Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

2019-10-08 02:55:32 -05:00
parent ee5155bdbb 492e9c9d08
commit 3113074bfb
276 changed files with 4886 additions and 1609 deletions
@@ -277,6 +277,9 @@
 	. = ..()
 	AddComponent(/datum/component/anti_magic, TRUE, TRUE)

+/obj/item/twohanded/dualsaber/hypereutactic/chaplain/IsReflect()
+	return FALSE
+
 /obj/item/twohanded/dualsaber/hypereutactic/pre_altattackby(atom/A, mob/living/user, params)	//checks if it can do right click memes
 	altafterattack(A, user, TRUE, params)
 	return TRUE