From 5c848750b4ce15da535f8bc36511a055889f4952 Mon Sep 17 00:00:00 2001 From: Kirill Date: Sun, 14 Jul 2024 16:28:47 +0500 Subject: [PATCH 1/8] Update fusion_engine.dm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Изменил скорость потребления заряда стержней в генераторах корабля --- code/modules/power/fusion_engine.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/power/fusion_engine.dm b/code/modules/power/fusion_engine.dm index 75228d4c32f..46694659353 100644 --- a/code/modules/power/fusion_engine.dm +++ b/code/modules/power/fusion_engine.dm @@ -82,10 +82,10 @@ switch(power_gen_percent) //Flavor text! if(10) balloon_alert_to_viewers("begins to whirr as it powers up") - fuel_rate = FUSION_ENGINE_FULL_STRENGTH_FULL_RATE * 0.1 + fuel_rate = FUSION_ENGINE_FULL_STRENGTH_FULL_RATE * 0.2 if(50) balloon_alert_to_viewers("hums as it reaches half capacity") - fuel_rate = FUSION_ENGINE_FULL_STRENGTH_FULL_RATE * 0.5 + fuel_rate = FUSION_ENGINE_FULL_STRENGTH_FULL_RATE * 0.8 if(100) balloon_alert_to_viewers("rumbles as it reaches full strength") fuel_rate = FUSION_ENGINE_FULL_STRENGTH_FULL_RATE From d8834dc4386e770d4c710725f3cf858ed837a53a Mon Sep 17 00:00:00 2001 From: Kirill Date: Sun, 14 Jul 2024 19:41:36 +0500 Subject: [PATCH 2/8] =?UTF-8?q?=D0=B1=D0=B0=D0=BB=D0=B0=D0=BD=D1=81=D0=B8?= =?UTF-8?q?=D0=BC=20=D1=81=D1=82=D0=B0=D1=82=D1=8B=20=D0=B1=D1=80=D0=BE?= =?UTF-8?q?=D0=BD=D0=B8=20=D0=B8=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5?= =?UTF-8?q?=D0=B9,=20=D0=B2=D0=BE=D0=B7=D0=B2=D1=80=D0=B0=D1=89=D0=B0?= =?UTF-8?q?=D0=B5=D0=BC=20=D1=82=D1=8E=D1=80,=20=D0=B8=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=8F=D0=B5=D0=BC=20=D1=81=D1=82=D0=B0=D1=82=D1=8B=20?= =?UTF-8?q?=D0=B1=D1=80=D0=BE=D0=BD=D0=B8=D0=BA=D0=B0=20=D0=BF=D0=B8=D0=BB?= =?UTF-8?q?=D0=BE=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/__DEFINES/loadout.dm | 10 +---- .../machinery/vending/new_marine_vendors.dm | 4 +- .../modular_armor/attachments/modules.dm | 24 ++++++------ .../clothing/modular_armor/xenonauten.dm | 37 ++++--------------- 4 files changed, 21 insertions(+), 54 deletions(-) diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index d9a78944d63..a058a68c714 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -473,9 +473,7 @@ GLOBAL_LIST_INIT(marine_clothes_listed_products, list( /obj/item/storage/pouch/magazine/pistol/large = list(CAT_POU, "Pistol magazine pouch", 0,"black"), /obj/item/storage/pouch/pistol = list(CAT_POU, "Sidearm pouch", 0,"black"), /obj/effect/vendor_bundle/mimir = list(CAT_HEL, "Mimir Resistance set", 0,"orange"), -/* RU TGMC EDIT /obj/effect/vendor_bundle/tyr = list(CAT_ARMMOD, "Mark 1 Tyr extra armor set", 0,"black"), -RU TGMC EDIT */ /obj/item/armor_module/module/ballistic_armor = list(CAT_ARMMOD, "Hod Accident Prevention Plating", 0,"black"), /obj/item/armor_module/module/better_shoulder_lamp = list(CAT_ARMMOD, "Baldur light armor module", 0,"black"), /obj/effect/vendor_bundle/vali = list(CAT_ARMMOD, "Vali chemical enhancement set", 0,"black"), @@ -551,9 +549,7 @@ GLOBAL_LIST_INIT(engineer_clothes_listed_products, list( /obj/item/storage/pouch/pistol = list(CAT_POU, "Sidearm pouch", 0, "black"), /obj/effect/vendor_bundle/mimir = list(CAT_HEL, "Mimir Resistance set", 0,"orange"), /obj/item/armor_module/module/ballistic_armor = list(CAT_ARMMOD, "Hod Accident Prevention Plating", 0,"black"), -/* RU TGMC EDIT /obj/effect/vendor_bundle/tyr = list(CAT_ARMMOD, "Mark 1 Tyr extra armor set", 0,"black"), -RU TGMC EDIT */ /obj/item/armor_module/module/better_shoulder_lamp = list(CAT_ARMMOD, "Baldur light armor module", 0,"black"), /obj/effect/vendor_bundle/vali = list(CAT_ARMMOD, "Vali chemical enhancement set", 0,"black"), /obj/item/armor_module/module/eshield = list(CAT_ARMMOD, "Svalinn Energy Shield System", 0 , "black"), @@ -607,9 +603,7 @@ GLOBAL_LIST_INIT(medic_clothes_listed_products, list( /obj/item/storage/pouch/medkit/medic = list(CAT_POU, "Medkit pouch", 0, "orange"), /obj/effect/vendor_bundle/mimir = list(CAT_HEL, "Mimir Resistance set", 0,"orange"), /obj/item/armor_module/module/ballistic_armor = list(CAT_ARMMOD, "Hod Accident Prevention Plating", 0,"black"), -/* RU TGMC EDIT /obj/effect/vendor_bundle/tyr = list(CAT_ARMMOD, "Mark 1 Tyr extra armor set", 0,"black"), -RU TGMC EDIT */ /obj/item/armor_module/module/better_shoulder_lamp = list(CAT_ARMMOD, "Baldur light armor module", 0,"black"), /obj/effect/vendor_bundle/vali = list(CAT_ARMMOD, "Vali chemical enhancement set", 0,"black"), /obj/item/armor_module/module/eshield = list(CAT_ARMMOD, "Svalinn Energy Shield System", 0 , "black"), @@ -668,9 +662,7 @@ GLOBAL_LIST_INIT(smartgunner_clothes_listed_products, list( /obj/item/storage/pouch/magazine/pistol/large = list(CAT_POU, "Pistol magazine pouch", 0, "black"), /obj/item/storage/pouch/pistol = list(CAT_POU, "Sidearm pouch", 0, "black"), /obj/effect/vendor_bundle/mimir = list(CAT_HEL, "Mimir Resistance set", 0,"orange"), -/* RU TGMC EDIT /obj/effect/vendor_bundle/tyr = list(CAT_ARMMOD, "Mark 1 Tyr extra armor set", 0,"black"), -RU TGMC EDIT */ /obj/item/armor_module/module/better_shoulder_lamp = list(CAT_ARMMOD, "Baldur light armor module", 0,"black"), /obj/effect/vendor_bundle/vali = list(CAT_ARMMOD, "Vali chemical enhancement set", 0,"black"), /obj/item/clothing/mask/gas = list(CAT_MAS, "Transparent gas mask", 0,"black"), @@ -734,8 +726,8 @@ GLOBAL_LIST_INIT(leader_clothes_listed_products, list( /obj/item/storage/pouch/pistol = list(CAT_POU, "Sidearm pouch", 0, "black"), /obj/item/storage/pouch/explosive = list(CAT_POU, "Explosive pouch", 0, "black"), /obj/effect/vendor_bundle/mimir = list(CAT_HEL, "Mimir Resistance set", 0,"orange"), -/* RUTGMC EDIT /obj/effect/vendor_bundle/tyr = list(CAT_ARMMOD, "Mark 1 Tyr extra armor set", 0,"black"), +/* RUTGMC EDIT /obj/effect/vendor_bundle/tyr/two = list(CAT_ARMMOD, "Mark 2 Tyr extra armor set", 0,"black"), /obj/effect/vendor_bundle/mimir/two = list(CAT_ARMMOD, "Mark 2 Mimir Resistance set", 0,"black"), RU TGMC EDIT */ diff --git a/code/game/objects/machinery/vending/new_marine_vendors.dm b/code/game/objects/machinery/vending/new_marine_vendors.dm index b92f7459527..5712b493dbd 100644 --- a/code/game/objects/machinery/vending/new_marine_vendors.dm +++ b/code/game/objects/machinery/vending/new_marine_vendors.dm @@ -857,7 +857,7 @@ gear_to_spawn = list( /obj/item/armor_module/module/mimir_environment_protection/mimir_helmet/mark1, /obj/item/clothing/mask/gas/tactical, -// /obj/item/armor_module/module/mimir_environment_protection/mark1, RU TGMC EDIT + /obj/item/armor_module/module/mimir_environment_protection/mark1, ) /obj/effect/vendor_bundle/vali @@ -867,14 +867,12 @@ /obj/item/storage/holster/blade/machete/full_harvester, /obj/item/paper/chemsystem, ) -/* RU TGMC EDIT /obj/effect/vendor_bundle/tyr desc = "A set of specialized gear for improved close-quarters combat longevitiy." gear_to_spawn = list( /obj/item/armor_module/module/tyr_head, /obj/item/armor_module/module/tyr_extra_armor/mark1, ) -RU TGMC EDIT */ /obj/effect/vendor_bundle/robot/essentials gear_to_spawn = list( /obj/item/clothing/under/marine/robotic, diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index a0e1216d903..28308d29d5b 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -118,8 +118,8 @@ icon_state = "mod_armor" item_state = "mod_armor_a" attachment_layer = COLLAR_LAYER - soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 5, BIO = 10, FIRE = 15, ACID = 10) - slowdown = 0 + soft_armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = -10) + slowdown = 0.2 slot = ATTACHMENT_SLOT_MODULE /obj/item/armor_module/module/tyr_extra_armor/mark1 @@ -127,8 +127,8 @@ desc = "Designed for mounting on modular armor. A substantial amount of additional armor plating designed to grant the user extra protection against threats, ranging from xeno slashes to friendly fire incidents. This older version has worse protection. Will greatly impact mobility." icon_state = "mod_armor_lower" item_state = "mod_armor_lower_a" - soft_armor = list(MELEE = 10, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, BIO = 10, FIRE = 10, ACID = 10) - slowdown = 0.4 + soft_armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = -10) + slowdown = 0.2 /obj/item/armor_module/module/tyr_extra_armor/som name = "\improper Lorica Armor Reinforcement" @@ -148,7 +148,7 @@ variants_by_parent_type = list(/obj/item/clothing/head/modular/m10x = "tyr_head_xn") icon_state = "tyr_head" item_state = "tyr_head_a" - soft_armor = list(MELEE = 15, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, BIO = 10, FIRE = 10, ACID = 10) + soft_armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = -10) slot = ATTACHMENT_SLOT_HEAD_MODULE /obj/item/armor_module/module/hod_head @@ -157,7 +157,7 @@ icon = 'icons/mob/modular/modular_armor_modules.dmi' icon_state = "mod_ff_head" item_state = "mod_ff_head_a" - soft_armor = list(MELEE = 0, BULLET = 40, LASER = 40, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) + soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 15, BIO = 15, FIRE = 15, ACID = 15) slot = ATTACHMENT_SLOT_HEAD_MODULE /** @@ -169,7 +169,7 @@ icon = 'icons/mob/modular/modular_armor_modules.dmi' icon_state = "mod_biohazard" item_state = "mod_biohazard_a" - soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 40, FIRE = 0, ACID = 30) + soft_armor = list(MELEE = -10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 20, FIRE = 0, ACID = 20) slowdown = 0.2 slot = ATTACHMENT_SLOT_MODULE ///siemens coefficient mod for gas protection. @@ -196,7 +196,7 @@ desc = "Designed for mounting on modular armor. This older model provides minor resistance to acid, biological, and radiological attacks. Pairing this with a Mimir helmet module and mask will make the user impervious to xeno gas clouds. Will impact mobility." icon_state = "mod_biohazard" item_state = "mod_biohazard_a" - soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 15, FIRE = 0, ACID = 15) + soft_armor = list(MELEE = -10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 10) slowdown = 0.2 //SOM version @@ -214,14 +214,14 @@ icon_state = "mimir_head" item_state = "mimir_head_a" variants_by_parent_type = list(/obj/item/clothing/head/modular/m10x = "mimir_head_xn") - soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 15, FIRE = 0, ACID = 0) + soft_armor = list(MELEE = -10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 10) slowdown = 0 slot = ATTACHMENT_SLOT_HEAD_MODULE /obj/item/armor_module/module/mimir_environment_protection/mimir_helmet/mark1 //gas protection name = "Mark 1 Mimir Environmental Helmet System" desc = "Designed for mounting on a modular helmet. This older model provides minor resistance to acid and biological attacks. Pairing this with a Mimir suit module and mask will make the user impervious to xeno gas clouds." - soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 15, FIRE = 0, ACID = 15) + soft_armor = list(MELEE = -10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 10) //Explosive defense armor /obj/item/armor_module/module/hlin_explosive_armor @@ -243,8 +243,8 @@ icon = 'icons/mob/modular/modular_armor_modules.dmi' icon_state = "mod_ff" item_state = "mod_ff_a" - soft_armor = list(MELEE = 0, BULLET = 40, LASER = 40, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) - slowdown = 0.2 + soft_armor = list(MELEE = 15, BULLET = 60, LASER = 60, ENERGY = 15, BOMB = 15, BIO = 15, FIRE = 15, ACID = 15) + slowdown = 1.0 slot = ATTACHMENT_SLOT_MODULE /obj/item/armor_module/module/chemsystem diff --git a/code/modules/clothing/modular_armor/xenonauten.dm b/code/modules/clothing/modular_armor/xenonauten.dm index 3130243e4f8..ea0937ebdd1 100644 --- a/code/modules/clothing/modular_armor/xenonauten.dm +++ b/code/modules/clothing/modular_armor/xenonauten.dm @@ -3,7 +3,7 @@ /obj/item/clothing/suit/modular/xenonauten name = "\improper Xenonauten-M pattern armored vest" desc = "A XN-M vest, also known as Xenonauten, a set vest with modular attachments made to work in many enviroments. This one seems to be a medium variant. Alt-Click to remove attached items. Use it to toggle the built-in flashlight." - soft_armor = list(MELEE = 45, BULLET = 65, LASER = 65, ENERGY = 55, BOMB = 45, BIO = 50, FIRE = 50, ACID = 50) + soft_armor = list(MELEE = 45, BULLET = 60, LASER = 60, ENERGY = 40, BOMB = 40, BIO = 40, FIRE = 10, ACID = 45) icon_state = "chest" item_state = "chest" icon = null @@ -71,7 +71,7 @@ /obj/item/clothing/suit/modular/xenonauten/light name = "\improper Xenonauten-L pattern armored vest" desc = "A XN-L vest, also known as Xenonauten, a set vest with modular attachments made to work in many enviroments. This one seems to be a light variant. Alt-Click to remove attached items. Use it to toggle the built-in flashlight." - soft_armor = list(MELEE = 35, BULLET = 55, LASER = 55, ENERGY = 50, BOMB = 40, BIO = 45, FIRE = 45, ACID = 45) + soft_armor = list(MELEE = 35, BULLET = 50, LASER = 50, ENERGY = 30, BOMB = 30, BIO = 30, FIRE = 5, ACID = 35) slowdown = SLOWDOWN_ARMOR_VERY_LIGHT greyscale_config = /datum/greyscale_config/xenonaut/light @@ -84,7 +84,7 @@ /obj/item/clothing/suit/modular/xenonauten/heavy name = "\improper Xenonauten-H pattern armored vest" desc = "A XN-H vest, also known as Xenonauten, a set vest with modular attachments made to work in many enviroments. This one seems to be a heavy variant. Alt-Click to remove attached items. Use it to toggle the built-in flashlight." - soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 60, BOMB = 50, BIO = 50, FIRE = 50, ACID = 60) + soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 15, ACID = 55) slowdown = SLOWDOWN_ARMOR_VERY_HEAVY greyscale_config = /datum/greyscale_config/xenonaut/heavy @@ -122,9 +122,8 @@ name = "\improper TerraGov standard flak jacket" desc = "A flak jacket used by dropship pilots to protect themselves while flying in the cockpit. Excels in protecting the wearer against high-velocity solid projectiles." flags_item = NONE - soft_armor = list(MELEE = 40, BULLET = 50, LASER = 50, ENERGY = 25, BOMB = 30, BIO = 5, FIRE = 25, ACID = 30) - slowdown = 0.25 - + soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 15, ACID = 55) + slowdown = SLOWDOWN_ARMOR_MEDIUM greyscale_config = /datum/greyscale_config/xenonaut/pilot allowed = list( @@ -146,35 +145,13 @@ /obj/item/weapon/energy/sword, ) - attachments_allowed = list( - /obj/item/armor_module/module/better_shoulder_lamp, - /obj/item/armor_module/module/valkyrie_autodoc, - /obj/item/armor_module/module/fire_proof, - /obj/item/armor_module/module/tyr_extra_armor, - /obj/item/armor_module/module/tyr_extra_armor/mark1, - /obj/item/armor_module/module/mimir_environment_protection, - /obj/item/armor_module/module/mimir_environment_protection/mark1, - /obj/item/armor_module/module/hlin_explosive_armor, - /obj/item/armor_module/module/ballistic_armor, - /obj/item/armor_module/module/chemsystem, - /obj/item/armor_module/module/eshield, - - /obj/item/armor_module/storage/general, - /obj/item/armor_module/storage/ammo_mag, - /obj/item/armor_module/storage/engineering, - /obj/item/armor_module/storage/medical, - /obj/item/armor_module/storage/injector, - /obj/item/armor_module/storage/integrated, - /obj/item/armor_module/armor/badge, - ) - //Xenonauten helmets /obj/item/clothing/head/modular/m10x name = "\improper M10X pattern marine helmet" desc = "A standard M10 Pattern Helmet with attach points. It reads on the label, 'The difference between an open-casket and closed-casket funeral. Wear on head for best results.'." item_state_worn = TRUE - soft_armor = list(MELEE = 45, BULLET = 65, LASER = 65, ENERGY = 55, BOMB = 45, BIO = 50, FIRE = 50, ACID = 50) + soft_armor = list(MELEE = 45, BULLET = 60, LASER = 60, ENERGY = 40, BOMB = 40, BIO = 40, FIRE = 10, ACID = 45) attachments_allowed = list( /obj/item/armor_module/module/tyr_head, /obj/item/armor_module/module/fire_proof_helmet, @@ -243,7 +220,7 @@ /obj/item/clothing/head/modular/m10x/leader name = "\improper M11X pattern leader helmet" desc = "A slightly fancier helmet for marine leaders. This one has cushioning to project your fragile brain." - soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 60, BOMB = 50, BIO = 50, FIRE = 50, ACID = 55) + soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 15, ACID = 55) /obj/item/clothing/suit/modular/xenonauten/light/mk1 name = "\improper Xenonauten-L-MK1 pattern armored vest" From d8b3268aa4940a0a252c4f27ae278a0ff3ba5428 Mon Sep 17 00:00:00 2001 From: Kirill Date: Mon, 15 Jul 2024 15:20:32 +0500 Subject: [PATCH 3/8] =?UTF-8?q?=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D1=81=D1=82=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modular_armor/attachments/modules.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index 4ea5bce1f46..2ba2bacb39b 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -118,7 +118,7 @@ icon_state = "mod_armor" item_state = "mod_armor_a" attachment_layer = COLLAR_LAYER - soft_armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = -10) + soft_armor = list(MELEE = 20, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = -10) slowdown = 0.2 slot = ATTACHMENT_SLOT_MODULE @@ -127,7 +127,7 @@ desc = "Designed for mounting on modular armor. A substantial amount of additional armor plating designed to grant the user extra protection against threats, ranging from xeno slashes to friendly fire incidents. This older version has worse protection. Will greatly impact mobility." icon_state = "mod_armor_lower" item_state = "mod_armor_lower_a" - soft_armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = -10) + soft_armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = -15) slowdown = 0.2 /obj/item/armor_module/module/tyr_extra_armor/som @@ -157,7 +157,7 @@ icon = 'icons/mob/modular/modular_armor_modules.dmi' icon_state = "mod_ff_head" item_state = "mod_ff_head_a" - soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 15, BIO = 15, FIRE = 15, ACID = 15) + soft_armor = list(MELEE = 15, BULLET = 60, LASER = 60, ENERGY = 15, BOMB = 15, BIO = 15, FIRE = 15, ACID = 15) slot = ATTACHMENT_SLOT_HEAD_MODULE /** @@ -169,7 +169,7 @@ icon = 'icons/mob/modular/modular_armor_modules.dmi' icon_state = "mod_biohazard" item_state = "mod_biohazard_a" - soft_armor = list(MELEE = -10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 20, FIRE = 0, ACID = 20) + soft_armor = list(MELEE = -5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 20, FIRE = 0, ACID = 20) slowdown = 0.2 slot = ATTACHMENT_SLOT_MODULE ///siemens coefficient mod for gas protection. @@ -196,7 +196,7 @@ desc = "Designed for mounting on modular armor. This older model provides minor resistance to acid, biological, and radiological attacks. Pairing this with a Mimir helmet module and mask will make the user impervious to xeno gas clouds. Will impact mobility." icon_state = "mod_biohazard" item_state = "mod_biohazard_a" - soft_armor = list(MELEE = -10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 10) + soft_armor = list(MELEE = -10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 15) slowdown = 0.2 //SOM version @@ -214,14 +214,14 @@ icon_state = "mimir_head" item_state = "mimir_head_a" variants_by_parent_type = list(/obj/item/clothing/head/modular/m10x = "mimir_head_xn") - soft_armor = list(MELEE = -10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 10) + soft_armor = list(MELEE = -5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 20) slowdown = 0 slot = ATTACHMENT_SLOT_HEAD_MODULE /obj/item/armor_module/module/mimir_environment_protection/mimir_helmet/mark1 //gas protection name = "Mark 1 Mimir Environmental Helmet System" desc = "Designed for mounting on a modular helmet. This older model provides minor resistance to acid and biological attacks. Pairing this with a Mimir suit module and mask will make the user impervious to xeno gas clouds." - soft_armor = list(MELEE = -10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 10) + soft_armor = list(MELEE = -10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 15) //Explosive defense armor /obj/item/armor_module/module/hlin_explosive_armor @@ -288,7 +288,7 @@ icon_state = "mod_eshield" item_state = "mod_eshield_a" slot = ATTACHMENT_SLOT_MODULE - soft_armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) + soft_armor = list(MELEE = -5, BULLET = -5, LASER = -5, ENERGY = -5, BOMB = -5, BIO = -5, FIRE = -5, ACID = -5) ///Current shield Health var/shield_health = 0 From a110e1a0896b12de9e1f04db7b28d13bd37e2e07 Mon Sep 17 00:00:00 2001 From: Kirill Date: Tue, 16 Jul 2024 14:49:13 +0500 Subject: [PATCH 4/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=82=D1=8E=D1=802,=20=D0=BF=D0=B5=D1=80=D0=B5=D1=80=D0=B0?= =?UTF-8?q?=D1=81=D0=BA=D0=B8=D0=B4=D0=B0=D0=BB=20=D1=81=D1=82=D0=B0=D1=82?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/game/objects/items/defibrillator.dm | 1 - .../machinery/vending/new_marine_vendors.dm | 2 +- .../modular_armor/attachments/modules.dm | 24 ++++++++++++------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/defibrillator.dm b/code/game/objects/items/defibrillator.dm index e5572f75c6a..799522fdbe4 100644 --- a/code/game/objects/items/defibrillator.dm +++ b/code/game/objects/items/defibrillator.dm @@ -373,4 +373,3 @@ /obj/item/defibrillator/gloves/update_icon_state() return - diff --git a/code/game/objects/machinery/vending/new_marine_vendors.dm b/code/game/objects/machinery/vending/new_marine_vendors.dm index 5712b493dbd..e9d26b544b1 100644 --- a/code/game/objects/machinery/vending/new_marine_vendors.dm +++ b/code/game/objects/machinery/vending/new_marine_vendors.dm @@ -909,7 +909,7 @@ /obj/effect/vendor_bundle/tyr/two desc = "A set of advanced gear for improved close-quarters combat longevitiy." gear_to_spawn = list( - /obj/item/armor_module/module/tyr_head, + /obj/item/armor_module/module/tyr_head/mark2 /obj/item/armor_module/module/tyr_extra_armor, ) diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index 2ba2bacb39b..21a66f64cad 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -118,7 +118,7 @@ icon_state = "mod_armor" item_state = "mod_armor_a" attachment_layer = COLLAR_LAYER - soft_armor = list(MELEE = 20, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = -10) + soft_armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = -5, FIRE = 0, ACID = -5) slowdown = 0.2 slot = ATTACHMENT_SLOT_MODULE @@ -127,8 +127,8 @@ desc = "Designed for mounting on modular armor. A substantial amount of additional armor plating designed to grant the user extra protection against threats, ranging from xeno slashes to friendly fire incidents. This older version has worse protection. Will greatly impact mobility." icon_state = "mod_armor_lower" item_state = "mod_armor_lower_a" - soft_armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = -15) - slowdown = 0.2 + soft_armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = -5, FIRE = 0, ACID = -5) + slowdown = 0.3 /obj/item/armor_module/module/tyr_extra_armor/som name = "\improper Lorica Armor Reinforcement" @@ -148,9 +148,14 @@ variants_by_parent_type = list(/obj/item/clothing/head/modular/m10x = "tyr_head_xn") icon_state = "tyr_head" item_state = "tyr_head_a" - soft_armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = -10) + soft_armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = -5, FIRE = 0, ACID = -5) slot = ATTACHMENT_SLOT_HEAD_MODULE +/obj/item/armor_module/module/tyr_head/mark2 + name = "Tyr 2 Helmet System" + desc = "Designed for mounting on a modular helmet. When attached, this system provides substantial resistance to most damaging hazards, ranging from xeno slashes to friendly fire incidents." + soft_armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = -5, FIRE = 0, ACID = -5) + /obj/item/armor_module/module/hod_head name = "\improper Hod Helmet System" desc = "Designed for mounting on a modular helmet. When attached, this system provides substantial resistance to most gunshot wounds by providing high internal padding within the helmet's structure." @@ -159,6 +164,7 @@ item_state = "mod_ff_head_a" soft_armor = list(MELEE = 15, BULLET = 60, LASER = 60, ENERGY = 15, BOMB = 15, BIO = 15, FIRE = 15, ACID = 15) slot = ATTACHMENT_SLOT_HEAD_MODULE + slowdown = 1.0 /** * Environment protection module @@ -169,7 +175,7 @@ icon = 'icons/mob/modular/modular_armor_modules.dmi' icon_state = "mod_biohazard" item_state = "mod_biohazard_a" - soft_armor = list(MELEE = -5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 20, FIRE = 0, ACID = 20) + soft_armor = list(MELEE = -5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 10) slowdown = 0.2 slot = ATTACHMENT_SLOT_MODULE ///siemens coefficient mod for gas protection. @@ -196,8 +202,8 @@ desc = "Designed for mounting on modular armor. This older model provides minor resistance to acid, biological, and radiological attacks. Pairing this with a Mimir helmet module and mask will make the user impervious to xeno gas clouds. Will impact mobility." icon_state = "mod_biohazard" item_state = "mod_biohazard_a" - soft_armor = list(MELEE = -10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 15) - slowdown = 0.2 + soft_armor = list(MELEE = -5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 5, FIRE = 0, ACID = 5) + slowdown = 0.3 //SOM version /obj/item/armor_module/module/mimir_environment_protection/som @@ -214,14 +220,14 @@ icon_state = "mimir_head" item_state = "mimir_head_a" variants_by_parent_type = list(/obj/item/clothing/head/modular/m10x = "mimir_head_xn") - soft_armor = list(MELEE = -5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 20) + soft_armor = list(MELEE = -5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 10) slowdown = 0 slot = ATTACHMENT_SLOT_HEAD_MODULE /obj/item/armor_module/module/mimir_environment_protection/mimir_helmet/mark1 //gas protection name = "Mark 1 Mimir Environmental Helmet System" desc = "Designed for mounting on a modular helmet. This older model provides minor resistance to acid and biological attacks. Pairing this with a Mimir suit module and mask will make the user impervious to xeno gas clouds." - soft_armor = list(MELEE = -10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 15) + soft_armor = list(MELEE = -5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 5, FIRE = 0, ACID = 5) //Explosive defense armor /obj/item/armor_module/module/hlin_explosive_armor From 8b731d8773fc26fe52c740d6df72c6285c26c061 Mon Sep 17 00:00:00 2001 From: Kirill Date: Tue, 16 Jul 2024 15:44:36 +0500 Subject: [PATCH 5/8] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=20=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D1=82=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/clothing/modular_armor/attachments/modules.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index 21a66f64cad..74c4decdfa7 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -162,9 +162,9 @@ icon = 'icons/mob/modular/modular_armor_modules.dmi' icon_state = "mod_ff_head" item_state = "mod_ff_head_a" - soft_armor = list(MELEE = 15, BULLET = 60, LASER = 60, ENERGY = 15, BOMB = 15, BIO = 15, FIRE = 15, ACID = 15) + soft_armor = list(MELEE = 10, BULLET = 60, LASER = 60, ENERGY = 10, BOMB = 10, BIO = 10, FIRE = 10, ACID = 10) slot = ATTACHMENT_SLOT_HEAD_MODULE - slowdown = 1.0 + slowdown = 0.6 /** * Environment protection module @@ -249,7 +249,7 @@ icon = 'icons/mob/modular/modular_armor_modules.dmi' icon_state = "mod_ff" item_state = "mod_ff_a" - soft_armor = list(MELEE = 15, BULLET = 60, LASER = 60, ENERGY = 15, BOMB = 15, BIO = 15, FIRE = 15, ACID = 15) + soft_armor = list(MELEE = 10, BULLET = 60, LASER = 60, ENERGY = 10, BOMB = 10, BIO = 10, FIRE = 10, ACID = 10) slowdown = 1.0 slot = ATTACHMENT_SLOT_MODULE From 73cc264aae45c14a08cff2e33de35833f13e607c Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 17 Jul 2024 20:33:51 +0500 Subject: [PATCH 6/8] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20TODO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/clothing/modular_armor/attachments/modules.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index 74c4decdfa7..bb660bfc0ae 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -1,4 +1,7 @@ /** + * TODO: не забыть создать подходящее описание на русском языке для измененных модулей. Англ версия не соответствует действительности. + * + * ** Modules * These include the helmet and regular armor modules. Basically these are the subtypes of any armor 'system'. */ From 5f8dd6e488dbeff1c251b4868ecc971ba38a0b85 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 17 Jul 2024 20:40:45 +0500 Subject: [PATCH 7/8] fix --- code/modules/clothing/modular_armor/attachments/modules.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index bb660bfc0ae..cf4c8ce10b8 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -157,6 +157,8 @@ /obj/item/armor_module/module/tyr_head/mark2 name = "Tyr 2 Helmet System" desc = "Designed for mounting on a modular helmet. When attached, this system provides substantial resistance to most damaging hazards, ranging from xeno slashes to friendly fire incidents." + icon_state = "tyr_head" + item_state = "tyr_head_a" soft_armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = -5, FIRE = 0, ACID = -5) /obj/item/armor_module/module/hod_head From 2cb48680d6fce59ec63bbcd7abded9494295c8c5 Mon Sep 17 00:00:00 2001 From: Kirill Date: Thu, 18 Jul 2024 11:07:30 +0500 Subject: [PATCH 8/8] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BE=D1=88?= =?UTF-8?q?=D0=B8=D0=B1=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/game/objects/machinery/vending/new_marine_vendors.dm | 2 +- code/modules/clothing/modular_armor/attachments/modules.dm | 2 -- code/modules/clothing/modular_armor/xenonauten.dm | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/machinery/vending/new_marine_vendors.dm b/code/game/objects/machinery/vending/new_marine_vendors.dm index e9d26b544b1..b76d4c78f87 100644 --- a/code/game/objects/machinery/vending/new_marine_vendors.dm +++ b/code/game/objects/machinery/vending/new_marine_vendors.dm @@ -909,7 +909,7 @@ /obj/effect/vendor_bundle/tyr/two desc = "A set of advanced gear for improved close-quarters combat longevitiy." gear_to_spawn = list( - /obj/item/armor_module/module/tyr_head/mark2 + /obj/item/armor_module/module/tyr_head/mark2, /obj/item/armor_module/module/tyr_extra_armor, ) diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index cf4c8ce10b8..bb660bfc0ae 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -157,8 +157,6 @@ /obj/item/armor_module/module/tyr_head/mark2 name = "Tyr 2 Helmet System" desc = "Designed for mounting on a modular helmet. When attached, this system provides substantial resistance to most damaging hazards, ranging from xeno slashes to friendly fire incidents." - icon_state = "tyr_head" - item_state = "tyr_head_a" soft_armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = -5, FIRE = 0, ACID = -5) /obj/item/armor_module/module/hod_head diff --git a/code/modules/clothing/modular_armor/xenonauten.dm b/code/modules/clothing/modular_armor/xenonauten.dm index ea0937ebdd1..b40e8286f3c 100644 --- a/code/modules/clothing/modular_armor/xenonauten.dm +++ b/code/modules/clothing/modular_armor/xenonauten.dm @@ -154,6 +154,7 @@ soft_armor = list(MELEE = 45, BULLET = 60, LASER = 60, ENERGY = 40, BOMB = 40, BIO = 40, FIRE = 10, ACID = 45) attachments_allowed = list( /obj/item/armor_module/module/tyr_head, + /obj/item/armor_module/module/tyr_head/mark2, /obj/item/armor_module/module/fire_proof_helmet, /obj/item/armor_module/module/hod_head, /obj/item/armor_module/module/mimir_environment_protection/mimir_helmet, @@ -199,6 +200,7 @@ starting_attachments = list(/obj/item/armor_module/armor/visor/marine/xenonaut, /obj/item/armor_module/storage/helmet) attachments_allowed = list( /obj/item/armor_module/module/tyr_head, + /obj/item/armor_module/module/tyr_head/mark2, /obj/item/armor_module/module/fire_proof_helmet, /obj/item/armor_module/module/hod_head, /obj/item/armor_module/module/mimir_environment_protection/mimir_helmet,