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
This commit is contained in:
johnsonmt88@gmail.com
2012-07-25 17:04:22 +00:00
parent 12e233653c
commit e9e434c226
4 changed files with 7 additions and 3 deletions

View File

@@ -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))

View File

@@ -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)

View File

@@ -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