diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml index cc4884e637..8e01183445 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml @@ -13,7 +13,7 @@ components: - type: StorageFill contents: - - id: ClothingHeadHelmetHelmet + - id: ClothingHeadHelmetBasic amount: 3 - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 6396a52834..e02d7c3076 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -129,8 +129,6 @@ prob: 0.20 - id: DrinkSpaceGlue prob: 0.20 - - id: DrinkSpaceLube - prob: 0.20 - type: entity id: ClosetWallMaintenanceFilledRandom diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 501df7a607..db2306136a 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -58,7 +58,7 @@ prob: 0.8 - id: ClothingUniformJumpsuitSecGrey prob: 0.3 - - id: ClothingHeadHelmetHelmet + - id: ClothingHeadHelmetBasic - id: ClothingOuterArmorBulletproof - id: ClothingBeltSecurityFilled - id: Flash diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml index 24d77584d9..a256147227 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml @@ -159,7 +159,7 @@ - id: ClothingBackpackSecurity - id: ClothingShoesBootsJack - id: ClothingEyesGlassesSecurity - - id: ClothingHeadHelmetHelmetOld + - id: ClothingHeadHelmetBasic - id: ClothingOuterVestKevlar - id: ClothingUniformJumpskirtSec diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 5b3d990b24..a5301400a2 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -1,9 +1,9 @@ -#(Security) Helmet +#Basic Helmet (Security Helmet) - type: entity parent: ClothingHeadBase - id: ClothingHeadHelmetHelmet + id: ClothingHeadHelmetBasic name: helmet - description: A usual helmet. + description: Standard security gear. Protects the head from impacts. components: - type: Sprite sprite: Clothing/Head/Helmets/security.rsi @@ -18,24 +18,11 @@ Heat: 0.8 - type: Tag tags: - - HamsterWearable - WhitelistChameleon -#Old (Security) Helmet -- type: entity - parent: ClothingHeadHelmetHelmet - id: ClothingHeadHelmetHelmetOld - name: helmet - description: Standard Security gear. Protects the head from impacts. - components: - - type: Sprite - sprite: Clothing/Head/Helmets/securityold.rsi - - type: Clothing - sprite: Clothing/Head/Helmets/securityold.rsi - #Mercenary Helmet - type: entity - parent: ClothingHeadHelmetHelmet + parent: ClothingHeadHelmetBasic id: ClothingHeadHelmetMerc name: mercenary helmet description: The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the jungle. @@ -95,9 +82,9 @@ - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 + Blunt: 0.70 + Slash: 0.80 + Piercing: 0.85 #Bombsuit Helmet - type: entity @@ -298,3 +285,64 @@ Slash: 0.5 Piercing: 0.5 Heat: 0.9 + +#ERT HELMETS +#ERT Leader Helmet +- type: entity + parent: ClothingHeadHelmetBasic + id: ClothingHeadHelmetERTLeader + name: ERT leader helmet + description: An in-atmosphere helmet worn by the leader of a Nanotrasen Emergency Response Team. Has blue highlights. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/ert_leader.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/ert_leader.rsi + +#ERT Security Helmet +- type: entity + parent: ClothingHeadHelmetBasic + id: ClothingHeadHelmetERTSecurity + name: ERT security helmet + description: An in-atmosphere helmet worn by security members of the Nanotrasen Emergency Response Team. Has red highlights. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/ert_security.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/ert_security.rsi + +#ERT Medic Helmet +- type: entity + parent: ClothingHeadHelmetBasic + id: ClothingHeadHelmetERTMedic + name: ERT medic helmet + description: An in-atmosphere helmet worn by medical members of the Nanotrasen Emergency Response Team. Has white highlights. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/ert_medic.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/ert_medic.rsi + +#ERT Engineer Helmet +- type: entity + parent: ClothingHeadHelmetBasic + id: ClothingHeadHelmetERTEngineer + name: ERT engineer helmet + description: An in-atmosphere helmet worn by engineering members of the Nanotrasen Emergency Response Team. Has orange highlights. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/ert_engineer.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/ert_engineer.rsi + +#ERT Janitor Helmet +- type: entity + parent: ClothingHeadHelmetBasic + id: ClothingHeadHelmetERTJanitor + name: ERT janitor helmet + description: An in-atmosphere helmet worn by janitorial members of the Nanotrasen Emergency Response Team. Has dark purple highlights. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/ert_janitor.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/ert_janitor.rsi \ 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 3dbb6c18f3..c1f1d9b0bc 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -18,7 +18,7 @@ jumpsuit: ClothingUniformJumpsuitERTLeader back: ClothingBackpackERTLeaderFilled shoes: ClothingShoesBootsJack - head: ClothingHeadHelmetHelmet + head: ClothingHeadHelmetERTLeader eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesColorBlack outerClothing: ClothingOuterVestKevlar @@ -63,7 +63,7 @@ jumpsuit: ClothingUniformJumpsuitERTEngineer back: ClothingBackpackERTEngineerFilled shoes: ClothingShoesBootsWork - head: ClothingHeadHelmetHelmet + head: ClothingHeadHelmetERTEngineer eyes: ClothingEyesGlassesMeson gloves: ClothingHandsGlovesColorYellow outerClothing: ClothingOuterVestKevlar @@ -108,7 +108,7 @@ jumpsuit: ClothingUniformJumpsuitERTSecurity back: ClothingBackpackERTSecurityFilled shoes: ClothingShoesBootsJack - head: ClothingHeadHelmetHelmet + head: ClothingHeadHelmetERTSecurity eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesColorBlack outerClothing: ClothingOuterVestKevlar @@ -153,7 +153,7 @@ jumpsuit: ClothingUniformJumpsuitERTMedic back: ClothingBackpackERTMedicalFilled shoes: ClothingShoesBootsJack - head: ClothingHeadHelmetHelmet + head: ClothingHeadHelmetERTMedic eyes: ClothingEyesHudMedical gloves: ClothingHandsGlovesColorBlack outerClothing: ClothingOuterVestKevlar @@ -200,7 +200,7 @@ jumpsuit: ClothingUniformJumpsuitERTJanitor back: ClothingBackpackERTJanitorFilled shoes: ClothingShoesGaloshes - head: ClothingHeadHelmetHelmet + head: ClothingHeadHelmetERTJanitor gloves: ClothingHandsGlovesColorBlack outerClothing: ClothingOuterVestKevlar id: ERTLeaderPDA diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 24a24844b8..d6a4c19f61 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -25,7 +25,7 @@ back: ClothingBackpackSecurityFilled shoes: ClothingShoesBootsJack eyes: ClothingEyesGlassesSecurity - head: ClothingHeadHelmetHelmetOld + head: ClothingHeadHelmetBasic outerClothing: ClothingOuterVestKevlar id: SecurityPDA ears: ClothingHeadsetSecurity diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..77b6ef5b3d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/icon.png new file mode 100644 index 0000000000..cfee6aae70 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-left.png new file mode 100644 index 0000000000..5c7a58cf14 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-right.png new file mode 100644 index 0000000000..2206f9d17d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/meta.json similarity index 54% rename from Resources/Textures/Clothing/Head/Helmets/securityold.rsi/meta.json rename to Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/meta.json index db2bbfafd4..6aae6f0097 100644 --- a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.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/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37 and repaletted, inhands created by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -14,14 +14,6 @@ "name": "equipped-HELMET", "directions": 4 }, - { - "name": "light-equipped-HELMET", - "directions": 4 - }, - { - "name": "lighton-equipped-HELMET", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..67feca27ed Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/icon.png new file mode 100644 index 0000000000..d688522bc5 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/inhand-left.png new file mode 100644 index 0000000000..d07ab18238 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/inhand-right.png new file mode 100644 index 0000000000..3592fb67f5 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/meta.json new file mode 100644 index 0000000000..a4a0293921 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Helmets/ert_janitor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37, inhands created by Flareguy for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..b41c00ca5f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/icon.png new file mode 100644 index 0000000000..f38509cbc1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/inhand-left.png new file mode 100644 index 0000000000..f5dd6a7321 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/inhand-right.png new file mode 100644 index 0000000000..cd8e066d37 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/meta.json new file mode 100644 index 0000000000..6aae6f0097 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Helmets/ert_leader.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37 and repaletted, inhands created by Flareguy for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..6e0ac9cfc4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/icon.png new file mode 100644 index 0000000000..377fad32bf Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/inhand-left.png new file mode 100644 index 0000000000..7b91444077 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/inhand-right.png new file mode 100644 index 0000000000..4982132d29 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/meta.json new file mode 100644 index 0000000000..a4a0293921 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Helmets/ert_medic.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37, inhands created by Flareguy for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..a644a20e0a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/icon.png new file mode 100644 index 0000000000..e9c5c7ae71 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/inhand-left.png new file mode 100644 index 0000000000..b768856809 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/inhand-right.png new file mode 100644 index 0000000000..2f289e525a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/meta.json new file mode 100644 index 0000000000..a4a0293921 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Helmets/ert_security.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37, inhands created by Flareguy for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/inhand-left.png index 3461b5504f..801be1333e 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/inhand-right.png index d93e3583c3..3d87b5cdb2 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/inhand-left.png index 3d32e4c7df..077fb62a2c 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/inhand-right.png index 4ae22a2561..41261d9815 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-left.png index eddab76956..5274c94828 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-right.png index 10ffa34811..93a06a90a7 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-hamster.png deleted file mode 100644 index bba686a7f0..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-hamster.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png index c139614ac9..4fd9f44ff2 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png index e8137aceaa..325084b69f 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png index 4839fd1a53..f8f7501afc 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png index 1331703085..a8bbe3dfac 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/light-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Helmets/securityold.rsi/light-equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/lighton-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png similarity index 100% rename from Resources/Textures/Clothing/Head/Helmets/securityold.rsi/lighton-equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json index 9a2a838962..db2bbfafd4 100644 --- a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -15,7 +15,11 @@ "directions": 4 }, { - "name": "equipped-HELMET-hamster", + "name": "light-equipped-HELMET", + "directions": 4 + }, + { + "name": "lighton-equipped-HELMET", "directions": 4 }, { diff --git a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/equipped-HELMET.png deleted file mode 100644 index 4fd9f44ff2..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/icon.png deleted file mode 100644 index 325084b69f..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/inhand-left.png deleted file mode 100644 index f8f7501afc..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/inhand-right.png deleted file mode 100644 index a8bbe3dfac..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/securityold.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 9f9fa7b6a9..41fdbf8b7e 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -94,3 +94,7 @@ WindoorScienceLocked: WindoorSecureScienceLocked WindoorHeadOfPersonnelLocked: WindoorSecureHeadOfPersonnelLocked WindoorAtmosphericsLocked: WindoorSecureAtmosphericsLocked WindoorParamedicLocked: WindoorSecureParamedicLocked + +# 2023-07-03 +ClothingHeadHelmetHelmet: ClothingHeadHelmetBasic +ClothingHeadHelmetHelmetOld: ClothingHeadHelmetBasic \ No newline at end of file