From 724b5495ceccfc95836a23e5d28d75ee6c67e06c Mon Sep 17 00:00:00 2001 From: Merrgear <68803078+Merrgear@users.noreply.github.com> Date: Sat, 20 Jul 2024 00:17:31 -0400 Subject: [PATCH 01/14] Hopefully doesnt break the ai --- code/datums/effects/mob_crit/human_crit.dm | 2 +- code/datums/effects/pain/human_pain.dm | 4 ++-- .../living/carbon/human/life/handle_regular_status_updates.dm | 2 +- .../mob/living/carbon/xenomorph/xeno_ai_interaction.dm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/datums/effects/mob_crit/human_crit.dm b/code/datums/effects/mob_crit/human_crit.dm index ff4d0eeda0..8aab79eb4f 100644 --- a/code/datums/effects/mob_crit/human_crit.dm +++ b/code/datums/effects/mob_crit/human_crit.dm @@ -8,7 +8,7 @@ qdel(src) return FALSE - affected_mob.apply_effect(3, PARALYZE) + affected_mob.apply_effect(3, WEAKEN) if(!affected_mob.reagents || !affected_mob.reagents.has_reagent("inaprovaline")) affected_mob.apply_damage(1, OXY) diff --git a/code/datums/effects/pain/human_pain.dm b/code/datums/effects/pain/human_pain.dm index 9c8070596b..fc4e99e94c 100644 --- a/code/datums/effects/pain/human_pain.dm +++ b/code/datums/effects/pain/human_pain.dm @@ -58,7 +58,7 @@ var/mob/living/carbon/affected_mob = affected_atom if(do_once) - affected_mob.apply_effect(3, PARALYZE) + affected_mob.apply_effect(3, WEAKEN) do_once = FALSE affected_mob.EyeBlur(2) @@ -83,7 +83,7 @@ affected_mob.EyeBlur(2) if(affected_mob.pain && affected_mob.pain.feels_pain) affected_mob.TalkStutter(2) - affected_mob.apply_effect(2, PARALYZE) + affected_mob.apply_effect(2, WEAKEN) if(!affected_mob.reagents || !affected_mob.reagents.has_reagent("inaprovaline")) affected_mob.apply_damage(0.5, OXY) diff --git a/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm b/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm index 41554f0567..a6de491cb0 100644 --- a/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm +++ b/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm @@ -42,7 +42,7 @@ //UNCONSCIOUS. NO-ONE IS HOME if(regular_update && ((getOxyLoss() > 50))) - apply_effect(3, PARALYZE) + apply_effect(3, WEAKEN) if((src.species.flags & HAS_HARDCRIT) && HEALTH_THRESHOLD_CRIT > health) var/already_in_crit = FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm b/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm index 177cd07433..0ffa1a3aad 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm @@ -127,7 +127,7 @@ At bare minimum, make sure the relevant checks from parent types gets copied in // MOBS // ///////////////////////////// /mob/living/ai_check_stat(mob/living/carbon/xenomorph/X) - return stat == CONSCIOUS + return stat == CONSCIOUS && !(HAS_TRAIT(src, TRAIT_FLOORED) && HAS_TRAIT(src, TRAIT_INCAPACITATED)) ///////////////////////////// From 9d0e872e63096725aed4d1a8e89b9b71d7b2b2f4 Mon Sep 17 00:00:00 2001 From: Merrgear <68803078+Merrgear@users.noreply.github.com> Date: Mon, 22 Jul 2024 01:48:59 -0400 Subject: [PATCH 02/14] fixes those two issues we found --- .../xeno/ai_behavior_overrides/capture_override_behavior.dm | 2 +- code/modules/mob/living/carbon/human/human_attackhand.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm b/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm index 96eaa7d8fb..7f5734c8ee 100644 --- a/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm +++ b/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm @@ -45,7 +45,7 @@ if(distance > 10) return FALSE - if(captee_stat == CONSCIOUS) + if(captee_stat == CONSCIOUS && !(HAS_TRAIT(parent_mob, TRAIT_FLOORED) && HAS_TRAIT(parent_mob, TRAIT_INCAPACITATED))) return FALSE if(isxeno(pulledby) && pulledby != checked_xeno) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 2bb113d677..1c115d5537 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -22,7 +22,7 @@ return 1 // If unconcious with oxygen damage, do CPR. If dead, we do CPR - if(!(stat == UNCONSCIOUS && getOxyLoss() > 0) && !(stat == DEAD)) + if(!((stat == UNCONSCIOUS || (HAS_TRAIT(src, TRAIT_FLOORED) && HAS_TRAIT(src, TRAIT_INCAPACITATED))) && getOxyLoss() > 0) && !(stat == DEAD)) help_shake_act(attacking_mob) return 1 From f8a181116f6d66ebd745108a7a6ce4bdd884eac6 Mon Sep 17 00:00:00 2001 From: Merrgear <68803078+Merrgear@users.noreply.github.com> Date: Sat, 3 Aug 2024 18:16:41 -0400 Subject: [PATCH 03/14] Update code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm Co-authored-by: Doubleumc --- code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm b/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm index 0ffa1a3aad..527dd77c6f 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm @@ -127,7 +127,7 @@ At bare minimum, make sure the relevant checks from parent types gets copied in // MOBS // ///////////////////////////// /mob/living/ai_check_stat(mob/living/carbon/xenomorph/X) - return stat == CONSCIOUS && !(HAS_TRAIT(src, TRAIT_FLOORED) && HAS_TRAIT(src, TRAIT_INCAPACITATED)) + return stat == CONSCIOUS && !(body_position == LYING_DOWN && HAS_TRAIT(src, TRAIT_INCAPACITATED)) ///////////////////////////// From 2e918581c87ea1b5348827f17339c25ec0141d73 Mon Sep 17 00:00:00 2001 From: Merrgear <68803078+Merrgear@users.noreply.github.com> Date: Sat, 3 Aug 2024 18:16:49 -0400 Subject: [PATCH 04/14] Update code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm Co-authored-by: Doubleumc --- .../xeno/ai_behavior_overrides/capture_override_behavior.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm b/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm index 7f5734c8ee..ff3fac0786 100644 --- a/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm +++ b/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm @@ -45,7 +45,7 @@ if(distance > 10) return FALSE - if(captee_stat == CONSCIOUS && !(HAS_TRAIT(parent_mob, TRAIT_FLOORED) && HAS_TRAIT(parent_mob, TRAIT_INCAPACITATED))) + if(captee_stat == CONSCIOUS && !(parent_mob.body_position == LYING_DOWN && HAS_TRAIT(parent_mob, TRAIT_INCAPACITATED))) return FALSE if(isxeno(pulledby) && pulledby != checked_xeno) From c68ab1293ef583d5d1738afc9d4fc63f7398848c Mon Sep 17 00:00:00 2001 From: Merrgear <68803078+Merrgear@users.noreply.github.com> Date: Sat, 3 Aug 2024 18:16:57 -0400 Subject: [PATCH 05/14] Update code/modules/mob/living/carbon/human/human_attackhand.dm Co-authored-by: Doubleumc --- code/modules/mob/living/carbon/human/human_attackhand.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 1c115d5537..017c911a3c 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -22,7 +22,7 @@ return 1 // If unconcious with oxygen damage, do CPR. If dead, we do CPR - if(!((stat == UNCONSCIOUS || (HAS_TRAIT(src, TRAIT_FLOORED) && HAS_TRAIT(src, TRAIT_INCAPACITATED))) && getOxyLoss() > 0) && !(stat == DEAD)) + if(!((stat == UNCONSCIOUS || (body_position == LYING_DOWN && HAS_TRAIT(src, TRAIT_INCAPACITATED))) && getOxyLoss() > 0) && !(stat == DEAD)) help_shake_act(attacking_mob) return 1 From 3aa87fb31035942c28238920573494abff72461e Mon Sep 17 00:00:00 2001 From: Merrgear <68803078+Merrgear@users.noreply.github.com> Date: Mon, 5 Aug 2024 13:21:39 -0400 Subject: [PATCH 06/14] That damn UMC guy broke muh code!!!!! --- .../xeno/ai_behavior_overrides/capture_override_behavior.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm b/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm index ff3fac0786..b917ba3fce 100644 --- a/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm +++ b/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm @@ -22,7 +22,7 @@ if(isfacehugger(checked_xeno)) return FALSE - var/mob/parent_mob = parent + var/mob/living/parent_mob = parent var/captee_stat = parent_mob.stat var/mob/pulledby = parent_mob.pulledby From d0b5eb95b3219deef9e11dd7f2fa6734870c1a2b Mon Sep 17 00:00:00 2001 From: Merrgear <68803078+Merrgear@users.noreply.github.com> Date: Tue, 6 Aug 2024 08:44:26 -0400 Subject: [PATCH 07/14] Update code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm Co-authored-by: Doubleumc --- .../xeno/ai_behavior_overrides/capture_override_behavior.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm b/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm index b917ba3fce..1f84842e54 100644 --- a/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm +++ b/code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm @@ -45,7 +45,7 @@ if(distance > 10) return FALSE - if(captee_stat == CONSCIOUS && !(parent_mob.body_position == LYING_DOWN && HAS_TRAIT(parent_mob, TRAIT_INCAPACITATED))) + if(captee_stat == CONSCIOUS && !(locate(/datum/effects/crit) in parent_mob.effects_list)) return FALSE if(isxeno(pulledby) && pulledby != checked_xeno) From a745eee35ae394fa20ea46780cbe7a67417c9018 Mon Sep 17 00:00:00 2001 From: Merrgear <68803078+Merrgear@users.noreply.github.com> Date: Tue, 6 Aug 2024 08:44:33 -0400 Subject: [PATCH 08/14] Update code/modules/mob/living/carbon/human/human_attackhand.dm Co-authored-by: Doubleumc --- code/modules/mob/living/carbon/human/human_attackhand.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 90089b44f9..a1c3b5a4d0 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -22,7 +22,7 @@ return 1 // If unconcious with oxygen damage, do CPR. If dead, we do CPR - if(!((stat == UNCONSCIOUS || (body_position == LYING_DOWN && HAS_TRAIT(src, TRAIT_INCAPACITATED))) && getOxyLoss() > 0) && !(stat == DEAD)) + if(!((stat == UNCONSCIOUS || (locate(/datum/effects/crit) in effects_list)) && getOxyLoss() > 0) && !(stat == DEAD)) help_shake_act(attacking_mob) return 1 From 69cf9c2977217f81a1e684d3848cec36832ed622 Mon Sep 17 00:00:00 2001 From: Merrgear <68803078+Merrgear@users.noreply.github.com> Date: Tue, 6 Aug 2024 08:44:40 -0400 Subject: [PATCH 09/14] Update code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm Co-authored-by: Doubleumc --- code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm b/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm index 527dd77c6f..e817c73462 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm @@ -127,7 +127,7 @@ At bare minimum, make sure the relevant checks from parent types gets copied in // MOBS // ///////////////////////////// /mob/living/ai_check_stat(mob/living/carbon/xenomorph/X) - return stat == CONSCIOUS && !(body_position == LYING_DOWN && HAS_TRAIT(src, TRAIT_INCAPACITATED)) + return stat == CONSCIOUS && !(locate(/datum/effects/crit) in effects_list) ///////////////////////////// From 23a6b58f799a4b0409f2e76c6cf05d686190c238 Mon Sep 17 00:00:00 2001 From: Merrgear <68803078+Merrgear@users.noreply.github.com> Date: Tue, 13 Aug 2024 21:28:42 -0400 Subject: [PATCH 10/14] boberthastofindnewstufftocomplain --- code/modules/cm_marines/overwatch.dm | 3 +++ .../mob/living/carbon/human/life/handle_regular_hud_updates.dm | 2 +- tgui/packages/tgui/interfaces/OverwatchConsole.jsx | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm index 243ecd9342..58cfd2c797 100644 --- a/code/modules/cm_marines/overwatch.dm +++ b/code/modules/cm_marines/overwatch.dm @@ -218,6 +218,9 @@ if(DEAD) mob_state = "Dead" + if(mob_state == "Conscious" && (locate(/datum/effects/crit) in marine_human.effects_list)) + mob_state = "Incapacitated" + if(!istype(marine_human.head, /obj/item/clothing/head/helmet/marine)) has_helmet = FALSE diff --git a/code/modules/mob/living/carbon/human/life/handle_regular_hud_updates.dm b/code/modules/mob/living/carbon/human/life/handle_regular_hud_updates.dm index b84c8e9d24..32dd9ddef8 100644 --- a/code/modules/mob/living/carbon/human/life/handle_regular_hud_updates.dm +++ b/code/modules/mob/living/carbon/human/life/handle_regular_hud_updates.dm @@ -7,7 +7,7 @@ if(stat != DEAD) //the dead get zero fullscreens - if(stat == UNCONSCIOUS) + if(stat == UNCONSCIOUS || (locate(/datum/effects/crit) in effects_list)) var/severity = 0 switch(health) if(-20 to -10) severity = 1 diff --git a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx index 0c2c4e801c..db9987529e 100644 --- a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx +++ b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx @@ -370,12 +370,13 @@ const SquadMonitor = (props) => { let determine_status_color = (status) => { let conscious = status.includes('Conscious'); + let incapacitated = status.includes('Incapacitated'); let unconscious = status.includes('Unconscious'); let state_color = 'red'; if (conscious) { state_color = 'green'; - } else if (unconscious) { + } else if (incapacitated || unconscious) { state_color = 'yellow'; } return state_color; From 79f842a4d44c2c9ae8746b033e2ae2439c2b8012 Mon Sep 17 00:00:00 2001 From: Merrgear <68803078+Merrgear@users.noreply.github.com> Date: Mon, 19 Aug 2024 00:36:09 -0400 Subject: [PATCH 11/14] Update code/datums/effects/mob_crit/human_crit.dm Co-authored-by: Doubleumc --- code/datums/effects/mob_crit/human_crit.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/effects/mob_crit/human_crit.dm b/code/datums/effects/mob_crit/human_crit.dm index 8aab79eb4f..8b25b2bc2a 100644 --- a/code/datums/effects/mob_crit/human_crit.dm +++ b/code/datums/effects/mob_crit/human_crit.dm @@ -8,7 +8,8 @@ qdel(src) return FALSE - affected_mob.apply_effect(3, WEAKEN) + affected_mob.KnockDown(3) + affected_mob.Stun(3) if(!affected_mob.reagents || !affected_mob.reagents.has_reagent("inaprovaline")) affected_mob.apply_damage(1, OXY) From eb96495bfb731c1a98f664c50e2600c301f3955e Mon Sep 17 00:00:00 2001 From: Merrgear <68803078+Merrgear@users.noreply.github.com> Date: Mon, 19 Aug 2024 00:36:16 -0400 Subject: [PATCH 12/14] Update code/datums/effects/pain/human_pain.dm Co-authored-by: Doubleumc --- code/datums/effects/pain/human_pain.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/effects/pain/human_pain.dm b/code/datums/effects/pain/human_pain.dm index fc4e99e94c..f4d2869f7b 100644 --- a/code/datums/effects/pain/human_pain.dm +++ b/code/datums/effects/pain/human_pain.dm @@ -58,7 +58,8 @@ var/mob/living/carbon/affected_mob = affected_atom if(do_once) - affected_mob.apply_effect(3, WEAKEN) + affected_mob.KnockDown(3) + affected_mob.Stun(3) do_once = FALSE affected_mob.EyeBlur(2) From 95edb35a466850b40e86b5c012ad4dbc07178c84 Mon Sep 17 00:00:00 2001 From: Merrgear <68803078+Merrgear@users.noreply.github.com> Date: Mon, 19 Aug 2024 00:36:25 -0400 Subject: [PATCH 13/14] Update code/datums/effects/pain/human_pain.dm Co-authored-by: Doubleumc --- code/datums/effects/pain/human_pain.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/effects/pain/human_pain.dm b/code/datums/effects/pain/human_pain.dm index f4d2869f7b..bddd793077 100644 --- a/code/datums/effects/pain/human_pain.dm +++ b/code/datums/effects/pain/human_pain.dm @@ -84,7 +84,8 @@ affected_mob.EyeBlur(2) if(affected_mob.pain && affected_mob.pain.feels_pain) affected_mob.TalkStutter(2) - affected_mob.apply_effect(2, WEAKEN) + affected_mob.KnockDown(2) + affected_mob.Stun(2) if(!affected_mob.reagents || !affected_mob.reagents.has_reagent("inaprovaline")) affected_mob.apply_damage(0.5, OXY) From d0915f7465b689ce03637df491d19a0b2c6e7540 Mon Sep 17 00:00:00 2001 From: Merrgear <68803078+Merrgear@users.noreply.github.com> Date: Mon, 19 Aug 2024 00:36:31 -0400 Subject: [PATCH 14/14] Update code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm Co-authored-by: Doubleumc --- .../living/carbon/human/life/handle_regular_status_updates.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm b/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm index deac40971b..65f98d928e 100644 --- a/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm +++ b/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm @@ -42,7 +42,8 @@ //UNCONSCIOUS. NO-ONE IS HOME if(regular_update && ((getOxyLoss() > 50))) - apply_effect(3, WEAKEN) + KnockDown(3) + Stun(3) if((src.species.flags & HAS_HARDCRIT) && HEALTH_THRESHOLD_CRIT > health) var/already_in_crit = FALSE