From 5a4e93fabd132acbd558520465c207d6a0e0d8e2 Mon Sep 17 00:00:00 2001 From: potato1234_x <79580518+potato1234x@users.noreply.github.com> Date: Mon, 10 Apr 2023 08:00:23 +1000 Subject: [PATCH] [Entity] Sustenance Vendor (#15119) * sustenance vendor * emaggedinventory --- .../Inventories/sustenance.yml | 12 ++++ .../Structures/Machines/vending_machines.yml | 30 ++++++++++ .../VendingMachines/sustenance.rsi/broken.png | Bin 0 -> 470 bytes .../sustenance.rsi/deny-unshaded.png | Bin 0 -> 416 bytes .../sustenance.rsi/eject-unshaded.png | Bin 0 -> 482 bytes .../VendingMachines/sustenance.rsi/meta.json | 52 ++++++++++++++++++ .../sustenance.rsi/normal-unshaded.png | Bin 0 -> 478 bytes .../VendingMachines/sustenance.rsi/off.png | Bin 0 -> 348 bytes .../VendingMachines/sustenance.rsi/panel.png | Bin 0 -> 244 bytes 9 files changed, 94 insertions(+) create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/deny-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/eject-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/panel.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml new file mode 100644 index 0000000000..70ac44102d --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml @@ -0,0 +1,12 @@ +- type: vendingMachineInventory + id: SustenanceInventory + startingInventory: + DrinkMREFlask: 3 + FoodSnackNutribrick: 5 + FoodSnackMREBrownie: 5 + FoodCondimentPacketKetchup: 5 + emaggedInventory: + KitchenKnife: 2 + SpaceMedipen: 3 + ClothingMaskBreath: 3 + EmergencyOxygenTankFilled: 3 diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index d2ae397482..73a127fe20 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -849,6 +849,36 @@ radius: 1.5 energy: 1.6 color: "#c73434" + +- type: entity + parent: VendingMachineSnack + id: VendingMachineSustenance + name: Sustenance Vendor + description: A vending machine which vends food, as required by section 47-C of the NT's Prisoner Ethical Treatment Agreement. + components: + - type: VendingMachine + pack: SustenanceInventory + dispenseOnHitChance: 0.25 + dispenseOnHitThreshold: 2 + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + - type: Sprite + sprite: Structures/Machines/VendingMachines/sustenance.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: "#737785" - type: entity parent: VendingMachineSnack diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..2531bb130c007a0b8347e60bb40e22f1e8720bd2 GIT binary patch literal 470 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijq1AIbUm87MLbBluA1B{iFrcRwIEGpt;V!`0#R2;i(`ixw6Sq-st!w@pbGf$+tp9PC45x zfAgra?Nams#eZrAS2#6RzIeFlHS3Dpeb1EUMs2;o{J>uD=3TA=+f^@*tag5@cg*3C zuO_#xti;CK36k;*>-b`R3rIHDu{xY&RETA(FAY>E5fD^iU`yzhiI9CKA!8{ZBO!O_ zjcHCGmt4cU`~R;rgr4eW3gp#jG+YqQ=dmE0;i+|H;f2~)%)dp~G4XwNcKG%2JcFD} z3STAbg~XM%E}9G3uZy^RTX(9Vja_UO!@|Q|TccO%s{RR6XJ4}7rj(iV1wG9z?=%^B tnlBqUzDPVYvtTE~LY*fEyx;!Tek44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=y`V}|p1*G{FHv|;6ylLqM<-0$7HcUP9n6bEs>nH|5k(Y2!R zw{KAsP=~tzGbQhg=>%Rhsd9=7zIuTHB>`PEXokc(Gz9N6_J%hBZm%9+vO9 zg?p!WC(Qb^?+i%6lu6gWYOw-^my2oo<|t99kd? zU7GH#eWM5_m`Y#wnS8kSUry=3=1|G(2Ydh9x-7W&eNn{1`bpw1tT>Xlh^#am-iyHz8Ti(5UcV)RuaS-R5+3|ZDT`LNI`xZ3?y9Z32 zI@MT738>@G#B^yO#a|NS7yKUuFkHDaVsfyY?g((7eq* z!kd1VKknOp|4+^X-wMYC{}1%d>-R2`WSXv603^6M@8yb$iA1b*_)x^nwJU5v&Woo& z?%y~NH{iF_tF{wT8|xFkRv$dAtFhtN-UmQgm*4x3J1+PR68hpD=5X!6ll*{!jrx%w vB^KS@oO}MsKUTQ#`|s`^?=s8CfY;2$`3B4)lg=Ijh9QHetDnm{r-UW|OSskX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/meta.json new file mode 100644 index 0000000000..182a623278 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/meta.json @@ -0,0 +1,52 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.05, + 3.4 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.8, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..40d6cf5ddccd6be36e991412b0e376df20fb9535 GIT binary patch literal 478 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~;1^9%x`V}|p1*G{FHv|;6ynFZV%5s_FAWo;W3dgiE=hVtKv*VZ7C+=-@ ztxL31atvOvWlu%nZ{MP(*wmwrspUc8n}Ejb`7K)pq{K>s{DS{u0}PCp4m<&>;4JWn zEM{QfI}E~%$MaXD03FEe>Eaj?;r@2oUA{vKJZ`!^t$(eb{*AwCV7F_cNayA5*n&&< zYSPqs6>oI^o~X5g>HL2d@gT3YYv*RKGe2@>ZjWL1?I-18E&Wq3Et#;SrN4J$$^@2( z3)|K@bqkloreFBPQhQ%m%JY-~kFu0!1M3z=KZCpz!V|7-oUmlV){P*gCRWod4w~GI z_{8#g&Go7?#*?O`Zp^lw&gz+$q)bl literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..a243722ebb7f16edac1401aaaeaa7d2a915f684e GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?STm87MLbBluA1Ex-$Dl97EWMW~gq@)*+#;<7vR1#^G`4vcUl?3?( z|AzsFO=on@14TItJR*x382FBWFymBhK53xfMo$;V5DWjalLGk;EATi=d%URn&#iBk z$u0SNrAekghhy%X1)F3OqAxAA^Zx1Z?|i`0q>>%;c(Mv}4ota}nW22=Y}+#Bwv}f& zcimrcl}UW5wxY`hFAp}Al*6yn<_ai9sJqxy+;HxAkjSst6#rE~>A?B(Z2t`ov=~Wu zb=+vpw`sW)d8nc*z}#E)PiyGDEvsVvIpdtT<#QSjIu~(%k=?Oy=e%_<`FMm*pWM(A eWM1>s;$B37*pHmrYg2)aXYh3Ob6Mw<&;$T&wttua literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/sustenance.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..c60f5c3069d9db8312578c551f2e6b8c66eac5e9 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$Y$y9k_Szn|+5}#RmiByRsW{_TBlv z>)Lak%W8j8D}F`%{6Dw4{G(OVE4~%ksmz!2zKZgE+vF|Lz;|HvyjOe-KW$bw%uI~* z({{cxC2PTn#9vkiawiKkpW4sQQ+jp{4^LCe)!^%lnaBQ1rp-;=!z}Kxd^2;yw8Juv iYs6lqI}7QsGcq*RYDdh?PJ0P-F@vY8pUXO@geCwkfL){j literal 0 HcmV?d00001 -- 2.51.2