Merge remote-tracking branch 'citadel/master' into shield_refactor

2020-03-22 15:07:41 -07:00
parent 300c8e3c6d 82cf7e584b
commit a6ca854e5c
44 changed files with 988 additions and 697 deletions
@@ -282,7 +282,6 @@
 	throwforce = 5
 	stamforce = 25
 	hitcost = 1000
-	knockdown = FALSE
 	throw_hit_chance = 10
 	slot_flags = ITEM_SLOT_BACK
 	var/obj/item/assembly/igniter/sparkler