From a5d8d93215d897b00acaa3c3d91fb06740ea311d Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Fri, 14 Jul 2023 12:09:08 -0400 Subject: [PATCH 01/12] Carrier Eggsac Strain can now place eggs on regular weeds --- code/modules/mob/living/carbon/xenomorph/egg_item.dm | 4 ++-- .../carbon/xenomorph/mutators/strains/carrier/eggsac.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm index 4a70cff368b6..030534f0b3a8 100644 --- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm +++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm @@ -87,7 +87,7 @@ hive_weeds = W break - if(!hive_weeds) + if(!hive_weeds && user.mutation_type != CARRIER_EGGSAC) var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] to_chat(user, SPAN_XENOWARNING("[src] can only be planted on [lowertext(hive.prefix)]hive weeds.")) return @@ -107,7 +107,7 @@ return for(var/obj/effect/alien/weeds/W in T) - if(W.weed_strength >= WEED_LEVEL_HIVE) + if(W.weed_strength >= WEED_LEVEL_HIVE || user.mutation_type == CARRIER_EGGSAC) user.use_plasma(30) var/obj/effect/alien/egg/newegg = new /obj/effect/alien/egg(T, hivenumber) diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm index c8e6b768f2bc..2ce2f2c6a1fb 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm @@ -1,6 +1,6 @@ /datum/xeno_mutator/eggsac name = "STRAIN: Carrier - Eggsac" - description = "In exchange for your ability to store huggers and place traps, you gain larger plasma stores, strong pheromones, and the ability to lay eggs by using your plasma stores. In addition, you can now carry twelve eggs at once and can place eggs one pace further than normal." + description = "In exchange for your ability to store huggers and place traps, you gain larger plasma stores, strong pheromones, and the ability to lay eggs by using your plasma stores. In addition, you can now carry twelve eggs at once and can place eggs one pace further than normal even on regular weeds." flavor_description = "An egg is always an adventure; the next one may be different." cost = MUTATOR_COST_EXPENSIVE individual_only = TRUE From 5de24feab51b8c4c94a4349e5146697ee469a96a Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Fri, 14 Jul 2023 13:01:18 -0400 Subject: [PATCH 02/12] Fix range bug, notify eggsacs on egg generation --- code/modules/mob/living/carbon/xenomorph/egg_item.dm | 5 ++++- .../carbon/xenomorph/mutators/strains/carrier/eggsac.dm | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm index 030534f0b3a8..24b1c7f9295d 100644 --- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm +++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm @@ -37,8 +37,11 @@ if(istype(target, /obj/effect/alien/resin/special/eggmorph)) return //We tried storing the hugger from the egg, no need to try to plant it (we know the turf is occupied!) if(isxeno(user)) + var/mob/living/carbon/xenomorph/xeno = user var/turf/T = get_turf(target) - plant_egg(user, T, proximity) + if(xeno.mutation_type == CARRIER_EGGSAC && get_dist(xeno, T) <= 2) + proximity = TRUE + plant_egg(xeno, T, proximity) if(proximity && ishuman(user)) var/turf/T = get_turf(target) plant_egg_human(user, T) diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm index 2ce2f2c6a1fb..7fb24e59a8a8 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm @@ -73,3 +73,4 @@ if(egg_generation_progress >= 15) egg_generation_progress = 0 xeno.eggs_cur++ + to_chat(xeno, SPAN_XENONOTICE("You generate a egg. Now sheltering: [xeno.eggs_cur] / [xeno.eggs_max].")) From 6c4d029488e4cd579b17cc0219611350ef36fe52 Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Fri, 14 Jul 2023 13:16:08 -0400 Subject: [PATCH 03/12] remove unused procs and replace with variable --- .../mob/living/carbon/xenomorph/castes/Queen.dm | 7 ++----- .../mob/living/carbon/xenomorph/xeno_defines.dm | 10 ---------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm index ac975835b21f..c3a24b9e3054 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm @@ -832,6 +832,7 @@ ADD_TRAIT(src, TRAIT_ABILITY_OVIPOSITOR, TRAIT_SOURCE_ABILITY("Ovipositor")) extra_build_dist = IGNORE_BUILD_DISTANCE + egg_planting_range = 3 anchored = TRUE resting = FALSE update_canmove() @@ -883,6 +884,7 @@ egg_amount = 0 extra_build_dist = initial(extra_build_dist) + egg_planting_range = initial(egg_planting_range) for(var/datum/action/xeno_action/action in actions) if(istype(action, /datum/action/xeno_action/onclick/grow_ovipositor)) var/datum/action/xeno_action/onclick/grow_ovipositor/ovi_ability = action @@ -917,11 +919,6 @@ if(ovipositor) return "Queen_ovipositor_[severity]" // I don't actually have it, but maybe one day. -/mob/living/carbon/xenomorph/queen/proc/in_egg_plant_range(turf/T) - if(!ovipositor) - return FALSE // can't range plant while not in ovi... but who the fuck cares, we can't plant anyways - return get_dist(src, T) <= egg_planting_range - /mob/living/carbon/xenomorph/queen/gib(datum/cause_data/cause = create_cause_data("gibbing", src)) death(cause, 1) diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm index 8b25cf07d14b..fbb9db8fce72 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm @@ -811,16 +811,6 @@ #undef OPEN_SLOTS #undef GUARANTEED_SLOTS -// returns if that location can be used to plant eggs -/datum/hive_status/proc/in_egg_plant_range(turf/T) - if(!istype(living_xeno_queen)) - return TRUE // xenos already dicked without queen. Let them plant whereever - - if(!living_xeno_queen.ovipositor) - return FALSE // ovid queen only - - return get_dist(living_xeno_queen, T) <= egg_planting_range - /datum/hive_status/proc/can_build_structure(structure_name) if(!structure_name || !hive_structures_limit[structure_name]) return FALSE From 735d765d29387a695ce8819665445a9dad8476f9 Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Fri, 14 Jul 2023 13:16:29 -0400 Subject: [PATCH 04/12] new variable to handle extra range on egg plant --- code/modules/mob/living/carbon/xenomorph/Xenomorph.dm | 1 + code/modules/mob/living/carbon/xenomorph/egg_item.dm | 2 +- .../living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm index 0b2625882ed8..2aadbf27d985 100644 --- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm @@ -281,6 +281,7 @@ // Related to zooming out (primarily queen and boiler) var/devour_timer = 0 // The world.time at which we will regurgitate our currently-vored victim var/extra_build_dist = 0 // For drones/hivelords. Extends the maximum build range they have + var/egg_planting_range = 1 //tiles from self you can plant eggs. var/can_stack_builds = FALSE var/list/resin_build_order var/selected_resin // Which resin structure to build when we secrete resin, defaults to null. diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm index 24b1c7f9295d..b357c6896102 100644 --- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm +++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm @@ -39,7 +39,7 @@ if(isxeno(user)) var/mob/living/carbon/xenomorph/xeno = user var/turf/T = get_turf(target) - if(xeno.mutation_type == CARRIER_EGGSAC && get_dist(xeno, T) <= 2) + if(get_dist(xeno, T) <= egg_planting_range) proximity = TRUE plant_egg(xeno, T, proximity) if(proximity && ishuman(user)) diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm index 7fb24e59a8a8..4dd55f97c373 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm @@ -37,7 +37,7 @@ carrier.huggers_cur = 0 carrier.huggers_max = 0 carrier.eggs_max = 12 - carrier.extra_build_dist = 1 + carrier.egg_planting_range = 2 return TRUE /datum/action/xeno_action/active_toggle/generate_egg From 8f68b49fb237912a7020ea10d4ad18cd5d811e86 Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Fri, 14 Jul 2023 13:32:10 -0400 Subject: [PATCH 05/12] bugfixes --- code/modules/mob/living/carbon/xenomorph/castes/Queen.dm | 1 - code/modules/mob/living/carbon/xenomorph/egg_item.dm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm index c3a24b9e3054..f3a354b42ad0 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm @@ -276,7 +276,6 @@ var/queen_ability_cooldown = 0 var/egg_amount = 0 //amount of eggs inside the queen var/screech_sound_effect_list = list('sound/voice/alien_queen_screech.ogg') //the noise the Queen makes when she screeches. Done this way for VV purposes. - var/egg_planting_range = 3 // in ovipositor queen can plant egg up to this amount of tiles away from her position var/queen_ovipositor_icon var/queen_standing_icon diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm index b357c6896102..84c1e066f306 100644 --- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm +++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm @@ -39,7 +39,7 @@ if(isxeno(user)) var/mob/living/carbon/xenomorph/xeno = user var/turf/T = get_turf(target) - if(get_dist(xeno, T) <= egg_planting_range) + if(get_dist(xeno, T) <= xeno.egg_planting_range) proximity = TRUE plant_egg(xeno, T, proximity) if(proximity && ishuman(user)) From 3a8fb0c88ccf84602ec8220a5fc857c40abd880c Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Fri, 14 Jul 2023 15:52:03 -0400 Subject: [PATCH 06/12] Change to eggsac desc --- .../living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm index 4dd55f97c373..910642ed8b40 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm @@ -1,6 +1,6 @@ /datum/xeno_mutator/eggsac name = "STRAIN: Carrier - Eggsac" - description = "In exchange for your ability to store huggers and place traps, you gain larger plasma stores, strong pheromones, and the ability to lay eggs by using your plasma stores. In addition, you can now carry twelve eggs at once and can place eggs one pace further than normal even on regular weeds." + description = "In exchange for your ability to store huggers and place traps, you gain larger plasma stores, strong pheromones, and the ability to lay eggs by using your plasma stores. In addition, you can now carry twelve eggs at once, can plant eggs of non-hive weeds, and can place eggs one pace further than normal" flavor_description = "An egg is always an adventure; the next one may be different." cost = MUTATOR_COST_EXPENSIVE individual_only = TRUE From 4349cc74611aebfe857f15d57ac56c9fc5f681f6 Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Fri, 14 Jul 2023 16:00:38 -0400 Subject: [PATCH 07/12] Fix oversight regarding egg placement (must have some weeds for placement) and rename of variable from single letter --- .../mob/living/carbon/xenomorph/egg_item.dm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm index 84c1e066f306..cf4dfaa4e618 100644 --- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm +++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm @@ -85,12 +85,19 @@ return var/obj/effect/alien/weeds/hive_weeds = null - for(var/obj/effect/alien/weeds/W in T) - if(W.weed_strength >= WEED_LEVEL_HIVE && W.linked_hive.hivenumber == hivenumber) - hive_weeds = W + var/obj/effect/alien/weeds/any_weeds = null + for(var/obj/effect/alien/weeds/Weed in T) + if(Weed.weed_strength >= WEED_LEVEL_HIVE && Weed.linked_hive.hivenumber == hivenumber) + hive_weeds = Weed break + if(Weed.weed_strength >= WEED_LEVEL_WEAK && Weed.linked_hive.hivenumber == hivenumber) //check for ANY weeds + any_weeds = Weed - if(!hive_weeds && user.mutation_type != CARRIER_EGGSAC) + if(!any_weeds && !hive_weeds) //you need at least some weeds to plant on. + to_chat(user, SPAN_XENOWARNING("[src] must be planted on your weeds.")) + return + + if(!hive_weeds && user.mutation_type != CARRIER_EGGSAC) //must have SOME weeds for eggsac var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] to_chat(user, SPAN_XENOWARNING("[src] can only be planted on [lowertext(hive.prefix)]hive weeds.")) return @@ -109,8 +116,8 @@ if(!user.check_plasma(30)) return - for(var/obj/effect/alien/weeds/W in T) - if(W.weed_strength >= WEED_LEVEL_HIVE || user.mutation_type == CARRIER_EGGSAC) + for(var/obj/effect/alien/weeds/Weed in T) + if(Weed.weed_strength >= WEED_LEVEL_HIVE || user.mutation_type == CARRIER_EGGSAC) user.use_plasma(30) var/obj/effect/alien/egg/newegg = new /obj/effect/alien/egg(T, hivenumber) From e9e4ae3da97d3319408f35d9b90e5f5a54ee6afd Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Fri, 14 Jul 2023 16:14:19 -0400 Subject: [PATCH 08/12] better warning --- code/modules/mob/living/carbon/xenomorph/egg_item.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm index cf4dfaa4e618..5d0eed528647 100644 --- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm +++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm @@ -93,12 +93,12 @@ if(Weed.weed_strength >= WEED_LEVEL_WEAK && Weed.linked_hive.hivenumber == hivenumber) //check for ANY weeds any_weeds = Weed + var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] if(!any_weeds && !hive_weeds) //you need at least some weeds to plant on. - to_chat(user, SPAN_XENOWARNING("[src] must be planted on your weeds.")) + to_chat(user, SPAN_XENOWARNING("[src] must be planted on [lowertext(hive.prefix)]weeds.")) return if(!hive_weeds && user.mutation_type != CARRIER_EGGSAC) //must have SOME weeds for eggsac - var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] to_chat(user, SPAN_XENOWARNING("[src] can only be planted on [lowertext(hive.prefix)]hive weeds.")) return From 80eb6237402be8ffef3340abc35d015ba0384c7a Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Fri, 14 Jul 2023 16:16:21 -0400 Subject: [PATCH 09/12] old comment --- code/modules/mob/living/carbon/xenomorph/egg_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm index 5d0eed528647..c929660cf703 100644 --- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm +++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm @@ -98,7 +98,7 @@ to_chat(user, SPAN_XENOWARNING("[src] must be planted on [lowertext(hive.prefix)]weeds.")) return - if(!hive_weeds && user.mutation_type != CARRIER_EGGSAC) //must have SOME weeds for eggsac + if(!hive_weeds && user.mutation_type != CARRIER_EGGSAC) to_chat(user, SPAN_XENOWARNING("[src] can only be planted on [lowertext(hive.prefix)]hive weeds.")) return From 1d778be7f11a894ffc791bfd59bfff851ea41acf Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Tue, 18 Jul 2023 18:18:57 -0400 Subject: [PATCH 10/12] Suggested changes --- .../mob/living/carbon/xenomorph/Xenomorph.dm | 33 ++++++++++++------- .../mob/living/carbon/xenomorph/egg_item.dm | 14 ++++---- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm index 2aadbf27d985..dfbe6b197204 100644 --- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm @@ -271,28 +271,39 @@ // ////////////////////////////////////////////////////////////////// var/tunnel = FALSE - var/stealth = FALSE // for check on lurker invisibility + /// for check on lurker invisibility + var/stealth = FALSE var/burrow = FALSE var/fortify = FALSE var/crest_defense = FALSE - var/agility = FALSE // 0 - upright, 1 - all fours + /// 0/FALSE - upright, 1/TRUE - all fours + var/agility = FALSE var/ripping_limb = FALSE var/steelcrest = FALSE // Related to zooming out (primarily queen and boiler) var/devour_timer = 0 // The world.time at which we will regurgitate our currently-vored victim var/extra_build_dist = 0 // For drones/hivelords. Extends the maximum build range they have - var/egg_planting_range = 1 //tiles from self you can plant eggs. + /// tiles from self you can plant eggs. + var/egg_planting_range = 1 var/can_stack_builds = FALSE var/list/resin_build_order - var/selected_resin // Which resin structure to build when we secrete resin, defaults to null. - var/selected_construction = XENO_STRUCTURE_CORE //which special structure to build when we place constructions - var/selected_mark // If leader what mark you will place when you make one - var/datum/ammo/xeno/ammo = null //The ammo datum for our spit projectiles. We're born with this, it changes sometimes. + /// Which resin structure to build when we secrete resin, defaults to null. + var/selected_resin + /// which special structure to build when we place constructions + var/selected_construction = XENO_STRUCTURE_CORE + /// If leader what mark you will place when you make one + var/selected_mark + /// The ammo datum for our spit projectiles. We're born with this, it changes sometimes. + var/datum/ammo/xeno/ammo = null var/tunnel_delay = 0 - var/list/available_fruits = list() // List of placeable the xenomorph has access to. - var/list/current_fruits = list() // If we have current_fruits that are limited, e.g. fruits - var/max_placeable = 0 // Limit to that amount - var/obj/effect/alien/resin/fruit/selected_fruit = null // the typepath of the placeable we wanna put down + /// List of placeable the xenomorph has access to. + var/list/available_fruits = list() + /// If we have current_fruits that are limited, e.g. fruits + var/list/current_fruits = list() + /// Limit to that amount + var/max_placeable = 0 + /// the typepath of the placeable we wanna put down + var/obj/effect/alien/resin/fruit/selected_fruit = null var/list/built_structures = list() var/icon_xeno diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm index c929660cf703..623715cb1be0 100644 --- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm +++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm @@ -84,13 +84,13 @@ if(!user.check_plasma(30)) return - var/obj/effect/alien/weeds/hive_weeds = null - var/obj/effect/alien/weeds/any_weeds = null - for(var/obj/effect/alien/weeds/Weed in T) - if(Weed.weed_strength >= WEED_LEVEL_HIVE && Weed.linked_hive.hivenumber == hivenumber) + var/obj/effect/alien/weeds/hive_weeds + var/obj/effect/alien/weeds/any_weeds + for(var/obj/effect/alien/weeds/weed in T) + if(weed.weed_strength >= WEED_LEVEL_HIVE && weed.linked_hive.hivenumber == hivenumber) hive_weeds = Weed break - if(Weed.weed_strength >= WEED_LEVEL_WEAK && Weed.linked_hive.hivenumber == hivenumber) //check for ANY weeds + if(weed.weed_strength >= WEED_LEVEL_WEAK && weed.linked_hive.hivenumber == hivenumber) //check for ANY weeds any_weeds = Weed var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] @@ -116,8 +116,8 @@ if(!user.check_plasma(30)) return - for(var/obj/effect/alien/weeds/Weed in T) - if(Weed.weed_strength >= WEED_LEVEL_HIVE || user.mutation_type == CARRIER_EGGSAC) + for(var/obj/effect/alien/weeds/weed in T) + if(weed.weed_strength >= WEED_LEVEL_HIVE || user.mutation_type == CARRIER_EGGSAC) user.use_plasma(30) var/obj/effect/alien/egg/newegg = new /obj/effect/alien/egg(T, hivenumber) From 596615ce8e1a8e5a1d206d20ce71524790940c98 Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Tue, 18 Jul 2023 18:28:45 -0400 Subject: [PATCH 11/12] Changes but not broken --- code/modules/mob/living/carbon/xenomorph/egg_item.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm index 623715cb1be0..b4d423bec364 100644 --- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm +++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm @@ -88,10 +88,10 @@ var/obj/effect/alien/weeds/any_weeds for(var/obj/effect/alien/weeds/weed in T) if(weed.weed_strength >= WEED_LEVEL_HIVE && weed.linked_hive.hivenumber == hivenumber) - hive_weeds = Weed + hive_weeds = weed break if(weed.weed_strength >= WEED_LEVEL_WEAK && weed.linked_hive.hivenumber == hivenumber) //check for ANY weeds - any_weeds = Weed + any_weeds = weed var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] if(!any_weeds && !hive_weeds) //you need at least some weeds to plant on. From b0001f9deac95558b9aedce5aaadfbceb5357b00 Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Tue, 18 Jul 2023 18:30:23 -0400 Subject: [PATCH 12/12] Yes --- code/modules/mob/living/carbon/xenomorph/Xenomorph.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm index dfbe6b197204..6a2dccaaaf72 100644 --- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm @@ -280,9 +280,10 @@ var/agility = FALSE var/ripping_limb = FALSE var/steelcrest = FALSE - // Related to zooming out (primarily queen and boiler) - var/devour_timer = 0 // The world.time at which we will regurgitate our currently-vored victim - var/extra_build_dist = 0 // For drones/hivelords. Extends the maximum build range they have + /// The world.time at which we will regurgitate our currently-vored victim + var/devour_timer = 0 + /// For drones/hivelords. Extends the maximum build range they have + var/extra_build_dist = 0 /// tiles from self you can plant eggs. var/egg_planting_range = 1 var/can_stack_builds = FALSE