From 2d2516b58ccba79274b512b0bcb52393b9012c31 Mon Sep 17 00:00:00 2001 From: Deahaka <96499407+Deahaka@users.noreply.github.com> Date: Sun, 31 Jul 2022 05:58:57 +0300 Subject: [PATCH] Donut-Vend add (#9703) * donut-vend * after_review * emogarbagechoice * after_2_review * added_emagged * miss Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com> --- .../en-US/advertisements/vending/donut.ftl | 3 ++ .../VendingMachines/Advertisements/donut.yml | 6 ++++ .../VendingMachines/Inventories/donut.yml | 11 ++++++ .../Objects/Consumable/Food/Baked/donut.yml | 13 +++++++ .../Structures/Machines/vending_machines.yml | 34 ++++++++++++++++++ .../VendingMachines/donut.rsi/broken.png | Bin 0 -> 494 bytes .../VendingMachines/donut.rsi/meta.json | 34 ++++++++++++++++++ .../donut.rsi/normal-unshaded.png | Bin 0 -> 1478 bytes .../VendingMachines/donut.rsi/off.png | Bin 0 -> 378 bytes .../VendingMachines/donut.rsi/panel.png | Bin 0 -> 264 bytes 10 files changed, 101 insertions(+) create mode 100644 Resources/Locale/en-US/advertisements/vending/donut.ftl create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/donut.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/donut.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/donut.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/donut.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/donut.rsi/panel.png diff --git a/Resources/Locale/en-US/advertisements/vending/donut.ftl b/Resources/Locale/en-US/advertisements/vending/donut.ftl new file mode 100644 index 0000000000..32a3443e07 --- /dev/null +++ b/Resources/Locale/en-US/advertisements/vending/donut.ftl @@ -0,0 +1,3 @@ +advertisement-donut-1 = Each of us is a little cop! +advertisement-donut-2 = Hope you're hunger! +advertisement-donut-3 = Over 1 million donuts sold! diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml new file mode 100644 index 0000000000..1bc44793e4 --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml @@ -0,0 +1,6 @@ +- type: advertisementsPack + id: DonutAds + advertisements: + - advertisement-donut-1 + - advertisement-donut-2 + - advertisement-donut-3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml new file mode 100644 index 0000000000..a640f68a28 --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml @@ -0,0 +1,11 @@ +- type: vendingMachineInventory + id: DonutInventory + name: Donut + spriteName: donut + startingInventory: + FoodDonutChocolate: 5 + FoodDonutApple: 3 + FoodDonutPink: 3 + FoodDonutBungo: 3 + emaggedInventory: + FoodDonutPoison: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml index 885d5f8393..c34cb3ccfe 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml @@ -405,3 +405,16 @@ - ReagentId: Vitamin Quantity: 1 # Tastes like jelly-donut, fizzy tutti frutti. + +# Poison donut +- type: entity + parent: FoodDonutPink + id: FoodDonutPoison + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Amatoxin + Quantity: 10 diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 9983064159..bf74f7dd7e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -919,6 +919,40 @@ energy: 1.6 color: "#9dc5c9" +- type: entity + parent: VendingMachine + id: VendingMachineDonut + name: Monkin' Donuts + description: A donut vendor provided by Robust Industries, LLC. + components: + - type: VendingMachine + pack: DonutInventory + dispenseOnHitChance: 0.25 + dispenseOnHitThreshold: 2 + - type: Advertise + pack: DonutAds + - type: Speech + - type: Sprite + sprite: Structures/Machines/VendingMachines/donut.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Unlit"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Appearance + visuals: + - type: VendingMachineVisualizer + normalUnshaded: true + broken: true + - type: WiresVisualizer + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#d4ab33" + # job clothing - type: entity diff --git a/Resources/Textures/Structures/Machines/VendingMachines/donut.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/donut.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..3fd8e619226eac2294caafe587f96a6c01bc00b3 GIT binary patch literal 494 zcmVtL!bC_Lv=FfcGDCns}K2~$Tht>Yt8e(+?KGU>B`a&e^C8 zmjrgDX!qAy#kxbgLp8;*v3&?cJW4IVT=9&BVn)R_xyu0gV1`9z$sM8i~mr3cwvJ9gQ}31b4mnW_RdDR*S0-<$H7 zhojbJrC#%>;aBCr7eAg`f~)Ms8|;3_qO+Yl=UN>3?B}g*wN994qg#>nFI@AJs0QJk zAdAR&NC##r%_ick=MNbYF;9z-Z{UocV_J-N;cdZSmDB+dp3FQIjv*b|4 z&0-Kp{*jlb`{_j1^3->Jlv9TNtFe~gQ)?~e9$>`m?|F${$8htvBr*&czY#O9c$J~V zlJ9u=I%H@%9E0d{VI9gfe!>9a$D%Fd=$$#6fswr(Wf_u=a+By7KT@bW?)6EP&Cm}l z$7$pu`z36~K6Gw<-MZbK9QB}T)Q)zbi=zfIXixxA<_oq3f%`1lx^9F7BW?>Igb)Gb z6oYZjitxDa2{M!ls|SZXks)l&`ex)V*4b3exE;ryY~pr`gZflYJ) z)7a`rqQiu%z&?hS^OEU5$14fBMJ*;ut(gOQ;(Y%>_B7TG`T}_#54o_0yK>?f(1uIxDW=PLcDXklk%fM^qG|T51wFBqXk2tS8#9*Cv&` z+!mKdB2a~3<_ciqp$ieaymLabBZw+5jH`s3PF3sNfQ@Vmf>`O3n-UFrj^GWx9P7KZ z$^PI*U$7`I_iX2miEIMKD%g3mG*G_6`1;K;&r{$KAz^r zq@9LLnzlSWryOZ74iM7cj%VC(m{+3%FOOBvygJ3YJJuHQ90L4GATJ!rv&ADc^DpUr B!qNZ$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/donut.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/donut.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..3c0472ec3a4cb8be91ac5616cceb49193eb465a1 GIT binary patch literal 378 zcmV-=0fqjFP)tL!bC_LpB`Z@$P?eRH6BQIKTTj&h0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL zOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DJ4Izw4_)!KP^p(i!&v&s2C_{$i6spy;u1~cF)I#&U~%3UYYQ3Yns zNFSUkR-p@=K@xy^4k54$q+~T*puBVSZXnn-qa2r(a#)DLRFtPd0bBqMpaP+A01-e1 Y07u4{YW@rb6951J07*qoM6N<$f+Zw|L*sHmvy+M>u{JagH6 zxtYesA7?zg0F-4c3GxeOaCmkj4amu_3W+FjNi9w;$}A|!%+F(BsF)KRR!~&>{Y!Ac z$FEPcymhtCojD)8A=Kca@qarp%blm8h+~t%`r-S4sht=9B(aSYLz zn4BQNYQpODg6Yr;CMC8ErY0cuB8r9c)}byv0fzwAFb0On(->_!94EH`H8FU)`njxg HN@xNA9g18! literal 0 HcmV?d00001