From 44cf1c4106f901fec8b6726f2eabcbcbd4ddd1a7 Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Sun, 26 Aug 2012 00:37:47 +0000 Subject: [PATCH] Runtime fix. runtime error: Cannot execute null.apply effect(). proc name: on hit (/obj/item/projectile/energy/floramut/on_hit) source file: special.dm,85 Moved ninja gloves into the gloves sub-folder in clothing instead of space suits. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4545 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/clothing/gloves/miscellaneous.dm | 10 ++++++++++ code/modules/clothing/spacesuits/ninja.dm | 11 ----------- code/modules/projectiles/projectile/special.dm | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 2a57ccc3c11..05c4bf03e3d 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -1,3 +1,13 @@ +/obj/item/clothing/gloves/space_ninja + desc = "These nano-enhanced gloves insulate from electricity and provide fire resistance." + name = "ninja gloves" + icon_state = "s-ninja" + item_state = "s-ninja" + siemens_coefficient = 0 + var/draining = 0 + var/candrain = 0 + var/mindrain = 200 + var/maxdrain = 400 /obj/item/clothing/gloves/captain desc = "Regal blue gloves, with a nice gold trim. Swanky." diff --git a/code/modules/clothing/spacesuits/ninja.dm b/code/modules/clothing/spacesuits/ninja.dm index 242679a62fc..7a275944c1c 100644 --- a/code/modules/clothing/spacesuits/ninja.dm +++ b/code/modules/clothing/spacesuits/ninja.dm @@ -1,14 +1,3 @@ -/obj/item/clothing/gloves/space_ninja - desc = "These nano-enhanced gloves insulate from electricity and provide fire resistance." - name = "ninja gloves" - icon_state = "s-ninja" - item_state = "s-ninja" - siemens_coefficient = 0 - var/draining = 0 - var/candrain = 0 - var/mindrain = 200 - var/maxdrain = 400 - /obj/item/clothing/head/helmet/space/space_ninja desc = "What may appear to be a simple black garment is in fact a highly sophisticated nano-weave helmet. Standard issue ninja gear." name = "ninja hood" diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 8a9d20262d6..5e12670cc29 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -80,7 +80,7 @@ on_hit(var/atom/target, var/blocked = 0) var/mob/living/M = target if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //Plantmen possibly get mutated and damaged by the rays. - var/mob/living/L as mob + var/mob/living/L = target if(prob(15)) L.apply_effect((rand(30,80)),IRRADIATE) L.Weaken(5)