Skip to content

Commit

Permalink
Laser tag guns, practice lasers and staves of change no longer blow u…
Browse files Browse the repository at this point in the history
…p 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
  • Loading branch information
[email protected] committed Jul 25, 2012
1 parent 12e2336 commit e9e434c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
3 changes: 2 additions & 1 deletion code/modules/projectiles/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
var/silenced = 0
var/recoil = 0
var/ejectshell = 1
var/clumsy_check = 1


proc/load_into_chamber()
Expand Down Expand Up @@ -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))
Expand Down
4 changes: 3 additions & 1 deletion code/modules/projectiles/guns/energy/laser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/modules/projectiles/guns/energy/special.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion data/mode.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
traitor
extended

0 comments on commit e9e434c

Please sign in to comment.