]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
ERT Overhaul 1/3: Apparel (#37855)
authorNox <nebulousnox38@gmail.com>
Mon, 15 Dec 2025 03:43:57 +0000 (19:43 -0800)
committerGitHub <noreply@github.com>
Mon, 15 Dec 2025 03:43:57 +0000 (03:43 +0000)
* Initial commit: Added ERT web vest and sprites, added ERT magboots.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Added duffle bag and magboots

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Half finished updating the web vest

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Removed unused items

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Added ERT chest rig, changed sprites of backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Parented all ERT hardsuit stats to nukie hardsuits

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* changed size of ERT backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Unparented ERT duffels from syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Fixed belt sprites

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Fixed ERT medic backpack sprite

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Added explosion resistance to backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Removed ERT duffel bag.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
27 files changed:
Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
Resources/Prototypes/Entities/Clothing/Belt/belts.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/equipped-BACKPACK.png
Resources/Textures/Clothing/Back/Backpacks/ertclown.rsi/equipped-BACKPACK.png
Resources/Textures/Clothing/Back/Backpacks/erteng.rsi/equipped-BACKPACK.png
Resources/Textures/Clothing/Back/Backpacks/ertjanitor.rsi/equipped-BACKPACK.png
Resources/Textures/Clothing/Back/Backpacks/ertleader.rsi/equipped-BACKPACK.png
Resources/Textures/Clothing/Back/Backpacks/ertmed.rsi/equipped-BACKPACK.png
Resources/Textures/Clothing/Back/Backpacks/ertsec.rsi/equipped-BACKPACK.png
Resources/Textures/Clothing/Belt/militarywebbingert.rsi/equipped-BELT.png [new file with mode: 0644]
Resources/Textures/Clothing/Belt/militarywebbingert.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Belt/militarywebbingert.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Belt/militarywebbingert.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Belt/militarywebbingert.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/equipped-FEET-vox.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/equipped-FEET.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/icon-on.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-equipped-FEET-vox.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-equipped-FEET.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-inhand-right.png [new file with mode: 0644]

index 1218760d802f5453ae78403368d579dde0d3bb81..b5d0692a0b45f2d33cf66268bf2ad6ab4a9ca7bb 100644 (file)
   parent: [ ClothingBackpack, BaseCentcommContraband ]
   id: ClothingBackpackERTLeader
   name: ERT leader backpack
-  description: A spacious backpack with lots of pockets, worn by the Commander of an Emergency Response Team.
+  description: A spacious backpack with lots of pockets, worn by the Leader of an Emergency Response Team.
   components:
   - type: Sprite
     sprite: Clothing/Back/Backpacks/ertleader.rsi
   - type: Storage
     grid:
-    - 0,0,10,3
+    - 0,0,8,3
+  - type: ExplosionResistance
+    damageCoefficient: 0.1
 
 - type: entity
   parent: ClothingBackpackERTLeader
index d114136a049b272976c8cfa6c501a105cf6608f5..9c627741854bc6facc95663a48c8429214574623 100644 (file)
     sprite: Clothing/Belt/militarywebbingmed.rsi
   - type: Clothing
     sprite: Clothing/Belt/militarywebbingmed.rsi
+
+- type: entity
+  parent: ClothingBeltMilitaryWebbing
+  id: ClothingBeltMilitaryWebbingERT
+  name: ERT chest rig
+  description: A set of tactical webbing worn by Emergency Response Team operatives.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/militarywebbingert.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/militarywebbingert.rsi
index 0909ef56a4236b44c34af1b42c7fdc1e9428053f..5f171b39a48c9b18278da29985464ec50d0df8c9 100644 (file)
 
 #ERT Chaplain Hardsuit
 - type: entity
-  parent: [ BaseCentcommContraband, ClothingOuterHardsuitJuggernaut ]
+  parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndie ]
   id: ClothingOuterHardsuitERTChaplain
   name: ERT chaplain's hardsuit
   description: A protective hardsuit worn by the chaplains of an Emergency Response Team.
 
 #ERT Engineer Hardsuit
 - type: entity
-  parent: ClothingOuterHardsuitCBURN
+  parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndieElite ]
   id: ClothingOuterHardsuitERTEngineer
   name: ERT engineer's hardsuit
   description: A protective hardsuit worn by the engineers of an emergency response team.
 
 #ERT Janitor Hardsuit
 - type: entity
-  parent: ClothingOuterHardsuitCBURN
+  parent: [ BaseCentcommContraband, ClothingOuterHardsuitSyndieElite ]
   id: ClothingOuterHardsuitERTJanitor
   name: ERT janitor's hardsuit
   description: A protective hardsuit worn by the janitors of an emergency response team.
index 19a907f5d1de7cd1f960d4096c8c92d42a5f3ca0..d10c37392ef2ef71d5f641bab7c21fba5a840506 100644 (file)
@@ -91,7 +91,7 @@
   parent: [ClothingShoesBootsMagBase, BaseJetpack, BaseSyndicateContraband]
   id: ClothingShoesBootsMagSyndie
   name: blood-red magboots
-  description: Reverse-engineered magnetic boots that have a heavy magnetic pull and integrated thrusters. It can hold 0.75 L of gas.
+  description: Reverse-engineered from ERT magboots, they have a heavy magnetic pull and integrated thrusters. It can hold 0.75 L of gas.
   components:
   - type: Sprite
     sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi
   - type: StaticPrice
     price: 1500
 
+- type: entity
+  parent: [BaseCentcommContraband, ClothingShoesBootsMagSyndie]
+  id: ClothingShoesBootsMagERT
+  name: ERT magboots
+  description: Upgraded magnetic boots utilized by Nanotrasen's Emergency Response Teams, they have a heavy magnetic pull and integrated thrusters. It can hold 0.75 L of gas.
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Boots/magboots-ert.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Boots/magboots-ert.rsi
+
 - type: entity
   parent: BaseAction
   id: ActionToggleMagboots
index 4bcff09c29dcc40bca6b9f629012361f6a19a8f6..1fb44addcdba694d9b6679a0b8d5b43d8ccb0fb4 100644 (file)
Binary files a/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/equipped-BACKPACK.png differ
index df622e17347988acee4600685cc1ff4acf8290f7..1cee79c0556407832b76f753254d164cc21cdb64 100644 (file)
Binary files a/Resources/Textures/Clothing/Back/Backpacks/ertclown.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/ertclown.rsi/equipped-BACKPACK.png differ
index f7c55cac3a58fddceb1cc3af8be4e8e761ac206d..84d4e5bbe4808d3bd4c5e15a26055065eb05e086 100644 (file)
Binary files a/Resources/Textures/Clothing/Back/Backpacks/erteng.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/erteng.rsi/equipped-BACKPACK.png differ
index de90b33ac607567f844d5612d9b5f779b3c89440..f9cf5b31c18ead573943887ed8a794fb5e8c19e0 100644 (file)
Binary files a/Resources/Textures/Clothing/Back/Backpacks/ertjanitor.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/ertjanitor.rsi/equipped-BACKPACK.png differ
index e3d66731440da3517fea1a258403a7f8549b4c4e..a0381cbfbc171b4b9eb1505f1afbc039a2a5b1df 100644 (file)
Binary files a/Resources/Textures/Clothing/Back/Backpacks/ertleader.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/ertleader.rsi/equipped-BACKPACK.png differ
index f586a72c9be91d54bf5aba99562b2645a8db0296..21ff5db93a7e4c6cdffef20f2ea4ddd543e8863d 100644 (file)
Binary files a/Resources/Textures/Clothing/Back/Backpacks/ertmed.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/ertmed.rsi/equipped-BACKPACK.png differ
index 06b330ec8307173ffa5d36515af3c2afaa69b0e6..6aea24709fd052e68b420345786ddce83b66095f 100644 (file)
Binary files a/Resources/Textures/Clothing/Back/Backpacks/ertsec.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/ertsec.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/equipped-BELT.png
new file mode 100644 (file)
index 0000000..5bb2e5c
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/icon.png b/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/icon.png
new file mode 100644 (file)
index 0000000..0d11dc8
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..dbce144
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..8280138
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/meta.json b/Resources/Textures/Clothing/Belt/militarywebbingert.rsi/meta.json
new file mode 100644 (file)
index 0000000..a01a9c6
--- /dev/null
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/equipped-FEET-vox.png
new file mode 100644 (file)
index 0000000..4d0f8d2
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/equipped-FEET-vox.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/equipped-FEET.png
new file mode 100644 (file)
index 0000000..c400613
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/icon-on.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/icon-on.png
new file mode 100644 (file)
index 0000000..b058f60
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/icon-on.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/icon.png
new file mode 100644 (file)
index 0000000..e0bfcc6
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..2b35b6a
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..d54a3b6
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/meta.json
new file mode 100644 (file)
index 0000000..6e4a57f
--- /dev/null
@@ -0,0 +1,49 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/debf90acfcafa4fb8d6723a37e0b8ac556c0702b. equipped-FEET-vox & on-equipped-FEET-vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31d6576ba8102135d058ef49c3cb6ecbe8db8a79/icons/mob/species/vox/shoes.dmi, and equipped-FEET-vox state modified to fix inconsistencies. ERT recolor by davyei for SS14.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-FEET",
+            "directions": 4
+        },
+        {
+            "name": "equipped-FEET-vox",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-FEET-vox",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-on"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "on-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "on-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-equipped-FEET-vox.png
new file mode 100644 (file)
index 0000000..d7d694f
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-equipped-FEET-vox.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-equipped-FEET.png
new file mode 100644 (file)
index 0000000..1ae542d
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-inhand-left.png
new file mode 100644 (file)
index 0000000..a5d0ba4
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-inhand-right.png
new file mode 100644 (file)
index 0000000..8c1b002
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-inhand-right.png differ