fixes yay

Monkestation · Sep 9, 2023 · 7c12a10 · 7c12a10
1 parent a5a795c
commit 7c12a10
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/monkestation/code/_onclick/hud/alert.dm b/monkestation/code/_onclick/hud/alert.dm
@@ -24,7 +24,7 @@
 			 as well as [GLOB.main_clock_cult?.members.len] servants all together.<br>"
 
 	if(GLOB.clock_ark?.charging_for)
-		desc += "The Ark will open in [10 MINUTES - GLOB.clock_ark?.charging_for] seconds!<br>"
+		desc += "The Ark will open in [600 - GLOB.clock_ark?.charging_for] seconds!<br>"
 		return //we dont care about anchoring crystals at this point
 
 	if(get_charged_anchor_crystals()) //only put this here if we need to use it

diff --git a/monkestation/code/modules/antagonists/clock_cult/items/weaponry.dm b/monkestation/code/modules/antagonists/clock_cult/items/weaponry.dm
@@ -29,7 +29,7 @@
 	if(!is_type_in_typecache(gotten_turf, effect_turf_typecache))
 		return
 
-	if(!QDELETED(target) && target.stat != DEAD && !IS_CLOCK(target) && !target.can_block_magic(MAGIC_RESISTANCE_HOLY))
+	if((!QDELETED(target) && (!ismob(target) || (ismob(target) && target.stat != DEAD && !IS_CLOCK(target) && !target.can_block_magic(MAGIC_RESISTANCE_HOLY)))))
 		hit_effect(target, user)