From c92785fea781aca56436309bb07145d74c25cb6c Mon Sep 17 00:00:00 2001
From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Sun, 20 Dec 2020 13:24:16 +0000
Subject: [PATCH] Removes areamaster (#15149)

---
 code/game/atoms_movable.dm                     | 5 -----
 code/game/machinery/alarm.dm                   | 2 +-
 code/game/machinery/cryopod.dm                 | 2 +-
 code/modules/mob/living/silicon/decoy/decoy.dm | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index b0a9d8f0995..d5b3443cc01 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -29,11 +29,6 @@
 
 	var/moving_diagonally = 0 //0: not doing a diagonal move. 1 and 2: doing the first/second step of the diagonal move
 	var/list/client_mobs_in_contents
-	var/area/areaMaster
-
-/atom/movable/New()
-	. = ..()
-	areaMaster = get_area(src)
 
 /atom/movable/attempt_init(loc, ...)
 	var/turf/T = get_turf(src)
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index fa10d39d5ea..5231d44d4c7 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -244,7 +244,7 @@
 	if(!alarm_area)
 		alarm_area = get_area(src)
 	if(!alarm_area)
-		log_runtime(EXCEPTION("Air alarm /obj/machinery/alarm lacks alarm_area and areaMaster vars during proc/master_is_operating()"), src)
+		log_runtime(EXCEPTION("Air alarm /obj/machinery/alarm lacks alarm_area vars during proc/master_is_operating()"), src)
 		return FALSE
 	return alarm_area.master_air_alarm && !(alarm_area.master_air_alarm.stat & (NOPOWER|BROKEN))
 
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 342833c06f4..3c523cce7fa 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -263,7 +263,7 @@
 	find_control_computer()
 
 /obj/machinery/cryopod/proc/find_control_computer(urgent=0)
-	for(var/obj/machinery/computer/cryopod/C in areaMaster.contents) //locate() is shit, this actually works, and there's a decent chance it's faster than locate()
+	for(var/obj/machinery/computer/cryopod/C in get_area(src).contents)
 		control_computer = C
 		break
 
diff --git a/code/modules/mob/living/silicon/decoy/decoy.dm b/code/modules/mob/living/silicon/decoy/decoy.dm
index a0c3ab8272f..88be4d11374 100644
--- a/code/modules/mob/living/silicon/decoy/decoy.dm
+++ b/code/modules/mob/living/silicon/decoy/decoy.dm
@@ -34,7 +34,7 @@
 
 /mob/living/silicon/decoy/syndicate/depot/proc/raise_alert()
 	raised_alert = TRUE
-	var/area/syndicate_depot/core/depotarea = get_area(src) // Cannot use myArea or areaMaster as neither will be defined for this mob type
+	var/area/syndicate_depot/core/depotarea = get_area(src) // Cannot use myArea as it wont be defined for this mob type
 	if(istype(depotarea))
 		depotarea.increase_alert("AI Unit Offline")
 	else