Scurrets get emergency EVA suit access (#38778)

* Scurrets - spacing protection via adorable outfits

* ALPHABETIZATION!!

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 59ee0786edd0193258f2600eaf87843a0f54f35e..6904727d2b899c1bbba0e6e135436315bc1785d6 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -579,6 +579,7 @@
     - Hardsuit
     - WhitelistChameleon
     - CorgiWearable
+    - ScurretWearable
   - type: StaticPrice
     price: 5000
 

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
index 574bdc2640aadd3902625cd8ef45f561f812bdcf..d5612210c67f17c4b2358ef319b07aaed39add6c 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -62,6 +62,7 @@
   - type: Tag
     tags:
     - CorgiWearable
+    - ScurretWearable
     - MonkeyWearable
     - WhitelistChameleon
 

diff --git a/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml
index 8433564ea61bcd838e4bdd0d7709a8c90553f7c5..28b95eb3d347b17487759a0d1e179f53a95c8ea0 100644 (file)
--- a/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml
@@ -59,3 +59,13 @@
     dependsOnComponents:
     - type: AllowSuitStorage
     displayName: Suit Storage
+  - name: outerClothing
+    slotTexture: suit
+    slotFlags: OUTERCLOTHING
+    stripTime: 6
+    uiWindowPos: 0,3
+    strippingWindowPos: 1,3
+    displayName: Suit
+    whitelist:
+      tags:
+      - ScurretWearable

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index c10eb514862872d3a0027180a84dfe882cd1d693..cdcd6c8afc3045cd2a13c7d2d788b46e2fa8084c 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -225,7 +225,6 @@
 - type: Tag
   id: CanPilot
 
-
 - type: Tag
   id: CaptainSabre
 
@@ -1203,6 +1202,9 @@
 - type: Tag
   id: Screwdriver
 
+- type: Tag # Flags items that scurrets can wear in their back and outerwear slots.
+  id: ScurretWearable
+
 - type: Tag
   id: SecBeltEquip
 
@@ -1514,5 +1516,4 @@
 
 - type: Tag
   id: XenoborgModuleStealth
-
 # ALPHABETICAL

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-scurret.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-scurret.png
new file mode 100644 (file)
index 0000000..8125ec9
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-scurret.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
index 9e60a70b9ea4e878c212788fd2b2d0cdb5299b59..78875bc2739f8676c30739cd9daa838e4aeed2dd 100644 (file)
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde, vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by casiliuscestus (GitHub)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde, vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by casiliuscestus (GitHub), equipped-OUTERCLOTHING-scurret modified from equipped-OUTERCLOTHING by FairlySadPanda (Github)",
     "size": {
         "x": 32,
         "y": 32
@@ -26,6 +26,10 @@
             "name": "equipped-OUTERCLOTHING-dog",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-scurret",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4

diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-scurret.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-scurret.png
new file mode 100644 (file)
index 0000000..ecf9ff0
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-scurret.png differ

diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
index 63fe1c868fbe1bbf850b0d05f6189e2d604c9133..0762521a017d5d933528bdf616f7dd0db9755d57 100644 (file)
--- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Sprites by Flareguy, cboyjet, & monkey-suit sprite by Kittygyat, modified from space suit sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34. Vox state based off of biosuit, taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub).",
+    "copyright": "Sprites by Flareguy, cboyjet, & monkey-suit sprite by Kittygyat, modified from space suit sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34. Vox state based off of biosuit, taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub). equipped-OUTERCLOTHING-scurret modified from equipped-OUTERCLOTHING by FairlySadPanda (GitHub)",
     "size": {
         "x": 32,
         "y": 32
@@ -26,6 +26,10 @@
             "name": "equipped-OUTERCLOTHING-dog",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-scurret",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4