From 40e2685a7c4d32a9293176b9fd1fd5d3228bc9e3 Mon Sep 17 00:00:00 2001 From: coiax Date: Sat, 17 Feb 2018 16:05:19 +0000 Subject: [PATCH 1/2] Removes abstract shotgun from Summon Guns list (#35736) * Fixes abstract shotgun from Summon Guns list Fixes #34962. Looking at the old summon gun list, the comment says this typepath was supposed to be a Bulldog. * Removes duplicate bulldog --- code/modules/spells/spell_types/rightandwrong.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm index 2d5ac40c8b..c69b9b1e86 100644 --- a/code/modules/spells/spell_types/rightandwrong.dm +++ b/code/modules/spells/spell_types/rightandwrong.dm @@ -25,7 +25,6 @@ GLOBAL_LIST_INIT(summoned_guns, list( /obj/item/gun/energy/kinetic_accelerator/crossbow/large, /obj/item/gun/energy/e_gun/nuclear, /obj/item/gun/ballistic/automatic/proto, - /obj/item/gun/ballistic/automatic/shotgun/bulldog, /obj/item/gun/ballistic/automatic/c20r, /obj/item/gun/ballistic/automatic/l6_saw, /obj/item/gun/ballistic/automatic/m90, @@ -39,7 +38,7 @@ GLOBAL_LIST_INIT(summoned_guns, list( /obj/item/gun/energy/plasmacutter/adv, /obj/item/gun/energy/wormhole_projector, /obj/item/gun/ballistic/automatic/wt550, - /obj/item/gun/ballistic/automatic/shotgun, + /obj/item/gun/ballistic/automatic/shotgun/bulldog, /obj/item/gun/ballistic/revolver/grenadelauncher, /obj/item/gun/ballistic/revolver/golden, /obj/item/gun/ballistic/automatic/sniper_rifle,