From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Mon, 13 Jan 2025 18:49:02 +0000 (-0500) Subject: Porting Pride-O-Mat to Upstream (#34412) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=6c41d967e5ca4f08573c73f03f8975580fd9f7eb;p=space-station-14.git Porting Pride-O-Mat to Upstream (#34412) * Pride-O-Mat (#1322) * Added Pride-O-Mat * Yep * Updated license to the correct one * Added more lines, reconfigured settings a bit, also added cloaks to inventory, set coder socks to emag inventory * Removed bunny ears, fixed typo * Made requested changes Webedit lmao --------- Co-authored-by: Dorragon <101672978+Dorragon@users.noreply.github.com> --- diff --git a/Resources/Locale/en-US/advertisements/vending/pride.ftl b/Resources/Locale/en-US/advertisements/vending/pride.ftl new file mode 100644 index 0000000000..042291ba8e --- /dev/null +++ b/Resources/Locale/en-US/advertisements/vending/pride.ftl @@ -0,0 +1,7 @@ +advertisement-pride-1 = Be gay do crime! +advertisement-pride-2 = Full of colors! +advertisement-pride-3 = You are valid! +advertisement-pride-4 = The first pride was a riot! +thankyou-pride-1 = Slay! +thankyou-pride-2 = Knock 'em dead! +thankyou-pride-3 = What a glow up! diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml new file mode 100644 index 0000000000..e93c27c041 --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml @@ -0,0 +1,34 @@ +- type: vendingMachineInventory + id: PrideDrobeInventory + startingInventory: + ClothingNeckLGBTPin: 3 + ClothingNeckAromanticPin: 3 + ClothingNeckAsexualPin: 3 + ClothingNeckBisexualPin: 3 + ClothingNeckGayPin: 3 + ClothingNeckIntersexPin: 3 + ClothingNeckLesbianPin: 3 + ClothingNeckNonBinaryPin: 3 + ClothingNeckPansexualPin: 3 + ClothingNeckTransPin: 3 + ClothingNeckAutismPin: 3 + ClothingNeckGoldAutismPin: 3 + PlushieSharkBlue: 2 + PlushieSharkPink: 2 + PlushieSharkGrey: 2 + ClothingNeckCloakAce: 2 + ClothingNeckCloakAro: 2 + ClothingNeckCloakBi: 2 + ClothingNeckCloakEnby: 2 + ClothingNeckCloakGay: 2 + ClothingNeckCloakIntersex: 2 + ClothingNeckCloakLesbian: 2 + ClothingNeckCloakPan: 2 + ClothingNeckCloakTrans: 2 + ClothingHeadHatXmasCrown: 2 + BedsheetRainbow: 2 + ClothingNeckHeadphones: 2 + ClothingHeadHatFlowerWreath: 2 + ClothingUniformColorRainbow: 2 + ClothingUnderSocksCoder: 2 + ClothingUnderSocksBee: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml index 6dc004dd1b..6967c97f5a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml @@ -279,3 +279,9 @@ values: prefix: advertisement-medibot- count: 17 + +- type: localizedDataset + id: PrideDrobeAds + values: + prefix: advertisement-pride- + count: 4 diff --git a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml index 47da3b3dc6..61ccc2b044 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml @@ -111,3 +111,9 @@ values: prefix: thankyou-syndiedrobe- count: 5 + +- type: localizedDataset + id: PrideDrobeGoodbyes + values: + prefix: thankyou-pride- + count: 3 diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index f66c58f199..92a88c6d06 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -2100,6 +2100,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 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/broken.png new file mode 100644 index 0000000000..b506b41a54 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/meta.json new file mode 100644 index 0000000000..cef421923b --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "The art belongs to Woods#1999 on discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 1.5, + 0.1, + 1.5, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png new file mode 100644 index 0000000000..4bea61c2ab Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/off.png new file mode 100644 index 0000000000..4e1dc9af28 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/panel.png new file mode 100644 index 0000000000..0032751ff4 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/panel.png differ