diff --git a/Resources/Maps/Corvax/corvax_avrite.yml b/Resources/Maps/Corvax/corvax_avrite.yml index 59124e10692..50acaaba255 100644 --- a/Resources/Maps/Corvax/corvax_avrite.yml +++ b/Resources/Maps/Corvax/corvax_avrite.yml @@ -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 @@ -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 @@ -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 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml index 5b99555c3be..e1c40c5a33e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index 02a8ec62b13..0d20e430c2d 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -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 @@ -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 diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml index 155bb9a82f3..727f1037d09 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -12,145 +12,145 @@ - type: Clothing sprite: Clothing/Neck/Misc/pins.rsi -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckLGBTPin - name: LGBT pin - description: Be gay do crime. - components: - - type: Sprite - state: lgbt - - type: Clothing - equippedPrefix: lgbt +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckLGBTPin +# name: LGBT pin +# description: Be gay do crime. +# components: +# - type: Sprite +# state: lgbt +# - type: Clothing +# equippedPrefix: lgbt -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckAromanticPin - name: aromantic pin - description: Be aro do crime. - components: - - type: Sprite - state: aro - - type: Clothing - equippedPrefix: aro +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckAromanticPin +# name: aromantic pin +# description: Be aro do crime. +# components: +# - type: Sprite +# state: aro +# - type: Clothing +# equippedPrefix: aro -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckAsexualPin - name: asexual pin - description: Be ace do crime. - components: - - type: Sprite - state: asex - - type: Clothing - equippedPrefix: asex +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckAsexualPin +# name: asexual pin +# description: Be ace do crime. +# components: +# - type: Sprite +# state: asex +# - type: Clothing +# equippedPrefix: asex -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckBisexualPin - name: bisexual pin - description: Be bi do crime. - components: - - type: Sprite - state: bi - - type: Clothing - equippedPrefix: bi +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckBisexualPin +# name: bisexual pin +# description: Be bi do crime. +# components: +# - type: Sprite +# state: bi +# - type: Clothing +# equippedPrefix: bi -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckGayPin - name: gay pin - description: Be gay~ do crime. - components: - - type: Sprite - state: gay - - type: Clothing - equippedPrefix: gay +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckGayPin +# name: gay pin +# description: Be gay~ do crime. +# components: +# - type: Sprite +# state: gay +# - type: Clothing +# equippedPrefix: gay -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckIntersexPin - name: intersex pin - description: Be intersex do crime. - components: - - type: Sprite - state: inter - - type: Clothing - equippedPrefix: inter +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckIntersexPin +# name: intersex pin +# description: Be intersex do crime. +# components: +# - type: Sprite +# state: inter +# - type: Clothing +# equippedPrefix: inter -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckLesbianPin - name: lesbian pin - description: Be lesbian do crime. - components: - - type: Sprite - state: les - - type: Clothing - equippedPrefix: les +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckLesbianPin +# name: lesbian pin +# description: Be lesbian do crime. +# components: +# - type: Sprite +# state: les +# - type: Clothing +# equippedPrefix: les -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckNonBinaryPin - name: non-binary pin - description: "01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101" - components: - - type: Sprite - state: non - - type: Clothing - equippedPrefix: non +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckNonBinaryPin +# name: non-binary pin +# description: "01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101" +# components: +# - type: Sprite +# state: non +# - type: Clothing +# equippedPrefix: non -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckPansexualPin - name: pansexual pin - description: Be pan do crime. - components: - - type: Sprite - state: pan - - type: Clothing - equippedPrefix: pan +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckPansexualPin +# name: pansexual pin +# description: Be pan do crime. +# components: +# - type: Sprite +# state: pan +# - type: Clothing +# equippedPrefix: pan -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckOmnisexualPin - name: omnisexual pin - description: Be omni do crime. - components: - - type: Sprite - state: omni - - type: Clothing - equippedPrefix: omni +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckOmnisexualPin +# name: omnisexual pin +# description: Be omni do crime. +# components: +# - type: Sprite +# state: omni +# - type: Clothing +# equippedPrefix: omni -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckTransPin - name: transgender pin - description: Be trans do crime. - components: - - type: Sprite - state: trans - - type: Clothing - equippedPrefix: trans +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckTransPin +# name: transgender pin +# description: Be trans do crime. +# components: +# - type: Sprite +# state: trans +# - type: Clothing +# equippedPrefix: trans -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckAutismPin - name: autism pin - description: Be autism do crime. - components: - - type: Sprite - state: autism - - type: Clothing - equippedPrefix: autism +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckAutismPin +# name: autism pin +# description: Be autism do crime. +# components: +# - type: Sprite +# state: autism +# - type: Clothing +# equippedPrefix: autism -- type: entity - parent: ClothingNeckPinBase - id: ClothingNeckGoldAutismPin - name: golden autism pin - description: Be autism do warcrime. - components: - - type: Sprite - state: goldautism - - type: Clothing - equippedPrefix: goldautism +#- type: entity +# parent: ClothingNeckPinBase +# id: ClothingNeckGoldAutismPin +# name: golden autism pin +# description: Be autism do warcrime. +# components: +# - type: Sprite +# state: goldautism +# - type: Clothing +# equippedPrefix: goldautism diff --git a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml index 82ebfa2b94c..62b599786d9 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml @@ -131,112 +131,111 @@ 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 +#- 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 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index ef6b08b08c6..3deb7c85378 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -97,19 +97,19 @@ # Cloaks - !type:GroupSelector children: - - id: ClothingNeckCloakTrans + #- id: ClothingNeckCloakTrans - id: ClothingNeckCloakAdmin - id: ClothingNeckCloakMoth - id: ClothingNeckCloakVoid - id: ClothingNeckCloakGoliathCloak - - id: ClothingNeckCloakAce - - id: ClothingNeckCloakAro - - id: ClothingNeckCloakBi - - id: ClothingNeckCloakIntersex - - id: ClothingNeckCloakLesbian - - id: ClothingNeckCloakGay - - id: ClothingNeckCloakEnby - - id: ClothingNeckCloakPan + #- id: ClothingNeckCloakAce + #- id: ClothingNeckCloakAro + #- id: ClothingNeckCloakBi + #- id: ClothingNeckCloakIntersex + #- id: ClothingNeckCloakLesbian + #- id: ClothingNeckCloakGay + #- id: ClothingNeckCloakEnby + #- id: ClothingNeckCloakPan - id: ToySkeleton - id: Basketball - id: Football @@ -140,19 +140,19 @@ # Pins - !type:GroupSelector children: - - id: ClothingNeckLGBTPin - - id: ClothingNeckAromanticPin - - id: ClothingNeckAsexualPin - - id: ClothingNeckBisexualPin - - id: ClothingNeckGayPin - - id: ClothingNeckIntersexPin - - id: ClothingNeckLesbianPin - - id: ClothingNeckNonBinaryPin - - id: ClothingNeckPansexualPin - - id: ClothingNeckOmnisexualPin - - id: ClothingNeckTransPin - - id: ClothingNeckAutismPin - - id: ClothingNeckGoldAutismPin + #- id: ClothingNeckLGBTPin + #- id: ClothingNeckAromanticPin + #- id: ClothingNeckAsexualPin + #- id: ClothingNeckBisexualPin + #- id: ClothingNeckGayPin + #- id: ClothingNeckIntersexPin + #- id: ClothingNeckLesbianPin + #- id: ClothingNeckNonBinaryPin + #- id: ClothingNeckPansexualPin + #- id: ClothingNeckOmnisexualPin + #- id: ClothingNeckTransPin + #- id: ClothingNeckAutismPin + #- id: ClothingNeckGoldAutismPin # Corvax-Pins-Start - id: ClothingNeckUSSPPin - id: ClothingNeckDonkPin diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml index 3b3b8e6c482..3b8dc7d07f0 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml @@ -45,8 +45,8 @@ weight: 40 - id: VendingMachineWinter weight: 40 - - id: VendingMachinePride - weight: 10 + #- id: VendingMachinePride # backmen: remove pride + # weight: 10 - id: VendingMachineTheater weight: 10 diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index e9ddd3b517d..9552f88a294 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -194,8 +194,8 @@ orGroup: GiftPool - id: ViolaInstrument orGroup: GiftPool - - id: ClothingNeckCloakTrans - orGroup: GiftPool + #- id: ClothingNeckCloakTrans + # orGroup: GiftPool - id: ClothingNeckCloakAdmin orGroup: GiftPool - id: ToySkeleton diff --git a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml index 6df1a39dc8c..d862ffd6bd9 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml @@ -34,17 +34,17 @@ - type: Item sprite: Objects/Misc/Handy_Flags/syndie_handy_flag.rsi -- type: entity - parent: BaseItem - id: LGBTQHandyFlag - name: LGBTQ handheld flag - description: "The be gay do crime handy flag." - components: - - type: Sprite - sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi - state: icon - - type: Item - sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi +#- type: entity # backmen: no pride +# parent: BaseItem +# id: LGBTQHandyFlag +# name: LGBTQ handheld flag +# description: "The be gay do crime handy flag." +# components: +# - type: Sprite +# sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi +# state: icon +# - type: Item +# sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi - type: entity parent: BaseItem diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml index bec38c0ab9e..56739b8fc56 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml @@ -55,9 +55,9 @@ price: 30 - type: StorageFill contents: - - id: ClothingNeckLGBTPin - prob: 0.06 - orGroup: dressermainloot + #- id: ClothingNeckLGBTPin + # prob: 0.06 + # orGroup: dressermainloot # Corvax-Pins-Start - id: ClothingNeckAtharaPin prob: 0.06 diff --git a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml index 7fdd80bd2b1..a54d3c81537 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml @@ -27,8 +27,8 @@ holidays: festive: - FestiveSeason - pride: - - PrideMonth +# pride: # backmen: no pride +# - PrideMonth - type: GenericVisualizer visuals: enum.HolidayVisuals.Holiday: @@ -147,8 +147,8 @@ holidays: festive: - FestiveSeason - pride: - - PrideMonth +# pride: # backmen: no pride +# - PrideMonth - type: GenericVisualizer visuals: enum.HolidayVisuals.Holiday: diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index ac0a7127b3e..5bf4fee00bd 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -2120,36 +2120,36 @@ # 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"] +#- type: entity # backmen: remove pride +# 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 diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml index 992f7a71e6f..9e89293e654 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml @@ -35,16 +35,16 @@ components: - type: Sprite state: syndie_flag - -- type: entity - parent: BaseFlag - id: LGBTQFlag - name: LGBTQ flag - description: "\"Be gay do crime\" flag." - components: - - type: Sprite - state: lgbtq_flag - + +#- type: entity # backmen: no pride +# parent: BaseFlag +# id: LGBTQFlag +# name: LGBTQ flag +# description: "\"Be gay do crime\" flag." +# components: +# - type: Sprite +# state: lgbtq_flag + - type: entity parent: BaseFlag id: PirateFlag @@ -52,4 +52,4 @@ description: Raise the jolly roger, scallywags! components: - type: Sprite - state: pirate_flag \ No newline at end of file + state: pirate_flag diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 9265cb71b56..affa82cc11e 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -100,83 +100,83 @@ - CigarGold # Pins -- type: loadout - id: ClothingNeckLGBTPin - storage: - back: - - ClothingNeckLGBTPin - -- type: loadout - id: ClothingNeckAromanticPin - storage: - back: - - ClothingNeckAromanticPin - -- type: loadout - id: ClothingNeckAsexualPin - storage: - back: - - ClothingNeckAsexualPin - -- type: loadout - id: ClothingNeckBisexualPin - storage: - back: - - ClothingNeckBisexualPin - -- type: loadout - id: ClothingNeckGayPin - storage: - back: - - ClothingNeckGayPin - -- type: loadout - id: ClothingNeckIntersexPin - storage: - back: - - ClothingNeckIntersexPin - -- type: loadout - id: ClothingNeckLesbianPin - storage: - back: - - ClothingNeckLesbianPin - -- type: loadout - id: ClothingNeckNonBinaryPin - storage: - back: - - ClothingNeckNonBinaryPin - -- type: loadout - id: ClothingNeckPansexualPin - storage: - back: - - ClothingNeckPansexualPin - -- type: loadout - id: ClothingNeckOmnisexualPin - storage: - back: - - ClothingNeckOmnisexualPin - -- type: loadout - id: ClothingNeckTransPin - storage: - back: - - ClothingNeckTransPin - -- type: loadout - id: ClothingNeckAutismPin - storage: - back: - - ClothingNeckAutismPin - -- type: loadout - id: ClothingNeckGoldAutismPin - storage: - back: - - ClothingNeckGoldAutismPin +#- type: loadout +# id: ClothingNeckLGBTPin +# storage: +# back: +# - ClothingNeckLGBTPin + +#- type: loadout +# id: ClothingNeckAromanticPin +# storage: +# back: +# - ClothingNeckAromanticPin + +#- type: loadout +# id: ClothingNeckAsexualPin +# storage: +# back: +# - ClothingNeckAsexualPin + +#- type: loadout +# id: ClothingNeckBisexualPin +# storage: +# back: +# - ClothingNeckBisexualPin + +#- type: loadout +# id: ClothingNeckGayPin +# storage: +# back: +# - ClothingNeckGayPin + +#- type: loadout +# id: ClothingNeckIntersexPin +# storage: +# back: +# - ClothingNeckIntersexPin + +#- type: loadout +# id: ClothingNeckLesbianPin +# storage: +# back: +# - ClothingNeckLesbianPin + +#- type: loadout +# id: ClothingNeckNonBinaryPin +# storage: +# back: +# - ClothingNeckNonBinaryPin + +#- type: loadout +# id: ClothingNeckPansexualPin +# storage: +# back: +# - ClothingNeckPansexualPin + +#- type: loadout +# id: ClothingNeckOmnisexualPin +# storage: +# back: +# - ClothingNeckOmnisexualPin + +#- type: loadout +# id: ClothingNeckTransPin +# storage: +# back: +# - ClothingNeckTransPin + +#- type: loadout +# id: ClothingNeckAutismPin +# storage: +# back: +# - ClothingNeckAutismPin + +#- type: loadout +# id: ClothingNeckGoldAutismPin +# storage: +# back: +# - ClothingNeckGoldAutismPin # backmen: loadouts-start - type: loadout #Backmen diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index c87d2214bb6..9b7b49594bd 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -19,19 +19,21 @@ - CigPackBlack - CigarCase - CigarGold - - ClothingNeckLGBTPin - - ClothingNeckAromanticPin - - ClothingNeckAsexualPin - - ClothingNeckBisexualPin - - ClothingNeckGayPin - - ClothingNeckIntersexPin - - ClothingNeckLesbianPin - - ClothingNeckNonBinaryPin - - ClothingNeckPansexualPin - - ClothingNeckOmnisexualPin - - ClothingNeckTransPin - - ClothingNeckAutismPin - - ClothingNeckGoldAutismPin +# start-backmen: no pride +# - ClothingNeckLGBTPin +# - ClothingNeckAromanticPin +# - ClothingNeckAsexualPin +# - ClothingNeckBisexualPin +# - ClothingNeckGayPin +# - ClothingNeckIntersexPin +# - ClothingNeckLesbianPin +# - ClothingNeckNonBinaryPin +# - ClothingNeckPansexualPin +# - ClothingNeckOmnisexualPin +# - ClothingNeckTransPin +# - ClothingNeckAutismPin +# - ClothingNeckGoldAutismPin +# end-backmen: no pride # backmen-pins-start - ClothingNeckDonkPin - ClothingNeckDeForestPin diff --git a/Resources/Prototypes/holidays.yml b/Resources/Prototypes/holidays.yml index fae9c13adbd..1d42bab9e87 100644 --- a/Resources/Prototypes/holidays.yml +++ b/Resources/Prototypes/holidays.yml @@ -265,11 +265,11 @@ !type:DayOfYear dayOfYear: 256 -- type: holiday - id: BisexualPrideDay - name: holiday-name-bisexual-pride-day - beginDay: 23 - beginMonth: September +#- type: holiday # backmen: no pride +# id: BisexualPrideDay +# name: holiday-name-bisexual-pride-day +# beginDay: 23 +# beginMonth: September - type: holiday id: StupidQuestionsDay @@ -289,11 +289,11 @@ beginDay: 7 beginMonth: October -- type: holiday - id: LesbianDay - name: holiday-name-lesbian-day - beginDay: 8 - beginMonth: October +#- type: holiday # backmen: no pride +# id: LesbianDay +# name: holiday-name-lesbian-day +# beginDay: 8 +# beginMonth: October - type: holiday id: NationalComingOutDay @@ -438,9 +438,9 @@ shouldCelebrate: !type:FridayThirteenth { } -- type: holiday - id: PrideMonth - name: holiday-name-pride-month - beginDay: 1 - endDay: 31 - beginMonth: June +#- type: holiday # backmen: no pride +# id: PrideMonth +# name: holiday-name-pride-month +# beginDay: 1 +# endDay: 31 +# beginMonth: June diff --git a/Resources/migration.yml b/Resources/migration.yml index bc8c9e11a1e..4802001f1af 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -731,3 +731,40 @@ FoodCondimentPacketFrostoil: FoodCondimentPacketColdsauce #WeaponSubMachineGunVectorRubber: null MagazineBoxCaselessRifleBig: MagazineBoxCaselessRifle MagazineBoxAntiMaterielBig: MagazineBoxAntiMateriel + +#2025-02-06 backmen: no pride +LGBTQFlag: null +LGBTQHandyFlag: null +ClothingNeckLGBTPin: null +ClothingNeckAromanticPin: null +ClothingNeckAsexualPin: null +ClothingNeckBisexualPin: null +ClothingNeckGayPin: null +ClothingNeckIntersexPin: null +ClothingNeckLesbianPin: null +ClothingNeckNonBinaryPin: null +ClothingNeckPansexualPin: null +ClothingNeckOmnisexualPin: null +ClothingNeckTransPin: null +ClothingNeckAutismPin: null +ClothingNeckGoldAutismPin: null +ClothingNeckScarfStripedAce: null +ClothingNeckScarfStripedAro: null +ClothingNeckScarfStripedBiSexual: null +ClothingNeckScarfStripedGay: null +ClothingNeckScarfStripedInter: null +ClothingNeckScarfStripedLesbian: null +ClothingNeckScarfStripedPan: null +ClothingNeckScarfStripedNonBinary: null +ClothingNeckScarfStripedRainbow: null +ClothingNeckScarfStripedTrans: null +ClothingNeckCloakAce: null +ClothingNeckCloakAro: null +ClothingNeckCloakBi: null +ClothingNeckCloakIntersex: null +ClothingNeckCloakLesbian: null +ClothingNeckCloakTrans: null +ClothingNeckCloakGay: null +ClothingNeckCloakEnby: null +ClothingNeckCloakPan: null +VendingMachinePride: null