From 3545588a33009f37763761eb1c5b68856afd8e28 Mon Sep 17 00:00:00 2001
From: AmShegars <88627712+AmShegars@users.noreply.github.com>
Date: Sat, 9 Dec 2023 22:43:17 +0500
Subject: [PATCH 01/10] =?UTF-8?q?=D0=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

п
---
 .../code/game/objects/items/loadout_xeno.dm   | 18 +++---
 infinity/code/game/objects/items/passport.dm  | 64 +++++++++----------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/infinity/code/game/objects/items/loadout_xeno.dm b/infinity/code/game/objects/items/loadout_xeno.dm
index ae2823398b8..25942cc80b4 100644
--- a/infinity/code/game/objects/items/loadout_xeno.dm
+++ b/infinity/code/game/objects/items/loadout_xeno.dm
@@ -1,9 +1,9 @@
-/datum/gear/passport/unathi/New()
-	..()
-	var/list/passports = list()
-	passports["independent clans registration document"] = /obj/item/passport/xeno/unathi/independent
-	passports["Moghes Hegemony registration document"] = /obj/item/passport/xeno/unathi/hegemony
-	passports["Ssen-Uuma Convent registration document"] = /obj/item/passport/xeno/unathi/convent
-	passports["Rah'Zakeh League registration document"] = /obj/item/passport/xeno/unathi/league
-	passports["Tersten Republic identity document"] = /obj/item/passport/xeno/unathi/tersten
-	gear_tweaks += new/datum/gear_tweak/path(passports)
+/datum/gear/passport/unathi/New()
+	..()
+	var/list/passports = list()
+	passports["independent clans registration document"] = /obj/item/passport/xeno/unathi/independent
+	passports["Moghes Hegemony registration document"] = /obj/item/passport/xeno/unathi/hegemony
+	passports["Ssen-Uuma Convent registration document"] = /obj/item/passport/xeno/unathi/convent
+	passports["Rah'Zakeh League registration document"] = /obj/item/passport/xeno/unathi/league
+	passports["Tersten Republic identity document"] = /obj/item/passport/xeno/unathi/tersten
+	gear_tweaks += new/datum/gear_tweak/path(passports)
diff --git a/infinity/code/game/objects/items/passport.dm b/infinity/code/game/objects/items/passport.dm
index b136a2abecb..b9363c6ae68 100644
--- a/infinity/code/game/objects/items/passport.dm
+++ b/infinity/code/game/objects/items/passport.dm
@@ -1,32 +1,32 @@
-/obj/item/passport/independent/mirania
-	icon = 'infinity/icons/obj/item/passport.dmi'
-	icon_state = "passport_mir"
-	
-/obj/item/passport/xeno/unathi/independent
-	name = "\improper independent clans registration document"
-	icon_state = "passport"
-	desc = "A document that indentifies its bearer as a member of a minor clan that is not aligned with any major power."
-	
-/obj/item/passport/xeno/unathi/hegemony
-	name = "\improper Moghes Hegemony registration document"
-	icon = 'infinity/icons/obj/item/passport.dmi'
-	icon_state = "passport_unathi_heg"
-	desc = "A document that indentifies its bearer as a registered denizen of the Moghes Hegemony."
-	
-/obj/item/passport/xeno/unathi/convent
-	name = "\improper Ssen-Uuma Convent registration document"
-	icon = 'infinity/icons/obj/item/passport.dmi'
-	icon_state = "passport_unathi_conv"
-	desc = "A document that indentifies its bearer as a registered denizen of the Ssen-Uuma Convent."
-	
-/obj/item/passport/xeno/unathi/league
-	name = "\improper Rah'Zakeh League registration document"
-	icon = 'infinity/icons/obj/item/passport.dmi'
-	icon_state = "passport_unathi_league"
-	desc = "A document that indentifies its bearer as a registered denizen of the Rah'Zakeh League."
-	
-/obj/item/passport/xeno/unathi/tersten
-	name = "\improper Tersten Republic identity document"
-	icon = 'infinity/icons/obj/item/passport.dmi'
-	icon_state = "passport_unathi_tersten"
-	desc = "Issued by the Tersten Republic to its Unathi inhabitants, this document identifies its bearer as a citizen of the Republic, while also acting as a permanent residence permit across the rest of the SCG space."
+/obj/item/passport/independent/mirania
+	icon = 'infinity/icons/obj/item/passport.dmi'
+	icon_state = "passport_mir"
+	
+/obj/item/passport/xeno/unathi/independent
+	name = "\improper independent clans registration document"
+	icon_state = "passport"
+	desc = "A document that indentifies its bearer as a member of a minor clan that is not aligned with any major power."
+	
+/obj/item/passport/xeno/unathi/hegemony
+	name = "\improper Moghes Hegemony registration document"
+	icon = 'infinity/icons/obj/item/passport.dmi'
+	icon_state = "passport_unathi_heg"
+	desc = "A document that indentifies its bearer as a registered denizen of the Moghes Hegemony."
+	
+/obj/item/passport/xeno/unathi/convent
+	name = "\improper Ssen-Uuma Convent registration document"
+	icon = 'infinity/icons/obj/item/passport.dmi'
+	icon_state = "passport_unathi_conv"
+	desc = "A document that indentifies its bearer as a registered denizen of the Ssen-Uuma Convent."
+	
+/obj/item/passport/xeno/unathi/league
+	name = "\improper Rah'Zakeh League registration document"
+	icon = 'infinity/icons/obj/item/passport.dmi'
+	icon_state = "passport_unathi_league"
+	desc = "A document that indentifies its bearer as a registered denizen of the Rah'Zakeh League."
+	
+/obj/item/passport/xeno/unathi/tersten
+	name = "\improper Tersten Republic identity document"
+	icon = 'infinity/icons/obj/item/passport.dmi'
+	icon_state = "passport_unathi_tersten"
+	desc = "Issued by the Tersten Republic to its Unathi inhabitants, this document identifies its bearer as a citizen of the Republic, while also acting as a permanent residence permit across the rest of the SCG space."

From 2dfb1385046cb7bd9e0ec7396a7b10a9a65eedf0 Mon Sep 17 00:00:00 2001
From: AmShegars <88627712+AmShegars@users.noreply.github.com>
Date: Sun, 10 Dec 2023 20:29:39 +0500
Subject: [PATCH 02/10] Rods thowers fixes (Vs mech and slimes)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Прутья, запущенные в мехов и слаймов, не могут прибить их к полу (КАК это вообще может произойти?!)
Теперь, в меха влетает опр урон (Зависит от силы броска).
---
 code/modules/mob/living/living_defense.dm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 739a0ce1b68..dad81c93c3d 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -164,7 +164,11 @@
 			mass = I.w_class/THROWNOBJ_KNOCKBACK_DIVISOR
 		var/momentum = TT.speed*mass
 
-		if(momentum >= THROWNOBJ_KNOCKBACK_SPEED)
+		if(momentum >= THROWNOBJ_KNOCKBACK_SPEED | can_be_buckled)
+			if(!can_be_buckled)//Not effective vs slimes and mechs
+				visible_message("<span class='warning'>[O] flyes away from [src]!</span>","<span class='warning'>The projectile was ineffective against you!</span>")
+				apply_damage(throw_damage*1.4, BRUTE) //[INF] Мехи и слаймы не прибиваются, а просто получают урон. Учтите, он проходит сквозь энергощит меха.
+				return
 			var/dir = TT.init_dir
 
 			visible_message("<span class='warning'>\The [src] staggers under the impact!</span>","<span class='warning'>You stagger under the impact!</span>")
@@ -398,4 +402,4 @@
 		return
 	amount *= 1
 	if(amount > 0)
-		adjustToxLoss(amount)
\ No newline at end of file
+		adjustToxLoss(amount)

From d334944cfe1750cd2357dbb871b71115cc205dc7 Mon Sep 17 00:00:00 2001
From: AmShegars <88627712+AmShegars@users.noreply.github.com>
Date: Tue, 12 Dec 2023 20:03:29 +0500
Subject: [PATCH 03/10] =?UTF-8?q?Revert=20"=D0=BF"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3545588a33009f37763761eb1c5b68856afd8e28.
---
 .../code/game/objects/items/loadout_xeno.dm   | 18 +++---
 infinity/code/game/objects/items/passport.dm  | 64 +++++++++----------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/infinity/code/game/objects/items/loadout_xeno.dm b/infinity/code/game/objects/items/loadout_xeno.dm
index 25942cc80b4..ae2823398b8 100644
--- a/infinity/code/game/objects/items/loadout_xeno.dm
+++ b/infinity/code/game/objects/items/loadout_xeno.dm
@@ -1,9 +1,9 @@
-/datum/gear/passport/unathi/New()
-	..()
-	var/list/passports = list()
-	passports["independent clans registration document"] = /obj/item/passport/xeno/unathi/independent
-	passports["Moghes Hegemony registration document"] = /obj/item/passport/xeno/unathi/hegemony
-	passports["Ssen-Uuma Convent registration document"] = /obj/item/passport/xeno/unathi/convent
-	passports["Rah'Zakeh League registration document"] = /obj/item/passport/xeno/unathi/league
-	passports["Tersten Republic identity document"] = /obj/item/passport/xeno/unathi/tersten
-	gear_tweaks += new/datum/gear_tweak/path(passports)
+/datum/gear/passport/unathi/New()
+	..()
+	var/list/passports = list()
+	passports["independent clans registration document"] = /obj/item/passport/xeno/unathi/independent
+	passports["Moghes Hegemony registration document"] = /obj/item/passport/xeno/unathi/hegemony
+	passports["Ssen-Uuma Convent registration document"] = /obj/item/passport/xeno/unathi/convent
+	passports["Rah'Zakeh League registration document"] = /obj/item/passport/xeno/unathi/league
+	passports["Tersten Republic identity document"] = /obj/item/passport/xeno/unathi/tersten
+	gear_tweaks += new/datum/gear_tweak/path(passports)
diff --git a/infinity/code/game/objects/items/passport.dm b/infinity/code/game/objects/items/passport.dm
index b9363c6ae68..b136a2abecb 100644
--- a/infinity/code/game/objects/items/passport.dm
+++ b/infinity/code/game/objects/items/passport.dm
@@ -1,32 +1,32 @@
-/obj/item/passport/independent/mirania
-	icon = 'infinity/icons/obj/item/passport.dmi'
-	icon_state = "passport_mir"
-	
-/obj/item/passport/xeno/unathi/independent
-	name = "\improper independent clans registration document"
-	icon_state = "passport"
-	desc = "A document that indentifies its bearer as a member of a minor clan that is not aligned with any major power."
-	
-/obj/item/passport/xeno/unathi/hegemony
-	name = "\improper Moghes Hegemony registration document"
-	icon = 'infinity/icons/obj/item/passport.dmi'
-	icon_state = "passport_unathi_heg"
-	desc = "A document that indentifies its bearer as a registered denizen of the Moghes Hegemony."
-	
-/obj/item/passport/xeno/unathi/convent
-	name = "\improper Ssen-Uuma Convent registration document"
-	icon = 'infinity/icons/obj/item/passport.dmi'
-	icon_state = "passport_unathi_conv"
-	desc = "A document that indentifies its bearer as a registered denizen of the Ssen-Uuma Convent."
-	
-/obj/item/passport/xeno/unathi/league
-	name = "\improper Rah'Zakeh League registration document"
-	icon = 'infinity/icons/obj/item/passport.dmi'
-	icon_state = "passport_unathi_league"
-	desc = "A document that indentifies its bearer as a registered denizen of the Rah'Zakeh League."
-	
-/obj/item/passport/xeno/unathi/tersten
-	name = "\improper Tersten Republic identity document"
-	icon = 'infinity/icons/obj/item/passport.dmi'
-	icon_state = "passport_unathi_tersten"
-	desc = "Issued by the Tersten Republic to its Unathi inhabitants, this document identifies its bearer as a citizen of the Republic, while also acting as a permanent residence permit across the rest of the SCG space."
+/obj/item/passport/independent/mirania
+	icon = 'infinity/icons/obj/item/passport.dmi'
+	icon_state = "passport_mir"
+	
+/obj/item/passport/xeno/unathi/independent
+	name = "\improper independent clans registration document"
+	icon_state = "passport"
+	desc = "A document that indentifies its bearer as a member of a minor clan that is not aligned with any major power."
+	
+/obj/item/passport/xeno/unathi/hegemony
+	name = "\improper Moghes Hegemony registration document"
+	icon = 'infinity/icons/obj/item/passport.dmi'
+	icon_state = "passport_unathi_heg"
+	desc = "A document that indentifies its bearer as a registered denizen of the Moghes Hegemony."
+	
+/obj/item/passport/xeno/unathi/convent
+	name = "\improper Ssen-Uuma Convent registration document"
+	icon = 'infinity/icons/obj/item/passport.dmi'
+	icon_state = "passport_unathi_conv"
+	desc = "A document that indentifies its bearer as a registered denizen of the Ssen-Uuma Convent."
+	
+/obj/item/passport/xeno/unathi/league
+	name = "\improper Rah'Zakeh League registration document"
+	icon = 'infinity/icons/obj/item/passport.dmi'
+	icon_state = "passport_unathi_league"
+	desc = "A document that indentifies its bearer as a registered denizen of the Rah'Zakeh League."
+	
+/obj/item/passport/xeno/unathi/tersten
+	name = "\improper Tersten Republic identity document"
+	icon = 'infinity/icons/obj/item/passport.dmi'
+	icon_state = "passport_unathi_tersten"
+	desc = "Issued by the Tersten Republic to its Unathi inhabitants, this document identifies its bearer as a citizen of the Republic, while also acting as a permanent residence permit across the rest of the SCG space."

From a852c44f3e5216c959fa583af424ea729cc7d9ee Mon Sep 17 00:00:00 2001
From: AmShegars <88627712+AmShegars@users.noreply.github.com>
Date: Thu, 14 Dec 2023 10:41:51 +0500
Subject: [PATCH 04/10] Many shit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Всё в ПРе.
---
 .../definitions/materials_organic.dm          |  2 ++
 code/modules/mechs/components/armour.dm       | 12 +++----
 code/modules/mechs/components/body.dm         | 16 +++++++--
 code/modules/mechs/mech_damage.dm             | 34 ++++++++++++++++---
 code/modules/mechs/premade/combat.dm          |  6 +++-
 code/modules/mechs/premade/heavy.dm           |  4 +--
 code/modules/mechs/premade/light.dm           |  2 +-
 code/modules/mechs/premade/powerloader.dm     |  8 ++---
 infinity/code/modules/mechs/armour.dm         |  9 +++--
 9 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/code/modules/materials/definitions/materials_organic.dm b/code/modules/materials/definitions/materials_organic.dm
index 00e8c0b36b0..2065f604a73 100644
--- a/code/modules/materials/definitions/materials_organic.dm
+++ b/code/modules/materials/definitions/materials_organic.dm
@@ -9,6 +9,7 @@
 	icon_colour = COLOR_WHITE
 	hardness = MATERIAL_FLEXIBLE
 	weight = 5
+	integrity = 50
 	melting_point = T0C+371 //assuming heat resistant plastic
 	stack_origin_tech = list(TECH_MATERIAL = 3)
 	conductive = 0
@@ -61,6 +62,7 @@
 	hardness = MATERIAL_SOFT
 	weight = 1
 	brute_armor = 1
+	integrity = 10
 	conductive = 0
 	stack_type = null
 	hidden_from_codex = TRUE
diff --git a/code/modules/mechs/components/armour.dm b/code/modules/mechs/components/armour.dm
index e67f5815d42..4818a46e579 100644
--- a/code/modules/mechs/components/armour.dm
+++ b/code/modules/mechs/components/armour.dm
@@ -37,13 +37,13 @@
 	icon_state = "armor_e"
 	icon_state_broken = "armor_e_broken"
 	armor = list(
-		melee = ARMOR_MELEE_RESISTANT ,
-		bullet = ARMOR_BALLISTIC_SMALL,
-		laser = ARMOR_LASER_SMALL,
+		melee = ARMOR_MELEE_RESISTANT,
+		bullet = ARMOR_BALLISTIC_PISTOL,
+		laser = ARMOR_LASER_HANDGUNS,
 		energy = ARMOR_ENERGY_SHIELDED,
-		bomb = ARMOR_BOMB_MINOR,
+		bomb = ARMOR_BOMB_PADDED,
 		bio = ARMOR_BIO_SHIELDED,
-		rad = ARMOR_RAD_SMALL
+		rad = ARMOR_RAD_MINOR
 		)
 	origin_tech = list(TECH_MATERIAL = 3)
 
@@ -64,4 +64,4 @@
 
 /obj/item/robot_parts/robot_component/armour/exosuit/Initialize()
 	. = ..()
-	set_extension(src, /datum/extension/armor/mech, armor)
\ No newline at end of file
+	set_extension(src, /datum/extension/armor/mech, armor)
diff --git a/code/modules/mechs/components/body.dm b/code/modules/mechs/components/body.dm
index 764dc12b585..b93ca3e1bd6 100644
--- a/code/modules/mechs/components/body.dm
+++ b/code/modules/mechs/components/body.dm
@@ -1,4 +1,4 @@
-/obj/item/storage/mech
+/obj/item/storage/mech //[INF] Сам багажник меха
 	w_class = ITEM_SIZE_NO_CONTAINER
 	max_w_class = ITEM_SIZE_LARGE
 	storage_slots = 4
@@ -21,8 +21,18 @@
 	name = "body"
 	icon_state = "loader_body"
 	gender = NEUTER
-
-	var/mech_health = 300
+//*=======REINFORCES FOR MECH===================
+//[INF]ХП корпуса будет зависить от материала, которым обшивают меха. Чем он прочнее (больше Integrity), тем больше мех вытерпливает поджопников до полного разрушения
+// Плассталь 400 (550 ХП)
+// Сталь 150 (300 ХП)
+// Титан 200 (350 ХП)
+// Аллюминий 125 (275 ХП)
+// Алмазы 150 (300 ХП)
+// Пластик 50 (200 ХП)
+// Стекло 50 (200 хп)
+// Золото 100 (250 ХП)
+// Серебро 150 (300 ХП)
+	var/mech_health = 150 //в updatehealth() добавляется хп от укрепления ресурсом.
 	var/obj/item/cell/cell
 	var/obj/item/robot_parts/robot_component/diagnosis_unit/diagnostics
 	var/obj/item/robot_parts/robot_component/armour/exosuit/m_armour
diff --git a/code/modules/mechs/mech_damage.dm b/code/modules/mechs/mech_damage.dm
index 759cb21cab4..440e126da9e 100644
--- a/code/modules/mechs/mech_damage.dm
+++ b/code/modules/mechs/mech_damage.dm
@@ -43,7 +43,7 @@
 					return AR
 
 	return def_zone //Careful with effects, mechs shouldn't be stunned
-	
+
 /mob/living/exosuit/hitby(atom/movable/AM, var/datum/thrownthing/TT)
 	if(LAZYLEN(pilots) && (!hatch_closed || !prob(body.pilot_coverage)))
 		var/mob/living/pilot = pick(pilots)
@@ -65,8 +65,8 @@
 		if(body_armor)
 			. += body_armor
 
-/mob/living/exosuit/updatehealth()
-	maxHealth = body ? body.mech_health : 0
+/mob/living/exosuit/updatehealth() //Самая крепкая сборка Тяжёлая броня + плассталь может жить вполне прилично (500 + 400)
+	maxHealth = body ? (body.mech_health + material.integrity) : 0 //[INF] Обьяснение логики в code/modules/mechs/components/body
 	health = maxHealth-(getFireLoss()+getBruteLoss())
 
 /mob/living/exosuit/adjustFireLoss(var/amount, var/obj/item/mech_component/MC = pick(list(arms, legs, body, head)))
@@ -126,9 +126,33 @@
 	var/target = zoneToComponent(def_zone)
 	//Only 3 types of damage concern mechs and vehicles
 	switch(damagetype)
+	//==============================================RENFORCE MATERIAL=============================================================
+	//This code response for mech reiforce - melting(heat), brute and burn defense . Hear writed all material modifiers (Steel - Standart (Brute 7 Burn 7))
+	//Картон(Carboard). brute 1 burn 2
+	// Сталь (Steel) brute 2 burn не выставлен
+	//Плассталь (Plasteel) burn 10 brute 8
+	//Алмаз(Diamond) brute 10 burn 50
+	//Пластик(Plastic) brute 2 burn 2
+	//Стекло(Glass) brute 1 burn 2
+	//Серебро(Silver) brute 2 burn 2
+	//Платина (Platinum) brute 2 burn 2
+	//Золото (Gold) burte 2 burn 2
+	//Аллюминий (Alluminium) brute 2 burn 2
+	//Сталь (Steel) brute 7 burn 7 <---- STANDART
+	//Титан (Titan) brute 10 burn 8
 		if(BRUTE)
+			//Здесь формула что призовёт материал БРУТ //max = 20
+			var/brute_resist = ((material.brute_armor-7)) // Макс защита - 4 от брута, 8 от бёрна
+			if(brute_resist > 4)
+				brute_resist = 4
+			damage = damage - brute_resist
 			adjustBruteLoss(damage, target)
 		if(BURN)
+			//Здесь формула что призовёт материал БЁРН
+			var/burn_resist = ((material.burn_armor-7))
+			if(burn_resist > 8)
+				burn_resist = 5
+			damage = damage - burn_resist
 			adjustFireLoss(damage, target)
 		if(IRRADIATE)
 			for(var/mob/living/pilot in pilots)
@@ -149,7 +173,7 @@
 	if(!hatch_closed || (body.pilot_coverage < 100)) //Open, environment is the source
 		return .
 	var/list/after_armor = modify_damage_by_armor(null, ., IRRADIATE, DAM_DISPERSED, src, 0, TRUE)
-	return after_armor[1]	
+	return after_armor[1]
 
 /mob/living/exosuit/getFireLoss()
 	var/total = 0
@@ -185,6 +209,6 @@
 			for(var/thing in pilots)
 				var/mob/pilot = thing
 				pilot.emp_act(severity)
-				
+
 /mob/living/exosuit/get_bullet_impact_effect_type(def_zone)
 	return BULLET_IMPACT_METAL
diff --git a/code/modules/mechs/premade/combat.dm b/code/modules/mechs/premade/combat.dm
index 520b8d4fdbd..21afc0d72e7 100644
--- a/code/modules/mechs/premade/combat.dm
+++ b/code/modules/mechs/premade/combat.dm
@@ -40,6 +40,7 @@
 	name = "combat arms"
 	exosuit_desc_string = "flexible, advanced manipulators"
 	icon_state = "combat_arms"
+	max_damage = 60
 	melee_damage = 25
 	action_delay = 10
 	power_use = 50
@@ -48,6 +49,7 @@
 	name = "combat legs"
 	exosuit_desc_string = "sleek hydraulic legs"
 	icon_state = "combat_legs"
+	max_damage = 60
 	move_delay = 3
 	turn_delay = 3
 	power_use = 20
@@ -55,6 +57,7 @@
 /obj/item/mech_component/sensors/combat
 	name = "combat sensors"
 	gender = PLURAL
+	max_damage = 60
 	exosuit_desc_string = "high-resolution thermal sensors"
 	icon_state = "combat_head"
 	vision_flags = SEE_MOBS
@@ -67,9 +70,10 @@
 	software.installed_software = list(MECH_SOFTWARE_WEAPONS)
 
 /obj/item/mech_component/chassis/combat
-	name = "sealed exosuit chassis"
+	name = "combat exosuit chassis"
 	hatch_descriptor = "canopy"
 	pilot_coverage = 100
+	max_damage = 100 //[INF]+40 хп
 	exosuit_desc_string = "an armoured chassis"
 	icon_state = "combat_body"
 	power_use = 40
diff --git a/code/modules/mechs/premade/heavy.dm b/code/modules/mechs/premade/heavy.dm
index 2fcb6ced4d4..188e77b90c4 100644
--- a/code/modules/mechs/premade/heavy.dm
+++ b/code/modules/mechs/premade/heavy.dm
@@ -31,7 +31,7 @@
 	desc = "Designed to function where any other piece of equipment would have long fallen apart, the Hephaestus Superheavy Lifter series can take a beating and excel at delivering it."
 	melee_damage = 40
 	action_delay = 15
-	max_damage = 90
+	max_damage = 160
 	power_use = 60
 
 /obj/item/mech_component/propulsion/heavy
@@ -64,7 +64,7 @@
 	pilot_coverage = 100
 	exosuit_desc_string = "a heavily armoured chassis"
 	icon_state = "heavy_body"
-	max_damage = 150
+	max_damage = 160
 	mech_health = 500
 	power_use = 50
 	has_hardpoints = list(HARDPOINT_BACK)
diff --git a/code/modules/mechs/premade/light.dm b/code/modules/mechs/premade/light.dm
index 18fef2391e9..ad5a0c388bd 100644
--- a/code/modules/mechs/premade/light.dm
+++ b/code/modules/mechs/premade/light.dm
@@ -54,7 +54,7 @@
 	gender = PLURAL
 	exosuit_desc_string = "advanced sensor array"
 	icon_state = "light_head"
-	max_damage = 30
+	max_damage = 45
 	vision_flags = SEE_TURFS
 	see_invisible = SEE_INVISIBLE_NOLIGHTING
 	power_use = 50
diff --git a/code/modules/mechs/premade/powerloader.dm b/code/modules/mechs/premade/powerloader.dm
index abf2705d766..27f4ab2ba96 100644
--- a/code/modules/mechs/premade/powerloader.dm
+++ b/code/modules/mechs/premade/powerloader.dm
@@ -43,7 +43,7 @@
 	name = "exosuit arms"
 	exosuit_desc_string = "heavy-duty industrial lifters"
 	melee_damage = 25
-	max_damage = 70
+	max_damage = 50 //[INF] было 70
 	power_use = 30
 	desc = "The Xion Industrial Digital Interaction Manifolds allow you poke untold dangers from the relative safety of your cockpit."
 
@@ -51,7 +51,7 @@
 	name = "exosuit legs"
 	exosuit_desc_string = "reinforced hydraulic legs"
 	desc = "Wide and stable but not particularly fast."
-	max_damage = 70
+	max_damage = 50 //[INF] было 70
 	move_delay = 4
 	turn_delay = 4
 	power_use = 10
@@ -61,7 +61,7 @@
 	gender = PLURAL
 	exosuit_desc_string = "simple collision detection sensors"
 	desc = "A primitive set of sensors designed to work in tandem with most MKI Eyeball platforms."
-	max_damage = 100
+	max_damage = 50 //[INF] было 100(чё)
 	power_use = 0
 
 /obj/item/mech_component/sensors/powerloader/prebuild()
@@ -75,7 +75,7 @@
 	pilot_coverage = 40
 	exosuit_desc_string = "an industrial rollcage"
 	desc = "A Xion industrial brand roll cage. Technically OSHA compliant. Technically."
-	max_damage = 100
+	max_damage = 60 //[INF] Теперь стандартное хп. Карго пузо НЕ должно быть крепче боевой туши
 	power_use = 0
 	climb_time = 6
 
diff --git a/infinity/code/modules/mechs/armour.dm b/infinity/code/modules/mechs/armour.dm
index d886f90e450..a1f42c218a9 100644
--- a/infinity/code/modules/mechs/armour.dm
+++ b/infinity/code/modules/mechs/armour.dm
@@ -2,12 +2,11 @@
 	name = "tactical combat plating"
 	desc = "Special combat plating, designed for operating in field of battle."
 	armor = list(
-		melee = ARMOR_MELEE_VERY_HIGH,
-		bullet = ARMOR_BALLISTIC_RIFLE,
-		laser = ARMOR_LASER_RIFLES,
-		energy = ARMOR_ENERGY_STRONG,
+		melee = ARMOR_MELEE_MAJOR + 5, //55
+		bullet = ARMOR_BALLISTIC_RESISTANT, //65
+		laser = ARMOR_LASER_MAJOR, //55
+		energy = ARMOR_ENERGY_STRONG, //EMP dont work actually
 		bomb = ARMOR_BOMB_RESISTANT,
-		rad = ARMOR_RAD_RESISTANT,
 		bio = ARMOR_BIO_SHIELDED
 		)
 	origin_tech = list(TECH_MATERIAL = 7)

From 819754973b611a90ccfc3248465c59951c495082 Mon Sep 17 00:00:00 2001
From: AmShegars <88627712+AmShegars@users.noreply.github.com>
Date: Mon, 25 Dec 2023 21:22:50 +0500
Subject: [PATCH 05/10] Update infinity/code/modules/mechs/armour.dm

Co-authored-by: SuhEugene <32931701+SuhEugene@users.noreply.github.com>
---
 infinity/code/modules/mechs/armour.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/infinity/code/modules/mechs/armour.dm b/infinity/code/modules/mechs/armour.dm
index a1f42c218a9..458bcfc2ab5 100644
--- a/infinity/code/modules/mechs/armour.dm
+++ b/infinity/code/modules/mechs/armour.dm
@@ -2,9 +2,9 @@
 	name = "tactical combat plating"
 	desc = "Special combat plating, designed for operating in field of battle."
 	armor = list(
-		melee = ARMOR_MELEE_MAJOR + 5, //55
-		bullet = ARMOR_BALLISTIC_RESISTANT, //65
-		laser = ARMOR_LASER_MAJOR, //55
+		melee = ARMOR_MELEE_MAJOR + 5,
+		bullet = ARMOR_BALLISTIC_RESISTANT,
+		laser = ARMOR_LASER_MAJOR,
 		energy = ARMOR_ENERGY_STRONG, //EMP dont work actually
 		bomb = ARMOR_BOMB_RESISTANT,
 		bio = ARMOR_BIO_SHIELDED

From 99764cde7381ce3bcabab4076615fe677d8708e9 Mon Sep 17 00:00:00 2001
From: AmShegars <88627712+AmShegars@users.noreply.github.com>
Date: Mon, 25 Dec 2023 21:27:59 +0500
Subject: [PATCH 06/10] Update mech_damage.dm

---
 code/modules/mechs/mech_damage.dm | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/code/modules/mechs/mech_damage.dm b/code/modules/mechs/mech_damage.dm
index 440e126da9e..2941676b11c 100644
--- a/code/modules/mechs/mech_damage.dm
+++ b/code/modules/mechs/mech_damage.dm
@@ -128,27 +128,15 @@
 	switch(damagetype)
 	//==============================================RENFORCE MATERIAL=============================================================
 	//This code response for mech reiforce - melting(heat), brute and burn defense . Hear writed all material modifiers (Steel - Standart (Brute 7 Burn 7))
-	//Картон(Carboard). brute 1 burn 2
-	// Сталь (Steel) brute 2 burn не выставлен
-	//Плассталь (Plasteel) burn 10 brute 8
-	//Алмаз(Diamond) brute 10 burn 50
-	//Пластик(Plastic) brute 2 burn 2
-	//Стекло(Glass) brute 1 burn 2
-	//Серебро(Silver) brute 2 burn 2
-	//Платина (Platinum) brute 2 burn 2
-	//Золото (Gold) burte 2 burn 2
-	//Аллюминий (Alluminium) brute 2 burn 2
-	//Сталь (Steel) brute 7 burn 7 <---- STANDART
-	//Титан (Titan) brute 10 burn 8
 		if(BRUTE)
-			//Здесь формула что призовёт материал БРУТ //max = 20
+			//Данная формула призывает БРУТ материала
 			var/brute_resist = ((material.brute_armor-7)) // Макс защита - 4 от брута, 8 от бёрна
 			if(brute_resist > 4)
 				brute_resist = 4
 			damage = damage - brute_resist
 			adjustBruteLoss(damage, target)
 		if(BURN)
-			//Здесь формула что призовёт материал БЁРН
+			//Данная формула призывает БЁРН материала
 			var/burn_resist = ((material.burn_armor-7))
 			if(burn_resist > 8)
 				burn_resist = 5

From 91de41c4d798909ce0a6623ca0648e4b392d6627 Mon Sep 17 00:00:00 2001
From: AmShegars <88627712+AmShegars@users.noreply.github.com>
Date: Mon, 25 Dec 2023 21:29:04 +0500
Subject: [PATCH 07/10] Update body.dm

---
 code/modules/mechs/components/body.dm | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/code/modules/mechs/components/body.dm b/code/modules/mechs/components/body.dm
index b93ca3e1bd6..443ccd2afb5 100644
--- a/code/modules/mechs/components/body.dm
+++ b/code/modules/mechs/components/body.dm
@@ -23,15 +23,6 @@
 	gender = NEUTER
 //*=======REINFORCES FOR MECH===================
 //[INF]ХП корпуса будет зависить от материала, которым обшивают меха. Чем он прочнее (больше Integrity), тем больше мех вытерпливает поджопников до полного разрушения
-// Плассталь 400 (550 ХП)
-// Сталь 150 (300 ХП)
-// Титан 200 (350 ХП)
-// Аллюминий 125 (275 ХП)
-// Алмазы 150 (300 ХП)
-// Пластик 50 (200 ХП)
-// Стекло 50 (200 хп)
-// Золото 100 (250 ХП)
-// Серебро 150 (300 ХП)
 	var/mech_health = 150 //в updatehealth() добавляется хп от укрепления ресурсом.
 	var/obj/item/cell/cell
 	var/obj/item/robot_parts/robot_component/diagnosis_unit/diagnostics

From 7b3a1720cad36826f953f6d8bb0ddf315dfd8195 Mon Sep 17 00:00:00 2001
From: AmShegars <88627712+AmShegars@users.noreply.github.com>
Date: Mon, 25 Dec 2023 21:29:30 +0500
Subject: [PATCH 08/10] Update code/modules/mechs/mech_damage.dm

Co-authored-by: SuhEugene <32931701+SuhEugene@users.noreply.github.com>
---
 code/modules/mechs/mech_damage.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mechs/mech_damage.dm b/code/modules/mechs/mech_damage.dm
index 2941676b11c..30d885646e4 100644
--- a/code/modules/mechs/mech_damage.dm
+++ b/code/modules/mechs/mech_damage.dm
@@ -65,7 +65,7 @@
 		if(body_armor)
 			. += body_armor
 
-/mob/living/exosuit/updatehealth() //Самая крепкая сборка Тяжёлая броня + плассталь может жить вполне прилично (500 + 400)
+/mob/living/exosuit/updatehealth()
 	maxHealth = body ? (body.mech_health + material.integrity) : 0 //[INF] Обьяснение логики в code/modules/mechs/components/body
 	health = maxHealth-(getFireLoss()+getBruteLoss())
 

From fdf1f08c61a9b6bfad8cebab807bfd1ea246bac6 Mon Sep 17 00:00:00 2001
From: AmShegars <88627712+AmShegars@users.noreply.github.com>
Date: Mon, 25 Dec 2023 21:30:19 +0500
Subject: [PATCH 09/10] Update code/modules/mob/living/living_defense.dm

Co-authored-by: SuhEugene <32931701+SuhEugene@users.noreply.github.com>
---
 code/modules/mob/living/living_defense.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index dad81c93c3d..efc052613b4 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -164,7 +164,7 @@
 			mass = I.w_class/THROWNOBJ_KNOCKBACK_DIVISOR
 		var/momentum = TT.speed*mass
 
-		if(momentum >= THROWNOBJ_KNOCKBACK_SPEED | can_be_buckled)
+		if(momentum >= THROWNOBJ_KNOCKBACK_SPEED || can_be_buckled)
 			if(!can_be_buckled)//Not effective vs slimes and mechs
 				visible_message("<span class='warning'>[O] flyes away from [src]!</span>","<span class='warning'>The projectile was ineffective against you!</span>")
 				apply_damage(throw_damage*1.4, BRUTE) //[INF] Мехи и слаймы не прибиваются, а просто получают урон. Учтите, он проходит сквозь энергощит меха.

From b76080e0eaa90de88755f3467339bf3a364b774f Mon Sep 17 00:00:00 2001
From: AmShegars <88627712+AmShegars@users.noreply.github.com>
Date: Mon, 25 Dec 2023 21:37:57 +0500
Subject: [PATCH 10/10] Update mech_damage.dm

---
 code/modules/mechs/mech_damage.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/mechs/mech_damage.dm b/code/modules/mechs/mech_damage.dm
index 30d885646e4..4ffab699588 100644
--- a/code/modules/mechs/mech_damage.dm
+++ b/code/modules/mechs/mech_damage.dm
@@ -129,14 +129,14 @@
 	//==============================================RENFORCE MATERIAL=============================================================
 	//This code response for mech reiforce - melting(heat), brute and burn defense . Hear writed all material modifiers (Steel - Standart (Brute 7 Burn 7))
 		if(BRUTE)
-			//Данная формула призывает БРУТ материала
+			//Данная формула использует БРУТ АРМОР материала, которым обшили меха (Его каркас)
 			var/brute_resist = ((material.brute_armor-7)) // Макс защита - 4 от брута, 8 от бёрна
 			if(brute_resist > 4)
 				brute_resist = 4
 			damage = damage - brute_resist
 			adjustBruteLoss(damage, target)
 		if(BURN)
-			//Данная формула призывает БЁРН материала
+			//Данная формула использует БЁРН АРМОР материала, которым обшили меха (Его каркас)
 			var/burn_resist = ((material.burn_armor-7))
 			if(burn_resist > 8)
 				burn_resist = 5