Merge branch 'master' into wound-port

2020-07-18 23:06:49 +01:00
parent 3b78ac58bd ee8162ea8b
commit 1a5008fee7
203 changed files with 364 additions and 307 deletions
@@ -104,7 +104,7 @@
 	QDEL_IN(src, 300)

 //ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/effect/hallucination/simple/bluespace_stream/attack_hand(mob/user)
+/obj/effect/hallucination/simple/bluespace_stream/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	if(user != seer || !linked_to)
 		return
 	var/slip_in_message = pick("slides sideways in an odd way, and disappears", "jumps into an unseen dimension",\