From 665f467b2f8ddc4e37810307770f1393ab86abd0 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Tue, 19 Jul 2022 20:55:42 -0300 Subject: [PATCH 1/3] WOOO please pass your arguments if you want to use them! --- code/modules/mob/living/blood.dm | 10 +++++----- code/modules/mob/living/carbon/human/species.dm | 2 +- code/modules/mob/living/carbon/life.dm | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index 99bfa7a91d..c287dbc3dd 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -30,7 +30,7 @@ // Takes care blood loss and regeneration -/mob/living/carbon/human/handle_blood() +/mob/living/carbon/human/handle_blood(delta_time, times_fired) if(NOBLOOD in dna.species.species_traits || bleedsuppress || (HAS_TRAIT(src, TRAIT_FAKEDEATH))) return @@ -39,7 +39,7 @@ return if(bodytemperature >= TCRYO && !(HAS_TRAIT(src, TRAIT_HUSK))) //cryosleep or husked people do not pump the blood. - if(dna.species.handle_blood()) // if this returns TRUE, then the species is not handling blood itself and we can control everything + if(dna.species.handle_blood(src, delta_time, times_fired)) // if this returns TRUE, then the species is not handling blood itself and we can control everything if(integrating_blood > 0) var/blood_integrated = max(integrating_blood - 1, 0) var/blood_diff = integrating_blood - blood_integrated @@ -378,10 +378,10 @@ var/mob/living/carbon/human/H = src if (HAS_TRAIT(src, TRAIT_HIGH_BLOOD)) blood_ratio = 1.2 - H.handle_blood() + H.handle_blood(delta_time, times_fired) return blood_ratio = 1 - H.handle_blood() + H.handle_blood(delta_time, times_fired) return blood_ratio = 1 @@ -391,7 +391,7 @@ blood_ratio = value if(ishuman(src)) var/mob/living/carbon/human/H = src - H.handle_blood() + H.handle_blood(delta_time, times_fired) /mob/living/proc/adjust_integration_blood(value, remove_actual_blood, force) if(integrating_blood + value < 0 && remove_actual_blood) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index af49998afe..ddbb23741b 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -2456,7 +2456,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) //Blood Stuff/// //////////////// // true = handle blood normally, false = do not (and then handle blood in this proc instead please!!) -/datum/species/proc/handle_blood() +/datum/species/proc/handle_blood(mob/living/carbon/human/H, delta_time, times_fired) return TRUE //////////////// diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 27f795015e..9ba2eb6bf7 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -9,7 +9,7 @@ . = FALSE if(!.) return - handle_blood() + handle_blood(delta_time, times_fired) // handle_blood *could* kill us. // we should probably have a better system for if we need to check for death or something in the future hmw if(stat != DEAD) @@ -375,7 +375,7 @@ miasma_turf.air_update_turf() -/mob/living/carbon/proc/handle_blood() +/mob/living/carbon/proc/handle_blood(delta_time, times_fired) return /mob/living/carbon/proc/handle_bodyparts(seconds, times_fired) From c88d687eaa61fec68695055cd72cf9362c67bd12 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Tue, 19 Jul 2022 21:10:06 -0300 Subject: [PATCH 2/3] fix and remove unused proc --- code/modules/mob/living/blood.dm | 21 --------------------- code/modules/mob/living/carbon/life.dm | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index c287dbc3dd..8d5bd40acc 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -372,27 +372,6 @@ if(!B) B = new(T) -//This is a terrible way of handling it. -/mob/living/proc/ResetBloodVol() - if(ishuman(src)) - var/mob/living/carbon/human/H = src - if (HAS_TRAIT(src, TRAIT_HIGH_BLOOD)) - blood_ratio = 1.2 - H.handle_blood(delta_time, times_fired) - return - blood_ratio = 1 - H.handle_blood(delta_time, times_fired) - return - blood_ratio = 1 - -/mob/living/proc/AdjustBloodVol(value) - if(blood_ratio == value) - return - blood_ratio = value - if(ishuman(src)) - var/mob/living/carbon/human/H = src - H.handle_blood(delta_time, times_fired) - /mob/living/proc/adjust_integration_blood(value, remove_actual_blood, force) if(integrating_blood + value < 0 && remove_actual_blood) blood_volume += value + integrating_blood diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 9ba2eb6bf7..3d68d040e9 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -9,7 +9,7 @@ . = FALSE if(!.) return - handle_blood(delta_time, times_fired) + handle_blood(seconds, times_fired) // handle_blood *could* kill us. // we should probably have a better system for if we need to check for death or something in the future hmw if(stat != DEAD) From 329e160a1f72baa07ff6de76b0501565705a8d58 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Wed, 20 Jul 2022 21:40:53 -0300 Subject: [PATCH 3/3] /BiologicalLife(delta_time... --- code/__DEFINES/dcs/signals.dm | 2 +- code/datums/brain_damage/split_personality.dm | 2 +- .../antagonists/blob/blob/blobs/blob_mobs.dm | 4 ++-- .../clockcult/clock_mobs/clockwork_guardian.dm | 2 +- .../clockcult/clock_mobs/clockwork_marauder.dm | 2 +- code/modules/antagonists/devil/imp/imp.dm | 2 +- code/modules/holiday/halloween/jacqueen.dm | 2 +- code/modules/mob/living/brain/life.dm | 2 +- code/modules/mob/living/carbon/alien/larva/life.dm | 2 +- code/modules/mob/living/carbon/alien/life.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 2 +- code/modules/mob/living/carbon/life.dm | 8 ++++---- code/modules/mob/living/carbon/monkey/life.dm | 2 +- code/modules/mob/living/carbon/monkey/punpun.dm | 2 +- code/modules/mob/living/life.dm | 6 +++--- code/modules/mob/living/silicon/ai/life.dm | 2 +- code/modules/mob/living/silicon/pai/pai.dm | 2 +- code/modules/mob/living/silicon/robot/life.dm | 2 +- .../mob/living/simple_animal/eldritch_demons.dm | 2 +- .../mob/living/simple_animal/friendly/cat.dm | 6 +++--- .../mob/living/simple_animal/friendly/crab.dm | 2 +- .../mob/living/simple_animal/friendly/dog.dm | 8 ++++---- .../living/simple_animal/friendly/farm_animals.dm | 14 +++++++------- .../mob/living/simple_animal/friendly/plushie.dm | 2 +- .../living/simple_animal/guardian/types/charger.dm | 2 +- .../living/simple_animal/guardian/types/fire.dm | 2 +- .../mob/living/simple_animal/hostile/bear.dm | 2 +- .../mob/living/simple_animal/hostile/carp.dm | 2 +- .../mob/living/simple_animal/hostile/hostile.dm | 2 +- .../mob/living/simple_animal/hostile/illusion.dm | 2 +- .../living/simple_animal/hostile/jungle/leaper.dm | 2 +- .../simple_animal/hostile/jungle/mega_arachnid.dm | 2 +- .../simple_animal/hostile/megafauna/hierophant.dm | 2 +- .../simple_animal/hostile/megafauna/swarmer.dm | 2 +- .../mob/living/simple_animal/hostile/mimic.dm | 2 +- .../simple_animal/hostile/mining_mobs/basilisk.dm | 2 +- .../mining_mobs/elites/goliath_broodmother.dm | 2 +- .../hostile/mining_mobs/elites/pandora.dm | 2 +- .../simple_animal/hostile/mining_mobs/goliath.dm | 4 ++-- .../simple_animal/hostile/mining_mobs/gutlunch.dm | 2 +- .../simple_animal/hostile/mining_mobs/hivelord.dm | 2 +- .../simple_animal/hostile/mining_mobs/ice_demon.dm | 2 +- .../simple_animal/hostile/mining_mobs/ice_whelp.dm | 2 +- .../simple_animal/hostile/mining_mobs/polarbear.dm | 2 +- .../simple_animal/hostile/mining_mobs/wolf.dm | 2 +- .../mob/living/simple_animal/hostile/mushroom.dm | 2 +- .../living/simple_animal/hostile/netherworld.dm | 2 +- .../mob/living/simple_animal/hostile/plaguerat.dm | 2 +- .../simple_animal/hostile/retaliate/clown.dm | 2 +- .../mob/living/simple_animal/hostile/statue.dm | 2 +- .../mob/living/simple_animal/hostile/tree.dm | 2 +- .../simple_animal/hostile/venus_human_trap.dm | 2 +- .../living/simple_animal/hostile/wumborian_fugu.dm | 2 +- code/modules/mob/living/simple_animal/parrot.dm | 4 ++-- .../modules/mob/living/simple_animal/slime/life.dm | 2 +- 55 files changed, 74 insertions(+), 74 deletions(-) diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index c8909fc80d..83995812a4 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -389,7 +389,7 @@ #define COMPONENT_INTERRUPT_LIFE_PHYSICAL 2 // interrupt physical handling #define COMPONET_INTERRUPT_STATUS_EFFECTS 3 // interrupt status effects -#define COMSIG_LIVING_BIOLOGICAL_LIFE "biological_life" //from base of mob/living/BiologicalLife() (seconds, times_fired) +#define COMSIG_LIVING_BIOLOGICAL_LIFE "biological_life" //from base of mob/living/BiologicalLife() (delta_time, times_fired) #define COMSIG_LIVING_PHYSICAL_LIFE "physical_life" //from base of mob/living/PhysicalLife() (seconds, times_fired) diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm index 6b84e1362d..44a1a76b08 100644 --- a/code/datums/brain_damage/split_personality.dm +++ b/code/datums/brain_damage/split_personality.dm @@ -123,7 +123,7 @@ trauma = _trauma return ..() -/mob/living/split_personality/BiologicalLife(seconds, times_fired) +/mob/living/split_personality/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(QDELETED(body)) diff --git a/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm b/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm index 8ecfc70a42..1c98060d9b 100644 --- a/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm +++ b/code/modules/antagonists/blob/blob/blobs/blob_mobs.dm @@ -102,7 +102,7 @@ factory.spores += src . = ..() -/mob/living/simple_animal/hostile/blob/blobspore/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/blob/blobspore/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(!is_zombie && isturf(src.loc)) @@ -233,7 +233,7 @@ return FALSE return ..() -/mob/living/simple_animal/hostile/blob/blobbernaut/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/blob/blobbernaut/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return var/list/blobs_in_area = range(2, src) diff --git a/code/modules/antagonists/clockcult/clock_mobs/clockwork_guardian.dm b/code/modules/antagonists/clockcult/clock_mobs/clockwork_guardian.dm index a1f9a7fa8d..c937b27f16 100644 --- a/code/modules/antagonists/clockcult/clock_mobs/clockwork_guardian.dm +++ b/code/modules/antagonists/clockcult/clock_mobs/clockwork_guardian.dm @@ -38,7 +38,7 @@ . = ..() true_name = pick(possible_true_names) -/mob/living/simple_animal/hostile/clockwork/guardian/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/clockwork/guardian/BiologicalLife(delta_time, times_fired) ..() if(is_in_host()) if(!is_servant_of_ratvar(host)) diff --git a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm index d58608652c..cab5aec636 100644 --- a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm +++ b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm @@ -39,7 +39,7 @@ if(!shield_health) return "Its shield has been destroyed!" -/mob/living/simple_animal/hostile/clockwork/marauder/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/clockwork/marauder/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return var/turf/T = get_turf(src) diff --git a/code/modules/antagonists/devil/imp/imp.dm b/code/modules/antagonists/devil/imp/imp.dm index c0abe504a5..4b2a41db71 100644 --- a/code/modules/antagonists/devil/imp/imp.dm +++ b/code/modules/antagonists/devil/imp/imp.dm @@ -48,7 +48,7 @@ ..() boost = world.time + 30 -/mob/living/simple_animal/imp/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/imp/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(boost= GAME_STATE_SETTING_UP) @@ -191,7 +191,7 @@ gold_core_spawnable = NO_SPAWN unique_pet = TRUE -/mob/living/simple_animal/pet/cat/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/pet/cat/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(!stat && !buckled && !client) @@ -285,7 +285,7 @@ to_chat(src, "Your name is now \"new_name\"!") name = new_name -/mob/living/simple_animal/pet/cat/cak/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/pet/cat/cak/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(stat) diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm index 8fd97a465c..775ad05c11 100644 --- a/code/modules/mob/living/simple_animal/friendly/crab.dm +++ b/code/modules/mob/living/simple_animal/friendly/crab.dm @@ -30,7 +30,7 @@ . = ..() AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS) -/mob/living/simple_animal/crab/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/crab/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return //CRAB movement diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index fb8c937ea8..16d4ea61fa 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -425,7 +425,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list( RemoveElement(/datum/element/mob_holder, held_icon) AddElement(/datum/element/mob_holder, "old_corgi") -/mob/living/simple_animal/pet/dog/corgi/Ian/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/pet/dog/corgi/Ian/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved) @@ -563,7 +563,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list( nofur = TRUE unique_pet = TRUE -/mob/living/simple_animal/pet/dog/corgi/narsie/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/pet/dog/corgi/narsie/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return for(var/mob/living/simple_animal/pet/P in range(1, src)) @@ -693,7 +693,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list( return ..() -/mob/living/simple_animal/pet/dog/corgi/Lisa/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/pet/dog/corgi/Lisa/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return @@ -707,7 +707,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list( setDir(i) sleep(1) -/mob/living/simple_animal/pet/dog/pug/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/pet/dog/pug/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(!stat && CHECK_MULTIPLE_BITFIELDS(mobility_flags, MOBILITY_STAND|MOBILITY_MOVE) && !buckled) diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index dd6ba49c07..7893f7b26b 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -47,7 +47,7 @@ udder = null return ..() -/mob/living/simple_animal/hostile/retaliate/goat/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/retaliate/goat/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(stat == CONSCIOUS) @@ -163,7 +163,7 @@ else return ..() -/mob/living/simple_animal/cow/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/cow/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(stat == CONSCIOUS) @@ -259,7 +259,7 @@ pixel_y = rand(0, 10) AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS) -/mob/living/simple_animal/chick/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/chick/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(!stat && !ckey) @@ -268,7 +268,7 @@ new /mob/living/simple_animal/chicken(src.loc) qdel(src) -/mob/living/simple_animal/chick/holo/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/chick/holo/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return amount_grown = 0 @@ -347,7 +347,7 @@ else ..() -/mob/living/simple_animal/chicken/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/chicken/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if((!stat && prob(3) && eggsleft > 0) && egg_type) @@ -424,7 +424,7 @@ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS) -/mob/living/simple_animal/kiwi/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/kiwi/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if((!stat && prob(3) && eggsleft > 0) && egg_type) @@ -501,7 +501,7 @@ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS) -/mob/living/simple_animal/babyKiwi/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/babyKiwi/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(!stat && !ckey) diff --git a/code/modules/mob/living/simple_animal/friendly/plushie.dm b/code/modules/mob/living/simple_animal/friendly/plushie.dm index 4821695f45..6a8e2565f1 100644 --- a/code/modules/mob/living/simple_animal/friendly/plushie.dm +++ b/code/modules/mob/living/simple_animal/friendly/plushie.dm @@ -74,7 +74,7 @@ qdel(src) //low regen over time -/mob/living/simple_animal/pet/plushie/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/pet/plushie/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(health < maxHealth) diff --git a/code/modules/mob/living/simple_animal/guardian/types/charger.dm b/code/modules/mob/living/simple_animal/guardian/types/charger.dm index ee5a648067..9715d4f63c 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/charger.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/charger.dm @@ -14,7 +14,7 @@ var/charging = 0 var/atom/movable/screen/alert/chargealert -/mob/living/simple_animal/hostile/guardian/charger/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/guardian/charger/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(ranged_cooldown <= world.time) diff --git a/code/modules/mob/living/simple_animal/guardian/types/fire.dm b/code/modules/mob/living/simple_animal/guardian/types/fire.dm index a05cd517fb..68e05f3f8c 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/fire.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/fire.dm @@ -13,7 +13,7 @@ tech_fluff_string = "Boot sequence complete. Crowd control modules activated. Holoparasite swarm online." carp_fluff_string = "CARP CARP CARP! You caught one! OH GOD, EVERYTHING'S ON FIRE. Except you and the fish." -/mob/living/simple_animal/hostile/guardian/fire/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/guardian/fire/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(summoner) diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index c7772f780d..ba81ad72da 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -129,7 +129,7 @@ attack_verb_continuous = "slaps" attack_verb_simple = "slap" -/mob/living/simple_animal/hostile/bear/butter/BiologicalLife(seconds, times_fired) //Heals butter bear really fast when he takes damage. +/mob/living/simple_animal/hostile/bear/butter/BiologicalLife(delta_time, times_fired) //Heals butter bear really fast when he takes damage. if(stat) return if(health < maxHealth) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 98dddab7bd..7f7589dae4 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -46,7 +46,7 @@ if(regen_amount) regen_cooldown = world.time + REGENERATION_DELAY -/mob/living/simple_animal/hostile/carp/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/carp/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(regen_amount && regen_cooldown < world.time) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 1b6f417b7b..89f27f067e 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -79,7 +79,7 @@ foes = null return ..() -/mob/living/simple_animal/hostile/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/BiologicalLife(delta_time, times_fired) if(!(. = ..())) walk(src, 0) //stops walking return diff --git a/code/modules/mob/living/simple_animal/hostile/illusion.dm b/code/modules/mob/living/simple_animal/hostile/illusion.dm index f561f0d43c..edefa028f9 100644 --- a/code/modules/mob/living/simple_animal/hostile/illusion.dm +++ b/code/modules/mob/living/simple_animal/hostile/illusion.dm @@ -23,7 +23,7 @@ deathmessage = "vanishes into thin air! It was a fake!" has_field_of_vision = FALSE //not meant to be played anyway. -/mob/living/simple_animal/hostile/illusion/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/illusion/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(world.time > life_span) diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm index a0528b4109..f3676e752a 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm @@ -165,7 +165,7 @@ if(!hopping) Hop() -/mob/living/simple_animal/hostile/jungle/leaper/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/jungle/leaper/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return update_icons() diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm index 31303bd7f1..1e0116f52c 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm @@ -26,7 +26,7 @@ footstep_type = FOOTSTEP_MOB_CLAW -/mob/living/simple_animal/hostile/jungle/mega_arachnid/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/jungle/mega_arachnid/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(target && ranged_cooldown > world.time && iscarbon(target)) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index 04967f081d..b8e605a075 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -89,7 +89,7 @@ Difficulty: Normal /mob/living/simple_animal/hostile/megafauna/hierophant/spawn_crusher_loot() new /obj/item/crusher_trophy/vortex_talisman(get_turf(spawned_beacon)) -/mob/living/simple_animal/hostile/megafauna/hierophant/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/megafauna/hierophant/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(spawned_beacon && !QDELETED(spawned_beacon) && !client) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm index 6ce43ed409..a8910f5104 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm @@ -74,7 +74,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa step(R, ddir) //Step the swarmers, instead of spawning them there, incase the turf is solid -/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return var/createtype = GetUncappedAISwarmerType() diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index c2d05e43d9..6370fae0e3 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -118,7 +118,7 @@ GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/ca overlay_googly_eyes = FALSE CopyObject(copy, creator, destroy_original) -/mob/living/simple_animal/hostile/mimic/copy/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/mimic/copy/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(idledamage && !target && !ckey) //Objects eventually revert to normal if no one is around to terrorize diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index cda54e32f9..232bdb04c4 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -95,7 +95,7 @@ wanted_objects = list(/obj/item/pen/survival, /obj/item/stack/ore/diamond) field_of_vision_type = FOV_270_DEGREES //Obviously, it's one eyeball. -/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(stat == CONSCIOUS) 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 5ee249c767..d7b7dc3dae 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 @@ -98,7 +98,7 @@ if(CALL_CHILDREN) call_children() -/mob/living/simple_animal/hostile/asteroid/elite/broodmother/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/asteroid/elite/broodmother/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(health < maxHealth * 0.5 && rand_tent < world.time) 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 50b15933a9..5daeaff9e8 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 @@ -95,7 +95,7 @@ if(AOE_SQUARES) aoe_squares(target) -/mob/living/simple_animal/hostile/asteroid/elite/pandora/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/asteroid/elite/pandora/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(health >= maxHealth * 0.5) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm index 2b7943d130..115681a7d4 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm @@ -38,7 +38,7 @@ footstep_type = FOOTSTEP_MOB_HEAVY -/mob/living/simple_animal/hostile/asteroid/goliath/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/asteroid/goliath/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return handle_preattack() @@ -129,7 +129,7 @@ var/turf/last_location var/tentacle_recheck_cooldown = 100 -/mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(isturf(loc)) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm index d0aa25aabc..f08b52040b 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm @@ -114,7 +114,7 @@ name = "guthen" gender = FEMALE -/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(udder.reagents.total_volume == udder.reagents.maximum_volume) //Only breed when we're full. diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 757272ca98..f2ffd54cbd 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -198,7 +198,7 @@ swarming = TRUE var/can_infest_dead = FALSE -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(isturf(loc)) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm index d40cd8636c..2cf96bf51b 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm @@ -62,7 +62,7 @@ SLEEP_CHECK_DEATH(8) return ..() -/mob/living/simple_animal/hostile/asteroid/ice_demon/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/asteroid/ice_demon/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(target) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm index 7214fd71e0..8ab61d2450 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm @@ -43,7 +43,7 @@ var/list/burn_turfs = getline(src, T) - get_turf(src) dragon_fire_line(src, burn_turfs) -/mob/living/simple_animal/hostile/asteroid/ice_whelp/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/asteroid/ice_whelp/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(target) 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 de9464cc16..9a81d74dc8 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 @@ -44,7 +44,7 @@ aggressive_message_said = TRUE rapid_melee = 2 -/mob/living/simple_animal/hostile/asteroid/polarbear/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/asteroid/polarbear/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(target) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm index 8c4db48434..148d71ecd8 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm @@ -51,7 +51,7 @@ retreat_message_said = TRUE retreat_distance = 30 -/mob/living/simple_animal/hostile/asteroid/wolf/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/asteroid/wolf/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(target) diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 527fd51260..378dbefae7 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -51,7 +51,7 @@ else . += "It looks like it's been roughed up." -/mob/living/simple_animal/hostile/mushroom/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/mushroom/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(!stat)//Mushrooms slowly regenerate if conscious, for people who want to save them from being eaten diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm index c3a272fee0..d538cc0412 100644 --- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm +++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm @@ -45,7 +45,7 @@ var/chosen_sound = pick(migo_sounds) playsound(src, chosen_sound, 100, TRUE) -/mob/living/simple_animal/hostile/netherworld/migo/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/netherworld/migo/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(stat) diff --git a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm index 7112740b39..73dace85cd 100644 --- a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm +++ b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm @@ -86,7 +86,7 @@ GLOBAL_LIST_EMPTY(plague_rats) walk_to(src, entry_vent) break -/mob/living/simple_animal/hostile/plaguerat/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/plaguerat/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(isopenturf(loc)) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm index 0233cb9c5d..2919c6d070 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm @@ -56,7 +56,7 @@ ..() playsound(src.loc, 'sound/items/bikehorn.ogg', 50, TRUE) -/mob/living/simple_animal/hostile/retaliate/clown/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/retaliate/clown/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(banana_time && banana_time < world.time) diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index 600d60eb4d..9356c962fd 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -81,7 +81,7 @@ return 0 return ..() -/mob/living/simple_animal/hostile/statue/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/statue/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(!client && target) // If we have a target and we're AI controlled diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm index 978d58339d..9f53c11df3 100644 --- a/code/modules/mob/living/simple_animal/hostile/tree.dm +++ b/code/modules/mob/living/simple_animal/hostile/tree.dm @@ -44,7 +44,7 @@ gold_core_spawnable = HOSTILE_SPAWN del_on_death = 1 -/mob/living/simple_animal/hostile/tree/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/tree/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(isopenturf(loc)) diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm index 452138fa80..e724da5cc3 100644 --- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm +++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm @@ -100,7 +100,7 @@ /mob/living/simple_animal/hostile/venus_human_trap/ghost_playable playable_plant = TRUE //For admins that want to buss some harmless plants -/mob/living/simple_animal/hostile/venus_human_trap/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/venus_human_trap/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return pull_vines() diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm index eb35606e0d..33b9be4757 100644 --- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm +++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm @@ -47,7 +47,7 @@ QDEL_NULL(E) return ..() -/mob/living/simple_animal/hostile/asteroid/fugu/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/hostile/asteroid/fugu/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(!wumbo) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index fe1ee35428..7111bebe36 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -376,7 +376,7 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list( /* * AI - Not really intelligent, but I'm calling it AI anyway. */ -/mob/living/simple_animal/parrot/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/parrot/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return //Sprite update for when a parrot gets pulled @@ -934,7 +934,7 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list( if(. && !client && prob(1) && prob(1) && CONFIG_GET(string/chat_squawk_tag)) //Only the one true bird may speak across dimensions. send2chat("A stray squawk is heard... \"[message]\"", CONFIG_GET(string/chat_squawk_tag)) -/mob/living/simple_animal/parrot/Poly/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/parrot/Poly/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved) diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index 2ce355a0ef..274af333fc 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -8,7 +8,7 @@ typing_indicator_state = /obj/effect/overlay/typing_indicator/slime -/mob/living/simple_animal/slime/BiologicalLife(seconds, times_fired) +/mob/living/simple_animal/slime/BiologicalLife(delta_time, times_fired) if(!(. = ..())) return if(buckled)