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

This commit is contained in:
Ghommie
2019-07-15 17:46:13 +02:00
347 changed files with 5689 additions and 2856 deletions
@@ -42,6 +42,7 @@ GLOBAL_LIST_INIT(summoned_guns, list(
/obj/item/gun/ballistic/revolver/grenadelauncher,
/obj/item/gun/ballistic/revolver/golden,
/obj/item/gun/ballistic/automatic/sniper_rifle,
/obj/item/gun/ballistic/rocketlauncher,
/obj/item/gun/medbeam,
/obj/item/gun/energy/laser/scatter,
/obj/item/gun/energy/gravity_gun))