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

This commit is contained in:
silicons
2021-06-13 15:37:35 -07:00
180 changed files with 78539 additions and 75395 deletions
@@ -35,6 +35,9 @@
/obj/item/ammo_casing/magic/spellblade
projectile_type = /obj/item/projectile/magic/spellblade
/obj/item/ammo_casing/magic/judgement_cut
projectile_type = /obj/item/projectile/judgement_cut
/obj/item/ammo_casing/magic/arcane_barrage
projectile_type = /obj/item/projectile/magic/arcane_barrage