From c78f6afe89a46ca17a16125fcbb0934ffe3424e2 Mon Sep 17 00:00:00 2001 From: 1080pCat <96908085+1080pCat@users.noreply.github.com> Date: Thu, 15 Feb 2024 05:44:25 +1000 Subject: [PATCH] Adds some more guns, and removes some spells/wands from the greater summon guns and magic spell (#24056) * Update rightandwrong.dm * Revert "Update rightandwrong.dm" This reverts commit 28a93bfadd3d92a70115a9fcc63fae0fb45c450c. * Update rightandwrong.dm * forgor this one * Update rightandwrong.dm --- code/game/gamemodes/wizard/rightandwrong.dm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index 4bc8a7b00af..ac866c0a4f3 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -41,7 +41,22 @@ GLOBAL_LIST_INIT(summoned_guns, list( /obj/item/gun/projectile/revolver/golden, /obj/item/gun/projectile/automatic/sniper_rifle, /obj/item/gun/medbeam, - /obj/item/gun/energy/laser/scatter)) + /obj/item/gun/energy/laser/scatter, + /obj/item/gun/projectile/automatic/c20r/toy/riot, + /obj/item/gun/projectile/shotgun/automatic/dual_tube, + /obj/item/gun/energy/kinetic_accelerator/experimental, // even with atmos, this thing can get scary + /obj/item/gun/energy/emitter, + /obj/item/gun/energy/spikethrower, + /obj/item/gun/energy/bsg/prebuilt, + /obj/item/gun/energy/xray, + /obj/item/gun/energy/plasma_pistol, + /obj/item/gun/projectile/automatic/pistol/APS, // whyyy is this capitalized + /obj/item/gun/projectile/revolver/overgrown, + /obj/item/gun/energy/gun/blueshield/pdw9, + /obj/item/gun/energy/disabler/silencer, + /obj/item/gun/energy/lwap, + /obj/item/gun/energy/arc_revolver, + /obj/item/gun/projectile/automatic/ak814)) //if you add anything that isn't covered by the typepaths below, add it to summon_magic_objective_types GLOBAL_LIST_INIT(summoned_magic, list( @@ -55,9 +70,7 @@ GLOBAL_LIST_INIT(summoned_magic, list( /obj/item/spellbook/oneuse/charge, /obj/item/spellbook/oneuse/summonitem, /obj/item/gun/magic/wand, - /obj/item/gun/magic/wand/death, /obj/item/gun/magic/wand/resurrection, - /obj/item/gun/magic/wand/polymorph, /obj/item/gun/magic/wand/teleport, /obj/item/gun/magic/wand/door, /obj/item/gun/magic/wand/fireball, @@ -69,7 +82,6 @@ GLOBAL_LIST_INIT(summoned_magic, list( /obj/item/melee/ghost_sword)) GLOBAL_LIST_INIT(summoned_special_magic, list( - /obj/item/gun/magic/staff/change, /obj/item/gun/magic/staff/animate, /obj/item/storage/belt/wands/full, /obj/item/contract,