From: Cass <45694413+CubixThree@users.noreply.github.com>
Date: Sun, 20 Apr 2025 07:00:33 +0000 (-0500)
Subject: Plurality pin addition (now not on master branch) (#36744)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=39bf2469add465a4cd97f0b2b20002abb7c79532;p=space-station-14.git

Plurality pin addition (now not on master branch) (#36744)
---

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
index 80c1408c53..509104ecf5 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
@@ -12,6 +12,7 @@
     ClothingNeckLesbianPin: 3
     ClothingNeckNonBinaryPin: 3
     ClothingNeckPansexualPin: 3
+    ClothingNeckPluralPin: 3
     ClothingNeckOmnisexualPin: 3
     ClothingNeckGenderqueerPin: 3
     ClothingNeckTransPin: 3
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
index 563a94779b..bd54707fe1 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
@@ -133,6 +133,17 @@
   - type: Clothing
     equippedPrefix: pan
 
+- type: entity
+  parent: ClothingNeckPinBase
+  id: ClothingNeckPluralPin
+  name: plural pin
+  description: Be plural, do crimes.
+  components:
+  - type: Sprite
+    state: plural
+  - type: Clothing
+    equippedPrefix: plural
+
 - type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckOmnisexualPin
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 289fee8596..f701933f70 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -152,6 +152,7 @@
         - id: ClothingNeckLesbianPin
         - id: ClothingNeckNonBinaryPin
         - id: ClothingNeckPansexualPin
+        - id: ClothingNeckPluralPin
         - id: ClothingNeckOmnisexualPin
         - id: ClothingNeckGenderqueerPin
         - id: ClothingNeckTransPin
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index 68eea05131..99dbedd456 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -166,6 +166,12 @@
     back:
     - ClothingNeckPansexualPin
 
+- type: loadout
+  id: ClothingNeckPluralPin
+  storage:
+    back:
+    - ClothingNeckPluralPin
+
 - type: loadout
   id: ClothingNeckOmnisexualPin
   storage:
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index a93d727b43..e9473a459a 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -29,6 +29,7 @@
   - ClothingNeckLesbianPin
   - ClothingNeckNonBinaryPin
   - ClothingNeckPansexualPin
+  - ClothingNeckPluralPin
   - ClothingNeckOmnisexualPin
   - ClothingNeckGenderqueerPin
   - ClothingNeckTransPin
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
index a25719fabe..c1ec904c05 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",
+  "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",
   "size": {
     "x": 32,
     "y": 32
@@ -98,6 +98,13 @@
             "name": "pan-equipped-NECK",
             "directions": 4
         },
+        {
+            "name": "plural"
+        },
+        {
+            "name": "plural-equipped-NECK",
+            "directions": 4
+        },
         {
             "name": "trans"
         },
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/plural-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/plural-equipped-NECK.png
new file mode 100644
index 0000000000..ab2669f73b
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/plural-equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/plural.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/plural.png
new file mode 100644
index 0000000000..983875a5b2
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/plural.png differ