Shock Gloves fix

Two separate changes were required. 1) commenting out the (assumedly
bad) re-declaration of RangedAttack in other_mobs.dm and 2) moving the
line "if(!mutations.len) return" BELOW the power glove line.  This means
people without powers can use the gloves also.

It's tested as working, but I haven't tested to see if it's broken any
other ranged attacks due to what I changed.  You may want to text xeno
projectiles etc and anything else that uses RangedAttack.
This commit is contained in:
Bone White
2014-06-17 20:08:51 +01:00
parent c353e263f4
commit 26724e002b
2 changed files with 9 additions and 1 deletions
+2 -1
View File
@@ -167,9 +167,9 @@
animals lunging, etc.
*/
/mob/proc/RangedAttack(var/atom/A, var/params)
if(!mutations.len) return
if(ishuman(src) && (istype(src:gloves, /obj/item/clothing/gloves/yellow/power)) && a_intent == "harm")
PowerGlove(A)
if(!mutations.len) return
if((M_LASER in mutations) && a_intent == "harm")
LaserEyes(A) // moved into a proc below
return
@@ -302,6 +302,7 @@
var/turf/U = get_turf(A)
var/obj/structure/cable/cable = locate() in T
if(!cable || !istype(cable))
src << "No cable"
return
if(world.time < G.next_shock)
src << "<span class='warning'>[G] aren't ready to shock again!</span>"
+7
View File
@@ -20,7 +20,12 @@
/mob/living/carbon/human/RestrainedClickOn(var/atom/A)
return
// Commented out to prevent overwriting RangedAttack in click.dm ~ Bone White
/*
/mob/living/carbon/human/RangedAttack(var/atom/A)
world << "Ranged Attack Start! other_mobs"
if(!gloves && !mutations.len) return
var/obj/item/clothing/gloves/G = gloves
if((M_LASER in mutations) && a_intent == "harm")
@@ -41,6 +46,8 @@
return
A.attack_tk(src)
*/
/*
Animals & All Unspecified
*/