Merge pull request Civ13#2597 from savethetreez/popo

Small fixes
KanohaShinobi · Jan 27, 2024 · 7038d40 · 7038d40
2 parents 01b9d66 + bca5df5
commit 7038d40
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/code/game/mob/living/living_defense.dm b/code/game/mob/living/living_defense.dm
@@ -99,7 +99,8 @@
 			instadeath = 5
 		if (instadeath > 0)
 			if (prob(instadeath))
-				death()
+				adjustBrainLoss(rand(30,60))
+				H.instadeath_check()
 	if (!P.nodamage)
 		apply_damage(damage, P.damage_type, def_zone, absorb, P, sharp=proj_sharp, edge=proj_edge)
 

diff --git a/code/modules/1713/barriers/sandbag.dm b/code/modules/1713/barriers/sandbag.dm
@@ -131,7 +131,6 @@
 		if (ishuman(user))
 			var/mob/living/human/H = user
 			decon_time /= 1.5*H.getStatCoeff("crafting")
-			world << "Debug: [decon_time]"
 		if (do_after(user, decon_time, src))
 			visible_message(SPAN_DANGER("[user] finishes dismantling the [src] using the [O.name]."), SPAN_DANGER("You finish dismantling the [src] using the [O.name]."))
 			var/turf = get_turf(src)