From b7ecdf6a2fa3b29ee7f057440ac5c2949ec5dcab Mon Sep 17 00:00:00 2001 From: Incoming Date: Mon, 28 Dec 2015 20:47:32 -0500 Subject: [PATCH] Adds scatter lasers to the drop list Changes it so scatter lasers start in scatter mode to drive home the point CODING STANDARDS --- code/game/gamemodes/wizard/rightandwrong.dm | 4 +++- code/modules/projectiles/gun.dm | 4 +++- code/modules/projectiles/guns/energy/laser.dm | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index a46d852ae79..26021fcb966 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -1,7 +1,7 @@ //In this file: Summon Magic/Summon Guns/Summon Events /proc/rightandwrong(summon_type, mob/user, survivor_probability) //0 = Summon Guns, 1 = Summon Magic - var/list/gunslist = list("taser","egun","laser","revolver","detective","c20r","nuclear","deagle","gyrojet","pulse","suppressed","cannon","doublebarrel","shotgun","combatshotgun","bulldog","mateba","sabr","crossbow","saw","car","boltaction","speargun","arg","uzi","alienpistol","dragnet","turret","pulsecarbine","decloner","mindflayer","hyperkinetic","advplasmacutter","wormhole","wt550","bulldog","grenadelauncher","goldenrevolver","sniper","medibeam") + var/list/gunslist = list("taser","egun","laser","revolver","detective","c20r","nuclear","deagle","gyrojet","pulse","suppressed","cannon","doublebarrel","shotgun","combatshotgun","bulldog","mateba","sabr","crossbow","saw","car","boltaction","speargun","arg","uzi","alienpistol","dragnet","turret","pulsecarbine","decloner","mindflayer","hyperkinetic","advplasmacutter","wormhole","wt550","bulldog","grenadelauncher","goldenrevolver","sniper","medibeam","scatterbeam") var/list/magiclist = list("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge", "summonitem", "wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffchange", "staffhealing", "armor", "scrying","staffdoor","voodoo", "special") var/list/magicspeciallist = list("staffchange","staffanimation", "wandbelt", "contract", "staffchaos", "necromantic") @@ -115,6 +115,8 @@ G = new /obj/item/weapon/gun/projectile/sniper_rifle(get_turf(H)) if("medibeam") G = new /obj/item/weapon/gun/medbeam(get_turf(H)) + if("scatterbeam") + G = new /obj/item/weapon/gun/energy/laser/scatter(get_turf(H)) G.unlock() playsound(get_turf(H),'sound/magic/Summon_guns.ogg', 50, 1) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 39ed3d1983a..51e0a7822be 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -429,8 +429,10 @@ obj/item/weapon/gun/proc/newshot() process_fire(target, user, 1, params) /obj/item/weapon/gun/proc/unlock() //used in summon guns and as a convience for admins - if(pin) qdel(pin) + if(pin) + qdel(pin) pin = new /obj/item/device/firing_pin + ///////////// // ZOOMING // ///////////// diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index e2659248250..ea52cf11f12 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -39,7 +39,7 @@ item_state = "laser" desc = "An industrial-grade heavy-duty laser rifle with a modified laser lense to scatter its shot into multiple smaller lasers. The inner-core can self-charge for theorically infinite use." origin_tech = "combat=5;materials=4;powerstorage=4" - ammo_type = list(/obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/laser/scatter) + ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser) /obj/item/weapon/gun/energy/laser/cyborg can_charge = 0 @@ -55,7 +55,7 @@ /obj/item/weapon/gun/energy/laser/scatter name = "scatter laser gun" desc = "A laser gun equipped with a refraction kit that spreads bolts." - ammo_type = list(/obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/laser/scatter) + ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser) /obj/item/weapon/gun/energy/lasercannon name = "laser cannon"