From 077d3fd5e5a6a7b7bb62e1dcdb498ae1680f6b8c Mon Sep 17 00:00:00 2001 From: mister-onion Date: Fri, 8 Nov 2024 20:54:52 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B5=D1=81=D1=82=D0=B0=20=D0=BA?= =?UTF-8?q?=D0=B0=D1=80=D1=80=D0=B8=D0=B5=D1=80=D1=83=20=D0=B8=20=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=85=D0=B0?= =?UTF-8?q?=D1=80=D0=B0=D0=BA=D1=82=D0=B5=D1=80=D0=B8=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../castes/carrier/abilities_carrier.dm | 57 ++++++++++++++++++- .../castes/carrier/castedatum_carrier.dm | 18 +++--- 2 files changed, 65 insertions(+), 10 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm b/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm index 37d58819815..19f13895a91 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm @@ -37,7 +37,7 @@ GLOBAL_LIST_INIT(hugger_images_list, list( keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_THROW_HUGGER, ) - cooldown_duration = 3 SECONDS + cooldown_duration = 2 SECONDS /datum/action/ability/activable/xeno/throw_hugger/get_cooldown() var/mob/living/carbon/xenomorph/carrier/caster = owner @@ -378,7 +378,7 @@ GLOBAL_LIST_INIT(hugger_images_list, list( action_icon_state = "call_younger" desc = "Appeals to the larva inside the Marine. The Marine loses his balance, and larva's progress accelerates." ability_cost = 150 - cooldown_duration = 20 SECONDS + cooldown_duration = 10 SECONDS keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_CALL_YOUNGER, ) @@ -456,3 +456,56 @@ GLOBAL_LIST_INIT(hugger_images_list, list( succeed_activate() add_cooldown() + +// *************************************** +// *********** Build nest +// *************************************** + +/datum/action/ability/xeno_action/build_nest + name = "Build nest" + action_icon_state = ALIEN_NEST + desc = "Build nest for host" + ability_cost = 200 + cooldown_duration = 20 SECONDS + keybinding_signals = list( + KEYBINDING_NORMAL = COMSIG_XENOABILITY_SECRETE_RESIN, + ) + +/datum/action/ability/xeno_action/build_nest/can_use_action(silent, override_flags) + . = ..() + var/turf/T = get_turf(owner) + var/mob/living/carbon/xenomorph/blocker = locate() in T + if(blocker && blocker != owner && blocker.stat != DEAD) + if(!silent) + to_chat(owner, span_xenowarning("You cannot build with [blocker] in the way!")) + return FALSE + + if(!T.is_weedable()) + return FALSE + + var/mob/living/carbon/xenomorph/owner_xeno = owner + if(!owner_xeno.loc_weeds_type) + if(!silent) + to_chat(owner, span_xenowarning("No weeds here!")) + return FALSE + + if(!T.check_alien_construction(owner, silent, /obj/structure/bed/nest) || !T.check_disallow_alien_fortification(owner)) + return FALSE + +/datum/action/ability/xeno_action/build_nest/action_activate() + + var/turf/T = get_turf(owner) + for(var/obj/structure/bed/nest/nest in range(2, T)) + owner.balloon_alert(owner, "Another nest too close!") + return FALSE + + if(!do_after(owner, 2 SECONDS, NONE, owner, BUSY_ICON_BUILD)) + return FALSE + + if(!can_use_action()) + return FALSE + + new /obj/structure/bed/nest(T) + playsound(T, "alien_resin_build", 25) + succeed_activate() + add_cooldown() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm b/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm index 1c0c767aaaf..42ae3a01578 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm @@ -11,17 +11,17 @@ wound_type = "carrier" //used to match appropriate wound overlays // *** Melee Attacks *** // - melee_damage = 20 + melee_damage = 22 // *** Speed *** // - speed = -0.4 + speed = -0.3 // *** Plasma *** // - plasma_max = 800 - plasma_gain = 38 + plasma_max = 1000 + plasma_gain = 50 // *** Health *** // - max_health = 325 + max_health = 425 // *** Evolution *** // evolution_threshold = 225 @@ -33,7 +33,7 @@ caste_traits = null // *** Defense *** // - soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 0, BIO = 5, FIRE = 0, ACID = 5) + soft_armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 0, BIO = 5, FIRE = 25, ACID = 5) // *** Pheromones *** // aura_strength = 2.5 @@ -42,8 +42,8 @@ minimap_icon = "carrier" // *** Carrier Abilities *** // - huggers_max = 7 - hugger_delay = 1.5 SECONDS + huggers_max = 8 + hugger_delay = 1.25 SECONDS actions = list( /datum/action/ability/xeno_action/xeno_resting, @@ -61,6 +61,7 @@ /datum/action/ability/xeno_action/pheromones/emit_warding, /datum/action/ability/xeno_action/pheromones/emit_frenzy, /datum/action/ability/xeno_action/carrier_panic, + /datum/action/ability/xeno_action/build_nest, /datum/action/ability/xeno_action/choose_hugger_type, /datum/action/ability/xeno_action/set_hugger_reserve, ) @@ -90,6 +91,7 @@ /datum/action/ability/xeno_action/pheromones/emit_warding, /datum/action/ability/xeno_action/pheromones/emit_frenzy, /datum/action/ability/xeno_action/carrier_panic, + /datum/action/ability/xeno_action/build_nest, /datum/action/ability/xeno_action/choose_hugger_type, /datum/action/ability/xeno_action/set_hugger_reserve, /datum/action/ability/xeno_action/build_hugger_turret, From 3f5313c2fe707343af5363e22eb7c4fa079b5545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D1=83=D0=BA?= <155453968+mister-onion@users.noreply.github.com> Date: Fri, 8 Nov 2024 22:03:00 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=85=D0=B0=D1=80=D0=B0=D0=BA=D1=82=D0=B5=D1=80=D0=B8?= =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Лук <155453968+mister-onion@users.noreply.github.com> --- .../carbon/xenomorph/castes/carrier/castedatum_carrier.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm b/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm index 42ae3a01578..107d8427f6a 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm @@ -14,11 +14,11 @@ melee_damage = 22 // *** Speed *** // - speed = -0.3 + speed = -0.4 // *** Plasma *** // plasma_max = 1000 - plasma_gain = 50 + plasma_gain = 45 // *** Health *** // max_health = 425 From 33570db6773c555898f12940aae89d7a2d5df79a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D1=83=D0=BA?= <155453968+mister-onion@users.noreply.github.com> Date: Fri, 8 Nov 2024 22:04:38 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B4=D0=BE=D0=BF.=20=D0=B8=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D0=BF=D0=BE=D1=81=D0=BE?= =?UTF-8?q?=D0=B1=D0=BD=D0=BE=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Лук <155453968+mister-onion@users.noreply.github.com> --- .../living/carbon/xenomorph/castes/carrier/abilities_carrier.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm b/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm index 19f13895a91..2a832977002 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm @@ -150,7 +150,7 @@ GLOBAL_LIST_INIT(hugger_images_list, list( action_icon_state = "spawn_hugger" desc = "Spawn a facehugger that is stored on your body." ability_cost = 100 - cooldown_duration = 10 SECONDS + cooldown_duration = 5 SECONDS keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_SPAWN_HUGGER, ) From 168f7986c80d89129e69449b4ffd26b92083f991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D1=83=D0=BA?= <155453968+mister-onion@users.noreply.github.com> Date: Sat, 9 Nov 2024 16:35:41 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BB=D0=B8=D1=87=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=B2=D0=BE=20=D1=85=D0=B0=D0=B3=D0=B3=D0=B5=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit мне кажется +1 хаггер такое себе изменение Signed-off-by: Лук <155453968+mister-onion@users.noreply.github.com> --- .../carbon/xenomorph/castes/carrier/castedatum_carrier.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm b/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm index 107d8427f6a..516630e40a3 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/carrier/castedatum_carrier.dm @@ -42,7 +42,7 @@ minimap_icon = "carrier" // *** Carrier Abilities *** // - huggers_max = 8 + huggers_max = 9 hugger_delay = 1.25 SECONDS actions = list(