cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make area.gravitychange not require being passed a reference to... itself. (#6838)

Browse Source
This commit is contained in:
Leshana
2020-03-16 05:31:09 -04:00
committed by VirgoBot
parent 4b8a6dc904
commit 3e3241eeb2
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/area/areas.dm
View File

@@ -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 << sound(sound, repeat = 0, wait = 0, volume = 50, channel = CHANNEL_AMBIENCE)
L.client.time_last_ambience_played = world.time L.client.time_last_ambience_played = world.time
/area/proc/gravitychange(var/gravitystate = 0, var/area/A) /area/proc/gravitychange(var/gravitystate = 0)
A.has_gravity = gravitystate src.has_gravity = gravitystate
for(var/mob/M in A) for(var/mob/M in src)
if(has_gravity) if(has_gravity)
thunk(M) thunk(M)
M.update_floating( M.Check_Dense_Object() ) M.update_floating( M.Check_Dense_Object() )

2
code/modules/admin/secrets/random_events/gravity.dm
View File

@@ -17,7 +17,7 @@
gravity_is_on = !gravity_is_on gravity_is_on = !gravity_is_on
for(var/area/A in all_areas) 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_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","Grav") feedback_add_details("admin_secrets_fun_used","Grav")

4
code/modules/events/gravity.dm
View File

@@ -17,7 +17,7 @@
gravity_is_on = 0 gravity_is_on = 0
for(var/area/A in all_areas) for(var/area/A in all_areas)
if(A.z in zLevels) if(A.z in zLevels)
A.gravitychange(gravity_is_on, A) A.gravitychange(gravity_is_on)
/datum/event/gravity/end() /datum/event/gravity/end()
if(!gravity_is_on) if(!gravity_is_on)
@@ -25,6 +25,6 @@
for(var/area/A in all_areas) for(var/area/A in all_areas)
if(A.z in zLevels) 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") command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.", "Gravity Restored")

4
code/modules/gamemaster/actions/gravity.dm
View File

@@ -20,7 +20,7 @@
gravity_is_on = 0 gravity_is_on = 0
for(var/area/A in all_areas) for(var/area/A in all_areas)
if(A.z in zLevels) if(A.z in zLevels)
A.gravitychange(gravity_is_on, A) A.gravitychange(gravity_is_on)
/datum/gm_action/gravity/end() /datum/gm_action/gravity/end()
if(!gravity_is_on) if(!gravity_is_on)
@@ -28,7 +28,7 @@
for(var/area/A in all_areas) for(var/area/A in all_areas)
if(A.z in zLevels) 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") command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.", "Gravity Restored")

8
code/modules/holodeck/HolodeckControl.dm
View File

@@ -268,7 +268,7 @@
loadProgram(powerdown_program, 0) loadProgram(powerdown_program, 0)
if(!linkedholodeck.has_gravity) if(!linkedholodeck.has_gravity)
linkedholodeck.gravitychange(1,linkedholodeck) linkedholodeck.gravitychange(1)
active = 0 active = 0
use_power = 1 use_power = 1
@@ -365,16 +365,16 @@
use_power = 1 use_power = 1
if(A.has_gravity) if(A.has_gravity)
A.gravitychange(0,A) A.gravitychange(0)
else else
A.gravitychange(1,A) A.gravitychange(1)
/obj/machinery/computer/HolodeckControl/proc/emergencyShutdown() /obj/machinery/computer/HolodeckControl/proc/emergencyShutdown()
//Turn it back to the regular non-holographic room //Turn it back to the regular non-holographic room
loadProgram(powerdown_program, 0) loadProgram(powerdown_program, 0)
if(!linkedholodeck.has_gravity) if(!linkedholodeck.has_gravity)
linkedholodeck.gravitychange(1,linkedholodeck) linkedholodeck.gravitychange(1)
active = 0 active = 0
use_power = 1 use_power = 1

4
code/modules/power/gravitygenerator.dm
View File

@@ -127,13 +127,13 @@
if((A in G.localareas) && (G.on)) if((A in G.localareas) && (G.on))
break break
if(!G) if(!G)
A.gravitychange(0,A) A.gravitychange(0)
else else
for(var/area/A in gravity_generator:localareas) for(var/area/A in gravity_generator:localareas)
gravity_generator:on = 1 gravity_generator:on = 1
A.gravitychange(1,A) A.gravitychange(1)
src.updateUsrDialog() src.updateUsrDialog()
return return