From 059e81fd2ec89de15a19442295521ebf22c19d5c Mon Sep 17 00:00:00 2001 From: Nairod <110078045+Nairodian@users.noreply.github.com> Date: Mon, 7 Nov 2022 20:37:08 -0600 Subject: [PATCH] Laser crate changes (#12191) --- .../en-US/prototypes/catalog/cargo/cargo-armory.ftl | 3 +++ .../en-US/prototypes/catalog/cargo/cargo-security.ftl | 3 --- .../prototypes/catalog/fills/crates/armory-crates.ftl | 3 +++ .../catalog/fills/crates/security-crates.ftl | 3 --- Resources/Maps/centcomm.yml | 2 +- Resources/Prototypes/Catalog/Cargo/cargo_armory.yml | 10 ++++++++++ Resources/Prototypes/Catalog/Cargo/cargo_security.yml | 10 ---------- Resources/Prototypes/Catalog/Fills/Crates/armory.yml | 9 +++++++++ Resources/Prototypes/Catalog/Fills/Crates/security.yml | 9 --------- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-armory.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-armory.ftl index 236a192fb8..2c33cd2acd 100644 --- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-armory.ftl +++ b/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 } \ No newline at end of file diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-security.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-security.ftl index 42acf12ba9..df7cfa6c38 100644 --- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-security.ftl +++ b/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 } diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/armory-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/armory-crates.ftl index c4aede9ad8..d119182b23 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/armory-crates.ftl +++ b/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. \ No newline at end of file diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/security-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/security-crates.ftl index 7eb40cec06..c4f6fa7272 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/security-crates.ftl +++ b/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. diff --git a/Resources/Maps/centcomm.yml b/Resources/Maps/centcomm.yml index b25472a118..c056b5637f 100644 --- a/Resources/Maps/centcomm.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml index d2b432b90d..c66fe08bee 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml +++ b/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 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index c3d0d26a0a..9096319345 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/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: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml index 679dc507dc..cd07e42e72 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml +++ b/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 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml index 834c8c3da3..e63678cc4c 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml +++ b/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