Merge pull request #8010 from VOREStation/upstream-merge-7180

[MIRROR] Fix weeds
This commit is contained in:
Aronai Sieyes
2020-05-21 16:06:26 -04:00
committed by GitHub
2 changed files with 7 additions and 5 deletions
+6 -4
View File
@@ -176,11 +176,11 @@
. = ..()
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,7 +203,7 @@
desc = "Weird glowing organic growth."
layer = ABOVE_TURF_LAYER+0.01
light_range = NODERANGE
var/node_range = NODERANGE
var/set_color = "#321D37"
@@ -216,6 +216,8 @@
else
qdel(existing)
linked_node = src
if(newcolor)
set_color = newcolor
if(set_color)
@@ -299,7 +301,7 @@
W.color = W.linked_node.set_color
if(prob(max(10, 40 - (5 * nearby_weeds.len))))
if(prob(max(10, 60 - (5 * nearby_weeds.len))))
W.process()
/obj/effect/alien/weeds/ex_act(severity)
@@ -121,7 +121,7 @@
if(check_alien_ability(50,1,O_RESIN))
visible_message("<span class='alium'><B>[src] has planted some alien weeds!</B></span>")
new /obj/effect/alien/weeds/node(get_turf(src), "#321D37")
new /obj/effect/alien/weeds/node(get_turf(src), null, "#321D37")
return
/mob/living/carbon/human/proc/Spit(var/atom/A)