Arsenal tech discipline (#17400)

2023-06-18 17:56:49 -04:00
parent 8cd6067d49
commit 3975578e4e
36 changed files with 560 additions and 56 deletions
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -1,10 +1,10 @@
 research-discipline-none = None
 research-discipline-industrial = Industrial
 research-discipline-biochemical = Biochemical
+research-discipline-arsenal = Arsenal
 research-discipline-experimental = Experimental
 research-discipline-civilian-services = Civilian Services

-research-technology-salvage-weapons = Salvage weapons
 research-technology-salvage-equipment = Salvage Equipment
 research-technology-advanced-powercells = Advanced Powercells
 research-technology-compact-power = Compact Power
@@ -29,8 +29,17 @@ research-technology-crew-monitoring = Crew Monitoring
 research-technology-bluespace-chemistry = Bluespace Chemistry
 research-technology-cloning = Cloning

+research-technology-salvage-weapons = Salvage Weapons
+research-technology-draconic-munitions = Draconic Munitions
+research-technology-explosive-technology = Explosive Technology
+research-technology-advanced-laser-manipulation = Advanced Laser Manipulation
+research-technology-nonlethal-ammunition = Nonlethal Ammunition
+research-technology-optimized-ballistics = Optimized Ballistics
+research-technology-concentrated-laser-weaponry = Concentrated Laser Weaponry
+research-technology-wave-particle-harnessing = Wave Particle Harnessing
+research-technology-handheld-electrical-propulsion = Handheld Electrical Propulsion
+
 research-technology-basic-robotics = Basic Robotics
-research-technology-signalling-tech = Signalling Tech
 research-technology-basic-anomalous-research = Basic Anomalous Research
 research-technology-basic-xenoarcheology = Basic XenoArcheology
 research-technology-alternative-research = Alternative Research
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
@@ -103,3 +103,18 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]
    - state: rubber
+
+- type: entity
+  id: MagazineBoxLightRifleIncendiary
+  parent: BaseMagazineBoxLightRifle
+  name: ammunition box (.30 rifle incendiary)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifleIncendiary
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: incendiary
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
@@ -82,3 +82,18 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]
    - state: rubber
+
+- type: entity
+  id: MagazineBoxMagnumIncendiary
+  parent: BaseMagazineBoxMagnum
+  name: ammunition box (.45 magnum incendiary)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumIncendiary
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: incendiary
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
@@ -83,3 +83,18 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]
    - state: rubber
+
+- type: entity
+  id: MagazineBoxPistolIncendiary
+  parent: BaseMagazineBoxPistol
+  name: ammunition box (.35 auto incendiary)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolIncendiary
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: incendiary
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -123,3 +123,18 @@
    - state: mag-1
      map: ["enum.GunVisualLayers.Mag"]
    - state: rubber
+
+- type: entity
+  id: MagazineBoxRifleIncendiary
+  parent: BaseMagazineBoxRifle
+  name: ammunition box (.20 rifle incendiary)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleIncendiary
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: incendiary
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
@@ -51,3 +51,11 @@
  components:
  - type: CartridgeAmmo
    proto: BulletLightRifleRubber
+
+- type: entity
+  id: CartridgeLightRifleIncendiary
+  name: cartridge (.30 rifle incendiary)
+  parent: BaseCartridgeLightRifle
+  components:
+  - type: CartridgeAmmo
+    proto: BulletLightRifleIncendiary
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
@@ -52,6 +52,14 @@
  - type: CartridgeAmmo
    proto: BulletMagnumRubber

+- type: entity
+  id: CartridgeMagnumIncendiary
+  name: cartridge (.45 magnum incendiary)
+  parent: BaseCartridgeMagnum
+  components:
+  - type: CartridgeAmmo
+    proto: BulletMagnumIncendiary
+
 - type: entity
  id: BaseAnomalousCartridge
  parent: BaseCartridgeMagnum
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -51,3 +51,11 @@
  components:
  - type: CartridgeAmmo
    proto: BulletPistolRubber
+
+- type: entity
+  id: CartridgePistolIncendiary
+  name: cartridge (.35 auto incendiary)
+  parent: BaseCartridgePistol
+  components:
+  - type: CartridgeAmmo
+    proto: BulletPistolIncendiary
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
@@ -51,3 +51,11 @@
  components:
  - type: CartridgeAmmo
    proto: BulletRifleRubber
+
+- type: entity
+  id: CartridgeRifleIncendiary
+  name: cartridge (.20 rifle incendiary)
+  parent: BaseCartridgeRifle
+  components:
+  - type: CartridgeAmmo
+    proto: BulletRifleIncendiary
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
@@ -41,3 +41,14 @@
    damage:
      types:
        Blunt: 3
+
+- type: entity
+  id: BulletLightRifleIncendiary
+  parent: BaseBulletIncendiary
+  name: bullet (.20 rifle incendiary)
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      groups:
+        Burn: 17
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -43,3 +43,14 @@
        Blunt: 3
  - type: StaminaDamageOnCollide
    damage: 35 # 3 hits to stun cuz revolver
+
+- type: entity
+  id: BulletMagnumIncendiary
+  parent: BaseBulletIncendiary
+  name: bullet (.45 magnum incendiary)
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      groups:
+        Burn: 32
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
@@ -41,3 +41,14 @@
    damage:
      types:
        Blunt: 3
+
+- type: entity
+  id: BulletPistolIncendiary
+  parent: BaseBulletIncendiary
+  name: bullet (.35 auto incendiary)
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      groups:
+        Burn: 14
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -41,3 +41,14 @@
    damage:
      types:
        Blunt: 3
+
+- type: entity
+  id: BulletRifleIncendiary
+  parent: BaseBulletIncendiary
+  name: bullet (0.20 rifle incendiary)
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      groups:
+        Burn: 15
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -46,7 +46,7 @@
  id: PelletShotgunIncendiary
  name: pellet (.50 incendiary)
  noSpawn: true
-  parent: BaseBullet
+  parent: BaseBulletIncendiary
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -55,13 +55,6 @@
    damage:
      groups:
        Burn: 7
-  - type: PointLight
-    enabled: true
-    color: "#ff4300"
-    radius: 2.0
-    energy: 7.0
-  - type: IgniteOnCollide
-    fireStacks: 1

 - type: entity
  id: PelletShotgunPractice
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -326,7 +326,6 @@
  parent: BaseWeaponBatterySmall
  id: WeaponTaser
  description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range.
-  suffix: Admin
  components:
  - type: Tag
    tags:
@@ -350,7 +349,7 @@
      path: /Audio/Weapons/Guns/Gunshots/taser.ogg
  - type: ProjectileBatteryAmmoProvider
    proto: BulletTaser
-    fireCost: 100
+    fireCost: 200
  - type: MagazineVisuals
    magState: mag
    steps: 5
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -126,6 +126,24 @@
  - type: StaminaDamageOnCollide
    damage: 22 # 5 hits to stun sounds reasonable

+- type: entity
+  id: BaseBulletIncendiary
+  name: base bullet incendiary
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 14
+  - type: PointLight
+    enabled: true
+    color: "#ff4300"
+    radius: 2.0
+    energy: 7.0
+  - type: IgniteOnCollide
+    fireStacks: 1
+
 # Energy projectiles
 - type: entity
  name: taser bolt
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -105,6 +105,7 @@
      - StationMapElectronics
      - FireAlarmElectronics
      - MailingUnitElectronics
+      - SignalTimerElectronics
      - APCElectronics
      - SMESMachineCircuitboard
      - SubstationMachineCircuitboard
@@ -215,7 +216,6 @@
      - SuperCapacitorStockPart
      - SuperMatterBinStockPart
      - PicoManipulatorStockPart
-      - SignalTimerElectronics
      - MopItem
      - Holoprojector
      - Mousetrap
@@ -279,7 +279,6 @@
    idleState: icon
    runningState: building
    dynamicRecipes:
-      - SignalTimerElectronics
      - ThermomachineFreezerMachineCircuitBoard
      - PortableScrubberMachineCircuitBoard
      - CloningPodMachineCircuitboard
@@ -432,7 +431,6 @@
    runningState: icon
    staticRecipes:
      - Flash
-      - FlashPayload
      - Handcuffs
      - Zipties
      - Stunbaton
@@ -441,27 +439,56 @@
      - RiotShield
      - CartridgePistol
      - CartridgeMagnum
-      - CartridgePistolRubber
-      - CartridgeMagnumRubber
      - ShellShotgun
-      - ShellShotgunBeanbag
      - ShellShotgunFlare
      - ShellTranquilizer
      - CartridgeLightRifle
      - CartridgeRifle
-      - CartridgeLightRifleRubber
-      - CartridgeRifleRubber
+      - MagazineBoxPistol
+      - MagazineBoxMagnum
+      - MagazineBoxRifle
+      - MagazineBoxLightRifle
      - TargetHuman
      - TargetSyndicate
      - TargetClown
-      - MagazineBoxPistol
+    dynamicRecipes:
+      - CartridgePistolRubber
+      - CartridgeMagnumRubber
+      - ShellShotgunBeanbag
+      - CartridgeRifleRubber
+      - CartridgeLightRifleRubber
      - MagazineBoxPistolRubber
-      - MagazineBoxMagnum
      - MagazineBoxMagnumRubber
-      - MagazineBoxRifle
      - MagazineBoxRifleRubber
-      - MagazineBoxLightRifle
      - MagazineBoxLightRifleRubber
+      - CartridgePistolHighVelocity
+      - CartridgeMagnumHighVelocity
+      - CartridgeLightRifleHighVelocity
+      - CartridgeRifleHighVelocity
+      - MagazineBoxPistolHighVelocity
+      - MagazineBoxMagnumHighVelocity
+      - MagazineBoxLightRifleHighVelocity
+      - MagazineBoxRifleHighVelocity
+      - ShellShotgunIncendiary
+      - CartridgePistolIncendiary
+      - CartridgeMagnumIncendiary
+      - CartridgeLightRifleIncendiary
+      - CartridgeRifleIncendiary
+      - MagazineBoxPistolIncendiary
+      - MagazineBoxMagnumIncendiary
+      - MagazineBoxLightRifleIncendiary
+      - MagazineBoxRifleIncendiary
+      - Signaller
+      - SignalTrigger
+      - VoiceTrigger
+      - TimerTrigger
+      - FlashPayload
+      - ExplosivePayload
+      - WeaponLaserCarbine
+      - WeaponAdvancedLaser
+      - WeaponLaserCannon
+      - WeaponXrayCannon
+      - WeaponTaser
  - type: MaterialStorage
    whitelist:
      tags:
--- a/Resources/Prototypes/Entities/Structures/Machines/research.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/research.yml
@@ -15,6 +15,7 @@
    supportedDisciplines:
    - Industrial
    - Biochemical
+    - Arsenal
    - Experimental
    - CivilianServices
  - type: ApcPowerReceiver
--- a/Resources/Prototypes/Recipes/Lathes/devices.yml
+++ b/Resources/Prototypes/Recipes/Lathes/devices.yml
@@ -40,6 +40,15 @@
    Glass: 50
    #one fourth of what making a flash would cost

+- type: latheRecipe
+  id: ExplosivePayload
+  result: ExplosivePayload
+  completetime: 1
+  materials:
+    Steel: 50
+    Plastic: 100
+    Glass: 50
+
 - type: latheRecipe
  id: Signaller
  result: RemoteSignaller
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -20,6 +20,52 @@
    Steel: 300
    Plastic: 300

+- type: latheRecipe
+  id: WeaponLaserCarbine
+  result: WeaponLaserCarbine
+  completetime: 5
+  materials:
+    Steel: 750
+    Glass: 500
+    Plastic: 250
+
+- type: latheRecipe
+  id: WeaponAdvancedLaser
+  result: WeaponAdvancedLaser
+  completetime: 5
+  materials:
+    Steel: 1000
+    Glass: 500
+    Gold: 150
+
+- type: latheRecipe
+  id: WeaponLaserCannon
+  result: WeaponLaserCannon
+  completetime: 5
+  materials:
+    Steel: 1250
+    Plastic: 750
+    Gold: 100
+
+- type: latheRecipe
+  id: WeaponXrayCannon
+  result: WeaponXrayCannon
+  completetime: 5
+  materials:
+    Steel: 1500
+    Glass: 500
+    Plastic: 250
+    Gold: 100
+
+- type: latheRecipe
+  id: WeaponTaser
+  result: WeaponTaser
+  completetime: 5
+  materials:
+    Steel: 700
+    Plastic: 300
+    Gold: 250
+
 - type: latheRecipe
  id: ForensicPad
  result: ForensicPad
@@ -248,3 +294,122 @@
  materials:
    Steel: 350
    Plastic: 600
+
+- type: latheRecipe
+  id: CartridgePistolHighVelocity
+  result: CartridgePistolHighVelocity
+  completetime: 2
+  materials:
+    Steel: 20
+
+- type: latheRecipe
+  id: CartridgeMagnumHighVelocity
+  result: CartridgeMagnumHighVelocity
+  completetime: 2
+  materials:
+    Steel: 40
+
+- type: latheRecipe
+  id: CartridgeLightRifleHighVelocity
+  result: CartridgeLightRifleHighVelocity
+  completetime: 2
+  materials:
+    Steel: 40
+
+- type: latheRecipe
+  id: CartridgeRifleHighVelocity
+  result: CartridgeRifleHighVelocity
+  completetime: 2
+  materials:
+    Steel: 30
+
+- type: latheRecipe
+  id: MagazineBoxPistolHighVelocity
+  result: MagazineBoxPistolHighVelocity
+  completetime: 5
+  materials:
+    Steel: 1250
+
+- type: latheRecipe
+  id: MagazineBoxMagnumHighVelocity
+  result: MagazineBoxMagnumHighVelocity
+  completetime: 5
+  materials:
+    Steel: 2450
+
+- type: latheRecipe
+  id: MagazineBoxLightRifleHighVelocity
+  result: MagazineBoxLightRifleHighVelocity
+  completetime: 5
+  materials:
+    Steel: 2050
+
+- type: latheRecipe
+  id: MagazineBoxRifleHighVelocity
+  result: MagazineBoxRifleHighVelocity
+  completetime: 5
+  materials:
+    Steel: 1850
+
+- type: latheRecipe
+  id: ShellShotgunIncendiary
+  result: ShellShotgunIncendiary
+  completetime: 2
+  materials:
+    Plastic: 20
+
+- type: latheRecipe
+  id: CartridgePistolIncendiary
+  result: CartridgePistolIncendiary
+  completetime: 2
+  materials:
+    Plastic: 10
+
+- type: latheRecipe
+  id: CartridgeMagnumIncendiary
+  result: CartridgeMagnumIncendiary
+  completetime: 2
+  materials:
+    Plastic: 20
+
+- type: latheRecipe
+  id: CartridgeLightRifleIncendiary
+  result: CartridgeLightRifleIncendiary
+  completetime: 2
+  materials:
+    Plastic: 20
+
+- type: latheRecipe
+  id: CartridgeRifleIncendiary
+  result: CartridgeRifleIncendiary
+  completetime: 2
+  materials:
+    Plastic: 15
+
+- type: latheRecipe
+  id: MagazineBoxPistolIncendiary
+  result: MagazineBoxPistolIncendiary
+  completetime: 5
+  materials:
+    Plastic: 650
+
+- type: latheRecipe
+  id: MagazineBoxMagnumIncendiary
+  result: MagazineBoxMagnumIncendiary
+  completetime: 5
+  materials:
+    Plastic: 1250
+
+- type: latheRecipe
+  id: MagazineBoxLightRifleIncendiary
+  result: MagazineBoxLightRifleIncendiary
+  completetime: 5
+  materials:
+    Plastic: 1800
+
+- type: latheRecipe
+  id: MagazineBoxRifleIncendiary
+  result: MagazineBoxRifleIncendiary
+  completetime: 5
+  materials:
+    Plastic: 950
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -0,0 +1,145 @@
+# Tier 1
+
+- type: technology
+  id: SalvageWeapons
+  name: research-technology-salvage-weapons
+  icon:
+    sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
+    state: gun
+  discipline: Arsenal
+  tier: 1
+  cost: 10000
+  recipeUnlocks:
+  - WeaponProtoKineticAccelerator
+  # These are roundstart but not replenishable for salvage
+  - WeaponCrusher
+  - WeaponCrusherDagger
+
+- type: technology
+  id: DraconicMunitions
+  name: research-technology-draconic-munitions
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
+    state: incendiarydisplay
+  discipline: Arsenal
+  tier: 1
+  cost: 10000
+  recipeUnlocks:
+  - ShellShotgunIncendiary
+  - CartridgePistolIncendiary
+  - CartridgeMagnumIncendiary
+  - CartridgeLightRifleIncendiary
+  - CartridgeRifleIncendiary
+  - MagazineBoxPistolIncendiary
+  - MagazineBoxMagnumIncendiary
+  - MagazineBoxLightRifleIncendiary
+  - MagazineBoxRifleIncendiary
+
+- type: technology
+  id: ExplosiveTechnology
+  name: research-technology-explosive-technology
+  icon:
+    sprite: Objects/Devices/payload.rsi
+    state: payload-explosive-armed
+  discipline: Arsenal
+  tier: 1
+  cost: 7500
+  recipeUnlocks:
+  - Signaller
+  - SignalTrigger
+  - VoiceTrigger
+  - TimerTrigger
+  - FlashPayload
+  - ExplosivePayload
+
+- type: technology
+  id: AdvancedLaserManipulation
+  name: research-technology-advanced-laser-manipulation
+  icon:
+    sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 1
+  cost: 10000
+  recipeUnlocks:
+  - WeaponLaserCarbine
+  - WeaponAdvancedLaser
+
+- type: technology
+  id: NonlethalAmmunition
+  name: research-technology-nonlethal-ammunition
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
+    state: beanbag
+  discipline: Arsenal
+  tier: 1
+  cost: 7500
+  recipeUnlocks:
+  - ShellShotgunBeanbag
+  - CartridgePistolRubber
+  - CartridgeMagnumRubber
+  - CartridgeLightRifleRubber
+  - CartridgeRifleRubber
+  - MagazineBoxPistolRubber
+  - MagazineBoxMagnumRubber
+  - MagazineBoxLightRifleRubber
+  - MagazineBoxRifleRubber
+
+# Tier 2
+
+- type: technology
+  id: OptimizedBallistics
+  name: research-technology-optimized-ballistics
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
+    state: hvdisplay
+  discipline: Arsenal
+  tier: 2
+  cost: 7500
+  recipeUnlocks:
+  - CartridgePistolHighVelocity
+  - CartridgeMagnumHighVelocity
+  - CartridgeLightRifleHighVelocity
+  - CartridgeRifleHighVelocity
+  - MagazineBoxPistolHighVelocity
+  - MagazineBoxMagnumHighVelocity
+  - MagazineBoxLightRifleHighVelocity
+  - MagazineBoxRifleHighVelocity
+
+- type: technology
+  id: ConcentratedLaserWeaponry
+  name: research-technology-concentrated-laser-weaponry
+  icon:
+    sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+  - WeaponLaserCannon
+
+- type: technology
+  id: WaveParticleHarnessing
+  name: research-technology-wave-particle-harnessing
+  icon:
+    sprite: Objects/Weapons/Guns/Battery/xray.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+  - WeaponXrayCannon
+
+# Tier 3
+
+- type: technology
+  id: HandheldElectricalPropulsion
+  name: research-technology-handheld-electrical-propulsion
+  icon:
+    sprite: Objects/Weapons/Guns/Battery/taser.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 3
+  cost: 15000
+  recipeUnlocks:
+  - WeaponTaser
--- a/Resources/Prototypes/Research/disciplines.yml
+++ b/Resources/Prototypes/Research/disciplines.yml
@@ -22,6 +22,18 @@
    2: 0.75
    3: 0.75

+- type: techDiscipline
+  id: Arsenal
+  name: research-discipline-arsenal
+  color: "#dc373b"
+  icon:
+    sprite: Interface/Misc/research_disciplines.rsi
+    state: arsenal
+  tierPrerequisites:
+    1: 0
+    2: 0.75
+    3: 0.75
+
 - type: techDiscipline
  id: Experimental
  name: research-discipline-experimental
--- a/Resources/Prototypes/Research/experimental.yml
+++ b/Resources/Prototypes/Research/experimental.yml
@@ -19,22 +19,6 @@
  - Drone
  - ExosuitFabricatorMachineCircuitboard

- type: technology
-  id: SignallingTech
-  name: research-technology-signalling-tech
-  icon:
-    sprite: Objects/Devices/signaller.rsi
-    state: signaller
-  discipline: Experimental
-  tier: 1
-  cost: 7500
-  recipeUnlocks:
-  - Signaller
-  - SignalTrigger
-  - VoiceTrigger
-  - TimerTrigger
-  - SignalTimerElectronics
-
 - type: technology
  id: BasicAnomalousResearch
  name: research-technology-basic-anomalous-research
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -1,20 +1,5 @@
 # Tier 1

- type: technology
-  id: SalvageWeapons
-  name: research-technology-salvage-weapons
-  icon:
-    sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
-    state: gun
-  discipline: Industrial
-  tier: 1
-  cost: 10000
-  recipeUnlocks:
-    - WeaponProtoKineticAccelerator
-    # These are roundstart but not replenishable for salvage
-    - WeaponCrusher
-    - WeaponCrusherDagger
-
 - type: technology
  id: SalvageEquipment
  name: research-technology-salvage-equipment
--- a/Resources/Textures/Interface/Misc/research_disciplines.rsi/arsenal.png
+++ b/Resources/Textures/Interface/Misc/research_disciplines.rsi/arsenal.png
--- a/Resources/Textures/Interface/Misc/research_disciplines.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/research_disciplines.rsi/meta.json
@@ -7,6 +7,9 @@
    "y": 8
  },
  "states": [
+    {
+      "name": "arsenal"
+    },
    {
      "name": "biochemical"
    },
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiary.png
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json
@@ -22,6 +22,9 @@
    {
      "name": "hv"
    },
+    {
+      "name": "incendiary"
+    },
    {
      "name": "practice"
    },
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/incendiary.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/incendiary.png
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json
@@ -22,6 +22,9 @@
    {
      "name": "hv"
    },
+    {
+      "name": "incendiary"
+    },
    {
      "name": "practice"
    },
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/hvdisplay.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/hvdisplay.png
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiary.png
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json
@@ -16,6 +16,15 @@
    {
      "name": "hv"
    },
+    {
+      "name": "hvdisplay"
+    },
+    {
+      "name": "incendiarydisplay"
+    },
+    {
+      "name": "incendiary"
+    },
    {
      "name": "practice"
    },
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiary.png
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json
@@ -22,6 +22,9 @@
    {
      "name": "hv"
    },
+    {
+      "name": "incendiary"
+    },
    {
      "name": "practice"
    },