From 6c41d967e5ca4f08573c73f03f8975580fd9f7eb Mon Sep 17 00:00:00 2001 From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Mon, 13 Jan 2025 13:49:02 -0500 Subject: [PATCH] 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> --- .../en-US/advertisements/vending/pride.ftl | 7 ++++ .../VendingMachines/Inventories/pride.yml | 34 ++++++++++++++++++ .../VendingMachines/advertisements.yml | 6 ++++ .../Catalog/VendingMachines/goodbyes.yml | 6 ++++ .../Structures/Machines/vending_machines.yml | 33 +++++++++++++++++ .../VendingMachines/pride.rsi/broken.png | Bin 0 -> 1719 bytes .../VendingMachines/pride.rsi/meta.json | 31 ++++++++++++++++ .../pride.rsi/normal-unshaded.png | Bin 0 -> 912 bytes .../VendingMachines/pride.rsi/off.png | Bin 0 -> 1439 bytes .../VendingMachines/pride.rsi/panel.png | Bin 0 -> 190 bytes 10 files changed, 117 insertions(+) create mode 100644 Resources/Locale/en-US/advertisements/vending/pride.ftl create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/panel.png 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 0000000000000000000000000000000000000000..b506b41a54344ba1c30369b66a59a258b09a797b GIT binary patch literal 1719 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0032751ff4ffedd3d0ecc00eaf4e0ab459929e9f GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJR!TD@E@bvU_NvA($#wnr(!Xc+! zxY-SW0LU@E^H5*bg578Khv|+_lg$sW*?jCvdBeJOdWZj3DYB`nt4B%rOPnz=`)6-p h#&6~hvQUMA!DX(Lkd@zrT|fshc)I$ztaD0e0svz&KxzO0 literal 0 HcmV?d00001 -- 2.51.2