From 77a3cf1009b0c0b1b45700d6ce31737f42d65c6d Mon Sep 17 00:00:00 2001 From: lapatison <100279397+lapatison@users.noreply.github.com> Date: Sat, 22 Apr 2023 14:13:05 +0300 Subject: [PATCH] Orderable crates: boxing equipment, empty boxes, bodybags (#14378) --- .../catalog/fills/crates/fun-crates.ftl | 3 +++ .../catalog/fills/crates/medical-crates.ftl | 3 +++ .../catalog/fills/crates/service-crates.ftl | 3 +++ Resources/Prototypes/Catalog/Cargo/cargo_fun.yml | 10 ++++++++++ .../Prototypes/Catalog/Cargo/cargo_medical.yml | 11 +++++++++++ .../Prototypes/Catalog/Cargo/cargo_service.yml | 10 ++++++++++ Resources/Prototypes/Catalog/Fills/Crates/fun.yml | 15 +++++++++++++++ .../Prototypes/Catalog/Fills/Crates/medical.yml | 10 ++++++++++ .../Prototypes/Catalog/Fills/Crates/service.yml | 9 +++++++++ 9 files changed, 74 insertions(+) diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/fun-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/fun-crates.ftl index 1428bf04ac..5eb24599c2 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/fun-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/fun-crates.ftl @@ -39,3 +39,6 @@ ent-CrateFunParty = Party Crate ent-CrateFunSyndicateSegway = Syndicate segway crate .desc = A crate containing a two-wheeler that will help you escape from the security officers. Or not. + +ent-CrateFunBoxing = Boxing Crate + .desc = Want to set up an underground fight club or host a tournament amongst station crew? This crate is for you! diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/medical-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/medical-crates.ftl index b8bfb063bf..89f7e5d8e7 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/medical-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/medical-crates.ftl @@ -29,6 +29,9 @@ ent-CrateEmergencyAdvancedKit = Emergency advanced kit ent-CrateEmergencyRadiationKit = Emergency radiation kit .desc = Crate filled with four radiation treatment kits + +ent-CrateBodyBags = Body bags crate + .desc = Contains ten body bags. ent-CrateVirologyBiosuit = Virology bio suit crate .desc = Contains 2 biohazard suits to ensure that no disease will distract you from treating the crew. Requires Medical access to open. diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/service-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/service-crates.ftl index 508a32f918..d932417fdc 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/service-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/service-crates.ftl @@ -21,6 +21,9 @@ ent-CrateServicePersonnel = Personnel crate ent-CrateServiceBooks = Books crate .desc = Contains 10 empty books of random appearance + +ent-CrateServiceBox = Boxes crate + .desc = Contains 6 empty multipurpose boxes. ent-CrateJanitorBiosuit = Janitor bio suit crate .desc = Contains 2 biohazard suits to ensure that no disease will distract you from cleaning. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index 7c4fe64583..97422e1a41 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -128,6 +128,16 @@ category: Fun group: market +- type: cargoProduct + id: FunBoxing + icon: + sprite: Clothing/Hands/Gloves/Boxing/boxingred.rsi + state: icon + product: CrateFunBoxing + cost: 500 + category: Fun + group: market + - type: cargoProduct id: FunPirate icon: diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml index 61877656be..aac1280560 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml @@ -77,6 +77,17 @@ cost: 2500 category: Medical group: market + +- type: cargoProduct + id: MedicalBodybags + icon: + sprite: Objects/Specific/Medical/Morgue/bodybags.rsi + state: bag_folded + product: CrateBodyBags + cost: 700 + category: Medical + group: market + - type: cargoProduct id: MedicalBiosuit icon: diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml index c20c331015..5e8d3efc05 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml @@ -88,6 +88,16 @@ category: Service group: market +- type: cargoProduct + id: ServiceBoxes + icon: + sprite: Objects/Storage/boxes.rsi + state: box + product: CrateServiceBox + cost: 400 + category: Service + group: market + - type: cargoProduct id: ServiceJanitorBiosuit icon: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 5f6337230c..0c05dbe582 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -195,6 +195,21 @@ - id: VehicleSyndicateSegway - id: VehicleKeySyndicateSegway +- type: entity + id: CrateFunBoxing + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: ClothingHandsGlovesBoxingRed + - id: ClothingHandsGlovesBoxingBlue + - id: ClothingHandsGlovesBoxingYellow + - id: ClothingHandsGlovesBoxingGreen + - id: UniformShortsRed + amount: 3 + - id: UniformShortsRedWithTop + amount: 3 + - type: entity id: CrateFunPirate parent: CratePirate diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml index 1b40e17ddb..273dedb00f 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml @@ -119,6 +119,16 @@ contents: - id: MedkitRadiationFilled amount: 4 + +- type: entity + id: CrateBodyBags + parent: CrateMedical + components: + - type: StorageFill + contents: + - id: BoxBodyBag + amount: 2 + - type: entity id: CrateVirologyBiosuit parent: CrateMedicalSecure diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 532ed34949..d4d0206c36 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -121,6 +121,15 @@ - id: BookRandom amount: 10 +- type: entity + id: CrateServiceBox + parent: CratePlastic + components: + - type: StorageFill + contents: + - id: BoxCardboard + amount: 6 + - type: entity id: CrateJanitorBiosuit parent: CratePlastic -- 2.51.2