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 80c1408c53dce4e5af4dda54a2098528a4e842bd..509104ecf57236bd4c2e5db0728a0fbc6810f961 100644 (file)
--- 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 563a94779b5d4cfbe0061169bec2bc4f52af44a9..bd54707fe1c20590acfffd6e8f349b7f3bad6ac0 100644 (file)
--- 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 289fee8596155748e2e2ddca0444572d541242e2..f701933f70dd8f96558328f9eda3b79169ee6bce 100644 (file)
--- 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 68eea05131e6a22b1008b58ede9b9e56cc762b93..99dbedd4569c14e7c844eb3b01bbdb0ffb362099 100644 (file)
--- 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 a93d727b436eb6f7b6a14b6c88780068ba202d5e..e9473a459a896d852629f3c3ac4947265a051653 100644 (file)
--- 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 a25719fabeaecd4a47a119f95d34baa893915ba1..c1ec904c05c5cb16b4e976d470bc5ef36bba49be 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, 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 (file)
index 0000000..ab2669f
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 (file)
index 0000000..983875a
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/plural.png differ