Expedite gender reassignment (#36894)

diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
index 1724186bc273b9d6b3e046f5da0fa2de1248fab5..cab86da726abb1b7a283fc3f0b736232a92464a8 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
@@ -14,6 +14,25 @@
 
 - type: entity
   parent: ClothingNeckPinBase
+  id: ClothingGenderPinBase
+  abstract: true
+  components:
+  - type: ChameleonClothing
+    slot: Neck
+#    default: ClothingNeckLGBTPin
+    requireTag: GenderPin
+  - type: UserInterface
+    interfaces:
+      enum.ChameleonUiKey.Key:
+        type: ChameleonBoundUserInterface
+  - type: Tag
+    tags:
+    - ClothMade #idk man its on the parent
+    - WhitelistChameleon
+    - GenderPin
+
+- type: entity
+  parent: ClothingGenderPinBase
   id: ClothingNeckLGBTPin
   name: LGBT pin
   description: Be gay do crime.
@@ -22,9 +41,11 @@
     state: lgbt
   - type: Clothing
     equippedPrefix: lgbt
+  - type: ChameleonClothing
+    default: ClothingNeckLGBTPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckAllyPin
   name: straight ally pin
   description: Be ally do crime.
@@ -33,9 +54,11 @@
     state: ally
   - type: Clothing
     equippedPrefix: ally
+  - type: ChameleonClothing
+    default: ClothingNeckAllyPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckAromanticPin
   name: aromantic pin
   description: Be aro do crime.
@@ -44,9 +67,11 @@
     state: aro
   - type: Clothing
     equippedPrefix: aro
+  - type: ChameleonClothing
+    default: ClothingNeckAromanticPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckAroacePin
   name: aroace pin
   description: Be aroace do crime.
@@ -55,9 +80,11 @@
     state: aroace
   - type: Clothing
     equippedPrefix: aroace
+  - type: ChameleonClothing
+    default: ClothingNeckAroacePin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckAsexualPin
   name: asexual pin
   description: Be ace do crime.
@@ -66,9 +93,11 @@
     state: asex
   - type: Clothing
     equippedPrefix: asex
+  - type: ChameleonClothing
+    default: ClothingNeckAsexualPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckBisexualPin
   name: bisexual pin
   description: Be bi do crime.
@@ -77,9 +106,11 @@
     state: bi
   - type: Clothing
     equippedPrefix: bi
+  - type: ChameleonClothing
+    default: ClothingNeckBisexualPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckGayPin
   name: gay pin
   description: Be gay~ do crime.
@@ -88,9 +119,11 @@
     state: gay
   - type: Clothing
     equippedPrefix: gay
+  - type: ChameleonClothing
+    default: ClothingNeckGayPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckIntersexPin
   name: intersex pin
   description: Be intersex do crime.
@@ -99,9 +132,11 @@
     state: inter
   - type: Clothing
     equippedPrefix: inter
+  - type: ChameleonClothing
+    default: ClothingNeckIntersexPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckLesbianPin
   name: lesbian pin
   description: Be lesbian do crime.
@@ -110,9 +145,11 @@
     state: les
   - type: Clothing
     equippedPrefix: les
+  - type: ChameleonClothing
+    default: ClothingNeckLesbianPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckNonBinaryPin
   name: non-binary pin
   description: "01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101"
@@ -121,9 +158,11 @@
     state: non
   - type: Clothing
     equippedPrefix: non
+  - type: ChameleonClothing
+    default: ClothingNeckNonBinaryPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckPansexualPin
   name: pansexual pin
   description: Be pan do crime.
@@ -132,9 +171,11 @@
     state: pan
   - type: Clothing
     equippedPrefix: pan
+  - type: ChameleonClothing
+    default: ClothingNeckPansexualPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckPluralPin
   name: plural pin
   description: Be plural, do crimes.
@@ -143,9 +184,11 @@
     state: plural
   - type: Clothing
     equippedPrefix: plural
+  - type: ChameleonClothing
+    default: ClothingNeckPluralPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckOmnisexualPin
   name: omnisexual pin
   description: Be omni do crime.
@@ -154,9 +197,11 @@
     state: omni
   - type: Clothing
     equippedPrefix: omni
+  - type: ChameleonClothing
+    default: ClothingNeckOmnisexualPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckGenderqueerPin
   name: genderqueer pin
   description: be crime, do gender
@@ -165,9 +210,11 @@
     state: gender
   - type: Clothing
     equippedPrefix: gender
+  - type: ChameleonClothing
+    default: ClothingNeckGenderqueerPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckGenderfluidPin
   name: genderfluid pin
   description: be gender, be fluid
@@ -176,9 +223,11 @@
     state: fluid
   - type: Clothing
     equippedPrefix: fluid
+  - type: ChameleonClothing
+    default: ClothingNeckGenderfluidPin
 
 - type: entity
-  parent: ClothingNeckPinBase
+  parent: ClothingGenderPinBase
   id: ClothingNeckTransPin
   name: transgender pin
   description: Be trans do crime.
@@ -187,6 +236,8 @@
     state: trans
   - type: Clothing
     equippedPrefix: trans
+  - type: ChameleonClothing
+    default: ClothingNeckTransPin
 
 - type: entity
   parent: ClothingNeckPinBase

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 4193ca52d1e862b84ab9e5961826d8b60ffcf21f..174374beb8eca711cd00de6c4c7eec350a1465b6 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -633,6 +633,9 @@
 - type: Tag
   id: GhostOnlyWarp
 
+- type: Tag
+  id: GenderPin
+
 - type: Tag
   id: GlassAirlock