Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Movielike Crit #335

Merged
merged 15 commits into from
Aug 28, 2024
Merged

Movielike Crit #335

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
724b549
Hopefully doesnt break the ai
Merrgear Jul 20, 2024
9d0e872
fixes those two issues we found
Merrgear Jul 22, 2024
f8a1811
Update code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm
Merrgear Aug 3, 2024
2e91858
Update code/datums/components/xeno/ai_behavior_overrides/capture_over…
Merrgear Aug 3, 2024
c68ab12
Update code/modules/mob/living/carbon/human/human_attackhand.dm
Merrgear Aug 3, 2024
3aa87fb
That damn UMC guy broke muh code!!!!!
Merrgear Aug 5, 2024
ce66bc1
Merge branch 'master' into cinematic-crit
Merrgear Aug 5, 2024
d0b5eb9
Update code/datums/components/xeno/ai_behavior_overrides/capture_over…
Merrgear Aug 6, 2024
a745eee
Update code/modules/mob/living/carbon/human/human_attackhand.dm
Merrgear Aug 6, 2024
69cf9c2
Update code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm
Merrgear Aug 6, 2024
23a6b58
boberthastofindnewstufftocomplain
Merrgear Aug 14, 2024
79f842a
Update code/datums/effects/mob_crit/human_crit.dm
Merrgear Aug 19, 2024
eb96495
Update code/datums/effects/pain/human_pain.dm
Merrgear Aug 19, 2024
95edb35
Update code/datums/effects/pain/human_pain.dm
Merrgear Aug 19, 2024
d0915f7
Update code/modules/mob/living/carbon/human/life/handle_regular_statu…
Merrgear Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -45,7 +45,7 @@
if(distance > 10)
return FALSE

if(captee_stat == CONSCIOUS)
if(captee_stat == CONSCIOUS && !(parent_mob.body_position == LYING_DOWN && HAS_TRAIT(parent_mob, TRAIT_INCAPACITATED)))
Merrgear marked this conversation as resolved.
Show resolved Hide resolved
return FALSE

if(isxeno(pulledby) && pulledby != checked_xeno)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/effects/mob_crit/human_crit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
qdel(src)
return FALSE

affected_mob.apply_effect(3, PARALYZE)
affected_mob.apply_effect(3, WEAKEN)
Merrgear marked this conversation as resolved.
Show resolved Hide resolved
if(!affected_mob.reagents || !affected_mob.reagents.has_reagent("inaprovaline"))
affected_mob.apply_damage(1, OXY)

Expand Down
4 changes: 2 additions & 2 deletions code/datums/effects/pain/human_pain.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Merrgear marked this conversation as resolved.
Show resolved Hide resolved
do_once = FALSE

affected_mob.EyeBlur(2)
Expand All @@ -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)
Merrgear marked this conversation as resolved.
Show resolved Hide resolved
if(!affected_mob.reagents || !affected_mob.reagents.has_reagent("inaprovaline"))
affected_mob.apply_damage(0.5, OXY)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/human_attackhand.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 || (body_position == LYING_DOWN && HAS_TRAIT(src, TRAIT_INCAPACITATED))) && getOxyLoss() > 0) && !(stat == DEAD))
Merrgear marked this conversation as resolved.
Show resolved Hide resolved
help_shake_act(attacking_mob)
return 1

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

//UNCONSCIOUS. NO-ONE IS HOME
if(regular_update && ((getOxyLoss() > 50)))
apply_effect(3, PARALYZE)
apply_effect(3, WEAKEN)
Merrgear marked this conversation as resolved.
Show resolved Hide resolved

if((src.species.flags & HAS_HARDCRIT) && HEALTH_THRESHOLD_CRIT > health)
var/already_in_crit = FALSE
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/xeno_ai_interaction.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && !(body_position == LYING_DOWN && HAS_TRAIT(src, TRAIT_INCAPACITATED))
Merrgear marked this conversation as resolved.
Show resolved Hide resolved


/////////////////////////////
Expand Down
Loading