From 19cc26d3d7f3a20e72ee39b155e62793ccbaf811 Mon Sep 17 00:00:00 2001 From: GoldenDarkness55 <103884785+GoldenDarkness55@users.noreply.github.com> Date: Sun, 22 Sep 2024 15:28:26 +0200 Subject: [PATCH 01/13] Neuro scatter.dm --- code/__DEFINES/weapon_stats.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/weapon_stats.dm b/code/__DEFINES/weapon_stats.dm index 1c3c09e9b28d..7313ebf80562 100644 --- a/code/__DEFINES/weapon_stats.dm +++ b/code/__DEFINES/weapon_stats.dm @@ -66,7 +66,7 @@ It DOES NOT control where your bullets go, that's scatter and projectile varianc ////SCATTER//// */ -#define SCATTER_AMOUNT_NEURO 60 +#define SCATTER_AMOUNT_NEURO 45 #define SCATTER_AMOUNT_TIER_1 15 #define SCATTER_AMOUNT_TIER_2 10 #define SCATTER_AMOUNT_TIER_3 8 From 48a800a3c34dce36a2d3b9ad58ae55c39840f63f Mon Sep 17 00:00:00 2001 From: GoldenDarkness55 <103884785+GoldenDarkness55@users.noreply.github.com> Date: Sun, 22 Sep 2024 15:30:13 +0200 Subject: [PATCH 02/13] hibernate sentinel_abilities.dm --- .../abilities/sentinel/sentinel_abilities.dm | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_abilities.dm index fdd1164c1479..b82eba2bc7c9 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_abilities.dm @@ -6,7 +6,7 @@ macro_path = /datum/action/xeno_action/verb/verb_slowing_spit action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_1 - xeno_cooldown = 1.5 SECONDS + xeno_cooldown = 2 SECONDS plasma_cost = 20 // Scatterspit @@ -17,7 +17,7 @@ macro_path = /datum/action/xeno_action/verb/verb_scattered_spit action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_2 - xeno_cooldown = 8 SECONDS + xeno_cooldown = 6 SECONDS plasma_cost = 30 // Paralyzing slash @@ -32,3 +32,19 @@ plasma_cost = 50 var/buff_duration = 50 + +/datum/action/xeno_action/activable/hibernate + name = "hibernate" + action_icon_state = "warden_heal" + ability_name = "hibernate" + macro_path = /datum/action/xeno_action/verb/verb_hibernate + action_type = XENO_ACTION_CLICK + ability_primacy = XENO_PRIMARY_ACTION_4 + xeno_cooldown = 50 SECONDS + plasma_cost = 150 + + var/regeneration_amount_total = 500 + var/regeneration_ticks = 10 + var/plasma_amount = 400 + var/plasma_time = 10 + var/time_between_plasmas = 1 From ad3fda74e657099741242f16f521b4d2cae52139 Mon Sep 17 00:00:00 2001 From: GoldenDarkness55 <103884785+GoldenDarkness55@users.noreply.github.com> Date: Sun, 22 Sep 2024 15:30:56 +0200 Subject: [PATCH 03/13] hibernate sentinel_macros.dm --- .../carbon/xenomorph/abilities/sentinel/sentinel_macros.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_macros.dm b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_macros.dm index c3ed88f89095..2c32e4f840cb 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_macros.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_macros.dm @@ -18,3 +18,10 @@ set hidden = TRUE var/action_name = "Paralyzing Slash" handle_xeno_macro(src,action_name) + +/datum/action/xeno_action/verb/verb_hibernate() + set category = "Alien" + set name = "hibernate" + set hidden = TRUE + var/action_name = "hibernate" + handle_xeno_macro(src,action_name) From bd87da8e0ca0041bc216407203e2936492a775a8 Mon Sep 17 00:00:00 2001 From: GoldenDarkness55 <103884785+GoldenDarkness55@users.noreply.github.com> Date: Sun, 22 Sep 2024 15:32:11 +0200 Subject: [PATCH 04/13] hibernate sentinel_powers.dm --- .../abilities/sentinel/sentinel_powers.dm | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm index 1ed8863c231a..733a1b58780d 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm @@ -99,3 +99,41 @@ to_chat(xeno, SPAN_XENODANGER("We have waited too long, our slash will no longer apply neurotoxin!")) button.icon_state = "template" +/datum/action/xeno_action/activable/hibernate/use_ability(atom/target) + var/mob/living/carbon/xenomorph/X = owner + if (!X.check_state() || X.action_busy) + return + + var/turf/current_turf = get_turf(X) + if(!current_turf || !istype(current_turf)) + return + + if (!action_cooldown_check() && check_and_use_plasma_owner()) + return + + if (!action_cooldown_check()) + return + + var/obj/effect/alien/weeds/alien_weeds = locate() in current_turf + + if(!alien_weeds) + to_chat(X, SPAN_XENOWARNING("You need to be on weeds in order to hibernate.")) + return + + if(alien_weeds.linked_hive.hivenumber != X.hivenumber) + to_chat(X, SPAN_XENOWARNING("These weeds don't belong to your hive! You can't hibernate here.")) + return + + new /datum/effects/plasma_over_time(X, plasma_amount, plasma_time, time_between_plasmas) + new /datum/effects/heal_over_time(X, regeneration_amount_total, regeneration_ticks, 1) + X.SetSleeping(5) + addtimer(CALLBACK(src, PROC_REF(sleep_off)), 10 SECONDS, TIMER_UNIQUE) + X.add_filter("sleep_on", 1, list("type" = "outline", "color" = "#17991b80", "size" = 1)) + + apply_cooldown() + to_chat(X, SPAN_XENONOTICE("You fall into a deep sleep, quickly healing your wounds and restoring your plasma.")) + return ..() + +/datum/action/xeno_action/activable/hibernate/proc/sleep_off() + var/mob/living/carbon/xenomorph/X = owner + X.remove_filter("sleep_on") From ead07713ee5db7ce9baf913c8424a00d78f6e8b1 Mon Sep 17 00:00:00 2001 From: GoldenDarkness55 <103884785+GoldenDarkness55@users.noreply.github.com> Date: Sun, 22 Sep 2024 15:41:40 +0200 Subject: [PATCH 05/13] paralyzing slash Sentinel.dm --- .../mob/living/carbon/xenomorph/castes/Sentinel.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm b/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm index 3e7416f39fc5..4faa839d49b2 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm @@ -11,15 +11,15 @@ xeno_explosion_resistance = XENO_EXPLOSIVE_ARMOR_TIER_1 armor_deflection = XENO_NO_ARMOR evasion = XENO_EVASION_NONE - speed = XENO_SPEED_TIER_7 + speed = XENO_SPEED_HELLHOUND caste_desc = "A weak ranged combat alien." evolves_to = list(XENO_CASTE_SPITTER) deevolves_to = list("Larva") acid_level = 1 - tackle_min = 4 - tackle_max = 4 + tackle_min = 3 + tackle_max = 3 tackle_chance = 50 tacklestrength_min = 4 tacklestrength_max = 4 @@ -49,6 +49,7 @@ /datum/action/xeno_action/activable/slowing_spit, //first macro /datum/action/xeno_action/activable/scattered_spit, //second macro /datum/action/xeno_action/onclick/paralyzing_slash, //third macro + /datum/action/xeno_action/activable/hibernate, //fourth macro /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( @@ -68,7 +69,7 @@ // State var/next_slash_buffed = FALSE -#define NEURO_TOUCH_DELAY 4 SECONDS +#define NEURO_TOUCH_DELAY 3 SECONDS /datum/behavior_delegate/sentinel_base/melee_attack_modify_damage(original_damage, mob/living/carbon/carbon_target) if (!next_slash_buffed) @@ -103,6 +104,6 @@ #undef NEURO_TOUCH_DELAY /datum/behavior_delegate/sentinel_base/proc/paralyzing_slash(mob/living/carbon/human/human_target) - human_target.KnockDown(2) - human_target.Stun(2) + human_target.KnockDown(2.5) + human_target.Stun(2.5) to_chat(human_target, SPAN_XENOHIGHDANGER("You fall over, paralyzed by the toxin!")) From 20e6b9d57034176d67a3942dcdb01f1491125997 Mon Sep 17 00:00:00 2001 From: GoldenDarkness55 <103884785+GoldenDarkness55@users.noreply.github.com> Date: Sun, 22 Sep 2024 15:46:03 +0200 Subject: [PATCH 06/13] sent neuro slow xeno.dm --- code/datums/ammo/xeno.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ammo/xeno.dm b/code/datums/ammo/xeno.dm index 7b5c8ee71257..c975cb2c0c83 100644 --- a/code/datums/ammo/xeno.dm +++ b/code/datums/ammo/xeno.dm @@ -55,7 +55,7 @@ return if(ishuman(M)) - M.apply_effect(2.5, SUPERSLOW) + M.apply_effect(4, SUPERSLOW) M.visible_message(SPAN_DANGER("[M]'s movements are slowed.")) var/no_clothes_neuro = FALSE From 8808093965e6f1ff32647b9a80ee62a3d583abe7 Mon Sep 17 00:00:00 2001 From: GoldenDarkness55 <103884785+GoldenDarkness55@users.noreply.github.com> Date: Sun, 22 Sep 2024 16:58:40 +0200 Subject: [PATCH 07/13] sent neuro superslow xeno.dm --- code/datums/ammo/xeno.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ammo/xeno.dm b/code/datums/ammo/xeno.dm index c975cb2c0c83..ba8c9f60b9cf 100644 --- a/code/datums/ammo/xeno.dm +++ b/code/datums/ammo/xeno.dm @@ -55,7 +55,7 @@ return if(ishuman(M)) - M.apply_effect(4, SUPERSLOW) + M.apply_effect(3, SUPERSLOW) M.visible_message(SPAN_DANGER("[M]'s movements are slowed.")) var/no_clothes_neuro = FALSE From 180a06fda5a9403c02fba5e6a2b7b1977317a9cf Mon Sep 17 00:00:00 2001 From: GoldenDarkness55 <103884785+GoldenDarkness55@users.noreply.github.com> Date: Sun, 22 Sep 2024 17:12:32 +0200 Subject: [PATCH 08/13] sent spit slow xeno.dm --- code/datums/ammo/xeno.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ammo/xeno.dm b/code/datums/ammo/xeno.dm index ba8c9f60b9cf..c975cb2c0c83 100644 --- a/code/datums/ammo/xeno.dm +++ b/code/datums/ammo/xeno.dm @@ -55,7 +55,7 @@ return if(ishuman(M)) - M.apply_effect(3, SUPERSLOW) + M.apply_effect(4, SUPERSLOW) M.visible_message(SPAN_DANGER("[M]'s movements are slowed.")) var/no_clothes_neuro = FALSE From 38a697d160a5acbcc5eb88b261c658db93a44736 Mon Sep 17 00:00:00 2001 From: GoldenDarkness55 <103884785+GoldenDarkness55@users.noreply.github.com> Date: Fri, 1 Nov 2024 02:08:33 +0100 Subject: [PATCH 09/13] Update sentinel_abilities.dm --- .../abilities/sentinel/sentinel_abilities.dm | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_abilities.dm index b82eba2bc7c9..0aaf6f1270c0 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_abilities.dm @@ -32,19 +32,3 @@ plasma_cost = 50 var/buff_duration = 50 - -/datum/action/xeno_action/activable/hibernate - name = "hibernate" - action_icon_state = "warden_heal" - ability_name = "hibernate" - macro_path = /datum/action/xeno_action/verb/verb_hibernate - action_type = XENO_ACTION_CLICK - ability_primacy = XENO_PRIMARY_ACTION_4 - xeno_cooldown = 50 SECONDS - plasma_cost = 150 - - var/regeneration_amount_total = 500 - var/regeneration_ticks = 10 - var/plasma_amount = 400 - var/plasma_time = 10 - var/time_between_plasmas = 1 From 14dc218ca297bcf7418e60ad361f9f4681afdcb6 Mon Sep 17 00:00:00 2001 From: GoldenDarkness55 <103884785+GoldenDarkness55@users.noreply.github.com> Date: Fri, 1 Nov 2024 02:09:02 +0100 Subject: [PATCH 10/13] Update sentinel_macros.dm --- .../carbon/xenomorph/abilities/sentinel/sentinel_macros.dm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_macros.dm b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_macros.dm index 2c32e4f840cb..c3ed88f89095 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_macros.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_macros.dm @@ -18,10 +18,3 @@ set hidden = TRUE var/action_name = "Paralyzing Slash" handle_xeno_macro(src,action_name) - -/datum/action/xeno_action/verb/verb_hibernate() - set category = "Alien" - set name = "hibernate" - set hidden = TRUE - var/action_name = "hibernate" - handle_xeno_macro(src,action_name) From 42254b1ff332927d6478d51975f92eb45e87c793 Mon Sep 17 00:00:00 2001 From: GoldenDarkness55 <103884785+GoldenDarkness55@users.noreply.github.com> Date: Fri, 1 Nov 2024 02:09:25 +0100 Subject: [PATCH 11/13] Update sentinel_powers.dm --- .../abilities/sentinel/sentinel_powers.dm | 38 ------------------- 1 file changed, 38 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm index 733a1b58780d..1ed8863c231a 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm @@ -99,41 +99,3 @@ to_chat(xeno, SPAN_XENODANGER("We have waited too long, our slash will no longer apply neurotoxin!")) button.icon_state = "template" -/datum/action/xeno_action/activable/hibernate/use_ability(atom/target) - var/mob/living/carbon/xenomorph/X = owner - if (!X.check_state() || X.action_busy) - return - - var/turf/current_turf = get_turf(X) - if(!current_turf || !istype(current_turf)) - return - - if (!action_cooldown_check() && check_and_use_plasma_owner()) - return - - if (!action_cooldown_check()) - return - - var/obj/effect/alien/weeds/alien_weeds = locate() in current_turf - - if(!alien_weeds) - to_chat(X, SPAN_XENOWARNING("You need to be on weeds in order to hibernate.")) - return - - if(alien_weeds.linked_hive.hivenumber != X.hivenumber) - to_chat(X, SPAN_XENOWARNING("These weeds don't belong to your hive! You can't hibernate here.")) - return - - new /datum/effects/plasma_over_time(X, plasma_amount, plasma_time, time_between_plasmas) - new /datum/effects/heal_over_time(X, regeneration_amount_total, regeneration_ticks, 1) - X.SetSleeping(5) - addtimer(CALLBACK(src, PROC_REF(sleep_off)), 10 SECONDS, TIMER_UNIQUE) - X.add_filter("sleep_on", 1, list("type" = "outline", "color" = "#17991b80", "size" = 1)) - - apply_cooldown() - to_chat(X, SPAN_XENONOTICE("You fall into a deep sleep, quickly healing your wounds and restoring your plasma.")) - return ..() - -/datum/action/xeno_action/activable/hibernate/proc/sleep_off() - var/mob/living/carbon/xenomorph/X = owner - X.remove_filter("sleep_on") From 2a5934a75d9003f2cb0b1c590bd05dcb9801b2ca Mon Sep 17 00:00:00 2001 From: GoldenDarkness55 <103884785+GoldenDarkness55@users.noreply.github.com> Date: Fri, 1 Nov 2024 02:10:06 +0100 Subject: [PATCH 12/13] Update Sentinel.dm --- code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm b/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm index 4faa839d49b2..42091415b047 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm @@ -18,8 +18,8 @@ deevolves_to = list("Larva") acid_level = 1 - tackle_min = 3 - tackle_max = 3 + tackle_min = 4 + tackle_max = 4 tackle_chance = 50 tacklestrength_min = 4 tacklestrength_max = 4 @@ -49,7 +49,6 @@ /datum/action/xeno_action/activable/slowing_spit, //first macro /datum/action/xeno_action/activable/scattered_spit, //second macro /datum/action/xeno_action/onclick/paralyzing_slash, //third macro - /datum/action/xeno_action/activable/hibernate, //fourth macro /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( From 8e651689326eaff0ea89fa7dc63aa85a5cfbcb8a Mon Sep 17 00:00:00 2001 From: GoldenDarkness55 <103884785+GoldenDarkness55@users.noreply.github.com> Date: Sat, 2 Nov 2024 05:07:53 +0100 Subject: [PATCH 13/13] speed Sentinel.dm --- code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm b/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm index 42091415b047..1a048cdd3e0c 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm @@ -11,7 +11,7 @@ xeno_explosion_resistance = XENO_EXPLOSIVE_ARMOR_TIER_1 armor_deflection = XENO_NO_ARMOR evasion = XENO_EVASION_NONE - speed = XENO_SPEED_HELLHOUND + speed = XENO_SPEED_TIER_7 caste_desc = "A weak ranged combat alien." evolves_to = list(XENO_CASTE_SPITTER)