Dr. Gibb Vendor (#18651)

* g

* g2

* fixe

* fixe2

Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml

@@ -6,7 +6,6 @@
     DrinkRootBeerCan: 2
     DrinkIcedTeaCan: 2
     DrinkLemonLimeCan: 2
-    DrinkDrGibbCan: 2
     DrinkFourteenLokoCan: 2
   emaggedInventory:
     DrinkNukieCan: 2

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

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

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

Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml

@@ -6,7 +6,6 @@
     DrinkRootBeerCan: 3
     DrinkIcedTeaCan: 3
     DrinkLemonLimeCan: 3
-    DrinkDrGibbCan: 3
     DrinkFourteenLokoCan: 3
   emaggedInventory:
     DrinkNukieCan: 3

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

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

Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml

@@ -27,6 +27,7 @@
       - VendingMachineDonut
       - VendingMachineShamblersJuice
       - VendingMachinePwrGame
+      - VendingMachineDrGibb
       - VendingMachineSoda
       - VendingMachineStarkist
       - VendingMachineSpaceUp

Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml

@@ -18,6 +18,7 @@
       - VendingMachineSovietSoda
       - VendingMachineShamblersJuice
       - VendingMachinePwrGame
+      - VendingMachineDrGibb
       - VendingMachineSoda
       - VendingMachineStarkist
       - VendingMachineSpaceUp

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

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

Resources/Textures/Structures/Machines/VendingMachines/gib.rsi/meta.json

@@ -0,0 +1,56 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from TauCetiClassic at https://github.com/TauCetiStation/TauCetiClassic/commit/5a1be762e81c5a85a0982e821ce3dbbf9258302f and modified by Potato1234x (Github) for SS14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "normal-unshaded",
+      "delays": [
+        [
+          2.5,
+          0.1,
+          3.4,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "broken"
+    },
+    {
+      "name": "normal"
+    },
+    {
+      "name": "deny-unshaded",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "eject-unshaded",
+      "delays": [
+        [
+          0.5,
+          0.1,
+          1.0,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off"
+    },
+    {
+      "name": "panel"
+    }
+  ]
+}