From f65581b1c8b61822bfb9e55134b06de99ac2e558 Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Thu, 21 Jan 2016 21:04:56 -0500 Subject: [PATCH 1/2] Fixes #10942 The portion that generates the list just performs a null check, not a length check. So we initialize it as null instead. --- code/modules/clothing/chameleon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index f1f916cd3c..3dfc09201c 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -299,7 +299,7 @@ item_state = "glasses" desc = "It looks like a plain set of mesons, but on closer inspection, it seems to have a small dial inside." origin_tech = list(TECH_ILLEGAL = 3) - var/list/clothing_choices = list() + var/list/global/clothing_choices /obj/item/clothing/glasses/chameleon/New() ..() From 588e072b9de81c520505b2697b173bdc73c980d0 Mon Sep 17 00:00:00 2001 From: Spamcat Date: Sun, 20 Dec 2015 18:48:01 +0300 Subject: [PATCH 2/2] Fixes #11681 --- code/modules/spells/targeted/projectile/projectile.dm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/code/modules/spells/targeted/projectile/projectile.dm b/code/modules/spells/targeted/projectile/projectile.dm index a0c403b51a..fef039d191 100644 --- a/code/modules/spells/targeted/projectile/projectile.dm +++ b/code/modules/spells/targeted/projectile/projectile.dm @@ -15,7 +15,7 @@ If the spell_projectile is seeking, it will update its target every process and var/proj_step_delay = 1 //lower = faster var/cast_prox_range = 1 -/spell/targeted/projectile/cast(list/targets, mob/user = usr) +/spell/targeted/projectile/cast(list/targets, mob/user = usr, var/target_zone) if(istext(proj_type)) proj_type = text2path(proj_type) // sanity filters @@ -26,19 +26,14 @@ If the spell_projectile is seeking, it will update its target every process and if(!projectile) return - projectile.original = target - projectile.starting = get_turf(user) + projectile.shot_from = user //fired from the user - projectile.current = projectile.original - projectile.yo = target.y - user.y - projectile.xo = target.x - user.x - projectile.kill_count = src.duration projectile.hitscan = !proj_step_delay projectile.step_delay = proj_step_delay if(istype(projectile, /obj/item/projectile/spell_projectile)) var/obj/item/projectile/spell_projectile/SP = projectile SP.carried = src //casting is magical - spawn projectile.process() + projectile.launch(target, target_zone="chest") return /spell/targeted/projectile/proc/choose_prox_targets(mob/user = usr, var/atom/movable/spell_holder)