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{~eC($*b71ClcT3Ii#Tk|4j}|CoTm-~YKFP@c2EBeIx*f$slFzvGA{**to7)fyb477nhOCm;e92e%>ah zoOl$Ex!?S5`_qwwW1{oVCsTg4DYrOXQc%87@Wtr~&i#>O{rPvkJTF(71k29D zn^#;F@Z#~ku|mpvN{6^2)78@%7d&=o6&~E8lE2dW+OMZ#^VTnX{!y+cTI7A?fy&j1 zj~{2O5HC7a85i^~{bhR4ES7z2(z@m6E*hF8tZTX>=*#Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizyJUazyWI3i3tDz0!~RpK~#8N?V7z# z!!QuXU6u-U>&(+FZ*KtwWzFM!>+7xJd z^L78Azty#VJipXC)S==c*1oys~kr_17ZpB01~5m zvzWjHKOclU287x-|6_>(20IeRL|`g4sH~9ifXopb?*+ObB@L38J-I{s zaui*^7ijAnOA;u6@dUfQ|Iw4So5I3HTi;k*c*OvFKOXn!DN4T^3?chmrk+C5{Ip21 zL3#kXyj^fQQ1rF53FW;v&mBU@$R&V;w*}h5rx(ve2h>04Yy% z-kTKI<@W);q}cF^0io~b2NMHuu%*5a=mIYRnp7h|EPWE7`uzYA0P1QH0idpy>IGoQ f=dnl{ERIsYp(FYp&e+EQ00000NkvXXu0mjfUNJ9z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/gib.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/gib.rsi/eject-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..b4f3174d2d6495270b544ffcf20bba319c3efad2 GIT binary patch literal 946 zcmeAS@N?(olHy`uVBq!ia0vp^2|(slu#0|T?Wr;B4qMcmujh8@C=B5mcmJd?CESq{Eh zx6z9AGN;n3g;QUwoVy@Qj8RZ$?c3a-ZiR>y8eyj%DmH~#2JAfaY@4XaB(269Ybq1f z{MzQ4zkYYS_T9VR2{UHS&bfE@-}}8cZ_egqaTI`{mLks3xhGPLZq7KH79U#fx&5~5 z`o)W0ervv%A>teutKTp8pJ(0uA3JvBy}xX}EBq#Gy>f7$R8f=G%HHi!YahQY z`#t;J{hhnpzZGF0pT=>0zc_J&rjMzhZnG!R)7{7jAzIN!)9C=ZOqPejLgs*&gr zRT=lU^Eq5pWM8=A_BIVQ*R?LIbK-d|Jw+LdpPoOzI{rf2oEtAoF1%i05VmOQR{6Fc z?!lZ1!QXf{teo^WhRH#K>*ohfhi!ZUn-rN0f@g}9ynQtF$D5_TSAU;AH~Z~_qqoCX z78iw8y?%XewqgC1(p&4#%1rpm7I3kGaaEVkq5qaj4957;i`h!m@jc7d)N}eR4-We+ z@+0op!XIUfH$=8-JJ#+M&-yKLlwGU;-{Y@!5_j`Y{bbyBvH_s@*3 zO`Y|jPUPBauVDCQ<*=ObYN^xH#yj6mGl()Al09@!FRMcJjqeJZ3AgJc7sw@5&#sd* zKWy8%YYzW{h7?tvl@8l;1AV%pIE!yC*RTt6J#goa zD>+slu#P{VIe7srr_xVN`A<{dH+Xn44Vd)1AIl}C=< zDA!ycG$tDh1J^_kLLbHZujQ-$X|&;F~3#7OD&J+>C`1DVgT zq4e>#wXb&7-O1a|eceW)*X`inpvbjhYd_Z|JTNe)vJrI*;b3ig}$ojpcqAN!OJNrCmjf_<6?YPAa8O7__+ER$G1k1?vl+s8f7 r7-VYb^{<E{YqfgJ^Qh)PiC|I4gl*Od(u>OcaXu6{1-oD!MC)C6!R`T5r%naxOaHXL2uKN*1o;L3M*|G1YiA|_B{>T`B8wRq_zr_GhpD?tlV%?h+<#DWPdVQ| z{|^sdCLY@^^i9E?^}w+W{V%jLJgPVZI8QozXzrE^=lwP0J?!%?Wqr{^vug5vJ1m_|Kj-w_IV%mygPM9p&Ecjf&V7rrbryG->q0>ahWS4_?IM`HuBn7#> btNt_GEK~Nl^(#Ue=qm zoaDK5Y3mN4rpN#Od<9YhB|(0{|4{+M1Lasrpd4p`M`SSr1K$x4W}K?cCk+%l;pyTS zV&Q*w!fC!10}j{LuG-iC|G#xO?UMa6Evz`H=cMi4fbHHle5$V8Z(u&Bc<4VT-yEB{ z-)uRoUk0-7nD|YswpDOq+@Xi8XEj>{3Ps)pcvv3WxUiz$MkP}tztPeppI6^e_~~-C zeQnEnE*fxL&8Ya-UKPb_p1!qgNBNr4Lhd)pKlW5|+x4GlniKz@{rqoFKTG{-Ie&e6 zCSTw^%h+)0%7J3*Nz50o2n2}*30ur>oztSjTiL5V(@hJb6Mw<&;$U_?VjiW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/gib.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/gib.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..9e3049e07d7a844331a3a4f1d3b659746f2c4727 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7ehi z#WAE}PI96|g2AhXK=vN1ge#1T`6NmYtYCJNg$ezzI&kmaH~S8|iVp_LcV#!^?7Q=S z*R|(7m(~8HR{VZGZQ2I zw4JX^$y#tC@t4(s+{psXr}p#nl%8F~!_)NRYS4Yg%wzv0)8?k`VHWpTzL~jU+F=>T io}ybR&PuxMj11R=v?F4y!$pBEX7F_Nb6Mw<&;$Um9a~)h literal 0 HcmV?d00001