Merge pull request #2198 from Citadel-Station-13/upstream-merge-29288

[MIRROR] Hallucinations 3.0
2017-08-14 18:45:45 -05:00
parent ce918273bc 69bf7e42cf
commit 6d62d51eab
18 changed files with 2239 additions and 462 deletions
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -127,7 +127,7 @@
 	var/pure_red = list(0,0,0,0,0,0,0,0,0,1,0,0)

 	spawn(0)
-		new /obj/effect/hallucination/delusion(victim.loc,victim,"demon",duration,0)
+		new /datum/hallucination/delusion(victim, TRUE, "demon",duration,0)

 	var/obj/item/weapon/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc)
 	chainsaw.flags |= NODROP