Orderable crates: boxing equipment, empty boxes, bodybags (#14378)

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 1428bf04aca8e1ab020e9bb0f05528b88f1c7497..5eb24599c2119f20eb3a3ca68bc38c54ea08a28d 100644 (file)
--- 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 b8bfb063bfc4c8080f188ec0359d74de5152d74c..89f7e5d8e7a65d2baef40c8fc85b5cdcb5afea46 100644 (file)
--- 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 508a32f9185413a38c43252ab9dc6c46abacab7e..d932417fdc6c342ecfb0c64fb0c4cb8c4e5fec77 100644 (file)
--- 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 7c4fe6458392f19f332338bd7adca7eb2630db6b..97422e1a410cd94d0b97b79ca1aa3b9ea04ed70f 100644 (file)
--- 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 61877656be36742a7e2bf77d8ec662fa260082c9..aac1280560268ba11cdcd87e3c52c5a6a45d9aab 100644 (file)
--- 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 c20c3310153090b26ddbc114fbf58308bc5e056a..5e8d3efc050c56a11b6fab7346a4566657295322 100644 (file)
--- 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 5f6337230cb26d911201ffb36029771845ebbea3..0c05dbe582414318f717d7d2391a1c11d09ebffb 100644 (file)
--- 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 1b40e17ddb06250d6d0caa866b5d0e742b92a20a..273dedb00f412f9410906db099d5d6ec45e510bc 100644 (file)
--- 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 532ed3494964955ec1853c8257eced8505badd87..d4d0206c36efdbdd79d99af3eddcb4752c7d9545 100644 (file)
--- 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