diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm index 7741beecedef..4b45c660feab 100644 --- a/code/__DEFINES/xeno.dm +++ b/code/__DEFINES/xeno.dm @@ -132,6 +132,7 @@ // Weed defines #define WEED_LEVEL_WEAK 0 #define WEED_LEVEL_STANDARD 1.5 +#define WEED_LEVEL_HARDY 1.6 #define WEED_LEVEL_HIVE 4 #define WEED_RANGE_STANDARD 3 diff --git a/code/modules/cm_aliens/weeds.dm b/code/modules/cm_aliens/weeds.dm index 0be2220994d8..080bb2cf2d5a 100644 --- a/code/modules/cm_aliens/weeds.dm +++ b/code/modules/cm_aliens/weeds.dm @@ -492,20 +492,20 @@ overlay_node = TRUE overlays += staticnode -/obj/effect/alien/weeds/node/Initialize(mapload, obj/effect/alien/weeds/node/node, mob/living/carbon/xenomorph/X, datum/hive_status/hive) +/obj/effect/alien/weeds/node/Initialize(mapload, obj/effect/alien/weeds/node/node, mob/living/carbon/xenomorph/xeno, datum/hive_status/hive) if (istype(hive)) linked_hive = hive - else if (istype(X) && X.hive) - linked_hive = X.hive + else if (istype(xeno) && xeno.hive) + linked_hive = xeno.hive else linked_hive = GLOB.hive_datum[hivenumber] - for(var/obj/effect/alien/weeds/W in loc) - if(W != src) - if(W.weed_strength > WEED_LEVEL_HIVE) + for(var/obj/effect/alien/weeds/weed in loc) + if(weed != src) + if(weed.weed_strength > WEED_LEVEL_HIVE) qdel(src) return - qdel(W) //replaces the previous weed + qdel(weed) //replaces the previous weed break . = ..(mapload, src) @@ -513,15 +513,15 @@ if(!staticnode) staticnode = image('icons/mob/xenos/weeds.dmi', "weednode", ABOVE_OBJ_LAYER) - var/obj/effect/alien/resin/trap/TR = locate() in loc - if(TR) - RegisterSignal(TR, COMSIG_PARENT_PREQDELETED, PROC_REF(trap_destroyed)) + var/obj/effect/alien/resin/trap/trap = locate() in loc + if(trap) + RegisterSignal(trap, COMSIG_PARENT_PREQDELETED, PROC_REF(trap_destroyed)) overlay_node = FALSE overlays -= staticnode - if(X) - add_hiddenprint(X) - weed_strength = X.weed_level + if(xeno) + add_hiddenprint(xeno) + weed_strength = max(weed_strength, xeno.weed_level) if (weed_strength < WEED_LEVEL_STANDARD) weed_strength = WEED_LEVEL_STANDARD diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm index 0e6b7e4657d3..303e1c94692d 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm @@ -352,8 +352,8 @@ /obj/effect/alien/weeds/node/gardener spread_on_semiweedable = TRUE - block_structures = BLOCK_SPECIAL_STRUCTURES fruit_growth_multiplier = 0.8 + weed_strength = WEED_LEVEL_HARDY /datum/action/xeno_action/verb/verb_plant_gardening_weeds() set category = "Alien"