Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HonkCrystalNuking

This commit is contained in:
Sirryan2002
2021-09-22 01:20:09 -04:00
122 changed files with 5159 additions and 4247 deletions
@@ -323,7 +323,7 @@
/obj/item/lava_staff,
/obj/item/katana/energy,
/obj/item/hierophant_club,
/obj/item/storage/toolbox/green/memetic,
/obj/item/his_grace,
/obj/item/gun/projectile/automatic/l6_saw,
/obj/item/gun/magic/staff/chaos,
/obj/item/gun/magic/staff/spellblade,