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

Merge pull request #3454 from VOREStation/vplk-sundry-fixes

Browse Source 
Sundry small bugfixes
This commit is contained in:
Neerti
2017-05-19 13:54:30 -04:00
committed by GitHub
parent 098e2ffff8 d2ca5df408
commit 8a2f69d439
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/jobs/job_controller.dm
View File

@@ -613,7 +613,7 @@ var/global/datum/controller/occupations/job_master
else else
spawnpos = spawntypes[H.client.prefs.spawnpoint] 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)) if(spawnpos.check_job_spawning(rank))
H.forceMove(pick(spawnpos.turfs)) H.forceMove(pick(spawnpos.turfs))
. = spawnpos.msg . = spawnpos.msg

4
code/game/machinery/OpTable.dm
View File

@@ -14,8 +14,8 @@
/obj/machinery/optable/New() /obj/machinery/optable/New()
..() ..()
for(dir in list(NORTH,EAST,SOUTH,WEST)) for(var/direction in list(NORTH,EAST,SOUTH,WEST))
computer = locate(/obj/machinery/computer/operating, get_step(src, dir)) computer = locate(/obj/machinery/computer/operating, get_step(src, direction))
if(computer) if(computer)
computer.table = src computer.table = src
break break

4
code/game/machinery/computer/Operating.dm
View File

@@ -12,8 +12,8 @@
/obj/machinery/computer/operating/New() /obj/machinery/computer/operating/New()
..() ..()
for(dir in list(NORTH,EAST,SOUTH,WEST)) for(var/direction in list(NORTH,EAST,SOUTH,WEST))
table = locate(/obj/machinery/optable, get_step(src, dir)) table = locate(/obj/machinery/optable, get_step(src, direction))
if (table) if (table)
table.computer = src table.computer = src
break break

2
code/game/machinery/computer/communications.dm
View File

@@ -52,7 +52,7 @@
/obj/machinery/computer/communications/Topic(href, href_list) /obj/machinery/computer/communications/Topic(href, href_list)
if(..()) if(..())
return 1 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!" usr << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
return return
usr.set_machine(src) usr.set_machine(src)

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

@@ -128,8 +128,8 @@
if(href_list["program"]) if(href_list["program"])
var/prog = href_list["program"] var/prog = href_list["program"]
if(prog in (supported_programs + restricted_programs)) if(prog in (supported_programs + restricted_programs))
loadProgram(prog) if(loadProgram(prog))
current_program = prog current_program = prog
else if(href_list["AIoverride"]) else if(href_list["AIoverride"])
if(!issilicon(usr)) if(!issilicon(usr))
@@ -294,11 +294,11 @@
if(check_delay) if(check_delay)
if(world.time < (last_change + 25)) if(world.time < (last_change + 25))
if(world.time < (last_change + 15))//To prevent super-spam clicking, reduced process size and annoyance -Sieve 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)) for(var/mob/M in range(3,src))
M.show_message("\b ERROR. Recalibrating projection apparatus.") M.show_message("\b ERROR. Recalibrating projection apparatus.")
last_change = world.time last_change = world.time
return return 0
last_change = world.time last_change = world.time
active = 1 active = 1
@@ -349,6 +349,8 @@
update_projections() update_projections()
return 1
/obj/machinery/computer/HolodeckControl/proc/toggleGravity(var/area/A) /obj/machinery/computer/HolodeckControl/proc/toggleGravity(var/area/A)
if(world.time < (last_gravity_change + 25)) if(world.time < (last_gravity_change + 25))