From 2e093a54dd7888c92775fc867bb8f36a1f4f3a4e Mon Sep 17 00:00:00 2001
From: Jack Edge <yellowbounder@gmail.com>
Date: Fri, 24 Jun 2016 09:59:12 +0100
Subject: [PATCH] Compile errors II

---
 code/game/gamemodes/gang/dominator.dm      | 2 +-
 code/game/gamemodes/gang/gang_datum.dm     | 2 +-
 code/game/gamemodes/gang/recaller.dm       | 4 ++--
 code/modules/mob/dead/observer/observer.dm | 2 +-
 code/modules/mob/living/living.dm          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/game/gamemodes/gang/dominator.dm b/code/game/gamemodes/gang/dominator.dm
index 67c501c0f39..a2051d1f4b9 100644
--- a/code/game/gamemodes/gang/dominator.dm
+++ b/code/game/gamemodes/gang/dominator.dm
@@ -182,7 +182,7 @@
 		user << "<span class='warning'>Error: Unable to breach station network. Firewall has logged our signature and is blocking all further attempts.</span>"
 		return
 
-	var/time = round(get_domination_time(tempgang)/60,0.1)
+	var/time = round(determine_domination_time(tempgang)/60,0.1)
 	if(alert(user,"With [round((tempgang.territory.len/start_state.num_territories)*100, 1)]% station control, a takeover will require [time] minutes.\nYour gang will be unable to gain influence while it is active.\nThe entire station will likely be alerted to it once it starts.\nYou have [tempgang.dom_attempts] attempt(s) remaining. Are you ready?","Confirm","Ready","Later") == "Ready")
 		if((tempgang.is_dominating) || !tempgang.dom_attempts || !in_range(src, user) || !istype(src.loc, /turf))
 			return 0
diff --git a/code/game/gamemodes/gang/gang_datum.dm b/code/game/gamemodes/gang/gang_datum.dm
index 3f74edabc94..16010b04605 100644
--- a/code/game/gamemodes/gang/gang_datum.dm
+++ b/code/game/gamemodes/gang/gang_datum.dm
@@ -179,7 +179,7 @@
 	//Calculate and report influence growth
 	var/message = "<b>[src] Gang Status Report:</b><BR>*---------*<br>"
 	if(is_dominating)
-		var/seconds_remaining = dominating_time_remaining()
+		var/seconds_remaining = domination_time_remaining()
 		var/new_time = max(180, seconds_remaining - (uniformed * 4) - (territory.len * 2))
 		if(new_time < seconds_remaining)
 			message += "Takeover shortened by [seconds_remaining - new_time] seconds for defending [territory.len] territories and [uniformed] uniformed gangsters.<BR>"
diff --git a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm
index 90a72310abf..3f1a00593d4 100644
--- a/code/game/gamemodes/gang/recaller.dm
+++ b/code/game/gamemodes/gang/recaller.dm
@@ -42,7 +42,7 @@
 			dat += "This device is not authorized to promote.<br>"
 	else
 		if(gang.is_dominating)
-			dat += "<center><font color='red'>Takeover In Progress:<br><B>[gang.dominating_time_remaining()] seconds remain</B></font></center>"
+			dat += "<center><font color='red'>Takeover In Progress:<br><B>[gang.domination_time_remaining()] seconds remain</B></font></center>"
 
 		var/isboss = (user.mind == gang.bosses[1])
 		var/points = gang.points
@@ -157,7 +157,7 @@
 				dat += "<a href='?src=\ref[src];purchase=dominator'><b>Station Dominator</b></a><br>"
 			else
 				dat += "<b>Station Dominator</b><br>"
-			dat += "<i>(Estimated Takeover Time: [round(get_domination_time(gang)/60,0.1)] minutes)</i><br>"
+			dat += "<i>(Estimated Takeover Time: [round(determine_domination_time(gang)/60,0.1)] minutes)</i><br>"
 
 	dat += "<br>"
 	dat += "<a href='?src=\ref[src];choice=refresh'>Refresh</a><br>"
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 0e002773466..9407c3d5f54 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -303,7 +303,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 			if(ticker.mode)
 				for(var/datum/gang/G in ticker.mode.gangs)
 					if(G.is_dominating)
-						stat(null, "[G.name] Gang Takeover: [max(G.dominating_time_remaining(), 0)]")
+						stat(null, "[G.name] Gang Takeover: [max(G.domination_time_remaining(), 0)]")
 
 /mob/dead/observer/verb/reenter_corpse()
 	set category = "Ghost"
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index fd792de1de3..f6a9200c49b 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -923,7 +923,7 @@ Sorry Giacom. Please don't be mad :(
 			if(ticker.mode)
 				for(var/datum/gang/G in ticker.mode.gangs)
 					if(G.is_dominating)
-						stat(null, "[G.name] Gang Takeover: [max(G.dominating_time_remaining(), 0)]")
+						stat(null, "[G.name] Gang Takeover: [max(G.domination_time_remaining(), 0)]")
 
 /mob/living/cancel_camera()
 	..()