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

Merge pull request #5063 from VOREStation/vs-port-3124

Browse Source 
[PORT] Make cryopods check area first, then range
This commit is contained in:
Anewbe
2018-03-15 21:47:19 -05:00
committed by GitHub
parent 8d0434eb61 e1d31365d3
commit 72fb2c052b
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/game/machinery/cryopod.dm
View File

@@ -304,13 +304,18 @@
find_control_computer() find_control_computer()
/obj/machinery/cryopod/proc/find_control_computer(urgent=0) /obj/machinery/cryopod/proc/find_control_computer(urgent=0)
//control_computer = locate(/obj/machinery/computer/cryopod) in src.loc.loc // Broken due to http://www.byond.com/forum/?post=2007448 control_computer = null
control_computer = locate(/obj/machinery/computer/cryopod) in range(6,src)
var/area/my_area = get_area(src)
control_computer = locate(/obj/machinery/computer/cryopod) in my_area
if(!control_computer) //Fallback to old method.
control_computer = locate(/obj/machinery/computer/cryopod) in range(6,src)
// Don't send messages unless we *need* the computer, and less than five minutes have passed since last time we messaged // Don't send messages unless we *need* the computer, and less than five minutes have passed since last time we messaged
if(!control_computer && urgent && last_no_computer_message + 5*60*10 < world.time) if(!control_computer && urgent && last_no_computer_message + 5 MINUTES < world.time)
log_admin("Cryopod in [src.loc.loc] could not find control computer!") log_admin("Cryopod in [my_area] could not find control computer!")
message_admins("Cryopod in [src.loc.loc] could not find control computer!") message_admins("Cryopod in [my_area] could not find control computer!")
last_no_computer_message = world.time last_no_computer_message = world.time
return control_computer != null return control_computer != null