diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 450d82a0e8e..fc9f4b7826d 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 2b1dc572e1c..5f248a4dfcf 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 4d0881294f4..049464cb545 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 a3907f1aa85..f568de9eae2 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 2a4afe462e8..ed1ced9c78c 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 3d198c18b32..ad02676e9b9 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