From df2510cc2502a95e7bee1be12e4976d590dc981c Mon Sep 17 00:00:00 2001 From: Lophi Date: Sun, 22 Oct 2023 15:32:55 -0400 Subject: [PATCH 1/2] Added 6 crates mostly armory --- .../Catalog/Cargo/cargo_armory.yml | 49 +++++++++++ .../Catalog/Cargo/cargo_engineering.yml | 9 ++ .../Catalog/Fills/Crates/armory.yml | 82 +++++++++++++++++++ .../Catalog/Fills/Crates/engines.yml | 9 ++ .../Weapons/Guns/Battery/battery_guns.yml | 4 +- 5 files changed, 151 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/SimpleStation14/Catalog/Cargo/cargo_armory.yml create mode 100644 Resources/Prototypes/SimpleStation14/Catalog/Cargo/cargo_engineering.yml create mode 100644 Resources/Prototypes/SimpleStation14/Catalog/Fills/Crates/armory.yml create mode 100644 Resources/Prototypes/SimpleStation14/Catalog/Fills/Crates/engines.yml diff --git a/Resources/Prototypes/SimpleStation14/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/SimpleStation14/Catalog/Cargo/cargo_armory.yml new file mode 100644 index 0000000000..1247d37135 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Catalog/Cargo/cargo_armory.yml @@ -0,0 +1,49 @@ +- type: cargoProduct + id: ArmoryPv3Pistol + icon: + sprite: SimpleStation14/Objects/Weapons/Guns/Pistols/pv3mini.rsi + state: icon + product: CratePV3Pistol + cost: 6000 + category: Armory + group: market + +- type: cargoProduct + id: ArmoryPv3Smg + icon: + sprite: SimpleStation14/Objects/Weapons/Guns/SMGs/pv3compact.rsi + state: icon + product: CratePV3Smg + cost: 10000 + category: Armory + group: market + +- type: cargoProduct + id: ArmoryK12Pistol + icon: + sprite: SimpleStation14/Objects/Weapons/Guns/Pistols/k12mini.rsi + state: icon + product: CrateK12Pistol + cost: 4000 + category: Armory + group: market + +- type: cargoProduct + id: ArmoryK12Smg + icon: + sprite: SimpleStation14/Objects/Weapons/Guns/Smgs/k12compact.rsi + state: icon + product: CrateK12Smg + cost: 8000 + category: Armory + group: market + +- type: cargoProduct + id: ArmoryMilitia + icon: + sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi + state: base + product: CrateMilitia + cost: 6000 + category: Armory + group: market diff --git a/Resources/Prototypes/SimpleStation14/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/SimpleStation14/Catalog/Cargo/cargo_engineering.yml new file mode 100644 index 0000000000..79c56e142c --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Catalog/Cargo/cargo_engineering.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: EngineeringPortableGenerator + icon: + sprite: Structures/Power/power.rsi + state: generator + product: CrateEngineeringPortableGenerator + cost: 1000 + category: Engineering + group: market diff --git a/Resources/Prototypes/SimpleStation14/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Crates/armory.yml new file mode 100644 index 0000000000..19e8629cc9 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Crates/armory.yml @@ -0,0 +1,82 @@ +- type: entity + id: CratePV3Pistol + parent: CrateWeaponSecure + name: PV-3 Mini Crate + description: "A crate containing three PV-3 Mini energy Personal Defence Weapons" + components: + - type: StorageFill + contents: + - id: WeaponLaserPv3Mini + - id: WeaponLaserPv3Mini + - id: WeaponLaserPv3Mini + +- type: entity + id: CratePV3Smg + parent: CrateWeaponSecure + name: PV-3 Compact Crate + description: "A crate containing three PV-3 Compact Energy Assault Weapons" + components: + - type: StorageFill + contents: + - id: WeaponLaserPv3Compact + - id: WeaponLaserPv3Compact + - id: WeaponLaserPv3Compact + +- type: entity + id: CrateK12Pistol + parent: CrateWeaponSecure + name: K12 Mini Crate + description: "A crate containing two K12 Mini Ballistic Personal Defence Weapons" + components: + - type: StorageFill + contents: + - id: WeaponPistolK12Mini + - id: WeaponPistolK12Mini + - id: MagazinePistol + - id: MagazinePistol + - id: MagazinePistol + - id: MagazinePistol + +- type: entity + id: CrateK12Smg + parent: CrateWeaponSecure + name: K12 Compact Crate + description: "A crate containing two K12 Compact Ballistic Assault Weapons" + components: + - type: StorageFill + contents: + - id: WeaponSubMachineGunK12Compact + - id: WeaponSubMachineGunK12Compact + - id: MagazinePistolSubMachineGun + - id: MagazinePistolSubMachineGun + - id: MagazinePistolSubMachineGun + - id: MagazinePistolSubMachineGun + +- type: entity + id: CrateMilitia + parent: CrateWeaponSecure + name: Militia Crate + description: "A crate containing four Mark 1 rifles, four armor vests, four berets, and eight stripper clips of .30 rifle" + components: + - type: StorageFill + contents: + - id: WeaponSniperGrand + - id: WeaponSniperGrand + - id: WeaponSniperGrand + - id: WeaponSniperGrand + - id: SpeedLoaderLightRifle + - id: SpeedLoaderLightRifle + - id: SpeedLoaderLightRifle + - id: SpeedLoaderLightRifle + - id: SpeedLoaderLightRifle + - id: SpeedLoaderLightRifle + - id: SpeedLoaderLightRifle + - id: SpeedLoaderLightRifle + - id: ClothingHeadHatBeret + - id: ClothingHeadHatBeret + - id: ClothingHeadHatBeret + - id: ClothingHeadHatBeret + - id: ClothingOuterArmorBasic + - id: ClothingOuterArmorBasic + - id: ClothingOuterArmorBasic + - id: ClothingOuterArmorBasic diff --git a/Resources/Prototypes/SimpleStation14/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Crates/engines.yml new file mode 100644 index 0000000000..4e41205052 --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Crates/engines.yml @@ -0,0 +1,9 @@ +- type: entity + id: CrateEngineeringPortableGenerator + parent: CrateEngineering + name: Portable Generator Crate + description: "A crate containing a portable generator" + components: + - type: StorageFill + contents: + - id: GeneratorBasic diff --git a/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index b2764f88bc..299a4e28d7 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -2,7 +2,7 @@ name: pv3 compact parent: BaseWeaponBattery id: WeaponLaserPv3Compact - description: Standard issue Nyanotrasen laser SMG. Pew! Pew pew! Now we're talkin' scifi! + description: Standard issue Nanotrasen laser SMG. Pew! Pew pew! Now we're talkin' scifi! components: - type: Item size: 28 @@ -39,7 +39,7 @@ name: pv3 mini parent: BaseWeaponBatterySmall id: WeaponLaserPv3Mini - description: Standard issue Nyanotrasen laser sidearm. This thing can bullseye a two metre target, it's not impossible! + description: Standard issue Nanotrasen laser sidearm. This thing can bullseye a two metre target, it's not impossible! components: - type: Sprite sprite: SimpleStation14/Objects/Weapons/Guns/Pistols/pv3mini.rsi From 2ef1858ec9cd3b3f9f9f604a5d4a38253b7ff3c2 Mon Sep 17 00:00:00 2001 From: LovelyLophi <111106265+LovelyLophi@users.noreply.github.com> Date: Sun, 22 Oct 2023 17:47:40 -0400 Subject: [PATCH 2/2] Apply suggestions from code review thank you for these death Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> --- .../SimpleStation14/Catalog/Fills/Crates/armory.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/SimpleStation14/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Crates/armory.yml index 19e8629cc9..238aba5b5e 100644 --- a/Resources/Prototypes/SimpleStation14/Catalog/Fills/Crates/armory.yml +++ b/Resources/Prototypes/SimpleStation14/Catalog/Fills/Crates/armory.yml @@ -2,7 +2,7 @@ id: CratePV3Pistol parent: CrateWeaponSecure name: PV-3 Mini Crate - description: "A crate containing three PV-3 Mini energy Personal Defence Weapons" + description: "A crate containing three PV-3 Mini energy Personal Defense Weapons" components: - type: StorageFill contents: @@ -26,7 +26,7 @@ id: CrateK12Pistol parent: CrateWeaponSecure name: K12 Mini Crate - description: "A crate containing two K12 Mini Ballistic Personal Defence Weapons" + description: "A crate containing two K12 Mini Ballistic Personal Defense Weapons" components: - type: StorageFill contents: @@ -53,7 +53,7 @@ - id: MagazinePistolSubMachineGun - type: entity - id: CrateMilitia + id: CrateMilitia parent: CrateWeaponSecure name: Militia Crate description: "A crate containing four Mark 1 rifles, four armor vests, four berets, and eight stripper clips of .30 rifle"