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(