shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits

Browse Source
This commit is contained in:
Putnam3145
2022-05-17 13:22:40 -07:00
parent d5c36b4a99 35f86287e2
commit 33889870c9
1311 changed files with 12771 additions and 10321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/flufftext/Hallucination.dm
+3 -3
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
@@ -1122,7 +1122,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
/obj/effect/hallucination/danger/anomaly
name = "flux wave anomaly"
/obj/effect/hallucination/danger/anomaly/Initialize()
/obj/effect/hallucination/danger/anomaly/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)