Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)

This commit is contained in:
SandPoot
2022-04-09 03:06:56 -03:00
88 changed files with 630 additions and 647 deletions
+2 -2
View File
@@ -647,10 +647,10 @@ GLOBAL_LIST_INIT(hallucination_list, list(
target.playsound_local(get_turf(airlock), 'sound/machines/boltsup.ogg',30,0,3)
qdel(src)
/obj/effect/hallucination/fake_door_lock/CanPass(atom/movable/mover, turf/_target)
/obj/effect/hallucination/fake_door_lock/CanAllowThrough(atom/movable/mover, turf/_target)
. = ..()
if(mover == target && airlock.density)
return FALSE
return TRUE
/datum/hallucination/chat