Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Remove] No more pride #1027

Merged
merged 8 commits into from
Feb 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 0 additions & 75 deletions Resources/Maps/Corvax/corvax_avrite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67369,22 +67369,6 @@ entities:
- type: ContainedSolution
containerName: food
container: 21467
- uid: 53898
components:
- type: MetaData
- type: Transform
parent: 53897
- type: Solution
solution:
maxVol: 10
name: food
reagents:
- data: []
ReagentId: Fiber
Quantity: 10
- type: ContainedSolution
containerName: food
container: 53897
- uid: 53899
components:
- type: MetaData
Expand Down Expand Up @@ -188622,21 +188606,6 @@ entities:
- type: Transform
pos: -34.079777,78.5483
parent: 2
- proto: ClothingNeckCloakPan
entities:
- uid: 53897
components:
- type: Transform
pos: 128.49423,-63.46637
parent: 2
- type: SolutionContainerManager
solutions: null
containers:
- food
- type: ContainerContainer
containers:
solution@food: !type:ContainerSlot
ent: 53898
- proto: ClothingNeckCloakPirateCap
entities:
- uid: 67410
Expand Down Expand Up @@ -305491,50 +305460,6 @@ entities:
- type: Transform
pos: -54.614853,43.736557
parent: 2
- proto: LGBTQFlag
entities:
- uid: 30188
components:
- type: Transform
pos: 65.5,-11.5
parent: 2
- uid: 30189
components:
- type: Transform
pos: 68.5,-11.5
parent: 2
- uid: 30190
components:
- type: Transform
pos: 65.5,-17.5
parent: 2
- uid: 30191
components:
- type: Transform
pos: 68.5,-17.5
parent: 2
- proto: LGBTQHandyFlag
entities:
- uid: 30184
components:
- type: Transform
pos: 64.33289,-12.427074
parent: 2
- uid: 30185
components:
- type: Transform
pos: 64.44227,-12.458324
parent: 2
- uid: 30186
components:
- type: Transform
pos: 64.50477,-12.520824
parent: 2
- uid: 30187
components:
- type: Transform
pos: 64.66102,-12.567699
parent: 2
- proto: LightBulb
entities:
- uid: 19256
Expand Down
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
- type: vendingMachineInventory
id: PrideDrobeInventory
startingInventory:
ClothingNeckLGBTPin: 3
ClothingNeckAromanticPin: 3
ClothingNeckAsexualPin: 3
ClothingNeckBisexualPin: 3
ClothingNeckGayPin: 3
ClothingNeckIntersexPin: 3
ClothingNeckLesbianPin: 3
ClothingNeckNonBinaryPin: 3
ClothingNeckPansexualPin: 3
ClothingNeckOmnisexualPin: 3
ClothingNeckTransPin: 3
ClothingNeckAutismPin: 3
ClothingNeckGoldAutismPin: 3
PlushieSharkBlue: 2
PlushieSharkPink: 2
PlushieSharkGrey: 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
ClothingHeadHatFlowerWreath: 2
ClothingUniformColorRainbow: 2
ClothingUnderSocksCoder: 2
ClothingUnderSocksBee: 2
#- type: vendingMachineInventory
# id: PrideDrobeInventory
# startingInventory:
# ClothingNeckLGBTPin: 3
# ClothingNeckAromanticPin: 3
# ClothingNeckAsexualPin: 3
# ClothingNeckBisexualPin: 3
# ClothingNeckGayPin: 3
# ClothingNeckIntersexPin: 3
# ClothingNeckLesbianPin: 3
# ClothingNeckNonBinaryPin: 3
# ClothingNeckPansexualPin: 3
# ClothingNeckOmnisexualPin: 3
# ClothingNeckTransPin: 3
# ClothingNeckAutismPin: 3
# ClothingNeckGoldAutismPin: 3
# PlushieSharkBlue: 2
# PlushieSharkPink: 2
# PlushieSharkGrey: 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
# ClothingHeadHatFlowerWreath: 2
# ClothingUniformColorRainbow: 2
# ClothingUnderSocksCoder: 2
# ClothingUnderSocksBee: 2
144 changes: 72 additions & 72 deletions Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,14 @@
- type: Sprite
sprite: Clothing/Neck/Cloaks/miner.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakTrans
name: vampire cloak
description: Worn by high ranking vampires of the transylvanian society of vampires.
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/trans.rsi
#- type: entity
# parent: ClothingNeckBase
# id: ClothingNeckCloakTrans
# name: vampire cloak
# description: Worn by high ranking vampires of the transylvanian society of vampires.
# components:
# - type: Sprite
# sprite: Clothing/Neck/Cloaks/trans.rsi

- type: entity
parent: ClothingNeckBase
Expand Down Expand Up @@ -208,75 +208,75 @@
- type: TypingIndicatorClothing
proto: alien

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakAce
name: pilot's cloak
description: Cloak awarded to Nanotrasen's finest space aces.
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/ace.rsi
#- type: entity
# parent: ClothingNeckBase
# id: ClothingNeckCloakAce
# name: pilot's cloak
# description: Cloak awarded to Nanotrasen's finest space aces.
# components:
# - type: Sprite
# sprite: Clothing/Neck/Cloaks/ace.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakAro
name: werewolf cloak
description: This cloak lets others know you're a lone wolf.
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/aro.rsi
#- type: entity
# parent: ClothingNeckBase
# id: ClothingNeckCloakAro
# name: werewolf cloak
# description: This cloak lets others know you're a lone wolf.
# components:
# - type: Sprite
# sprite: Clothing/Neck/Cloaks/aro.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakBi
name: poison cloak
description: The purple color is a clear indicator you are poisonous.
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/bi.rsi
#- type: entity
# parent: ClothingNeckBase
# id: ClothingNeckCloakBi
# name: poison cloak
# description: The purple color is a clear indicator you are poisonous.
# components:
# - type: Sprite
# sprite: Clothing/Neck/Cloaks/bi.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakIntersex
name: cyclops cloak
description: The circle on this cloak represents a cyclops' eye.
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/intersex.rsi
#- type: entity
# parent: ClothingNeckBase
# id: ClothingNeckCloakIntersex
# name: cyclops cloak
# description: The circle on this cloak represents a cyclops' eye.
# components:
# - type: Sprite
# sprite: Clothing/Neck/Cloaks/intersex.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakLesbian
name: poet cloak
description: This cloak belonged to an ancient poet, you forgot which one.
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/les.rsi
#- type: entity
# parent: ClothingNeckBase
# id: ClothingNeckCloakLesbian
# name: poet cloak
# description: This cloak belonged to an ancient poet, you forgot which one.
# components:
# - type: Sprite
# sprite: Clothing/Neck/Cloaks/les.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakGay
name: multi-level marketing cloak
description: This cloak is highly sought after in the Nanotrasen Marketing Offices.
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/gay.rsi
#- type: entity
# parent: ClothingNeckBase
# id: ClothingNeckCloakGay
# name: multi-level marketing cloak
# description: This cloak is highly sought after in the Nanotrasen Marketing Offices.
# components:
# - type: Sprite
# sprite: Clothing/Neck/Cloaks/gay.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakEnby
name: treasure hunter cloak
description: This cloak belonged to a greedy treasure hunter.
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/enby.rsi
#- type: entity
# parent: ClothingNeckBase
# id: ClothingNeckCloakEnby
# name: treasure hunter cloak
# description: This cloak belonged to a greedy treasure hunter.
# components:
# - type: Sprite
# sprite: Clothing/Neck/Cloaks/enby.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakPan
name: chef's cloak
description: Meant to be worn alongside a frying pan.
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/pan.rsi
#- type: entity
# parent: ClothingNeckBase
# id: ClothingNeckCloakPan
# name: chef's cloak
# description: Meant to be worn alongside a frying pan.
# components:
# - type: Sprite
# sprite: Clothing/Neck/Cloaks/pan.rsi

Loading
Loading