From dda4b73f895cb01e8f73f928aa6ee97c17345553 Mon Sep 17 00:00:00 2001 From: potato1234_x <79580518+potato1234x@users.noreply.github.com> Date: Sat, 5 Aug 2023 12:07:40 +1000 Subject: [PATCH] Dr. Gibb Vendor (#18651) * g * g2 * fixe * fixe2 --- .../VendingMachines/Inventories/cola.yml | 1 - .../VendingMachines/Inventories/gib.yml | 12 ++++ .../VendingMachines/Inventories/pwrgame.yml | 4 +- .../Inventories/shamblersjuice.yml | 4 +- .../VendingMachines/Inventories/soda.yml | 1 - .../VendingMachines/Inventories/spaceup.yml | 2 +- .../VendingMachines/Inventories/starkist.yml | 2 +- .../Markers/Spawners/Random/vending.yml | 1 + .../Markers/Spawners/Random/vendingdrinks.yml | 1 + .../Service/vending_machine_restock.yml | 3 +- .../Structures/Machines/vending_machines.yml | 34 +++++++++++ .../VendingMachines/gib.rsi/broken.png | Bin 0 -> 464 bytes .../VendingMachines/gib.rsi/deny-unshaded.png | Bin 0 -> 697 bytes .../gib.rsi/eject-unshaded.png | Bin 0 -> 946 bytes .../VendingMachines/gib.rsi/meta.json | 56 ++++++++++++++++++ .../gib.rsi/normal-unshaded.png | Bin 0 -> 614 bytes .../VendingMachines/gib.rsi/normal.png | Bin 0 -> 401 bytes .../Machines/VendingMachines/gib.rsi/off.png | Bin 0 -> 395 bytes .../VendingMachines/gib.rsi/panel.png | Bin 0 -> 244 bytes 19 files changed, 114 insertions(+), 7 deletions(-) create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/gib.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/gib.rsi/deny-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/gib.rsi/eject-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/gib.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/gib.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/gib.rsi/normal.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/gib.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/gib.rsi/panel.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml index 3b4484728d..2f9ce3d3ae 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml @@ -6,7 +6,6 @@ DrinkRootBeerCan: 2 DrinkIcedTeaCan: 2 DrinkLemonLimeCan: 2 - DrinkDrGibbCan: 2 DrinkFourteenLokoCan: 2 emaggedInventory: DrinkNukieCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml new file mode 100644 index 0000000000..38ea3a0012 --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml @@ -0,0 +1,12 @@ +- type: vendingMachineInventory + id: DrGibbInventory + startingInventory: + DrinkDrGibbCan: 4 + DrinkGrapeCan: 2 + DrinkRootBeerCan: 2 + DrinkIcedTeaCan: 2 + DrinkLemonLimeCan: 2 + DrinkFourteenLokoCan: 2 + emaggedInventory: + DrinkNukieCan: 2 + DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml index acfe12960b..96513fca8a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml @@ -7,5 +7,7 @@ DrinkRootBeerCan: 2 DrinkIcedTeaCan: 2 DrinkLemonLimeCan: 2 - DrinkDrGibbCan: 2 DrinkFourteenLokoCan: 2 + emaggedInventory: + DrinkNukieCan: 2 + DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml index 665a1d9c32..08c0162c08 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml @@ -6,5 +6,7 @@ DrinkRootBeerCan: 2 DrinkIcedTeaCan: 2 DrinkLemonLimeCan: 2 - DrinkDrGibbCan: 2 DrinkFourteenLokoCan: 2 + emaggedInventory: + DrinkNukieCan: 2 + DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml index b1f2096300..494f05f6a3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml @@ -6,7 +6,6 @@ DrinkRootBeerCan: 3 DrinkIcedTeaCan: 3 DrinkLemonLimeCan: 3 - DrinkDrGibbCan: 3 DrinkFourteenLokoCan: 3 emaggedInventory: DrinkNukieCan: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml index 30586d13b4..0dc33cf07f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml @@ -7,7 +7,7 @@ DrinkRootBeerCan: 2 DrinkIcedTeaCan: 2 DrinkLemonLimeCan: 2 - DrinkDrGibbCan: 2 DrinkFourteenLokoCan: 2 emaggedInventory: + DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml index 53a84d0beb..6afbe1eae6 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml @@ -6,7 +6,7 @@ DrinkRootBeerCan: 2 DrinkIcedTeaCan: 2 DrinkLemonLimeCan: 2 - DrinkDrGibbCan: 2 DrinkFourteenLokoCan: 2 emaggedInventory: + DrinkNukieCan: 2 DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml index d988f7f1db..d55a7916b4 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml @@ -27,6 +27,7 @@ - VendingMachineDonut - VendingMachineShamblersJuice - VendingMachinePwrGame + - VendingMachineDrGibb - VendingMachineSoda - VendingMachineStarkist - VendingMachineSpaceUp diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml index 1b187cf221..a911b7ebfc 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml @@ -18,6 +18,7 @@ - VendingMachineSovietSoda - VendingMachineShamblersJuice - VendingMachinePwrGame + - VendingMachineDrGibb - VendingMachineSoda - VendingMachineStarkist - VendingMachineSpaceUp diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml index e0cc828810..0417c23f8e 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -291,7 +291,7 @@ - type: entity parent: BaseVendingMachineRestock id: VendingMachineRestockRobustSoftdrinks - name: Robust Softdrinks box + name: beverage restock box description: A cold, clunky container of colliding chilly cylinders. Use only as directed by Robust Industries, LLC. components: - type: VendingMachineRestock @@ -303,6 +303,7 @@ - StarkistInventory - SpaceUpInventory - SodaInventory + - DrGibbInventory - type: Sprite layers: - state: base diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 76654a588d..f6f20bfb61 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -579,6 +579,40 @@ energy: 1.6 color: "#6927C5" +- type: entity + parent: VendingMachine + id: VendingMachineDrGibb + name: Dr. Gibb Vendor + description: Canned explosion of different flavors in this very vendor! + components: + - type: VendingMachine + pack: DrGibbInventory + dispenseOnHitChance: 0.25 + dispenseOnHitThreshold: 2 + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + ejectDelay: 1.9 + - type: Advertise + pack: RobustSoftdrinksAds + - type: Speech + - type: Sprite + sprite: Structures/Machines/VendingMachines/gib.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#D82929" + - type: entity parent: VendingMachine id: VendingMachineDinnerware diff --git a/Resources/Textures/Structures/Machines/VendingMachines/gib.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/gib.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..097d807ad3939c33d60ffca3b82e674ef8e20e1a GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikV0(?STn{