mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Merge pull request #3454 from VOREStation/vplk-sundry-fixes
Sundry small bugfixes
This commit is contained in:
@@ -613,7 +613,7 @@ var/global/datum/controller/occupations/job_master
|
||||
else
|
||||
spawnpos = spawntypes[H.client.prefs.spawnpoint]
|
||||
|
||||
if(spawnpos && istype(spawnpos))
|
||||
if(spawnpos && istype(spawnpos) && spawnpos.turfs.len) // VOREStation Edit - Fix runtime if no landmarks exist for a spawntype
|
||||
if(spawnpos.check_job_spawning(rank))
|
||||
H.forceMove(pick(spawnpos.turfs))
|
||||
. = spawnpos.msg
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
|
||||
/obj/machinery/optable/New()
|
||||
..()
|
||||
for(dir in list(NORTH,EAST,SOUTH,WEST))
|
||||
computer = locate(/obj/machinery/computer/operating, get_step(src, dir))
|
||||
for(var/direction in list(NORTH,EAST,SOUTH,WEST))
|
||||
computer = locate(/obj/machinery/computer/operating, get_step(src, direction))
|
||||
if(computer)
|
||||
computer.table = src
|
||||
break
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
|
||||
/obj/machinery/computer/operating/New()
|
||||
..()
|
||||
for(dir in list(NORTH,EAST,SOUTH,WEST))
|
||||
table = locate(/obj/machinery/optable, get_step(src, dir))
|
||||
for(var/direction in list(NORTH,EAST,SOUTH,WEST))
|
||||
table = locate(/obj/machinery/optable, get_step(src, direction))
|
||||
if (table)
|
||||
table.computer = src
|
||||
break
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
/obj/machinery/computer/communications/Topic(href, href_list)
|
||||
if(..())
|
||||
return 1
|
||||
if (src.z > 1)
|
||||
if (using_map && !(src.z in using_map.station_levels))
|
||||
usr << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
|
||||
return
|
||||
usr.set_machine(src)
|
||||
|
||||
@@ -128,7 +128,7 @@
|
||||
if(href_list["program"])
|
||||
var/prog = href_list["program"]
|
||||
if(prog in (supported_programs + restricted_programs))
|
||||
loadProgram(prog)
|
||||
if(loadProgram(prog))
|
||||
current_program = prog
|
||||
|
||||
else if(href_list["AIoverride"])
|
||||
@@ -294,11 +294,11 @@
|
||||
if(check_delay)
|
||||
if(world.time < (last_change + 25))
|
||||
if(world.time < (last_change + 15))//To prevent super-spam clicking, reduced process size and annoyance -Sieve
|
||||
return
|
||||
return 0
|
||||
for(var/mob/M in range(3,src))
|
||||
M.show_message("\b ERROR. Recalibrating projection apparatus.")
|
||||
last_change = world.time
|
||||
return
|
||||
return 0
|
||||
|
||||
last_change = world.time
|
||||
active = 1
|
||||
@@ -349,6 +349,8 @@
|
||||
|
||||
update_projections()
|
||||
|
||||
return 1
|
||||
|
||||
|
||||
/obj/machinery/computer/HolodeckControl/proc/toggleGravity(var/area/A)
|
||||
if(world.time < (last_gravity_change + 25))
|
||||
|
||||
Reference in New Issue
Block a user