From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Sat, 8 Feb 2025 23:02:00 +0000 (+0100)
Subject: add straight ally pin (#34977)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=50ba607bf54a5222f640ec0bf8025fdc8c5fc4eb;p=space-station-14.git

add straight ally pin (#34977)
---

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
index 5dcdce41dd..28d0ec7b25 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
@@ -2,6 +2,7 @@
   id: PrideDrobeInventory
   startingInventory:
     ClothingNeckLGBTPin: 3
+    ClothingNeckAllyPin: 3
     ClothingNeckAromanticPin: 3
     ClothingNeckAsexualPin: 3
     ClothingNeckBisexualPin: 3
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
index a402791f5a..ea781fb3f3 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
@@ -23,6 +23,17 @@
   - type: Clothing
     equippedPrefix: lgbt
 
+- type: entity
+  parent: ClothingNeckPinBase
+  id: ClothingNeckAllyPin
+  name: straight ally pin
+  description: Be ally do crime.
+  components:
+  - type: Sprite
+    state: ally
+  - type: Clothing
+    equippedPrefix: ally
+
 - type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckAromanticPin
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index a6b2324792..78f7aed89d 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -141,6 +141,7 @@
       - !type:GroupSelector
         children:
         - id: ClothingNeckLGBTPin
+        - id: ClothingNeckAllyPin
         - id: ClothingNeckAromanticPin
         - id: ClothingNeckAsexualPin
         - id: ClothingNeckBisexualPin
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index 5abc708afd..51a96c06d3 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -106,6 +106,12 @@
     back:
     - ClothingNeckLGBTPin
 
+- type: loadout
+  id: ClothingNeckAllyPin
+  storage:
+    back:
+    - ClothingNeckAllyPin
+
 - type: loadout
   id: ClothingNeckAromanticPin
   storage:
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index ba76e8a1ee..433cebee37 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -19,6 +19,7 @@
   - CigarCase
   - CigarGold
   - ClothingNeckLGBTPin
+  - ClothingNeckAllyPin
   - ClothingNeckAromanticPin
   - ClothingNeckAsexualPin
   - ClothingNeckBisexualPin
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/ally-equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/ally-equipped-NECK.png
new file mode 100644
index 0000000000..1dd4f7358a
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/ally-equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/ally.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/ally.png
new file mode 100644
index 0000000000..3ff67be505
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/ally.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 78cf15fc4e..a9e20917af 100644
--- a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json
@@ -1,12 +1,19 @@
 {
   "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",
+  "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",
   "size": {
     "x": 32,
     "y": 32
   },
     "states": [
+        {
+            "name": "ally"
+        },
+        {
+            "name": "ally-equipped-NECK",
+            "directions": 4
+        },
         {
             "name": "aro"
         },