diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl index ddcaa622ab..a48b19e1f3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl @@ -31,6 +31,9 @@ ent-ClothingHeadHelmetHardsuitSecurity = шлем скафандра служб ent-ClothingHeadHelmetHardsuitSecurityRed = шлем скафандра главы службы безопасности .desc = Шлем скафандра службы безопасности с новейшим сверхсекретным программным обеспечением NT-HUD. Принадлежит главе службы безопасности. .suffix = { "" } +ent-ClothingHeadHelmetHardsuitHOP = шлем скафандра главы персонала + .desc = Шлем скафандра главы персонала. Жаль на кепку не натянуть. + .suffix = { "" } ent-ClothingHeadHelmetHardsuitSyndie = кроваво-красный шлем скафандра .desc = Продвинутый красный шлем скафандра, предназначенный для работы в специальных операциях. .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl index d37ef9e302..d72bd8c8a8 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl @@ -40,6 +40,9 @@ ent-ClothingOuterHardsuitSecurity = скафандр службы безопас ent-ClothingOuterHardsuitSecurityRed = скафандр главы службы безопасности .desc = Специальный костюм, защищающий от опасной среды с низким давлением. Имеет дополнительный слой брони. .suffix = { "" } +ent-ClothingOuterHardsuitHOP = скафандр главы персонала + .desc = Специальный костюм, защищающий от опасной среды с низким давлением. Имеет дополнительный слой легкой брони. + .suffix = { "" } ent-ClothingOuterHardsuitSyndie = кроваво-красный скафандр .desc = Тяжелобронированный и мобильный скафандр, предназначенный для специальных операций. .suffix = { "" } diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 7ee7351fbe..dd52f06c08 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -217,6 +217,20 @@ - type: AccessReader access: [["HeadOfSecurity"]] +#HoP's hardsuit +- type: entity + id: SuitStorageHOP + parent: SuitStorageBase + suffix: Head of Personnel + components: + - type: StorageFill + contents: + - id: NitrogenTankFilled + - id: OxygenTankFilled + - id: ClothingOuterHardsuitHOP + - id: ClothingMaskBreath + - id: ToyIan + #Warden's hardsuit - type: entity id: SuitStorageWarden diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index a9cdde4208..ed27ccc315 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -327,6 +327,22 @@ radius: 7 energy: 3 +#Head of Personnel's Hardsuit WD +- type: entity + parent: ClothingHeadHardsuitBase + id: ClothingHeadHelmetHardsuitHOP + noSpawn: true + name: head of personnel's hardsuit helmet + description: Lightweight hardsuit helmet that doesn't restrict your head movements. Belongs to the HoP. + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/hop.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/hop.rsi + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 1000 + #ANTAG HARDSUITS #Blood-red Hardsuit - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index f4f6cdce5a..b581910897 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -437,6 +437,37 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitLuxury +#Head of Personnel's Hardsuit WD +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitHOP + name: head of personnel's hardsuit + description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of light armor. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/hop.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/hop.rsi + - type: PressureProtection + highPressureMultiplier: 0.45 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.2 + - type: Armor + modifiers: + coefficients: + Blunt: 0.2 + Slash: 0.1 + Piercing: 0.1 + Radiation: 0.1 + Caustic: 0.2 + Heat: 0.1 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitHOP + #ANTAG HARDSUITS #Blood-red Hardsuit - type: entity diff --git a/Resources/Textures/Clothing/Head/Hardsuits/hop.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/hop.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..0068bf9127 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/hop.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/hop.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/hop.rsi/icon.png new file mode 100644 index 0000000000..9e8d1e3d55 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/hop.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/hop.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/hop.rsi/meta.json new file mode 100644 index 0000000000..0d9aa88dcb --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/hop.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Gargarien, property of White Dream", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] + } + \ No newline at end of file diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png index 9fc9e52b49..2a3520e290 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/icon.png index c935d29b23..b6fcee6fd0 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json index fde00d6116..27194f90cb 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/hop.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/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", + "copyright": "icon and equipped-NECK drawn by Gargarien (White Dream), sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/equipped-OUTERCLOTHING-body-slim.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/equipped-OUTERCLOTHING-body-slim.png new file mode 100644 index 0000000000..2766afbec6 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/equipped-OUTERCLOTHING-body-slim.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..3e6750126c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/icon.png new file mode 100644 index 0000000000..00bf5d502c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/inhand-left.png new file mode 100644 index 0000000000..6de8bd0d73 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/inhand-right.png new file mode 100644 index 0000000000..d1f65d1eb6 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/meta.json new file mode 100644 index 0000000000..f152733bcd --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/hop.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Gargarien, property of White Dream", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] + } + \ No newline at end of file