From e9e434c226d501ebf4f0a66fd8bb717163a518d6 Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Wed, 25 Jul 2012 17:04:22 +0000 Subject: [PATCH] Laser tag guns, practice lasers and staves of change no longer blow up in the clown's face. Fixes Issue 638. Changed mode.txt from traitor to extended. Extended makes a heck of a lot more sense for testing purposes. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4172 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/projectiles/gun.dm | 3 ++- code/modules/projectiles/guns/energy/laser.dm | 4 +++- code/modules/projectiles/guns/energy/special.dm | 1 + data/mode.txt | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 6a0ee6d4db6..fa566130f3e 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -20,6 +20,7 @@ var/silenced = 0 var/recoil = 0 var/ejectshell = 1 + var/clumsy_check = 1 proc/load_into_chamber() @@ -47,7 +48,7 @@ if(istype(target, /obj/machinery/recharger) && istype(src, /obj/item/weapon/gun/energy)) return//Shouldnt flag take care of this? //Exclude lasertag guns from the CLUMSY check. - if(src.name != "laser tag gun") + if(src.clumsy_check) if(istype(user, /mob/living)) var/mob/living/M = user if ((CLUMSY in M.mutations) && prob(50)) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 6a15aa06f88..7986b37eea6 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -13,7 +13,7 @@ name = "practice laser gun" desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice." projectile_type = "/obj/item/projectile/practice" - + clumsy_check = 0 obj/item/weapon/gun/energy/laser/retro name ="retro laser" @@ -90,6 +90,7 @@ obj/item/weapon/gun/energy/laser/retro desc = "Standard issue weapon of the Imperial Guard" projectile_type = "/obj/item/projectile/bluetag" origin_tech = "combat=1;magnets=2" + clumsy_check = 0 var/charge_tick = 0 special_check(var/mob/living/carbon/human/M) @@ -126,6 +127,7 @@ obj/item/weapon/gun/energy/laser/retro desc = "Standard issue weapon of the Imperial Guard" projectile_type = "/obj/item/projectile/redtag" origin_tech = "combat=1;magnets=2" + clumsy_check = 0 var/charge_tick = 0 special_check(var/mob/living/carbon/human/M) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index c440af73763..2a0357a7ab9 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -34,6 +34,7 @@ obj/item/weapon/gun/energy/staff charge_cost = 200 projectile_type = "/obj/item/projectile/change" origin_tech = null + clumsy_check = 0 var/charge_tick = 0 diff --git a/data/mode.txt b/data/mode.txt index bd81a61cbfd..cf1ffd5c991 100644 --- a/data/mode.txt +++ b/data/mode.txt @@ -1 +1 @@ -traitor +extended \ No newline at end of file