From e436747b475705fc30dd481af969de718209b7e3 Mon Sep 17 00:00:00 2001 From: MaxSMokeSkaarj Date: Sat, 18 Jan 2025 14:02:38 +1000 Subject: [PATCH] =?utf8?q?Revert=20"=D1=86=D0=B5=D0=BD=D0=B7=D1=83=D1=80?= =?utf8?q?=D0=B0=20#2"?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit a1875ec3a60fbbfa0dad4c5b91a4d85c32b80977. --- .../Objects/Consumable/Drinks/drinks_cups.yml | 9 +++++ .../Structures/Machines/vending_machines.yml | 33 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 43f8c57d0b..9dd386426c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -161,6 +161,15 @@ - type: Sprite sprite: Objects/Consumable/Drinks/mug_one.rsi +- type: entity + parent: DrinkBaseMug + id: DrinkMugRainbow + name: rainbow mug + description: A rainbow mug. The colors are almost as blinding as a welder. + components: + - type: Sprite + sprite: Objects/Consumable/Drinks/mug_rainbow.rsi + - type: entity parent: DrinkBaseMug id: DrinkMugRed diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 8063a07458..41d5edf4d4 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -2116,6 +2116,39 @@ - type: AccessReader access: [["Kitchen"], ["Theatre"]] +# Pride Vending Machine + +- type: entity + parent: VendingMachine + id: VendingMachinePride + name: Pride-O-Mat + description: A vending machine containing pride. + components: + - type: VendingMachine + pack: PrideDrobeInventory + offState: off + brokenState: broken + normalState: normal-unshaded + - type: Advertise + pack: PrideDrobeAds + - type: SpeakOnUIClosed + pack: PrideDrobeGoodbyes + - type: Speech + - type: PointLight + radius: 1.5 + energy: 1.3 # reduced energy since the color is pure white + color: "#FFFFFF" + - type: Sprite + sprite: Structures/Machines/VendingMachines/pride.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + # Gas Tank Dispenser - type: entity -- 2.52.0