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

2019-11-10 23:23:36 +01:00
parent b3ef41a10f c4849ead74
commit 09860d463f
1399 changed files with 9581 additions and 9696 deletions
@@ -201,8 +201,10 @@
 /obj/item/assembly/flash/cyborg

 /obj/item/assembly/flash/cyborg/attack(mob/living/M, mob/user)
-	..()
+	. = ..()
 	new /obj/effect/temp_visual/borgflash(get_turf(src))
+	if(. && !CONFIG_GET(flag/disable_borg_flash_knockdown) && iscarbon(M) && !M.resting && !M.get_eye_protection())
+		M.Knockdown(80)

 /obj/item/assembly/flash/cyborg/attack_self(mob/user)
 	..()