From 3e3241eeb2d8f771de312debf63c9fea681e2ba6 Mon Sep 17 00:00:00 2001
From: Leshana <Leshana@users.noreply.github.com>
Date: Mon, 16 Mar 2020 05:31:09 -0400
Subject: [PATCH] Make area.gravitychange not require being passed a reference
 to... itself. (#6838)

---
 code/game/area/areas.dm                             | 6 +++---
 code/modules/admin/secrets/random_events/gravity.dm | 2 +-
 code/modules/events/gravity.dm                      | 4 ++--
 code/modules/gamemaster/actions/gravity.dm          | 4 ++--
 code/modules/holodeck/HolodeckControl.dm            | 8 ++++----
 code/modules/power/gravitygenerator.dm              | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 450d82a0e8..fc9f4b7826 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -335,10 +335,10 @@ var/list/mob/living/forced_ambiance_list = new
 			L << sound(sound, repeat = 0, wait = 0, volume = 50, channel = CHANNEL_AMBIENCE)
 			L.client.time_last_ambience_played = world.time
 
-/area/proc/gravitychange(var/gravitystate = 0, var/area/A)
-	A.has_gravity = gravitystate
+/area/proc/gravitychange(var/gravitystate = 0)
+	src.has_gravity = gravitystate
 
-	for(var/mob/M in A)
+	for(var/mob/M in src)
 		if(has_gravity)
 			thunk(M)
 		M.update_floating( M.Check_Dense_Object() )
diff --git a/code/modules/admin/secrets/random_events/gravity.dm b/code/modules/admin/secrets/random_events/gravity.dm
index 2b1dc572e1..5f248a4dfc 100644
--- a/code/modules/admin/secrets/random_events/gravity.dm
+++ b/code/modules/admin/secrets/random_events/gravity.dm
@@ -17,7 +17,7 @@
 
 	gravity_is_on = !gravity_is_on
 	for(var/area/A in all_areas)
-		A.gravitychange(gravity_is_on,A)
+		A.gravitychange(gravity_is_on)
 
 	feedback_inc("admin_secrets_fun_used",1)
 	feedback_add_details("admin_secrets_fun_used","Grav")
diff --git a/code/modules/events/gravity.dm b/code/modules/events/gravity.dm
index 4d0881294f..049464cb54 100644
--- a/code/modules/events/gravity.dm
+++ b/code/modules/events/gravity.dm
@@ -17,7 +17,7 @@
 	gravity_is_on = 0
 	for(var/area/A in all_areas)
 		if(A.z in zLevels)
-			A.gravitychange(gravity_is_on, A)
+			A.gravitychange(gravity_is_on)
 
 /datum/event/gravity/end()
 	if(!gravity_is_on)
@@ -25,6 +25,6 @@
 
 		for(var/area/A in all_areas)
 			if(A.z in zLevels)
-				A.gravitychange(gravity_is_on, A)
+				A.gravitychange(gravity_is_on)
 
 		command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.", "Gravity Restored")
diff --git a/code/modules/gamemaster/actions/gravity.dm b/code/modules/gamemaster/actions/gravity.dm
index a3907f1aa8..f568de9eae 100644
--- a/code/modules/gamemaster/actions/gravity.dm
+++ b/code/modules/gamemaster/actions/gravity.dm
@@ -20,7 +20,7 @@
 	gravity_is_on = 0
 	for(var/area/A in all_areas)
 		if(A.z in zLevels)
-			A.gravitychange(gravity_is_on, A)
+			A.gravitychange(gravity_is_on)
 
 /datum/gm_action/gravity/end()
 	if(!gravity_is_on)
@@ -28,7 +28,7 @@
 
 		for(var/area/A in all_areas)
 			if(A.z in zLevels)
-				A.gravitychange(gravity_is_on, A)
+				A.gravitychange(gravity_is_on)
 
 		command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.", "Gravity Restored")
 
diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm
index 2a4afe462e..ed1ced9c78 100644
--- a/code/modules/holodeck/HolodeckControl.dm
+++ b/code/modules/holodeck/HolodeckControl.dm
@@ -268,7 +268,7 @@
 		loadProgram(powerdown_program, 0)
 
 		if(!linkedholodeck.has_gravity)
-			linkedholodeck.gravitychange(1,linkedholodeck)
+			linkedholodeck.gravitychange(1)
 
 		active = 0
 		use_power = 1
@@ -365,16 +365,16 @@
 	use_power = 1
 
 	if(A.has_gravity)
-		A.gravitychange(0,A)
+		A.gravitychange(0)
 	else
-		A.gravitychange(1,A)
+		A.gravitychange(1)
 
 /obj/machinery/computer/HolodeckControl/proc/emergencyShutdown()
 	//Turn it back to the regular non-holographic room
 	loadProgram(powerdown_program, 0)
 
 	if(!linkedholodeck.has_gravity)
-		linkedholodeck.gravitychange(1,linkedholodeck)
+		linkedholodeck.gravitychange(1)
 
 	active = 0
 	use_power = 1
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 3d198c18b3..ad02676e9b 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -127,13 +127,13 @@
 					if((A in G.localareas) && (G.on))
 						break
 				if(!G)
-					A.gravitychange(0,A)
+					A.gravitychange(0)
 
 
 		else
 			for(var/area/A in gravity_generator:localareas)
 				gravity_generator:on = 1
-				A.gravitychange(1,A)
+				A.gravitychange(1)
 
 		src.updateUsrDialog()
 		return