From: T <theo75cg@gmail.com>
Date: Mon, 21 Apr 2025 17:46:33 +0000 (+0100)
Subject: Added a semi-functional genderfluid pin. (#35854)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=cc80f8d7820f4c38bf5ff6a52510cc4a0ef247a8;p=space-station-14.git

Added a semi-functional genderfluid pin. (#35854)

* Added a semi-function GenderfluidPin

* Update pins.yml

fix bug

* Fix meta.json under the newly merged "fix as you go" policy

* Update pin description

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
---

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
index 509104ecf5..92057ab21c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
@@ -15,6 +15,7 @@
     ClothingNeckPluralPin: 3
     ClothingNeckOmnisexualPin: 3
     ClothingNeckGenderqueerPin: 3
+    ClothingNeckGenderfluidPin: 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 bd54707fe1..e579ec38fb 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
@@ -166,6 +166,17 @@
   - type: Clothing
     equippedPrefix: gender
 
+- type: entity
+  parent: ClothingNeckPinBase
+  id: ClothingNeckGenderfluidPin
+  name: genderfluid pin
+  description: be gender, be fluid
+  components:
+  - type: Sprite
+    state: fluid
+  - type: Clothing
+    equippedPrefix: fluid
+
 - 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 f701933f70..4f1315ce1d 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -155,6 +155,7 @@
         - id: ClothingNeckPluralPin
         - id: ClothingNeckOmnisexualPin
         - id: ClothingNeckGenderqueerPin
+        - id: ClothingNeckGenderfluidPin
         - id: ClothingNeckTransPin
         - id: ClothingNeckAutismPin
         - id: ClothingNeckGoldAutismPin
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index 99dbedd456..e1d45e4784 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -184,6 +184,12 @@
     back:
     - ClothingNeckGenderqueerPin
 
+- type: loadout
+  id: ClothingNeckGenderfluidPin
+  storage:
+    back:
+    - ClothingNeckGenderfluidPin
+
 - type: loadout
   id: ClothingNeckTransPin
   storage:
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 987affe13d..04b11056f3 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -32,6 +32,7 @@
   - ClothingNeckPluralPin
   - ClothingNeckOmnisexualPin
   - ClothingNeckGenderqueerPin
+  - ClothingNeckGenderfluidPin
   - ClothingNeckTransPin
   - ClothingNeckAutismPin
   - ClothingNeckGoldAutismPin
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/fluid-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/fluid-equipped-NECK.png
new file mode 100644
index 0000000000..eb84427391
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/fluid-equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/fluid.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/fluid.png
new file mode 100644
index 0000000000..e98ca3395a
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/fluid.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 c1ec904c05..d6c4a337c0 100644
--- 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, genderqueer by centcomofficer24, ally by FairlySadPanda, aroace by momochitters, plural by CubixThree",
+  "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, autism pins by Terraspark, omnisexual pin by juliangiebel, genderqueer and genderfluid by centcomofficer24, ally by FairlySadPanda, aroace by momochitters, plural by CubixThree",
   "size": {
     "x": 32,
     "y": 32
@@ -125,6 +125,13 @@
         {
             "name": "gender-equipped-NECK",
             "directions": 4
+        },
+        {
+            "name": "fluid"
+        },
+        {
+            "name": "fluid-equipped-NECK",
+            "directions": 4
         }
     ]
 }