diff --git a/code/defines/procs/AStar.dm b/code/defines/procs/AStar.dm index 1750814c228..1ec4f4eb7fc 100644 --- a/code/defines/procs/AStar.dm +++ b/code/defines/procs/AStar.dm @@ -157,7 +157,7 @@ Actual Adjacent procs : for(var/dir in cardinal) T = get_step(src,dir) - if(simulated_only && !istype(T)) + if(!T || (simulated_only && !istype(T))) continue if(!T.density && !LinkBlockedWithAccess(T,caller, ID)) L.Add(T) diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 868d0e901a7..1706763b824 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -2327,6 +2327,7 @@ area/security/podbay /area/awaymission name = "\improper Strange Location" icon_state = "away" + report_alerts = 0 /area/awaymission/example name = "\improper Strange Station" diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index 7a01a53a8b9..4eae22d7646 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -22,7 +22,7 @@ recharging_mecha = null return ..() -/turf/simulated/floor/mech_bay_recharge_floor/Entered(var/obj/mecha/mecha) +/turf/simulated/floor/mech_bay_recharge_floor/Entered(var/obj/mecha/mecha, atom/OL, ignoreRest = 0) . = ..() if(istype(mecha)) mecha.occupant_message("Initializing power control devices.") diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 58f6e4a41d9..efe3bdb6e55 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -67,7 +67,7 @@ else to_chat(user, "The plating is going to need some support! Place metal rods first.") -/turf/space/Entered(atom/movable/A as mob|obj) +/turf/space/Entered(atom/movable/A as mob|obj, atom/OL, ignoreRest = 0) ..() if(destination_z && A && (src in A.locs)) diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index 73398077df2..1b7c9343ca2 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -85,7 +85,7 @@ /turf/space/transit/horizontal dir = WEST -/turf/space/transit/Entered(atom/movable/AM, atom/OldLoc) +/turf/space/transit/Entered(atom/movable/AM, atom/OldLoc, ignoreRest = 0) if(!AM) return if(istype(AM, /obj/docking_port) || !AM.simulated) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 1db6cba37d6..8541a638040 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -121,7 +121,7 @@ return 1 //Nothing found to block so return success! -/turf/Entered(atom/movable/M) +/turf/Entered(atom/movable/M, atom/OL, ignoreRest = 0) if(ismob(M)) var/mob/O = M if(!O.lastarea) diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index af73c27667d..0adf55229e0 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -19,9 +19,6 @@ * Areas */ //Gateroom gets its own APC specifically for the gate - /area/awaymission - report_alerts = 0 - /area/awaymission/gateroom //Library, medbay, storage room