From 69fc5d6a3b5a65d660d56e3ee23e2c1240332d63 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Thu, 21 May 2020 11:37:16 -0700 Subject: [PATCH 1/2] Merge pull request #7180 from Mechoid/FixWeeds Fix weeds --- code/game/objects/effects/alien/aliens.dm | 10 ++++++---- .../carbon/human/species/xenomorphs/alien_powers.dm | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/game/objects/effects/alien/aliens.dm b/code/game/objects/effects/alien/aliens.dm index 3d2676c4dd..836e277872 100644 --- a/code/game/objects/effects/alien/aliens.dm +++ b/code/game/objects/effects/alien/aliens.dm @@ -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) diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm index 4e3ce65811..bfeaf73fde 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm @@ -121,7 +121,7 @@ if(check_alien_ability(50,1,O_RESIN)) visible_message("[src] has planted some alien weeds!") - 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)