max_hit_damage

code/game/gamemodes/gangs/dominator.dm

@@ -11,7 +11,7 @@
 	anchored = TRUE
 	layer = HIGH_OBJ_LAYER
 	max_integrity = 300
-	maximum_damage = 30
+	max_hit_damage = 30
 	integrity_failure = 0.33
 	move_resist = INFINITY
 	armor = list(MELEE = 20,  BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 10, BIO = 100, RAD = 100, FIRE = 10, ACID = 70, STAMINA = 0, BLEED = 0)

code/game/objects/items/crab17.dm

@@ -38,7 +38,7 @@
 	pixel_z = -8
 	layer = LARGE_MOB_LAYER
 	max_integrity = 600
-	maximum_damage = 30
+	max_hit_damage = 30
 	/// when this gets at this hp, it will run away! oh no!
 	var/next_health_to_teleport
 	var/mob/living/carbon/human/bogdanoff

code/game/objects/obj_defense.dm

@@ -14,8 +14,8 @@
 	damage_amount = run_obj_armor(damage_amount, damage_type, damage_flag, attack_dir, armour_penetration)
 	if(damage_amount < DAMAGE_PRECISION)
 		return
-	if (!isnull(maximum_damage))
-		damage_amount = min(damage_amount, maximum_damage)
+	if (!isnull(max_hit_damage))
+		damage_amount = min(damage_amount, max_hit_damage)
 	//Object is basssiiiiccaalllyyy guaranteed to take damage by this point, lets run our signal
 	if(SEND_SIGNAL(src, COMSIG_OBJ_TAKE_DAMAGE, damage_amount, damage_type, damage_flag, sound_effect, attack_dir, armour_penetration) & COMPONENT_NO_TAKE_DAMAGE)
 		return

code/game/objects/objs.dm

@@ -21,7 +21,7 @@
 	/// Damage under this value will be completely ignored
 	var/damage_deflection = 0
 	/// Maximum damage that can be taken in a single hit
-	var/maximum_damage = null
+	var/max_hit_damage = null
 
 	/// INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ON_FIRE | UNACIDABLE | ACID_PROOF
 	var/resistance_flags = NONE

code/modules/antagonists/blob/structures/core.dm

@@ -4,7 +4,7 @@
 	icon_state = "blank_blob"
 	desc = "A huge, pulsating yellow mass."
 	max_integrity = 400
-	maximum_damage = 40
+	max_hit_damage = 40
 	armor = list(MELEE = 0,  BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 75, ACID = 90, STAMINA = 0, BLEED = 0)
 	explosion_block = 6
 	point_return = -1

code/modules/antagonists/blob/structures/factory.dm

@@ -4,7 +4,7 @@
 	icon_state = "blob_factory"
 	desc = "A thick spire of tendrils."
 	max_integrity = 200
-	maximum_damage = 40
+	max_hit_damage = 40
 	health_regen = 1
 	point_return = 25
 	resistance_flags = LAVA_PROOF

code/modules/antagonists/blob/structures/node.dm

@@ -4,7 +4,7 @@
 	icon_state = "blank_blob"
 	desc = "A large, pulsating yellow mass."
 	max_integrity = 200
-	maximum_damage = 40
+	max_hit_damage = 40
 	armor = list(MELEE = 0,  BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 65, ACID = 90, STAMINA = 0, BLEED = 0)
 	health_regen = 3
 	point_return = 25

code/modules/antagonists/clock_cult/clockwork_massive.dm

@@ -6,7 +6,7 @@ GLOBAL_LIST_INIT(clockwork_portals, list())
 	clockwork_desc = "Nezbere's magnum opus: a hulking clockwork machine capable of combining bluespace and steam power to summon Ratvar. Once activated, \
 	its instability will cause one-way bluespace rifts to open across the station to the City of Cogs, so be prepared to defend it at all costs."
 	max_integrity = 1000
-	maximum_damage = 25
+	max_hit_damage = 25
 	icon = 'icons/effects/96x96.dmi'
 	icon_state = "clockwork_gateway_components"
 	pixel_x = -32

code/modules/antagonists/space_dragon/carp_rift.dm

@@ -62,7 +62,7 @@
 	desc = "A rift akin to the ones space carp use to travel long distances."
 	armor = list(MELEE = 0,  BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 50, BIO = 100, RAD = 100, FIRE = 100, ACID = 100, STAMINA = 0, BLEED = 0)
 	max_integrity = 300
-	maximum_damage = 50
+	max_hit_damage = 50
 	icon = 'icons/obj/carp_rift.dmi'
 	icon_state = "carp_rift_carpspawn"
 	light_color = LIGHT_COLOR_PURPLE