From 782c9f00cb8f1a59cc28efd0e7ada9127b52b19e Mon Sep 17 00:00:00 2001 From: ChilbroBaggins <107660393+ChilbroBaggins@users.noreply.github.com> Date: Fri, 20 Jan 2023 09:56:05 -0600 Subject: [PATCH] Adds Condiment Station for dining areas (#12939) Co-authored-by: Jeff Co-authored-by: Kara --- .../advertisements/vending/condiments.ftl | 6 +++++ .../Advertisements/condiments.yml | 8 ++++++ .../Inventories/condiments.yml | 19 +++++++++++++ .../Structures/Machines/vending_machines.yml | 25 ++++++++++++++++++ .../VendingMachines/condiments.rsi/icon.png | Bin 0 -> 817 bytes .../VendingMachines/condiments.rsi/meta.json | 20 ++++++++++++++ .../condiments.rsi/normal-unshaded.png | Bin 0 -> 817 bytes .../VendingMachines/condiments.rsi/off.png | Bin 0 -> 819 bytes 8 files changed, 78 insertions(+) create mode 100644 Resources/Locale/en-US/advertisements/vending/condiments.ftl create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/condiments.rsi/icon.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/condiments.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/condiments.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/condiments.rsi/off.png diff --git a/Resources/Locale/en-US/advertisements/vending/condiments.ftl b/Resources/Locale/en-US/advertisements/vending/condiments.ftl new file mode 100644 index 0000000000..9e41b35eda --- /dev/null +++ b/Resources/Locale/en-US/advertisements/vending/condiments.ftl @@ -0,0 +1,6 @@ +advertisement-condiment-1 = Tired of dry meat? Squirt some flavor-packed condiments on it! +advertisement-condiment-2 = Child-safe utensils. Forks, spoons, and knives that won't cut a thing. +advertisement-condiment-3 = Corn oil! +advertisement-condiment-4 = Sweeten up your day with Astrotame! Eight out of ten doctors agree, it probably won't cause cancer. +advertisement-condiment-5 = Hot Sauce! Barbecue Sauce! Cold Sauce! Ketchup! Soy Sauce! Horseradish Sauce! We got all the sauce! + diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml new file mode 100644 index 0000000000..9ee06de4a1 --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml @@ -0,0 +1,8 @@ +- type: advertisementsPack + id: CondimentVendAds + advertisements: + - advertisement-condiment-1 + - advertisement-condiment-2 + - advertisement-condiment-3 + - advertisement-condiment-4 + - advertisement-condiment-5 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml new file mode 100644 index 0000000000..c099492b51 --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml @@ -0,0 +1,19 @@ +- type: vendingMachineInventory + id: CondimentInventory + startingInventory: + FoodCondimentPacketAstrotame: 5 + FoodCondimentPacketBbq: 5 + FoodCondimentPacketFrostoil: 5 + FoodCondimentPacketHorseradish: 5 + FoodCondimentPacketHotsauce: 5 + FoodCondimentPacketKetchup: 5 + FoodCondimentPacketPepper: 5 + FoodCondimentPacketSalt: 5 + FoodCondimentPacketSoy: 5 + FoodCondimentPacketSugar: 5 + FoodCondimentPacketCornoil: 5 + ForkPlastic: 10 + SpoonPlastic: 10 + KnifePlastic: 10 + FoodPlatePlastic: 10 + FoodPlateSmallPlastic: 10 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 1c9047ccb9..0d5ed1e999 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -74,6 +74,31 @@ - type: Appearance - type: WiresVisuals +- type: entity + parent: VendingMachine + id: VendingMachineCondiments + name: Condiment Station + description: Slather these thick gooey substances on your food for a full flavor effect. + components: + - type: VendingMachine + pack: CondimentInventory + offState: off + normalState: normal-unshaded + - type: Sprite + sprite: Structures/Machines/VendingMachines/condiments.rsi + drawdepth: SmallObjects + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - type: Advertise + pack: CondimentVendAds + - type: Speech + - type: Transform + noRot: false + - type: entity parent: VendingMachine id: VendingMachineAmmo diff --git a/Resources/Textures/Structures/Machines/VendingMachines/condiments.rsi/icon.png b/Resources/Textures/Structures/Machines/VendingMachines/condiments.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..138832ba7c6962e0272fe096a8cb551e830ac91e GIT binary patch literal 817 zcmV-11J3-3P)~xL$ZTvmj$jBl zrmOznKl3(NopH#{|Hy`%UE>ZGzj09JzlQx2xLKFB_WjrME&}tB^%Ly?dwYAZMP4^= z!u4!ZR|m5vm-&O~+^&sadS=sIxSI4jWd;?qr*QtAQ_>7f8qXO1-H-x{9Xxmt!^0Q? zAj=gL6d1mK{mNi^C-_%ic0fs*geOL|)?(hT5RBaIxlf#ti(57Z{r3dKhXK zl`v#&`U;nuWZ}l};K2h7N8oh8&Ye3Ml7BNZM9%gB8{(3+k>T9#84SLSoM8Uu`tJ-z zt{DvbR&c{Dafa$?yLSxt?<2A+ND)RF7;p!`asepCK6>;B>=QXT zIR;S9z$ONgCsr-dxd4;~K=HL=#R`U7w{9`i)zvZJ5(7DaShYl@0SO6-|I*UZ3{Rgv zWmvg#C4-up8iS#sAp=b8qd6PHckv$#5}TO7Vjuug+x}CEL5q`oG&>T_)q>qall3Ku*dq1JK1_AwY~;P)HH&09xcjk{kfc4RALAvnHGk z%*Sx{vSrJ_?5L~xL$ZTvmj$jBl zrmOznKl3(NopH#{|Hy`%UE>ZGzj09JzlQx2xLKFB_WjrME&}tB^%Ly?dwYAZMP4^= z!u4!ZR|m5vm-&O~+^&sadS=sIxSI4jWd;?qr*QtAQ_>7f8qXO1-H-x{9Xxmt!^0Q? zAj=gL6d1mK{mNi^C-_%ic0fs*geOL|)?(hT5RBaIxlf#ti(57Z{r3dKhXK zl`v#&`U;nuWZ}l};K2h7N8oh8&Ye3Ml7BNZM9%gB8{(3+k>T9#84SLSoM8Uu`tJ-z zt{DvbR&c{Dafa$?yLSxt?<2A+ND)RF7;p!`asepCK6>;B>=QXT zIR;S9z$ONgCsr-dxd4;~K=HL=#R`U7w{9`i)zvZJ5(7DaShYl@0SO6-|I*UZ3{Rgv zWmvg#C4-up8iS#sAp=b8qd6PHckv$#5}TO7Vjuug+x}CEL5q`oG&>T_)q>qall3Ku*dq1JK1_AwY~;P)HH&09xcjk{kfc4RALAvnHGk z%*Sx{vSrJ_?5L~xL$ZTvmj$jBl zrmOznKl3(NopH#{|Hy`%UE>ZGzj09JzlQx2xLKFB_WjrME&}tB^%Ly?dwYAZMP4^= z!u4!ZR|m5vm-&O~+^&sadS=sIxSI4jWd;?qr*QtAQ_>7f8qXO1-H-x{9Xxmt!^0Q? zAj=gL6d1mK{mNi^C-_%ic0fs*geOL|)?(hT5RBaIxlf#ti(57Z{r3dKhXK zl`v#&`U;nuWZ}l};K2h7N8oh8&Ye3Ml7BNZM9%gB8{(3+k>T9#84SLSoM8Uu`tJ-z zt{DvbR&c{Dafa$?yLSxt?<2A+ND)RF7;p!`asepCK6>;B>=QXT zIR;S9z$ONgCsr-dxd4;~K=HL=#R`U7w{9`i)zvZJ5(7DaShYl@0SO6-|I*UZ3{Rgv zWmvg#C4-up8iS#sAp=b8qd6PHckv$#5}TO7Vjuug+x}CEL5q`oG&>T_)q>qall3Ku*dq1JK1_AwY~;P)HH&09xcjk{rOx%L{h{Fl)lu zz`cND|NG-_@(9_c+m<$daH~?1T;NU<|?WIeXNQ(ku9I$=+cCf{so}Scmz<}2U xAg_QNLC{NNC_t|XK}Ha4l#*c&Nm@o7006{kwJ