Aroace pride pin, scarf, and cloak (#35718)

cloak, pin, and scarf added yayyyy

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
index c31ba95565c95a50413a8c4254c3418a331ba6cd..80c1408c53dce4e5af4dda54a2098528a4e842bd 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
@@ -5,6 +5,7 @@
     ClothingNeckAllyPin: 3
     ClothingNeckAromanticPin: 3
     ClothingNeckAsexualPin: 3
+    ClothingNeckAroacePin: 3
     ClothingNeckBisexualPin: 3
     ClothingNeckGayPin: 3
     ClothingNeckIntersexPin: 3
@@ -21,6 +22,7 @@
     PlushieSharkGrey: 2
     ClothingNeckScarfStripedAce: 2
     ClothingNeckScarfStripedAro: 2
+    ClothingNeckScarfStripedAroace: 2
     ClothingNeckScarfStripedBiSexual: 2
     ClothingNeckScarfStripedGay: 2
     ClothingNeckScarfStripedInter: 2

diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
index 02a8ec62b135b6ac58cfd435389563ec11f486d7..facafd045815d566c7dffb79f3d42509621a658b 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
@@ -226,6 +226,15 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/aro.rsi
 
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakAroace
+  name: aeropilot's cloak # thank you happyman442 this was the best name idea ever
+  description: Cloak awarded to Nanotrasen's finest pilots on planets with inhabitable atmospheres.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Cloaks/aroace.rsi
+
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakBi

diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
index ea781fb3f30df529fa65743f3375e2749deeafe0..563a94779b5d4cfbe0061169bec2bc4f52af44a9 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml
@@ -45,6 +45,17 @@
   - type: Clothing
     equippedPrefix: aro
 
+- type: entity
+  parent: ClothingNeckPinBase
+  id: ClothingNeckAroacePin
+  name: aroace pin
+  description: Be aroace do crime.
+  components:
+  - type: Sprite
+    state: aroace
+  - type: Clothing
+    equippedPrefix: aroace
+
 - type: entity
   parent: ClothingNeckPinBase
   id: ClothingNeckAsexualPin

diff --git a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
index 659bce996498753fb138a9c4a26a136ab7c3aa18..22f92c4f2165f791d0acffae6040b45b3846b5fb 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml
@@ -153,6 +153,17 @@
   - type: Clothing
     sprite: Clothing/Neck/Scarfs/PrideScarfs/aro.rsi
 
+- type: entity
+  parent: ClothingScarfBase
+  id: ClothingNeckScarfStripedAroace
+  name: striped aroace scarf
+  description: A stylish striped aroace scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi
+
 - type: entity
   parent: ClothingScarfBase
   id: ClothingNeckScarfStripedBiSexual

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 78f7aed89d621fcb297c0b33c12bc02e86228670..289fee8596155748e2e2ddca0444572d541242e2 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -104,6 +104,7 @@
         - id: ClothingNeckCloakGoliathCloak
         - id: ClothingNeckCloakAce
         - id: ClothingNeckCloakAro
+        - id: ClothingNeckCloakAroace
         - id: ClothingNeckCloakBi
         - id: ClothingNeckCloakIntersex
         - id: ClothingNeckCloakLesbian
@@ -144,6 +145,7 @@
         - id: ClothingNeckAllyPin
         - id: ClothingNeckAromanticPin
         - id: ClothingNeckAsexualPin
+        - id: ClothingNeckAroacePin
         - id: ClothingNeckBisexualPin
         - id: ClothingNeckGayPin
         - id: ClothingNeckIntersexPin

diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index 51a96c06d34025fa4f1dc729cfdefd192149b945..68eea05131e6a22b1008b58ede9b9e56cc762b93 100644 (file)
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -124,6 +124,12 @@
     back:
     - ClothingNeckAsexualPin
 
+- type: loadout
+  id: ClothingNeckAroacePin
+  storage:
+    back:
+    - ClothingNeckAroacePin
+
 - type: loadout
   id: ClothingNeckBisexualPin
   storage:

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index fc73ffb9b928b22ffaa52e09e34a9dea8ec76bef..bcdd592007e1ca240d0a62d8fce41f0c553f7d33 100644 (file)
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -22,6 +22,7 @@
   - ClothingNeckAllyPin
   - ClothingNeckAromanticPin
   - ClothingNeckAsexualPin
+  - ClothingNeckAroacePin
   - ClothingNeckBisexualPin
   - ClothingNeckGayPin
   - ClothingNeckIntersexPin

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

diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/icon.png
new file mode 100644 (file)
index 0000000..9128954
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..1d96f75
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..21fb10e
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/meta.json
new file mode 100644 (file)
index 0000000..f7c8c42
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Cloaks/aroace.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Base made by superfreak9111 on discord for Space Station 14, recoloured by momochitters",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+       {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

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

diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aroace.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aroace.png
new file mode 100644 (file)
index 0000000..a241f4c
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aroace.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 a9e20917af29ca31cb25fd64558aa455e83a262a..a25719fabeaecd4a47a119f95d34baa893915ba1 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",
+  "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",
   "size": {
     "x": 32,
     "y": 32
@@ -21,6 +21,13 @@
             "name": "aro-equipped-NECK",
             "directions": 4
         },
+        {
+            "name": "aroace"
+        },
+        {
+            "name": "aroace-equipped-NECK",
+            "directions": 4
+        },
         {
             "name": "asex"
         },

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/equipped-NECK.png
new file mode 100644 (file)
index 0000000..b361d17
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/equipped-NECK.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/icon.png
new file mode 100644 (file)
index 0000000..40da622
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..d21cedc
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..d4c4a39
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/meta.json
new file mode 100644 (file)
index 0000000..b226dc0
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aroace.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da | In hand sprites sprited by PuroSlavKing (Github) for Space Station 14, recoloured by momochitters",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}