From 49aa045e471c6c14e77d66325a6cb5d63b4e31ab Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 3 May 2020 12:03:57 -0400 Subject: [PATCH] More fixes for aliens.dm --- code/game/objects/effects/alien/aliens.dm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/code/game/objects/effects/alien/aliens.dm b/code/game/objects/effects/alien/aliens.dm index d0cb3dce97a..2262375ea0b 100644 --- a/code/game/objects/effects/alien/aliens.dm +++ b/code/game/objects/effects/alien/aliens.dm @@ -172,12 +172,14 @@ var/obj/effect/alien/weeds/node/linked_node = null var/static/list/weedImageCache -/obj/effect/alien/weeds/Initialize(var/mapload, node) +/obj/effect/alien/weeds/Initialize(var/mapload, var/node, var/newcolor) . = ..() if(isspace(loc)) return INITIALIZE_HINT_QDEL linked_node = node + if(newcolor) + color = newcolor if(icon_state == "weeds") icon_state = pick("weeds", "weeds1", "weeds2") @@ -203,9 +205,9 @@ light_range = NODERANGE var/node_range = NODERANGE - var/set_color = null + var/set_color = "#321D37" -/obj/effect/alien/weeds/node/Initialize(var/mapload, var/newcolor = "#321D37") +/obj/effect/alien/weeds/node/Initialize(var/mapload, var/node, var/newcolor) . = ..() for(var/obj/effect/alien/weeds/existing in loc) @@ -216,6 +218,8 @@ if(newcolor) set_color = newcolor + if(set_color) + color = set_color START_PROCESSING(SSobj, src) // Only the node processes in a subsystem, the rest are process()'d by the node @@ -278,8 +282,7 @@ if(T1.c_airblock(T2) == BLOCKED) continue - var/obj/effect/E = new /obj/effect/alien/weeds(T2, linked_node) - E.color = color + new /obj/effect/alien/weeds(T2, linked_node, color) /obj/effect/alien/weeds/node/process() set background = 1