From f1c9935f4c0fc0686d12051a75be6bacd352a929 Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Fri, 3 Nov 2023 15:56:48 -0400 Subject: [PATCH] Makes a syndicate chemvend so they dont have to hack it on nukie planet. (#21416) Adds a few goodies to the vendor's inventories. --- Resources/Maps/nukieplanet.yml | 2 +- .../VendingMachines/Inventories/chemvend.yml | 32 +++++++++++++ .../Objects/Specific/chemical-containers.yml | 15 ++++++ .../Objects/Specific/chemistry-bottles.yml | 48 +++++++++++++++++++ .../Structures/Machines/vending_machines.yml | 19 +++++++- 5 files changed, 114 insertions(+), 2 deletions(-) diff --git a/Resources/Maps/nukieplanet.yml b/Resources/Maps/nukieplanet.yml index 3ce69a4dc7..0a0dbb3779 100644 --- a/Resources/Maps/nukieplanet.yml +++ b/Resources/Maps/nukieplanet.yml @@ -13523,7 +13523,7 @@ entities: - pos: -10.5,7.5 parent: 104 type: Transform -- proto: VendingMachineChemicals +- proto: VendingMachineChemicalsSyndicate entities: - uid: 1335 components: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml index 1c540feda2..af5c774559 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml @@ -24,3 +24,35 @@ JugSulfur: 2 emaggedInventory: ToxinChemistryBottle: 1 + +- type: vendingMachineInventory + id: ChemVendInventorySyndicate + startingInventory: + Jug: 4 + JugAluminium: 2 + JugCarbon: 2 + JugChlorine: 2 + JugCopper: 2 + JugEthanol: 2 + JugFluorine: 2 + JugHydrogen: 2 + JugIodine: 2 + JugIron: 2 + JugLithium: 2 + JugMercury: 2 + JugNitrogen: 2 + JugOxygen: 2 + JugPhosphorus: 2 + JugPotassium: 2 + JugRadium: 2 + JugSilicon: 2 + JugSodium: 2 + JugSugar: 2 + JugSulfur: 2 + JugWeldingFuel: 1 + emaggedInventory: + PaxChemistryBottle: 3 + MuteToxinChemistryBottle: 3 + LeadChemistryBottle: 2 + ToxinChemistryBottle: 1 + diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml index 51d705f617..ba422313e3 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml @@ -392,3 +392,18 @@ reagents: - ReagentId: PlantBGone Quantity: 200 + +- type: entity + parent: Jug + name: jug (welding fuel) + id: JugWeldingFuel + noSpawn: true + components: + - type: Label + currentLabel: welding fuel + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: WeldingFuel + Quantity: 200 diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml index 59bf0927aa..4c6e03c578 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml @@ -288,6 +288,54 @@ tags: - Bottle +- type: entity + id: PaxChemistryBottle + name: pax bottle + parent: BaseChemistryEmptyBottle + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Pax + Quantity: 30 + - type: Tag + tags: + - Bottle + +- type: entity + id: MuteToxinChemistryBottle + name: mute toxin bottle + parent: BaseChemistryEmptyBottle + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: MuteToxin + Quantity: 30 + - type: Tag + tags: + - Bottle + +- type: entity + id: LeadChemistryBottle + name: lead bottle + parent: BaseChemistryEmptyBottle + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Lead + Quantity: 30 + - type: Tag + tags: + - Bottle + - type: entity id: ToxinChemistryBottle name: toxin bottle diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 839ae47ef5..02443f1e27 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -2003,7 +2003,7 @@ brokenState: broken normalState: normal denyState: deny - ejectDelay: 3 + ejectDelay: 2 - type: Sprite sprite: Structures/Machines/VendingMachines/chemvend.rsi layers: @@ -2018,3 +2018,20 @@ - type: GuideHelp guides: - Chemicals + +- type: entity + parent: VendingMachineChemicals + id: VendingMachineChemicalsSyndicate + name: SyndieJuice + description: Not made with freshly squeezed syndies I hope. + components: + - type: VendingMachine + pack: ChemVendInventorySyndicate + offState: off + brokenState: broken + normalState: normal + denyState: deny + ejectDelay: 2 + - type: AccessReader + access: [["SyndicateAgent"]] + -- 2.51.2