More Cargo Catalog Changes (new-frontiers-14#678)

* Janitor + Surgery

* Crates

* More Crates

* JaniCart

* Update service-crates.ftl

* Update service-crates.ftl

* Update service-crates.ftl

* Update cargo_shuttle.yml

Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-fun.ftl

@@ -12,3 +12,6 @@ ent-FunChurchOrganInstrument = { ent-ChurchOrganInstrument }
 
 ent-FunMinimoogInstrument = { ent-MinimoogInstrument }
     .desc = { ent-MinimoogInstrument.desc }
+
+ent-FunDawInstrument = { ent-DawInstrument }
+    .desc = { ent-DawInstrument.desc }

Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-service.ftl

@@ -0,0 +1,5 @@
+ent-ServiceJanitorial2 = { ent-CrateServiceJanitorialSupplies2 }
+    .desc = { ent-CrateServiceJanitorialSupplies2.desc }
+
+ent-ServiceVehicleJanicart = { ent-CrateVehicleJanicart }
+    .desc = { ent-CrateVehicleJanicart.desc }

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

@@ -0,0 +1,5 @@
+ent-CrateThruster = { ent-BaseThruster }
+    .desc = { ent-BaseThruster.desc }
+
+ent-CrateGyroscope = { ent-Gyroscope }
+    .desc = { ent-Gyroscope.desc }

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

@@ -0,0 +1,8 @@
+ent-CrateServiceJanitorialSupplies2 = Janitorial supplies crate B
+    .desc = Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains two trash bag boxes, one box of wet floor signs and 2 spray cleaners.
+
+ent-CrateSpaceCleaner = Bulk space cleaner crate
+    .desc = For a large mess
+
+ent-CrateVehicleJanicart = Janicart crate
+    .desc = The janitor's trusty steed.

Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml

@@ -1,22 +1,22 @@
-- type: cargoProduct
-  id: ShuttleThruster
-  icon:
-    sprite: Structures/Shuttles/thruster.rsi
-    state: base
-  product: Thruster
-  cost: 1500
-  category: Shuttle
-  group: market
+# - type: cargoProduct # Frontier - Moved to crate
+  # id: ShuttleThruster
+  # icon:
+    # sprite: Structures/Shuttles/thruster.rsi
+    # state: base
+  # product: Thruster
+  # cost: 1500
+  # category: Shuttle
+  # group: market
 
-- type: cargoProduct
-  id: ShuttleGyroscope
-  icon:
-    sprite: Structures/Shuttles/gyroscope.rsi
-    state: base
-  product: Gyroscope
-  cost: 4000
-  category: Shuttle
-  group: market
+# - type: cargoProduct # Frontier - Moved to crate
+  # id: ShuttleGyroscope
+  # icon:
+    # sprite: Structures/Shuttles/gyroscope.rsi
+    # state: base
+  # product: Gyroscope
+  # cost: 4000
+  # category: Shuttle
+  # group: market
 
 # - type: cargoProduct
   # id: ShuttlePowerKit

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

@@ -50,6 +50,9 @@
       - id: Saw
       - id: Hemostat
       - id: ClothingMaskSterile
+      - id: NitrousOxideTankFilled # Frontier
+      - id: ClothingMaskBreathMedical # Frontier
+      - id: SawElectric # Frontier
 
 - type: entity
   id: CrateMedicalScrubs

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

@@ -15,8 +15,10 @@
         amount: 2
       - id: TrashBag
         amount: 2
-      - id: Plunger
-        amount: 2
+      - id: Plunger # Frontier 2<1
+        amount: 1 
+      - id: LightReplacer # Frontier
+        amount: 1
 
 - type: entity
   id: CrateServiceReplacementLights

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml

@@ -617,9 +617,6 @@
           Amount: 1
           DefaultPrototype: SaxophoneInstrument
           ExamineName: Woodwind Instrument
-    - type: StaticPrice
-      price: 400
-
 
 - type: entity
   id: PortableGeneratorPacmanMachineCircuitboard

Resources/Prototypes/_NF/Catalog/Cargo/cargo_food.yml

@@ -0,0 +1,9 @@
+- type: cargoProduct
+  id: FoodCrateFreezer
+  icon:
+    sprite: Structures/Storage/Crates/freezer.rsi
+    state: icon
+  product: CrateFreezer
+  cost: 500
+  category: Food
+  group: market

Resources/Prototypes/_NF/Catalog/Cargo/cargo_fun.yml

@@ -48,3 +48,12 @@
   category: Fun
   group: market
 
+# - type: cargoProduct
+  # id: FunDawInstrument
+  # icon:
+    # sprite: Objects/Fun/Instruments/structureinstruments.rsi
+    # state: daw-base
+  # product: DawInstrument
+  # cost: 15000
+  # category: Fun
+  # group: market

Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml

@@ -1,9 +1,19 @@
 - type: cargoProduct
   id: MedicalTrackingImplant
   icon:
-    sprite: Objects/Specific/Chemistry/syringe.rsi
-    state: syringe_base0
+    sprite: Objects/Specific/Medical/implanter.rsi
+    state: implanter0
   product: CrateMedicalTrackingImplants
   cost: 1000
   category: Medical
   group: market
+
+- type: cargoProduct
+  id: CrateMedicalSurgery
+  icon:
+    sprite: Structures/Storage/Crates/surgery.rsi
+    state: icon
+  product: CrateMedicalSurgery
+  cost: 3000
+  category: Medical
+  group: market

Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml

@@ -0,0 +1,39 @@
+- type: cargoProduct
+  id: BulkSpaceCleaner
+  icon:
+    sprite: Objects/Specific/Chemistry/jug.rsi
+    state: jug
+  product: CrateSpaceCleaner
+  cost: 2000
+  category: Service
+  group: market
+
+- type: cargoProduct
+  id: ServiceJanitorial2
+  icon:
+    sprite: Objects/Specific/Janitorial/janitorial.rsi
+    state: cleaner
+  product: CrateServiceJanitorialSupplies2
+  cost: 800
+  category: Service
+  group: market
+
+- type: cargoProduct
+  id: ServiceJanitorialTrolley
+  icon:
+    sprite: Objects/Specific/Janitorial/janitorial_cart.rsi
+    state: cart
+  product: JanitorialTrolley
+  cost: 1000
+  category: Service
+  group: market
+
+- type: cargoProduct
+  id: ServiceVehicleJanicart
+  icon:
+    sprite: Objects/Vehicles/janicart.rsi
+    state: icon
+  product: CrateVehicleJanicart
+  cost: 1500
+  category: Service
+  group: market

Resources/Prototypes/_NF/Catalog/Cargo/cargo_shuttle.yml

@@ -0,0 +1,30 @@
+- type: cargoProduct
+  id: ShuttleThruster
+  icon:
+    sprite: Structures/Shuttles/thruster.rsi
+    state: base
+  product: CrateThruster
+  cost: 1500
+  category: Shuttle
+  group: market
+
+- type: cargoProduct
+  id: ShuttleGyroscope
+  icon:
+    sprite: Structures/Shuttles/gyroscope.rsi
+    state: base
+  product: CrateGyroscope
+  cost: 4000
+  category: Shuttle
+  group: market
+
+# - type: cargoProduct
+  # id: ShuttlePowerKit
+  # icon:
+    # sprite: Structures/Machines/computers.rsi
+    # state: avionics-systems
+  # product: CrateEngineeringShuttle
+  # cost: 3000
+  # category: Shuttle
+  # group: market
+#  locked: true   # only the QM has permission to order by default

Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml

@@ -22,3 +22,23 @@
       - state: syringe
   - type: VendPrice
     price: 200 # Single Implant Box (5 are 1000)
+
+- type: entity
+  name: Wet floor sign box
+  parent: BoxCardboard
+  id: BoxWetFloorSign
+  description: A box of wet floor signs. Happy janitor noises.
+  components:
+  - type: StorageFill
+    contents:
+      - id: WetFloorSign
+        amount: 6
+  - type: Storage
+    capacity: 90
+    whitelist:
+      tags:
+        - WetFloorSign
+  - type: Sprite
+    layers:
+      - state: box
+#      - state: wet_floor_sign

Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml

@@ -0,0 +1,8 @@
+- type: entity
+  id: CrateSpaceCleaner
+  parent: CrateGenericSteel
+  components:
+    - type: StorageFill
+      contents:
+        - id: JugSpaceCleaner
+          amount: 5

Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml

@@ -0,0 +1,15 @@
+- type: entity
+  id: CrateGyroscope
+  parent: CrateEngineering
+  components:
+  - type: StorageFill
+    contents:
+      - id: GyroscopeUnanchored
+
+- type: entity
+  id: CrateThruster
+  parent: CrateEngineering
+  components:
+  - type: StorageFill
+    contents:
+      - id: ThrusterUnanchored

Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml

@@ -0,0 +1,20 @@
+- type: entity
+  id: CrateServiceJanitorialSupplies2
+  parent: CratePlastic
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxTrashbag
+        amount: 2
+      - id: SprayBottleSpaceCleaner
+        amount: 2
+      - id: BoxWetFloorSign
+
+- type: entity
+  id: CrateVehicleJanicart
+  parent: CrateLivestock
+  components:
+  - type: StorageFill
+    contents:
+      - id: VehicleJanicart
+      - id: VehicleKeyJanicart

Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml

@@ -18,5 +18,4 @@
     MaterialReclaimerMachineCircuitboard: 4
     UniformPrinterMachineCircuitboard: 4
     HydroponicsTrayMachineCircuitboard: 16
-    DawInstrumentMachineCircuitboard: 4
-    TelecomServerCircuitboard: 6
+    TelecomServerCircuitboard: 6

Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml

@@ -0,0 +1,14 @@
+- type: entity
+  parent: Jug
+  name: jug (Space Cleaner)
+  id: JugSpaceCleaner
+  noSpawn: true
+  components:
+    - type: Label
+      currentLabel: Space Cleaner
+    - type: SolutionContainerManager
+      solutions:
+        beaker:
+          reagents:
+            - ReagentId: SpaceCleaner
+              Quantity: 200