juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pride Scarves (#34448)

Browse Source 
* More scarfs (#216)

* Sprites + Colored Scarf Implimentation

Doesn't include into quickthreads or other clothing vendors

* File Paths are important

* Metas, items exist, winterdrobe

I'm iffy on them being in the winterdrobe but the other option is quickthreads so idk

* File Path Fix

* Typo fix

* Resolved merge conflict

* Moved scarves around

* Moved scarf textures out of the _CD directory

* Removed final CD folder

* Removed extra scarfs

* Removed extra scarfs, again

* Replaced ClothingNeckBase with ClothingScarfBase

---------

Co-authored-by: PursuitInAshes <91865152+PursuitInAshes@users.noreply.github.com>
Co-authored-by: TakoDragon <69509841+BackeTako@users.noreply.github.com>
This commit is contained in:
Southbridge
2025-01-17 06:35:03 -05:00
committed by GitHub
parent 40e049603e
commit 8295bfbf8d
52 changed files with 381 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
View File

@@ -17,15 +17,16 @@
PlushieSharkBlue: 2
PlushieSharkPink: 2
PlushieSharkGrey: 2
ClothingNeckCloakAce: 2
ClothingNeckCloakAro: 2
ClothingNeckCloakBi: 2
ClothingNeckCloakEnby: 2
ClothingNeckCloakGay: 2
ClothingNeckCloakIntersex: 2
ClothingNeckCloakLesbian: 2
ClothingNeckCloakPan: 2
ClothingNeckCloakTrans: 2
ClothingNeckScarfStripedAce: 2
ClothingNeckScarfStripedAro: 2
ClothingNeckScarfStripedBiSexual: 2
ClothingNeckScarfStripedGay: 2
ClothingNeckScarfStripedInter: 2
ClothingNeckScarfStripedLesbian: 2
ClothingNeckScarfStripedPan: 2
ClothingNeckScarfStripedNonBinary: 2
ClothingNeckScarfStripedRainbow: 2
ClothingNeckScarfStripedTrans: 2
ClothingHeadHatXmasCrown: 2
BedsheetRainbow: 2
ClothingNeckHeadphones: 2

111
Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
View File

@@ -129,3 +129,114 @@
sprite: Clothing/Neck/Scarfs/zebra.rsi
- type: Clothing
sprite: Clothing/Neck/Scarfs/zebra.rsi
# Pride Scarves
- type: entity
parent: ClothingScarfBase
id: ClothingNeckScarfStripedAce
name: striped asexual scarf
description: A stylish striped asexual scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
components:
- type: Sprite
sprite: Clothing/Neck/Scarfs/PrideScarfs/ace.rsi
- type: Clothing
sprite: Clothing/Neck/Scarfs/PrideScarfs/ace.rsi
- type: entity
parent: ClothingScarfBase
id: ClothingNeckScarfStripedAro
name: striped aromantic scarf
description: A stylish striped aromantic scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
components:
- type: Sprite
sprite: Clothing/Neck/Scarfs/PrideScarfs/aro.rsi
- type: Clothing
sprite: Clothing/Neck/Scarfs/PrideScarfs/aro.rsi
- type: entity
parent: ClothingScarfBase
id: ClothingNeckScarfStripedBiSexual
name: striped bisexual scarf
description: A stylish striped bisexual scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
components:
- type: Sprite
sprite: Clothing/Neck/Scarfs/PrideScarfs/bi.rsi
- type: Clothing
sprite: Clothing/Neck/Scarfs/PrideScarfs/bi.rsi
- type: entity
parent: ClothingScarfBase
id: ClothingNeckScarfStripedGay
name: striped gay scarf
description: A stylish striped gay scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
components:
- type: Sprite
sprite: Clothing/Neck/Scarfs/PrideScarfs/gay.rsi
- type: Clothing
sprite: Clothing/Neck/Scarfs/PrideScarfs/gay.rsi
- type: entity
parent: ClothingScarfBase
id: ClothingNeckScarfStripedInter
name: striped intersex scarf
description: A stylish striped intersex scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
components:
- type: Sprite
sprite: Clothing/Neck/Scarfs/PrideScarfs/inter.rsi
- type: Clothing
sprite: Clothing/Neck/Scarfs/PrideScarfs/inter.rsi
- type: entity
parent: ClothingScarfBase
id: ClothingNeckScarfStripedLesbian
name: striped lesbian scarf
description: A stylish striped lesbian scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
components:
- type: Sprite
sprite: Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi
- type: Clothing
sprite: Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi
- type: entity
parent: ClothingScarfBase
id: ClothingNeckScarfStripedPan
name: striped pan scarf
description: A stylish striped pan scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
components:
- type: Sprite
sprite: Clothing/Neck/Scarfs/PrideScarfs/pan.rsi
- type: Clothing
sprite: Clothing/Neck/Scarfs/PrideScarfs/pan.rsi
- type: entity
parent: ClothingScarfBase
id: ClothingNeckScarfStripedNonBinary
name: striped non-binary scarf
description: A stylish striped non-binary scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
components:
- type: Sprite
sprite: Clothing/Neck/Scarfs/PrideScarfs/non.rsi
- type: Clothing
sprite: Clothing/Neck/Scarfs/PrideScarfs/non.rsi
- type: entity
parent: ClothingScarfBase
id: ClothingNeckScarfStripedRainbow
name: rainbow scarf
description: A stylish rainbow scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
components:
- type: Sprite
sprite: Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi
- type: Clothing
sprite: Clothing/Neck/Scarfs/PrideScarfs/rainbow.rsi
- type: entity
parent: ClothingScarfBase
id: ClothingNeckScarfStripedTrans
name: striped trans scarf
description: A stylish striped trans scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
components:
- type: Sprite
sprite: Clothing/Neck/Scarfs/PrideScarfs/trans.rsi
- type: Clothing
sprite: Clothing/Neck/Scarfs/PrideScarfs/trans.rsi