New Arsenal T3: Temperature Gun Revitalization (#35447)

* tempgun real

* fixin shit

* Warios Couch

* fix tests. i hope

* add to lathes

* tests begone

* RIP svalinn

* maintainer for the project btw

---------

Co-authored-by: Flareguy <woaj9999@outlook.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>

diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index f4f12eec5253540be0fd46c9cc40bcdf3d98d8d8..fc4f3e41e8793d61a39200eeec7acbce29d16ceb 100644 (file)
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -35,8 +35,9 @@ research-technology-wave-particle-harnessing = Wave Particle Harnessing
 research-technology-advanced-riot-control = Advanced Riot Control
 research-technology-portable-microfusion-weaponry = Portable Microfusion Weaponry
 research-technology-experimental-battery-ammo = Experimental Battery Ammo
-research-technology-basic-shuttle-armament = Shuttle basic armament
-research-technology-advanced-shuttle-weapon = Advanced shuttle weapons
+research-technology-basic-shuttle-armament = Shuttle Basic Armament
+research-technology-advanced-shuttle-weapon = Advanced Shuttle Weapons
+research-technology-thermal-weaponry = Thermal Weaponry
 
 research-technology-basic-robotics = Basic Robotics
 research-technology-basic-anomalous-research = Basic Anomalous Research

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 7b1c77b8d03cae0dd7e91ce79222989f5340cc2b..4d8856ef9ee1b2fee8777f0156380a6dd9385ed1 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -799,3 +799,47 @@
     autoRechargeRate: 24
     autoRechargePause: true
     autoRechargePauseTime: 30
+
+- type: entity
+  name: temperature gun
+  parent: [BaseWeaponBattery, BaseGunWieldable]
+  id: WeaponTemperatureGun
+  description: An advanced gun that shoots body-temperature-changing beams. This probably constitutes as some kind of war crime.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Battery/temp_gun.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-1
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Appearance
+  - type: Item
+    size: Large
+    shape:
+    - 0,0,3,1
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: false
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Battery/temp_gun.rsi
+  - type: Gun
+    fireRate: 1
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: BoltTempgunCold
+    fireCost: 100
+  - type: BatteryWeaponFireModes
+    fireModes:
+    - proto: BoltTempgunCold
+      fireCost: 100
+    - proto: BoltTempgunHot
+      fireCost: 100
+  - type: Battery
+    maxCharge: 1000
+    startingCharge: 1000
+  - type: StaticPrice
+    price: 100

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 57987b10869195daa767750b9a60654dbc0e0c59..ace364f127e39695189d3e4ed06bc5eb4f59dfa3 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -384,6 +384,23 @@
   - type: ChangeTemperatureOnCollide
     heat: -50000
 
+- type: entity
+  name: freezing bolt
+  id: BoltTempgunCold
+  parent: WatcherBolt
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Projectile
+    #   soundHit:  Waiting on serv3
+    impactEffect: BulletImpactEffectDisabler
+    damage:
+      types:
+        Cold: 10
+  - type: TimedDespawn
+    lifetime: 3
+  - type: ChangeTemperatureOnCollide
+    heat: -100000
+
 - type: entity
   name: magmawing watcher bolt
   id: WatcherBoltMagmawing
@@ -405,6 +422,21 @@
   - type: ChangeTemperatureOnCollide
     heat: 50000
 
+- type: entity
+  name: scorching bolt
+  id: BoltTempgunHot
+  parent: WatcherBoltMagmawing
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Projectile
+    #   soundHit:  Waiting on serv3
+    impactEffect: BulletImpactEffectOrangeDisabler
+    damage:
+      types:
+        Heat: 10
+  - type: ChangeTemperatureOnCollide
+    heat: 100000 #This may be a bit underpowered, but in testing, 130000 was RIDICULOUS and killed in seconds.
+
 - type: entity
   id: BulletKinetic
   name: kinetic bolt

diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml
index a86b4bbebfb1484354f3926505f7087dd8e30cd5..c68b408cacb9918f2a4a3d2d68a088b011cf4d23 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml
@@ -52,7 +52,6 @@
   recipes:
   - WeaponPistolCHIMP
   - WeaponForceGun
-  - WeaponLaserSvalinn
   - WeaponProtoKineticAccelerator
   - WeaponTetherGun
   - WeaponGauntletGorilla

diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
index a8eee17d5e41c20281cd16b03e4d606285531b1d..c2839b237938a80acaaca3c3d73fcf646e12c7d0 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
@@ -127,6 +127,7 @@
   - WeaponLaserCannon
   - WeaponLaserCarbine
   - WeaponXrayCannon
+  - WeaponTemperatureGun
 
 - type: latheRecipePack
   id: SecurityDisablers

diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index 725b785dd78c781dd2632cccef9e26a4d5979665..864edcba6ea036ab6b82c45002001ba9d9f84661 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -92,10 +92,12 @@
 
 - type: latheRecipe
   parent: BaseWeaponRecipeLong
-  id: WeaponLaserSvalinn
-  result: WeaponLaserSvalinn
+  id: WeaponTemperatureGun
+  result: WeaponTemperatureGun
   materials:
     Steel: 2000
+    Glass: 500
+    Plastic: 500
     Gold: 500
 
 - type: latheRecipe

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 6cecc490358151e2806c9ea20e4ee52fbd994dc8..b848ae0998d6ccacf25298f4c50456cce0bb30b3 100644 (file)
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -193,16 +193,16 @@
   - PortableRecharger
 
 - type: technology
-  id: ExperimentalBatteryAmmo
-  name: research-technology-experimental-battery-ammo
+  id: ThermalWeaponry
+  name: research-technology-thermal-weaponry
   icon:
-    sprite: Objects/Weapons/Guns/Battery/svalinn.rsi
+    sprite: Objects/Weapons/Guns/Battery/temp_gun.rsi
     state: icon
   discipline: Arsenal
   tier: 3
   cost: 15000
   recipeUnlocks:
-  - WeaponLaserSvalinn
+  - WeaponTemperatureGun
 
 - type: technology
   id: AdvancedShuttleWeapon

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/base.png
new file mode 100644 (file)
index 0000000..00fc6f7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/base.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/equipped-BACKPACK.png
new file mode 100644 (file)
index 0000000..11dc6f6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/equipped-BACKPACK.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/equipped-SUITSTORAGE.png
new file mode 100644 (file)
index 0000000..11dc6f6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/equipped-SUITSTORAGE.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/icon.png
new file mode 100644 (file)
index 0000000..1091e64
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..7911e2e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..ecc3d00
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-1.png
new file mode 100644 (file)
index 0000000..3785439
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-2.png
new file mode 100644 (file)
index 0000000..4feaf6c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-2.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-3.png
new file mode 100644 (file)
index 0000000..376f97a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-3.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-4.png
new file mode 100644 (file)
index 0000000..b2e9ea6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/mag-unshaded-4.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/meta.json
new file mode 100644 (file)
index 0000000..d9585ec
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/meta.json
@@ -0,0 +1,53 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b98afcd1400b0f398bf1322b2b20de57ccf7bb0c and modified by Flareguy. equipped-BACKPACK, equipped-SUITSTORAGE, inhand-left and inhand-right states modified by Flareguy using ion rifle states",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/wielded-inhand-left.png
new file mode 100644 (file)
index 0000000..e3e7a96
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/wielded-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/wielded-inhand-right.png
new file mode 100644 (file)
index 0000000..8d58d05
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/temp_gun.rsi/wielded-inhand-right.png differ