Skip to content

Commit

Permalink
Porting Pride-O-Mat to Upstream (#34412)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
southbridge-fur and Dorragon authored Jan 13, 2025
1 parent b308589 commit 6c41d96
Show file tree
Hide file tree
Showing 10 changed files with 117 additions and 0 deletions.
7 changes: 7 additions & 0 deletions Resources/Locale/en-US/advertisements/vending/pride.ftl
Original file line number Diff line number Diff line change
@@ -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!
34 changes: 34 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -279,3 +279,9 @@
values:
prefix: advertisement-medibot-
count: 17

- type: localizedDataset
id: PrideDrobeAds
values:
prefix: advertisement-pride-
count: 4
6 changes: 6 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,9 @@
values:
prefix: thankyou-syndiedrobe-
count: 5

- type: localizedDataset
id: PrideDrobeGoodbyes
values:
prefix: thankyou-pride-
count: 3
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
]
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6c41d96

Please sign in to comment.