cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7606 from VOREStation/upstream-merge-6960

Browse Source 
More fixes for aliens.dm
This commit is contained in:
Aronai Sieyes
2020-05-03 12:15:58 -04:00
committed by GitHub
parent c07ff1ffc1 49aa045e47
commit ff07f3e0b0
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/game/objects/effects/alien/aliens.dm
View File

@@ -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