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

[MIRROR] Chem stun reductions now all use AdjustAllImmobility, and the AllImmobility procs now adjust unconscious #2332

Merged
merged 1 commit into from
Mar 9, 2024
Merged

[MIRROR] Chem stun reductions now all use AdjustAllImmobility, and the AllImmobility procs now adjust unconscious #2332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions code/modules/mob/living/status_procs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,20 +303,23 @@
Knockdown(amount)
Stun(amount)
Immobilize(amount)
Unconscious(amount)


/mob/living/proc/SetAllImmobility(amount)
SetParalyzed(amount)
SetKnockdown(amount)
SetStun(amount)
SetImmobilized(amount)
SetUnconscious(amount)


/mob/living/proc/AdjustAllImmobility(amount)
AdjustParalyzed(amount)
AdjustKnockdown(amount)
AdjustStun(amount)
AdjustImmobilized(amount)
AdjustUnconscious(amount)


/* UNCONSCIOUS */
Expand Down
19 changes: 4 additions & 15 deletions code/modules/reagents/chemistry/reagents/drug_reagents.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,8 @@
to_chat(affected_mob, span_notice("[smoke_message]"))
affected_mob.add_mood_event("smoked", /datum/mood_event/smoked)
affected_mob.remove_status_effect(/datum/status_effect/jitter)
affected_mob.AdjustStun(-50 * REM * seconds_per_tick)
affected_mob.AdjustKnockdown(-50 * REM * seconds_per_tick)
affected_mob.AdjustUnconscious(-50 * REM * seconds_per_tick)
affected_mob.AdjustParalyzed(-50 * REM * seconds_per_tick)
affected_mob.AdjustImmobilized(-50 * REM * seconds_per_tick)
affected_mob.AdjustAllImmobility(-50 * REM * seconds_per_tick)

return UPDATE_MOB_HEALTH

/datum/reagent/drug/nicotine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
Expand Down Expand Up @@ -177,11 +174,7 @@
if(SPT_PROB(2.5, seconds_per_tick))
to_chat(affected_mob, span_notice("[high_message]"))
affected_mob.add_mood_event("tweaking", /datum/mood_event/stimulant_medium)
affected_mob.AdjustStun(-40 * REM * seconds_per_tick)
affected_mob.AdjustKnockdown(-40 * REM * seconds_per_tick)
affected_mob.AdjustUnconscious(-40 * REM * seconds_per_tick)
affected_mob.AdjustParalyzed(-40 * REM * seconds_per_tick)
affected_mob.AdjustImmobilized(-40 * REM * seconds_per_tick)
affected_mob.AdjustAllImmobility(-40 * REM * seconds_per_tick)
var/need_mob_update
need_mob_update = affected_mob.adjustStaminaLoss(-2 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype)
affected_mob.set_jitter_if_lower(4 SECONDS * REM * seconds_per_tick)
Expand Down Expand Up @@ -459,11 +452,7 @@

/datum/reagent/drug/maint/tar/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
affected_mob.AdjustStun(-10 * REM * seconds_per_tick)
affected_mob.AdjustKnockdown(-10 * REM * seconds_per_tick)
affected_mob.AdjustUnconscious(-10 * REM * seconds_per_tick)
affected_mob.AdjustParalyzed(-10 * REM * seconds_per_tick)
affected_mob.AdjustImmobilized(-10 * REM * seconds_per_tick)
affected_mob.AdjustAllImmobility(-10 * REM * seconds_per_tick)
affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)
return UPDATE_MOB_HEALTH

Expand Down
7 changes: 2 additions & 5 deletions code/modules/reagents/chemistry/reagents/medicine_reagents.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,8 @@
/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
affected_mob.adjust_drowsiness(-10 SECONDS * REM * seconds_per_tick)
affected_mob.AdjustStun(-20 * REM * seconds_per_tick)
affected_mob.AdjustKnockdown(-20 * REM * seconds_per_tick)
affected_mob.AdjustUnconscious(-20 * REM * seconds_per_tick)
affected_mob.AdjustImmobilized(-20 * REM * seconds_per_tick)
affected_mob.AdjustParalyzed(-20 * REM * seconds_per_tick)
affected_mob.AdjustAllImmobility(-20 * REM * seconds_per_tick)

if(holder.has_reagent(/datum/reagent/toxin/mindbreaker))
holder.remove_reagent(/datum/reagent/toxin/mindbreaker, 5 * REM * seconds_per_tick)
affected_mob.adjust_hallucinations(-20 SECONDS * REM * seconds_per_tick)
Expand Down
Loading