From 47670e909084e78aca349ca0e6c558626a5e5a30 Mon Sep 17 00:00:00 2001 From: Agronomist-NN Date: Wed, 13 Nov 2024 18:01:36 +0300 Subject: [PATCH 1/2] [tweak] Disease protection and quality of life additionals. (#910) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Disease Protection first commit First sample. * Corvax CBURN anti viral * Resize - Hardsuits can now be put in a backpack. - Emergency boxes now have space medipens. - Emergency boxes are now smaller in size and take up space like a first aid kit. * Parent fix Я всё сделал как надо, честно!!! * Add armor to security bio suit * Space Medipen deleted again --- .../Prototypes/Catalog/Fills/Boxes/general.yml | 4 ++-- .../Clothing/Head/hardsuit-helmets.yml | 2 ++ .../Clothing/OuterClothing/hardsuits.yml | 2 ++ .../Clothing/Hands/base_clothinghands.yml | 2 ++ .../Entities/Clothing/Hands/gloves.yml | 2 ++ .../Clothing/Head/base_clothinghead.yml | 6 ++++++ .../Clothing/Head/hardsuit-helmets.yml | 4 ++++ .../Entities/Clothing/Head/hoods.yml | 2 ++ .../Entities/Clothing/Masks/bandanas.yml | 2 ++ .../Entities/Clothing/Masks/masks.yml | 18 ++++++++++++++++++ .../OuterClothing/base_clothingouter.yml | 6 +++++- .../Entities/Clothing/OuterClothing/bio.yml | 9 +++++++++ .../Clothing/OuterClothing/hardsuits.yml | 4 ++++ .../Clothing/OuterClothing/softsuits.yml | 2 ++ .../Entities/Clothing/OuterClothing/armor.yml | 2 ++ 15 files changed, 64 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 62081fdf65a..87895394858 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -5,9 +5,9 @@ description: A cardboard box for storing things. components: - type: Item - size: Large + size: Normal shape: - - 0,0,2,2 + - 0,0,1,1 - type: Storage maxItemSize: Small grid: diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Head/hardsuit-helmets.yml index dd3b7ecd60c..40ac5be328a 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Head/hardsuit-helmets.yml @@ -40,3 +40,5 @@ Shock: 0.1 Cold: 0.2 Radiation: 0.2 + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.2 diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/hardsuits.yml index 9a195b1690a..00cb41bdc30 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/hardsuits.yml @@ -32,3 +32,5 @@ damageCoefficient: 0.7 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetCBURNLeader + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.5 diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml index bb494ffda41..bed8b678853 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml @@ -27,6 +27,8 @@ damageProtection: flatReductions: Heat: 5 # the average lightbulb only does around four damage! + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.1 - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 31ec83cbd7d..c84966bf99a 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -156,6 +156,8 @@ - type: Fiber fiberMaterial: fibers-nitrile - type: FingerprintMask + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.2 #### - type: entity parent: ClothingHandsButcherable diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index 46fe9ef09df..587f49c0fde 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml @@ -132,6 +132,8 @@ - Snout - HeadTop - HeadSide + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.2 - type: entity abstract: true @@ -177,6 +179,8 @@ - Snout - HeadTop - HeadSide + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.2 - type: entity abstract: true @@ -229,6 +233,8 @@ - type: BatterySelfRecharger autoRecharge: true autoRechargeRate: 2 #recharge of 2 makes total drain 1w / s so max charge is 1:1 with time. Time to fully charge should be 5 minutes. Having recharge gives light an extended flicker period which gives you some warning to return to light area. + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.2 - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 532b73132ba..ec79eaf8c94 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -694,6 +694,8 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.4 #Deathsquad Hardsuit - type: entity @@ -723,6 +725,8 @@ Heat: 0.80 Radiation: 0.80 Caustic: 0.95 + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 1 #MISC. HARDSUITS #Clown Hardsuit diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 1330d38f404..a7c6b75fe3a 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -20,6 +20,8 @@ - Snout - HeadTop - HeadSide + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.2 - type: entity parent: ClothingHeadHatHoodBioGeneral diff --git a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml index 0f519fdcf8a..1868a53984c 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml @@ -34,6 +34,8 @@ slots: - Snout hideOnToggle: true + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.1 - type: entity parent: ClothingMaskBandanaBase diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 0dd16dceb14..bfaf92e0a99 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -19,6 +19,8 @@ slots: - Snout hideOnToggle: true + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.1 - type: entity parent: [ClothingMaskGas, BaseRestrictedContraband] @@ -59,6 +61,8 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.95 + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.2 - type: entity parent: ClothingMaskGas @@ -137,6 +141,8 @@ tags: - PetWearable - WhitelistChameleon + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.2 - type: entity parent: ClothingMaskBreathMedical @@ -157,6 +163,8 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.95 + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.2 - type: entity parent: ClothingMaskPullableBase @@ -302,6 +310,8 @@ - type: PhysicalComposition materialComposition: Plastic: 25 + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.2 - type: entity parent: ClothingMaskBase @@ -429,6 +439,8 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.95 + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.2 - type: entity parent: ClothingMaskGasERT @@ -447,6 +459,8 @@ Slash: 0.80 Piercing: 0.90 Heat: 0.90 + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.2 - type: entity parent: ClothingMaskBase @@ -579,6 +593,8 @@ - type: Tag tags: - WhitelistChameleon + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.1 - type: entity parent: ClothingMaskNeckGaiter @@ -665,3 +681,5 @@ - type: EyeProtection - type: BreathMask - type: IdentityBlocker + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.2 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 8f52b69ba60..6707de71906 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -116,7 +116,7 @@ sprintModifier: 0.6 - type: HeldSpeedModifier - type: Item - size: Ginormous + size: Huge - type: Armor modifiers: coefficients: @@ -146,6 +146,8 @@ flatReductions: Heat: 10 # the average lightbulb only does around four damage! slots: OUTERCLOTHING + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.4 - type: entity abstract: true @@ -174,6 +176,8 @@ flatReductions: Heat: 10 # the average lightbulb only does around four damage! slots: OUTERCLOTHING + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.3 - type: entity parent: ClothingOuterBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml index 82caea25485..ea22d5ceb91 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml @@ -16,6 +16,8 @@ modifiers: coefficients: Caustic: 0.5 + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.4 - type: entity parent: ClothingOuterBioGeneral @@ -67,6 +69,13 @@ sprite: Clothing/OuterClothing/Bio/security.rsi - type: Clothing sprite: Clothing/OuterClothing/Bio/security.rsi + - type: Armor #Based on /tg/ but slightly compensated to fit the fact that armor stacks in SS14. + modifiers: + coefficients: + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.70 + Heat: 0.80 - type: entity parent: ClothingOuterBioGeneral diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 10492541384..86717e30172 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -911,6 +911,8 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitDeathsquad + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 1 #CBURN Hardsuit - type: entity @@ -949,6 +951,8 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetCBURN + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.6 #MISC. HARDSUITS #Clown Hardsuit diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index b5f1bf9f658..7c4fef7902d 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -127,3 +127,5 @@ - type: ContainerContainer containers: toggleable-clothing: !type:ContainerSlot {} + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.4 diff --git a/Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/armor.yml index 9d3be481feb..9ede748ff71 100644 --- a/Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_Backmen/Entities/Clothing/OuterClothing/armor.yml @@ -64,6 +64,8 @@ - type: ExplosionResistance damageCoefficient: 0.60 - type: GroupExamine + - type: DiseaseProtection #Backmen & Ataraxia anti viral + protection: 0.4 - type: entity parent: [ClothingOuterBase, AllowSuitStorageClothing] From 4e00804ea3d1bddcb979cb42732be9114bfe95ee Mon Sep 17 00:00:00 2001 From: bkm CL Date: Wed, 13 Nov 2024 18:11:44 +0300 Subject: [PATCH 2/2] Automatic changelog update --- Resources/Changelog/ChangelogBkm.yml | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/Resources/Changelog/ChangelogBkm.yml b/Resources/Changelog/ChangelogBkm.yml index bb6c1092915..eedd48a5115 100644 --- a/Resources/Changelog/ChangelogBkm.yml +++ b/Resources/Changelog/ChangelogBkm.yml @@ -291,3 +291,45 @@ id: 20 time: '2024-11-12T20:22:04.0000000+00:00' url: https://github.com/Rxup/space-station-14/pull/917 +- author: Agronomist-NN + changes: + - message: "\u041F\u0440\u043E\u0442\u0438\u0432\u043E\u0433\u0430\u0437\u0430\u043C\ + , \u0434\u044B\u0445\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u043C \u043C\u0430\ + \u0441\u043A\u0430\u043C, \u0448\u043B\u0435\u043C\u0430\u043C \u0441\u043A\u0430\ + \u0444\u0430\u043D\u0434\u0440\u043E\u0432, \u0441\u043A\u0430\u0444\u0430\u043D\ + \u0434\u0440\u0430\u043C, \u043A\u043E\u0441\u0442\u044E\u043C\u0430\u043C \u0431\ + \u0438\u043E\u0437\u0430\u0449\u0438\u0442\u044B \u0431\u044B\u043B\u0430 \u0434\ + \u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0437\u0430\u0449\u0438\u0442\ + \u0430 \u043E\u0442 \u0431\u043E\u043B\u0435\u0437\u043D\u0435\u0439." + type: Add + - message: "\u041F\u0438\u0442\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0439 \u0431\ + \u0430\u0442\u043E\u043D\u0447\u0438\u043A \u0432 \u0430\u0432\u0430\u0440\u0438\ + \u0439\u043D\u044B\u0445 \u043D\u0430\u0431\u043E\u0440\u0430\u0445 \u0437\u0430\ + \u043C\u0435\u043D\u0451\u043D \u043D\u0430 \u043A\u043E\u043D\u0441\u0435\u0440\ + \u0432\u044B." + type: Tweak + - message: "\u0410\u0432\u0430\u0440\u0438\u0439\u043D\u044B\u0439 \u043D\u0430\u0431\ + \u043E\u0440 \u0442\u0435\u043F\u0435\u0440\u044C \u0437\u0430\u043D\u0438\u043C\ + \u0430\u0435\u0442 \u043D\u0435 3 \u0445 3 \u0430 2 \u0445 2 \u043A\u043B\u0435\ + \u0442\u043E\u043A \u0432 \u0438\u043D\u0432\u0435\u043D\u0442\u0430\u0440\u0435\ + ." + type: Tweak + - message: "\u0421\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u044B \u0442\u0435\u043F\ + \u0435\u0440\u044C \u0438\u043C\u0435\u044E\u0442 \u0440\u0430\u0437\u043C\u0435\ + \u0440 \u0442\u0438\u043F\u0430 Huge \u0438 \u043C\u043E\u0433\u0443\u0442 \u043F\ + \u043E\u043C\u0435\u0441\u0442\u0438\u0442\u044C\u0441\u044F \u0432 \u0438\u043D\ + \u0432\u0435\u043D\u0442\u0430\u0440\u044C." + type: Tweak + - message: "\u041A\u043E\u0441\u0442\u044E\u043C\u0443 \u0431\u0438\u043E\u0437\u0430\ + \u0449\u0438\u0442\u044B \u0421\u0411 \u0431\u044B\u043B\u0430 \u0434\u043E\u0431\ + \u0430\u0432\u043B\u0435\u043D\u0430 \u0437\u0430\u0449\u0438\u0442\u0430 \u0441\ + \u0440\u0430\u0432\u043D\u0438\u043C\u0430\u044F \u0441 \u043E\u0431\u044B\u0447\ + \u043D\u044B\u043C \u0431\u0440\u043E\u043D\u0435\u0436\u0438\u043B\u0435\u0442\ + \u043E\u043C \u0421\u0411. \u0428\u043B\u0435\u043C \u0411\u0417 \u0421\u0411\ + \ \u043E\u0441\u0442\u0430\u043B\u0441\u044F \u0431\u0435\u0437 \u0438\u0437\ + \u043C\u0435\u043D\u0435\u043D\u0438\u0439 \u0432 \u043F\u043B\u0430\u043D\u0435\ + \ \u0437\u0430\u0449\u0438\u0442\u044B." + type: Tweak + id: 21 + time: '2024-11-13T15:01:37.0000000+00:00' + url: https://github.com/Rxup/space-station-14/pull/910