TGS Test Merge (#16114)

tgstation · Jun 19, 2024 · 819f6c2 · 819f6c2
2 parents 17bb400 + 772b5d8
commit 819f6c2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/code/game/objects/structures/razorwire.dm b/code/game/objects/structures/razorwire.dm
@@ -51,6 +51,8 @@
 		return
 	if(CHECK_BITFIELD(O.pass_flags, PASS_DEFENSIVE_STRUCTURE))
 		return
+	if(HAS_TRAIT(O, TRAIT_TANK_DESANT))
+		return
 	var/mob/living/M = O
 	if(M.status_flags & INCORPOREAL)
 		return

diff --git a/code/game/objects/structures/xeno.dm b/code/game/objects/structures/xeno.dm
@@ -100,6 +100,9 @@
 	if(crosser.throwing || crosser.buckled)
 		return
 
+	if(HAS_TRAIT(crosser, TRAIT_TANK_DESANT))
+		return
+
 	if(isvehicle(crosser))
 		var/obj/vehicle/vehicle = crosser
 		vehicle.last_move_time += slow_amt

diff --git a/code/modules/projectiles/guns/_shared_ammo_objects.dm b/code/modules/projectiles/guns/_shared_ammo_objects.dm
@@ -156,10 +156,12 @@
 	burn_ticks = 12
 
 ///Effects applied to a mob that crosses a burning turf
-/obj/fire/flamer/on_cross(datum/source, mob/living/crosser, oldloc, oldlocs)
-	. = ..()
-	if(istype(crosser) || isobj(crosser))
-		crosser.fire_act(burn_level)
+/obj/fire/flamer/on_cross(datum/source, atom/movable/crosser, oldloc, oldlocs)
+	if(!isliving(crosser) || isobj(crosser))
+		return
+	if(HAS_TRAIT(crosser, TRAIT_TANK_DESANT))
+		return
+	crosser.fire_act(burn_level)
 
 /obj/fire/flamer/affect_mob(mob/living/carbon/affected)
 	. = ..()
@@ -207,6 +209,9 @@
 		target.apply_status_effect(STATUS_EFFECT_MELTING_FIRE, PYROGEN_MELTING_FIRE_EFFECT_STACK)
 	target.take_overall_damage(damage, BURN, FIRE, max_limbs = 2)
 
-/obj/fire/melting_fire/on_cross(datum/source, mob/living/carbon/human/crosser, oldloc, oldlocs)
-	if(istype(crosser))
-		affect_mob(crosser)
+/obj/fire/melting_fire/on_cross(datum/source, atom/movable/crosser, oldloc, oldlocs)
+	if(!ishuman(crosser))
+		return
+	if(HAS_TRAIT(crosser, TRAIT_TANK_DESANT))
+		return
+	affect_mob(crosser)