Crayons and Gloves

This commit is contained in:
Fox-McCloud
2015-03-06 21:40:57 -05:00
parent 73c957dc04
commit 4e4e7ae77f
36 changed files with 297 additions and 241 deletions
+2 -2
View File
@@ -167,7 +167,7 @@
animals lunging, etc.
*/
/mob/proc/RangedAttack(var/atom/A, var/params)
if(ishuman(src) && (istype(src:gloves, /obj/item/clothing/gloves/yellow/power)) && a_intent == "harm")
if(ishuman(src) && (istype(src:gloves, /obj/item/clothing/gloves/color/yellow/power)) && a_intent == "harm")
PowerGlove(A)
if(!mutations.len) return
if((LASER in mutations) && a_intent == "harm")
@@ -321,7 +321,7 @@
return
/mob/living/carbon/human/PowerGlove(atom/A)
var/obj/item/clothing/gloves/yellow/power/G = src:gloves
var/obj/item/clothing/gloves/color/yellow/power/G = src:gloves
var/time = 100
var/turf/T = get_turf(src)
var/turf/U = get_turf(A)