From 7c5ef1cfb8c8121267498ab0635993fef147390b Mon Sep 17 00:00:00 2001 From: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> Date: Fri, 26 Dec 2025 20:21:33 +0530 Subject: [PATCH] Removes unused parameter `times_fired` from mob procs (#94590) ## About The Pull Request What it says on the tin. `times_fired` is the most unused parameter in all mob procs. I say most because there were just 2 cases where it was used - handling breathing - handling heartbeat Besides these 2 cases this parameter did nothing in every proc. Removing it does 2 things - Makes those procs more readable as it now has 1 less parameter that was documented poorly and did nothing - Makes those procs slightly faster as we are passing 1 less variable to its parameter call stack It can easily be substituted with `SSmobs.times_fired` which was its original value anyways ## Changelog :cl: code: removes an unused parameter `times_fired` from mob life procs. Making them function slightly faster /:cl: --- .../signals/signals_mob/signals_mob_carbon.dm | 2 +- .../signals/signals_mob/signals_mob_living.dm | 4 +- .../signals/signals_mob/signals_mob_main.dm | 2 +- code/_onclick/hud/screen_objects.dm | 2 +- code/controllers/subsystem/mobs.dm | 3 +- code/datums/brain_damage/brain_trauma.dm | 2 +- code/datums/brain_damage/creepy_trauma.dm | 2 +- code/datums/brain_damage/hypnosis.dm | 2 +- code/datums/brain_damage/imaginary_friend.dm | 2 +- code/datums/brain_damage/magic.dm | 6 +- code/datums/brain_damage/mild.dm | 16 +- code/datums/brain_damage/severe.dm | 6 +- code/datums/brain_damage/special.dm | 14 +- code/datums/brain_damage/split_personality.dm | 8 +- code/datums/diseases/_disease.dm | 2 +- code/datums/diseases/adrenal_crisis.dm | 2 +- code/datums/diseases/advance/advance.dm | 2 +- code/datums/diseases/anaphylaxis.dm | 2 +- code/datums/diseases/anxiety.dm | 2 +- code/datums/diseases/asthma_attack.dm | 10 +- code/datums/diseases/beesease.dm | 2 +- code/datums/diseases/brainrot.dm | 2 +- code/datums/diseases/chronic_illness.dm | 2 +- code/datums/diseases/cold.dm | 2 +- code/datums/diseases/cold9.dm | 2 +- .../diseases/death_sandwich_poisoning.dm | 2 +- code/datums/diseases/decloning.dm | 2 +- code/datums/diseases/dna_spread.dm | 2 +- code/datums/diseases/fake_gbs.dm | 2 +- .../diseases/floor_diseases/carpellosis.dm | 2 +- .../diseases/floor_diseases/gastritium.dm | 2 +- .../diseases/floor_diseases/nebula_nausea.dm | 2 +- code/datums/diseases/flu.dm | 2 +- code/datums/diseases/fluspanish.dm | 2 +- code/datums/diseases/gastrolisis.dm | 2 +- code/datums/diseases/gbs.dm | 2 +- code/datums/diseases/magnitis.dm | 2 +- code/datums/diseases/parasitic_infection.dm | 2 +- code/datums/diseases/parrotpossession.dm | 2 +- code/datums/diseases/pierrot_throat.dm | 2 +- code/datums/diseases/retrovirus.dm | 2 +- code/datums/diseases/rhumba_beat.dm | 2 +- code/datums/diseases/transformation.dm | 14 +- code/datums/diseases/tuberculosis.dm | 2 +- code/datums/diseases/weightlessness.dm | 2 +- code/datums/diseases/wizarditis.dm | 2 +- code/datums/elements/body_temp_sensitive.dm | 2 +- code/datums/elements/leeching_walk.dm | 2 +- code/datums/mutations/_mutations.dm | 2 +- code/datums/mutations/body.dm | 16 +- code/datums/mutations/chameleon.dm | 2 +- code/datums/mutations/hulk.dm | 4 +- code/datums/mutations/speech.dm | 4 +- code/datums/mutations/void_magnet.dm | 2 +- .../datums/quirks/negative_quirks/allergic.dm | 2 +- code/datums/quirks/negative_quirks/asthma.dm | 2 +- .../negative_quirks/blood_deficiency.dm | 2 +- code/datums/wounds/_wounds.dm | 4 +- code/datums/wounds/bones.dm | 2 +- code/datums/wounds/burns.dm | 4 +- code/datums/wounds/pierce.dm | 2 +- code/datums/wounds/slash.dm | 2 +- .../dna_infuser/organ_sets/carp_organs.dm | 2 +- .../dna_infuser/organ_sets/rat_organs.dm | 2 +- code/game/objects/items/body_egg.dm | 10 +- code/game/objects/items/soulscythe.dm | 2 +- .../stacks/golem_food/golem_status_effects.dm | 2 +- .../antagonists/abductor/equipment/gland.dm | 2 +- .../blob/blobstrains/cryogenic_poison.dm | 2 +- .../blob/blobstrains/regenerative_materia.dm | 2 +- .../antagonists/changeling/changeling.dm | 2 +- .../antagonists/changeling/headslug_eggs.dm | 2 +- .../changeling/powers/_biodegrade_bioacid.dm | 2 +- .../heretic/items/corrupted_organs.dm | 6 +- .../heretic/items/heretic_grenade.dm | 2 +- .../heretic/knowledge/moon_lore.dm | 2 +- .../heretic/knowledge/rust_lore.dm | 2 +- .../heretic/knowledge/void_lore.dm | 2 +- .../heretic/status_effects/heretic_passive.dm | 2 +- .../antagonists/nightmare/nightmare_organs.dm | 4 +- .../antagonists/revenant/revenant_blight.dm | 2 +- .../voidwalker/voidwalker_traumas.dm | 2 +- .../equipment/monster_organs/brimdust_sac.dm | 2 +- .../monster_organs/regenerative_core.dm | 2 +- .../equipment/monster_organs/rush_gland.dm | 2 +- code/modules/mob/living/basic/basic.dm | 2 +- .../living/basic/blob_minions/blobbernaut.dm | 2 +- .../living/basic/cult/constructs/harvester.dm | 2 +- .../basic/guardian/guardian_types/gaseous.dm | 4 +- .../mob/living/basic/heretic/ash_spirit.dm | 2 +- .../mob/living/basic/heretic/rust_walker.dm | 2 +- .../basic/jungle/leaper/leaper_abilities.dm | 2 +- .../living/basic/jungle/venus_human_trap.dm | 2 +- .../living/basic/lavaland/goliath/goliath.dm | 2 +- .../basic/lavaland/legion/legion_tumour.dm | 2 +- .../living/basic/lavaland/raptor/_raptor.dm | 2 +- .../mob/living/basic/pets/dog/dog_subtypes.dm | 2 +- .../mob/living/basic/ruin_defender/flesh.dm | 2 +- .../living/basic/ruin_defender/mimic/mimic.dm | 2 +- code/modules/mob/living/basic/slime/life.dm | 4 +- .../basic/space_fauna/netherworld/migo.dm | 2 +- .../basic/space_fauna/revenant/_revenant.dm | 2 +- .../space_fauna/space_dragon/dragon_gust.dm | 2 +- code/modules/mob/living/basic/tree.dm | 2 +- code/modules/mob/living/blood.dm | 4 +- code/modules/mob/living/brain/brain_item.dm | 2 +- code/modules/mob/living/brain/life.dm | 6 +- code/modules/mob/living/carbon/alien/alien.dm | 2 +- .../mob/living/carbon/alien/larva/life.dm | 2 +- code/modules/mob/living/carbon/alien/life.dm | 6 +- .../modules/mob/living/carbon/alien/organs.dm | 2 +- .../carbon/alien/special/alien_embryo.dm | 2 +- .../mob/living/carbon/human/_species.dm | 32 ++-- code/modules/mob/living/carbon/human/dummy.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 20 +-- .../modules/mob/living/carbon/human/monkey.dm | 2 +- .../carbon/human/species_types/golems.dm | 2 +- .../carbon/human/species_types/jellypeople.dm | 4 +- .../human/species_types/lizardpeople.dm | 2 +- .../carbon/human/species_types/vampire.dm | 2 +- .../carbon/human/species_types/zombies.dm | 4 +- code/modules/mob/living/carbon/life.dm | 68 ++++---- code/modules/mob/living/life.dm | 34 ++-- code/modules/mob/living/silicon/ai/life.dm | 2 +- code/modules/mob/living/silicon/robot/life.dm | 10 +- code/modules/mob/living/silicon/silicon.dm | 2 +- .../living/simple_animal/hostile/hostile.dm | 2 +- .../hostile/megafauna/bubblegum.dm | 2 +- .../mining_mobs/elites/goliath_broodmother.dm | 2 +- .../hostile/mining_mobs/elites/pandora.dm | 2 +- .../hostile/mining_mobs/polarbear.dm | 2 +- .../mob/living/simple_animal/hostile/ooze.dm | 2 +- .../mob/living/simple_animal/simple_animal.dm | 4 +- .../reagents/chemistry/holder/mob_life.dm | 19 ++- code/modules/reagents/chemistry/reagents.dm | 6 +- .../chemistry/reagents/atmos_gas_reagents.dm | 10 +- .../reagents/cat2_medicine_reagents.dm | 40 ++--- .../reagents/drinks/alcohol_reagents.dm | 132 +++++++-------- .../reagents/drinks/drink_reagents.dm | 128 +++++++-------- .../chemistry/reagents/drug_reagents.dm | 62 ++++---- .../chemistry/reagents/food_reagents.dm | 46 +++--- .../chemistry/reagents/impure_reagents.dm | 8 +- .../impure_medicine_reagents.dm | 60 +++---- .../impure_reagents/impure_toxin_reagents.dm | 2 +- .../chemistry/reagents/medicine_reagents.dm | 150 +++++++++--------- .../chemistry/reagents/other_reagents.dm | 82 +++++----- .../reagents/pyrotechnic_reagents.dm | 18 +-- .../chemistry/reagents/toxin_reagents.dm | 94 +++++------ .../modules/reagents/withdrawal/_addiction.dm | 2 +- code/modules/religion/burdened/psyker.dm | 2 +- code/modules/surgery/bodyparts/_bodyparts.dm | 2 +- code/modules/surgery/organs/_organ.dm | 8 +- .../organs/external/wings/functional_wings.dm | 2 +- .../organs/internal/appendix/_appendix.dm | 2 +- .../internal/cyberimp/augments_chest.dm | 6 +- .../surgery/organs/internal/ears/_ears.dm | 2 +- .../surgery/organs/internal/eyes/_eyes.dm | 2 +- .../surgery/organs/internal/heart/_heart.dm | 10 +- .../organs/internal/heart/heart_anomalock.dm | 4 +- .../surgery/organs/internal/liver/_liver.dm | 16 +- .../organs/internal/liver/liver_golem.dm | 2 +- .../organs/internal/liver/liver_plasmaman.dm | 2 +- .../organs/internal/liver/liver_skeleton.dm | 2 +- .../surgery/organs/internal/lungs/_lungs.dm | 2 +- .../organs/internal/stomach/_stomach.dm | 12 +- .../internal/stomach/stomach_ethereal.dm | 6 +- .../organs/internal/stomach/stomach_golem.dm | 4 +- code/modules/zombie/organs.dm | 2 +- 168 files changed, 742 insertions(+), 744 deletions(-) diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm index 5c1379bcaba..03f8a044085 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm @@ -144,7 +144,7 @@ ///from base of /mob/living/carbon/regenerate_limbs(): (excluded_limbs) #define COMSIG_CARBON_REGENERATE_LIMBS "living_regen_limbs" -/// Sent from /mob/living/carbon/human/handle_blood(): (seconds_per_tick, times_fired) +/// Sent from /mob/living/carbon/human/handle_blood(): (seconds_per_tick) #define COMSIG_HUMAN_ON_HANDLE_BLOOD "human_on_handle_blood" /// Return to prevent all default blood handling #define HANDLE_BLOOD_HANDLED (1<<0) diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm index de280d576b6..86bfadb0428 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm @@ -60,7 +60,7 @@ #define COMSIG_LIVING_TRY_SYRINGE_WITHDRAW "living_try_syringe_withdraw" ///from base of mob/living/set_usable_legs() #define COMSIG_LIVING_LIMBLESS_SLOWDOWN "living_limbless_slowdown" -///From living/Life(). (deltatime, times_fired) +///From living/Life(). (deltatime) #define COMSIG_LIVING_LIFE "living_life" /// Block the Life() proc from proceeding... this should really only be done in some really wacky situations. #define COMPONENT_LIVING_CANCEL_LIFE_PROCESSING (1<<0) @@ -146,7 +146,7 @@ #define COMPONENT_CANT_TRACK (1<<0) ///from end of fully_heal(): (heal_flags) #define COMSIG_LIVING_POST_FULLY_HEAL "living_post_fully_heal" -/// from start of /mob/living/handle_breathing(): (seconds_per_tick, times_fired) +/// from start of /mob/living/handle_breathing(): (seconds_per_tick) #define COMSIG_LIVING_HANDLE_BREATHING "living_handle_breathing" ///from /obj/item/hand_item/slapper/attack_atom(): (source=mob/living/slammer, obj/structure/table/slammed_table) #define COMSIG_LIVING_SLAM_TABLE "living_slam_table" diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm index 2db139bceed..8b710d030f3 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm @@ -8,7 +8,7 @@ #define COMSIG_MOB_MIND_INITIALIZED "mob_mind_inited" ///from base of mob/set_stat(): (new_stat, old_stat) #define COMSIG_MOB_STATCHANGE "mob_statchange" -///from base of mob/reagent_tick(): (datum/reagent/chem, seconds_per_tick, times_fired) +///from base of mob/reagent_tick(): (datum/reagent/chem, seconds_per_tick) #define COMSIG_MOB_REAGENT_TICK "mob_reagent_tick" ///stops the reagent check call #define COMSIG_MOB_STOP_REAGENT_TICK (1<<0) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 77f1316d4a4..42a9e4f5c68 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -1169,7 +1169,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/splash) return INITIALIZE_HINT_QDEL RegisterSignal(hud_owner.mymob, COMSIG_LIVING_LIFE, PROC_REF(on_mob_life)) -/atom/movable/screen/blood_level/proc/on_mob_life(mob/living/source, seconds_per_tick, times_fired) +/atom/movable/screen/blood_level/proc/on_mob_life(mob/living/source, seconds_per_tick) SIGNAL_HANDLER if(!isliving(source)) diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index 1faa2e102ad..7f500e08289 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -32,13 +32,12 @@ SUBSYSTEM_DEF(mobs) //cache for sanic speed (lists are references anyways) var/list/currentrun = src.currentrun - var/times_fired = src.times_fired var/seconds_per_tick = wait / (1 SECONDS) while(currentrun.len) var/mob/living/processing_mob = currentrun[currentrun.len] currentrun.len-- if(processing_mob) - processing_mob.Life(seconds_per_tick, times_fired) + processing_mob.Life(seconds_per_tick) else GLOB.mob_living_list.Remove(processing_mob) if (MC_TICK_CHECK) diff --git a/code/datums/brain_damage/brain_trauma.dm b/code/datums/brain_damage/brain_trauma.dm index 9d1caff55f6..e542682154f 100644 --- a/code/datums/brain_damage/brain_trauma.dm +++ b/code/datums/brain_damage/brain_trauma.dm @@ -35,7 +35,7 @@ return ..() //Called on life ticks -/datum/brain_trauma/proc/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/proc/on_life(seconds_per_tick) return //Called on death diff --git a/code/datums/brain_damage/creepy_trauma.dm b/code/datums/brain_damage/creepy_trauma.dm index cc5cac5fd38..99f2c39a9fb 100644 --- a/code/datums/brain_damage/creepy_trauma.dm +++ b/code/datums/brain_damage/creepy_trauma.dm @@ -36,7 +36,7 @@ RegisterSignal(owner, COMSIG_CARBON_HELPED, PROC_REF(on_hug)) ADD_TRAIT(owner, TRAIT_DESENSITIZED, REF(src)) -/datum/brain_trauma/special/obsessed/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/special/obsessed/on_life(seconds_per_tick) if(!obsession || obsession.stat == DEAD) viewing = FALSE//important, makes sure you no longer stutter when happy if you murdered them while viewing return diff --git a/code/datums/brain_damage/hypnosis.dm b/code/datums/brain_damage/hypnosis.dm index 7518419423c..dead3e4f878 100644 --- a/code/datums/brain_damage/hypnosis.dm +++ b/code/datums/brain_damage/hypnosis.dm @@ -60,7 +60,7 @@ owner.mind.remove_antag_datum(/datum/antagonist/hypnotized) antagonist = null -/datum/brain_trauma/hypnosis/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/hypnosis/on_life(seconds_per_tick) ..() if(SPT_PROB(1, seconds_per_tick)) if(prob(50)) diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm index 2c99da7c6f0..09cbe114de5 100644 --- a/code/datums/brain_damage/imaginary_friend.dm +++ b/code/datums/brain_damage/imaginary_friend.dm @@ -20,7 +20,7 @@ make_friend() get_ghost() -/datum/brain_trauma/special/imaginary_friend/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/special/imaginary_friend/on_life(seconds_per_tick) if(get_dist(owner, friend) > 9) friend.recall() if(!friend) diff --git a/code/datums/brain_damage/magic.dm b/code/datums/brain_damage/magic.dm index d15296baa22..8ec6dac0bb3 100644 --- a/code/datums/brain_damage/magic.dm +++ b/code/datums/brain_damage/magic.dm @@ -16,7 +16,7 @@ COOLDOWN_DECLARE(damage_warning_cooldown) var/next_damage_warning = 0 -/datum/brain_trauma/magic/lumiphobia/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/magic/lumiphobia/on_life(seconds_per_tick) ..() var/turf/T = owner.loc if(!istype(T)) @@ -37,7 +37,7 @@ gain_text = span_warning("You feel a hateful presence close to you.") lose_text = span_notice("You feel the hateful presence fade away.") -/datum/brain_trauma/magic/poltergeist/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/magic/poltergeist/on_life(seconds_per_tick) ..() if(!SPT_PROB(2, seconds_per_tick)) return @@ -97,7 +97,7 @@ QDEL_NULL(stalker) return ..() -/datum/brain_trauma/magic/stalker/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/magic/stalker/on_life(seconds_per_tick) // Dead and unconscious people are not interesting to the psychic stalker. if(owner.stat != CONSCIOUS) return diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm index 81c589d3389..dce6ae6dd38 100644 --- a/code/datums/brain_damage/mild.dm +++ b/code/datums/brain_damage/mild.dm @@ -14,7 +14,7 @@ /// Whether the hallucinations we give are uncapped, ie all the wacky ones var/uncapped = FALSE -/datum/brain_trauma/mild/hallucinations/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/mild/hallucinations/on_life(seconds_per_tick) if(owner.stat >= UNCONSCIOUS) return if(HAS_TRAIT(owner, TRAIT_RDS_SUPPRESSED)) @@ -38,7 +38,7 @@ gain_text = span_warning("Speaking clearly is getting harder.") lose_text = span_notice("You feel in control of your speech.") -/datum/brain_trauma/mild/stuttering/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/mild/stuttering/on_life(seconds_per_tick) owner.adjust_stutter_up_to(5 SECONDS * seconds_per_tick, 50 SECONDS) /datum/brain_trauma/mild/stuttering/on_lose() @@ -57,7 +57,7 @@ owner.add_mood_event("dumb", /datum/mood_event/oblivious) return ..() -/datum/brain_trauma/mild/dumbness/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/mild/dumbness/on_life(seconds_per_tick) owner.adjust_derpspeech_up_to(5 SECONDS * seconds_per_tick, 50 SECONDS) if(SPT_PROB(1.5, seconds_per_tick)) owner.emote("drool") @@ -92,7 +92,7 @@ gain_text = span_warning("Your head hurts!") lose_text = span_notice("The pressure inside your head starts fading.") -/datum/brain_trauma/mild/concussion/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/mild/concussion/on_life(seconds_per_tick) if(SPT_PROB(2.5, seconds_per_tick)) switch(rand(1,11)) if(1) @@ -124,7 +124,7 @@ owner.apply_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type) return ..() -/datum/brain_trauma/mild/healthy/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/mild/healthy/on_life(seconds_per_tick) owner.adjust_stamina_loss(-6 * seconds_per_tick) //no pain, no fatigue /datum/brain_trauma/mild/healthy/on_lose() @@ -138,7 +138,7 @@ gain_text = span_warning("Your muscles feel oddly faint.") lose_text = span_notice("You feel in control of your muscles again.") -/datum/brain_trauma/mild/muscle_weakness/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/mild/muscle_weakness/on_life(seconds_per_tick) var/fall_chance = 1 if(owner.move_intent == MOVE_INTENT_RUN) fall_chance += 2 @@ -180,7 +180,7 @@ gain_text = span_warning("Your throat itches incessantly...") lose_text = span_notice("Your throat stops itching.") -/datum/brain_trauma/mild/nervous_cough/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/mild/nervous_cough/on_life(seconds_per_tick) if(SPT_PROB(6, seconds_per_tick) && !HAS_TRAIT(owner, TRAIT_SOOTHED_THROAT)) if(prob(5)) to_chat(owner, span_warning("[pick("You have a coughing fit!", "You can't stop coughing!")]")) @@ -299,7 +299,7 @@ for(var/obj/item/thing in owner.held_items) clear_trait(thing) -/datum/brain_trauma/mild/possessive/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/mild/possessive/on_life(seconds_per_tick) if(!SPT_PROB(5, seconds_per_tick)) return diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index 16289a58fe5..431bf2ca4ea 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -149,7 +149,7 @@ var/sleep_time_minimum = 6 SECONDS var/sleep_time_maximum = 6 SECONDS -/datum/brain_trauma/severe/narcolepsy/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/severe/narcolepsy/on_life(seconds_per_tick) if(owner.IsSleeping()) return @@ -254,7 +254,7 @@ ..() owner.remove_status_effect(/datum/status_effect/trance) -/datum/brain_trauma/severe/hypnotic_stupor/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/severe/hypnotic_stupor/on_life(seconds_per_tick) ..() if(SPT_PROB(0.5, seconds_per_tick) && !owner.has_status_effect(/datum/status_effect/trance)) owner.apply_status_effect(/datum/status_effect/trance, rand(100,300), FALSE) @@ -329,7 +329,7 @@ if(damage_amount >= 5 && (damage_type == BRUTE || damage_type == BURN || damage_type == STAMINA)) COOLDOWN_START(src, steal_cd, 12 SECONDS) -/datum/brain_trauma/severe/kleptomaniac/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/severe/kleptomaniac/on_life(seconds_per_tick) if(owner.usable_hands <= 0) return if(!SPT_PROB(5, seconds_per_tick)) diff --git a/code/datums/brain_damage/special.dm b/code/datums/brain_damage/special.dm index d5e5157c1c1..bad94722bcc 100644 --- a/code/datums/brain_damage/special.dm +++ b/code/datums/brain_damage/special.dm @@ -11,7 +11,7 @@ gain_text = span_notice("You feel a higher power inside your mind...") lose_text = span_warning("The divine presence leaves your head, no longer interested.") -/datum/brain_trauma/special/godwoken/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/special/godwoken/on_life(seconds_per_tick) ..() if(SPT_PROB(2, seconds_per_tick)) if(prob(33) && (owner.IsStun() || owner.IsParalyzed() || owner.IsUnconscious())) @@ -57,7 +57,7 @@ /// Cooldown so we can't teleport literally everywhere on a whim COOLDOWN_DECLARE(portal_cooldown) -/datum/brain_trauma/special/bluespace_prophet/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/special/bluespace_prophet/on_life(seconds_per_tick) if(!COOLDOWN_FINISHED(src, portal_cooldown)) return @@ -164,7 +164,7 @@ /// Cooldown for snapbacks COOLDOWN_DECLARE(snapback_cooldown) -/datum/brain_trauma/special/quantum_alignment/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/special/quantum_alignment/on_life(seconds_per_tick) if(linked) if(QDELETED(linked_target)) linked_target = null @@ -309,7 +309,7 @@ /// A cooldown to prevent constantly erratic dolphining through the fabric of reality COOLDOWN_DECLARE(crisis_cooldown) -/datum/brain_trauma/special/existential_crisis/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/special/existential_crisis/on_life(seconds_per_tick) ..() if(!veil && COOLDOWN_FINISHED(src, crisis_cooldown) && SPT_PROB(1.5, seconds_per_tick)) if(isturf(owner.loc)) @@ -449,7 +449,7 @@ /datum/hallucination/battle/stun_prod, ) -/datum/brain_trauma/special/ptsd/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/special/ptsd/on_life(seconds_per_tick) if(owner.stat != CONSCIOUS) return @@ -504,7 +504,7 @@ owner.ai_controller = new old_ai_controller_type(owner) owner.remove_language(/datum/language/monkey, UNDERSTOOD_LANGUAGE, TRAUMA_TRAIT) -/datum/brain_trauma/special/primal_instincts/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/special/primal_instincts/on_life(seconds_per_tick) if(isnull(owner.ai_controller)) qdel(src) return @@ -558,7 +558,7 @@ "Ah!", ) -/datum/brain_trauma/special/axedoration/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/special/axedoration/on_life(seconds_per_tick) if(owner.stat != CONSCIOUS) return diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm index 0fb56079a96..bef6ac74494 100644 --- a/code/datums/brain_damage/split_personality.dm +++ b/code/datums/brain_damage/split_personality.dm @@ -62,7 +62,7 @@ message_admins("[ADMIN_LOOKUPFLW(stranger_backseat)] became [ADMIN_LOOKUPFLW(owner)]'s split personality.") -/datum/brain_trauma/severe/split_personality/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/severe/split_personality/on_life(seconds_per_tick) if(owner.stat == DEAD) if(current_controller != OWNER) switch_personalities(TRUE) @@ -155,7 +155,7 @@ trauma = _trauma return ..() -/mob/living/split_personality/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/split_personality/Life(seconds_per_tick = SSMOBS_DT) if(QDELETED(body)) qdel(src) //in case trauma deletion doesn't already do it @@ -227,7 +227,7 @@ else qdel(src) -/datum/brain_trauma/severe/split_personality/brainwashing/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/severe/split_personality/brainwashing/on_life(seconds_per_tick) return //no random switching /datum/brain_trauma/severe/split_personality/brainwashing/handle_hearing(datum/source, list/hearing_args) @@ -298,7 +298,7 @@ if(prob(20))//we don't want every single splash to wake them up now do we qdel(src) -/datum/brain_trauma/severe/split_personality/blackout/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/severe/split_personality/blackout/on_life(seconds_per_tick) if(current_controller == OWNER && stranger_backseat)//we should only start transitioning after the other personality has entered owner.overlay_fullscreen("fade_to_black", /atom/movable/screen/fullscreen/blind) owner.clear_fullscreen("fade_to_black", animated = 4 SECONDS) diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index d3c8c0f7dc0..8bb65e43049 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -98,7 +98,7 @@ UnregisterSignal(affected_mob, COMSIG_CARBON_PRE_BREATHE) ///Proc to process the disease and decide on whether to advance, cure or make the symptoms appear. Returns a boolean on whether to continue acting on the symptoms or not. -/datum/disease/proc/stage_act(seconds_per_tick, times_fired) +/datum/disease/proc/stage_act(seconds_per_tick) var/slowdown = HAS_TRAIT(affected_mob, TRAIT_VIRUS_RESISTANCE) ? 0.5 : 1 // spaceacillin slows stage speed by 50% var/recovery_prob = 0 var/cure_mod diff --git a/code/datums/diseases/adrenal_crisis.dm b/code/datums/diseases/adrenal_crisis.dm index aa9587c2e1a..72882bd3694 100644 --- a/code/datums/diseases/adrenal_crisis.dm +++ b/code/datums/diseases/adrenal_crisis.dm @@ -15,7 +15,7 @@ visibility_flags = HIDDEN_PANDEMIC bypasses_immunity = TRUE -/datum/disease/adrenal_crisis/stage_act(seconds_per_tick, times_fired) +/datum/disease/adrenal_crisis/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 5fc4928990b..298f537ef63 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -142,7 +142,7 @@ // Randomly pick a symptom to activate. -/datum/disease/advance/stage_act(seconds_per_tick, times_fired) +/datum/disease/advance/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/anaphylaxis.dm b/code/datums/diseases/anaphylaxis.dm index fb105b4b0de..54408235755 100644 --- a/code/datums/diseases/anaphylaxis.dm +++ b/code/datums/diseases/anaphylaxis.dm @@ -16,7 +16,7 @@ bypasses_immunity = TRUE stage_prob = 5 -/datum/disease/anaphylaxis/stage_act(seconds_per_tick, times_fired) +/datum/disease/anaphylaxis/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm index df24ae2ffa5..2b6df5808f1 100644 --- a/code/datums/diseases/anxiety.dm +++ b/code/datums/diseases/anxiety.dm @@ -12,7 +12,7 @@ severity = DISEASE_SEVERITY_MINOR -/datum/disease/anxiety/stage_act(seconds_per_tick, times_fired) +/datum/disease/anxiety/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/asthma_attack.dm b/code/datums/diseases/asthma_attack.dm index 7adefd2f746..3c01accc113 100644 --- a/code/datums/diseases/asthma_attack.dm +++ b/code/datums/diseases/asthma_attack.dm @@ -72,7 +72,7 @@ return (locate(/datum/quirk/item_quirk/asthma) in target.quirks) -/datum/disease/asthma_attack/stage_act(seconds_per_tick, times_fired) +/datum/disease/asthma_attack/stage_act(seconds_per_tick) . = ..() if (!.) return @@ -116,7 +116,7 @@ "3" = 0.6, ) -/datum/disease/asthma_attack/minor/stage_act(seconds_per_tick, times_fired) +/datum/disease/asthma_attack/minor/stage_act(seconds_per_tick) . = ..() if (!.) return FALSE @@ -140,7 +140,7 @@ "4" = 4, ) -/datum/disease/asthma_attack/moderate/stage_act(seconds_per_tick, times_fired) +/datum/disease/asthma_attack/moderate/stage_act(seconds_per_tick) . = ..() if (!.) return FALSE @@ -174,7 +174,7 @@ visibility_flags = HIDDEN_SCANNER alert_ghosts = TRUE -/datum/disease/asthma_attack/severe/stage_act(seconds_per_tick, times_fired) +/datum/disease/asthma_attack/severe/stage_act(seconds_per_tick) . = ..() if (!.) return FALSE @@ -216,7 +216,7 @@ /// Have we ever reached our max stage? If no, and we are at our max stage, we send a ominous message warning them of their imminent demise. var/max_stage_reached = FALSE -/datum/disease/asthma_attack/critical/stage_act(seconds_per_tick, times_fired) +/datum/disease/asthma_attack/critical/stage_act(seconds_per_tick) . = ..() if (!.) return FALSE diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm index faf0445cbcb..ead9c35da18 100644 --- a/code/datums/diseases/beesease.dm +++ b/code/datums/diseases/beesease.dm @@ -13,7 +13,7 @@ infectable_biotypes = MOB_ORGANIC|MOB_UNDEAD //bees nesting in corpses -/datum/disease/beesease/stage_act(seconds_per_tick, times_fired) +/datum/disease/beesease/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm index 615d3c94921..e3a4e3d35a2 100644 --- a/code/datums/diseases/brainrot.dm +++ b/code/datums/diseases/brainrot.dm @@ -13,7 +13,7 @@ severity = DISEASE_SEVERITY_HARMFUL bypasses_immunity = TRUE -/datum/disease/brainrot/stage_act(seconds_per_tick, times_fired) //Removed toxloss because damaging diseases are pretty horrible. Last round it killed the entire station because the cure didn't work -- Urist -ACTUALLY Removed rather than commented out, I don't see it returning - RR +/datum/disease/brainrot/stage_act(seconds_per_tick) //Removed toxloss because damaging diseases are pretty horrible. Last round it killed the entire station because the cure didn't work -- Urist -ACTUALLY Removed rather than commented out, I don't see it returning - RR . = ..() if(!.) return diff --git a/code/datums/diseases/chronic_illness.dm b/code/datums/diseases/chronic_illness.dm index 6152e894558..43dd24a7cb1 100644 --- a/code/datums/diseases/chronic_illness.dm +++ b/code/datums/diseases/chronic_illness.dm @@ -16,7 +16,7 @@ severity = DISEASE_SEVERITY_UNCURABLE bypasses_immunity = TRUE -/datum/disease/chronic_illness/stage_act(seconds_per_tick, times_fired) +/datum/disease/chronic_illness/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm index f7bf6cf4b18..990a138e9ad 100644 --- a/code/datums/diseases/cold.dm +++ b/code/datums/diseases/cold.dm @@ -12,7 +12,7 @@ required_organ = ORGAN_SLOT_LUNGS -/datum/disease/cold/stage_act(seconds_per_tick, times_fired) +/datum/disease/cold/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/cold9.dm b/code/datums/diseases/cold9.dm index 2e55df23b7e..667be8c88e5 100644 --- a/code/datums/diseases/cold9.dm +++ b/code/datums/diseases/cold9.dm @@ -11,7 +11,7 @@ severity = DISEASE_SEVERITY_HARMFUL required_organ = ORGAN_SLOT_LUNGS -/datum/disease/cold9/stage_act(seconds_per_tick, times_fired) +/datum/disease/cold9/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/death_sandwich_poisoning.dm b/code/datums/diseases/death_sandwich_poisoning.dm index 6fad7e445ae..375d97c9eee 100644 --- a/code/datums/diseases/death_sandwich_poisoning.dm +++ b/code/datums/diseases/death_sandwich_poisoning.dm @@ -16,7 +16,7 @@ bypasses_immunity = TRUE required_organ = ORGAN_SLOT_STOMACH -/datum/disease/death_sandwich_poisoning/stage_act(seconds_per_tick, times_fired) +/datum/disease/death_sandwich_poisoning/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/decloning.dm b/code/datums/diseases/decloning.dm index 8d0d5ece467..b3017b9ca21 100644 --- a/code/datums/diseases/decloning.dm +++ b/code/datums/diseases/decloning.dm @@ -18,7 +18,7 @@ affected_mob.remove_status_effect(/datum/status_effect/decloning) return ..() -/datum/disease/decloning/stage_act(seconds_per_tick, times_fired) +/datum/disease/decloning/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm index 168c7f3a2f2..2630a805c74 100644 --- a/code/datums/diseases/dna_spread.dm +++ b/code/datums/diseases/dna_spread.dm @@ -15,7 +15,7 @@ bypasses_immunity = TRUE -/datum/disease/dnaspread/stage_act(seconds_per_tick, times_fired) +/datum/disease/dnaspread/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/fake_gbs.dm b/code/datums/diseases/fake_gbs.dm index 655439cdc6c..59ffb1e1c9a 100644 --- a/code/datums/diseases/fake_gbs.dm +++ b/code/datums/diseases/fake_gbs.dm @@ -11,7 +11,7 @@ severity = DISEASE_SEVERITY_BIOHAZARD -/datum/disease/fake_gbs/stage_act(seconds_per_tick, times_fired) +/datum/disease/fake_gbs/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/floor_diseases/carpellosis.dm b/code/datums/diseases/floor_diseases/carpellosis.dm index 5f5fcb9051c..50a6481c575 100644 --- a/code/datums/diseases/floor_diseases/carpellosis.dm +++ b/code/datums/diseases/floor_diseases/carpellosis.dm @@ -22,7 +22,7 @@ /// Whether the host has carp ability var/ability_granted = FALSE -/datum/disease/carpellosis/stage_act(seconds_per_tick, times_fired) +/datum/disease/carpellosis/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/floor_diseases/gastritium.dm b/code/datums/diseases/floor_diseases/gastritium.dm index dfa445a0648..cbee6e1fe87 100644 --- a/code/datums/diseases/floor_diseases/gastritium.dm +++ b/code/datums/diseases/floor_diseases/gastritium.dm @@ -14,7 +14,7 @@ /// The chance of burped out tritium to be hot during max stage var/tritium_burp_hot_chance = 10 -/datum/disease/gastritium/stage_act(seconds_per_tick, times_fired) +/datum/disease/gastritium/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/floor_diseases/nebula_nausea.dm b/code/datums/diseases/floor_diseases/nebula_nausea.dm index 85d7716a1d3..9f8e45648de 100644 --- a/code/datums/diseases/floor_diseases/nebula_nausea.dm +++ b/code/datums/diseases/floor_diseases/nebula_nausea.dm @@ -12,7 +12,7 @@ required_organ = ORGAN_SLOT_STOMACH max_stages = 5 -/datum/disease/advance/nebula_nausea/stage_act(seconds_per_tick, times_fired) +/datum/disease/advance/nebula_nausea/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm index 4fa00e06097..97563ed515c 100644 --- a/code/datums/diseases/flu.dm +++ b/code/datums/diseases/flu.dm @@ -12,7 +12,7 @@ severity = DISEASE_SEVERITY_MINOR required_organ = ORGAN_SLOT_LUNGS -/datum/disease/flu/stage_act(seconds_per_tick, times_fired) +/datum/disease/flu/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/fluspanish.dm b/code/datums/diseases/fluspanish.dm index 6919884b2fe..7fd35c631b4 100644 --- a/code/datums/diseases/fluspanish.dm +++ b/code/datums/diseases/fluspanish.dm @@ -12,7 +12,7 @@ severity = DISEASE_SEVERITY_DANGEROUS required_organ = ORGAN_SLOT_LUNGS -/datum/disease/fluspanish/stage_act(seconds_per_tick, times_fired) +/datum/disease/fluspanish/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/gastrolisis.dm b/code/datums/diseases/gastrolisis.dm index f7348c38cb8..2e562051bbd 100644 --- a/code/datums/diseases/gastrolisis.dm +++ b/code/datums/diseases/gastrolisis.dm @@ -12,7 +12,7 @@ bypasses_immunity = TRUE -/datum/disease/gastrolosis/stage_act(seconds_per_tick, times_fired) +/datum/disease/gastrolosis/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/gbs.dm b/code/datums/diseases/gbs.dm index c9faf303674..162a688a86e 100644 --- a/code/datums/diseases/gbs.dm +++ b/code/datums/diseases/gbs.dm @@ -13,7 +13,7 @@ severity = DISEASE_SEVERITY_BIOHAZARD bypasses_immunity = TRUE -/datum/disease/gbs/stage_act(seconds_per_tick, times_fired) +/datum/disease/gbs/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/magnitis.dm b/code/datums/diseases/magnitis.dm index a0fbc957e74..295fa0b6a7e 100644 --- a/code/datums/diseases/magnitis.dm +++ b/code/datums/diseases/magnitis.dm @@ -15,7 +15,7 @@ process_dead = TRUE -/datum/disease/magnitis/stage_act(seconds_per_tick, times_fired) +/datum/disease/magnitis/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/parasitic_infection.dm b/code/datums/diseases/parasitic_infection.dm index 53b61266271..ec008c50495 100644 --- a/code/datums/diseases/parasitic_infection.dm +++ b/code/datums/diseases/parasitic_infection.dm @@ -14,7 +14,7 @@ required_organ = ORGAN_SLOT_LIVER bypasses_immunity = TRUE -/datum/disease/parasite/stage_act(seconds_per_tick, times_fired) +/datum/disease/parasite/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/parrotpossession.dm b/code/datums/diseases/parrotpossession.dm index 114d144902a..0bb50df6b29 100644 --- a/code/datums/diseases/parrotpossession.dm +++ b/code/datums/diseases/parrotpossession.dm @@ -19,7 +19,7 @@ var/datum/ai_controller/basic_controller/parrot_controller -/datum/disease/parrot_possession/stage_act(seconds_per_tick, times_fired) +/datum/disease/parrot_possession/stage_act(seconds_per_tick) . = ..() if(!. || isnull(parrot_controller)) diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index afc27eff07a..950d98b22f0 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -12,7 +12,7 @@ severity = DISEASE_SEVERITY_MEDIUM required_organ = ORGAN_SLOT_TONGUE -/datum/disease/pierrot_throat/stage_act(seconds_per_tick, times_fired) +/datum/disease/pierrot_throat/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/retrovirus.dm b/code/datums/diseases/retrovirus.dm index 4524c2af346..507c9340a5c 100644 --- a/code/datums/diseases/retrovirus.dm +++ b/code/datums/diseases/retrovirus.dm @@ -27,7 +27,7 @@ D.restcure = restcure return D -/datum/disease/dna_retrovirus/stage_act(seconds_per_tick, times_fired) +/datum/disease/dna_retrovirus/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/rhumba_beat.dm b/code/datums/diseases/rhumba_beat.dm index 554aa62e242..ac45d32e403 100644 --- a/code/datums/diseases/rhumba_beat.dm +++ b/code/datums/diseases/rhumba_beat.dm @@ -11,7 +11,7 @@ severity = DISEASE_SEVERITY_BIOHAZARD bypasses_immunity = TRUE -/datum/disease/rhumba_beat/stage_act(seconds_per_tick, times_fired) +/datum/disease/rhumba_beat/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 5c11528b686..a2de17f8531 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -31,7 +31,7 @@ return D -/datum/disease/transformation/stage_act(seconds_per_tick, times_fired) +/datum/disease/transformation/stage_act(seconds_per_tick) . = ..() if(!.) return @@ -129,7 +129,7 @@ /datum/disease/transformation/jungle_flu/do_disease_transformation(mob/living/carbon/affected_mob) affected_mob.monkeyize() -/datum/disease/transformation/jungle_flu/stage_act(seconds_per_tick, times_fired) +/datum/disease/transformation/jungle_flu/stage_act(seconds_per_tick) . = ..() if(!.) return @@ -168,7 +168,7 @@ infectable_biotypes = MOB_ORGANIC|MOB_UNDEAD|MOB_ROBOTIC bantype = JOB_CYBORG -/datum/disease/transformation/robot/stage_act(seconds_per_tick, times_fired) +/datum/disease/transformation/robot/stage_act(seconds_per_tick) . = ..() if(!.) return @@ -212,7 +212,7 @@ bantype = ROLE_ALIEN -/datum/disease/transformation/xeno/stage_act(seconds_per_tick, times_fired) +/datum/disease/transformation/xeno/stage_act(seconds_per_tick) . = ..() if(!.) return @@ -244,7 +244,7 @@ new_form = /mob/living/basic/slime -/datum/disease/transformation/slime/stage_act(seconds_per_tick, times_fired) +/datum/disease/transformation/slime/stage_act(seconds_per_tick) . = ..() if(!.) return @@ -284,7 +284,7 @@ new_form = /mob/living/basic/pet/dog/corgi -/datum/disease/transformation/corgi/stage_act(seconds_per_tick, times_fired) +/datum/disease/transformation/corgi/stage_act(seconds_per_tick) . = ..() if(!.) return @@ -337,7 +337,7 @@ new_form = /mob/living/basic/pet/gondola -/datum/disease/transformation/gondola/stage_act(seconds_per_tick, times_fired) +/datum/disease/transformation/gondola/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm index f54df123c1b..4c14337ba27 100644 --- a/code/datums/diseases/tuberculosis.dm +++ b/code/datums/diseases/tuberculosis.dm @@ -13,7 +13,7 @@ severity = DISEASE_SEVERITY_BIOHAZARD bypasses_immunity = TRUE // TB primarily impacts the lungs; it's also bacterial or fungal in nature; viral immunity should do nothing. -/datum/disease/tuberculosis/stage_act(seconds_per_tick, times_fired) //it begins +/datum/disease/tuberculosis/stage_act(seconds_per_tick) //it begins . = ..() if(!.) return diff --git a/code/datums/diseases/weightlessness.dm b/code/datums/diseases/weightlessness.dm index 2eac4aca19c..877b16574cc 100644 --- a/code/datums/diseases/weightlessness.dm +++ b/code/datums/diseases/weightlessness.dm @@ -15,7 +15,7 @@ infectable_biotypes = MOB_ORGANIC -/datum/disease/weightlessness/stage_act(seconds_per_tick, times_fired) +/datum/disease/weightlessness/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index fe0502387f9..b4a420d22cf 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -47,7 +47,7 @@ QDEL_LIST(random_targeted_spells) return ..() -/datum/disease/wizarditis/stage_act(seconds_per_tick, times_fired) +/datum/disease/wizarditis/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/datums/elements/body_temp_sensitive.dm b/code/datums/elements/body_temp_sensitive.dm index 9cbb027123d..ce74f9c9f7f 100644 --- a/code/datums/elements/body_temp_sensitive.dm +++ b/code/datums/elements/body_temp_sensitive.dm @@ -43,7 +43,7 @@ UnregisterSignal(source, COMSIG_LIVING_LIFE) return ..() -/datum/element/body_temp_sensitive/proc/on_life(datum/target, seconds_per_tick, times_fired) +/datum/element/body_temp_sensitive/proc/on_life(datum/target, seconds_per_tick) SIGNAL_HANDLER var/mob/living/living_mob = target diff --git a/code/datums/elements/leeching_walk.dm b/code/datums/elements/leeching_walk.dm index 2ad01fc12d9..25ecb3fe1f9 100644 --- a/code/datums/elements/leeching_walk.dm +++ b/code/datums/elements/leeching_walk.dm @@ -34,7 +34,7 @@ * Gradually heals the heretic ([source]) on rust, * including baton knockdown and stamina damage. */ -/datum/element/leeching_walk/proc/on_life(mob/living/source, seconds_per_tick, times_fired) +/datum/element/leeching_walk/proc/on_life(mob/living/source, seconds_per_tick) SIGNAL_HANDLER var/turf/our_turf = get_turf(source) diff --git a/code/datums/mutations/_mutations.dm b/code/datums/mutations/_mutations.dm index 19164ea98a5..a9641a4795e 100644 --- a/code/datums/mutations/_mutations.dm +++ b/code/datums/mutations/_mutations.dm @@ -149,7 +149,7 @@ /datum/mutation/proc/get_visual_indicator() return -/datum/mutation/proc/on_life(seconds_per_tick, times_fired) +/datum/mutation/proc/on_life(seconds_per_tick) return /datum/mutation/proc/on_losing(mob/living/carbon/human/owner) diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index 2e633fef128..4fe07773ca8 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -10,7 +10,7 @@ synchronizer_coeff = 1 power_coeff = 1 -/datum/mutation/epilepsy/on_life(seconds_per_tick, times_fired) +/datum/mutation/epilepsy/on_life(seconds_per_tick) if(SPT_PROB(0.5 * GET_MUTATION_SYNCHRONIZER(src), seconds_per_tick)) trigger_seizure() @@ -89,7 +89,7 @@ synchronizer_coeff = 1 power_coeff = 1 -/datum/mutation/cough/on_life(seconds_per_tick, times_fired) +/datum/mutation/cough/on_life(seconds_per_tick) if(SPT_PROB(2.5 * GET_MUTATION_SYNCHRONIZER(src), seconds_per_tick) && owner.stat == CONSCIOUS) owner.drop_all_held_items() owner.emote("cough") @@ -106,7 +106,7 @@ text_gain_indication = span_danger("You feel screams echo through your mind...") text_lose_indication = span_notice("The screaming in your mind fades.") -/datum/mutation/paranoia/on_life(seconds_per_tick, times_fired) +/datum/mutation/paranoia/on_life(seconds_per_tick) if(SPT_PROB(2.5, seconds_per_tick) && owner.stat == CONSCIOUS) owner.emote("scream") if(prob(25)) @@ -214,7 +214,7 @@ text_gain_indication = span_danger("You twitch.") synchronizer_coeff = 1 -/datum/mutation/tourettes/on_life(seconds_per_tick, times_fired) +/datum/mutation/tourettes/on_life(seconds_per_tick) if(SPT_PROB(5 * GET_MUTATION_SYNCHRONIZER(src), seconds_per_tick) && owner.stat == CONSCIOUS && !owner.IsStun()) switch(rand(1, 3)) if(1) @@ -359,7 +359,7 @@ synchronizer_coeff = 1 power_coeff = 1 -/datum/mutation/fire/on_life(seconds_per_tick, times_fired) +/datum/mutation/fire/on_life(seconds_per_tick) if(SPT_PROB((0.05+(100-dna.stability)/19.5) * GET_MUTATION_SYNCHRONIZER(src), seconds_per_tick)) owner.adjust_fire_stacks(2 * GET_MUTATION_POWER(src)) owner.ignite_mob() @@ -388,7 +388,7 @@ power_coeff = 1 var/warpchance = 0 -/datum/mutation/badblink/on_life(seconds_per_tick, times_fired) +/datum/mutation/badblink/on_life(seconds_per_tick) if(SPT_PROB(warpchance, seconds_per_tick)) var/warpmessage = pick( span_warning("With a sickening 720-degree twist of [owner.p_their()] back, [owner] vanishes into thin air."), @@ -416,7 +416,7 @@ /// The cooldown for the warning message COOLDOWN_DECLARE(msgcooldown) -/datum/mutation/acidflesh/on_life(seconds_per_tick, times_fired) +/datum/mutation/acidflesh/on_life(seconds_per_tick) if(SPT_PROB(13, seconds_per_tick)) if(COOLDOWN_FINISHED(src, msgcooldown)) to_chat(owner, span_danger("Your acid flesh bubbles...")) @@ -698,7 +698,7 @@ else ADD_TRAIT(owner, TRAIT_SOFTSPOKEN, REF(src)) -/datum/mutation/inexorable/on_life(seconds_per_tick, times_fired) +/datum/mutation/inexorable/on_life(seconds_per_tick) if(owner.health > owner.crit_threshold || owner.stat != CONSCIOUS || HAS_TRAIT(owner, TRAIT_STASIS)) return // Gives you 30 seconds of being in soft crit... give or take diff --git a/code/datums/mutations/chameleon.dm b/code/datums/mutations/chameleon.dm index 7cc9d715661..660e672c682 100644 --- a/code/datums/mutations/chameleon.dm +++ b/code/datums/mutations/chameleon.dm @@ -17,7 +17,7 @@ RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) RegisterSignal(owner, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(on_attack_hand)) -/datum/mutation/chameleon/on_life(seconds_per_tick, times_fired) +/datum/mutation/chameleon/on_life(seconds_per_tick) owner.alpha = max(owner.alpha - (12.5 * (GET_MUTATION_POWER(src)) * seconds_per_tick), 0) //Upgraded mutation of the base variant, used for changelings. No instability and better power_coeff diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index 2649c2fcdec..9de066eeacb 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -65,7 +65,7 @@ /datum/mutation/hulk/proc/scream_attack(mob/living/carbon/human/source) source.say("WAAAAAAAAAAAAAAGH!", forced="hulk") -/datum/mutation/hulk/on_life(seconds_per_tick, times_fired) +/datum/mutation/hulk/on_life(seconds_per_tick) if(owner.health < owner.crit_threshold) on_losing(owner) to_chat(owner, span_danger("You suddenly feel very weak.")) @@ -276,7 +276,7 @@ TRAIT_NO_OXYLOSS_PASSOUT, ) // fight till your last breath -/datum/mutation/hulk/superhuman/on_life(seconds_per_tick, times_fired) +/datum/mutation/hulk/superhuman/on_life(seconds_per_tick) return /datum/mutation/hulk/ork diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index 61ee5e52977..99fa867fdc7 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -10,7 +10,7 @@ quality = MINOR_NEGATIVE text_gain_indication = span_danger("You feel nervous.") -/datum/mutation/nervousness/on_life(seconds_per_tick, times_fired) +/datum/mutation/nervousness/on_life(seconds_per_tick) if(SPT_PROB(5, seconds_per_tick)) owner.set_stutter_if_lower(20 SECONDS) @@ -208,7 +208,7 @@ . = ..() AddComponent(/datum/component/speechmod, replacements = strings("elvis_replacement.json", "elvis")) -/datum/mutation/elvis/on_life(seconds_per_tick, times_fired) +/datum/mutation/elvis/on_life(seconds_per_tick) switch(pick(1,2)) if(1) if(SPT_PROB(7.5, seconds_per_tick)) diff --git a/code/datums/mutations/void_magnet.dm b/code/datums/mutations/void_magnet.dm index a6c5c967a03..122fab4e198 100644 --- a/code/datums/mutations/void_magnet.dm +++ b/code/datums/mutations/void_magnet.dm @@ -57,7 +57,7 @@ return ..() /// Signal proc for [COMSIG_LIVING_LIFE]. Has a chance of casting itself randomly. -/datum/action/cooldown/spell/void/cursed/proc/on_life(mob/living/source, seconds_per_tick, times_fired) +/datum/action/cooldown/spell/void/cursed/proc/on_life(mob/living/source, seconds_per_tick) SIGNAL_HANDLER if(!isliving(source) || HAS_TRAIT(source, TRAIT_STASIS) || source.stat == DEAD || HAS_TRAIT(source, TRAIT_NO_TRANSFORM)) diff --git a/code/datums/quirks/negative_quirks/allergic.dm b/code/datums/quirks/negative_quirks/allergic.dm index 394a0a584f6..440e8f6bf0b 100644 --- a/code/datums/quirks/negative_quirks/allergic.dm +++ b/code/datums/quirks/negative_quirks/allergic.dm @@ -52,7 +52,7 @@ quirk_holder.add_mob_memory(/datum/memory/key/quirk_allergy, allergy_string = allergy_string) to_chat(quirk_holder, span_boldnotice("You are allergic to [allergy_string], make sure not to consume any of these!")) -/datum/quirk/item_quirk/allergic/proc/block_metab(mob/living/carbon/source, datum/reagent/chem, seconds_per_tick, times_fired) +/datum/quirk/item_quirk/allergic/proc/block_metab(mob/living/carbon/source, datum/reagent/chem, seconds_per_tick) SIGNAL_HANDLER if(!is_type_in_list(chem, allergies)) diff --git a/code/datums/quirks/negative_quirks/asthma.dm b/code/datums/quirks/negative_quirks/asthma.dm index 6057d306ae7..1c4e53640f9 100644 --- a/code/datums/quirks/negative_quirks/asthma.dm +++ b/code/datums/quirks/negative_quirks/asthma.dm @@ -81,7 +81,7 @@ current_attack?.cure() UnregisterSignal(quirk_holder, COMSIG_CARBON_EXPOSED_TO_SMOKE, COMSIG_CARBON_LOSE_ORGAN, COMSIG_ATOM_EXPOSE_REAGENTS, COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_LIVING_LIFE) -/datum/quirk/item_quirk/asthma/proc/on_life(mob/living/source, seconds_per_tick, times_fired) +/datum/quirk/item_quirk/asthma/proc/on_life(mob/living/source, seconds_per_tick) SIGNAL_HANDLER if (quirk_holder.stat == DEAD) diff --git a/code/datums/quirks/negative_quirks/blood_deficiency.dm b/code/datums/quirks/negative_quirks/blood_deficiency.dm index 7dfd01131dd..21ba3434d7c 100644 --- a/code/datums/quirks/negative_quirks/blood_deficiency.dm +++ b/code/datums/quirks/negative_quirks/blood_deficiency.dm @@ -31,7 +31,7 @@ return FALSE return ..() -/datum/quirk/blooddeficiency/proc/lose_blood(datum/source, seconds_per_tick, times_fired) +/datum/quirk/blooddeficiency/proc/lose_blood(datum/source, seconds_per_tick) SIGNAL_HANDLER var/mob/living/carbon/human/human_holder = quirk_holder diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index 5941718110a..31ca19429f7 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -536,7 +536,7 @@ return /// If var/processing is TRUE, this is run on each life tick -/datum/wound/proc/handle_process(seconds_per_tick, times_fired) +/datum/wound/proc/handle_process(seconds_per_tick) return /// For use in do_after callback checks @@ -569,7 +569,7 @@ return /// Called when the patient is undergoing stasis, so that having fully treated a wound doesn't make you sit there helplessly until you think to unbuckle them -/datum/wound/proc/on_stasis(seconds_per_tick, times_fired) +/datum/wound/proc/on_stasis(seconds_per_tick) return /// Sets our blood flow diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm index b3e3051fefd..12a47139473 100644 --- a/code/datums/wounds/bones.dm +++ b/code/datums/wounds/bones.dm @@ -75,7 +75,7 @@ QDEL_NULL(active_trauma) return ..() -/datum/wound/blunt/bone/handle_process(seconds_per_tick, times_fired) +/datum/wound/blunt/bone/handle_process(seconds_per_tick) . = ..() if (!victim || HAS_TRAIT(victim, TRAIT_STASIS)) diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm index 870df194c53..7877f1b955c 100644 --- a/code/datums/wounds/burns.dm +++ b/code/datums/wounds/burns.dm @@ -35,7 +35,7 @@ /// Once we reach infection beyond WOUND_INFECTION_SEPTIC, we get this many warnings before the limb is completely paralyzed (you'd have to ignore a really bad burn for a really long time for this to happen) var/strikes_to_lose_limb = 3 -/datum/wound/burn/flesh/handle_process(seconds_per_tick, times_fired) +/datum/wound/burn/flesh/handle_process(seconds_per_tick) if (!victim || HAS_TRAIT(victim, TRAIT_STASIS)) return @@ -253,7 +253,7 @@ uv(tool, user) // people complained about burns not healing on stasis beds, so in addition to checking if it's cured, they also get the special ability to very slowly heal on stasis beds if they have the healing effects stored -/datum/wound/burn/flesh/on_stasis(seconds_per_tick, times_fired) +/datum/wound/burn/flesh/on_stasis(seconds_per_tick) . = ..() if(strikes_to_lose_limb <= 0) // we've already hit sepsis, nothing more to do if(SPT_PROB(0.5, seconds_per_tick)) diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm index 0a2e98dcf8f..1379b1bbc0d 100644 --- a/code/datums/wounds/pierce.dm +++ b/code/datums/wounds/pierce.dm @@ -97,7 +97,7 @@ return BLOOD_FLOW_INCREASING return BLOOD_FLOW_STEADY -/datum/wound/pierce/bleed/handle_process(seconds_per_tick, times_fired) +/datum/wound/pierce/bleed/handle_process(seconds_per_tick) if (!victim || HAS_TRAIT(victim, TRAIT_STASIS)) return diff --git a/code/datums/wounds/slash.dm b/code/datums/wounds/slash.dm index 23fda75c902..a4e66f0188b 100644 --- a/code/datums/wounds/slash.dm +++ b/code/datums/wounds/slash.dm @@ -143,7 +143,7 @@ if(clot_rate < 0) return BLOOD_FLOW_INCREASING -/datum/wound/slash/flesh/handle_process(seconds_per_tick, times_fired) +/datum/wound/slash/flesh/handle_process(seconds_per_tick) if (!victim || HAS_TRAIT(victim, TRAIT_STASIS)) return diff --git a/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm b/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm index fa9d0032a49..2bde7c4d0a8 100644 --- a/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm @@ -89,7 +89,7 @@ head.unarmed_attack_effect = initial(head.unarmed_attack_effect) head.unarmed_sharpness = initial(head.unarmed_sharpness) -/obj/item/organ/tongue/carp/on_life(seconds_per_tick, times_fired) +/obj/item/organ/tongue/carp/on_life(seconds_per_tick) . = ..() if(owner.stat != CONSCIOUS || !prob(0.1)) return diff --git a/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm b/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm index 7d17f1bb477..3b1e1b9f3bb 100644 --- a/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm @@ -144,7 +144,7 @@ offerer.say("For you, it's on the mouse.") taker.add_mood_event("it_was_on_the_mouse", /datum/mood_event/it_was_on_the_mouse) -/obj/item/organ/tongue/rat/on_life(seconds_per_tick, times_fired) +/obj/item/organ/tongue/rat/on_life(seconds_per_tick) . = ..() if(prob(5)) owner.emote("squeaks") diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm index d95a9e2f963..05eabac2872 100644 --- a/code/game/objects/items/body_egg.dm +++ b/code/game/objects/items/body_egg.dm @@ -33,17 +33,17 @@ egg_owner.med_hud_set_status() INVOKE_ASYNC(src, PROC_REF(RemoveInfectionImages), egg_owner) -/obj/item/organ/body_egg/on_death(seconds_per_tick, times_fired) +/obj/item/organ/body_egg/on_death(seconds_per_tick) . = ..() if(!owner) return - egg_process(seconds_per_tick, times_fired) + egg_process(seconds_per_tick) -/obj/item/organ/body_egg/on_life(seconds_per_tick, times_fired) +/obj/item/organ/body_egg/on_life(seconds_per_tick) . = ..() - egg_process(seconds_per_tick, times_fired) + egg_process(seconds_per_tick) -/obj/item/organ/body_egg/proc/egg_process(seconds_per_tick, times_fired) +/obj/item/organ/body_egg/proc/egg_process(seconds_per_tick) return /obj/item/organ/body_egg/proc/RefreshInfectionImage() diff --git a/code/game/objects/items/soulscythe.dm b/code/game/objects/items/soulscythe.dm index fad7413520d..4e00fea5143 100644 --- a/code/game/objects/items/soulscythe.dm +++ b/code/game/objects/items/soulscythe.dm @@ -265,7 +265,7 @@ add_traits(list(TRAIT_ASHSTORM_IMMUNE, TRAIT_SNOWSTORM_IMMUNE, TRAIT_LAVA_IMMUNE), INNATE_TRAIT) RegisterSignal(src, COMSIG_LIVING_LIFE, PROC_REF(on_life)) -/mob/living/basic/soulscythe/proc/on_life(datum/source, seconds_per_tick, times_fired) // done like this because there's no need to go through all of life since the item does the work anyways +/mob/living/basic/soulscythe/proc/on_life(datum/source, seconds_per_tick) // done like this because there's no need to go through all of life since the item does the work anyways if(stat == CONSCIOUS) adjust_blood_volume(round(1 * seconds_per_tick), maximum = MAX_BLOOD_LEVEL) return COMPONENT_LIVING_CANCEL_LIFE_PROCESSING diff --git a/code/game/objects/items/stacks/golem_food/golem_status_effects.dm b/code/game/objects/items/stacks/golem_food/golem_status_effects.dm index a00b149097a..f7f2ef8f414 100644 --- a/code/game/objects/items/stacks/golem_food/golem_status_effects.dm +++ b/code/game/objects/items/stacks/golem_food/golem_status_effects.dm @@ -311,7 +311,7 @@ set_arm_fluff(arm) return TRUE -/datum/status_effect/golem/diamond/tick(delta_time, times_fired) +/datum/status_effect/golem/diamond/tick(delta_time) owner.alpha = max(owner.alpha - alpha_per_tick, 0) /// Reset alpha to starting value diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm index 4b82067ddc5..c7f1cf4306a 100644 --- a/code/modules/antagonists/abductor/equipment/gland.dm +++ b/code/modules/antagonists/abductor/equipment/gland.dm @@ -99,7 +99,7 @@ hud.add_atom_to_hud(gland_owner) update_gland_hud() -/obj/item/organ/heart/gland/on_life(seconds_per_tick, times_fired) +/obj/item/organ/heart/gland/on_life(seconds_per_tick) if(!active) return if(!ownerCheck()) diff --git a/code/modules/antagonists/blob/blobstrains/cryogenic_poison.dm b/code/modules/antagonists/blob/blobstrains/cryogenic_poison.dm index 43b213a2dd9..11fd020a01f 100644 --- a/code/modules/antagonists/blob/blobstrains/cryogenic_poison.dm +++ b/code/modules/antagonists/blob/blobstrains/cryogenic_poison.dm @@ -25,7 +25,7 @@ exposed_mob.reagents.add_reagent(/datum/reagent/blob/cryogenic_poison, 0.3*reac_volume) exposed_mob.apply_damage(0.2*reac_volume, BRUTE, wound_bonus=CANT_WOUND) -/datum/reagent/blob/cryogenic_poison/on_mob_life(mob/living/carbon/exposed_mob, seconds_per_tick, times_fired) +/datum/reagent/blob/cryogenic_poison/on_mob_life(mob/living/carbon/exposed_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = exposed_mob.adjust_brute_loss(0.5 * REM * seconds_per_tick, updating_health = FALSE) diff --git a/code/modules/antagonists/blob/blobstrains/regenerative_materia.dm b/code/modules/antagonists/blob/blobstrains/regenerative_materia.dm index 3963a7535a6..b65d00f3f17 100644 --- a/code/modules/antagonists/blob/blobstrains/regenerative_materia.dm +++ b/code/modules/antagonists/blob/blobstrains/regenerative_materia.dm @@ -26,7 +26,7 @@ exposed_mob.reagents.add_reagent(/datum/reagent/toxin/spore, 0.2*reac_volume) exposed_mob.apply_damage(0.7*reac_volume, TOX) -/datum/reagent/blob/regenerative_materia/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick, times_fired) +/datum/reagent/blob/regenerative_materia/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick) . = ..() if(metabolizer.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE)) return UPDATE_MOB_HEALTH diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 7b410dc732b..4374213117b 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -264,7 +264,7 @@ * Signal proc for [COMSIG_LIVING_LIFE]. * Handles regenerating chemicals on life ticks. */ -/datum/antagonist/changeling/proc/on_life(datum/source, seconds_per_tick, times_fired) +/datum/antagonist/changeling/proc/on_life(datum/source, seconds_per_tick) SIGNAL_HANDLER var/delta_time = DELTA_WORLD_TIME(SSmobs) diff --git a/code/modules/antagonists/changeling/headslug_eggs.dm b/code/modules/antagonists/changeling/headslug_eggs.dm index 529a27ee575..6d526672283 100644 --- a/code/modules/antagonists/changeling/headslug_eggs.dm +++ b/code/modules/antagonists/changeling/headslug_eggs.dm @@ -19,7 +19,7 @@ . = ..() removal_time = world.time -/obj/item/organ/body_egg/changeling_egg/egg_process(seconds_per_tick, times_fired) +/obj/item/organ/body_egg/changeling_egg/egg_process(seconds_per_tick) if(owner && hatch_time <= world.time) pop() diff --git a/code/modules/antagonists/changeling/powers/_biodegrade_bioacid.dm b/code/modules/antagonists/changeling/powers/_biodegrade_bioacid.dm index 7278a16c89a..96bc366e0af 100644 --- a/code/modules/antagonists/changeling/powers/_biodegrade_bioacid.dm +++ b/code/modules/antagonists/changeling/powers/_biodegrade_bioacid.dm @@ -19,7 +19,7 @@ exposed_mob.adjust_fire_loss(round(reac_volume * min(1 - touch_protection), 0.1) * 3, required_bodytype = BODYTYPE_ORGANIC) // full bio protection = 100% damage reduction exposed_mob.acid_act(10, 50) -/datum/reagent/toxin/acid/bio_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/acid/bio_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(50, seconds_per_tick)) affected_mob.emote(pick("screech", "cry")) diff --git a/code/modules/antagonists/heretic/items/corrupted_organs.dm b/code/modules/antagonists/heretic/items/corrupted_organs.dm index 59cd6ccc067..7e61252096b 100644 --- a/code/modules/antagonists/heretic/items/corrupted_organs.dm +++ b/code/modules/antagonists/heretic/items/corrupted_organs.dm @@ -167,7 +167,7 @@ deltimer(thirst_timer) thirst_timer = addtimer(VARSET_CALLBACK(src, thirst_satiated, FALSE), 3 MINUTES, TIMER_STOPPABLE | TIMER_DELETE_ME) -/obj/item/organ/stomach/corrupt/handle_hunger(mob/living/carbon/human/human, seconds_per_tick, times_fired) +/obj/item/organ/stomach/corrupt/handle_hunger(mob/living/carbon/human/human, seconds_per_tick) if (thirst_satiated || human.has_reagent(/datum/reagent/water/holywater)) return ..() @@ -206,7 +206,7 @@ . = ..() AddElement(/datum/element/corrupted_organ) -/obj/item/organ/heart/corrupt/on_life(seconds_per_tick, times_fired) +/obj/item/organ/heart/corrupt/on_life(seconds_per_tick) . = ..() if (!COOLDOWN_FINISHED(src, hand_cooldown) || IS_IN_MANSUS(owner) || !owner.needs_heart() || !is_beating() || owner.has_reagent(/datum/reagent/water/holywater)) return @@ -280,7 +280,7 @@ AddElement(/datum/element/corrupted_organ) AddElement(/datum/element/noticable_organ, "%PRONOUN_Their abdomen is distended... and wiggling.", BODY_ZONE_PRECISE_GROIN) -/obj/item/organ/appendix/corrupt/on_life(seconds_per_tick, times_fired) +/obj/item/organ/appendix/corrupt/on_life(seconds_per_tick) . = ..() if (owner.stat != CONSCIOUS || owner.has_reagent(/datum/reagent/water/holywater) || IS_IN_MANSUS(owner) || !SPT_PROB(worm_chance, seconds_per_tick)) return diff --git a/code/modules/antagonists/heretic/items/heretic_grenade.dm b/code/modules/antagonists/heretic/items/heretic_grenade.dm index 47e0817d94f..0eacd31d849 100644 --- a/code/modules/antagonists/heretic/items/heretic_grenade.dm +++ b/code/modules/antagonists/heretic/items/heretic_grenade.dm @@ -113,7 +113,7 @@ . = ..() exposed_turf.rust_turf() -/datum/reagent/heretic_rust/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/heretic_rust/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!holder.has_reagent(/datum/reagent/consumable/milk)) if(SPT_PROB(5, seconds_per_tick)) diff --git a/code/modules/antagonists/heretic/knowledge/moon_lore.dm b/code/modules/antagonists/heretic/knowledge/moon_lore.dm index d69b0bdb31a..ad93f9b31f8 100644 --- a/code/modules/antagonists/heretic/knowledge/moon_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/moon_lore.dm @@ -263,7 +263,7 @@ INVOKE_ASYNC(convertee, TYPE_PROC_REF(/mob, emote), "laugh") return TRUE -/datum/heretic_knowledge/ultimate/moon_final/proc/on_life(mob/living/source, seconds_per_tick, times_fired) +/datum/heretic_knowledge/ultimate/moon_final/proc/on_life(mob/living/source, seconds_per_tick) SIGNAL_HANDLER visible_hallucination_pulse( center = get_turf(source), diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm index dfd35ef1073..b8331ce909f 100644 --- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm @@ -293,7 +293,7 @@ * * Gradually heals the heretic ([source]) on rust. */ -/datum/heretic_knowledge/ultimate/rust_final/proc/on_life(mob/living/source, seconds_per_tick, times_fired) +/datum/heretic_knowledge/ultimate/rust_final/proc/on_life(mob/living/source, seconds_per_tick) SIGNAL_HANDLER var/turf/our_turf = get_turf(source) diff --git a/code/modules/antagonists/heretic/knowledge/void_lore.dm b/code/modules/antagonists/heretic/knowledge/void_lore.dm index 68d518f1c06..7cd58b4460f 100644 --- a/code/modules/antagonists/heretic/knowledge/void_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/void_lore.dm @@ -240,7 +240,7 @@ * * Also starts storms in any area that doesn't have one. */ -/datum/heretic_knowledge/ultimate/void_final/proc/on_life(mob/living/source, seconds_per_tick, times_fired) +/datum/heretic_knowledge/ultimate/void_final/proc/on_life(mob/living/source, seconds_per_tick) SIGNAL_HANDLER for(var/atom/thing_in_range as anything in range(10, source)) diff --git a/code/modules/antagonists/heretic/status_effects/heretic_passive.dm b/code/modules/antagonists/heretic/status_effects/heretic_passive.dm index 8b647c2c5b5..dbbfc13da9a 100644 --- a/code/modules/antagonists/heretic/status_effects/heretic_passive.dm +++ b/code/modules/antagonists/heretic/status_effects/heretic_passive.dm @@ -512,7 +512,7 @@ * Gradually heals the heretic ([source]) on rust, * including baton knockdown and stamina damage. */ -/datum/status_effect/heretic_passive/rust/proc/on_life(mob/living/source, seconds_per_tick, times_fired) +/datum/status_effect/heretic_passive/rust/proc/on_life(mob/living/source, seconds_per_tick) SIGNAL_HANDLER var/turf/our_turf = get_turf(source) diff --git a/code/modules/antagonists/nightmare/nightmare_organs.dm b/code/modules/antagonists/nightmare/nightmare_organs.dm index 92139f73c22..f2e11789944 100644 --- a/code/modules/antagonists/nightmare/nightmare_organs.dm +++ b/code/modules/antagonists/nightmare/nightmare_organs.dm @@ -34,7 +34,7 @@ QDEL_NULL(our_jaunt) QDEL_NULL(terrorize_spell) -/obj/item/organ/brain/shadow/nightmare/on_life(seconds_per_tick, times_fired) +/obj/item/organ/brain/shadow/nightmare/on_life(seconds_per_tick) . = ..() var/turf/owner_turf = owner.loc @@ -125,7 +125,7 @@ /obj/item/organ/heart/nightmare/Stop() return FALSE -/obj/item/organ/heart/nightmare/on_death(seconds_per_tick, times_fired) +/obj/item/organ/heart/nightmare/on_death(seconds_per_tick) if(!owner) return var/turf/T = get_turf(owner) diff --git a/code/modules/antagonists/revenant/revenant_blight.dm b/code/modules/antagonists/revenant/revenant_blight.dm index ac4c66263a2..14c952a2e69 100644 --- a/code/modules/antagonists/revenant/revenant_blight.dm +++ b/code/modules/antagonists/revenant/revenant_blight.dm @@ -24,7 +24,7 @@ ..() -/datum/disease/revblight/stage_act(seconds_per_tick, times_fired) +/datum/disease/revblight/stage_act(seconds_per_tick) . = ..() if(!.) return diff --git a/code/modules/antagonists/voidwalker/voidwalker_traumas.dm b/code/modules/antagonists/voidwalker/voidwalker_traumas.dm index 77f4f42bed3..ece09568b0b 100644 --- a/code/modules/antagonists/voidwalker/voidwalker_traumas.dm +++ b/code/modules/antagonists/voidwalker/voidwalker_traumas.dm @@ -78,7 +78,7 @@ untexture_limb(owner, bodypart) owner.update_body() -/datum/brain_trauma/voided/on_life(seconds_per_tick, times_fired) +/datum/brain_trauma/voided/on_life(seconds_per_tick) . = ..() if(prob(vomit_frequency)) diff --git a/code/modules/mining/equipment/monster_organs/brimdust_sac.dm b/code/modules/mining/equipment/monster_organs/brimdust_sac.dm index bcdd0b640a2..27729c24031 100644 --- a/code/modules/mining/equipment/monster_organs/brimdust_sac.dm +++ b/code/modules/mining/equipment/monster_organs/brimdust_sac.dm @@ -35,7 +35,7 @@ qdel(src) // Every x seconds, if on lavaland, add one stack -/obj/item/organ/monster_core/brimdust_sac/on_life(seconds_per_tick, times_fired) +/obj/item/organ/monster_core/brimdust_sac/on_life(seconds_per_tick) . = ..() if(!COOLDOWN_FINISHED(src, brimdust_auto_apply_cooldown)) return diff --git a/code/modules/mining/equipment/monster_organs/regenerative_core.dm b/code/modules/mining/equipment/monster_organs/regenerative_core.dm index bcec0eb6c4e..3e25850eaf0 100644 --- a/code/modules/mining/equipment/monster_organs/regenerative_core.dm +++ b/code/modules/mining/equipment/monster_organs/regenerative_core.dm @@ -25,7 +25,7 @@ return SSblackbox.record_feedback("nested tally", "hivelord_core", 1, list("[type]", "inert")) -/obj/item/organ/monster_core/regenerative_core/on_life(seconds_per_tick, times_fired) +/obj/item/organ/monster_core/regenerative_core/on_life(seconds_per_tick) . = ..() if (owner.health <= owner.crit_threshold) trigger_organ_action(TRIGGER_FORCE_AVAILABLE) diff --git a/code/modules/mining/equipment/monster_organs/rush_gland.dm b/code/modules/mining/equipment/monster_organs/rush_gland.dm index c11df30bc35..2c4ef8d057a 100644 --- a/code/modules/mining/equipment/monster_organs/rush_gland.dm +++ b/code/modules/mining/equipment/monster_organs/rush_gland.dm @@ -16,7 +16,7 @@ user_status = /datum/status_effect/lobster_rush actions_types = list(/datum/action/cooldown/monster_core_action/adrenal_boost) -/obj/item/organ/monster_core/rush_gland/on_life(seconds_per_tick, times_fired) +/obj/item/organ/monster_core/rush_gland/on_life(seconds_per_tick) . = ..() if (owner.health <= HEALTH_DANGER_ZONE) trigger_organ_action() diff --git a/code/modules/mob/living/basic/basic.dm b/code/modules/mob/living/basic/basic.dm index 37552284881..06eba0ac141 100644 --- a/code/modules/mob/living/basic/basic.dm +++ b/code/modules/mob/living/basic/basic.dm @@ -163,7 +163,7 @@ return AddElement(/datum/element/attack_zone_randomiser) -/mob/living/basic/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/basic/Life(seconds_per_tick = SSMOBS_DT) . = ..() if(staminaloss > 0) adjust_stamina_loss(-stamina_recovery * seconds_per_tick, forced = TRUE) diff --git a/code/modules/mob/living/basic/blob_minions/blobbernaut.dm b/code/modules/mob/living/basic/blob_minions/blobbernaut.dm index 17ce832e456..bbc9c1be16f 100644 --- a/code/modules/mob/living/basic/blob_minions/blobbernaut.dm +++ b/code/modules/mob/living/basic/blob_minions/blobbernaut.dm @@ -117,7 +117,7 @@ /// Is our factory dead? var/orphaned = FALSE -/mob/living/basic/blob_minion/blobbernaut/minion/Life(seconds_per_tick, times_fired) +/mob/living/basic/blob_minion/blobbernaut/minion/Life(seconds_per_tick) . = ..() if (!.) return FALSE diff --git a/code/modules/mob/living/basic/cult/constructs/harvester.dm b/code/modules/mob/living/basic/cult/constructs/harvester.dm index 9ffb16fd9a0..91037848540 100644 --- a/code/modules/mob/living/basic/cult/constructs/harvester.dm +++ b/code/modules/mob/living/basic/cult/constructs/harvester.dm @@ -206,7 +206,7 @@ // These aren't friends they're assholes // Don't let them be near you! -/mob/living/basic/construct/harvester/heretic/Life(seconds_per_tick, times_fired) +/mob/living/basic/construct/harvester/heretic/Life(seconds_per_tick) . = ..() if(!.) //dead or deleted return diff --git a/code/modules/mob/living/basic/guardian/guardian_types/gaseous.dm b/code/modules/mob/living/basic/guardian/guardian_types/gaseous.dm index e9b5573ec47..fb9a3964b4b 100644 --- a/code/modules/mob/living/basic/guardian/guardian_types/gaseous.dm +++ b/code/modules/mob/living/basic/guardian/guardian_types/gaseous.dm @@ -48,7 +48,7 @@ source.set_fire_stacks(0, remove_wet_stacks = FALSE) /// Maintain our summoner at a stable body temperature -/mob/living/basic/guardian/gaseous/proc/on_summoner_life(mob/living/source, seconds_per_tick, times_fired) +/mob/living/basic/guardian/gaseous/proc/on_summoner_life(mob/living/source, seconds_per_tick) SIGNAL_HANDLER source.adjust_bodytemperature(get_temp_change_amount((summoner.get_body_temp_normal() - summoner.bodytemperature), temp_stabilization_rate * seconds_per_tick)) @@ -152,7 +152,7 @@ UnregisterSignal(owner, COMSIG_LIVING_LIFE) /// Release gas every life tick while active -/datum/action/cooldown/mob_cooldown/expel_gas/proc/on_life(datum/source, seconds_per_tick, times_fired) +/datum/action/cooldown/mob_cooldown/expel_gas/proc/on_life(datum/source, seconds_per_tick) SIGNAL_HANDLER if (isnull(active_gas)) return // We shouldn't even be registered at this point but just in case diff --git a/code/modules/mob/living/basic/heretic/ash_spirit.dm b/code/modules/mob/living/basic/heretic/ash_spirit.dm index 8d23584d32f..9e3eaa885d6 100644 --- a/code/modules/mob/living/basic/heretic/ash_spirit.dm +++ b/code/modules/mob/living/basic/heretic/ash_spirit.dm @@ -21,6 +21,6 @@ ) grant_actions_by_list(actions_to_add) -/mob/living/basic/heretic_summon/ash_spirit/Life(seconds_per_tick, times_fired) +/mob/living/basic/heretic_summon/ash_spirit/Life(seconds_per_tick) . = ..() adjust_brute_loss(-3) // 3 health passively healing diff --git a/code/modules/mob/living/basic/heretic/rust_walker.dm b/code/modules/mob/living/basic/heretic/rust_walker.dm index 64ba177a7b7..3b7544edf5f 100644 --- a/code/modules/mob/living/basic/heretic/rust_walker.dm +++ b/code/modules/mob/living/basic/heretic/rust_walker.dm @@ -39,7 +39,7 @@ icon_state = "[base_icon_state]_s" icon_living = icon_state -/mob/living/basic/heretic_summon/rust_walker/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/basic/heretic_summon/rust_walker/Life(seconds_per_tick = SSMOBS_DT) . = ..() if(!.) //dead or deleted return diff --git a/code/modules/mob/living/basic/jungle/leaper/leaper_abilities.dm b/code/modules/mob/living/basic/jungle/leaper/leaper_abilities.dm index 5a9c39ee760..5869ab16d84 100644 --- a/code/modules/mob/living/basic/jungle/leaper/leaper_abilities.dm +++ b/code/modules/mob/living/basic/jungle/leaper/leaper_abilities.dm @@ -62,7 +62,7 @@ taste_description = "french cuisine" taste_mult = 1.3 -/datum/reagent/toxin/leaper_venom/on_mob_life(mob/living/carbon/poisoned_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/leaper_venom/on_mob_life(mob/living/carbon/poisoned_mob, seconds_per_tick) . = ..() if(volume <= 5) return diff --git a/code/modules/mob/living/basic/jungle/venus_human_trap.dm b/code/modules/mob/living/basic/jungle/venus_human_trap.dm index 87d24472566..3d2538b3c5c 100644 --- a/code/modules/mob/living/basic/jungle/venus_human_trap.dm +++ b/code/modules/mob/living/basic/jungle/venus_human_trap.dm @@ -185,7 +185,7 @@ return tangle_ability.Trigger(target = victim) -/mob/living/basic/venus_human_trap/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/basic/venus_human_trap/Life(seconds_per_tick = SSMOBS_DT) . = ..() if(!.) return FALSE diff --git a/code/modules/mob/living/basic/lavaland/goliath/goliath.dm b/code/modules/mob/living/basic/lavaland/goliath/goliath.dm index 1c9ab1f52d2..5932f47df66 100644 --- a/code/modules/mob/living/basic/lavaland/goliath/goliath.dm +++ b/code/modules/mob/living/basic/lavaland/goliath/goliath.dm @@ -209,7 +209,7 @@ /// List of places we might spawn a tentacle, if we're alive var/list/tentacle_target_turfs -/mob/living/basic/mining/goliath/ancient/immortal/Life(seconds_per_tick, times_fired) +/mob/living/basic/mining/goliath/ancient/immortal/Life(seconds_per_tick) . = ..() if (!. || !isturf(loc)) return diff --git a/code/modules/mob/living/basic/lavaland/legion/legion_tumour.dm b/code/modules/mob/living/basic/lavaland/legion/legion_tumour.dm index c6b5f574532..0328f83c184 100644 --- a/code/modules/mob/living/basic/lavaland/legion/legion_tumour.dm +++ b/code/modules/mob/living/basic/lavaland/legion/legion_tumour.dm @@ -86,7 +86,7 @@ skull.melee_attack(target) return TRUE -/obj/item/organ/legion_tumour/on_life(seconds_per_tick, times_fired) +/obj/item/organ/legion_tumour/on_life(seconds_per_tick) . = ..() if (QDELETED(src) || QDELETED(owner)) return diff --git a/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm b/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm index f43ffb924c2..2915cae1370 100644 --- a/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm +++ b/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm @@ -176,7 +176,7 @@ GLOBAL_LIST_EMPTY(raptor_population) if (0.8 to 0.999) . += span_notice("[p_They()] [p_have()] a few minor bruises and scratches.") -/mob/living/basic/raptor/Life(seconds_per_tick, times_fired) +/mob/living/basic/raptor/Life(seconds_per_tick) . = ..() if (growth_stage != RAPTOR_BABY || HAS_TRAIT(src, TRAIT_STASIS) || stat == DEAD) return diff --git a/code/modules/mob/living/basic/pets/dog/dog_subtypes.dm b/code/modules/mob/living/basic/pets/dog/dog_subtypes.dm index f2444539111..3e2dc5e5649 100644 --- a/code/modules/mob/living/basic/pets/dog/dog_subtypes.dm +++ b/code/modules/mob/living/basic/pets/dog/dog_subtypes.dm @@ -117,7 +117,7 @@ name = new_name real_name = new_name -/mob/living/basic/pet/dog/breaddog/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/basic/pet/dog/breaddog/Life(seconds_per_tick = SSMOBS_DT) . = ..() if(!.) //dead or deleted return diff --git a/code/modules/mob/living/basic/ruin_defender/flesh.dm b/code/modules/mob/living/basic/ruin_defender/flesh.dm index d88c896f34e..5d607c2c1a4 100644 --- a/code/modules/mob/living/basic/ruin_defender/flesh.dm +++ b/code/modules/mob/living/basic/ruin_defender/flesh.dm @@ -59,7 +59,7 @@ if(!QDELETED(bodypart)) qdel(bodypart) -/mob/living/basic/living_limb_flesh/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/basic/living_limb_flesh/Life(seconds_per_tick = SSMOBS_DT) . = ..() if(stat == DEAD) return diff --git a/code/modules/mob/living/basic/ruin_defender/mimic/mimic.dm b/code/modules/mob/living/basic/ruin_defender/mimic/mimic.dm index 0f833dfc577..854c74d30ec 100644 --- a/code/modules/mob/living/basic/ruin_defender/mimic/mimic.dm +++ b/code/modules/mob/living/basic/ruin_defender/mimic/mimic.dm @@ -283,7 +283,7 @@ GLOBAL_LIST_INIT(animatable_blacklist, typecacheof(list( copied_ref = null return ..() -/mob/living/basic/mimic/copy/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/basic/mimic/copy/Life(seconds_per_tick = SSMOBS_DT) . = ..() if(!.) //dead or deleted return diff --git a/code/modules/mob/living/basic/slime/life.dm b/code/modules/mob/living/basic/slime/life.dm index 86d5eb02c05..8d2b0a074df 100644 --- a/code/modules/mob/living/basic/slime/life.dm +++ b/code/modules/mob/living/basic/slime/life.dm @@ -1,5 +1,5 @@ -/mob/living/basic/slime/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/basic/slime/Life(seconds_per_tick = SSMOBS_DT) . = ..() if(!.) //dead or deleted return @@ -9,7 +9,7 @@ handle_slime_stasis() -/mob/living/basic/slime/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired) +/mob/living/basic/slime/handle_environment(datum/gas_mixture/environment, seconds_per_tick) ..() if(bodytemperature <= (T0C - 40)) // stun temperature apply_status_effect(/datum/status_effect/freon, SLIME_COLD) diff --git a/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm b/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm index c2103f2397a..ecf981299fc 100644 --- a/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm +++ b/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm @@ -60,7 +60,7 @@ return make_migo_sound() -/mob/living/basic/migo/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/basic/migo/Life(seconds_per_tick = SSMOBS_DT) . = ..() if(!.) //dead or deleted return diff --git a/code/modules/mob/living/basic/space_fauna/revenant/_revenant.dm b/code/modules/mob/living/basic/space_fauna/revenant/_revenant.dm index 71eebf9d42c..93e78563112 100644 --- a/code/modules/mob/living/basic/space_fauna/revenant/_revenant.dm +++ b/code/modules/mob/living/basic/space_fauna/revenant/_revenant.dm @@ -131,7 +131,7 @@ return TRUE /// Signal Handler Injection to handle Life() stuff for revenants -/mob/living/basic/revenant/proc/on_life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/basic/revenant/proc/on_life(seconds_per_tick = SSMOBS_DT) SIGNAL_HANDLER if(dormant) diff --git a/code/modules/mob/living/basic/space_fauna/space_dragon/dragon_gust.dm b/code/modules/mob/living/basic/space_fauna/space_dragon/dragon_gust.dm index 074804de86c..4aa7dc271bb 100644 --- a/code/modules/mob/living/basic/space_fauna/space_dragon/dragon_gust.dm +++ b/code/modules/mob/living/basic/space_fauna/space_dragon/dragon_gust.dm @@ -46,7 +46,7 @@ removed_from.remove_traits(applied_traits + TRAIT_WING_BUFFET_TIRED, REF(src)) /// Decay our accumulated additional tiredness -/datum/action/cooldown/mob_cooldown/wing_buffet/proc/on_life(mob/living/liver, seconds_per_tick, times_fired) +/datum/action/cooldown/mob_cooldown/wing_buffet/proc/on_life(mob/living/liver, seconds_per_tick) SIGNAL_HANDLER if (liver.stat == DEAD) return // not so life now buddy diff --git a/code/modules/mob/living/basic/tree.dm b/code/modules/mob/living/basic/tree.dm index 0ea6b25b3ab..bae229fddd8 100644 --- a/code/modules/mob/living/basic/tree.dm +++ b/code/modules/mob/living/basic/tree.dm @@ -59,7 +59,7 @@ AddElement(/datum/element/death_drops, /obj/item/stack/sheet/mineral/wood) AddComponent(/datum/component/aggro_emote, emote_list = string_list(list("growls")), emote_chance = 20) -/mob/living/basic/tree/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/basic/tree/Life(seconds_per_tick = SSMOBS_DT) . = ..() if(!.) //dead or deleted return diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index 1464177a491..a9193caf978 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -123,13 +123,13 @@ return !!bloodiest_wound // Takes care blood loss and regeneration -/mob/living/carbon/human/handle_blood(seconds_per_tick, times_fired) +/mob/living/carbon/human/handle_blood(seconds_per_tick) // Under these circumstances blood handling is not necessary if(bodytemperature < BLOOD_STOP_TEMP || HAS_TRAIT(src, TRAIT_FAKEDEATH)) return // Run the signal, still allowing mobs with noblood to "handle blood" in their own way - var/sigreturn = SEND_SIGNAL(src, COMSIG_HUMAN_ON_HANDLE_BLOOD, seconds_per_tick, times_fired) + var/sigreturn = SEND_SIGNAL(src, COMSIG_HUMAN_ON_HANDLE_BLOOD, seconds_per_tick) if((sigreturn & HANDLE_BLOOD_HANDLED) || !CAN_HAVE_BLOOD(src)) return diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index fd9a606e04b..45e3364fd35 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -337,7 +337,7 @@ owner?.mind?.set_current(null) //You aren't allowed to return to brains that don't exist return ..() -/obj/item/organ/brain/on_life(seconds_per_tick, times_fired) +/obj/item/organ/brain/on_life(seconds_per_tick) if(HAS_TRAIT(src, TRAIT_BRAIN_DAMAGE_NODEATH)) return if(damage >= BRAIN_DAMAGE_DEATH) //rip diff --git a/code/modules/mob/living/brain/life.dm b/code/modules/mob/living/brain/life.dm index 5b016db7fba..4da4ea706d2 100644 --- a/code/modules/mob/living/brain/life.dm +++ b/code/modules/mob/living/brain/life.dm @@ -1,5 +1,5 @@ -/mob/living/brain/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/brain/Life(seconds_per_tick = SSMOBS_DT) if(isnull(loc) || HAS_TRAIT(src, TRAIT_NO_TRANSFORM)) return @@ -11,7 +11,7 @@ stack_trace("/mob/living/brain with container set, but we weren't inside of it!") container = null . = ..() - handle_emp_damage(seconds_per_tick, times_fired) + handle_emp_damage(seconds_per_tick) /mob/living/brain/update_stat() if(HAS_TRAIT(src, TRAIT_GODMODE)) @@ -28,7 +28,7 @@ if(BR) BR.set_organ_damage(BRAIN_DAMAGE_DEATH) //beaten to a pulp -/mob/living/brain/proc/handle_emp_damage(seconds_per_tick, times_fired) +/mob/living/brain/proc/handle_emp_damage(seconds_per_tick) if(!emp_damage) return diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index d0c1ce82e09..dd1c97daee1 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -70,7 +70,7 @@ /mob/living/carbon/alien/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null) // beepsky won't hunt aliums return -10 -/mob/living/carbon/alien/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired) +/mob/living/carbon/alien/handle_environment(datum/gas_mixture/environment, seconds_per_tick) // Run base mob body temperature proc before taking damage // this balances body temp to the environment and natural stabilization . = ..() diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index a8de80b7058..930dd2956e5 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -1,6 +1,6 @@ -/mob/living/carbon/alien/larva/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/carbon/alien/larva/Life(seconds_per_tick = SSMOBS_DT) if(HAS_TRAIT(src, TRAIT_NO_TRANSFORM)) return if(!..() || HAS_TRAIT(src, TRAIT_STASIS) || (amount_grown >= max_grown)) diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm index 69b8dd316ac..e7b45585511 100644 --- a/code/modules/mob/living/carbon/alien/life.dm +++ b/code/modules/mob/living/carbon/alien/life.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/alien/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/carbon/alien/Life(seconds_per_tick = SSMOBS_DT) . = ..() if(!.) //dead or deleted return @@ -43,8 +43,8 @@ //BREATH TEMPERATURE handle_breath_temperature(breath) -/mob/living/carbon/alien/adult/Life(seconds_per_tick, times_fired) +/mob/living/carbon/alien/adult/Life(seconds_per_tick) . = ..() if(QDELETED(src)) return - handle_organs(seconds_per_tick, times_fired) + handle_organs(seconds_per_tick) diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index 1666209e573..193c6177258 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -49,7 +49,7 @@ max_plasma = 100 actions_types = list(/datum/action/cooldown/alien/transfer) -/obj/item/organ/alien/plasmavessel/on_life(seconds_per_tick, times_fired) +/obj/item/organ/alien/plasmavessel/on_life(seconds_per_tick) var/delta_time = DELTA_WORLD_TIME(SSmobs) //Instantly healing to max health in a single tick would be silly. If it takes 8 seconds to fire, then something's fucked. var/delta_time_capped = min(delta_time, 8) diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm index 189e83593ad..101f10b3120 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -25,7 +25,7 @@ if(prob(10)) attempt_grow(gib_on_success = FALSE) -/obj/item/organ/body_egg/alien_embryo/on_life(seconds_per_tick, times_fired) +/obj/item/organ/body_egg/alien_embryo/on_life(seconds_per_tick) . = ..() if(QDELETED(src) || QDELETED(owner)) return diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index 8bd0f360bde..b8172b2f35a 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -538,7 +538,7 @@ GLOBAL_LIST_EMPTY(features_by_species) return new_features -/datum/species/proc/spec_life(mob/living/carbon/human/H, seconds_per_tick, times_fired) +/datum/species/proc/spec_life(mob/living/carbon/human/H, seconds_per_tick) SHOULD_CALL_PARENT(TRUE) if(HAS_TRAIT(H, TRAIT_NOBREATH) && (H.health < H.crit_threshold) && !HAS_TRAIT(H, TRAIT_NOCRITDAMAGE)) H.adjust_brute_loss(0.5 * seconds_per_tick) @@ -1037,9 +1037,9 @@ GLOBAL_LIST_EMPTY(features_by_species) * * environment (required) The environment gas mix * * humi (required)(type: /mob/living/carbon/human) The mob we will target */ -/datum/species/proc/handle_environment(mob/living/carbon/human/humi, datum/gas_mixture/environment, seconds_per_tick, times_fired) - handle_environment_pressure(humi, environment, seconds_per_tick, times_fired) - handle_gas_interaction(humi, environment, seconds_per_tick, times_fired) +/datum/species/proc/handle_environment(mob/living/carbon/human/humi, datum/gas_mixture/environment, seconds_per_tick) + handle_environment_pressure(humi, environment, seconds_per_tick) + handle_gas_interaction(humi, environment, seconds_per_tick) /** * Body temperature handler for species @@ -1049,22 +1049,22 @@ GLOBAL_LIST_EMPTY(features_by_species) * vars: * * humi (required)(type: /mob/living/carbon/human) The mob we will target */ -/datum/species/proc/handle_body_temperature(mob/living/carbon/human/humi, seconds_per_tick, times_fired) +/datum/species/proc/handle_body_temperature(mob/living/carbon/human/humi, seconds_per_tick) // When in a cryo unit we suspend all natural body regulation if(istype(humi.loc, /obj/machinery/cryo_cell)) return // Only stabilise core temp when alive and not in statis if(humi.stat < DEAD && !HAS_TRAIT(humi, TRAIT_STASIS)) - body_temperature_core(humi, seconds_per_tick, times_fired) + body_temperature_core(humi, seconds_per_tick) // These do run in statis - body_temperature_skin(humi, seconds_per_tick, times_fired) - body_temperature_alerts(humi, seconds_per_tick, times_fired) + body_temperature_skin(humi, seconds_per_tick) + body_temperature_alerts(humi, seconds_per_tick) // Do not cause more damage in statis if(!HAS_TRAIT(humi, TRAIT_STASIS)) - body_temperature_damage(humi, seconds_per_tick, times_fired) + body_temperature_damage(humi, seconds_per_tick) /** * Used to stabilize the core temperature back to normal on living mobs @@ -1073,7 +1073,7 @@ GLOBAL_LIST_EMPTY(features_by_species) * vars: * * humi (required) The mob we will stabilize */ -/datum/species/proc/body_temperature_core(mob/living/carbon/human/humi, seconds_per_tick, times_fired) +/datum/species/proc/body_temperature_core(mob/living/carbon/human/humi, seconds_per_tick) var/natural_change = get_temp_change_amount(humi.get_body_temp_normal() - humi.coretemperature, 0.06 * seconds_per_tick) humi.adjust_coretemperature(humi.metabolism_efficiency * natural_change) @@ -1087,7 +1087,7 @@ GLOBAL_LIST_EMPTY(features_by_species) * - seconds_per_tick: The amount of time that is considered as elapsing * - times_fired: The number of times SSmobs has fired */ -/datum/species/proc/body_temperature_skin(mob/living/carbon/human/humi, seconds_per_tick, times_fired) +/datum/species/proc/body_temperature_skin(mob/living/carbon/human/humi, seconds_per_tick) // change the core based on the skin temp var/skin_core_diff = humi.bodytemperature - humi.coretemperature @@ -1199,7 +1199,7 @@ GLOBAL_LIST_EMPTY(features_by_species) * vars: * * humi (required) The mob we will targeting */ -/datum/species/proc/body_temperature_damage(mob/living/carbon/human/humi, seconds_per_tick, times_fired) +/datum/species/proc/body_temperature_damage(mob/living/carbon/human/humi, seconds_per_tick) //If the body temp is above the wound limit start adding exposure stacks if(humi.bodytemperature > BODYTEMP_HEAT_WOUND_LIMIT) @@ -1209,7 +1209,7 @@ GLOBAL_LIST_EMPTY(features_by_species) //when exposure stacks are greater then 10 + rand20 try to apply wounds and reset stacks if(humi.heat_exposure_stacks > (10 + rand(0, 20))) - apply_burn_wounds(humi, seconds_per_tick, times_fired) + apply_burn_wounds(humi, seconds_per_tick) humi.heat_exposure_stacks = 0 // Body temperature is too hot, and we do not have resist traits @@ -1260,7 +1260,7 @@ GLOBAL_LIST_EMPTY(features_by_species) * vars: * * humi (required) The mob we will targeting */ -/datum/species/proc/apply_burn_wounds(mob/living/carbon/human/humi, seconds_per_tick, times_fired) +/datum/species/proc/apply_burn_wounds(mob/living/carbon/human/humi, seconds_per_tick) // If we are resistant to heat exit if(HAS_TRAIT(humi, TRAIT_RESISTHEAT)) return @@ -1302,7 +1302,7 @@ GLOBAL_LIST_EMPTY(features_by_species) humi.apply_damage(burn_damage * seconds_per_tick, BURN, bodypart, wound_clothing = FALSE) /// Handle the air pressure of the environment -/datum/species/proc/handle_environment_pressure(mob/living/carbon/human/H, datum/gas_mixture/environment, seconds_per_tick, times_fired) +/datum/species/proc/handle_environment_pressure(mob/living/carbon/human/H, datum/gas_mixture/environment, seconds_per_tick) var/pressure = environment.return_pressure() var/adjusted_pressure = H.calculate_affecting_pressure(pressure) @@ -1346,7 +1346,7 @@ GLOBAL_LIST_EMPTY(features_by_species) /** * Handles exposure to the skin of various gases. */ -/datum/species/proc/handle_gas_interaction(mob/living/carbon/human/human, datum/gas_mixture/environment, seconds_per_tick, times_fired) +/datum/species/proc/handle_gas_interaction(mob/living/carbon/human/human, datum/gas_mixture/environment, seconds_per_tick) /// Some non-clothing items may end up in these slots, e.g. flowers worn on the head, so we should consider clothing_flags as potentially nonexistant as a var. /// Otherwise we will get a very spammy runtime. var/suit_flags = astype(human?.wear_suit, /obj/item/clothing)?.clothing_flags diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm index 1d4301c688f..1cb072c7080 100644 --- a/code/modules/mob/living/carbon/human/dummy.dm +++ b/code/modules/mob/living/carbon/human/dummy.dm @@ -16,7 +16,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) in_use = FALSE return ..() -/mob/living/carbon/human/dummy/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/carbon/human/dummy/Life(seconds_per_tick = SSMOBS_DT) return /mob/living/carbon/human/dummy/attach_rot(mapload) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index d659670c369..4714ba39cb1 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -18,7 +18,7 @@ #define THERMAL_PROTECTION_HAND_LEFT 0.025 #define THERMAL_PROTECTION_HAND_RIGHT 0.025 -/mob/living/carbon/human/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/carbon/human/Life(seconds_per_tick = SSMOBS_DT) if(HAS_TRAIT(src, TRAIT_NO_TRANSFORM)) return @@ -28,10 +28,10 @@ return FALSE // Body temperature stability and damage - dna.species.handle_body_temperature(src, seconds_per_tick, times_fired) + dna.species.handle_body_temperature(src, seconds_per_tick) if(HAS_TRAIT(src, TRAIT_STASIS)) for(var/datum/wound/iter_wound as anything in all_wounds) - iter_wound.on_stasis(seconds_per_tick, times_fired) + iter_wound.on_stasis(seconds_per_tick) return stat != DEAD if(stat == DEAD) @@ -39,14 +39,14 @@ // Handle active mutations for(var/datum/mutation/mutation as anything in dna.mutations) - mutation.on_life(seconds_per_tick, times_fired) + mutation.on_life(seconds_per_tick) // Heart attack stuff - handle_heart(seconds_per_tick, times_fired) + handle_heart(seconds_per_tick) // Handles liver failure effects, if we lack a liver - handle_liver(seconds_per_tick, times_fired) + handle_liver(seconds_per_tick) // For special species interactions - dna.species.spec_life(src, seconds_per_tick, times_fired) + dna.species.spec_life(src, seconds_per_tick) return stat != DEAD /mob/living/carbon/human/calculate_affecting_pressure(pressure) @@ -102,12 +102,12 @@ return FALSE /// Environment handlers for species -/mob/living/carbon/human/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired) +/mob/living/carbon/human/handle_environment(datum/gas_mixture/environment, seconds_per_tick) // If we are in a cryo bed do not process life functions if(istype(loc, /obj/machinery/cryo_cell)) return - dna.species.handle_environment(src, environment, seconds_per_tick, times_fired) + dna.species.handle_environment(src, environment, seconds_per_tick) /** * Adjust the core temperature of a mob @@ -287,7 +287,7 @@ return TRUE return ..() -/mob/living/carbon/human/proc/handle_heart(seconds_per_tick, times_fired) +/mob/living/carbon/human/proc/handle_heart(seconds_per_tick) var/we_breath = !HAS_TRAIT_FROM(src, TRAIT_NOBREATH, SPECIES_TRAIT) if(!undergoing_cardiac_arrest()) diff --git a/code/modules/mob/living/carbon/human/monkey.dm b/code/modules/mob/living/carbon/human/monkey.dm index 7a9ddc5ece2..c071f3def97 100644 --- a/code/modules/mob/living/carbon/human/monkey.dm +++ b/code/modules/mob/living/carbon/human/monkey.dm @@ -80,7 +80,7 @@ GLOBAL_DATUM(the_one_and_only_punpun, /mob/living/carbon/human/species/monkey/pu return ..() -/mob/living/carbon/human/species/monkey/punpun/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/carbon/human/species/monkey/punpun/Life(seconds_per_tick = SSMOBS_DT) if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved) Write_Memory(FALSE, FALSE) memory_saved = TRUE diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 014dd1a69cd..493540162b5 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -87,7 +87,7 @@ human_who_lost_species.physiology.stun_mod /= 0.6 human_who_lost_species.physiology.knockdown_mod /= 1.2 -/datum/species/golem/spec_life(mob/living/carbon/human/source, seconds_per_tick, times_fired) +/datum/species/golem/spec_life(mob/living/carbon/human/source, seconds_per_tick) . = ..() if(source.nutrition <= 20) // this is "hard crit" for golems diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 32667735f8e..f8526e7fccb 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -57,7 +57,7 @@ UnregisterSignal(former_jellyperson, COMSIG_HUMAN_ON_HANDLE_BLOOD) return ..() -/datum/species/jelly/proc/slime_blood(mob/living/carbon/human/slime, seconds_per_tick, times_fired) +/datum/species/jelly/proc/slime_blood(mob/living/carbon/human/slime, seconds_per_tick) SIGNAL_HANDLER if(slime.stat == DEAD) @@ -255,7 +255,7 @@ /datum/species/jelly/slime/copy_properties_from(datum/species/jelly/slime/old_species) bodies = old_species.bodies -/datum/species/jelly/slime/spec_life(mob/living/carbon/human/H, seconds_per_tick, times_fired) +/datum/species/jelly/slime/spec_life(mob/living/carbon/human/H, seconds_per_tick) . = ..() if(H.get_blood_volume() >= BLOOD_VOLUME_SLIME_SPLIT) if(SPT_PROB(2.5, seconds_per_tick)) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 9fb6c37dd22..55cd2e61dcb 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -47,7 +47,7 @@ ) /// Lizards are cold blooded and do not stabilize body temperature naturally -/datum/species/lizard/body_temperature_core(mob/living/carbon/human/humi, seconds_per_tick, times_fired) +/datum/species/lizard/body_temperature_core(mob/living/carbon/human/humi, seconds_per_tick) return /datum/species/lizard/randomize_features() diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index ec80fe52dee..0539776acbe 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -47,7 +47,7 @@ old_vampire.hud_used.infodisplay -= blood_display QDEL_NULL(blood_display) -/datum/species/human/vampire/spec_life(mob/living/carbon/human/vampire, seconds_per_tick, times_fired) +/datum/species/human/vampire/spec_life(mob/living/carbon/human/vampire, seconds_per_tick) . = ..() if(istype(vampire.loc, /obj/structure/closet/crate/coffin)) var/need_mob_update = FALSE diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index fffeaf59674..55cec54346a 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -57,7 +57,7 @@ ) /// Zombies do not stabilize body temperature they are the walking dead and are cold blooded -/datum/species/zombie/body_temperature_core(mob/living/carbon/human/humi, seconds_per_tick, times_fired) +/datum/species/zombie/body_temperature_core(mob/living/carbon/human/humi, seconds_per_tick) return /datum/species/zombie/check_roundstart_eligible() @@ -174,7 +174,7 @@ /datum/species/zombie/infectious/spec_stun(mob/living/carbon/human/H,amount) return min(2 SECONDS, amount) -/datum/species/zombie/infectious/spec_life(mob/living/carbon/carbon_mob, seconds_per_tick, times_fired) +/datum/species/zombie/infectious/spec_life(mob/living/carbon/carbon_mob, seconds_per_tick) . = ..() if(!HAS_TRAIT(carbon_mob, TRAIT_CRITICAL_CONDITION) && SPT_PROB(2, seconds_per_tick)) playsound(carbon_mob, pick(spooks), 50, TRUE, 10) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 7062e1e81f2..35e96354d99 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/carbon/Life(seconds_per_tick = SSMOBS_DT) if(HAS_TRAIT(src, TRAIT_NO_TRANSFORM)) return @@ -9,33 +9,33 @@ for(var/datum/wound/wound as anything in all_wounds) if(!wound.processes) // meh continue - wound.handle_process(seconds_per_tick, times_fired) + wound.handle_process(seconds_per_tick) if(HAS_TRAIT(src, TRAIT_STASIS)) . = ..() - reagents?.handle_stasis_chems(src, seconds_per_tick, times_fired) + reagents?.handle_stasis_chems(src, seconds_per_tick) else //Reagent processing needs to come before breathing, to prevent edge cases. - handle_dead_metabolization(seconds_per_tick, times_fired) //Dead metabolization first since it can modify life metabolization. - handle_organs(seconds_per_tick, times_fired) + handle_dead_metabolization(seconds_per_tick) //Dead metabolization first since it can modify life metabolization. + handle_organs(seconds_per_tick) . = ..() if(QDELETED(src)) return if(.) //not dead - handle_blood(seconds_per_tick, times_fired) + handle_blood(seconds_per_tick) if(stat != DEAD) - handle_brain_damage(seconds_per_tick, times_fired) + handle_brain_damage(seconds_per_tick) if(stat != DEAD) - handle_bodyparts(seconds_per_tick, times_fired) + handle_bodyparts(seconds_per_tick) if(. && mind) //. == not dead for(var/key in mind.addiction_points) var/datum/addiction/addiction = SSaddiction.all_addictions[key] - addiction.process_addiction(src, seconds_per_tick, times_fired) + addiction.process_addiction(src, seconds_per_tick) if(stat != DEAD) return TRUE @@ -44,7 +44,7 @@ /////////////// // Start of a breath chain, calls [carbon/proc/breathe()] -/mob/living/carbon/handle_breathing(seconds_per_tick, times_fired) +/mob/living/carbon/handle_breathing(seconds_per_tick) var/next_breath = 4 var/obj/item/organ/lungs/L = get_organ_slot(ORGAN_SLOT_LUNGS) var/obj/item/organ/heart/H = get_organ_slot(ORGAN_SLOT_HEART) @@ -55,8 +55,8 @@ if(H.damage > H.high_threshold) next_breath-- - if((times_fired % next_breath) == 0 || failed_last_breath) - breathe(seconds_per_tick, times_fired) //Breathe per 4 ticks if healthy, down to 2 if our lungs or heart are damaged, unless suffocating + if((SSmobs.times_fired % next_breath) == 0 || failed_last_breath) + breathe(seconds_per_tick) //Breathe per 4 ticks if healthy, down to 2 if our lungs or heart are damaged, unless suffocating if(failed_last_breath) add_mood_event("suffocation", /datum/mood_event/suffocation) else @@ -67,14 +67,14 @@ location_as_object.handle_internal_lifeform(src,0) // Second link in a breath chain, calls [carbon/proc/check_breath()] -/mob/living/carbon/proc/breathe(seconds_per_tick, times_fired) +/mob/living/carbon/proc/breathe(seconds_per_tick) var/obj/item/organ/lungs = get_organ_slot(ORGAN_SLOT_LUNGS) var/is_on_internals = FALSE - if(SEND_SIGNAL(src, COMSIG_CARBON_ATTEMPT_BREATHE, seconds_per_tick, times_fired) & COMSIG_CARBON_BLOCK_BREATH) + if(SEND_SIGNAL(src, COMSIG_CARBON_ATTEMPT_BREATHE, seconds_per_tick) & COMSIG_CARBON_BLOCK_BREATH) return - SEND_SIGNAL(src, COMSIG_CARBON_PRE_BREATHE, seconds_per_tick, times_fired) + SEND_SIGNAL(src, COMSIG_CARBON_PRE_BREATHE, seconds_per_tick) var/datum/gas_mixture/environment if(loc) @@ -455,10 +455,10 @@ // To differentiate between no internals and active, but empty internals. return . || FALSE -/mob/living/carbon/proc/handle_blood(seconds_per_tick, times_fired) +/mob/living/carbon/proc/handle_blood(seconds_per_tick) return -/mob/living/carbon/reagent_tick(datum/reagent/chem, seconds_per_tick, times_fired) +/mob/living/carbon/reagent_tick(datum/reagent/chem, seconds_per_tick) . = ..() if(. & COMSIG_MOB_STOP_REAGENT_TICK) return @@ -497,18 +497,18 @@ return COMPONENT_NO_EXPOSE_REAGENTS -/mob/living/carbon/proc/handle_bodyparts(seconds_per_tick, times_fired) +/mob/living/carbon/proc/handle_bodyparts(seconds_per_tick) for(var/obj/item/bodypart/limb as anything in bodyparts) - . |= limb.on_life(seconds_per_tick, times_fired) + . |= limb.on_life(seconds_per_tick) -/mob/living/carbon/proc/handle_organs(seconds_per_tick, times_fired) +/mob/living/carbon/proc/handle_organs(seconds_per_tick) if(stat == DEAD) if(reagents && (reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 1) || reagents.has_reagent(/datum/reagent/cryostylane))) // No organ decay if the body contains formaldehyde. return for(var/obj/item/organ/organ in organs) // On-death is where organ decay is handled if(organ?.owner) // organ + owner can be null due to reagent metabolization causing organ shuffling - organ.on_death(seconds_per_tick, times_fired) + organ.on_death(seconds_per_tick) // We need to re-check the stat every organ, as one of our others may have revived us if(stat != DEAD) break @@ -520,16 +520,16 @@ // This code is hot enough that it's just not worth the time var/obj/item/organ/organ = organs_slot[slot] if(organ?.owner) // This exist mostly because reagent metabolization can cause organ reshuffling - organ.on_life(seconds_per_tick, times_fired) + organ.on_life(seconds_per_tick) -/mob/living/carbon/handle_diseases(seconds_per_tick, times_fired) +/mob/living/carbon/handle_diseases(seconds_per_tick) for(var/datum/disease/disease as anything in diseases) if(QDELETED(disease)) //Got cured/deleted while the loop was still going. continue if(stat != DEAD || disease.process_dead) - disease.stage_act(seconds_per_tick, times_fired) + disease.stage_act(seconds_per_tick) -/mob/living/carbon/handle_mutations(time_since_irradiated, seconds_per_tick, times_fired) +/mob/living/carbon/handle_mutations(time_since_irradiated, seconds_per_tick) if(!dna?.temporary_mutations.len) return @@ -571,17 +571,17 @@ * - seconds_per_tick: The amount of time that has elapsed since the last tick. * - times_fired: The number of times SSmobs has ticked. */ -/mob/living/carbon/proc/handle_dead_metabolization(seconds_per_tick, times_fired) +/mob/living/carbon/proc/handle_dead_metabolization(seconds_per_tick) if(stat != DEAD) return - reagents?.metabolize(src, seconds_per_tick, times_fired, can_overdose = TRUE, liverless = TRUE, dead = TRUE) // Your liver doesn't work while you're dead. + reagents?.metabolize(src, seconds_per_tick, can_overdose = TRUE, liverless = TRUE, dead = TRUE) // Your liver doesn't work while you're dead. /// Base carbon environment handler, adds natural stabilization -/mob/living/carbon/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired) +/mob/living/carbon/handle_environment(datum/gas_mixture/environment, seconds_per_tick) var/areatemp = get_temperature(environment) if(stat != DEAD) // If you are dead your body does not stabilize naturally - natural_bodytemperature_stabilization(environment, seconds_per_tick, times_fired) + natural_bodytemperature_stabilization(environment, seconds_per_tick) else if(!on_fire && areatemp < bodytemperature) // lowers your dead body temperature to room temperature over time adjust_bodytemperature((areatemp - bodytemperature), use_insulation=FALSE, use_steps=TRUE) @@ -597,7 +597,7 @@ * - seconds_per_tick: The amount of time that has elapsed since the last tick * - times_fired: The number of times SSmobs has ticked */ -/mob/living/carbon/proc/natural_bodytemperature_stabilization(datum/gas_mixture/environment, seconds_per_tick, times_fired) +/mob/living/carbon/proc/natural_bodytemperature_stabilization(datum/gas_mixture/environment, seconds_per_tick) var/areatemp = get_temperature(environment) var/body_temperature_difference = get_body_temp_normal() - bodytemperature var/natural_change = 0 @@ -756,7 +756,7 @@ ///Check to see if we have the liver, if not automatically gives you last-stage effects of lacking a liver. -/mob/living/carbon/proc/handle_liver(seconds_per_tick, times_fired) +/mob/living/carbon/proc/handle_liver(seconds_per_tick) if(isnull(has_dna())) return @@ -765,7 +765,7 @@ return reagents.end_metabolization(src, keep_liverless = TRUE) //Stops trait-based effects on reagents, to prevent permanent buffs - reagents.metabolize(src, seconds_per_tick, times_fired, can_overdose = TRUE, liverless = TRUE) + reagents.metabolize(src, seconds_per_tick, can_overdose = TRUE, liverless = TRUE) if(HAS_TRAIT(src, TRAIT_STABLELIVER) || HAS_TRAIT(src, TRAIT_LIVERLESS_METABOLISM)) return @@ -782,10 +782,10 @@ //BRAIN DAMAGE// //////////////// -/mob/living/carbon/proc/handle_brain_damage(seconds_per_tick, times_fired) +/mob/living/carbon/proc/handle_brain_damage(seconds_per_tick) for(var/T in get_traumas()) var/datum/brain_trauma/BT = T - BT.on_life(seconds_per_tick, times_fired) + BT.on_life(seconds_per_tick) ///////////////////////////////////// //MONKEYS WITH TOO MUCH CHOLOESTROL// diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 0c1b1f18110..c5197578b77 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -9,11 +9,11 @@ * - seconds_per_tick: The amount of time that has elapsed since this last fired. * - times_fired: The number of times SSmobs has fired */ -/mob/living/proc/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/proc/Life(seconds_per_tick = SSMOBS_DT) set waitfor = FALSE SHOULD_NOT_SLEEP(TRUE) - var/signal_result = SEND_SIGNAL(src, COMSIG_LIVING_LIFE, seconds_per_tick, times_fired) + var/signal_result = SEND_SIGNAL(src, COMSIG_LIVING_LIFE, seconds_per_tick) if(signal_result & COMPONENT_LIVING_CANCEL_LIFE_PROCESSING) // mmm less work return @@ -44,11 +44,11 @@ if(!HAS_TRAIT(src, TRAIT_STASIS)) if(stat != DEAD) //Mutations and radiation - handle_mutations(seconds_per_tick, times_fired) + handle_mutations(seconds_per_tick) //Breathing, if applicable - handle_breathing(seconds_per_tick, times_fired) + handle_breathing(seconds_per_tick) - handle_diseases(seconds_per_tick, times_fired) // DEAD check is in the proc itself; we want it to spread even if the mob is dead, but to handle its disease-y properties only if you're not. + handle_diseases(seconds_per_tick) // DEAD check is in the proc itself; we want it to spread even if the mob is dead, but to handle its disease-y properties only if you're not. if (QDELETED(src)) // Diseases can qdel the mob via transformations return @@ -56,9 +56,9 @@ // Handle temperature/pressure differences between body and environment var/datum/gas_mixture/environment = loc.return_air() if(environment) - handle_environment(environment, seconds_per_tick, times_fired) + handle_environment(environment, seconds_per_tick) - handle_gravity(seconds_per_tick, times_fired) + handle_gravity(seconds_per_tick) if(living_flags & QUEUE_NUTRITION_UPDATE) update_nutrition() @@ -67,18 +67,18 @@ if(stat != DEAD) return TRUE -/mob/living/proc/handle_breathing(seconds_per_tick, times_fired) - SEND_SIGNAL(src, COMSIG_LIVING_HANDLE_BREATHING, seconds_per_tick, times_fired) +/mob/living/proc/handle_breathing(seconds_per_tick) + SEND_SIGNAL(src, COMSIG_LIVING_HANDLE_BREATHING, seconds_per_tick) return -/mob/living/proc/handle_mutations(seconds_per_tick, times_fired) +/mob/living/proc/handle_mutations(seconds_per_tick) return -/mob/living/proc/handle_diseases(seconds_per_tick, times_fired) +/mob/living/proc/handle_diseases(seconds_per_tick) return // Base mob environment handler for body temperature -/mob/living/proc/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired) +/mob/living/proc/handle_environment(datum/gas_mixture/environment, seconds_per_tick) var/loc_temp = get_temperature(environment) var/temp_delta = loc_temp - bodytemperature @@ -125,9 +125,9 @@ /mob/living/proc/update_damage_hud() return -/mob/living/proc/handle_gravity(seconds_per_tick, times_fired) +/mob/living/proc/handle_gravity(seconds_per_tick) if(gravity_state > STANDARD_GRAVITY) - handle_high_gravity(gravity_state, seconds_per_tick, times_fired) + handle_high_gravity(gravity_state, seconds_per_tick) /mob/living/proc/gravity_animate() if(!get_filter("gravity")) @@ -135,7 +135,7 @@ animate(get_filter("gravity"), y = 1, time = 10, loop = -1) animate(y = 0, time = 10) -/mob/living/proc/handle_high_gravity(gravity, seconds_per_tick, times_fired) +/mob/living/proc/handle_high_gravity(gravity, seconds_per_tick) if(gravity < GRAVITY_DAMAGE_THRESHOLD) //Aka gravity values of 3 or more return @@ -143,9 +143,9 @@ adjust_brute_loss(min(GRAVITY_DAMAGE_SCALING * grav_strength, GRAVITY_DAMAGE_MAXIMUM) * seconds_per_tick) /// Proc used for custom metabolization of reagents, if any -/mob/living/proc/reagent_tick(datum/reagent/chem, seconds_per_tick, times_fired) +/mob/living/proc/reagent_tick(datum/reagent/chem, seconds_per_tick) SHOULD_CALL_PARENT(TRUE) - return SEND_SIGNAL(src, COMSIG_MOB_REAGENT_TICK, chem, seconds_per_tick, times_fired) + return SEND_SIGNAL(src, COMSIG_MOB_REAGENT_TICK, chem, seconds_per_tick) /// Proc used for custom reagent exposure effects, if any /mob/living/proc/reagent_expose(datum/reagent/chem, methods = TOUCH, reac_volume, show_message = TRUE, touch_protection = 0) diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index 311a700fd15..ad7049332e9 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -1,4 +1,4 @@ -/mob/living/silicon/ai/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/silicon/ai/Life(seconds_per_tick = SSMOBS_DT) if (stat == DEAD) return //Being dead doesn't mean your temperature never changes diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 6e9a1e2d30d..d428c275171 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -1,12 +1,12 @@ -/mob/living/silicon/robot/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/silicon/robot/Life(seconds_per_tick = SSMOBS_DT) if(HAS_TRAIT(src, TRAIT_NO_TRANSFORM)) return . = ..() handle_robot_hud_updates() - handle_robot_cell(seconds_per_tick, times_fired) + handle_robot_cell(seconds_per_tick) -/mob/living/silicon/robot/proc/handle_robot_cell(seconds_per_tick, times_fired) +/mob/living/silicon/robot/proc/handle_robot_cell(seconds_per_tick) if(stat == DEAD) return @@ -14,9 +14,9 @@ if(cell?.charge) low_power_mode = FALSE else if(stat == CONSCIOUS) - use_energy(seconds_per_tick, times_fired) + use_energy(seconds_per_tick) -/mob/living/silicon/robot/proc/use_energy(seconds_per_tick, times_fired) +/mob/living/silicon/robot/proc/use_energy(seconds_per_tick) if(cell?.charge) if(cell.charge <= 0.01 * STANDARD_CELL_CHARGE) drop_all_held_items() diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index b7f8fd2900f..3bb3398e4a8 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -446,7 +446,7 @@ /mob/living/silicon/get_inactive_held_item() return FALSE -/mob/living/silicon/handle_high_gravity(gravity, seconds_per_tick, times_fired) +/mob/living/silicon/handle_high_gravity(gravity, seconds_per_tick) return /mob/living/silicon/rust_heretic_act() diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 51012b0c2ef..c3d14859d4f 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -102,7 +102,7 @@ GiveTarget(null) return ..() -/mob/living/simple_animal/hostile/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/Life(seconds_per_tick = SSMOBS_DT) . = ..() if(!.) //dead GLOB.move_manager.stop_looping(src) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index cdd367332ac..55cbd47b044 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -341,7 +341,7 @@ Difficulty: Hard new /obj/effect/decal/cleanable/blood(get_turf(src)) . = ..() -/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/Life(seconds_per_tick = SSMOBS_DT) return /mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/adjust_brute_loss(amount, updating_health = TRUE, forced = FALSE, required_bodytype) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm index ce3a94932d5..a75324ec642 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm @@ -104,7 +104,7 @@ if(CALL_CHILDREN) call_children() -/mob/living/simple_animal/hostile/asteroid/elite/broodmother/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/asteroid/elite/broodmother/Life(seconds_per_tick = SSMOBS_DT) . = ..() if(!.) //Checks if they are dead as a rock. return diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm index b71090c03da..1a6009e3bc3 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm @@ -96,7 +96,7 @@ if(AOE_SQUARES) aoe_squares(target) -/mob/living/simple_animal/hostile/asteroid/elite/pandora/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/asteroid/elite/pandora/Life(seconds_per_tick = SSMOBS_DT) . = ..() if(health >= maxHealth * 0.5) cooldown_time = 2 SECONDS diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm index 81556365e9a..8a73d146596 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm @@ -55,7 +55,7 @@ aggressive_message_said = TRUE rapid_melee = 2 -/mob/living/simple_animal/hostile/asteroid/polarbear/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/asteroid/polarbear/Life(seconds_per_tick = SSMOBS_DT) . = ..() if(!. || target) return diff --git a/code/modules/mob/living/simple_animal/hostile/ooze.dm b/code/modules/mob/living/simple_animal/hostile/ooze.dm index 542b67ffd2e..aec9457ecae 100644 --- a/code/modules/mob/living/simple_animal/hostile/ooze.dm +++ b/code/modules/mob/living/simple_animal/hostile/ooze.dm @@ -54,7 +54,7 @@ return ..() ///Handles nutrition gain/loss of mob and also makes it take damage if it's too low on nutrition, only happens for sentient mobs. -/mob/living/simple_animal/hostile/ooze/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/ooze/Life(seconds_per_tick = SSMOBS_DT) . = ..() if(!.) //dead or deleted diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 1d37cc3ce2a..684ac23e122 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -212,7 +212,7 @@ if((unsuitable_cold_damage || unsuitable_heat_damage) && (minbodytemp > 0 || maxbodytemp < INFINITY)) AddElement(/datum/element/body_temp_sensitive, minbodytemp, maxbodytemp, unsuitable_cold_damage, unsuitable_heat_damage, mapload) -/mob/living/simple_animal/Life(seconds_per_tick = SSMOBS_DT, times_fired) +/mob/living/simple_animal/Life(seconds_per_tick = SSMOBS_DT) . = ..() if(staminaloss > 0) adjust_stamina_loss(-stamina_recovery * seconds_per_tick, FALSE, TRUE) @@ -314,7 +314,7 @@ else manual_emote(pick(emote_hear)) -/mob/living/simple_animal/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired) +/mob/living/simple_animal/handle_environment(datum/gas_mixture/environment, seconds_per_tick) var/atom/A = loc if(isturf(A)) var/areatemp = get_temperature(environment) diff --git a/code/modules/reagents/chemistry/holder/mob_life.dm b/code/modules/reagents/chemistry/holder/mob_life.dm index a48fd9d257a..52726d4d2ed 100644 --- a/code/modules/reagents/chemistry/holder/mob_life.dm +++ b/code/modules/reagents/chemistry/holder/mob_life.dm @@ -13,7 +13,7 @@ * * can_overdose - Allows overdosing * * liverless - Stops reagents that aren't set as [/datum/reagent/var/self_consuming] from metabolizing */ -/datum/reagents/proc/metabolize(mob/living/carbon/owner, seconds_per_tick, times_fired, can_overdose = FALSE, liverless = FALSE, dead = FALSE) +/datum/reagents/proc/metabolize(mob/living/carbon/owner, seconds_per_tick, can_overdose = FALSE, liverless = FALSE, dead = FALSE) var/list/cached_reagents = reagent_list if(owner) expose_temperature(owner.bodytemperature, 0.25) @@ -44,7 +44,7 @@ owner.reagents.remove_reagent(toxin.type, toxin.metabolization_rate * owner.metabolism_efficiency * seconds_per_tick) continue - need_mob_update += metabolize_reagent(owner, reagent, seconds_per_tick, times_fired, can_overdose, liverless, dead) + need_mob_update += metabolize_reagent(owner, reagent, seconds_per_tick, can_overdose, liverless, dead) // If applicable, calculate any toxin-related liver damage // Note: we have to do this AFTER metabolize_reagent, because we want handle_reagent to run before we make the determination. @@ -85,7 +85,7 @@ * * can_overdose - Allows overdosing * * liverless - Stops reagents that aren't set as [/datum/reagent/var/self_consuming] from metabolizing */ -/datum/reagents/proc/metabolize_reagent(mob/living/carbon/owner, datum/reagent/reagent, seconds_per_tick, times_fired, can_overdose = FALSE, liverless = FALSE, dead = FALSE) +/datum/reagents/proc/metabolize_reagent(mob/living/carbon/owner, datum/reagent/reagent, seconds_per_tick, can_overdose = FALSE, liverless = FALSE, dead = FALSE) if(QDELETED(reagent.holder)) return FALSE @@ -95,7 +95,7 @@ if(!owner || !reagent || (dead && !(reagent.chemical_flags & REAGENT_DEAD_PROCESS))) return FALSE - var/tick_return = owner.reagent_tick(reagent, seconds_per_tick, times_fired) + var/tick_return = owner.reagent_tick(reagent, seconds_per_tick) if(tick_return & COMSIG_MOB_STOP_REAGENT_TICK) return FALSE @@ -117,16 +117,16 @@ owner.mind?.add_addiction_points(addiction, reagent.addiction_types[addiction] * REAGENTS_METABOLISM) if(reagent.overdosed) - need_mob_update += reagent.overdose_process(owner, seconds_per_tick, times_fired) + need_mob_update += reagent.overdose_process(owner, seconds_per_tick) reagent.current_cycle++ - need_mob_update += reagent.on_mob_life(owner, seconds_per_tick, times_fired) + need_mob_update += reagent.on_mob_life(owner, seconds_per_tick) if(dead && !QDELETED(owner) && !QDELETED(reagent)) need_mob_update += reagent.on_mob_dead(owner, seconds_per_tick) if(!QDELETED(owner) && !QDELETED(reagent) && !(tick_return & COMSIG_MOB_STOP_REAGENT_METABOLISM)) - reagent.metabolize_reagent(owner, seconds_per_tick, times_fired) + reagent.metabolize_reagent(owner, seconds_per_tick) return need_mob_update @@ -186,14 +186,13 @@ * * * [owner][mob/living/carbon] - the mob we are doing stasis handlng on * * seconds_per_tick - passed from process - * * times_fired - number of times to metabolize this reagent */ -/datum/reagents/proc/handle_stasis_chems(mob/living/carbon/owner, seconds_per_tick, times_fired) +/datum/reagents/proc/handle_stasis_chems(mob/living/carbon/owner, seconds_per_tick) var/need_mob_update = FALSE for(var/datum/reagent/reagent as anything in reagent_list) if(!(reagent.chemical_flags & REAGENT_IGNORE_STASIS)) continue - need_mob_update += metabolize_reagent(owner, reagent, seconds_per_tick, times_fired, can_overdose = TRUE) + need_mob_update += metabolize_reagent(owner, reagent, seconds_per_tick, can_overdose = TRUE) if(owner && need_mob_update) //some of the metabolized reagents had effects on the mob that requires some updates. owner.updatehealth() update_total() diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm index cfd8c516879..19a8564ae77 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -163,11 +163,11 @@ * * times_fired - the number of times the owner's Life() tick has been called aka The number of times SSmobs has fired * */ -/datum/reagent/proc/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/proc/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) SHOULD_CALL_PARENT(TRUE) ///Metabolizes a portion of the reagent after on_mob_life() is called -/datum/reagent/proc/metabolize_reagent(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/proc/metabolize_reagent(mob/living/carbon/affected_mob, seconds_per_tick) if(isnull(holder)) return @@ -245,7 +245,7 @@ SEND_SIGNAL(src, COMSIG_REAGENT_ON_MERGE, mix_data, amount) /// Called if the reagent has passed the overdose threshold and is set to be triggering overdose effects. Returning UPDATE_MOB_HEALTH will cause updatehealth() to be called on the holder mob by /datum/reagents/proc/metabolize. -/datum/reagent/proc/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/proc/overdose_process(mob/living/affected_mob, seconds_per_tick) return /// Called when an overdose starts. Returning UPDATE_MOB_HEALTH will cause updatehealth() to be called on the holder mob by /datum/reagents/proc/metabolize. diff --git a/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm b/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm index 03e391bda39..0d5d4da2c7c 100644 --- a/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm @@ -43,7 +43,7 @@ . = ..() breather.SetSleeping(1 SECONDS) -/datum/reagent/healium/on_mob_life(mob/living/breather, seconds_per_tick, times_fired) +/datum/reagent/healium/on_mob_life(mob/living/breather, seconds_per_tick) . = ..() breather.SetSleeping(30 SECONDS) var/need_mob_update @@ -61,7 +61,7 @@ taste_description = "searingly cold" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/hypernoblium/on_mob_life(mob/living/carbon/breather, seconds_per_tick, times_fired) +/datum/reagent/hypernoblium/on_mob_life(mob/living/carbon/breather, seconds_per_tick) . = ..() if(isplasmaman(breather)) breather.set_timed_status_effect(10 SECONDS * REM * seconds_per_tick, /datum/status_effect/hypernob_protection) @@ -77,7 +77,7 @@ addiction_types = list(/datum/addiction/stimulants = 14) metabolized_traits = list(TRAIT_SLEEPIMMUNE) -/datum/reagent/nitrium_high_metabolization/on_mob_life(mob/living/carbon/breather, seconds_per_tick, times_fired) +/datum/reagent/nitrium_high_metabolization/on_mob_life(mob/living/carbon/breather, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = breather.adjust_stamina_loss(-4 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype) @@ -110,7 +110,7 @@ taste_description = "irradiated air" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/pluoxium/on_mob_life(mob/living/carbon/breather, seconds_per_tick, times_fired) +/datum/reagent/pluoxium/on_mob_life(mob/living/carbon/breather, seconds_per_tick) . = ..() if(!HAS_TRAIT(breather, TRAIT_KNOCKEDOUT)) return @@ -132,7 +132,7 @@ affected_biotype = MOB_ORGANIC | MOB_MINERAL | MOB_PLANT // "toxic to all living beings" affected_respiration_type = ALL -/datum/reagent/zauker/on_mob_life(mob/living/breather, seconds_per_tick, times_fired) +/datum/reagent/zauker/on_mob_life(mob/living/breather, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = breather.adjust_brute_loss(6 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype) diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm index 01ba8ed7100..e6d4aae4db0 100644 --- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm @@ -24,7 +24,7 @@ var/reaping = FALSE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/c2/helbital/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/helbital/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/death_is_coming = (affected_mob.get_tox_loss() + affected_mob.get_oxy_loss() + affected_mob.get_fire_loss() + affected_mob.get_brute_loss())*normalise_creation_purity() var/thou_shall_heal = 0 @@ -80,7 +80,7 @@ holder.del_reagent(type) return -/datum/reagent/medicine/c2/helbital/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/helbital/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!helbent) affected_mob.apply_necropolis_curse(CURSE_WASTING | CURSE_BLINDING) @@ -107,7 +107,7 @@ inverse_chem = /datum/reagent/inverse/libitoil chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/c2/libital/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/libital/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 0.3 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags) @@ -125,7 +125,7 @@ inverse_chem = /datum/reagent/medicine/metafactor //Seems thematically intact chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/c2/probital/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/probital/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_brute_loss(-3 * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype) @@ -141,7 +141,7 @@ if(need_mob_update) return UPDATE_MOB_HEALTH -/datum/reagent/medicine/c2/probital/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/probital/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_stamina_loss(3 * REM * seconds_per_tick, updating_stamina = FALSE) @@ -176,7 +176,7 @@ inverse_chem_val = 0.4 inverse_chem = /datum/reagent/inverse/lentslurri -/datum/reagent/medicine/c2/lenturi/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/lenturi/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_fire_loss(-3.75 * REM * normalise_creation_purity() * seconds_per_tick, required_bodytype = affected_bodytype) @@ -195,7 +195,7 @@ inverse_chem_val = 0.35 inverse_chem = /datum/reagent/inverse/aiuri -/datum/reagent/medicine/c2/aiuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/aiuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_fire_loss(-2 * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype) @@ -214,7 +214,7 @@ inverse_chem_val = 0.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/c2/hercuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/hercuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update if(affected_mob.get_fire_loss() > 50) @@ -240,7 +240,7 @@ if(reac_volume >= metabolization_rate) exposed_mob.extinguish_mob() -/datum/reagent/medicine/c2/hercuri/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/hercuri/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_bodytemperature(-10 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, 50) //chilly chilly if(ishuman(affected_mob)) @@ -262,7 +262,7 @@ inverse_chem = /datum/reagent/inverse/healing/convermol chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/c2/convermol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/convermol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/oxycalc = 2.5 * REM * (current_cycle-1) if(!overdosed) @@ -276,7 +276,7 @@ if(need_mob_update) return UPDATE_MOB_HEALTH -/datum/reagent/medicine/c2/convermol/overdose_process(mob/living/carbon/human/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/convermol/overdose_process(mob/living/carbon/human/affected_mob, seconds_per_tick) . = ..() metabolization_rate += 2.5 * REAGENTS_METABOLISM @@ -294,7 +294,7 @@ /// A cooldown for spacing bursts of stamina damage COOLDOWN_DECLARE(drowsycd) -/datum/reagent/medicine/c2/tirimol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/tirimol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_oxy_loss(-4.5 * REM * seconds_per_tick * normalise_creation_purity(), updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) @@ -330,7 +330,7 @@ . = ..() rads_heal_threshold = rand(rads_heal_threshold - 50, rads_heal_threshold + 50) // Basically this means 50K and below will always give the radiation heal, and upto 150K could. Calculated once. -/datum/reagent/medicine/c2/seiver/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/seiver/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/chemtemp = min(holder.chem_temp, 1000) chemtemp = chemtemp ? chemtemp : T0C //why do you have null sweaty @@ -368,7 +368,7 @@ ph = 9.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/c2/multiver/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/multiver/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/medibonus = 0 //it will always have itself which makes it REALLY start @ 1 for(var/r in affected_mob.reagents.reagent_list) @@ -422,7 +422,7 @@ mob_reagents.remove_reagent(/datum/reagent/medicine/c2/syriniver, conversion_amount) mob_reagents.add_reagent(/datum/reagent/medicine/c2/musiver, conversion_amount) -/datum/reagent/medicine/c2/syriniver/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/syriniver/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 0.8 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags) @@ -435,7 +435,7 @@ if(need_mob_update) return UPDATE_MOB_HEALTH -/datum/reagent/medicine/c2/syriniver/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/syriniver/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 1.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) . = UPDATE_MOB_HEALTH @@ -452,7 +452,7 @@ var/datum/brain_trauma/mild/muscle_weakness/trauma chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/medicine/c2/musiver/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/musiver/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 0.1 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags) @@ -474,7 +474,7 @@ if(trauma) QDEL_NULL(trauma) -/datum/reagent/medicine/c2/musiver/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/musiver/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 1.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) . = UPDATE_MOB_HEALTH @@ -594,7 +594,7 @@ send_alert(user) user.add_traits(subject_traits, type) -/datum/reagent/medicine/c2/penthrite/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/penthrite/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_STOMACH, 0.25 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags) @@ -631,7 +631,7 @@ remove_alert(affected_mob) affected_mob.remove_traits(subject_traits, type) -/datum/reagent/medicine/c2/penthrite/overdose_process(mob/living/carbon/human/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/c2/penthrite/overdose_process(mob/living/carbon/human/affected_mob, seconds_per_tick) . = ..() REMOVE_TRAIT(affected_mob, TRAIT_STABLEHEART, type) var/need_mob_update diff --git a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm index c4858c55e68..db0e2aad924 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm @@ -51,7 +51,7 @@ LAZYSET(addiction_types, /datum/addiction/alcohol, 0.05 * boozepwr) return ..() -/datum/reagent/consumable/ethanol/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(drinker.get_drunk_amount() < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER || boozepwr < 0) var/booze_power = boozepwr @@ -146,7 +146,7 @@ ph = 6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/beer/green/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/beer/green/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(drinker.color != color) drinker.add_atom_colour(color, TEMPORARY_COLOUR_PRIORITY) @@ -155,7 +155,7 @@ . = ..() drinker.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, color) -/datum/reagent/consumable/ethanol/beer/green/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/beer/green/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() metabolization_rate = 1 * REAGENTS_METABOLISM @@ -178,7 +178,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolized_traits = list(TRAIT_STIMULATED) -/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.set_dizzy_if_lower(10 SECONDS * REM * seconds_per_tick) drinker.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick) @@ -210,7 +210,7 @@ taste_description = "pancake syrup" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/whiskey/candycorn/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/whiskey/candycorn/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(SPT_PROB(5, seconds_per_tick)) drinker.adjust_hallucinations(4 SECONDS * REM * seconds_per_tick) @@ -227,7 +227,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolized_traits = list(TRAIT_STIMULATED) -/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.adjust_drowsiness(-14 SECONDS * REM * seconds_per_tick) drinker.AdjustSleeping(-4 SECONDS * REM * seconds_per_tick) @@ -241,7 +241,7 @@ drinker.set_jitter_if_lower(40 SECONDS) drinker.Stun(1.5 SECONDS) -/datum/reagent/consumable/ethanol/thirteenloko/overdose_process(mob/living/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/thirteenloko/overdose_process(mob/living/drinker, seconds_per_tick) . = ..() if(SPT_PROB(3.5, seconds_per_tick) && iscarbon(drinker)) var/obj/item/held_item = drinker.get_active_held_item() @@ -299,7 +299,7 @@ taste_description = "desperation and lactate" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(drinker.get_brute_loss() && SPT_PROB(5, seconds_per_tick)) if(drinker.heal_bodypart_damage(brute = 1 * REM * seconds_per_tick, updating_health = FALSE)) @@ -315,7 +315,7 @@ ph = 3.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.set_drugginess(100 SECONDS * REM * seconds_per_tick) @@ -451,7 +451,7 @@ taste_description = "death and licorice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(SPT_PROB(5, seconds_per_tick) && !HAS_TRAIT(drinker, TRAIT_ALCOHOL_TOLERANCE)) drinker.adjust_hallucinations(8 SECONDS * REM * seconds_per_tick) @@ -551,7 +551,7 @@ taste_description = "a refreshing marriage of citrus and rum" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/cuba_libre/on_mob_life(mob/living/carbon/cubano, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/cuba_libre/on_mob_life(mob/living/carbon/cubano, seconds_per_tick) . = ..() var/need_mob_update if(cubano.mind && cubano.mind.has_antag_datum(/datum/antagonist/rev)) //Cuba Libre, the traditional drink of revolutions! Heals revolutionaries. @@ -639,7 +639,7 @@ drink.tool_behaviour = initial(drink.tool_behaviour) drink.usesound = initial(drink.usesound) -/datum/reagent/consumable/ethanol/screwdrivercocktail/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/screwdrivercocktail/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() var/obj/item/organ/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER) if(HAS_TRAIT(liver, TRAIT_ENGINEER_METABOLISM)) @@ -669,7 +669,7 @@ taste_description = "tomatoes with a hint of lime and liquid murder" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/bloody_mary/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/bloody_mary/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.adjust_blood_volume((0.25 + round(2 * drinker.get_drunk_amount() / 40, 0.1)) * REM * seconds_per_tick, maximum = BLOOD_VOLUME_NORMAL) // Bloody Mary restores blood loss based on how drunk you are @@ -715,7 +715,7 @@ light_holder = new(drinker) light_holder.set_light(3, 0.7, COLOR_TANGERINE_YELLOW) //Tequila Sunrise makes you radiate dim light, like a sunrise! -/datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) if(QDELETED(light_holder)) holder.del_reagent(type) //If we lost our light object somehow, remove the reagent else if(light_holder.loc != drinker) @@ -736,7 +736,7 @@ taste_description = "spicy toxins" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/toxins_special/on_mob_life(mob/living/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/toxins_special/on_mob_life(mob/living/drinker, seconds_per_tick) . = ..() drinker.adjust_bodytemperature(15 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, drinker.get_body_temp_normal() + 20) //310.15 is the normal bodytemp. @@ -763,7 +763,7 @@ beepsky_hallucination = new() drinker.gain_trauma(beepsky_hallucination, TRAUMA_RESILIENCE_ABSOLUTE) -/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.set_jitter_if_lower(4 SECONDS) var/obj/item/organ/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER) @@ -816,7 +816,7 @@ boozepwr = 50 // will still smash but not as much. dorf_mode = TRUE -/datum/reagent/consumable/ethanol/manly_dorf/on_mob_life(mob/living/carbon/dwarf, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/manly_dorf/on_mob_life(mob/living/carbon/dwarf, seconds_per_tick) . = ..() if(dorf_mode) var/need_mob_update @@ -904,7 +904,7 @@ taste_description = "death, the destroyer of worlds" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.set_drugginess(1 MINUTES * REM * seconds_per_tick) @@ -926,7 +926,7 @@ taste_description = "Jack Frost's piss" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.adjust_bodytemperature(20 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, drinker.get_body_temp_normal() + 20) //310.15 is the normal bodytemp. @@ -939,7 +939,7 @@ taste_description = "creamy berries" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/barefoot/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/barefoot/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(ishuman(drinker)) //Barefoot causes the imbiber to quickly regenerate brute trauma if they're not wearing shoes. var/mob/living/carbon/human/unshoed = drinker @@ -1079,7 +1079,7 @@ . = ..() drinker.remove_filter("singulo_rays") -/datum/reagent/consumable/ethanol/singulo/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/singulo/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(SPT_PROB(2.5, seconds_per_tick)) // 20u = 1x1, 45u = 2x2, 80u = 3x3 @@ -1106,7 +1106,7 @@ taste_description = "hot and spice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.adjust_bodytemperature(50 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, BODYTEMP_HEAT_DAMAGE_LIMIT) //310.15 is the normal bodytemp. @@ -1137,7 +1137,7 @@ taste_description = "refreshingly cold" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.adjust_bodytemperature(-20 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, T0C) //310.15 is the normal bodytemp. @@ -1206,7 +1206,7 @@ taste_description = "your brain coming out your nose" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/changelingsting/on_mob_life(mob/living/carbon/target, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/changelingsting/on_mob_life(mob/living/carbon/target, seconds_per_tick) . = ..() var/datum/antagonist/changeling/changeling = IS_CHANGELING(target) changeling?.adjust_chemicals(metabolization_rate * REM * seconds_per_tick) @@ -1229,7 +1229,7 @@ taste_description = "purified antagonism" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/syndicatebomb/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/syndicatebomb/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(SPT_PROB(2.5, seconds_per_tick)) playsound(get_turf(drinker), 'sound/effects/explosion/explosionfar.ogg', 100, TRUE) @@ -1272,7 +1272,7 @@ taste_description = "a bad joke" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() var/obj/item/organ/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER) if((liver && HAS_TRAIT(liver, TRAIT_COMEDY_METABOLISM)) || is_simian(drinker)) @@ -1289,7 +1289,7 @@ taste_description = "a pencil eraser" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(ishuman(drinker) && HAS_MIND_TRAIT(drinker, TRAIT_MIMING)) drinker.set_silence_if_lower(MIMEDRINK_SILENCE_DURATION) @@ -1333,7 +1333,7 @@ taste_description = "charged metal" // the same as teslium, honk honk. chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/fetching_fizz/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/fetching_fizz/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() var/turf/drinker_turf = get_turf(drinker) for(var/obj/item/stack/ore/ore in orange(3, drinker)) @@ -1350,7 +1350,7 @@ taste_description = "bravado in the face of disaster" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/hearty_punch/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/hearty_punch/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(drinker.health <= 0) var/need_mob_update @@ -1379,7 +1379,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED glass_price = DRINK_PRICE_HIGH -/datum/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.set_drugginess(100 SECONDS * REM * seconds_per_tick) if(!HAS_TRAIT(drinker, TRAIT_ALCOHOL_TOLERANCE)) @@ -1403,7 +1403,7 @@ taste_description = "your brains smashed out by a lemon wrapped around a gold brick" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/gargle_blaster/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/gargle_blaster/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.adjust_dizzy(3 SECONDS * REM * seconds_per_tick) switch(current_cycle) @@ -1431,7 +1431,7 @@ /datum/reagent/consumable/ethanol/neurotoxin/proc/pick_paralyzed_limb() return (pick(TRAIT_PARALYSIS_L_ARM,TRAIT_PARALYSIS_R_ARM,TRAIT_PARALYSIS_R_LEG,TRAIT_PARALYSIS_L_LEG)) -/datum/reagent/consumable/ethanol/neurotoxin/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/neurotoxin/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.set_drugginess(100 SECONDS * REM * seconds_per_tick) drinker.adjust_dizzy(4 SECONDS * REM * seconds_per_tick) @@ -1475,7 +1475,7 @@ taste_description = "giving peace a chance" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.set_slurring_if_lower(1 SECONDS * REM * seconds_per_tick) @@ -1536,7 +1536,7 @@ taste_description = "bloody" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/narsour/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/narsour/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.adjust_timed_status_effect(6 SECONDS * REM * seconds_per_tick, /datum/status_effect/speech/slurring/cult, max_duration = 6 SECONDS) drinker.adjust_stutter_up_to(6 SECONDS * REM * seconds_per_tick, 6 SECONDS) @@ -1582,7 +1582,7 @@ taste_description = "an invigorating bitter freshness which suffuses your being; no enemy of the station will go unrobusted this day" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/quadruple_sec/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/quadruple_sec/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() //Securidrink in line with the Screwdriver for engineers or Nothing for mimes var/obj/item/organ/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER) @@ -1599,7 +1599,7 @@ taste_description = "THE LAW" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/quintuple_sec/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/quintuple_sec/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() //Securidrink in line with the Screwdriver for engineers or Nothing for mimes but STRONG.. var/obj/item/organ/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER) @@ -1659,7 +1659,7 @@ if(!drinker.stat && heal_points == 20) //brought us out of softcrit drinker.visible_message(span_danger("[drinker] lurches to [drinker.p_their()] feet!"), span_boldnotice("Up and at 'em, kid.")) -/datum/reagent/consumable/ethanol/bastion_bourbon/on_mob_life(mob/living/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/bastion_bourbon/on_mob_life(mob/living/drinker, seconds_per_tick) . = ..() if(drinker.health > 0) var/need_mob_update @@ -1680,7 +1680,7 @@ nutriment_factor = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/squirt_cider/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/squirt_cider/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.satiety += 5 * REM * seconds_per_tick //for context, vitamins give 15 satiety per second @@ -1703,7 +1703,7 @@ nutriment_factor = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/sugar_rush/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/sugar_rush/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.satiety -= 10 * REM * seconds_per_tick //junky as hell! a whole glass will keep you from being able to eat junk food @@ -1738,7 +1738,7 @@ quality = DRINK_GOOD chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/peppermint_patty/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/peppermint_patty/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.apply_status_effect(/datum/status_effect/throat_soothed) drinker.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, drinker.get_body_temp_normal()) @@ -1763,7 +1763,7 @@ to_chat(the_human, span_notice("[the_shield] appears polished, although you don't recall polishing it.")) break -/datum/reagent/consumable/ethanol/alexander/on_mob_life(mob/living/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/alexander/on_mob_life(mob/living/drinker, seconds_per_tick) var/obj/item/shield/the_shield = mighty_shield?.resolve() if(the_shield && !(the_shield in drinker.contents)) //If you had a shield and lose it, you lose the reagent as well. Otherwise this is just a normal drink. holder.remove_reagent(type, volume) @@ -1807,7 +1807,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED glass_price = DRINK_PRICE_MEDIUM -/datum/reagent/consumable/ethanol/between_the_sheets/on_mob_life(mob/living/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/between_the_sheets/on_mob_life(mob/living/drinker, seconds_per_tick) . = ..() var/is_between_the_sheets = FALSE for(var/obj/item/bedsheet/bedsheet in range(drinker.loc, 0)) @@ -1868,7 +1868,7 @@ taste_description = "utter bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(drinker.nutrition <= NUTRITION_LEVEL_STARVING) if(drinker.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) @@ -1885,7 +1885,7 @@ taste_description = "sweet relief" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/fernet_cola/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/fernet_cola/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(drinker.nutrition <= NUTRITION_LEVEL_STARVING) if(drinker.adjust_tox_loss(0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) @@ -1903,7 +1903,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED glass_price = DRINK_PRICE_HIGH -/datum/reagent/consumable/ethanol/fanciulli/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/fanciulli/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.adjust_nutrition(-5 * REM * seconds_per_tick) drinker.overeatduration = 0 @@ -1923,7 +1923,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED glass_price = DRINK_PRICE_MEDIUM -/datum/reagent/consumable/ethanol/branca_menta/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/branca_menta/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.adjust_bodytemperature(-20 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, T0C) @@ -1942,7 +1942,7 @@ taste_description = "bubbling possibility" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/blank_paper/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/blank_paper/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(ishuman(drinker) && HAS_MIND_TRAIT(drinker, TRAIT_MIMING)) drinker.set_silence_if_lower(MIMEDRINK_SILENCE_DURATION) @@ -2073,7 +2073,7 @@ taste_description = "friendship! It is magic, after all" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/wizz_fizz/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/wizz_fizz/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() //A healing drink similar to Quadruple Sec, Ling Stings, and Screwdrivers for the Wizznerds; the check is consistent with the changeling sting if(drinker?.mind?.has_antag_datum(/datum/antagonist/wizard)) @@ -2099,7 +2099,7 @@ . = ..() AddElement(/datum/element/bugkiller_reagent) -/datum/reagent/consumable/ethanol/bug_spray/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/bug_spray/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() // Does some damage to bug biotypes if(drinker.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) @@ -2134,7 +2134,7 @@ taste_description = "the outlaw spirit" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/turbo/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/turbo/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(SPT_PROB(2, seconds_per_tick)) to_chat(drinker, span_notice("[pick("You feel disregard for the rule of law.", "You feel pumped!", "Your head is pounding.", "Your thoughts are racing..")]")) @@ -2150,7 +2150,7 @@ taste_description = "simpler times" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/old_timer/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/old_timer/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(SPT_PROB(10, seconds_per_tick) && ishuman(drinker)) var/mob/living/carbon/human/metabolizer = drinker @@ -2195,7 +2195,7 @@ taste_description = "dried plums and malt" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/trappist/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/trappist/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(drinker.mind?.holy_role) if(drinker.adjust_fire_loss(-2.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)) @@ -2211,7 +2211,7 @@ taste_description = "alternate realities" var/stored_teleports = 0 -/datum/reagent/consumable/ethanol/blazaam/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/blazaam/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(drinker.get_drunk_amount() > 40) if(stored_teleports) @@ -2239,7 +2239,7 @@ taste_description = "fiery, with an aftertaste of burnt flesh" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/mauna_loa/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/mauna_loa/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() // Heats the user up while the reagent is in the body. Occasionally makes you burst into flames. drinker.adjust_bodytemperature(25 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick) @@ -2273,7 +2273,7 @@ quality = DRINK_NICE taste_description = "a horrible emulsion of pineapple and olive oil" -/datum/reagent/consumable/ethanol/pina_olivada/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/pina_olivada/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(SPT_PROB(8, seconds_per_tick)) drinker.manual_emote(pick("coughs up some oil", "swallows the lump in [drinker.p_their()] throat", "gags", "chokes up a bit")) @@ -2295,7 +2295,7 @@ taste_description = "your tastebuds being individually shanked" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/pruno/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/pruno/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.adjust_disgust(5 * REM * seconds_per_tick) @@ -2336,7 +2336,7 @@ taste_description = "sweet nectar" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/kortara/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/kortara/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(drinker.get_brute_loss() && SPT_PROB(10, seconds_per_tick)) if(drinker.heal_bodypart_damage(brute = 1 * REM * seconds_per_tick, burn = 0, updating_health = FALSE)) @@ -2351,7 +2351,7 @@ taste_description = "mint choc chip" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/sea_breeze/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/sea_breeze/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.apply_status_effect(/datum/status_effect/throat_soothed) @@ -2373,7 +2373,7 @@ taste_description = "sorrow" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/drunken_espatier/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/drunken_espatier/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.add_mood_event("numb", /datum/mood_event/narcotic_medium, name) //comfortably numb @@ -2395,7 +2395,7 @@ nutriment_factor = 3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/protein_blend/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/protein_blend/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() drinker.adjust_nutrition(2 * REM * seconds_per_tick) if(!islizard(drinker)) @@ -2421,7 +2421,7 @@ taste_description = "victory" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/triumphal_arch/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/triumphal_arch/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(islizard(drinker)) drinker.add_mood_event("triumph", /datum/mood_event/memories_of_home, name) @@ -2580,7 +2580,7 @@ var/hal_amt = 4 var/hal_cap = 24 -/datum/reagent/consumable/ethanol/helianthus/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/helianthus/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(SPT_PROB(5, seconds_per_tick)) drinker.adjust_hallucinations_up_to(4 SECONDS * REM * seconds_per_tick, 48 SECONDS) @@ -2615,7 +2615,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED glass_price = DRINK_PRICE_MEDIUM -/datum/reagent/consumable/ethanol/gin_garden/on_mob_life(mob/living/carbon/doll, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/gin_garden/on_mob_life(mob/living/carbon/doll, seconds_per_tick) . = ..() doll.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, doll.get_body_temp_normal()) @@ -2978,7 +2978,7 @@ taste_description = "ginger-flavored recuperation" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/suffering_bastard/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/suffering_bastard/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.apply_status_effect(/datum/status_effect/headache_soothed) //prevents headaches affected_mob.adjust_disgust(-5 * REM * seconds_per_tick) //removes disgust, same with sol dry @@ -2994,7 +2994,7 @@ taste_description = "scorched sweet whiskey" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/blue_blazer/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/blue_blazer/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_bodytemperature(25 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal()) @@ -3008,7 +3008,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED glass_price = DRINK_PRICE_MEDIUM -/datum/reagent/consumable/ethanol/hot_toddy/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/hot_toddy/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_bodytemperature(25 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal()) diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm index cfeb3d55a1b..245a7d31e7b 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm @@ -7,7 +7,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice -/datum/reagent/consumable/orangejuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/orangejuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.get_oxy_loss() && SPT_PROB(16, seconds_per_tick)) if(affected_mob.adjust_oxy_loss(-1 * REM * seconds_per_tick, FALSE, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)) @@ -21,7 +21,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice -/datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.get_fire_loss() && SPT_PROB(10, seconds_per_tick)) if(affected_mob.heal_bodypart_damage(brute = 0, burn = 1 * REM * seconds_per_tick, updating_health = FALSE)) @@ -36,7 +36,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice -/datum/reagent/consumable/limejuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/limejuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.get_tox_loss() && SPT_PROB(10, seconds_per_tick)) if(affected_mob.adjust_tox_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) @@ -49,7 +49,7 @@ taste_description = "carrots" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/carrotjuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/carrotjuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_eye_blur(-2 SECONDS * REM * seconds_per_tick) affected_mob.adjust_temp_blindness(-2 SECONDS * REM * seconds_per_tick) @@ -84,7 +84,7 @@ taste_description = "berries" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) return UPDATE_MOB_HEALTH @@ -111,7 +111,7 @@ taste_description = "banana" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/banana/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/banana/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/obj/item/organ/liver/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER) if((liver && HAS_TRAIT(liver, TRAIT_COMEDY_METABOLISM)) || is_simian(affected_mob)) @@ -128,7 +128,7 @@ required_drink_type = /datum/reagent/consumable/nothing icon_state = "shotglass" -/datum/reagent/consumable/nothing/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/nothing/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(ishuman(drinker) && HAS_MIND_TRAIT(drinker, TRAIT_MIMING)) drinker.set_silence_if_lower(MIMEDRINK_SILENCE_DURATION) @@ -143,7 +143,7 @@ taste_description = "laughter" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/laughter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/laughter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.emote("laugh") affected_mob.add_mood_event("chemical_laughter", /datum/mood_event/chemical_laughter) @@ -156,7 +156,7 @@ taste_description = "laughter" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/superlaughter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/superlaughter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(16, seconds_per_tick)) affected_mob.visible_message(span_danger("[affected_mob] bursts out into a fit of uncontrollable laughter!"), span_userdanger("You burst out in a fit of uncontrollable laughter!")) @@ -179,7 +179,7 @@ taste_description = "vinegar brine" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/pickle/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/pickle/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/obj/item/organ/liver/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER) if((liver && HAS_TRAIT(liver, TRAIT_CORONER_METABOLISM))) @@ -218,7 +218,7 @@ return myseed.adjust_potency(-round(volume * 0.5)) -/datum/reagent/consumable/milk/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/milk/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) if(affected_mob.get_brute_loss() && SPT_PROB(10, seconds_per_tick)) if(affected_mob.heal_bodypart_damage(brute = 1 * REM * seconds_per_tick, burn = 0, updating_health = FALSE)) . = UPDATE_MOB_HEALTH @@ -240,7 +240,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED default_container = /obj/item/reagent_containers/condiment/soymilk -/datum/reagent/consumable/soymilk/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/soymilk/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.get_brute_loss() && SPT_PROB(10, seconds_per_tick)) if(affected_mob.heal_bodypart_damage(1, 0)) @@ -254,7 +254,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/cream -/datum/reagent/consumable/cream/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/cream/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(10, seconds_per_tick) && affected_mob.heal_bodypart_damage(1, 0)) return UPDATE_MOB_HEALTH @@ -270,11 +270,11 @@ glass_price = DRINK_PRICE_STOCK metabolized_traits = list(TRAIT_STIMULATED) -/datum/reagent/consumable/coffee/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/coffee/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) -/datum/reagent/consumable/coffee/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/coffee/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick) affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick) @@ -295,7 +295,7 @@ default_container = /obj/item/reagent_containers/cup/glass/mug/tea metabolized_traits = list(TRAIT_STIMULATED) -/datum/reagent/consumable/tea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/tea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_dizzy(-4 SECONDS * REM * seconds_per_tick) affected_mob.adjust_drowsiness(-2 SECONDS * REM * seconds_per_tick) @@ -354,7 +354,7 @@ taste_description = "bitter tea" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/tea/arnold_palmer/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/tea/arnold_palmer/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_notice("[pick("You remember to square your shoulders.","You remember to keep your head down.","You can't decide between squaring your shoulders and keeping your head down.","You remember to relax.","You think about how someday you'll get two strokes off your golf game.")]")) @@ -369,11 +369,11 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolized_traits = list(TRAIT_STIMULATED) -/datum/reagent/consumable/icecoffee/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/icecoffee/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) -/datum/reagent/consumable/icecoffee/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/icecoffee/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick) affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick) @@ -390,11 +390,11 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolized_traits = list(TRAIT_STIMULATED) -/datum/reagent/consumable/hot_ice_coffee/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/hot_ice_coffee/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) -/datum/reagent/consumable/hot_ice_coffee/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/hot_ice_coffee/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick) affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick) @@ -412,7 +412,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolized_traits = list(TRAIT_STIMULATED) -/datum/reagent/consumable/icetea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/icetea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_dizzy(-4 SECONDS * REM * seconds_per_tick) affected_mob.adjust_drowsiness(-2 SECONDS * REM * seconds_per_tick) @@ -429,7 +429,7 @@ taste_description = "cola" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/space_cola/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/space_cola/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_drowsiness(-10 SECONDS * REM * seconds_per_tick) affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) @@ -442,7 +442,7 @@ taste_description = "fruity overlysweet cola" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/roy_rogers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/roy_rogers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) affected_mob.set_jitter_if_lower(12 SECONDS * REM * seconds_per_tick) affected_mob.adjust_drowsiness(-10 SECONDS * REM * seconds_per_tick) affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) @@ -464,7 +464,7 @@ . = ..() affected_mob.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/nuka_cola) -/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.set_jitter_if_lower(40 SECONDS * REM * seconds_per_tick) affected_mob.set_drugginess(1 MINUTES * REM * seconds_per_tick) @@ -495,7 +495,7 @@ affected_mob.adjust_stamina_loss(min(80, current_cycle * 3), required_biotype = affected_biotype) affected_mob.adjust_drowsiness((current_cycle-1) * 2 SECONDS) -/datum/reagent/consumable/rootbeer/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/rootbeer/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(current_cycle > 3 && !effect_enabled) // takes a few seconds for the bonus to kick in to prevent microdosing to_chat(affected_mob, span_notice("You feel your trigger finger getting itchy...")) @@ -524,7 +524,7 @@ affected_atom.add_mood_event("maintenance_fun", /datum/mood_event/maintenance_high) metabolization_rate *= 0.8 -/datum/reagent/consumable/grey_bull/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/grey_bull/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.set_jitter_if_lower(40 SECONDS * REM * seconds_per_tick) affected_mob.adjust_dizzy(2 SECONDS * REM * seconds_per_tick) @@ -540,7 +540,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolized_traits = list(TRAIT_STIMULATED) -/datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_drowsiness(-14 SECONDS * REM * seconds_per_tick) affected_mob.AdjustSleeping(-2 SECONDS * REM * seconds_per_tick) @@ -554,7 +554,7 @@ taste_description = "cherry soda" // FALSE ADVERTISING chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/dr_gibb/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/dr_gibb/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_drowsiness(-12 SECONDS * REM * seconds_per_tick) affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) @@ -566,7 +566,7 @@ taste_description = "cherry soda" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/space_up/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/space_up/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) @@ -577,7 +577,7 @@ taste_description = "tangy lime and lemon soda" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/lemon_lime/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/lemon_lime/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) @@ -595,7 +595,7 @@ to_chat(exposed_mob, span_nicegreen("As you imbibe the Pwr Game, your gamer third eye opens... \ You feel as though a great secret of the universe has been made known to you...")) -/datum/reagent/consumable/pwr_game/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/pwr_game/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) if(SPT_PROB(5, seconds_per_tick)) @@ -608,7 +608,7 @@ taste_description = "carbonated metallic soda" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/shamblers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/shamblers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) @@ -625,7 +625,7 @@ mytray.adjust_waterlevel(round(volume)) mytray.adjust_plant_health(round(volume * 0.1)) -/datum/reagent/consumable/sodawater/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/sodawater/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick) affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick) @@ -638,7 +638,7 @@ taste_description = "tart and fresh" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/tonic/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/tonic/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick) affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick) @@ -652,7 +652,7 @@ taste_description = "grapes and the fresh open sea" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/wellcheers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/wellcheers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_drowsiness(3 SECONDS * REM * seconds_per_tick) var/need_mob_update @@ -675,7 +675,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolized_traits = list(TRAIT_STIMULATED) -/datum/reagent/consumable/monkey_energy/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/monkey_energy/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.set_jitter_if_lower(80 SECONDS * REM * seconds_per_tick) affected_mob.adjust_dizzy(2 SECONDS * REM * seconds_per_tick) @@ -692,7 +692,7 @@ . = ..() affected_mob.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/monkey_energy) -/datum/reagent/consumable/monkey_energy/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/monkey_energy/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(7.5, seconds_per_tick)) affected_mob.say(pick_list_replacements(BOOMER_FILE, "boomer"), forced = /datum/reagent/consumable/monkey_energy) @@ -705,7 +705,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED default_container = /obj/item/reagent_containers/cup/glass/ice -/datum/reagent/consumable/ice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/ice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, FALSE, affected_mob.get_body_temp_normal())) return UPDATE_MOB_HEALTH @@ -721,11 +721,11 @@ glass_price = DRINK_PRICE_EASY metabolized_traits = list(TRAIT_STIMULATED) -/datum/reagent/consumable/soy_latte/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/soy_latte/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) -/datum/reagent/consumable/soy_latte/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/soy_latte/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick) affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick) @@ -748,11 +748,11 @@ glass_price = DRINK_PRICE_EASY metabolized_traits = list(TRAIT_STIMULATED) -/datum/reagent/consumable/cafe_latte/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/cafe_latte/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) -/datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick) affected_mob.adjust_drowsiness(-12 SECONDS * REM * seconds_per_tick) @@ -772,7 +772,7 @@ taste_description = "homely fruit" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_brute_loss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype) @@ -795,7 +795,7 @@ taste_description = "sweet tangy fruit" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/cinderella/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/cinderella/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_disgust(-5 * REM * seconds_per_tick) @@ -879,11 +879,11 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolized_traits = list(TRAIT_STIMULATED) -/datum/reagent/consumable/pumpkin_latte/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/pumpkin_latte/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) -/datum/reagent/consumable/pumpkin_latte/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/pumpkin_latte/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick) affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick) @@ -933,7 +933,7 @@ taste_description = "grape soda" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/grape_soda/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/grape_soda/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) @@ -953,7 +953,7 @@ taste_description = "creamy chocolate" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) affected_mob.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal()) if(affected_mob.get_brute_loss() && SPT_PROB(10, seconds_per_tick)) if(affected_mob.heal_bodypart_damage(brute = 1 * REM * seconds_per_tick, burn = 0, updating_health = FALSE)) @@ -971,7 +971,7 @@ taste_description = "thick creamy chocolate" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/italian_coco/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/italian_coco/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal()) @@ -983,7 +983,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/menthol -/datum/reagent/consumable/menthol/on_mob_life(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/menthol/on_mob_life(mob/living/affected_mob, seconds_per_tick) . = ..() affected_mob.apply_status_effect(/datum/status_effect/throat_soothed) @@ -999,7 +999,7 @@ if(IS_REVOLUTIONARY(drinker)) to_chat(drinker, span_warning("Antioxidants are weakening your radical spirit!")) -/datum/reagent/consumable/grenadine/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/grenadine/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() if(IS_REVOLUTIONARY(drinker)) drinker.set_dizzy_if_lower(10 SECONDS * REM * seconds_per_tick) @@ -1036,7 +1036,7 @@ taste_description = "fizzy vanilla" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/cream_soda/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/cream_soda/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) @@ -1048,7 +1048,7 @@ taste_description = "sweet ginger spice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/sol_dry/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/sol_dry/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_disgust(-5 * REM * seconds_per_tick) @@ -1060,7 +1060,7 @@ taste_description = "sweet cherry syrup and ginger spice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/shirley_temple/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/shirley_temple/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) affected_mob.adjust_disgust(-3 * REM * seconds_per_tick) return ..() @@ -1073,7 +1073,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED var/current_size = RESIZE_DEFAULT_SIZE -/datum/reagent/consumable/red_queen/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/red_queen/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(50, seconds_per_tick)) return @@ -1111,7 +1111,7 @@ taste_description = "vegetable" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/aloejuice/on_mob_life(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/aloejuice/on_mob_life(mob/living/affected_mob, seconds_per_tick) . = ..() if(affected_mob.get_tox_loss() && SPT_PROB(16, seconds_per_tick)) if(affected_mob.adjust_tox_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) @@ -1125,7 +1125,7 @@ taste_description = "cool refreshing watermelon" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/agua_fresca/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/agua_fresca/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) if(affected_mob.get_tox_loss() && SPT_PROB(10, seconds_per_tick)) @@ -1140,7 +1140,7 @@ taste_description = "mushrooms" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/mushroom_tea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/mushroom_tea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(islizard(affected_mob)) if(affected_mob.adjust_oxy_loss(-0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)) @@ -1227,7 +1227,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED glass_price = DRINK_PRICE_HIGH -/datum/reagent/consumable/cucumberlemonade/on_mob_life(mob/living/carbon/doll, seconds_per_tick, times_fired) +/datum/reagent/consumable/cucumberlemonade/on_mob_life(mob/living/carbon/doll, seconds_per_tick) . = ..() doll.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, doll.get_body_temp_normal()) if(doll.get_tox_loss() && SPT_PROB(10, seconds_per_tick)) @@ -1241,7 +1241,7 @@ taste_description = "sludge seeping down your throat" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/mississippi_queen/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/consumable/mississippi_queen/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() switch(current_cycle) if(11 to 21) @@ -1260,7 +1260,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolized_traits = list(TRAIT_STIMULATED) -/datum/reagent/consumable/t_letter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/t_letter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!HAS_MIND_TRAIT(affected_mob, TRAIT_MIMING)) return @@ -1378,7 +1378,7 @@ taste_description = "mild aromatics" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/bitters_soda/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/ethanol/bitters_soda/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_disgust(-5 * REM * seconds_per_tick) @@ -1392,7 +1392,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolization_rate = 0.2 * REM -/datum/reagent/consumable/lean/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/lean/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_jitter(2.5 SECONDS * REM * seconds_per_tick) affected_mob.adjust_stutter(2.25 SECONDS * REM * seconds_per_tick) diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 42df93c4d68..9f4ee658962 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -18,7 +18,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED addiction_types = list(/datum/addiction/hallucinogens = 10) //4 per 2 seconds -/datum/reagent/drug/space_drugs/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/space_drugs/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.set_drugginess(30 SECONDS * REM * seconds_per_tick) if(isturf(affected_mob.loc) && !isspaceturf(affected_mob.loc) && !HAS_TRAIT(affected_mob, TRAIT_IMMOBILIZED) && SPT_PROB(5, seconds_per_tick)) @@ -31,7 +31,7 @@ to_chat(affected_mob, span_userdanger("You start tripping hard!")) affected_mob.add_mood_event("[type]_overdose", /datum/mood_event/overdose, name) -/datum/reagent/drug/space_drugs/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/space_drugs/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() var/hallucination_duration_in_seconds = (affected_mob.get_timed_status_effect_duration(/datum/status_effect/hallucination) / 10) if(hallucination_duration_in_seconds < volume && SPT_PROB(10, seconds_per_tick)) @@ -46,7 +46,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolization_rate = 0.125 * REAGENTS_METABOLISM -/datum/reagent/drug/cannabis/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/cannabis/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.apply_status_effect(/datum/status_effect/stoned) if(SPT_PROB(1, seconds_per_tick)) @@ -79,7 +79,7 @@ mytray.adjust_toxic(round(volume)) mytray.adjust_pestlevel(-rand(1, 2)) -/datum/reagent/drug/nicotine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/nicotine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(0.5, seconds_per_tick)) var/smoke_message = pick("You feel relaxed.", "You feel calmed.","You feel alert.","You feel rugged.") @@ -90,7 +90,7 @@ return UPDATE_MOB_HEALTH -/datum/reagent/drug/nicotine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/nicotine/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_tox_loss(0.1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype) @@ -109,7 +109,7 @@ inverse_chem = /datum/reagent/inverse/krokodil addiction_types = list(/datum/addiction/opioids = 18) //7.2 per 2 seconds -/datum/reagent/drug/krokodil/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/krokodil/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/high_message = pick("You feel calm.", "You feel collected.", "You feel like you need to relax.") if(SPT_PROB(2.5, seconds_per_tick)) @@ -125,7 +125,7 @@ if(affected_mob.adjust_brute_loss(50 * REM, updating_health = FALSE, required_bodytype = affected_bodytype)) // holy shit your skin just FELL THE FUCK OFF return UPDATE_MOB_HEALTH -/datum/reagent/drug/krokodil/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/krokodil/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.25 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags) @@ -168,7 +168,7 @@ . = ..() affected_mob.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/methamphetamine) -/datum/reagent/drug/methamphetamine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/methamphetamine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/high_message = pick("You feel hyper.", "You feel like you need to go faster.", "You feel like you can run the world.", "You understand now.") if(SPT_PROB(2.5, seconds_per_tick)) @@ -184,7 +184,7 @@ if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote(pick("twitch", "shiver")) -/datum/reagent/drug/methamphetamine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/methamphetamine/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(!HAS_TRAIT(affected_mob, TRAIT_IMMOBILIZED) && !ismovable(affected_mob.loc)) for(var/i in 1 to round(4 * REM * seconds_per_tick, 1)) @@ -226,7 +226,7 @@ if(rage) QDEL_NULL(rage) -/datum/reagent/drug/bath_salts/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/bath_salts/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.") if(SPT_PROB(2.5, seconds_per_tick)) @@ -242,7 +242,7 @@ step(affected_mob, pick(GLOB.cardinals)) step(affected_mob, pick(GLOB.cardinals)) -/datum/reagent/drug/bath_salts/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/bath_salts/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_hallucinations(10 SECONDS * REM * seconds_per_tick) if(!HAS_TRAIT(affected_mob, TRAIT_IMMOBILIZED) && !ismovable(affected_mob.loc)) @@ -263,7 +263,7 @@ addiction_types = list(/datum/addiction/stimulants = 8) metabolized_traits = list(TRAIT_STIMULATED) -/datum/reagent/drug/aranesp/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/aranesp/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.") if(SPT_PROB(2.5, seconds_per_tick)) @@ -297,7 +297,7 @@ . = ..() affected_mob.clear_mood_event("happiness_drug") -/datum/reagent/drug/happiness/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/happiness/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.remove_status_effect(/datum/status_effect/jitter) affected_mob.remove_status_effect(/datum/status_effect/confusion) @@ -305,7 +305,7 @@ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.2 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) return UPDATE_MOB_HEALTH -/datum/reagent/drug/happiness/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/happiness/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(16, seconds_per_tick)) var/reaction = rand(1,3) @@ -339,7 +339,7 @@ affected_mob.add_mood_event("maintenance_fun", /datum/mood_event/maintenance_high) metabolization_rate *= 0.8 -/datum/reagent/drug/pumpup/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/pumpup/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) @@ -354,7 +354,7 @@ . = ..() to_chat(affected_mob, span_userdanger("You can't stop shaking, your heart beats faster and faster...")) -/datum/reagent/drug/pumpup/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/pumpup/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) var/need_mob_update @@ -395,7 +395,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED addiction_types = list(/datum/addiction/maintenance_drugs = 14) -/datum/reagent/drug/maint/powder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/maint/powder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.1 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags) // 5x if you want to OD, you can potentially go higher, but good luck managing the brain damage. @@ -408,7 +408,7 @@ affected_mob?.mind?.experience_multiplier_reasons[type] = null affected_mob?.mind?.experience_multiplier_reasons -= type -/datum/reagent/drug/maint/powder/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/maint/powder/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 6 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) return UPDATE_MOB_HEALTH @@ -423,12 +423,12 @@ addiction_types = list(/datum/addiction/maintenance_drugs = 8) metabolized_traits = list(TRAIT_HARDLY_WOUNDED, TRAIT_ANALGESIA) -/datum/reagent/drug/maint/sludge/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/maint/sludge/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_tox_loss(0.5 * REM * seconds_per_tick, required_biotype = affected_biotype)) return UPDATE_MOB_HEALTH -/datum/reagent/drug/maint/sludge/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/maint/sludge/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(!iscarbon(affected_mob)) return @@ -450,13 +450,13 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED addiction_types = list(/datum/addiction/maintenance_drugs = 5) -/datum/reagent/drug/maint/tar/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/maint/tar/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.AdjustAllImmobility(-10 * REM * seconds_per_tick) affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 1.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags) return UPDATE_MOB_HEALTH -/datum/reagent/drug/maint/tar/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/maint/tar/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() var/need_update need_update = affected_mob.adjust_tox_loss(5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype) @@ -475,7 +475,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED addiction_types = list(/datum/addiction/hallucinogens = 12) -/datum/reagent/drug/mushroomhallucinogen/on_mob_life(mob/living/carbon/psychonaut, seconds_per_tick, times_fired) +/datum/reagent/drug/mushroomhallucinogen/on_mob_life(mob/living/carbon/psychonaut, seconds_per_tick) . = ..() psychonaut.set_slurring_if_lower(1 SECONDS * REM * seconds_per_tick) @@ -539,7 +539,7 @@ game_plane_master_controller.remove_filter("rainbow") game_plane_master_controller.remove_filter("psilocybin_wave") -/datum/reagent/drug/mushroomhallucinogen/overdose_process(mob/living/psychonaut, seconds_per_tick, times_fired) +/datum/reagent/drug/mushroomhallucinogen/overdose_process(mob/living/psychonaut, seconds_per_tick) . = ..() if(SPT_PROB(10, seconds_per_tick)) psychonaut.emote(pick("twitch","drool","moan")) @@ -611,7 +611,7 @@ game_plane_master_controller.remove_filter("blastoff_wave") dancer.sound_environment_override = NONE -/datum/reagent/drug/blastoff/on_mob_life(mob/living/carbon/dancer, seconds_per_tick, times_fired) +/datum/reagent/drug/blastoff/on_mob_life(mob/living/carbon/dancer, seconds_per_tick) . = ..() if(dancer.adjust_organ_loss(ORGAN_SLOT_LUNGS, 0.3 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) . = UPDATE_MOB_HEALTH @@ -620,7 +620,7 @@ if(SPT_PROB(BLASTOFF_DANCE_MOVE_CHANCE_PER_UNIT * volume, seconds_per_tick)) dancer.emote("flip") -/datum/reagent/drug/blastoff/overdose_process(mob/living/dancer, seconds_per_tick, times_fired) +/datum/reagent/drug/blastoff/overdose_process(mob/living/dancer, seconds_per_tick) . = ..() if(dancer.adjust_organ_loss(ORGAN_SLOT_LUNGS, 0.3 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) . = UPDATE_MOB_HEALTH @@ -683,7 +683,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED addiction_types = list(/datum/addiction/maintenance_drugs = 20) -/datum/reagent/drug/saturnx/on_mob_life(mob/living/carbon/invisible_man, seconds_per_tick, times_fired) +/datum/reagent/drug/saturnx/on_mob_life(mob/living/carbon/invisible_man, seconds_per_tick) . = ..() if(invisible_man.adjust_organ_loss(ORGAN_SLOT_LIVER, 0.3 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) return UPDATE_MOB_HEALTH @@ -755,7 +755,7 @@ game_plane_master_controller.remove_filter("saturnx_filter") game_plane_master_controller.remove_filter("saturnx_blur") -/datum/reagent/drug/saturnx/overdose_process(mob/living/invisible_man, seconds_per_tick, times_fired) +/datum/reagent/drug/saturnx/overdose_process(mob/living/invisible_man, seconds_per_tick) . = ..() if(SPT_PROB(7.5, seconds_per_tick)) invisible_man.emote("giggle") @@ -836,7 +836,7 @@ If you have at over 25u in your body you restore more than 20 stamina per cycle, stamina_heal_per_unit = 6 druggo.adjust_stamina_loss(-stamina_heal_per_unit * trans_volume) -/datum/reagent/drug/kronkaine/on_mob_life(mob/living/carbon/kronkaine_fiend, seconds_per_tick, times_fired) +/datum/reagent/drug/kronkaine/on_mob_life(mob/living/carbon/kronkaine_fiend, seconds_per_tick) . = ..() var/need_mob_update kronkaine_fiend.add_mood_event("tweaking", /datum/mood_event/stimulant_medium) @@ -864,7 +864,7 @@ If you have at over 25u in your body you restore more than 20 stamina per cycle, if(need_mob_update) return UPDATE_MOB_HEALTH -/datum/reagent/drug/kronkaine/overdose_process(mob/living/kronkaine_fiend, seconds_per_tick, times_fired) +/datum/reagent/drug/kronkaine/overdose_process(mob/living/kronkaine_fiend, seconds_per_tick) . = ..() if(kronkaine_fiend.adjust_organ_loss(ORGAN_SLOT_HEART, 0.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) . = UPDATE_MOB_HEALTH @@ -907,7 +907,7 @@ If you have at over 25u in your body you restore more than 20 stamina per cycle, /// Track the active hallucination we're giving out so we don't replace it by accident VAR_PRIVATE/datum/weakref/active_hallucination_weakref -/datum/reagent/drug/syndol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/drug/syndol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/obj/item/organ/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER) if(isnull(liver) || !(liver.organ_flags & affected_organ_flags)) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index c1307d3bf7f..2b6cf4d97d9 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -23,7 +23,7 @@ // All food reagents function at a fixed rate chemical_flags |= REAGENT_UNAFFECTED_BY_METABOLISM -/datum/reagent/consumable/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!ishuman(affected_mob) || HAS_TRAIT(affected_mob, TRAIT_NOHUNGER)) return @@ -74,7 +74,7 @@ /datum/reagent/consumable/nutriment/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) mytray.adjust_plant_health(round(volume * 0.2)) -/datum/reagent/consumable/nutriment/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/nutriment/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(30, seconds_per_tick)) if(affected_mob.heal_bodypart_damage(brute = brute_heal * REM * seconds_per_tick, burn = burn_heal * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)) @@ -131,7 +131,7 @@ brute_heal = 1 burn_heal = 1 -/datum/reagent/consumable/nutriment/vitamin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/nutriment/vitamin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.satiety < MAX_SATIETY) affected_mob.satiety += 30 * REM * seconds_per_tick @@ -258,7 +258,7 @@ ///Amount of satiety that will be drained when the cloth_fibers is fully metabolized var/delayed_satiety_drain = 2 * CLOTHING_NUTRITION_GAIN -/datum/reagent/consumable/nutriment/cloth_fibers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/nutriment/cloth_fibers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.satiety < MAX_SATIETY) affected_mob.adjust_nutrition(CLOTHING_NUTRITION_GAIN) @@ -311,7 +311,7 @@ to_chat(affected_mob, span_userdanger("You go into hyperglycemic shock! Lay off the twinkies!")) affected_mob.AdjustSleeping(20 SECONDS) -/datum/reagent/consumable/sugar/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/sugar/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_drowsiness_up_to((5 SECONDS * REM * seconds_per_tick), 60 SECONDS) @@ -358,7 +358,7 @@ taste_mult = 1.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/capsaicin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/capsaicin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/heating = 0 switch(current_cycle) @@ -385,7 +385,7 @@ specific_heat = 40 default_container = /obj/item/reagent_containers/cup/bottle/frostoil -/datum/reagent/consumable/frostoil/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/frostoil/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/cooling = 0 switch(current_cycle) @@ -461,7 +461,7 @@ victim.vomit(VOMIT_CATEGORY_DEFAULT) return ..() -/datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!holder.has_reagent(/datum/reagent/consumable/milk)) if(SPT_PROB(5, seconds_per_tick)) @@ -542,7 +542,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED added_traits = list(TRAIT_GARLIC_BREATH) -/datum/reagent/consumable/garlic/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/garlic/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(isvampire(affected_mob)) //incapacitating but not lethal. Unfortunately, vampires cannot vomit. if(SPT_PROB(min((current_cycle-1)/2, 12.5), seconds_per_tick)) @@ -586,7 +586,7 @@ taste_description = "childhood whimsy" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/obj/item/organ/liver/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER) if(liver && HAS_TRAIT(liver, TRAIT_LAW_ENFORCEMENT_METABOLISM)) @@ -626,7 +626,7 @@ taste_description = "your imprisonment" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, 0, affected_mob.get_body_temp_normal()) @@ -638,7 +638,7 @@ taste_description = "wet and cheap noodles on fire" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick) @@ -793,7 +793,7 @@ taste_description = "sweet slime" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() holder.add_reagent(/datum/reagent/consumable/sugar, 3 * REM * seconds_per_tick) @@ -816,7 +816,7 @@ mytray.adjust_weedlevel(rand(1, 2)) mytray.adjust_pestlevel(rand(1, 2)) -/datum/reagent/consumable/honey/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/honey/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() holder.add_reagent(/datum/reagent/consumable/sugar, 3 * REM * seconds_per_tick) var/need_mob_update @@ -861,7 +861,7 @@ metabolized_traits = list(TRAIT_GLUTTON) chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/moltobeso/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/moltobeso/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() for(var/datum/reagent/consumable/food in affected_mob.reagents.reagent_list) if(food == src) @@ -885,7 +885,7 @@ color = "#664330" // rgb: 102, 67, 48 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/nutriment/stabilized/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/nutriment/stabilized/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.nutrition > NUTRITION_LEVEL_FULL - 25) affected_mob.adjust_nutrition(-3 * REM * get_nutriment_factor(affected_mob) * seconds_per_tick) @@ -901,7 +901,7 @@ ph = 12 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/entpoly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/entpoly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update if(current_cycle > 10) @@ -950,7 +950,7 @@ ph = 10.4 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/vitfro/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/vitfro/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update if(SPT_PROB(55, seconds_per_tick)) @@ -980,7 +980,7 @@ if(istype(stomach)) stomach.adjust_charge(reac_volume * 30 * ETHEREAL_DISCHARGE_RATE) -/datum/reagent/consumable/liquidelectricity/enriched/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/liquidelectricity/enriched/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(isethereal(affected_mob)) affected_mob.adjust_blood_volume(1 * seconds_per_tick) @@ -999,7 +999,7 @@ overdose_threshold = 17 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/astrotame/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/astrotame/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.disgust < 80) affected_mob.adjust_disgust(10 * REM * seconds_per_tick) @@ -1050,7 +1050,7 @@ overdose_threshold = 15 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/char/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/char/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(13, seconds_per_tick)) affected_mob.say(pick_list_replacements(BOOMER_FILE, "boomer"), forced = /datum/reagent/consumable/char) @@ -1162,7 +1162,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED default_container = /obj/item/reagent_containers/condiment/peanut_butter -/datum/reagent/consumable/peanut_butter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) //ET loves peanut butter +/datum/reagent/consumable/peanut_butter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) //ET loves peanut butter . = ..() if(isabductor(affected_mob)) affected_mob.add_mood_event("ET_pieces", /datum/mood_event/et_pieces, name) @@ -1223,7 +1223,7 @@ taste_description = "mint" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/mintextract/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/mintextract/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(HAS_TRAIT(affected_mob, TRAIT_FAT)) affected_mob.investigate_log("has been gibbed by consuming [src] while fat.", INVESTIGATE_DEATHS) diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents.dm index aa2703f46c1..cd47b244bc4 100644 --- a/code/modules/reagents/chemistry/reagents/impure_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/impure_reagents.dm @@ -14,7 +14,7 @@ metabolization_rate = 0.1 * REM //default impurity is 0.75, so we get 25% converted. Default metabolisation rate is 0.4, so we're 4 times slower. var/liver_damage = 0.5 -/datum/reagent/impurity/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/impurity/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/obj/item/organ/liver/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER) var/need_mob_update @@ -39,7 +39,7 @@ var/tox_damage = 1 -/datum/reagent/inverse/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_tox_loss(tox_damage * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) return UPDATE_MOB_HEALTH @@ -108,11 +108,11 @@ human_thing.apply_status_effect(/datum/status_effect/reagent_effect/freeze, type) -/datum/reagent/inverse/cryostylane/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/cryostylane/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() metabolization_rate += 0.01 //speed up our metabolism over time. Chop chop. -/datum/reagent/inverse/cryostylane/metabolize_reagent(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/cryostylane/metabolize_reagent(mob/living/carbon/affected_mob, seconds_per_tick) if(current_cycle >= 60) holder.remove_reagent(type, volume) // remove it all if we're past 60 cycles return diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm index 9f86275f74a..3a21619a4fa 100644 --- a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm @@ -35,7 +35,7 @@ affected_respiration_type = ALL //Random healing of the 4 main groups -/datum/reagent/impurity/healing/medicine_failure/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/impurity/healing/medicine_failure/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update var/pick = pick("brute", "burn", "tox", "oxy") @@ -83,7 +83,7 @@ Then I attempt to calculate the how many hands to created based off the current I take the 2s interval period and divide it by the number of hands I want to make (i.e. the current seconds_per_tick) and I keep track of how many hands I'm creating (since I always create one on a tick, then I start at 1 hand). For each hand I then use this time value multiplied by the number of hands. Since we're spawning one now, and it checks to see if hands is less than, but not less than or equal to, seconds_per_tick, no hands will be created on the next expected tick. Basically, we fill the time between now and 2s from now with hands based off the current lag. */ -/datum/reagent/inverse/helgrasp/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/helgrasp/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() spawn_hands(affected_mob) lag_remainder += seconds_per_tick - FLOOR(seconds_per_tick, 1) @@ -130,7 +130,7 @@ Basically, we fill the time between now and 2s from now with hands based off the addiction_types = list(/datum/addiction/medicine = 4) tox_damage = 0 -/datum/reagent/inverse/libitoil/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/libitoil/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 0.1 * REM * seconds_per_tick) @@ -190,7 +190,7 @@ Basically, we fill the time between now and 2s from now with hands based off the description = "These inhibitory peptides drains nutrition and causes brain damage in the patient!" ph = 2.1 -/datum/reagent/peptides_failed/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/peptides_failed/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.25 * seconds_per_tick, 170)) . = UPDATE_MOB_HEALTH @@ -223,7 +223,7 @@ Basically, we fill the time between now and 2s from now with hands based off the var/amount_of_blur_applied = 1.25 SECONDS tox_damage = 0 -/datum/reagent/inverse/aiuri/on_mob_life(mob/living/carbon/owner, seconds_per_tick, times_fired) +/datum/reagent/inverse/aiuri/on_mob_life(mob/living/carbon/owner, seconds_per_tick) owner.adjust_organ_loss(ORGAN_SLOT_EYES, 0.1 * REM * seconds_per_tick) owner.adjust_eye_blur(amount_of_blur_applied * seconds_per_tick) . = ..() @@ -242,7 +242,7 @@ Basically, we fill the time between now and 2s from now with hands based off the taste_description = "heat! Ouch!" addiction_types = list(/datum/addiction/medicine = 2.5) -/datum/reagent/inverse/hercuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/hercuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/heating = rand(5, 25) * creation_purity * REM * seconds_per_tick var/datum/reagents/mob_reagents = affected_mob.reagents @@ -262,7 +262,7 @@ Basically, we fill the time between now and 2s from now with hands based off the exposed_mob.adjust_bodytemperature(reac_volume * TEMPERATURE_DAMAGE_COEFFICIENT) exposed_mob.adjust_fire_stacks(reac_volume / 2) -/datum/reagent/inverse/hercuri/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/hercuri/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 2 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) //Makes it so you can't abuse it with pyroxadone very easily (liver dies from 25u unless it's fully upgraded) . = UPDATE_MOB_HEALTH @@ -282,7 +282,7 @@ Basically, we fill the time between now and 2s from now with hands based off the addiction_types = list(/datum/addiction/medicine = 5) //Makes patients fall asleep, then boosts the purirty of their medicine reagents if they're asleep -/datum/reagent/inverse/healing/tirimol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/healing/tirimol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() switch(current_cycle) if(2 to 11)//same delay as chloral hydrate @@ -404,7 +404,7 @@ Basically, we fill the time between now and 2s from now with hands based off the var/poison_interval = (9 SECONDS) -/datum/reagent/inverse/technetium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/technetium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() time_until_next_poison -= seconds_per_tick * (1 SECONDS) if (time_until_next_poison <= 0) @@ -457,7 +457,7 @@ Basically, we fill the time between now and 2s from now with hands based off the addiction_types = list(/datum/addiction/medicine = 3.5) //Heals toxins if it's the only thing present - kinda the oposite of multiver! Maybe that's why it's inverse! -/datum/reagent/inverse/healing/monover/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/healing/monover/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update if(length(affected_mob.reagents.reagent_list) > 1) @@ -517,7 +517,7 @@ Basically, we fill the time between now and 2s from now with hands based off the affected_mob.emote("gasp") affected_mob.playsound_local(affected_mob, 'sound/effects/health/fastbeat.ogg', 65) -/datum/reagent/inverse/penthrite/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/penthrite/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!back_from_the_dead) return @@ -624,7 +624,7 @@ Basically, we fill the time between now and 2s from now with hands based off the //The temporary trauma passed to the affected mob var/datum/brain_trauma/temp_trauma -/datum/reagent/inverse/neurine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/neurine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(temp_trauma) return @@ -721,7 +721,7 @@ Basically, we fill the time between now and 2s from now with hands based off the color = "#4C8000" tox_damage = 0 -/datum/reagent/inverse/antihol/on_mob_life(mob/living/carbon/C, seconds_per_tick, times_fired) +/datum/reagent/inverse/antihol/on_mob_life(mob/living/carbon/C, seconds_per_tick) . = ..() for(var/datum/reagent/consumable/ethanol/alcohol in C.reagents.reagent_list) alcohol.boozepwr += seconds_per_tick @@ -739,7 +739,7 @@ Basically, we fill the time between now and 2s from now with hands based off the ///Did we get a headache? var/headache = FALSE -/datum/reagent/inverse/oculine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/oculine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(headache) return ..() @@ -766,7 +766,7 @@ Basically, we fill the time between now and 2s from now with hands based off the ///The random span we start hearing in var/random_span -/datum/reagent/impurity/inacusiate/on_mob_metabolize(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/impurity/inacusiate/on_mob_metabolize(mob/living/affected_mob, seconds_per_tick) . = ..() random_span = pick("clown", "small", "big", "hypnophrase", "alien", "cult", "alert", "danger", "emote", "yell", "brass", "sans", "papyrus", "robot", "his_grace", "phobia") RegisterSignal(affected_mob, COMSIG_MOVABLE_HEAR, PROC_REF(owner_hear)) @@ -817,13 +817,13 @@ Basically, we fill the time between now and 2s from now with hands based off the ph = 12.2 tox_damage = 0 -/datum/reagent/inverse/oxandrolone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/oxandrolone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/high_message = pick("You feel unstoppable.", "Giving it EVERYTHING!!", "You feel ready for anything.", "You feel like doing a thousand jumping jacks!") if(SPT_PROB(2, seconds_per_tick)) to_chat(affected_mob, span_notice("[high_message]")) -/datum/reagent/inverse/oxandrolone/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/oxandrolone/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(25, seconds_per_tick)) affected_mob.adjust_bodytemperature(30 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick) @@ -852,7 +852,7 @@ Basically, we fill the time between now and 2s from now with hands based off the metabolization_rate = 0.25 * REM tox_damage = 0 -/datum/reagent/inverse/pen_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/pen_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) holder.remove_reagent(/datum/reagent/medicine/c2/seiver, 5 * REM * seconds_per_tick) holder.remove_reagent(/datum/reagent/medicine/potass_iodide, 5 * REM * seconds_per_tick) holder.remove_reagent(/datum/reagent/medicine/c2/multiver, 5 * REM * seconds_per_tick) @@ -874,7 +874,7 @@ Basically, we fill the time between now and 2s from now with hands based off the tox_damage = 0 overdose_threshold = 40 -/datum/reagent/inverse/atropine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/atropine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_STOMACH, -1 * REM * seconds_per_tick) @@ -884,7 +884,7 @@ Basically, we fill the time between now and 2s from now with hands based off the if(need_mob_update) return UPDATE_MOB_HEALTH -/datum/reagent/inverse/atropine/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/atropine/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/static/list/possible_organs = list( ORGAN_SLOT_HEART, @@ -908,7 +908,7 @@ Basically, we fill the time between now and 2s from now with hands based off the metabolization_rate = 0.4 * REM tox_damage = 0 -/datum/reagent/inverse/ammoniated_mercury/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/ammoniated_mercury/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(7.5, seconds_per_tick)) affected_mob.emote("scream") @@ -957,11 +957,11 @@ Basically, we fill the time between now and 2s from now with hands based off the exposed_mob.add_surgery_speed_mod(type, 0.7, min(reac_volume * 1 MINUTES, 5 MINUTES)) -/datum/reagent/inverse/krokodil/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/krokodil/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.add_mood_event("smacked out", /datum/mood_event/narcotic_heavy) -/datum/reagent/inverse/krokodil/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/krokodil/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() affected_mob.set_jitter_if_lower(10 SECONDS) affected_mob.set_dizzy_if_lower(5 SECONDS) @@ -1001,7 +1001,7 @@ Basically, we fill the time between now and 2s from now with hands based off the affected_mob.remove_traits(list(TRAIT_STUNIMMUNE, TRAIT_SLEEPIMMUNE, TRAIT_ANALGESIA, TRAIT_STIMULATED), type) affected_mob.Sleeping(30 SECONDS) -/datum/reagent/inverse/bath_salts/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/bath_salts/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(holder.has_reagent(/datum/reagent/drug/bath_salts)) holder.remove_reagent(type, volume) @@ -1030,7 +1030,7 @@ Basically, we fill the time between now and 2s from now with hands based off the ph = 6.1 tox_damage = 0 -/datum/reagent/inverse/aranesp/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/aranesp/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(overdosed) return @@ -1081,7 +1081,7 @@ Basically, we fill the time between now and 2s from now with hands based off the holder.add_reagent(/datum/reagent/toxin/histamine, 6 * REM * seconds_per_tick) affected_mob.losebreath += 3 -/datum/reagent/inverse/aranesp/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/aranesp/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() var/need_mob_update if(SPT_PROB(10, seconds_per_tick)) @@ -1128,7 +1128,7 @@ Basically, we fill the time between now and 2s from now with hands based off the exposed_mob.emote("cry") return -/datum/reagent/inverse/happiness/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/happiness/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.mob_mood?.has_mood_of_category("friendly_hug") && !HAS_TRAIT(affected_mob, TRAIT_BADTOUCH)) holder.remove_reagent(type, volume) @@ -1167,7 +1167,7 @@ Basically, we fill the time between now and 2s from now with hands based off the affected_mob.manual_emote("exhales sharply.") to_chat(affected_mob, span_warning("You feel an intense burning sensation as your anger subsides!")) -/datum/reagent/inverse/baldium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/baldium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() delayed_burn_damage += (seconds_per_tick * 1) if(holder.has_reagent(/datum/reagent/consumable/salt)) @@ -1271,7 +1271,7 @@ Basically, we fill the time between now and 2s from now with hands based off the for (var/obj/item/bodypart/part as anything in exposed_carbon.bodyparts) part.add_atom_colour(color_filter, WASHABLE_COLOUR_PRIORITY) -/datum/reagent/inverse/colorful_reagent/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/colorful_reagent/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if (!iscarbon(affected_mob)) @@ -1312,7 +1312,7 @@ Basically, we fill the time between now and 2s from now with hands based off the . = ..() affected_mob.RemoveElement(/datum/element/forced_gravity, gravity = 5, ignore_turf_gravity = TRUE, can_override = FALSE) -/datum/reagent/inverse/gravitum/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/inverse/gravitum/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() switch(current_cycle) diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_toxin_reagents.dm index 4dd80ff4d95..576f5e09df9 100644 --- a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_toxin_reagents.dm @@ -26,7 +26,7 @@ ph = 7 liver_damage = 0 -/datum/reagent/impurity/methanol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/impurity/methanol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/obj/item/organ/eyes/eyes = affected_mob.get_organ_slot(ORGAN_SLOT_EYES) if(eyes?.apply_organ_damage(0.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index cbc4d3721ac..c01b06a92ea 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -21,7 +21,7 @@ color = "#DB90C6" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/leporazine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/leporazine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/target_temp = affected_mob.get_body_temp_normal(apply_change = FALSE) if(affected_mob.bodytemperature > target_temp) @@ -65,7 +65,7 @@ if(prob(20)) mytray.visible_message(span_warning("Nothing happens...")) -/datum/reagent/medicine/adminordrazine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/adminordrazine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.heal_bodypart_damage(brute = 5 * REM * seconds_per_tick, burn = 5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype) affected_mob.adjust_tox_loss(-5 * REM * seconds_per_tick, updating_health = FALSE, forced = TRUE, required_biotype = affected_biotype) @@ -85,7 +85,7 @@ ph = 4 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_drowsiness(-10 SECONDS * REM * seconds_per_tick) affected_mob.AdjustAllImmobility(-20 * REM * seconds_per_tick) @@ -104,7 +104,7 @@ ph = 5.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/medicine/synaphydramine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/synaphydramine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_drowsiness(-10 SECONDS * REM * seconds_per_tick) if(holder.has_reagent(/datum/reagent/toxin/mindbreaker)) @@ -123,7 +123,7 @@ ph = 6.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/sansufentanyl/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/sansufentanyl/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_confusion_up_to(3 SECONDS * REM * seconds_per_tick, 5 SECONDS) affected_mob.adjust_dizzy_up_to(6 SECONDS * REM * seconds_per_tick, 12 SECONDS) @@ -145,7 +145,7 @@ burning_volume = 0.1 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() metabolization_rate = REAGENTS_METABOLISM * (0.00001 * (affected_mob.bodytemperature ** 2) + 0.5) if(affected_mob.bodytemperature >= T0C || !HAS_TRAIT(affected_mob, TRAIT_KNOCKEDOUT)) @@ -176,7 +176,7 @@ ph = 12 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/pyroxadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/pyroxadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT) var/power = 0 @@ -214,7 +214,7 @@ inverse_chem = /datum/reagent/inverse/rezadone // Rezadone is almost never used in favor of cryoxadone. Hopefully this will change that. // No such luck so far // with clone damage gone, someone will find a better use for rezadone... right? -/datum/reagent/medicine/rezadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/rezadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.heal_bodypart_damage( brute = 1 * REM * seconds_per_tick, @@ -225,7 +225,7 @@ . = UPDATE_MOB_HEALTH REMOVE_TRAIT(affected_mob, TRAIT_DISFIGURED, TRAIT_GENERIC) -/datum/reagent/medicine/rezadone/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/rezadone/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) . = UPDATE_MOB_HEALTH @@ -268,7 +268,7 @@ inverse_chem_val = 0.3 inverse_chem = /datum/reagent/inverse/oxandrolone -/datum/reagent/medicine/oxandrolone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/oxandrolone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update if(affected_mob.get_fire_loss() > 25) @@ -278,7 +278,7 @@ if(need_mob_update) return UPDATE_MOB_HEALTH -/datum/reagent/medicine/oxandrolone/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/oxandrolone/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(affected_mob.get_fire_loss()) //It only makes existing burns worse if(affected_mob.adjust_fire_loss(4.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_biotype)) // it's going to be healing either 4 or 0.5 @@ -306,7 +306,7 @@ /// Only supplements blood types that use this restoration chem. var/required_restoration_chem = /datum/reagent/iron -/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update = FALSE @@ -322,7 +322,7 @@ if(need_mob_update) return UPDATE_MOB_HEALTH -/datum/reagent/medicine/salglu_solution/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/salglu_solution/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() var/need_mob_update if(SPT_PROB(1.5, seconds_per_tick)) @@ -350,7 +350,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_AFFECTS_WOUNDS metabolized_traits = list(TRAIT_ANALGESIA) -/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_brute_loss(-0.25 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) @@ -397,7 +397,7 @@ ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/omnizine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/omnizine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_tox_loss(-healing * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype) @@ -407,7 +407,7 @@ if(need_mob_update) return UPDATE_MOB_HEALTH -/datum/reagent/medicine/omnizine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/omnizine/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_tox_loss(1.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype) @@ -435,7 +435,7 @@ ph = 1.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/calomel/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/calomel/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() for(var/datum/reagent/target_reagent as anything in affected_mob.reagents.reagent_list) if(istype(target_reagent, /datum/reagent/medicine/calomel)) @@ -445,7 +445,7 @@ if(affected_mob.adjust_tox_loss(toxin_amount * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) return UPDATE_MOB_HEALTH -/datum/reagent/medicine/calomel/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/calomel/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() affected_mob.reagents.remove_reagent(type, 2 * REM * seconds_per_tick) if(affected_mob.adjust_tox_loss(2.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) @@ -465,7 +465,7 @@ inverse_chem_val = 0.50 inverse_chem = /datum/reagent/inverse/ammoniated_mercury -/datum/reagent/medicine/ammoniated_mercury/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/ammoniated_mercury/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/toxin_chem_amount = 0 for(var/datum/reagent/toxin/target_reagent in affected_mob.reagents.reagent_list) @@ -478,7 +478,7 @@ for(var/datum/reagent/medicine/ammoniated_mercury/target_reagent in affected_mob.reagents.reagent_list) affected_mob.reagents.remove_reagent(target_reagent.type, 1 * REM * seconds_per_tick) -/datum/reagent/medicine/ammoniated_mercury/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/ammoniated_mercury/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_tox_loss(3 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) return UPDATE_MOB_HEALTH @@ -492,7 +492,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolized_traits = list(TRAIT_HALT_RADIATION_EFFECTS) -/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(HAS_TRAIT(affected_mob, TRAIT_IRRADIATED)) if(affected_mob.adjust_tox_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) @@ -509,7 +509,7 @@ inverse_chem = /datum/reagent/inverse/pen_acid metabolized_traits = list(TRAIT_HALT_RADIATION_EFFECTS) -/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_tox_loss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) . = UPDATE_MOB_HEALTH @@ -528,7 +528,7 @@ inverse_chem_val = 0.3 inverse_chem = /datum/reagent/inverse/sal_acid -/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update if(affected_mob.get_brute_loss() > 25) @@ -538,7 +538,7 @@ if(need_mob_update) return UPDATE_MOB_HEALTH -/datum/reagent/medicine/sal_acid/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/sal_acid/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(affected_mob.get_brute_loss()) //It only makes existing bruises worse if(affected_mob.adjust_brute_loss(4.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)) // it's going to be healing either 4 or 0.5 @@ -554,7 +554,7 @@ inverse_chem_val = 0.25 inverse_chem = /datum/reagent/inverse/salbutamol -/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_oxy_loss(-3 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) @@ -611,7 +611,7 @@ var/obj/item/organ/lungs/holder_lungs = carbon_mob.get_organ_slot(ORGAN_SLOT_LUNGS) holder_lungs?.adjust_received_pressure_mult(-pressure_mult_increment) -/datum/reagent/medicine/albuterol/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/albuterol/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if (!iscarbon(affected_mob)) @@ -625,7 +625,7 @@ carbon_mob.losebreath += 1 to_chat(affected_mob, span_danger("Your diaphram spasms and you find yourself unable to breathe!")) else - carbon_mob.breathe(seconds_per_tick, times_fired) + carbon_mob.breathe(seconds_per_tick) to_chat(affected_mob, span_danger("Your diaphram spasms and you unintentionally take a breath!")) if (current_cycle > secondary_overdose_effect_cycle_threshold) @@ -672,7 +672,7 @@ . = ..() affected_mob.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/ephedrine) -/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/obj/item/active_held_item = affected_mob.get_active_held_item() if(SPT_PROB(10 * (1.5-creation_purity), seconds_per_tick) && iscarbon(affected_mob) && active_held_item?.w_class > WEIGHT_CLASS_SMALL) @@ -685,7 +685,7 @@ return UPDATE_MOB_HEALTH -/datum/reagent/medicine/ephedrine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/ephedrine/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(1 * (1 + (1-normalise_creation_purity())), seconds_per_tick) && iscarbon(affected_mob)) affected_mob.apply_status_effect(/datum/status_effect/heart_attack) @@ -708,7 +708,7 @@ ph = 11.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(5, seconds_per_tick)) affected_mob.adjust_drowsiness(2 SECONDS) @@ -735,7 +735,7 @@ . = ..() affected_mob.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown) -/datum/reagent/medicine/morphine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/morphine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(current_cycle > 5) affected_mob.add_mood_event("numb", /datum/mood_event/narcotic_medium, name) @@ -762,7 +762,7 @@ if(SPT_PROB(30 * (48 - current_cycle), seconds_per_tick)) affected_mob.Sleeping(4 SECONDS * REM * seconds_per_tick) -/datum/reagent/medicine/morphine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/morphine/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(18, seconds_per_tick)) affected_mob.drop_all_held_items() @@ -819,7 +819,7 @@ var/obj/item/organ/eyes/eyes = organ restore_eyesight(prev_affected_mob, eyes) -/datum/reagent/medicine/oculine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/oculine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/normalized_purity = normalise_creation_purity() affected_mob.adjust_temp_blindness(-4 SECONDS * REM * seconds_per_tick * normalized_purity) @@ -846,7 +846,7 @@ return restore_eyesight(affected_mob, eyes) -/datum/reagent/medicine/oculine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/oculine/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_organ_loss(ORGAN_SLOT_EYES, 1.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) . = UPDATE_MOB_HEALTH @@ -874,7 +874,7 @@ eyes.lighting_cutoff -= delta_light affected_mob.update_sight() -/datum/reagent/medicine/oculine/flumpuline/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/oculine/flumpuline/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/obj/item/organ/eyes/eyes = affected_mob.get_organ_slot(ORGAN_SLOT_EYES) // if no eyes or inorganic do nothing. we let already changed eyes go because funny @@ -887,7 +887,7 @@ flump_eyes(affected_mob, eyes) // Overdose causes constant eye popping -/datum/reagent/medicine/oculine/flumpuline/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/oculine/flumpuline/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(!prob(25)) return @@ -925,7 +925,7 @@ if(affected_mob.can_hear()) to_chat(affected_mob, span_nicegreen("You can feel your hearing drastically improve!")) -/datum/reagent/medicine/inacusiate/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/inacusiate/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/obj/item/organ/ears/ears = affected_mob.get_organ_slot(ORGAN_SLOT_EARS) if(!ears) @@ -953,7 +953,7 @@ inverse_chem = /datum/reagent/inverse/atropine added_traits = list(TRAIT_PREVENT_IMPLANT_AUTO_EXPLOSION) -/datum/reagent/medicine/atropine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/atropine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.health <= affected_mob.crit_threshold) var/need_mob_update @@ -971,7 +971,7 @@ affected_mob.set_dizzy_if_lower(10 SECONDS) affected_mob.set_jitter_if_lower(10 SECONDS) -/datum/reagent/medicine/atropine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/atropine/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_tox_loss(0.5 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) . = UPDATE_MOB_HEALTH @@ -989,7 +989,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolized_traits = list(TRAIT_NOCRITDAMAGE) -/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(holder.has_reagent(/datum/reagent/toxin/lexorin)) if(SPT_PROB(10, seconds_per_tick)) @@ -1018,13 +1018,13 @@ if(need_mob_update) return UPDATE_MOB_HEALTH -/datum/reagent/medicine/epinephrine/metabolize_reagent(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/epinephrine/metabolize_reagent(mob/living/carbon/affected_mob, seconds_per_tick) if(holder.has_reagent(/datum/reagent/toxin/lexorin)) holder.remove_reagent(/datum/reagent/toxin/lexorin, 2 * REM * seconds_per_tick) holder.remove_reagent(/datum/reagent/medicine/epinephrine, 1 * REM * seconds_per_tick) return ..() -/datum/reagent/medicine/epinephrine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/epinephrine/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(18, REM * seconds_per_tick)) var/need_mob_update @@ -1144,7 +1144,7 @@ return ..() -/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/damage_at_random = rand(0, 250)/100 //0 to 2.5 var/need_mob_update @@ -1186,7 +1186,7 @@ inverse_chem_val = 0.45 metabolized_traits = list(TRAIT_TUMOR_SUPPRESSED) //Having mannitol in you will pause the brain damage from brain tumor (so it heals an even 2 brain damage instead of 1.8) -/datum/reagent/medicine/mannitol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/mannitol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, -2 * REM * seconds_per_tick * normalise_creation_purity(), required_organ_flag = affected_organ_flags)) return UPDATE_MOB_HEALTH @@ -1195,7 +1195,7 @@ . = ..() to_chat(affected_mob, span_notice("You suddenly feel E N L I G H T E N E D!")) -/datum/reagent/medicine/mannitol/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/mannitol/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(65, seconds_per_tick)) return @@ -1237,7 +1237,7 @@ if(initial_bdamage < affected_carbon.get_organ_loss(ORGAN_SLOT_BRAIN)) affected_carbon.set_organ_loss(ORGAN_SLOT_BRAIN, initial_bdamage) -/datum/reagent/medicine/neurine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/neurine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(holder.has_reagent(/datum/reagent/consumable/ethanol/neurotoxin)) holder.remove_reagent(/datum/reagent/consumable/ethanol/neurotoxin, 5 * REM * seconds_per_tick * normalise_creation_purity()) @@ -1270,7 +1270,7 @@ human_mob.monkeyize() -/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.remove_status_effect(/datum/status_effect/jitter) if(affected_mob.has_dna()) @@ -1296,7 +1296,7 @@ /datum/status_effect/speech/slurring/drunk, ) -/datum/reagent/medicine/antihol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/antihol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() for(var/effect in status_effects_to_clear) affected_mob.remove_status_effect(effect) @@ -1331,7 +1331,7 @@ . = ..() affected_mob.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/stimulants) -/datum/reagent/medicine/stimulants/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/stimulants/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.health < 50 && affected_mob.health > 0) var/need_mob_update @@ -1344,7 +1344,7 @@ affected_mob.AdjustAllImmobility(-60 * REM * seconds_per_tick) affected_mob.adjust_stamina_loss(-12 * REM * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype) -/datum/reagent/medicine/stimulants/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/stimulants/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(18, seconds_per_tick)) affected_mob.adjust_stamina_loss(2.5, updating_stamina = FALSE, required_biotype = affected_biotype) @@ -1360,7 +1360,7 @@ ph = 6.7 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/insulin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/insulin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.AdjustSleeping(-2 SECONDS * REM * seconds_per_tick) holder.remove_reagent(/datum/reagent/consumable/sugar, 3 * REM * seconds_per_tick) @@ -1374,7 +1374,7 @@ ph = 8.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.losebreath >= 5) affected_mob.losebreath -= 5 * REM * seconds_per_tick @@ -1398,7 +1398,7 @@ exposed_human.set_facial_haircolor(color, update = FALSE) exposed_human.set_haircolor(color, update = TRUE) -/datum/reagent/medicine/regen_jelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/regen_jelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_brute_loss(-1.5 * REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype) @@ -1416,7 +1416,7 @@ ph = 11 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_brute_loss(-5 * REM * seconds_per_tick, updating_health = FALSE) //A ton of healing - this is a 50 telecrystal investment. @@ -1427,7 +1427,7 @@ if(need_mob_update) return UPDATE_MOB_HEALTH -/datum/reagent/medicine/syndicate_nanites/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) //wtb flavortext messages that hint that you're vomitting up robots +/datum/reagent/medicine/syndicate_nanites/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick) //wtb flavortext messages that hint that you're vomitting up robots . = ..() if(SPT_PROB(13, seconds_per_tick)) affected_mob.reagents.remove_reagent(type, metabolization_rate * 15) // ~5 units at a rate of 0.4 but i wanted a nice number in code @@ -1444,7 +1444,7 @@ addiction_types = list(/datum/addiction/hallucinogens = 14) metabolized_traits = list(TRAIT_PACIFISM) -/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update if(current_cycle < 25) //10u has to be processed before u get into THE FUN ZONE @@ -1468,7 +1468,7 @@ if(need_mob_update) return UPDATE_MOB_HEALTH -/datum/reagent/medicine/earthsblood/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/earthsblood/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_hallucinations_up_to(10 SECONDS * REM * seconds_per_tick, 120 SECONDS) var/need_mob_update @@ -1504,7 +1504,7 @@ ph = 4.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/haloperidol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/haloperidol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() for(var/datum/reagent/drug/reagent in affected_mob.reagents.reagent_list) affected_mob.reagents.remove_reagent(reagent.type, 5 * reagent.purge_multiplier * REM * seconds_per_tick) @@ -1534,7 +1534,7 @@ overdose_threshold = 30 chemical_flags = REAGENT_NO_RANDOM_RECIPE -/datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick, times_fired) +/datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick) . = ..() metabolizer.AdjustAllImmobility(-20 * REM * seconds_per_tick) if(metabolizer.adjust_stamina_loss(-30 * REM * seconds_per_tick, updating_stamina = FALSE)) @@ -1563,7 +1563,7 @@ volume -= (min(volume, 1)) return STAMCRIT_CANCELLED -/datum/reagent/medicine/changelingadrenaline/overdose_process(mob/living/metabolizer, seconds_per_tick, times_fired) +/datum/reagent/medicine/changelingadrenaline/overdose_process(mob/living/metabolizer, seconds_per_tick) . = ..() if(metabolizer.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE)) return UPDATE_MOB_HEALTH @@ -1583,7 +1583,7 @@ . = ..() affected_mob.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/changelinghaste) -/datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick, times_fired) +/datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick) . = ..() if(metabolizer.adjust_tox_loss(2 * REM * seconds_per_tick, updating_health = FALSE)) return UPDATE_MOB_HEALTH @@ -1637,7 +1637,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolized_traits = list(TRAIT_SLEEPIMMUNE) -/datum/reagent/medicine/modafinil/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick, times_fired) +/datum/reagent/medicine/modafinil/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick) . = ..() if(overdosed) // We do not want any effects on OD return @@ -1653,7 +1653,7 @@ to_chat(affected_mob, span_userdanger("You feel awfully out of breath and jittery!")) metabolization_rate = 0.025 * REAGENTS_METABOLISM // sets metabolism to 0.005 per second on overdose -/datum/reagent/medicine/modafinil/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/modafinil/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() overdose_progress++ var/need_mob_update @@ -1700,7 +1700,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolized_traits = list(TRAIT_FEARLESS) -/datum/reagent/medicine/psicodine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/psicodine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_jitter(-12 SECONDS * REM * seconds_per_tick) affected_mob.adjust_dizzy(-12 SECONDS * REM * seconds_per_tick) @@ -1709,7 +1709,7 @@ if(affected_mob.mob_mood != null && affected_mob.mob_mood.sanity <= SANITY_NEUTRAL) // only take effect if in negative sanity and then... affected_mob.mob_mood.adjust_sanity(5 * REM * seconds_per_tick, maximum = SANITY_NEUTRAL) // set minimum to prevent unwanted spiking over neutral -/datum/reagent/medicine/psicodine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/psicodine/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_hallucinations_up_to(10 SECONDS * REM * seconds_per_tick, 120 SECONDS) if(affected_mob.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) @@ -1729,7 +1729,7 @@ . = ..() metabolization_rate = 2 * REAGENTS_METABOLISM -/datum/reagent/medicine/metafactor/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/metafactor/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(13, seconds_per_tick)) affected_mob.vomit(VOMIT_CATEGORY_KNOCKDOWN) @@ -1741,7 +1741,7 @@ metabolization_rate = 1.5 * REAGENTS_METABOLISM chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/silibinin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/silibinin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, -2 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) // Add a chance to cure liver trauma once implemented. return UPDATE_MOB_HEALTH @@ -1755,7 +1755,7 @@ taste_description = "numbing bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/polypyr/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) //I wanted a collection of small positive effects, this is as hard to obtain as coniine after all. +/datum/reagent/medicine/polypyr/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) //I wanted a collection of small positive effects, this is as hard to obtain as coniine after all. . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_LUNGS, -0.25 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags) @@ -1770,7 +1770,7 @@ exposed_human.set_facial_haircolor("#9922ff", update = FALSE) exposed_human.set_haircolor(color) //this will call update_body_parts() -/datum/reagent/medicine/polypyr/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/polypyr/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_organ_loss(ORGAN_SLOT_LUNGS, 0.5 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags)) return UPDATE_MOB_HEALTH @@ -1784,7 +1784,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolized_traits = list(TRAIT_ANALGESIA) -/datum/reagent/medicine/granibitaluri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/granibitaluri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/healamount = max(0.5 - round(0.01 * (affected_mob.get_brute_loss() + affected_mob.get_fire_loss()), 0.1), 0) //base of 0.5 healing per cycle and loses 0.1 healing for every 10 combined brute/burn damage you have var/need_mob_update @@ -1793,7 +1793,7 @@ if(need_mob_update) return UPDATE_MOB_HEALTH -/datum/reagent/medicine/granibitaluri/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/granibitaluri/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_LIVER, 0.2 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags) @@ -1831,7 +1831,7 @@ var/mob/living/carbon/human/blood_boy = affected_mob blood_boy.physiology?.bleed_mod /= passive_bleed_modifier -/datum/reagent/medicine/coagulant/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/coagulant/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.coagulant_effect(clot_rate * REM * seconds_per_tick)) if(!was_working) @@ -1841,7 +1841,7 @@ else if(was_working) was_working = FALSE -/datum/reagent/medicine/coagulant/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/coagulant/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() if(!CAN_HAVE_BLOOD(affected_mob)) return @@ -1904,7 +1904,7 @@ ph = 10.6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/ondansetron/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/ondansetron/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(8, seconds_per_tick)) affected_mob.adjust_drowsiness(2 SECONDS * REM * seconds_per_tick) @@ -1930,7 +1930,7 @@ /datum/reagent/inverse/krokodil, ) -/datum/reagent/medicine/naloxone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/medicine/naloxone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() for(var/opiate in opiates_to_clear) holder.remove_reagent(opiate, 3 * REM * seconds_per_tick) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index a528338da7e..18a0369d0c5 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -217,7 +217,7 @@ #undef WATER_TO_WET_STACKS_FACTOR_VAPOR -/datum/reagent/water/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/water/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/obj/item/organ/liver/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER) @@ -247,7 +247,7 @@ name = "Mineral Water" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE|REAGENT_CLEANS -/datum/reagent/water/mineral/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/water/mineral/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_tox_loss(-0.1 * REM * seconds_per_tick, updating_health = FALSE) return UPDATE_MOB_HEALTH @@ -337,7 +337,7 @@ if(IS_CULTIST(affected_mob)) to_chat(affected_mob, span_userdanger("A vile holiness begins to spread its shining tendrils through your mind, purging the Geometer of Blood's influence!")) -/datum/reagent/water/holywater/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/water/holywater/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() data["deciseconds_metabolized"] += (seconds_per_tick * 1 SECONDS * REM) @@ -460,7 +460,7 @@ if(IS_CULTIST(affected_mob)) ADD_TRAIT(affected_mob, TRAIT_COAGULATING, type) -/datum/reagent/fuel/unholywater/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/fuel/unholywater/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update = FALSE @@ -496,7 +496,7 @@ ph = 0.1 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/hellwater/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/hellwater/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.set_fire_stacks(min(affected_mob.fire_stacks + (1.5 * seconds_per_tick), 5)) affected_mob.ignite_mob() //Only problem with igniting people is currently the commonly available fire suits make you immune to being on fire @@ -611,7 +611,7 @@ if((methods & INGEST) && show_message) to_chat(exposed_mob, span_notice("That tasted horrible.")) -/datum/reagent/spraytan/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/spraytan/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() metabolization_rate = 1 * REAGENTS_METABOLISM @@ -663,7 +663,7 @@ "Your appendages begin morphing." = MUT_MSG_EXTENDED, "You feel as though you're about to change at any moment!" = MUT_MSG_ABOUT2TURN) -/datum/reagent/mutationtoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/mutationtoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!ishuman(affected_mob)) return @@ -747,7 +747,7 @@ taste_description = "grandma's gelatin" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/mutationtoxin/jelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/mutationtoxin/jelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) if(!ishuman(affected_mob)) return ..() var/mob/living/carbon/affected_human = affected_mob @@ -848,7 +848,7 @@ taste_description = "slime" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/mulligan/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/mulligan/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!ishuman(affected_mob)) return @@ -894,7 +894,7 @@ ph = 10 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/serotrotium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/serotrotium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(3.5, seconds_per_tick)) affected_mob.emote(pick("twitch","drool","moan","gasp")) @@ -966,7 +966,7 @@ taste_mult = 0 // apparently tasteless. chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/mercury/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/mercury/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!HAS_TRAIT(src, TRAIT_IMMOBILIZED) && isturf(affected_mob.loc) && !isgroundlessturf(affected_mob.loc)) step(affected_mob, pick(GLOB.cardinals)) @@ -1016,7 +1016,7 @@ // White Phosphorous + water -> phosphoric acid. That's not a good thing really. -/datum/reagent/chlorine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/chlorine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.take_bodypart_damage(0.5*REM*seconds_per_tick, 0)) return UPDATE_MOB_HEALTH @@ -1036,7 +1036,7 @@ mytray.adjust_waterlevel(-round(volume * 0.5)) mytray.adjust_weedlevel(-rand(1, 4)) -/datum/reagent/fluorine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/fluorine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_tox_loss(0.5*REM*seconds_per_tick, updating_health = FALSE)) return UPDATE_MOB_HEALTH @@ -1071,7 +1071,7 @@ ph = 11.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/lithium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/lithium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!HAS_TRAIT(affected_mob, TRAIT_IMMOBILIZED) && isturf(affected_mob.loc) && !isgroundlessturf(affected_mob.loc)) step(affected_mob, pick(GLOB.cardinals)) @@ -1143,7 +1143,7 @@ /// How radioactive is this reagent var/rad_power = 1 -/datum/reagent/uranium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/uranium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!HAS_TRAIT(affected_mob, TRAIT_IRRADIATED) && SSradiation.can_irradiate_basic(affected_mob)) var/chance = min(volume / (20 - rad_power * 5), rad_power) @@ -1238,7 +1238,7 @@ do_teleport(exposed_mob, get_turf(exposed_mob), (reac_volume / 5), asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE) //4 tiles per crystal -/datum/reagent/bluespace/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/bluespace/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(current_cycle > 10 && SPT_PROB(7.5, seconds_per_tick)) to_chat(affected_mob, span_warning("You feel unstable...")) @@ -1290,7 +1290,7 @@ exposed_mob.adjust_fire_stacks(reac_volume / 10) -/datum/reagent/fuel/on_mob_life(mob/living/carbon/victim, seconds_per_tick, times_fired) +/datum/reagent/fuel/on_mob_life(mob/living/carbon/victim, seconds_per_tick) . = ..() var/obj/item/organ/liver/liver = victim.get_organ_slot(ORGAN_SLOT_LIVER) if(liver && HAS_TRAIT(liver, TRAIT_HUMAN_AI_METABOLISM)) @@ -1359,7 +1359,7 @@ ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/space_cleaner/ez_clean/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/space_cleaner/ez_clean/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_brute_loss(1.665*seconds_per_tick, updating_health = FALSE) @@ -1388,7 +1388,7 @@ ph = 11.9 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/cryptobiolin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/cryptobiolin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.set_dizzy_if_lower(2 SECONDS) @@ -1410,7 +1410,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED addiction_types = list(/datum/addiction/opioids = 10) -/datum/reagent/impedrezene/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/impedrezene/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_jitter(-5 SECONDS * seconds_per_tick) if(SPT_PROB(55, seconds_per_tick)) @@ -1579,7 +1579,7 @@ . = ..() REMOVE_TRAIT(affected_mob, TRAIT_BLOOD_FOUNTAIN, type) -/datum/reagent/nitrous_oxide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/nitrous_oxide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_drowsiness(4 SECONDS * REM * seconds_per_tick) @@ -1734,7 +1734,7 @@ taste_description = "plant food" ph = 3 -/datum/reagent/plantnutriment/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/plantnutriment/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(tox_prob, seconds_per_tick)) if(affected_mob.adjust_tox_loss(1, updating_health = FALSE, required_biotype = affected_biotype)) @@ -1833,7 +1833,7 @@ ph = 1.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/stable_plasma/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/stable_plasma/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjustPlasma(10 * REM * seconds_per_tick) @@ -1918,7 +1918,7 @@ name = "Royal Carpet?" description = "For those that break the game and need to make an issue report." -/datum/reagent/carpet/royal/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/carpet/royal/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/obj/item/organ/liver/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER) if(liver) @@ -2196,7 +2196,7 @@ for (var/obj/item/bodypart/part as anything in exposed_carbon.bodyparts) part.add_atom_colour(color_filter, WASHABLE_COLOUR_PRIORITY) -/datum/reagent/colorful_reagent/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/colorful_reagent/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if (!iscarbon(affected_mob)) @@ -2300,7 +2300,7 @@ exposed_human.set_hairstyle("Very Long Hair", update = TRUE) to_chat(exposed_human, span_notice("Your[HAS_TRAIT(exposed_human, TRAIT_BALD) ? " facial" : ""] hair starts growing at an incredible speed!")) -/datum/reagent/concentrated_barbers_aid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/concentrated_barbers_aid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(current_cycle > 21 / creation_purity) if(!ishuman(affected_mob)) @@ -2449,7 +2449,7 @@ ph = 3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/royal_bee_jelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/royal_bee_jelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(1, seconds_per_tick)) affected_mob.say(pick("Bzzz...","BZZ BZZ","Bzzzzzzzzzzz..."), forced = "royal bee jelly") @@ -2491,7 +2491,7 @@ color = "#00f041" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/magillitis/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/magillitis/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if((ishuman(affected_mob)) && current_cycle > 10) var/mob/living/basic/gorilla/new_gorilla = affected_mob.gorillize() @@ -2505,7 +2505,7 @@ taste_description = "bitterness" // apparently what viagra tastes like chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/growthserum/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/growthserum/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/newsize = current_size switch(volume) @@ -2549,7 +2549,7 @@ taste_description = "plastic" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/glitter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/glitter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(25, seconds_per_tick)) affected_mob.emote("cough") @@ -2630,7 +2630,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE metabolized_traits = list(TRAIT_CHANGELING_HIVEMIND_MUTE) -/datum/reagent/bz_metabolites/on_mob_life(mob/living/carbon/target, seconds_per_tick, times_fired) +/datum/reagent/bz_metabolites/on_mob_life(mob/living/carbon/target, seconds_per_tick) . = ..() target.adjust_hallucinations(5 SECONDS * REM * seconds_per_tick) var/datum/antagonist/changeling/changeling = IS_CHANGELING(target) @@ -2649,7 +2649,7 @@ taste_description = "dizziness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/peaceborg/confuse/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/peaceborg/confuse/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_confusion_up_to(3 SECONDS * REM * seconds_per_tick, 5 SECONDS) affected_mob.adjust_dizzy_up_to(6 SECONDS * REM * seconds_per_tick, 12 SECONDS) @@ -2664,7 +2664,7 @@ taste_description = "tiredness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/peaceborg/tire/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/peaceborg/tire/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/healthcomp = (100 - affected_mob.health) //DOES NOT ACCOUNT FOR ADMINBUS THINGS THAT MAKE YOU HAVE MORE THAN 200/210 HEALTH, OR SOMETHING OTHER THAN A HUMAN PROCESSING THIS. . = FALSE @@ -2716,7 +2716,7 @@ #define YUCK_PUKE_CYCLES 3 // every X cycle is a puke #define YUCK_PUKES_TO_STUN 3 // hit this amount of pukes in a row to start stunning -/datum/reagent/yuck/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/yuck/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!yuck_cycle) if(SPT_PROB(4, seconds_per_tick)) @@ -2877,7 +2877,7 @@ affected_mob.adjust_stamina_loss(stam_crash) affected_mob.remove_status_effect(/datum/status_effect/determined) -/datum/reagent/determination/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/determination/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!significant && volume >= WOUND_DETERMINATION_SEVERE) significant = TRUE @@ -2908,7 +2908,7 @@ metabolization_rate = 2.5 * REAGENTS_METABOLISM //0.5u/second chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/eldritch/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) +/datum/reagent/eldritch/on_mob_life(mob/living/carbon/drinker, seconds_per_tick) . = ..() var/need_mob_update = FALSE if(IS_HERETIC_OR_MONSTER(drinker)) @@ -3102,7 +3102,7 @@ taste_description = "burning" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/brimdust/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/brimdust/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_fire_loss((ispodperson(affected_mob) ? -1 : 1 * seconds_per_tick), updating_health = FALSE)) return UPDATE_MOB_HEALTH @@ -3140,7 +3140,7 @@ affected_mob.clear_mood_event(name) affected_mob.add_mood_event(name, /datum/mood_event/love_reagent, duration_of_moodlet) -/datum/reagent/love/overdose_process(mob/living/metabolizer, seconds_per_tick, times_fired) +/datum/reagent/love/overdose_process(mob/living/metabolizer, seconds_per_tick) . = ..() var/mob/living/carbon/carbon_metabolizer = metabolizer if(!istype(carbon_metabolizer) || !carbon_metabolizer.can_heartattack() || carbon_metabolizer.undergoing_cardiac_arrest()) @@ -3171,7 +3171,7 @@ exposed_item.make_haunted(HAUNTIUM_REAGENT_TRAIT, "#f8f8ff") addtimer(CALLBACK(exposed_item, TYPE_PROC_REF(/obj/item/, remove_haunted), HAUNTIUM_REAGENT_TRAIT), reac_volume * 20 SECONDS) -/datum/reagent/hauntium/on_mob_metabolize(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/hauntium/on_mob_metabolize(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() to_chat(affected_mob, span_userdanger("You feel an evil presence inside you!")) if(affected_mob.mob_biotypes & MOB_UNDEAD || HAS_MIND_TRAIT(affected_mob, TRAIT_MORBID)) @@ -3179,7 +3179,7 @@ else affected_mob.add_mood_event("hauntium_spirits", /datum/mood_event/hauntium_spirits, name) //8 minutes of mood debuff -/datum/reagent/hauntium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/hauntium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.mob_biotypes & MOB_UNDEAD || HAS_MIND_TRAIT(affected_mob, TRAIT_MORBID)) //if morbid or undead,acts like an addiction-less drug affected_mob.remove_status_effect(/datum/status_effect/jitter) @@ -3248,7 +3248,7 @@ if (eyes && !IS_ROBOTIC_ORGAN(eyes) && !overdosed) REMOVE_TRAIT(affected_human, TRAIT_LUMINESCENT_EYES, REF(src)) -/datum/reagent/luminescent_fluid/on_mob_life(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/luminescent_fluid/on_mob_life(mob/living/affected_mob, seconds_per_tick) . = ..() if (isnull(glowing) && !added_light && volume > 20) diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm index a708f858eeb..10f1e93e497 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm @@ -11,7 +11,7 @@ if(reac_volume >= 1) exposed_turf.AddComponent(/datum/component/thermite, reac_volume) -/datum/reagent/thermite/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/thermite/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_fire_loss(1 * REM * seconds_per_tick, updating_health = FALSE)) return UPDATE_MOB_HEALTH @@ -24,7 +24,7 @@ taste_description = "oil" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/nitroglycerin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/nitroglycerin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_organ_loss(ORGAN_SLOT_HEART, -1 * REM * seconds_per_tick * normalise_creation_purity(), required_organ_flag = affected_organ_flags)) return UPDATE_MOB_HEALTH @@ -49,7 +49,7 @@ penetrates_skin = NONE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/clf3/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/clf3/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_fire_stacks(2 * REM * seconds_per_tick) if(affected_mob.adjust_fire_loss(0.3 * max(affected_mob.fire_stacks, 1) * REM * seconds_per_tick, updating_health = FALSE)) @@ -171,7 +171,7 @@ exposed_mob.adjust_fire_loss(burndmg, 0) exposed_mob.ignite_mob() -/datum/reagent/phlogiston/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick, times_fired) +/datum/reagent/phlogiston/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick) . = ..() metabolizer.adjust_fire_stacks(1 * REM * seconds_per_tick) if(metabolizer.adjust_fire_loss(0.3 * max(metabolizer.fire_stacks, 0.15) * REM * seconds_per_tick, updating_health = FALSE)) @@ -194,7 +194,7 @@ mytray.adjust_weedlevel(-rand(5,9)) //At least give them a small reward if they bother. -/datum/reagent/napalm/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/napalm/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_fire_stacks(1 * REM * seconds_per_tick) @@ -242,7 +242,7 @@ . = ..() metabolization_rate = 0.05 * REM //slower consumption when dead -/datum/reagent/cryostylane/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/cryostylane/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() metabolization_rate = 0.25 * REM//faster consumption when alive if(affected_mob.reagents.has_reagent(/datum/reagent/oxygen)) @@ -273,7 +273,7 @@ burning_volume = 0.05 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/pyrosium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/pyrosium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(holder.has_reagent(/datum/reagent/oxygen)) holder.remove_reagent(/datum/reagent/oxygen, 0.5 * REM * seconds_per_tick) @@ -298,7 +298,7 @@ var/shock_timer = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/teslium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/teslium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() shock_timer++ if(shock_timer >= rand(5, 30)) //Random shocks are wildly unpredictable @@ -335,7 +335,7 @@ taste_description = "jelly" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/teslium/energized_jelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/teslium/energized_jelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) if(!isjellyperson(affected_mob)) //everyone but jellypeople get shocked as normal. return ..() affected_mob.AdjustAllImmobility(-40 *REM * seconds_per_tick) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 380a007dff6..0dbc8adc832 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -23,7 +23,7 @@ /datum/reagent/toxin/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) mytray.adjust_toxic(round(volume * 2)) -/datum/reagent/toxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(toxpwr && affected_mob.health > health_required) if(affected_mob.adjust_tox_loss(toxpwr * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) @@ -65,7 +65,7 @@ exposed_mob.updateappearance() exposed_mob.domutcheck() -/datum/reagent/toxin/mutagen/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/mutagen/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_tox_loss(0.5 * seconds_per_tick * REM, required_biotype = affected_biotype)) return UPDATE_MOB_HEALTH @@ -105,7 +105,7 @@ UnregisterSignal(holder, COMSIG_REAGENTS_TEMP_CHANGE) return ..() -/datum/reagent/toxin/plasma/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/plasma/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(holder.has_reagent(/datum/reagent/medicine/epinephrine)) holder.remove_reagent(/datum/reagent/medicine/epinephrine, 2 * REM * seconds_per_tick) @@ -160,7 +160,7 @@ material = /datum/material/hot_ice chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/hot_ice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/hot_ice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(holder.has_reagent(/datum/reagent/medicine/epinephrine)) holder.remove_reagent(/datum/reagent/medicine/epinephrine, 2 * REM * seconds_per_tick) @@ -190,7 +190,7 @@ ph = 1.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/lexorin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/lexorin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!HAS_TRAIT(affected_mob, TRAIT_NOBREATH)) affected_mob.adjust_oxy_loss(5 * REM * normalise_creation_purity() * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) @@ -221,7 +221,7 @@ ph = 10 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/slimejelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/slimejelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your insides are burning!")) @@ -292,7 +292,7 @@ . = ..() affected_mob.remove_status_effect(/datum/status_effect/reagent_effect/fakedeath) -/datum/reagent/toxin/zombiepowder/on_mob_life(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/zombiepowder/on_mob_life(mob/living/affected_mob, seconds_per_tick) . = ..() if(HAS_TRAIT(affected_mob, TRAIT_FAKEDEATH) && HAS_TRAIT(affected_mob, TRAIT_DEATHCOMA)) return @@ -322,7 +322,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolized_traits = list(TRAIT_FAKEDEATH) -/datum/reagent/toxin/ghoulpowder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/ghoulpowder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_oxy_loss(1 * REM * seconds_per_tick, FALSE, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)) return UPDATE_MOB_HEALTH @@ -341,7 +341,7 @@ addiction_types = list(/datum/addiction/hallucinogens = 18) //7.2 per 2 seconds metabolized_traits = list(TRAIT_RDS_SUPPRESSED) -/datum/reagent/toxin/mindbreaker/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/mindbreaker/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() // mindbreaker toxin assuages hallucinations in those plagued with it, mentally if(affected_mob.has_trauma_type(/datum/brain_trauma/mild/hallucinations)) @@ -433,7 +433,7 @@ . = ..() AddElement(/datum/element/bugkiller_reagent) -/datum/reagent/toxin/pestkiller/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/pestkiller/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_tox_loss(2 * toxpwr * REM * seconds_per_tick, updating_health = FALSE, required_biotype = MOB_BUG)) return UPDATE_MOB_HEALTH @@ -478,7 +478,7 @@ spore_lung_victim.Stun(1 SECONDS) spore_lung_victim.emote("cough") -/datum/reagent/toxin/spore/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/spore/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.damageoverlaytemp = 60 affected_mob.update_damage_hud() @@ -493,7 +493,7 @@ ph = 13 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/toxin/spore_burning/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/spore_burning/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_fire_stacks(2 * REM * seconds_per_tick) affected_mob.ignite_mob() @@ -511,7 +511,7 @@ inverse_chem = /datum/reagent/impurity/chloralax chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/chloralhydrate/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/chloralhydrate/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() switch(current_cycle) if(2 to 11) @@ -545,7 +545,7 @@ icon = initial(copy_from.icon) icon_state = initial(copy_from.icon_state) -/datum/reagent/toxin/fakebeer/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/fakebeer/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() switch(current_cycle) if(2 to 51) @@ -595,7 +595,7 @@ ph = 12.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/mutetoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/mutetoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() // Gain approximately 12 seconds * creation purity seconds of silence every metabolism tick. affected_mob.set_silence_if_lower(6 SECONDS * REM * normalise_creation_purity() * seconds_per_tick) @@ -609,7 +609,7 @@ toxpwr = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/staminatoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/staminatoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_stamina_loss(data * REM * seconds_per_tick, updating_stamina = FALSE)) . = UPDATE_MOB_HEALTH @@ -625,7 +625,7 @@ /// How radioactive is this reagent var/rad_power = 3 -/datum/reagent/toxin/polonium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/polonium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!HAS_TRAIT(affected_mob, TRAIT_IRRADIATED) && SSradiation.can_irradiate_basic(affected_mob)) var/chance = min(volume / (20 - rad_power * 5), rad_power) @@ -677,7 +677,7 @@ toxpwr = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/toxin/histamine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/histamine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(30, seconds_per_tick)) switch(pick(1, 2, 3, 4)) @@ -694,7 +694,7 @@ if(affected_mob.adjust_brute_loss(2* REM * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)) return UPDATE_MOB_HEALTH -/datum/reagent/toxin/histamine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/histamine/overdose_process(mob/living/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_oxy_loss(2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) @@ -717,7 +717,7 @@ inverse_chem = /datum/reagent/impurity/methanol chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) var/obj/item/organ/liver/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER) if(liver && HAS_TRAIT(liver, TRAIT_CORONER_METABOLISM)) //mmmm, the forbidden pickle juice if(affected_mob.adjust_tox_loss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) //it counteracts its own toxin damage. @@ -728,7 +728,7 @@ holder.remove_reagent(/datum/reagent/toxin/formaldehyde, 1.2) return ..() -/datum/reagent/toxin/formaldehyde/metabolize_reagent(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/formaldehyde/metabolize_reagent(mob/living/carbon/affected_mob, seconds_per_tick) if(HAS_TRAIT(affected_mob, TRAIT_BLOCK_FORMALDEHYDE_METABOLISM)) return @@ -744,7 +744,7 @@ ///Mob Size of the current mob sprite. var/current_size = RESIZE_DEFAULT_SIZE -/datum/reagent/toxin/venom/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/venom/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) var/newsize = 1.1 * RESIZE_DEFAULT_SIZE affected_mob.update_transform(newsize/current_size) current_size = newsize @@ -777,7 +777,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED addiction_types = list(/datum/addiction/opioids = 25) -/datum/reagent/toxin/fentanyl/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/fentanyl/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 3 * REM * normalise_creation_purity() * seconds_per_tick, 150) @@ -801,7 +801,7 @@ ph = 9.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/cyanide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/cyanide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update = FALSE if(SPT_PROB(2.5, seconds_per_tick)) @@ -836,7 +836,7 @@ penetrates_skin = TOUCH|VAPOR chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/itching_powder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/itching_powder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) var/scratched = FALSE var/scratch_damage = 0.2 * REM @@ -868,7 +868,7 @@ toxpwr = 2.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/toxin/initropidril/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/initropidril/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!SPT_PROB(13, seconds_per_tick)) return @@ -902,7 +902,7 @@ taste_mult = 0 // undetectable, I guess? chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/toxin/pancuronium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/pancuronium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(current_cycle > 10) affected_mob.Stun(40 * REM * seconds_per_tick) @@ -920,7 +920,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE added_traits = list(TRAIT_ANTICONVULSANT) -/datum/reagent/toxin/sodium_thiopental/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/sodium_thiopental/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(current_cycle > 10) affected_mob.Sleeping(40 * REM * seconds_per_tick) @@ -939,7 +939,7 @@ ph = 6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/sulfonal/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/sulfonal/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(current_cycle > 22) affected_mob.Sleeping(40 * REM * normalise_creation_purity() * seconds_per_tick) @@ -954,7 +954,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED var/delayed_toxin_damage = 0 -/datum/reagent/toxin/amanitin/on_mob_life(mob/living/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/amanitin/on_mob_life(mob/living/affected_mob, seconds_per_tick) . = ..() delayed_toxin_damage += (seconds_per_tick * 3) @@ -977,7 +977,7 @@ inverse_chem = /datum/reagent/impurity/ipecacide chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/lipolicide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/lipolicide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.nutrition <= NUTRITION_LEVEL_STARVING) if(affected_mob.adjust_tox_loss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype)) @@ -993,7 +993,7 @@ toxpwr = 1.75 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/coniine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/coniine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.losebreath < 5) affected_mob.losebreath = min(affected_mob.losebreath + 5 * REM * seconds_per_tick, 5) @@ -1009,7 +1009,7 @@ taste_description = "vomit" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/toxin/spewium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/spewium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(current_cycle > 11 && SPT_PROB(min(31, current_cycle), seconds_per_tick)) affected_mob.vomit(10, prob(10), prob(50), rand(0,4), TRUE) @@ -1023,7 +1023,7 @@ if(reagent != src) affected_mob.reagents.remove_reagent(reagent.type, 1 * reagent.purge_multiplier * REM * seconds_per_tick) -/datum/reagent/toxin/spewium/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/spewium/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(current_cycle > 33 && SPT_PROB(7.5, seconds_per_tick)) affected_mob.spew_organ() @@ -1038,7 +1038,7 @@ toxpwr = 1 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/toxin/curare/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/curare/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(current_cycle > 11) affected_mob.Paralyze(60 * REM * seconds_per_tick) @@ -1059,7 +1059,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolized_traits = list(TRAIT_BLOOD_FOUNTAIN) -/datum/reagent/toxin/heparin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/heparin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) if(holder.has_reagent(/datum/reagent/medicine/coagulant)) //Directly purges coagulants from the system. Get rid of the heparin BEFORE attempting to use coagulants. holder.remove_reagent(/datum/reagent/medicine/coagulant, 2 * REM * seconds_per_tick) return ..() @@ -1077,7 +1077,7 @@ taste_description = "spinning" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/rotatium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/rotatium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(!affected_mob.hud_used || (current_cycle < 20 || (current_cycle % 20) == 0)) return @@ -1106,7 +1106,7 @@ ph = 8 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/anacea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/anacea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) var/remove_amt = 5 if(holder.has_reagent(/datum/reagent/medicine/calomel) || holder.has_reagent(/datum/reagent/medicine/pen_acid)) remove_amt = 0.5 @@ -1181,7 +1181,7 @@ mytray.adjust_toxic(round(volume * 3)) mytray.adjust_weedlevel(-rand(1,4)) -/datum/reagent/toxin/acid/fluacid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/acid/fluacid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_fire_loss(((current_cycle-1)/15) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)) return UPDATE_MOB_HEALTH @@ -1197,7 +1197,7 @@ ph = 1.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/acid/nitracid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/acid/nitracid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_fire_loss((volume/10) * REM * normalise_creation_purity() * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype)) //here you go nervar return UPDATE_MOB_HEALTH @@ -1212,7 +1212,7 @@ var/delay = 31 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/toxin/delayed/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/delayed/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(current_cycle <= delay) return @@ -1253,7 +1253,7 @@ . = ..() affected_mob.say("oof ouch my bones", forced = /datum/reagent/toxin/bonehurtingjuice) -/datum/reagent/toxin/bonehurtingjuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/bonehurtingjuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_stamina_loss(7.5 * REM * seconds_per_tick, updating_stamina = FALSE)) . = UPDATE_MOB_HEALTH @@ -1267,7 +1267,7 @@ if(3) to_chat(affected_mob, span_warning("Your bones hurt!")) -/datum/reagent/toxin/bonehurtingjuice/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/bonehurtingjuice/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(SPT_PROB(2, seconds_per_tick) && iscarbon(affected_mob)) //big oof var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly. @@ -1297,7 +1297,7 @@ taste_description = "tannin" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/bungotoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/bungotoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() if(affected_mob.adjust_organ_loss(ORGAN_SLOT_HEART, 3 * REM * seconds_per_tick)) . = UPDATE_MOB_HEALTH @@ -1321,7 +1321,7 @@ taste_description = "sugary sweetness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/leadacetate/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/leadacetate/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_EARS, 1 * REM * seconds_per_tick) @@ -1345,7 +1345,7 @@ health_required = 10 liver_damage_multiplier = 0 -/datum/reagent/toxin/viperspider/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/viperspider/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() affected_mob.adjust_hallucinations(10 SECONDS * REM * seconds_per_tick) @@ -1368,7 +1368,7 @@ TRAIT_PARALYSIS_R_LEG = BODY_ZONE_R_LEG, ) -/datum/reagent/toxin/tetrodotoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/toxin/tetrodotoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() var/need_mob_update if(HAS_TRAIT(affected_mob, TRAIT_TETRODOTOXIN_HEALING)) diff --git a/code/modules/reagents/withdrawal/_addiction.dm b/code/modules/reagents/withdrawal/_addiction.dm index 8d32dce3d2c..a4c72425b33 100644 --- a/code/modules/reagents/withdrawal/_addiction.dm +++ b/code/modules/reagents/withdrawal/_addiction.dm @@ -55,7 +55,7 @@ end_withdrawal(victim_mind.current) LAZYREMOVE(victim_mind.active_addictions, type) -/datum/addiction/proc/process_addiction(mob/living/carbon/affected_carbon, seconds_per_tick, times_fired) +/datum/addiction/proc/process_addiction(mob/living/carbon/affected_carbon, seconds_per_tick) var/current_addiction_cycle = LAZYACCESS(affected_carbon.mind.active_addictions, type) //If this is null, we're not addicted var/on_drug_of_this_addiction = FALSE for(var/datum/reagent/possible_drug as anything in affected_carbon.reagents.reagent_list) //Go through the drugs in our system diff --git a/code/modules/religion/burdened/psyker.dm b/code/modules/religion/burdened/psyker.dm index cd9fc647a16..014c5b76998 100644 --- a/code/modules/religion/burdened/psyker.dm +++ b/code/modules/religion/burdened/psyker.dm @@ -22,7 +22,7 @@ qdel(removed_from.GetComponent(/datum/component/echolocation)) qdel(removed_from.GetComponent(/datum/component/anti_magic)) -/obj/item/organ/brain/psyker/on_life(seconds_per_tick, times_fired) +/obj/item/organ/brain/psyker/on_life(seconds_per_tick) . = ..() var/obj/item/bodypart/head/psyker/psyker_head = owner.get_bodypart(zone) if(istype(psyker_head)) diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index c4d8e3edf25..2967b5084e1 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -607,7 +607,7 @@ update_icon_dropped() //Return TRUE to get whatever mob this is in to update health. -/obj/item/bodypart/proc/on_life(seconds_per_tick, times_fired) +/obj/item/bodypart/proc/on_life(seconds_per_tick) SHOULD_CALL_PARENT(TRUE) /** diff --git a/code/modules/surgery/organs/_organ.dm b/code/modules/surgery/organs/_organ.dm index 176c11e6853..e57befba957 100644 --- a/code/modules/surgery/organs/_organ.dm +++ b/code/modules/surgery/organs/_organ.dm @@ -156,7 +156,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) if(!IS_ROBOTIC_ORGAN(src) && (clean_types & CLEAN_TYPE_BLOOD)) add_blood_DNA(blood_dna_info) -/obj/item/organ/proc/on_death(seconds_per_tick, times_fired) //runs decay when outside of a person +/obj/item/organ/proc/on_death(seconds_per_tick) //runs decay when outside of a person if(organ_flags & (ORGAN_ROBOTIC | ORGAN_FROZEN)) return @@ -170,7 +170,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) var/air_temperature_factor = min((exposed_air.temperature - T0C) / 20, 1) apply_organ_damage(decay_factor * maxHealth * seconds_per_tick * air_temperature_factor) -/obj/item/organ/proc/on_life(seconds_per_tick, times_fired) //repair organ damage if the organ is not failing +/obj/item/organ/proc/on_life(seconds_per_tick) //repair organ damage if the organ is not failing if(organ_flags & ORGAN_FAILING) handle_failing_organs(seconds_per_tick) return @@ -232,8 +232,8 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) /obj/item/organ/proc/enter_wardrobe() STOP_PROCESSING(SSobj, src) -/obj/item/organ/process(seconds_per_tick, times_fired) - on_death(seconds_per_tick, times_fired) //Kinda hate doing it like this, but I really don't want to call process directly. +/obj/item/organ/process(seconds_per_tick) + on_death(seconds_per_tick) //Kinda hate doing it like this, but I really don't want to call process directly. /obj/item/organ/proc/OnEatFrom(eater, feeder) // You can't use it anymore after eating it diff --git a/code/modules/surgery/organs/external/wings/functional_wings.dm b/code/modules/surgery/organs/external/wings/functional_wings.dm index 8dcd277eecd..6fa0d258e9f 100644 --- a/code/modules/surgery/organs/external/wings/functional_wings.dm +++ b/code/modules/surgery/organs/external/wings/functional_wings.dm @@ -65,7 +65,7 @@ if(wings_open) toggle_flight(organ_owner) -/obj/item/organ/wings/functional/on_life(seconds_per_tick, times_fired) +/obj/item/organ/wings/functional/on_life(seconds_per_tick) . = ..() handle_flight(owner) diff --git a/code/modules/surgery/organs/internal/appendix/_appendix.dm b/code/modules/surgery/organs/internal/appendix/_appendix.dm index 9f942489b1e..767be5214b7 100644 --- a/code/modules/surgery/organs/internal/appendix/_appendix.dm +++ b/code/modules/surgery/organs/internal/appendix/_appendix.dm @@ -29,7 +29,7 @@ icon_state = "[base_icon_state][inflamation_stage ? "inflamed" : ""]" return ..() -/obj/item/organ/appendix/on_life(seconds_per_tick, times_fired) +/obj/item/organ/appendix/on_life(seconds_per_tick) . = ..() if(!owner) return diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm index 7b869624e28..01c56cf1da8 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm @@ -14,7 +14,7 @@ var/poison_amount = 5 slot = ORGAN_SLOT_STOMACH_AID -/obj/item/organ/cyberimp/chest/nutriment/on_life(seconds_per_tick, times_fired) +/obj/item/organ/cyberimp/chest/nutriment/on_life(seconds_per_tick) if(synthesizing) return @@ -55,12 +55,12 @@ COOLDOWN_DECLARE(reviver_cooldown) COOLDOWN_DECLARE(defib_cooldown) -/obj/item/organ/cyberimp/chest/reviver/on_death(seconds_per_tick, times_fired) +/obj/item/organ/cyberimp/chest/reviver/on_death(seconds_per_tick) if(isnull(owner)) // owner can be null, on_death() gets called by /obj/item/organ/process() for decay return try_heal() // Allows implant to work even on dead people -/obj/item/organ/cyberimp/chest/reviver/on_life(seconds_per_tick, times_fired) +/obj/item/organ/cyberimp/chest/reviver/on_life(seconds_per_tick) try_heal() /obj/item/organ/cyberimp/chest/reviver/proc/try_heal() diff --git a/code/modules/surgery/organs/internal/ears/_ears.dm b/code/modules/surgery/organs/internal/ears/_ears.dm index 9b5abe721ff..5e68b8eb468 100644 --- a/code/modules/surgery/organs/internal/ears/_ears.dm +++ b/code/modules/surgery/organs/internal/ears/_ears.dm @@ -26,7 +26,7 @@ /// Multiplier for both long term and short term ear damage var/damage_multiplier = 1 -/obj/item/organ/ears/on_life(seconds_per_tick, times_fired) +/obj/item/organ/ears/on_life(seconds_per_tick) // only inform when things got worse, needs to happen before we heal if((damage > low_threshold && prev_damage < low_threshold) || (damage > high_threshold && prev_damage < high_threshold)) to_chat(owner, span_warning("The ringing in your ears grows louder, blocking out any external noises for a moment.")) diff --git a/code/modules/surgery/organs/internal/eyes/_eyes.dm b/code/modules/surgery/organs/internal/eyes/_eyes.dm index 38d2f3237b8..20bf1ecfac5 100644 --- a/code/modules/surgery/organs/internal/eyes/_eyes.dm +++ b/code/modules/surgery/organs/internal/eyes/_eyes.dm @@ -1181,7 +1181,7 @@ apply_organ_damage(20 * examtool.light_power) //that's 0.5 lightpower for a penlight, so one penlight shining is equivalent to two seconds in a lit area return span_danger("[owner.p_Their()] eyes [penlight_message].") -/obj/item/organ/eyes/night_vision/maintenance_adapted/on_life(seconds_per_tick, times_fired) +/obj/item/organ/eyes/night_vision/maintenance_adapted/on_life(seconds_per_tick) if(owner.get_eye_protection() <= FLASH_PROTECTION_SENSITIVE && !owner.is_blind() && isturf(owner.loc) && owner.has_light_nearby(light_amount=0.5)) //we allow a little more than usual so we can produce light from the adapted eyes to_chat(owner, span_danger("Your eyes! They burn in the light!")) apply_organ_damage(10) //blind quickly diff --git a/code/modules/surgery/organs/internal/heart/_heart.dm b/code/modules/surgery/organs/internal/heart/_heart.dm index 6f272b57d58..fc91066c4a6 100644 --- a/code/modules/surgery/organs/internal/heart/_heart.dm +++ b/code/modules/surgery/organs/internal/heart/_heart.dm @@ -108,7 +108,7 @@ // Always show if the guy needs a heart (so its status can be monitored) return ..() || owner.needs_heart() -/obj/item/organ/heart/on_life(seconds_per_tick, times_fired) +/obj/item/organ/heart/on_life(seconds_per_tick) ..() // If the owner doesn't need a heart, we don't need to do anything with it. @@ -238,7 +238,7 @@ span_userdanger("You feel a terrible pain in your chest, as if your heart has stopped!"), ) -/obj/item/organ/heart/cybernetic/on_life(seconds_per_tick, times_fired) +/obj/item/organ/heart/cybernetic/on_life(seconds_per_tick) . = ..() if(organ_flags & ORGAN_EMP) @@ -320,7 +320,7 @@ /// The cooldown until the next time this heart can give the host an adrenaline boost. COOLDOWN_DECLARE(adrenaline_cooldown) -/obj/item/organ/heart/freedom/on_life(seconds_per_tick, times_fired) +/obj/item/organ/heart/freedom/on_life(seconds_per_tick) . = ..() if(owner.health < 5 && COOLDOWN_FINISHED(src, adrenaline_cooldown)) COOLDOWN_START(src, adrenaline_cooldown, rand(25 SECONDS, 1 MINUTES)) @@ -350,7 +350,7 @@ /// Base healing we receive per tick at 0 damage and for standard versions var/base_healing = 1 -/obj/item/organ/heart/evolved/on_life(seconds_per_tick, times_fired) +/obj/item/organ/heart/evolved/on_life(seconds_per_tick) . = ..() if(prob(healing_probability * seconds_per_tick)) @@ -374,7 +374,7 @@ // How much damage each magic block deals to us var/damage_per_block = 50 -/obj/item/organ/heart/evolved/sacred/on_life(seconds_per_tick, times_fired) +/obj/item/organ/heart/evolved/sacred/on_life(seconds_per_tick) . = ..() if(IS_CULTIST(owner)) diff --git a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm index 78d3d64b715..4dbed5191ee 100644 --- a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm +++ b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm @@ -97,7 +97,7 @@ if(core) return attack(user, user, modifiers) -/obj/item/organ/heart/cybernetic/anomalock/on_life(seconds_per_tick, times_fired) +/obj/item/organ/heart/cybernetic/anomalock/on_life(seconds_per_tick) . = ..() if(!core) return @@ -107,7 +107,7 @@ if(owner.health <= owner.crit_threshold) activate_survival(owner) - if(times_fired % (1 SECONDS)) + if(SSmobs.times_fired % (1 SECONDS)) return var/list/batteries = list() diff --git a/code/modules/surgery/organs/internal/liver/_liver.dm b/code/modules/surgery/organs/internal/liver/_liver.dm index 7038dbee8a6..516c720f4b0 100755 --- a/code/modules/surgery/organs/internal/liver/_liver.dm +++ b/code/modules/surgery/organs/internal/liver/_liver.dm @@ -81,7 +81,7 @@ * * NOTE: If you return COMSIG_MOB_STOP_REAGENT_TICK, that reagent will not be removed like normal! You must handle it manually. **/ -/obj/item/organ/liver/proc/handle_chemical(mob/living/carbon/organ_owner, datum/reagent/chem, seconds_per_tick, times_fired) +/obj/item/organ/liver/proc/handle_chemical(mob/living/carbon/organ_owner, datum/reagent/chem, seconds_per_tick) SIGNAL_HANDLER /obj/item/organ/liver/examine(mob/user) @@ -128,15 +128,15 @@ continue ADD_TRAIT(replacement, readded_trait, JOB_TRAIT) -/obj/item/organ/liver/on_life(seconds_per_tick, times_fired) +/obj/item/organ/liver/on_life(seconds_per_tick) . = ..() //If your liver is failing, then we use the liverless version of metabolize if((organ_flags & ORGAN_FAILING) || HAS_TRAIT(owner, TRAIT_LIVERLESS_METABOLISM)) owner.reagents.end_metabolization(keep_liverless = TRUE) - owner.reagents.metabolize(owner, seconds_per_tick, times_fired, can_overdose = TRUE, liverless = TRUE) + owner.reagents.metabolize(owner, seconds_per_tick, can_overdose = TRUE, liverless = TRUE) return - owner.reagents?.metabolize(owner, seconds_per_tick, times_fired, can_overdose = TRUE) + owner.reagents?.metabolize(owner, seconds_per_tick, can_overdose = TRUE) /obj/item/organ/liver/handle_failing_organs(seconds_per_tick) if(HAS_TRAIT(owner, TRAIT_STABLELIVER) || HAS_TRAIT(owner, TRAIT_LIVERLESS_METABOLISM)) @@ -297,7 +297,7 @@ foodtype_flags = PODPERSON_ORGAN_FOODTYPES color = COLOR_LIME -/obj/item/organ/liver/pod/handle_chemical(mob/living/carbon/organ_owner, datum/reagent/chem, seconds_per_tick, times_fired) +/obj/item/organ/liver/pod/handle_chemical(mob/living/carbon/organ_owner, datum/reagent/chem, seconds_per_tick) . = ..() if((. & COMSIG_MOB_STOP_REAGENT_TICK) || (organ_flags & ORGAN_FAILING)) return @@ -324,7 +324,7 @@ organ_owner.remove_movespeed_modifier(/datum/movespeed_modifier/snail) organ_owner.RemoveElement(/datum/element/lube_walking, require_resting = TRUE) -/obj/item/organ/liver/snail/handle_chemical(mob/living/carbon/organ_owner, datum/reagent/chem, seconds_per_tick, times_fired) +/obj/item/organ/liver/snail/handle_chemical(mob/living/carbon/organ_owner, datum/reagent/chem, seconds_per_tick) . = ..() if((. & COMSIG_MOB_STOP_REAGENT_TICK) || (organ_flags & ORGAN_FAILING)) return @@ -356,7 +356,7 @@ toxTolerance = LIVER_DEFAULT_TOX_TOLERANCE + 1 liver_resistance = 1.1 * LIVER_DEFAULT_TOX_RESISTANCE -/obj/item/organ/liver/bloody/on_life(seconds_per_tick, times_fired) +/obj/item/organ/liver/bloody/on_life(seconds_per_tick) . = ..() owner.adjust_blood_volume(4 * seconds_per_tick, maximum = BLOOD_VOLUME_NORMAL) @@ -377,7 +377,7 @@ /// What to convert stuff into var/convert_into = /datum/reagent/consumable/ethanol -/obj/item/organ/liver/distillery/on_life(seconds_per_tick, times_fired) +/obj/item/organ/liver/distillery/on_life(seconds_per_tick) . = ..() for(var/datum/reagent/reagent as anything in owner.reagents.reagent_list) diff --git a/code/modules/surgery/organs/internal/liver/liver_golem.dm b/code/modules/surgery/organs/internal/liver/liver_golem.dm index 22e4091daec..c05c5df26aa 100644 --- a/code/modules/surgery/organs/internal/liver/liver_golem.dm +++ b/code/modules/surgery/organs/internal/liver/liver_golem.dm @@ -12,7 +12,7 @@ organ_flags = ORGAN_MINERAL color = COLOR_GOLEM_GRAY -/obj/item/organ/liver/golem/handle_chemical(mob/living/carbon/organ_owner, datum/reagent/chem, seconds_per_tick, times_fired) +/obj/item/organ/liver/golem/handle_chemical(mob/living/carbon/organ_owner, datum/reagent/chem, seconds_per_tick) . = ..() // parent returned COMSIG_MOB_STOP_REAGENT_TICK or we are failing if((. & COMSIG_MOB_STOP_REAGENT_TICK) || (organ_flags & ORGAN_FAILING)) diff --git a/code/modules/surgery/organs/internal/liver/liver_plasmaman.dm b/code/modules/surgery/organs/internal/liver/liver_plasmaman.dm index a8c335f8bee..e870149edeb 100644 --- a/code/modules/surgery/organs/internal/liver/liver_plasmaman.dm +++ b/code/modules/surgery/organs/internal/liver/liver_plasmaman.dm @@ -10,7 +10,7 @@ organ_traits = list(TRAIT_PLASMA_LOVER_METABOLISM) milk_burn_healing = 0 -/obj/item/organ/liver/bone/plasmaman/handle_chemical(mob/living/carbon/organ_owner, datum/reagent/chem, seconds_per_tick, times_fired) +/obj/item/organ/liver/bone/plasmaman/handle_chemical(mob/living/carbon/organ_owner, datum/reagent/chem, seconds_per_tick) . = ..() // parent returned COMSIG_MOB_STOP_REAGENT_TICK or we are failing if((. & COMSIG_MOB_STOP_REAGENT_TICK) || (organ_flags & ORGAN_FAILING)) diff --git a/code/modules/surgery/organs/internal/liver/liver_skeleton.dm b/code/modules/surgery/organs/internal/liver/liver_skeleton.dm index fe5d9764e54..240c7223af4 100644 --- a/code/modules/surgery/organs/internal/liver/liver_skeleton.dm +++ b/code/modules/surgery/organs/internal/liver/liver_skeleton.dm @@ -13,7 +13,7 @@ ///Var for burn healing via milk var/milk_burn_healing = 2.5 -/obj/item/organ/liver/bone/handle_chemical(mob/living/carbon/organ_owner, datum/reagent/chem, seconds_per_tick, times_fired) +/obj/item/organ/liver/bone/handle_chemical(mob/living/carbon/organ_owner, datum/reagent/chem, seconds_per_tick) . = ..() // parent returned COMSIG_MOB_STOP_REAGENT_TICK or we are failing if((. & COMSIG_MOB_STOP_REAGENT_TICK) || (organ_flags & ORGAN_FAILING)) diff --git a/code/modules/surgery/organs/internal/lungs/_lungs.dm b/code/modules/surgery/organs/internal/lungs/_lungs.dm index 48be0c3259c..5463a37cd5e 100644 --- a/code/modules/surgery/organs/internal/lungs/_lungs.dm +++ b/code/modules/surgery/organs/internal/lungs/_lungs.dm @@ -845,7 +845,7 @@ QDEL_IN(holder, breath_particle.lifespan) -/obj/item/organ/lungs/on_life(seconds_per_tick, times_fired) +/obj/item/organ/lungs/on_life(seconds_per_tick) . = ..() if(failed && !(organ_flags & ORGAN_FAILING)) failed = FALSE diff --git a/code/modules/surgery/organs/internal/stomach/_stomach.dm b/code/modules/surgery/organs/internal/stomach/_stomach.dm index 678576144fa..1f23b5b16c3 100644 --- a/code/modules/surgery/organs/internal/stomach/_stomach.dm +++ b/code/modules/surgery/organs/internal/stomach/_stomach.dm @@ -56,14 +56,14 @@ QDEL_LAZYLIST(stomach_contents) return ..() -/obj/item/organ/stomach/on_life(seconds_per_tick, times_fired) +/obj/item/organ/stomach/on_life(seconds_per_tick) . = ..() //Manage species digestion if(ishuman(owner)) var/mob/living/carbon/human/humi = owner if(!(organ_flags & ORGAN_FAILING)) - handle_hunger(humi, seconds_per_tick, times_fired) + handle_hunger(humi, seconds_per_tick) var/mob/living/carbon/body = owner @@ -99,7 +99,7 @@ //Handle disgust if(body) - handle_disgust(body, seconds_per_tick, times_fired) + handle_disgust(body, seconds_per_tick) //If the stomach is not damage exit out if(damage < low_threshold) @@ -132,7 +132,7 @@ body.vomit(VOMIT_CATEGORY_DEFAULT, lost_nutrition = damage) to_chat(body, span_warning("Your stomach reels in pain as you're incapable of holding down all that food!")) -/obj/item/organ/stomach/proc/handle_hunger(mob/living/carbon/human/human, seconds_per_tick, times_fired) +/obj/item/organ/stomach/proc/handle_hunger(mob/living/carbon/human/human, seconds_per_tick) if(HAS_TRAIT(human, TRAIT_NOHUNGER)) return //hunger is for BABIES @@ -266,7 +266,7 @@ owner.apply_damage(damage, BRUTE, BODY_ZONE_CHEST, wound_bonus = CANT_WOUND, wound_clothing = FALSE) return emptied -/obj/item/organ/stomach/on_life(seconds_per_tick, times_fired) +/obj/item/organ/stomach/on_life(seconds_per_tick) . = ..() if (!owner || SSmobs.times_fired % 3 != 0) return @@ -339,7 +339,7 @@ return 10 return 0 -/obj/item/organ/stomach/proc/handle_disgust(mob/living/carbon/human/disgusted, seconds_per_tick, times_fired) +/obj/item/organ/stomach/proc/handle_disgust(mob/living/carbon/human/disgusted, seconds_per_tick) var/old_disgust = disgusted.old_disgust var/disgust = disgusted.disgust diff --git a/code/modules/surgery/organs/internal/stomach/stomach_ethereal.dm b/code/modules/surgery/organs/internal/stomach/stomach_ethereal.dm index 06aa5b7a2d4..aea5173ae86 100644 --- a/code/modules/surgery/organs/internal/stomach/stomach_ethereal.dm +++ b/code/modules/surgery/organs/internal/stomach/stomach_ethereal.dm @@ -16,10 +16,10 @@ QDEL_NULL(cell) return ..() -/obj/item/organ/stomach/ethereal/on_life(seconds_per_tick, times_fired) +/obj/item/organ/stomach/ethereal/on_life(seconds_per_tick) . = ..() adjust_charge(-ETHEREAL_DISCHARGE_RATE * seconds_per_tick) - handle_charge(owner, seconds_per_tick, times_fired) + handle_charge(owner, seconds_per_tick) /obj/item/organ/stomach/ethereal/on_mob_insert(mob/living/carbon/stomach_owner) . = ..() @@ -58,7 +58,7 @@ var/amount_changed = clamp(amount, ETHEREAL_CHARGE_NONE - cell.charge(), ETHEREAL_CHARGE_DANGEROUS - cell.charge()) return cell.change(amount_changed) -/obj/item/organ/stomach/ethereal/proc/handle_charge(mob/living/carbon/carbon, seconds_per_tick, times_fired) +/obj/item/organ/stomach/ethereal/proc/handle_charge(mob/living/carbon/carbon, seconds_per_tick) switch(cell.charge()) if(-INFINITY to ETHEREAL_CHARGE_NONE) carbon.add_mood_event("charge", /datum/mood_event/decharged) diff --git a/code/modules/surgery/organs/internal/stomach/stomach_golem.dm b/code/modules/surgery/organs/internal/stomach/stomach_golem.dm index 38e69ba2bcd..f75835359de 100644 --- a/code/modules/surgery/organs/internal/stomach/stomach_golem.dm +++ b/code/modules/surgery/organs/internal/stomach/stomach_golem.dm @@ -30,7 +30,7 @@ return BLOCK_EAT_ATTEMPT /// Golem stomach cannot process nutriment except from minerals -/obj/item/organ/stomach/golem/on_life(delta_time, times_fired) +/obj/item/organ/stomach/golem/on_life(delta_time) for(var/datum/reagent/consumable/food in reagents.reagent_list) if (istype(food, /datum/reagent/consumable/nutriment/mineral)) continue @@ -38,7 +38,7 @@ return ..() /// Slow down based on how full you are -/obj/item/organ/stomach/golem/handle_hunger(mob/living/carbon/human/human, delta_time, times_fired) +/obj/item/organ/stomach/golem/handle_hunger(mob/living/carbon/human/human, delta_time) // the effects are all negative, so just don't run them if you have the trait . = ..() if(HAS_TRAIT(human, TRAIT_NOHUNGER)) diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm index 30d0fd98429..6f8f0f0a100 100644 --- a/code/modules/zombie/organs.dm +++ b/code/modules/zombie/organs.dm @@ -53,7 +53,7 @@ web of pus and viscera, bound tightly around the brain like some \ biological harness.")) -/obj/item/organ/zombie_infection/process(seconds_per_tick, times_fired) +/obj/item/organ/zombie_infection/process(seconds_per_tick) if(!owner) return if(!(src in owner.organs))