From: Nox Date: Mon, 15 Dec 2025 03:43:57 +0000 (-0800) Subject: ERT Overhaul 1/3: Apparel (#37855) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=5f6c08e1015acc8cf45ffb237e95e125b2b16e27;p=space-station-14.git ERT Overhaul 1/3: Apparel (#37855) * Initial commit: Added ERT web vest and sprites, added ERT magboots. Signed-off-by: Nox38 * Added duffle bag and magboots Signed-off-by: Nox38 * Half finished updating the web vest Signed-off-by: Nox38 * Removed unused items Signed-off-by: Nox38 * Added ERT chest rig, changed sprites of backpacks Signed-off-by: Nox38 * Parented all ERT hardsuit stats to nukie hardsuits Signed-off-by: Nox38 * Parented ERT backpacks to syndicate ones Signed-off-by: Nox38 * changed size of ERT backpacks Signed-off-by: Nox38 * Unparented ERT duffels from syndicate ones Signed-off-by: Nox38 * Fixed belt sprites Signed-off-by: Nox38 * Fixed ERT medic backpack sprite Signed-off-by: Nox38 * Added explosion resistance to backpacks Signed-off-by: Nox38 * Removed ERT duffel bag. Signed-off-by: Nox38 --------- Signed-off-by: Nox38 --- diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 1218760d80..b5d0692a0b 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -208,13 +208,15 @@ 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 diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index d114136a04..9c62774185 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -199,3 +199,14 @@ 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 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 0909ef56a4..5f171b39a4 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -879,7 +879,7 @@ #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. @@ -893,7 +893,7 @@ #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. @@ -941,7 +941,7 @@ #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. diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index 19a907f5d1..d10c37392e 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -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 @@ -116,6 +116,17 @@ - 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 diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/ertchaplain.rsi/equipped-BACKPACK.png index 4bcff09c29..1fb44addcd 100644 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 diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertclown.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/ertclown.rsi/equipped-BACKPACK.png index df622e1734..1cee79c055 100644 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 diff --git a/Resources/Textures/Clothing/Back/Backpacks/erteng.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/erteng.rsi/equipped-BACKPACK.png index f7c55cac3a..84d4e5bbe4 100644 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 diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertjanitor.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/ertjanitor.rsi/equipped-BACKPACK.png index de90b33ac6..f9cf5b31c1 100644 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 diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertleader.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/ertleader.rsi/equipped-BACKPACK.png index e3d6673144..a0381cbfbc 100644 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 diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertmed.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/ertmed.rsi/equipped-BACKPACK.png index f586a72c9b..21ff5db93a 100644 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 diff --git a/Resources/Textures/Clothing/Back/Backpacks/ertsec.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/ertsec.rsi/equipped-BACKPACK.png index 06b330ec83..6aea24709f 100644 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 index 0000000000..5bb2e5c634 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 index 0000000000..0d11dc84dd 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 index 0000000000..dbce144c60 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 index 0000000000..8280138ae7 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 index 0000000000..a01a9c6cb9 --- /dev/null +++ b/Resources/Textures/Clothing/Belt/militarywebbingert.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/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 index 0000000000..4d0f8d2ea2 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 index 0000000000..c4006135e3 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 index 0000000000..b058f6004d 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 index 0000000000..e0bfcc67a0 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 index 0000000000..2b35b6a700 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 index 0000000000..d54a3b6f3d 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 index 0000000000..6e4a57f3c0 --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/meta.json @@ -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 index 0000000000..d7d694fb92 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 index 0000000000..1ae542d086 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 index 0000000000..a5d0ba43f9 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 index 0000000000..8c1b0024bf Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-ert.rsi/on-inhand-right.png differ