Turf damage propogation changes (#10219)

BeeStation · Dec 1, 2023 · de5899b · de5899b
1 parent 42af247
commit de5899b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/code/game/turfs/open/floor/plating.dm b/code/game/turfs/open/floor/plating.dm
@@ -17,7 +17,7 @@
 	barefootstep = FOOTSTEP_HARD_BAREFOOT
 	clawfootstep = FOOTSTEP_HARD_CLAW
 	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
-	max_integrity = 600
+	max_integrity = 900
 	var/attachment_holes = TRUE
 
 	FASTDMM_PROP(\
@@ -123,6 +123,7 @@
 	name = "metal foam plating"
 	desc = "Thin, fragile flooring created with metal foam."
 	icon_state = "foam_plating"
+	max_integrity = 300
 
 /turf/open/floor/plating/foam/burn_tile()
 	return //jetfuel can't melt steel foam

diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm
@@ -11,6 +11,7 @@
 	name = "alien floor"
 	icon_state = "alienpod1"
 	tiled_dirt = FALSE
+	max_integrity = 1800
 
 /turf/open/floor/plating/abductor/Initialize(mapload)
 	. = ..()
@@ -21,6 +22,7 @@
 	name = "alien plating"
 	icon_state = "alienplating"
 	tiled_dirt = FALSE
+	max_integrity = 1800
 
 /turf/open/floor/plating/abductor2/break_tile()
 	return //unbreakable
@@ -112,6 +114,7 @@
 	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
 	max_integrity = 100
 	resistance_flags = INDESTRUCTIBLE
+	max_integrity = 300
 
 /turf/open/floor/plating/beach/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
 	return

diff --git a/code/game/turfs/turf_integrity.dm b/code/game/turfs/turf_integrity.dm
@@ -117,7 +117,8 @@
 		return
 	// Cascade turf damage downwards on destruction
 	if (additional_damage > 0)
-		take_damage(additional_damage, BRUTE, damage_flag, FALSE)
+		if (damage_flag == BOMB || damage_flag == ACID || damage_flag == FIRE)
+			take_damage(additional_damage, BRUTE, damage_flag, FALSE)
 
 //====================================
 // Generic Hits