Merge pull request #9501 from deathride58/stronksecborgs

Borg buffs - Allows jaws to incapacitate, gives secborg a taser, and more! (wall of text in desc)
2019-10-29 21:29:12 -07:00
parent 15e87a10d0 f72d058eb5
commit b172c5f691
9 changed files with 99 additions and 28 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)
 	..()