diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index cb7ae43729..24b49bdb1a 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -886,3 +886,78 @@ sprite: Clothing/Uniforms/Jumpsuit/musician.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/musician.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitERTEngineer + name: ERT engineering uniform + description: A special suit made for the elite engineers under CentCom. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/ert_engineer.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/ert_engineer.rsi + - type: Armor + modifiers: + coefficients: + Radiation: 0.8 + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitERTJanitor + name: ERT janitorial uniform + description: A special suit made for the elite janitors under CentCom. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/ert_janitor.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/ert_janitor.rsi + - type: DiseaseProtection + protection: 0.1 + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitERTLeader + name: ERT leader uniform + description: A special suit made for the best of the elites under CentCom. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/ert_leader.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/ert_leader.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.8 + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitERTMedic + name: ERT medical uniform + description: A special suit made for the elite medics under CentCom. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/ert_medic.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/ert_medic.rsi + - type: DiseaseProtection + protection: 0.15 + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitERTSecurity + name: ERT security uniform + description: A special suit made for the elite security under CentCom. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/ert_security.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/ert_security.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index 7712a57494..2a4a2e67e8 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -15,7 +15,7 @@ - type: startingGear id: ERTLeaderGear equipment: - jumpsuit: ClothingUniformJumpsuitColorBlue + jumpsuit: ClothingUniformJumpsuitERTLeader back: ClothingBackpackERTLeaderFilled shoes: ClothingShoesBootsJack head: ClothingHeadHelmetHelmet @@ -30,7 +30,7 @@ - type: startingGear id: ERTLeaderGearEVA equipment: - jumpsuit: ClothingUniformJumpsuitColorBlue + jumpsuit: ClothingUniformJumpsuitERTLeader back: ClothingBackpackERTLeaderFilled shoes: ClothingShoesBootsMag mask: ClothingMaskBreath @@ -60,7 +60,7 @@ - type: startingGear id: ERTEngineerGear equipment: - jumpsuit: ClothingUniformJumpsuitColorBlue + jumpsuit: ClothingUniformJumpsuitERTEngineer back: ClothingBackpackERTEngineerFilled shoes: ClothingShoesBootsWork head: ClothingHeadHelmetHelmet @@ -75,7 +75,7 @@ - type: startingGear id: ERTEngineerGearEVA equipment: - jumpsuit: ClothingUniformJumpsuitColorBlue + jumpsuit: ClothingUniformJumpsuitERTEngineer back: ClothingBackpackERTEngineerFilled shoes: ClothingShoesBootsMagAdv mask: ClothingMaskBreath @@ -105,7 +105,7 @@ - type: startingGear id: ERTSecurityGear equipment: - jumpsuit: ClothingUniformJumpsuitColorBlue + jumpsuit: ClothingUniformJumpsuitERTSecurity back: ClothingBackpackERTSecurityFilled shoes: ClothingShoesBootsJack head: ClothingHeadHelmetHelmet @@ -120,7 +120,7 @@ - type: startingGear id: ERTSecurityGearEVA equipment: - jumpsuit: ClothingUniformJumpsuitColorBlue + jumpsuit: ClothingUniformJumpsuitERTSecurity back: ClothingBackpackERTSecurityFilled shoes: ClothingShoesBootsMag mask: ClothingMaskBreath @@ -150,7 +150,7 @@ - type: startingGear id: ERTMedicalGear equipment: - jumpsuit: ClothingUniformJumpsuitColorBlue + jumpsuit: ClothingUniformJumpsuitERTMedic back: ClothingBackpackERTMedicalFilled shoes: ClothingShoesBootsJack head: ClothingHeadHelmetHelmet @@ -166,7 +166,7 @@ - type: startingGear id: ERTMedicalGearEVA equipment: - jumpsuit: ClothingUniformJumpsuitColorBlue + jumpsuit: ClothingUniformJumpsuitERTMedic back: ClothingBackpackERTMedicalFilled shoes: ClothingShoesBootsMag mask: ClothingMaskBreath @@ -197,7 +197,7 @@ - type: startingGear id: ERTJanitorGear equipment: - jumpsuit: ClothingUniformJumpsuitColorBlue + jumpsuit: ClothingUniformJumpsuitERTJanitor back: ClothingBackpackERTJanitorFilled shoes: ClothingShoesGaloshes head: ClothingHeadHelmetHelmet @@ -211,7 +211,7 @@ - type: startingGear id: ERTJanitorGearEVA equipment: - jumpsuit: ClothingUniformJumpsuitColorBlue + jumpsuit: ClothingUniformJumpsuitERTJanitor back: ClothingBackpackERTJanitorFilled shoes: ClothingShoesBootsMag mask: ClothingMaskBreath diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..7e275f29e9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/icon.png new file mode 100644 index 0000000000..3e0dfb1b0f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-left.png new file mode 100644 index 0000000000..eb6a7d90cd Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-right.png new file mode 100644 index 0000000000..34610a06fd Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/meta.json new file mode 100644 index 0000000000..ae21f57d56 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation: https://github.com/tgstation/tgstation/blob/c838ba21dae97db345e0113f99596decd1d66039/icons/mob/clothing/under/security.dmi. Modified and recolored by Nairodian (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..882d9f813a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/icon.png new file mode 100644 index 0000000000..34d28c744a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-left.png new file mode 100644 index 0000000000..88240bf0c1 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-right.png new file mode 100644 index 0000000000..b1ba7c7289 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/meta.json new file mode 100644 index 0000000000..ae21f57d56 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation: https://github.com/tgstation/tgstation/blob/c838ba21dae97db345e0113f99596decd1d66039/icons/mob/clothing/under/security.dmi. Modified and recolored by Nairodian (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..8e67a880df Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/icon.png new file mode 100644 index 0000000000..7b4f7f7a47 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-left.png new file mode 100644 index 0000000000..8cbca5d1d4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-right.png new file mode 100644 index 0000000000..0f20b7f88a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/meta.json new file mode 100644 index 0000000000..ae21f57d56 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation: https://github.com/tgstation/tgstation/blob/c838ba21dae97db345e0113f99596decd1d66039/icons/mob/clothing/under/security.dmi. Modified and recolored by Nairodian (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..3a8e6e6d6f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/icon.png new file mode 100644 index 0000000000..4646a0948d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-left.png new file mode 100644 index 0000000000..e6accaed55 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-right.png new file mode 100644 index 0000000000..e75e0297eb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/meta.json new file mode 100644 index 0000000000..ae21f57d56 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation: https://github.com/tgstation/tgstation/blob/c838ba21dae97db345e0113f99596decd1d66039/icons/mob/clothing/under/security.dmi. Modified and recolored by Nairodian (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..d8c6fa6239 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/icon.png new file mode 100644 index 0000000000..6a58be3f40 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-left.png new file mode 100644 index 0000000000..f01dd8232e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-right.png new file mode 100644 index 0000000000..a73a7cd466 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/meta.json new file mode 100644 index 0000000000..ae21f57d56 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation: https://github.com/tgstation/tgstation/blob/c838ba21dae97db345e0113f99596decd1d66039/icons/mob/clothing/under/security.dmi. Modified and recolored by Nairodian (github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}