Skip to content

Commit 670e0e5

Browse files
Merge remote-tracking branch 'upstream/master220' into facehugger_mob
2 parents 682880e + 4f84f3e commit 670e0e5

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

code/__HELPERS/level_traits.dm

+2
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ GLOBAL_LIST_INIT(default_map_traits, MAP_TRANSITION_CONFIG)
9191
/proc/are_zs_connected(atom/A, atom/B)
9292
A = get_turf(A)
9393
B = get_turf(B)
94+
if(isnull(A) || isnull(B))
95+
return FALSE
9496
if(A.z == B.z)
9597
return TRUE
9698
return (B.z in SSmapping.get_connected_levels(A))

code/_onclick/hud/parallax.dm

+3-2
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,8 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/parallax_layer)
376376
/atom/movable/screen/parallax_layer/planet/proc/on_mob_logout(mob/source)
377377
SIGNAL_HANDLER
378378
var/client/boss = source.canon_client
379-
update_status(boss.mob)
379+
if(boss) // this is stupid. I don't know why, but in rare cases it runtimes. Perhaps client's deletes before we can check all procs on him
380+
update_status(boss.mob)
380381

381382
/atom/movable/screen/parallax_layer/planet/proc/on_z_change(mob/source)
382383
SIGNAL_HANDLER
@@ -386,7 +387,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/parallax_layer)
386387

387388
/atom/movable/screen/parallax_layer/planet/update_status(mob/M)
388389
var/turf/T = get_turf(M)
389-
if(is_station_level(T.z))
390+
if(is_station_level(T?.z))
390391
invisibility = 0
391392
else
392393
invisibility = INVISIBILITY_ABSTRACT

code/modules/ruins/lavalandruin_code/puzzle.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240

241241
/obj/structure/puzzle_element/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE)
242242
. = ..()
243-
source.validate()
243+
source?.validate()
244244

245245
//Admin abuse version so you can pick the icon before it sets up
246246
/obj/effect/sliding_puzzle/admin

0 commit comments

Comments
 (0)