shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

/BiologicalLife(delta_time...

Browse Source
This commit is contained in:
SandPoot
2022-07-20 21:40:53 -03:00
parent c88d687eaa
commit 329e160a1f
55 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/blob/blob/blobs/blob_mobs.dm
+2 -2
View File
@@ -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)
code/modules/antagonists/clockcult/clock_mobs/clockwork_guardian.dm
+1 -1
View File
@@ -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))
code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm
+1 -1
View File
@@ -39,7 +39,7 @@
if(!shield_health)
return "<span class='warning'>Its shield has been destroyed!</span>"
/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)
code/modules/antagonists/devil/imp/imp.dm
+1 -1
View File
@@ -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<world.time)
code/modules/holiday/halloween/jacqueen.dm
+1 -1
View File
@@ -70,7 +70,7 @@
. = ..()
AddComponent(/datum/component/stationloving)
/mob/living/simple_animal/jacq/BiologicalLife(seconds, times_fired)
/mob/living/simple_animal/jacq/BiologicalLife(delta_time, times_fired)
if(!(. = ..()))
return
if(!ckey)
code/modules/mob/living/brain/life.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/mob/living/brain/BiologicalLife(seconds, times_fired)
/mob/living/brain/BiologicalLife(delta_time, times_fired)
if(!(. = ..()))
return
handle_emp_damage()
code/modules/mob/living/carbon/alien/larva/life.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/mob/living/carbon/alien/larva/BiologicalLife(seconds, times_fired)
/mob/living/carbon/alien/larva/BiologicalLife(delta_time, times_fired)
if(!(. = ..()))
return
// GROW!
code/modules/mob/living/carbon/alien/life.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/mob/living/carbon/alien/BiologicalLife(seconds, times_fired)
/mob/living/carbon/alien/BiologicalLife(delta_time, times_fired)
if(!(. = ..()))
return
findQueen()
code/modules/mob/living/carbon/human/life.dm
+1 -1
View File
@@ -18,7 +18,7 @@
#define THERMAL_PROTECTION_HAND_LEFT 0.025
#define THERMAL_PROTECTION_HAND_RIGHT 0.025
/mob/living/carbon/human/BiologicalLife(seconds, times_fired)
/mob/living/carbon/human/BiologicalLife(delta_time, times_fired)
if(!(. = ..()))
return
handle_active_genes()
code/modules/mob/living/carbon/life.dm
+4 -4
View File
@@ -1,6 +1,6 @@
/mob/living/carbon/BiologicalLife(seconds, times_fired)
/mob/living/carbon/BiologicalLife(delta_time, times_fired)
//Reagent processing needs to come before breathing, to prevent edge cases.
handle_organs(seconds, times_fired)
handle_organs(delta_time, times_fired)
. = ..() // if . is false, we are dead.
if(stat == DEAD)
stop_sound_channel(CHANNEL_HEARTBEAT)
@@ -9,7 +9,7 @@
. = FALSE
if(!.)
return
handle_blood(seconds, times_fired)
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)
@@ -23,7 +23,7 @@
handle_brain_damage()
if(stat != DEAD)
handle_liver(seconds, times_fired)
handle_liver(delta_time, times_fired)
if(stat != DEAD)
handle_corruption()
code/modules/mob/living/carbon/monkey/life.dm
+1 -1
View File
@@ -3,7 +3,7 @@
/mob/living/carbon/monkey
/mob/living/carbon/monkey/BiologicalLife(seconds, times_fired)
/mob/living/carbon/monkey/BiologicalLife(delta_time, times_fired)
if(!(. = ..()))
return
if(client)
code/modules/mob/living/carbon/monkey/punpun.dm
+1 -1
View File
@@ -33,7 +33,7 @@
if(relic_mask)
equip_to_slot_or_del(new relic_mask, ITEM_SLOT_MASK)
/mob/living/carbon/monkey/punpun/BiologicalLife(seconds, times_fired)
/mob/living/carbon/monkey/punpun/BiologicalLife(delta_time, times_fired)
if(!(. = ..()))
return
if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
code/modules/mob/living/life.dm
+3 -3
View File
@@ -42,8 +42,8 @@
* Handles biological life processes like chemical metabolism, breathing, etc
* Returns TRUE or FALSE based on if we were interrupted. This is used by overridden variants to check if they should stop.
*/
/mob/living/proc/BiologicalLife(seconds, times_fired)
SEND_SIGNAL(src,COMSIG_LIVING_BIOLOGICAL_LIFE, seconds, times_fired)
/mob/living/proc/BiologicalLife(delta_time, times_fired)
SEND_SIGNAL(src,COMSIG_LIVING_BIOLOGICAL_LIFE, delta_time, times_fired)
handle_diseases()// 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_wounds()
@@ -67,7 +67,7 @@
//stuff in the stomach
handle_stomach()
handle_block_parry(seconds)
handle_block_parry(delta_time)
handle_traits() // eye, ear, brain damages
code/modules/mob/living/silicon/ai/life.dm
+1 -1
View File
@@ -3,7 +3,7 @@
#define POWER_RESTORATION_SEARCH_APC 2
#define POWER_RESTORATION_APC_FOUND 3
/mob/living/silicon/ai/BiologicalLife(seconds, times_fired)
/mob/living/silicon/ai/BiologicalLife(delta_time, times_fired)
if(!(. = ..()))
return
//I'm not removing that shitton of tabs, unneeded as they are. -- Urist
code/modules/mob/living/silicon/pai/pai.dm
+1 -1
View File
@@ -152,7 +152,7 @@
if(possible_chassis[chassis])
AddElement(/datum/element/mob_holder, chassis, 'icons/mob/pai_item_head.dmi', 'icons/mob/pai_item_rh.dmi', 'icons/mob/pai_item_lh.dmi', ITEM_SLOT_HEAD)
/mob/living/silicon/pai/BiologicalLife(seconds, times_fired)
/mob/living/silicon/pai/BiologicalLife(delta_time, times_fired)
if(!(. = ..()))
return
if(hacking)
code/modules/mob/living/silicon/robot/life.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/mob/living/silicon/robot/BiologicalLife(seconds, times_fired)
/mob/living/silicon/robot/BiologicalLife(delta_time, times_fired)
if(!(. = ..()))
return
adjustOxyLoss(-10) //we're a robot!
code/modules/mob/living/simple_animal/eldritch_demons.dm
+1 -1
View File
@@ -223,7 +223,7 @@
QDEL_NULL(back) // chain destruction baby
return ..()
/mob/living/simple_animal/hostile/eldritch/armsy/BiologicalLife(seconds, times_fired)
/mob/living/simple_animal/hostile/eldritch/armsy/BiologicalLife(delta_time, times_fired)
adjustBruteLoss(-2)
/mob/living/simple_animal/hostile/eldritch/armsy/proc/heal()
code/modules/mob/living/simple_animal/friendly/cat.dm
+3 -3
View File
@@ -118,7 +118,7 @@
Read_Memory()
. = ..()
/mob/living/simple_animal/pet/cat/Runtime/BiologicalLife(seconds, times_fired)
/mob/living/simple_animal/pet/cat/Runtime/BiologicalLife(delta_time, times_fired)
if(!(. = ..()))
return
if(!cats_deployed && SSticker.current_state >= 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, "<span class='notice'>Your name is now <b>\"new_name\"</b>!</span>")
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)
code/modules/mob/living/simple_animal/friendly/crab.dm
+1 -1
View File
@@ -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
code/modules/mob/living/simple_animal/friendly/dog.dm
+4 -4
View File
@@ -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)
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+7 -7
View File
@@ -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)
code/modules/mob/living/simple_animal/friendly/plushie.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/guardian/types/charger.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/guardian/types/fire.dm
+1 -1
View File
@@ -13,7 +13,7 @@
tech_fluff_string = "<span class='holoparasite'>Boot sequence complete. Crowd control modules activated. Holoparasite swarm online.</span>"
carp_fluff_string = "<span class='holoparasite'>CARP CARP CARP! You caught one! OH GOD, EVERYTHING'S ON FIRE. Except you and the fish.</span>"
/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)
code/modules/mob/living/simple_animal/hostile/bear.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/hostile/carp.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/hostile/hostile.dm
+1 -1
View File
@@ -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
code/modules/mob/living/simple_animal/hostile/illusion.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
+1 -1
View File
@@ -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()
code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm
+1 -1
View File
@@ -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))
code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
+1 -1
View File
@@ -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()
code/modules/mob/living/simple_animal/hostile/mimic.dm
+1 -1
View File
@@ -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
code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+2 -2
View File
@@ -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))
code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
+1 -1
View File
@@ -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.
code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
+1 -1
View File
@@ -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))
code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/hostile/mushroom.dm
+1 -1
View File
@@ -51,7 +51,7 @@
else
. += "<span class='info'>It looks like it's been roughed up.</span>"
/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
code/modules/mob/living/simple_animal/hostile/netherworld.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/hostile/plaguerat.dm
+1 -1
View File
@@ -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))
code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/hostile/statue.dm
+1 -1
View File
@@ -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
code/modules/mob/living/simple_animal/hostile/tree.dm
+1 -1
View File
@@ -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))
code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
+1 -1
View File
@@ -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()
code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_animal/parrot.dm
+2 -2
View File
@@ -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)
code/modules/mob/living/simple_animal/slime/life.dm
+1 -1
View File
@@ -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)