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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 SEg2XX7(8A5T-G@yGywo~#;FSc literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4e1dc9af28da3a157cb0fed631875dedc1f2f9f2 GIT binary patch literal 1439 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}oCO|{#S9F5M?jcysy3fA z0|RTIr;B4qMC;z^-W@T=MceiVm%e{{+xYJ1X*t`4ZI5x-PdcNp=D?AAGj#R@3BxlM4QWOOpCQ09bG=`@wzG?neY z{L1gU&(*1N`#aVsH$McngtDuRH9T2g*ogx zo$eT9q#cOZk~lHs!|b+&Clt;JGBJuZ=&$-eAx=lXzv2DC{J3?-mQNSXOVu=}5w+mD zCgj=re@6TT54oh+*7f7TMI1Ael& z9Q5aDN}BWdVgg6>h7jGBJ4=W5JIl9zoIvuO8?PKRGEj=3n5c3g4A( z(}G?#=M>8^Og^n;++*t0b}F?iIkl~(KU0+Hz%1UfnXFFvQx`3GLo*iCo`GzJ%4}S|7_-UxM6_`3s645@jLgRO+L72uVa~p;KPJgxdCFZXz zYW(zW#>15p5|j?yo}c8#d;jc#{oj|Z`Qa2?^4y!@0cVeijneDMk@fwFH3{BwdEqBqGWB1pIWsMc z*kW_7KqN3P`l(}iujo%p%cg-e%1t6t6D`^)@a zW%^9xjprZzKK`Li`AAx`K!8dv?*y3#>$a?${aSymHOqqw(dSEj#s6*a3OjM0`DgV3 zU-?+>^6dQfVs35x@7IEMKYs-K?fIg}aBYtBlQ6xI zJQkDSM;g1?FPwDTcB?ApdSB6_@XvD+_T_R188AO#40IH_Y-)Imcag1?tjm1+uR`kg zf7u34-pwGPFT$B)*La5`rL*XJ*zLX5_p~$OtlmUUEAOBCF!tOQ*;DuH9p-b~2;o?i zw?yx}`P8*l>J|s?+>t3RF3x2t?8>>lO7~>1!>b2n!HGMT#_z1^Wxo7-*LO$ujk-IF zzDhAXKR^Hdto4$n(fZHl3Vm?VxH;|Rqob~A>FGu6-%nl3y`eohbFu@srSh+R9SYJ} zq4$4YzHQC4e|}HegYO%k3Ujosd2=wz+qUM1!RgbdnH$5jM98q!GQRJ z z@BI&ONp17x=H}MX(RssR6aMb=lvke>3R42l$bZwQTeM@U$R(coekVqWZ;2)?vjyLL zU*YcSqwgPN|8-nT|G*| qU*e33**|*&Gk!C7kcBD?3@&q}gsl7~>|$VGVDNPHb6Mw<&;$TuGC*no literal 0 HcmV?d00001