From cb37ca225f37d326c97ec6ff051f5bf43a328343 Mon Sep 17 00:00:00 2001 From: Da Cool Boss <142358580+DaCoolBoss@users.noreply.github.com> Date: Fri, 26 Sep 2025 20:10:06 +0100 Subject: [PATCH] Updates summon guns / gun mystery box list (#93062) ## About The Pull Request Updates the guns that the event can spawn. Mystery boxes use the same list. List now contains all lethal guns currently in the game, besides cosmetic/downgraded variants of other guns (some exceptions made if the variants are cool/iconic), craftable guns, and unique heist targets. Some of the newer guns weren't added to this list and now they're there. This means the sci portal guns are gone, gimmick guns are gone, if you get a gun from this you can immediately use it to harm someone as intended. Medbeam stays as the sole "dud" gun. Tasers and disablers stay in the list because they are used in the same way as lethal guns. You can shoot someone with them until they fall over. That counts, IMO. List now uses the unrestricted guns, for those with firing pins. This ensures non nukies can actually use them out of the box. Having to source a firing pin to make the gun that magically appeared in your hands actually work sucked, and went against the theme of the event. Alphabetises the list too. ## Why It's Good For The Game Event did dumb stuff like giving people non-guns or guns they couldn't use. List was also dated so some of the new cool guns weren't spawned. ## Changelog :cl: fix: Summon Guns event will no longer spawn guns with restricted firing pins. fix: Summon Guns event will now only spawn guns that are intended to harm people (except the medbeam) balance: Added more guns to the Summon Guns event. /:cl: --- code/modules/projectiles/guns/energy/laser.dm | 3 + .../spells/spell_types/right_and_wrong.dm | 86 +++++++++++-------- 2 files changed, 51 insertions(+), 38 deletions(-) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 8ddcb02e3ad..eedb3496166 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -60,6 +60,9 @@ spread = 14 pin = /obj/item/firing_pin/implant/pindicate +/obj/item/gun/energy/laser/carbine/cybersun/unrestricted + pin = /obj/item/firing_pin + /obj/item/gun/energy/laser/carbine/practice name = "practice laser carbine" desc = "A modified version of the laser carbine, this one fires even less concentrated energy bolts designed for target practice." diff --git a/code/modules/spells/spell_types/right_and_wrong.dm b/code/modules/spells/spell_types/right_and_wrong.dm index b85d9ba43d8..ecd4d75320e 100644 --- a/code/modules/spells/spell_types/right_and_wrong.dm +++ b/code/modules/spells/spell_types/right_and_wrong.dm @@ -14,52 +14,62 @@ GLOBAL_DATUM(mass_teaching, /datum/summon_things_controller/spellbook_entry) GLOBAL_LIST_INIT(summoned_all_guns, get_sane_item_types(/obj/item/gun)) GLOBAL_LIST_INIT(summoned_guns, list( - /obj/item/gun/energy/disabler, - /obj/item/gun/energy/e_gun, - /obj/item/gun/energy/e_gun/advtaser, - /obj/item/gun/energy/laser, + /obj/item/gun/ballistic/automatic/ar, + /obj/item/gun/ballistic/automatic/battle_rifle, + /obj/item/gun/ballistic/automatic/c20r/unrestricted, + /obj/item/gun/ballistic/automatic/gyropistol, + /obj/item/gun/ballistic/automatic/l6_saw/unrestricted, + /obj/item/gun/ballistic/automatic/laser, + /obj/item/gun/ballistic/automatic/m90/unrestricted, + /obj/item/gun/ballistic/automatic/mini_uzi, + /obj/item/gun/ballistic/automatic/pistol, + /obj/item/gun/ballistic/automatic/pistol/aps, + /obj/item/gun/ballistic/automatic/pistol/clandestine/fisher, + /obj/item/gun/ballistic/automatic/pistol/deagle, + /obj/item/gun/ballistic/automatic/pistol/deagle/regal, + /obj/item/gun/ballistic/automatic/pistol/doorhickey, + /obj/item/gun/ballistic/automatic/pistol/m1911, + /obj/item/gun/ballistic/automatic/proto/unrestricted, + /obj/item/gun/ballistic/automatic/smartgun, + /obj/item/gun/ballistic/automatic/tommygun, + /obj/item/gun/ballistic/automatic/wt550, /obj/item/gun/ballistic/revolver, /obj/item/gun/ballistic/revolver/badass, - /obj/item/gun/ballistic/revolver/c38/detective, - /obj/item/gun/ballistic/automatic/pistol/deagle/camo, - /obj/item/gun/ballistic/automatic/gyropistol, - /obj/item/gun/energy/pulse, - /obj/item/gun/ballistic/automatic/pistol/suppressed, - /obj/item/gun/ballistic/shotgun/doublebarrel, - /obj/item/gun/ballistic/shotgun, - /obj/item/gun/ballistic/shotgun/automatic/combat, - /obj/item/gun/ballistic/automatic/ar, - /obj/item/gun/ballistic/revolver/mateba, + /obj/item/gun/ballistic/revolver/c38, + /obj/item/gun/ballistic/revolver/nagant, /obj/item/gun/ballistic/rifle/boltaction, + /obj/item/gun/ballistic/rifle/boltaction/donkrifle, /obj/item/gun/ballistic/rifle/boltaction/harpoon, - /obj/item/gun/ballistic/automatic/mini_uzi, - /obj/item/gun/energy/lasercannon, - /obj/item/gun/energy/recharge/ebow/large, - /obj/item/gun/energy/e_gun/nuclear, - /obj/item/gun/ballistic/automatic/proto, - /obj/item/gun/ballistic/automatic/c20r, - /obj/item/gun/ballistic/automatic/l6_saw, - /obj/item/gun/ballistic/automatic/m90, - /obj/item/gun/energy/alien, - /obj/item/gun/energy/e_gun/dragnet, - /obj/item/gun/energy/e_gun/turret, - /obj/item/gun/energy/pulse/carbine, - /obj/item/gun/energy/mindflayer, - /obj/item/gun/energy/recharge/kinetic_accelerator, - /obj/item/gun/energy/plasmacutter/adv, - /obj/item/gun/energy/wormhole_projector, - /obj/item/gun/ballistic/automatic/wt550, - /obj/item/gun/ballistic/shotgun/bulldog, - /obj/item/gun/ballistic/revolver/grenadelauncher, - /obj/item/gun/ballistic/revolver/golden, + /obj/item/gun/ballistic/rifle/rebarxbow/syndie, /obj/item/gun/ballistic/rifle/sniper_rifle, - /obj/item/gun/ballistic/rocketlauncher, - /obj/item/gun/medbeam, + /obj/item/gun/ballistic/rocketlauncher/unrestricted, + /obj/item/gun/ballistic/shotgun/automatic/combat, + /obj/item/gun/ballistic/shotgun/bulldog/unrestricted, + /obj/item/gun/ballistic/shotgun/doublebarrel, + /obj/item/gun/ballistic/shotgun/hook, + /obj/item/gun/ballistic/shotgun/lethal, + /obj/item/gun/energy/alien, + /obj/item/gun/energy/disabler, + /obj/item/gun/energy/disabler/smg, + /obj/item/gun/energy/e_gun, + /obj/item/gun/energy/e_gun/advtaser, + /obj/item/gun/energy/e_gun/nuclear, + /obj/item/gun/energy/laser, + /obj/item/gun/energy/laser/carbine, + /obj/item/gun/energy/laser/carbine/cybersun/unrestricted, + /obj/item/gun/energy/laser/hellgun, /obj/item/gun/energy/laser/scatter, /obj/item/gun/energy/laser/thermal, - /obj/item/gun/energy/laser/thermal/inferno, /obj/item/gun/energy/laser/thermal/cryo, - /obj/item/gun/energy/gravity_gun)) + /obj/item/gun/energy/laser/thermal/inferno, + /obj/item/gun/energy/lasercannon, + /obj/item/gun/energy/mindflayer, + /obj/item/gun/energy/plasmacutter/adv, + /obj/item/gun/energy/pulse, + /obj/item/gun/energy/pulse/carbine, + /obj/item/gun/energy/recharge/ebow/large, + /obj/item/gun/energy/recharge/kinetic_accelerator, + /obj/item/gun/medbeam,)) //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(