diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml index ac19c2fe97..001ee08276 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml @@ -14,3 +14,5 @@ ClothingHeadsetMedical: 4 ClothingOuterWinterMed: 2 ClothingOuterWinterPara: 2 + ClothingHeadHelmetVoidParamed: 1 + ClothingOuterHardsuitVoidParamed: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index b43e6e69fe..8e2fb4b6e4 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -211,7 +211,7 @@ Radiation: 1 - type: PressureProtection highPressureMultiplier: 0.65 - lowPressureMultiplier: 25 + lowPressureMultiplier: 1000 - type: entity parent: ClothingHeadHardsuitWithLightBase # hardsuitlight base for light and protection @@ -236,13 +236,13 @@ Radiation: .95 - type: PressureProtection highPressureMultiplier: 0.45 - lowPressureMultiplier: 25 + lowPressureMultiplier: 1000 - type: entity parent: ClothingHeadBase id: ClothingHeadHelmetLing name: chitinous helmet - description: Inflates the changeling's body into an all-consuming chitinous mass of armor. Provides extensive protection against physical damage, but less against other types. Its mass slows the changeling's movement, and maintaining its shape slows chemical generation. + description: Inflates the changeling's body into an all-consuming chitinous mass of armor. components: - type: Sprite sprite: Clothing/Head/Helmets/linghelmet.rsi @@ -255,3 +255,25 @@ Slash: 0.5 Piercing: 0.5 Heat: 0.9 + +- type: entity + parent: ClothingHeadEVAHelmetBase + id: ClothingHeadHelmetVoidParamed + name: Paramedic Void Helmet + description: A void helmet made for paramedics. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/paramedhelm.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/paramedhelm.rsi + - type: IngestionBlocker + - type: DiseaseProtection + protection: 0.15 + - type: TemperatureProtection + coefficient: 0.1 + - type: Armor + modifiers: + coefficients: + Slash: 0.95 + Heat: 0.90 + Radiation: 0.75 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 59e6a82e8b..1dd7e17c70 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -134,6 +134,8 @@ Slash: 0.4 Piercing: 0.9 Heat: 0.9 + - type: ExplosionResistance + resistance: 0.9 - type: entity parent: ClothingOuterBase @@ -152,6 +154,8 @@ Slash: 0.7 Piercing: 0.4 Heat: 0.9 + - type: ExplosionResistance + resistance: 0.8 - type: entity parent: ClothingOuterBase @@ -170,12 +174,14 @@ Slash: 0.5 Piercing: 0.6 Heat: 0.5 - + - type: ExplosionResistance + resistance: 0.65 + - type: entity parent: ClothingOuterBase id: ClothingOuterArmorChangeling name: chitinous armor - description: Inflates the changeling's body into an all-consuming chitinous mass of armor. Provides extensive protection against physical damage, but less against other types. Its mass slows the changeling's movement, and maintaining its shape slows chemical generation. + description: Inflates the changeling's body into an all-consuming chitinous mass of armor. components: - type: Sprite sprite: Clothing/OuterClothing/Armor/lingarmor.rsi @@ -192,4 +198,5 @@ - type: ClothingSpeedModifier walkModifier: 0.7 sprintModifier: 0.65 - + - type: ExplosionResistance + resistance: 0.5 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index d27a3b70d2..c53775046a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -34,6 +34,7 @@ Heat: 0.90 Radiation: 0.25 - type: DiseaseProtection + protection: 0.05 - type: entity abstract: true @@ -52,3 +53,4 @@ - type: Clothing size: 30 - type: DiseaseProtection + protection: 0.05 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 055546bb53..7be7400818 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -23,6 +23,13 @@ sprite: Clothing/OuterClothing/Coats/detective.rsi - type: Storage capacity: 10 + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.6 + Heat: 0.9 - type: entity parent: ClothingOuterBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index ecd931cdae..e2d9aaaaf5 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -13,7 +13,7 @@ lowPressureMultiplier: 10000 - type: ClothingSpeedModifier walkModifier: 0.65 - sprintModifier: 0.7 + sprintModifier: 0.65 - type: Armor modifiers: coefficients: @@ -24,7 +24,9 @@ Radiation: 0.25 - type: TemperatureProtection coefficient: 0.01 - + - type: ExplosionResistance + resistance: 0.8 + - type: entity parent: ClothingOuterHardsuitBase id: ClothingOuterHardsuitCap @@ -49,6 +51,8 @@ Piercing: 0.75 Heat: 0.5 Radiation: 0.1 + - type: ExplosionResistance + resistance: 0.5 - type: entity parent: ClothingOuterHardsuitBase @@ -74,6 +78,8 @@ Piercing: 0.2 Heat: 0.2 Radiation: 0.2 + - type: ExplosionResistance + resistance: 0.3 - type: entity parent: ClothingOuterHardsuitBase @@ -99,7 +105,9 @@ Piercing: 0.85 Heat: 0.7 Radiation: 0.35 - + - type: ExplosionResistance + resistance: 0.8 + - type: entity parent: ClothingOuterHardsuitBase id: ClothingOuterHardsuitEngineeringWhite @@ -124,6 +132,8 @@ Piercing: 0.8 Heat: 0.4 Radiation: 0.25 + - type: ExplosionResistance + resistance: 0.8 #The voidsuit and eva suit are not techically 'hardsuits' but this seems to be the place for all EVA-capable outer clothing. This may be worth reevaluating when we have a lot more items. - type: entity @@ -195,7 +205,7 @@ protection: 0.2 - type: ClothingSpeedModifier walkModifier: 0.9 - sprintModifier: 0.9 + sprintModifier: 0.95 - type: Armor modifiers: coefficients: @@ -226,6 +236,8 @@ - type: ClothingSpeedModifier walkModifier: 0.75 sprintModifier: 0.75 + - type: ExplosionResistance + resistance: 0.7 - type: entity parent: ClothingOuterHardsuitBase @@ -251,6 +263,8 @@ Piercing: 0.75 Heat: 0.85 Radiation: 0.5 + - type: ExplosionResistance + resistance: 0.8 - type: entity parent: ClothingOuterHardsuitBase @@ -268,11 +282,13 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.7 + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 Heat: 0.8 Radiation: 0.25 + - type: ExplosionResistance + resistance: 0.6 - type: entity parent: ClothingOuterHardsuitSecurity @@ -289,15 +305,17 @@ lowPressureMultiplier: 10000 - type: ClothingSpeedModifier walkModifier: 0.7 - sprintModifier: 0.7 + sprintModifier: 0.75 - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.65 - Piercing: 0.7 + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 Heat: 0.8 Radiation: 0.25 + - type: ExplosionResistance + resistance: 0.6 - type: entity parent: ClothingOuterHardsuitBase @@ -323,6 +341,8 @@ Piercing: 0.4 Heat: 0.4 #all the combat numbers are pumped up here Radiation: 0.20 + - type: ExplosionResistance + resistance: 0.5 - type: entity parent: ClothingOuterHardsuitBase @@ -348,6 +368,8 @@ Piercing: 0.4 Heat: 0.25 Radiation: 0.20 + - type: ExplosionResistance + resistance: 0.5 - type: entity parent: ClothingOuterHardsuitBase @@ -373,6 +395,8 @@ Piercing: 1 Heat: 0.5 Radiation: 0.3 + - type: ExplosionResistance + resistance: 0.8 - type: entity parent: ClothingOuterHardsuitBase @@ -398,3 +422,31 @@ Piercing: 0.95 Heat: 0.9 Radiation: 0.5 #low physical but gave some rad protection in case of rad artifacts/rad storms + +- type: entity + parent: ClothingOuterEVASuitBase + id: ClothingOuterHardsuitVoidParamed + name: Paramedic Void Suit + description: A void suit made for paramedics. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi + - type: PressureProtection + highPressureMultiplier: 0.5 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: DiseaseProtection + protection: 0.15 + - type: TemperatureProtection + coefficient: 0.1 + - type: Armor + modifiers: + coefficients: + Slash: 0.95 + Heat: 0.90 + Radiation: 0.75 + diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index ab9061e222..ae4c3804e9 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -39,7 +39,7 @@ sprite: Clothing/OuterClothing/Suits/fire.rsi - type: PressureProtection highPressureMultiplier: 0.65 - lowPressureMultiplier: 25 + lowPressureMultiplier: 1000 - type: Clothing sprite: Clothing/OuterClothing/Suits/fire.rsi - type: Armor @@ -130,7 +130,7 @@ sprite: Clothing/OuterClothing/Suits/atmos_firesuit.rsi - type: PressureProtection highPressureMultiplier: 0.45 - lowPressureMultiplier: 25 + lowPressureMultiplier: 1000 - type: TemperatureProtection coefficient: 0.01 - type: Clothing @@ -142,4 +142,4 @@ Heat: 0.35 - type: ClothingSpeedModifier walkModifier: 0.7 - sprintModifier: 0.7 + sprintModifier: 0.75 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index fffca710e3..1a1115a3a8 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -15,7 +15,9 @@ Slash: 0.7 Piercing: 0.5 Heat: 0.9 - + - type: ExplosionResistance + resistance: 0.9 + - type: entity parent: ClothingOuterBase id: ClothingOuterVestWeb @@ -33,6 +35,8 @@ Slash: 0.6 Piercing: 0.3 Heat: 0.9 + - type: ExplosionResistance + resistance: 0.9 - type: entity parent: ClothingOuterBase @@ -51,17 +55,28 @@ Slash: 0.9 Piercing: 0.4 Heat: 0.9 + - type: ExplosionResistance + resistance: 0.9 - type: entity parent: ClothingOuterBase id: ClothingOuterVestDetective name: detective's vest - description: A hard-boiled private investigator's grey trenchcoat. + description: A hard-boiled private investigator's armored vest. components: - type: Sprite sprite: Clothing/OuterClothing/Vests/detvest.rsi - type: Clothing sprite: Clothing/OuterClothing/Vests/detvest.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.85 + Heat: 0.9 + - type: ExplosionResistance + resistance: 0.9 - type: entity parent: ClothingOuterBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 096dd240a6..055e8c3e58 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -15,6 +15,8 @@ coefficients: Slash: 0.95 Heat: 0.75 + - type: Storage + capacity: 10 - type: entity parent: ClothingOuterWinterCoat diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index c8375fc623..aa33d60255 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -19,7 +19,7 @@ event: !type:ToggleActionEvent - type: ClothingSpeedModifier walkModifier: 0.85 - sprintModifier: 0.65 + sprintModifier: 0.8 enabled: false - type: entity diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..d09e0347f5 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png new file mode 100644 index 0000000000..1ef8eb3706 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png new file mode 100644 index 0000000000..2cf555506b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png new file mode 100644 index 0000000000..8ad5054db1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json new file mode 100644 index 0000000000..c402402b13 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365", + "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/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..da0a69c9c4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png new file mode 100644 index 0000000000..5a1e8bf194 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png new file mode 100644 index 0000000000..1a4f03fa5d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png new file mode 100644 index 0000000000..7cbe137391 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json new file mode 100644 index 0000000000..2818392b32 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}