-
Notifications
You must be signed in to change notification settings - Fork 627
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]>
- Loading branch information
1 parent
b308589
commit 6c41d96
Showing
10 changed files
with
117 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
34
Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+1.68 KB
Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/broken.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions
31
Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
] | ||
] | ||
} | ||
] | ||
} |
Binary file added
BIN
+912 Bytes
...rces/Textures/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.41 KB
Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/off.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+190 Bytes
Resources/Textures/Structures/Machines/VendingMachines/pride.rsi/panel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.