diff --git a/code/modules/heavy_vehicle/components/_components.dm b/code/modules/heavy_vehicle/components/_components.dm
index b27f34377a2..428d8c547c4 100644
--- a/code/modules/heavy_vehicle/components/_components.dm
+++ b/code/modules/heavy_vehicle/components/_components.dm
@@ -9,7 +9,7 @@
var/total_damage = 0
var/brute_damage = 0
var/burn_damage = 0
- var/max_damage = 60
+ var/max_damage = 120
var/damage_state = 1
var/list/has_hardpoints = list()
var/power_use = 0
@@ -148,4 +148,4 @@
repair_burn_damage(25)
to_chat(user, "You mend the damage to \the [src]'s wiring.")
playsound(user.loc, 'sound/items/Deconstruct.ogg', 25, 1)
- return
\ No newline at end of file
+ return
diff --git a/code/modules/heavy_vehicle/components/arms.dm b/code/modules/heavy_vehicle/components/arms.dm
index 7953adcbf15..0fe5c2f0e57 100644
--- a/code/modules/heavy_vehicle/components/arms.dm
+++ b/code/modules/heavy_vehicle/components/arms.dm
@@ -15,6 +15,7 @@
/obj/item/mech_component/manipulators/Destroy()
QDEL_NULL(motivator)
. = ..()
+
/obj/item/mech_component/manipulators/show_missing_parts(var/mob/user)
if(!motivator)
to_chat(user, "It is missing an actuator.")
diff --git a/code/modules/heavy_vehicle/components/body.dm b/code/modules/heavy_vehicle/components/body.dm
index c7bd5558eef..41422349bc1 100644
--- a/code/modules/heavy_vehicle/components/body.dm
+++ b/code/modules/heavy_vehicle/components/body.dm
@@ -5,7 +5,7 @@
pixel_y = -8
center_of_mass = list("x"=24, "y"=20)
- var/mech_health = 300
+ var/mech_health = 600
var/obj/item/robot_parts/robot_component/diagnosis_unit/diagnostics
var/obj/item/cell/cell
var/obj/item/robot_parts/robot_component/armor/mech_armor
diff --git a/code/modules/heavy_vehicle/premade/heavy.dm b/code/modules/heavy_vehicle/premade/heavy.dm
index b76df2fb6c9..0e6c8b94c3c 100644
--- a/code/modules/heavy_vehicle/premade/heavy.dm
+++ b/code/modules/heavy_vehicle/premade/heavy.dm
@@ -20,7 +20,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 = 50
action_delay = 15
- max_damage = 90
+ max_damage = 200
power_use = 7500
punch_sound = 'sound/mecha/mech_punch_slow.ogg'
@@ -30,7 +30,7 @@
desc = "Oversized actuators struggle to move these armoured legs."
icon_state = "heavy_legs"
move_delay = 5
- max_damage = 90
+ max_damage = 200
power_use = 5000
trample_damage = 45
@@ -39,7 +39,7 @@
exosuit_desc_string = "a reinforced monoeye"
desc = "A solitary sensor moves inside a recessed slit in the armour plates."
icon_state = "heavy_head"
- max_damage = 120
+ max_damage = 240
power_use = 0
/obj/item/mech_component/sensors/heavy/prebuild()
@@ -54,8 +54,8 @@
pilot_coverage = 100
exosuit_desc_string = "a heavily armoured chassis"
icon_state = "heavy_body"
- max_damage = 150
- mech_health = 500
+ max_damage = 300
+ mech_health = 1000
has_hardpoints = list(HARDPOINT_BACK)
power_use = 5000
@@ -70,7 +70,8 @@
pilot_coverage = 100
exosuit_desc_string = "a heavily armoured chassis"
icon_state = "heavy_body"
- max_damage = 150
+ max_damage = 450
+ mech_health = 1250
has_hardpoints = list(HARDPOINT_BACK, HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER)
power_use = 15000
diff --git a/code/modules/heavy_vehicle/premade/hoverpod.dm b/code/modules/heavy_vehicle/premade/hoverpod.dm
index c239e3787b6..06cc1cd62b4 100644
--- a/code/modules/heavy_vehicle/premade/hoverpod.dm
+++ b/code/modules/heavy_vehicle/premade/hoverpod.dm
@@ -19,7 +19,7 @@
icon_state = "hoverlegs"
mech_turn_sound = null
mech_step_sound = null
- max_damage = 40
+ max_damage = 80
move_delay = 4
turn_delay = 2
power_use = 3000
@@ -35,7 +35,7 @@
hide_pilot = TRUE
exosuit_desc_string = "a spherical chassis"
icon_state = "pod_body"
- max_damage = 70
+ max_damage = 150
power_use = 5
has_hardpoints = list(HARDPOINT_BACK)
diff --git a/code/modules/heavy_vehicle/premade/light.dm b/code/modules/heavy_vehicle/premade/light.dm
index 6ca54fa73e6..f4889467f51 100644
--- a/code/modules/heavy_vehicle/premade/light.dm
+++ b/code/modules/heavy_vehicle/premade/light.dm
@@ -18,7 +18,7 @@
icon_state = "light_arms"
melee_damage = 15
action_delay = 15
- max_damage = 40
+ max_damage = 100
power_use = 3000
desc = "As flexible as they are fragile, these Bishop Cybernetics manipulators can follow a pilot's movements in close to real time."
punch_sound = 'sound/mecha/mech_punch_fast.ogg'
@@ -29,7 +29,7 @@
icon_state = "light_legs"
move_delay = 2
turn_delay = 3
- max_damage = 40
+ max_damage = 100
power_use = 3000
desc = "The electrical systems driving these legs are almost totally silent. Unfortunately slamming a plate of metal against the ground is not."
@@ -38,7 +38,7 @@
gender = PLURAL
exosuit_desc_string = "advanced sensor array"
icon_state = "light_head"
- max_damage = 30
+ max_damage = 80
power_use = 12000
desc = "A series of high resolution optical sensors."
vision_flags = SEE_TURFS
@@ -56,7 +56,7 @@
hatch_descriptor = "canopy"
exosuit_desc_string = "an open and light chassis"
icon_state = "light_body"
- max_damage = 50
+ max_damage = 150
power_use = 3000
desc = "The Veymed Odysseus series cockpits combine ultralight materials and clear aluminum laminates to provide an optimized cockpit experience."
diff --git a/code/modules/heavy_vehicle/premade/misc.dm b/code/modules/heavy_vehicle/premade/misc.dm
index 5f8cd57e54f..9dc63bb2764 100644
--- a/code/modules/heavy_vehicle/premade/misc.dm
+++ b/code/modules/heavy_vehicle/premade/misc.dm
@@ -3,7 +3,7 @@
exosuit_desc_string = "hydraulic quadlegs"
desc = "Xion Manufacturing Group's arachnid series boasts more leg per leg than the leading competitor."
icon_state = "spiderlegs"
- max_damage = 80
+ max_damage = 160
move_delay = 4
turn_delay = 1
power_use = 2500
@@ -14,7 +14,7 @@
exosuit_desc_string = "armored tracks"
desc = "A classic brought back. The Hephaestus' Landmaster class tracks are impervious to most damage and can maintain top speed regardless of load. Watch out for corners."
icon_state = "tracks"
- max_damage = 150
+ max_damage = 450
move_delay = 2 //Its fast
turn_delay = 7
power_use = 7500
diff --git a/code/modules/heavy_vehicle/premade/powerloader.dm b/code/modules/heavy_vehicle/premade/powerloader.dm
index 8de20bcff3b..37dc9d1a2ef 100644
--- a/code/modules/heavy_vehicle/premade/powerloader.dm
+++ b/code/modules/heavy_vehicle/premade/powerloader.dm
@@ -21,7 +21,7 @@
/obj/item/mech_component/manipulators/ripley
name = "exosuit arms"
exosuit_desc_string = "heavy-duty industrial lifters"
- max_damage = 70
+ max_damage = 150
power_use = 2000
melee_damage = 40
desc = "The Xion Manufacturing Group Digital Interaction Manifolds allow you poke untold dangers from the relative safety of your cockpit."
@@ -31,7 +31,7 @@
name = "exosuit legs"
exosuit_desc_string = "reinforced hydraulic legs"
desc = "Wide and stable but not particularly fast."
- max_damage = 70
+ max_damage = 150
move_delay = 4
turn_delay = 4
power_use = 2000
@@ -42,7 +42,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 = 200
power_use = 0
/obj/item/mech_component/sensors/ripley/prebuild()
@@ -56,7 +56,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 = 200
power_use = 5000
/obj/item/mech_component/chassis/ripley/prebuild()
diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm
index c9796a597c5..4cf47f2dea8 100644
--- a/code/modules/mob/living/silicon/robot/component.dm
+++ b/code/modules/mob/living/silicon/robot/component.dm
@@ -281,7 +281,7 @@
var/burn = 0
var/icon_state_broken = "broken"
var/total_dam = 0
- var/max_dam = 30
+ var/max_dam = 60
/obj/item/robot_parts/robot_component/binary_communication_device
name = "binary communication device"
diff --git a/html/changelogs/geeves-mech_components.yml b/html/changelogs/geeves-mech_components.yml
new file mode 100644
index 00000000000..7d414367566
--- /dev/null
+++ b/html/changelogs/geeves-mech_components.yml
@@ -0,0 +1,7 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+ - tweak: "All mech components have had their health more than doubled."
+ - tweak: "Cyborg components have had their health doubled."
\ No newline at end of file