From 3c093d7d64469d7486aee947d8b09cbdf8622a3e Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 21 Dec 2023 20:21:39 +0200 Subject: [PATCH] More Cargo Catalog Changes (#678) * Janitor + Surgery * Crates * More Crates * JaniCart * Update service-crates.ftl * Update service-crates.ftl * Update service-crates.ftl * Update cargo_shuttle.yml --- .../prototypes/catalog/cargo/cargo-fun.ftl | 3 ++ .../catalog/cargo/cargo-service.ftl | 5 +++ .../catalog/fills/crates/engines-crates.ftl | 5 +++ .../catalog/fills/crates/service-crates.ftl | 8 ++++ .../Catalog/Cargo/cargo_shuttle.yml | 36 ++++++++--------- .../Catalog/Fills/Crates/medical.yml | 3 ++ .../Catalog/Fills/Crates/service.yml | 6 ++- .../Circuitboards/Machine/production.yml | 3 -- .../_NF/Catalog/Cargo/cargo_food.yml | 9 +++++ .../_NF/Catalog/Cargo/cargo_fun.yml | 9 +++++ .../_NF/Catalog/Cargo/cargo_medical.yml | 14 ++++++- .../_NF/Catalog/Cargo/cargo_service.yml | 39 +++++++++++++++++++ .../_NF/Catalog/Cargo/cargo_shuttle.yml | 30 ++++++++++++++ .../_NF/Catalog/Fills/Boxes/general.yml | 20 ++++++++++ .../_NF/Catalog/Fills/Crates/chemistry.yml | 8 ++++ .../_NF/Catalog/Fills/Crates/engines.yml | 15 +++++++ .../_NF/Catalog/Fills/Crates/service.yml | 20 ++++++++++ .../Inventories/circuitvend.yml | 3 +- .../Objects/Specific/chemical-containers.yml | 14 +++++++ 19 files changed, 223 insertions(+), 27 deletions(-) create mode 100644 Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-service.ftl create mode 100644 Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/engines-crates.ftl create mode 100644 Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/service-crates.ftl create mode 100644 Resources/Prototypes/_NF/Catalog/Cargo/cargo_food.yml create mode 100644 Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml create mode 100644 Resources/Prototypes/_NF/Catalog/Cargo/cargo_shuttle.yml create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-fun.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-fun.ftl index 329ea5453a1..c93f16494c2 100644 --- a/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-fun.ftl +++ b/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 } diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-service.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/cargo/cargo-service.ftl new file mode 100644 index 00000000000..5e27cb780d1 --- /dev/null +++ b/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 } diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/engines-crates.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/engines-crates.ftl new file mode 100644 index 00000000000..f5a1492fa03 --- /dev/null +++ b/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 } diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/service-crates.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/service-crates.ftl new file mode 100644 index 00000000000..588b424a201 --- /dev/null +++ b/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. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml index 58c6f99494f..bcd66538092 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml index a487138afda..dae81c8f7f9 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index cf0540a29b1..b17a35f4d54 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 358e3c6043e..620ba3d32c6 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/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 diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_food.yml new file mode 100644 index 00000000000..6d7044db60b --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_fun.yml index 0b68053f7ec..aeb1b44a58f 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_fun.yml +++ b/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 diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml index 83c226c0b77..313c891bf44 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml +++ b/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 diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml new file mode 100644 index 00000000000..bf84e89780d --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_shuttle.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_shuttle.yml new file mode 100644 index 00000000000..874f44491e0 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml index 3de71493fa0..bd51c9b2e6c 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml +++ b/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 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml new file mode 100644 index 00000000000..5081dd5c5f3 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml new file mode 100644 index 00000000000..4772b318530 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml new file mode 100644 index 00000000000..1c0511c94a4 --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml index d92e1391771..ffb6661b9e9 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml @@ -18,5 +18,4 @@ MaterialReclaimerMachineCircuitboard: 4 UniformPrinterMachineCircuitboard: 4 HydroponicsTrayMachineCircuitboard: 16 - DawInstrumentMachineCircuitboard: 4 - TelecomServerCircuitboard: 6 \ No newline at end of file + TelecomServerCircuitboard: 6 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml new file mode 100644 index 00000000000..d3440a0f32b --- /dev/null +++ b/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