Laser crate changes (#12191)

Resources/Locale/en-US/prototypes/catalog/cargo/cargo-armory.ftl

@@ -3,3 +3,6 @@ ent-ArmorySmg = { ent-CrateArmorySMG }
 
 ent-ArmoryShotgun = { ent-CrateArmoryShotgun }
     .desc = { ent-CrateArmoryShotgun.desc }
+
+ent-ArmoryLaser = { ent-CrateArmoryLaser }
+    .desc = { ent-CrateArmoryLaser.desc }

Resources/Locale/en-US/prototypes/catalog/cargo/cargo-security.ftl

@@ -7,9 +7,6 @@ ent-SecurityHelmet = { ent-CrateSecurityHelmet }
 ent-SecurityNonLethal = { ent-CrateSecurityNonlethal }
     .desc = { ent-CrateSecurityNonlethal.desc }
 
-ent-SecurityLaser = { ent-CrateSecurityLaser }
-    .desc = { ent-CrateSecurityLaser.desc }
-
 ent-SecurityRiot = { ent-CrateSecurityRiot }
     .desc = { ent-CrateSecurityRiot.desc }
 

Resources/Locale/en-US/prototypes/catalog/fills/crates/armory-crates.ftl

@@ -3,3 +3,6 @@ ent-CrateArmorySMG = SMG crate
 
 ent-CrateArmoryShotgun = Shotgun crate
     .desc = For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open.
+
+ent-CrateArmoryLaser = lasers crate
+    .desc = Contains three lethal, high-energy laser guns. Requires Armory access to open.

Resources/Locale/en-US/prototypes/catalog/fills/crates/security-crates.ftl

@@ -7,9 +7,6 @@ ent-CrateSecurityHelmet = helmet crate
 ent-CrateSecurityNonlethal = nonlethals crate
     .desc = Disabler weapons. Requires Security access to open.
 
-ent-CrateSecurityLaser = lasers crate
-    .desc = Contains three lethal, high-energy laser guns. Requires Security access to open.
-
 ent-CrateSecurityRiot = swat crate
     .desc = Contains two sets of heavy body armor and helmets and 2 shotguns with 6 rounds of beanbag shells each. Requires Armory access to open.
 

Resources/Maps/centcomm.yml

@@ -50877,7 +50877,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 6533
-  type: CrateSecurityLaser
+  type: CrateArmoryLaser
   components:
   - pos: -7.5,22.5
     parent: 0

Resources/Prototypes/Catalog/Cargo/cargo_armory.yml

@@ -17,3 +17,13 @@
   cost: 2500
   category: Armory
   group: market
+
+- type: cargoProduct
+  id: ArmoryLaser
+  icon:
+    sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi
+    state: icon
+  product: CrateArmoryLaser
+  cost: 1600
+  category: Armory
+  group: market

Resources/Prototypes/Catalog/Cargo/cargo_security.yml

@@ -28,16 +28,6 @@
   category: Security
   group: market
 
-- type: cargoProduct
-  id: SecurityLaser
-  icon:
-    sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi
-    state: icon
-  product: CrateSecurityLaser
-  cost: 1600
-  category: Security
-  group: market
-
 - type: cargoProduct
   id: SecurityRiot
   icon:

Resources/Prototypes/Catalog/Fills/Crates/armory.yml

@@ -19,3 +19,12 @@
         amount: 2
       - id: BoxLethalshot
         amount: 3
+
+- type: entity
+  id: CrateArmoryLaser
+  parent: CrateWeaponSecure
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponLaserGun
+        amount: 3

Resources/Prototypes/Catalog/Fills/Crates/security.yml

@@ -33,15 +33,6 @@
 #      - Pepperspray
 #      - GrenadeTeargas
 
-- type: entity
-  id: CrateSecurityLaser
-  parent: CrateSecgear
-  components:
-  - type: StorageFill
-    contents:
-      - id: WeaponLaserGun
-        amount: 3
-
 - type: entity
   id: CrateSecurityRiot
   parent: CrateSecgear