Added Genderqueer pin! (Properly this time.) (#34561)

* Added Genderqueer pin! (Properly this time.)

* Update meta.json

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
index 5b99555c3be04eea4cbc8a447a284967031563f6..5dcdce41dd5ccd5c82ce0fe4808fca37343ef2d3 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
@@ -11,6 +11,7 @@
     ClothingNeckNonBinaryPin: 3
     ClothingNeckPansexualPin: 3
     ClothingNeckOmnisexualPin: 3
+    ClothingNeckGenderqueerPin: 3
     ClothingNeckTransPin: 3
     ClothingNeckAutismPin: 3
     ClothingNeckGoldAutismPin: 3

diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
index 155bb9a82f3ca3d84e18649bc30be045fd87d780..a402791f5a760729e0befa01b0eae2d6642e9f59 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
@@ -122,6 +122,17 @@
   - type: Clothing
     equippedPrefix: omni
 
+- type: entity
+  parent: ClothingNeckPinBase
+  id: ClothingNeckGenderqueerPin
+  name: genderqueer pin
+  description: be crime, do gender
+  components:
+  - type: Sprite
+    state: gender
+  - type: Clothing
+    equippedPrefix: gender
+
 - type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckTransPin

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 0ff3c2776cbf974054c3f5cdd3cd739217853e5f..a6b2324792b7fd4439f21153c08c14f6bdb827e7 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -150,6 +150,7 @@
         - id: ClothingNeckNonBinaryPin
         - id: ClothingNeckPansexualPin
         - id: ClothingNeckOmnisexualPin
+        - id: ClothingNeckGenderqueerPin
         - id: ClothingNeckTransPin
         - id: ClothingNeckAutismPin
         - id: ClothingNeckGoldAutismPin

diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index 8e998d602fba2378e300b7e26ce12a508f4b5fdd..5abc708afdd2f968bf858d4d4209139062f28d34 100644 (file)
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -160,6 +160,12 @@
     back:
     - ClothingNeckOmnisexualPin
 
+- type: loadout
+  id: ClothingNeckGenderqueerPin
+  storage:
+    back:
+    - ClothingNeckGenderqueerPin
+
 - type: loadout
   id: ClothingNeckTransPin
   storage:

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index b35fcef66f7b352fe6f8c23e679d005d608f05a8..ba76e8a1eeafcd455dc76376800ee09eff80e7d3 100644 (file)
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -28,6 +28,7 @@
   - ClothingNeckNonBinaryPin
   - ClothingNeckPansexualPin
   - ClothingNeckOmnisexualPin
+  - ClothingNeckGenderqueerPin
   - ClothingNeckTransPin
   - ClothingNeckAutismPin
   - ClothingNeckGoldAutismPin

diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gender-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gender-equipped-NECK.png
new file mode 100644 (file)
index 0000000..b617092
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gender-equipped-NECK.png differ

diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gender.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gender.png
new file mode 100644 (file)
index 0000000..10680e5
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gender.png differ

diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
index bb1013b21a06e85a093f03cbbb844f44f45fa25e..78cf15fc4e88872efe645b6dda83ebdf67ad8c41 100644 (file)
--- a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, autism pins by Terraspark, omnisexual pin by juliangiebel",
+  "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, autism pins by Terraspark, omnisexual pin by juliangiebel, genderqueer by centcomofficer24",
   "size": {
     "x": 32,
     "y": 32
@@ -97,6 +97,13 @@
         {
             "name": "omni-equipped-NECK",
             "directions": 4
+        },
+        {
+            "name": "gender"
+        },
+        {
+            "name": "gender-equipped-NECK",
+            "directions": 4
         }
     ]
 }