From ecf49cd0a0555497c214aae5013e7610c51f5e74 Mon Sep 17 00:00:00 2001
From: MoreRobustThanYou <MoreRobustThanYou@users.noreply.github.com>
Date: Thu, 9 Nov 2017 21:57:24 -0500
Subject: [PATCH 1/2] ok now i kinda tested the ark examine (#32445)

* No, I did NOT test the Ark examine.

* Update countdown.dm

* Update ark_of_the_clockwork_justicar.dm

* Update ark_of_the_clockwork_justicar.dm

* OK JOAN FIXED

* Update ark_of_the_clockwork_justicar.dm
---
 code/_onclick/hud/alert.dm                      |  5 +----
 .../ark_of_the_clockwork_justicar.dm            | 17 +++++++++--------
 code/game/objects/effects/countdown.dm          |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index cd812d10a7..93383c2c49 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -407,16 +407,13 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 					textlist += "[i] Scripture: <b>[SSticker.scripture_states[i] ? "UNLOCKED":"LOCKED"]</b><br>"
 		var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar
 		if(G)
-			var/time_info
+			var/time_info = G.get_arrival_time(FALSE)
 			var/time_name
 			if(G.seconds_until_activation)
-				time_info = G.seconds_until_activation
 				time_name = "until the Ark activates"
 			else if(G.grace_period)
-				time_info = G.grace_period
 				time_name = "of grace period remaining"
 			else if(G.progress_in_seconds)
-				time_info = GATEWAY_RATVAR_ARRIVAL - G.progress_in_seconds
 				time_name = "until the Ark finishes summoning"
 			if(time_info)
 				textlist += "<b>[time_info / 60] minutes</b> [time_name].<br>"
diff --git a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm
index ff17bf341c..0f13ac66ac 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm
@@ -134,14 +134,15 @@
 	var/damage = max((obj_integrity * 0.7) / severity, 100) //requires multiple bombs to take down
 	take_damage(damage, BRUTE, "bomb", 0)
 
-/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/get_arrival_time()
+/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/get_arrival_time(var/deciseconds = TRUE)
 	if(seconds_until_activation)
-		return (seconds_until_activation*10)
-	if(grace_period)
-		return (grace_period*10)
+		. = seconds_until_activation
+	else if(grace_period)
+		. = grace_period
 	else if(GATEWAY_RATVAR_ARRIVAL - progress_in_seconds > 0)
-		return (round(max((GATEWAY_RATVAR_ARRIVAL - progress_in_seconds) / (GATEWAY_SUMMON_RATE), 0), 1)*10)
-	return -10
+		. = round(max((GATEWAY_RATVAR_ARRIVAL - progress_in_seconds) / (GATEWAY_SUMMON_RATE), 0), 1)
+	if(deciseconds)
+		. *= 10
 
 /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/get_arrival_text(s_on_time)
 	if(seconds_until_activation)
@@ -276,10 +277,10 @@
 
 /obj/structure/destructible/clockwork/massive/celestial_gateway/attack_ghost(mob/user)
 	if(!IsAdminGhost(user))
-		return
+		return ..()
 	if(GLOB.servants_active)
 		to_chat(user, "<span class='danger'>The Ark is already counting down.</span>")
-		return
+		return ..()
 	if(alert(user, "Activate the Ark's countdown?", name, "Yes", "No") == "Yes")
 		if(alert(user, "REALLY activate the Ark's countdown?", name, "Yes", "No") == "Yes")
 			if(alert(user, "You're REALLY SURE? This cannot be undone.", name, "Yes - Activate the Ark", "No") == "Yes - Activate the Ark")
diff --git a/code/game/objects/effects/countdown.dm b/code/game/objects/effects/countdown.dm
index 4dd8e323c8..f4b67b7df2 100644
--- a/code/game/objects/effects/countdown.dm
+++ b/code/game/objects/effects/countdown.dm
@@ -108,7 +108,7 @@
 	if(!istype(G))
 		return
 	else if(G.obj_integrity && !G.purpose_fulfilled)
-		return "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'>[G.get_arrival_text(FALSE)]</div>"
+		return "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'>[G.get_arrival_time(FALSE)]</div>"
 
 /obj/effect/countdown/supermatter
 	name = "supermatter damage"