Skip to content

Commit

Permalink
[MIRROR] Replaces even more deciseconds with SECONDS (#1838)
Browse files Browse the repository at this point in the history
* Replaces even more deciseconds with SECONDS (#82438)

## About The Pull Request
Using these search regexes:

Ending in 0:
`addtimer\((.*),\s?(\d{1,3})0\b\)`
replacement:
`addtimer($1, $2 SECONDS)`

Two digit ending in odd:
`addtimer\((.*), (\d)([1-9])\)$`
replacement:
`addtimer($1, $2.$3 SECONDS)`

Single digit ending odd:
`addtimer\((.*), ([1-9])\)$`
replacement:
`addtimer($1, 0.$2 SECONDS)`

## Why It's Good For The Game
Code readability

---------

Co-authored-by: MrMelbert <[email protected]>

* Replaces even more deciseconds with SECONDS

---------

Co-authored-by: Jeremiah <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
  • Loading branch information
3 people authored and StealsThePRs committed Apr 7, 2024
1 parent 9f6e117 commit d7239b8
Show file tree
Hide file tree
Showing 139 changed files with 220 additions and 220 deletions.
2 changes: 1 addition & 1 deletion code/controllers/subsystem/explosions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ SUBSYSTEM_DEF(explosions)
else
continue

addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(wipe_color_and_text), wipe_colours), 100)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(wipe_color_and_text), wipe_colours), 10 SECONDS)

/proc/wipe_color_and_text(list/atom/wiping)
for(var/i in wiping)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/brain_damage/creepy_trauma.dm
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
return
if(prob(25)) // 25% chances to be nervous and stutter.
if(prob(50)) // 12.5% chance (previous check taken into account) of doing something suspicious.
addtimer(CALLBACK(src, PROC_REF(on_failed_social_interaction)), rand(1, 3) SECONDS)
addtimer(CALLBACK(src, PROC_REF(on_failed_social_interaction)), rand(1 SECONDS, 3 SECONDS))
else if(!owner.has_status_effect(/datum/status_effect/speech/stutter))
to_chat(owner, span_warning("Being near [obsession] makes you nervous and you begin to stutter..."))
owner.set_stutter_if_lower(6 SECONDS)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/brain_damage/imaginary_friend.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
qdel(src)
return
if(!friend.client && friend_initialized)
addtimer(CALLBACK(src, PROC_REF(reroll_friend)), 600)
addtimer(CALLBACK(src, PROC_REF(reroll_friend)), 1 MINUTES)

/datum/brain_trauma/special/imaginary_friend/on_death()
..()
Expand Down
4 changes: 2 additions & 2 deletions code/datums/brain_damage/mild.dm
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@
to_chat(owner, span_warning("[pick("You have a coughing fit!", "You can't stop coughing!")]"))
owner.Immobilize(20)
owner.emote("cough")
addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob/, emote), "cough"), 6)
addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob/, emote), "cough"), 12)
addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob/, emote), "cough"), 0.6 SECONDS)
addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob/, emote), "cough"), 1.2 SECONDS)
owner.emote("cough")
..()

Expand Down
2 changes: 1 addition & 1 deletion code/datums/brain_damage/phobia.dm
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
return

if(trigger_regex.Find(hearing_args[HEARING_RAW_MESSAGE]) != 0)
addtimer(CALLBACK(src, PROC_REF(freak_out), null, trigger_regex.group[2]), 10) //to react AFTER the chat message
addtimer(CALLBACK(src, PROC_REF(freak_out), null, trigger_regex.group[2]), 1 SECONDS) //to react AFTER the chat message
hearing_args[HEARING_RAW_MESSAGE] = trigger_regex.Replace(hearing_args[HEARING_RAW_MESSAGE], "[span_phobia("$2")]$3")

/datum/brain_trauma/mild/phobia/handle_speech(datum/source, list/speech_args)
Expand Down
4 changes: 2 additions & 2 deletions code/datums/brain_damage/severe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
to_chat(owner, span_warning("You feel really sick at the thought of being alone!"))
else
to_chat(owner, span_warning("You feel sick..."))
addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob/living/carbon, vomit), high_stress), 50) //blood vomit if high stress
addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob/living/carbon, vomit), high_stress), 5 SECONDS) //blood vomit if high stress
if(2)
if(high_stress)
to_chat(owner, span_warning("You feel weak and scared! If only you weren't alone..."))
Expand Down Expand Up @@ -309,7 +309,7 @@
var/regex/reg = new("(\\b[REGEX_QUOTE(trigger_phrase)]\\b)","ig")

if(findtext(hearing_args[HEARING_RAW_MESSAGE], reg))
addtimer(CALLBACK(src, PROC_REF(hypnotrigger)), 10) //to react AFTER the chat message
addtimer(CALLBACK(src, PROC_REF(hypnotrigger)), 1 SECONDS) //to react AFTER the chat message
hearing_args[HEARING_RAW_MESSAGE] = reg.Replace(hearing_args[HEARING_RAW_MESSAGE], span_hypnophrase("*********"))

/datum/brain_trauma/severe/hypnotic_trigger/proc/hypnotrigger()
Expand Down
4 changes: 2 additions & 2 deletions code/datums/brain_damage/special.dm
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
to_chat(owner, span_warning("Your connection to [linked_target] suddenly feels extremely strong... you can feel it pulling you!"))
owner.playsound_local(owner, 'sound/magic/lightning_chargeup.ogg', 75, FALSE)
returning = TRUE
addtimer(CALLBACK(src, PROC_REF(snapback)), 100)
addtimer(CALLBACK(src, PROC_REF(snapback)), 10 SECONDS)

/datum/brain_trauma/special/quantum_alignment/proc/snapback()
returning = FALSE
Expand Down Expand Up @@ -295,7 +295,7 @@
/datum/brain_trauma/special/death_whispers/proc/whispering()
ADD_TRAIT(owner, TRAIT_SIXTHSENSE, TRAUMA_TRAIT)
active = TRUE
addtimer(CALLBACK(src, PROC_REF(cease_whispering)), rand(50, 300))
addtimer(CALLBACK(src, PROC_REF(cease_whispering)), rand(5 SECONDS, 30 SECONDS))

/datum/brain_trauma/special/death_whispers/proc/cease_whispering()
REMOVE_TRAIT(owner, TRAIT_SIXTHSENSE, TRAUMA_TRAIT)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/brain_damage/split_personality.dm
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
var/message = hearing_args[HEARING_RAW_MESSAGE]
if(findtext(message, codeword))
hearing_args[HEARING_RAW_MESSAGE] = replacetext(message, codeword, span_warning("[codeword]"))
addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/brain_trauma/severe/split_personality, switch_personalities)), 10)
addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/brain_trauma/severe/split_personality, switch_personalities)), 1 SECONDS)

/datum/brain_trauma/severe/split_personality/brainwashing/handle_speech(datum/source, list/speech_args)
if(findtext(speech_args[SPEECH_MESSAGE], codeword))
Expand Down
2 changes: 1 addition & 1 deletion code/datums/components/boomerang.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
/datum/component/boomerang/proc/aerodynamic_swing(datum/thrownthing/throwingdatum, obj/item/true_parent)
var/mob/thrown_by = true_parent.thrownby?.resolve()
if(thrown_by)
addtimer(CALLBACK(true_parent, TYPE_PROC_REF(/atom/movable, throw_at), thrown_by, boomerang_throw_range, throwingdatum.speed, null, TRUE), 1)
addtimer(CALLBACK(true_parent, TYPE_PROC_REF(/atom/movable, throw_at), thrown_by, boomerang_throw_range, throwingdatum.speed, null, TRUE), 0.1 SECONDS)
COOLDOWN_START(src, last_boomerang_throw, BOOMERANG_REBOUND_INTERVAL)
var/mob/thrower = throwingdatum?.get_thrower()
true_parent.visible_message(span_danger("[true_parent] is flying back at [thrower]!"), \
Expand Down
2 changes: 1 addition & 1 deletion code/datums/components/fullauto.dm
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
if(istype(akimbo_gun) && weapon_weight < WEAPON_MEDIUM && allow_akimbo)
if(akimbo_gun.weapon_weight < WEAPON_MEDIUM && akimbo_gun.can_trigger_gun(shooter))
bonus_spread = dual_wield_spread
addtimer(CALLBACK(akimbo_gun, TYPE_PROC_REF(/obj/item/gun, process_fire), target, shooter, TRUE, params, null, bonus_spread), 1)
addtimer(CALLBACK(akimbo_gun, TYPE_PROC_REF(/obj/item/gun, process_fire), target, shooter, TRUE, params, null, bonus_spread), 0.1 SECONDS)
process_fire(target, shooter, TRUE, params, null, bonus_spread)

#undef AUTOFIRE_MOUSEUP
Expand Down
2 changes: 1 addition & 1 deletion code/datums/components/plumbing/_plumbing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@
return

// Defer to later frame because pixel_* is actually updated after all callbacks
addtimer(CALLBACK(parent_obj, TYPE_PROC_REF(/atom/, update_appearance)), 1)
addtimer(CALLBACK(parent_obj, TYPE_PROC_REF(/atom/, update_appearance)), 0.1 SECONDS)

///has one pipe input that only takes, example is manual output pipe
/datum/component/plumbing/simple_demand
Expand Down
6 changes: 3 additions & 3 deletions code/datums/diseases/advance/symptoms/cough.dm
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@
if(power >= 2 && prob(30))
to_chat(affected_mob, span_userdanger("[pick("You have a coughing fit!", "You can't stop coughing!")]"))
affected_mob.Immobilize(20)
addtimer(CALLBACK(affected_mob, TYPE_PROC_REF(/mob/, emote), "cough"), 6)
addtimer(CALLBACK(affected_mob, TYPE_PROC_REF(/mob/, emote), "cough"), 12)
addtimer(CALLBACK(affected_mob, TYPE_PROC_REF(/mob/, emote), "cough"), 18)
addtimer(CALLBACK(affected_mob, TYPE_PROC_REF(/mob/, emote), "cough"), 0.6 SECONDS)
addtimer(CALLBACK(affected_mob, TYPE_PROC_REF(/mob/, emote), "cough"), 1.2 SECONDS)
addtimer(CALLBACK(affected_mob, TYPE_PROC_REF(/mob/, emote), "cough"), 1.8 SECONDS)
4 changes: 2 additions & 2 deletions code/datums/diseases/advance/symptoms/heal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -381,14 +381,14 @@
if(M.getBruteLoss() + M.getFireLoss() >= 103 && !active_coma) //NOVA EDIT: ORIGINAL: 70 - Adjusts this to remain 37.5% of total health(plus crit health). Because 70 is alot less health here then it is on tg.
to_chat(M, span_warning("You feel yourself slip into a regenerative coma..."))
active_coma = TRUE
addtimer(CALLBACK(src, PROC_REF(coma), M), 60)
addtimer(CALLBACK(src, PROC_REF(coma), M), 6 SECONDS)


/datum/symptom/heal/coma/proc/coma(mob/living/M)
if(QDELETED(M) || M.stat == DEAD)
return
M.fakedeath("regenerative_coma", !deathgasp)
addtimer(CALLBACK(src, PROC_REF(uncoma), M), 300)
addtimer(CALLBACK(src, PROC_REF(uncoma), M), 30 SECONDS)

/datum/symptom/heal/coma/proc/uncoma(mob/living/M)
if(QDELETED(M) || !active_coma)
Expand Down
6 changes: 3 additions & 3 deletions code/datums/dna.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1004,10 +1004,10 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
spawn_gibs()
set_species(/datum/species/skeleton)
if(prob(90))
addtimer(CALLBACK(src, PROC_REF(death)), 30)
addtimer(CALLBACK(src, PROC_REF(death)), 3 SECONDS)
if(5)
to_chat(src, span_phobia("LOOK UP!"))
addtimer(CALLBACK(src, PROC_REF(something_horrible_mindmelt)), 30)
addtimer(CALLBACK(src, PROC_REF(something_horrible_mindmelt)), 3 SECONDS)
if(6)
slow_psykerize()

Expand All @@ -1019,4 +1019,4 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
eyes.Remove(src)
qdel(eyes)
visible_message(span_notice("[src] looks up and their eyes melt away!"), span_userdanger("I understand now."))
addtimer(CALLBACK(src, PROC_REF(adjustOrganLoss), ORGAN_SLOT_BRAIN, 200), 20)
addtimer(CALLBACK(src, PROC_REF(adjustOrganLoss), ORGAN_SLOT_BRAIN, 200), 2 SECONDS)
2 changes: 1 addition & 1 deletion code/datums/martial/wrestling.dm
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ If you make a derivative work from this code, you must include this notification
attacker.setDir(turn(attacker.dir, 90))

attacker.forceMove(defender.loc)
addtimer(CALLBACK(src, PROC_REF(CheckStrikeTurf), attacker, T), 4)
addtimer(CALLBACK(src, PROC_REF(CheckStrikeTurf), attacker, T), 0.4 SECONDS)

defender.visible_message(span_danger("[attacker] headbutts [defender]!"), \
span_userdanger("You're headbutted by [attacker]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, attacker)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/mutations/body.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
owner.Unconscious(200 * GET_MUTATION_POWER(src))
owner.set_jitter(2000 SECONDS * GET_MUTATION_POWER(src)) //yes this number looks crazy but the jitter animations are amplified based on the duration.
owner.add_mood_event("epilepsy", /datum/mood_event/epilepsy)
addtimer(CALLBACK(src, PROC_REF(jitter_less)), 90)
addtimer(CALLBACK(src, PROC_REF(jitter_less)), 9 SECONDS)

/datum/mutation/human/epilepsy/proc/jitter_less()
if(QDELETED(owner))
Expand Down
2 changes: 1 addition & 1 deletion code/datums/quirks/negative_quirks/social_anxiety.dm
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
if(prob(85) || (istype(mind_check) && mind_check.mind))
return

addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), quirk_holder, span_smallnotice("You make eye contact with [A].")), 3)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), quirk_holder, span_smallnotice("You make eye contact with [A].")), 0.3 SECONDS)

/datum/quirk/social_anxiety/proc/eye_contact(datum/source, mob/living/other_mob, triggering_examiner)
SIGNAL_HANDLER
Expand Down
2 changes: 1 addition & 1 deletion code/datums/status_effects/debuffs/debuffs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@
// The brain trauma itself does its own set of logging, but this is the only place the source of the hypnosis phrase can be found.
hearing_speaker.log_message("hypnotised [key_name(C)] with the phrase '[hearing_args[HEARING_RAW_MESSAGE]]'", LOG_ATTACK, color="red")
C.log_message("has been hypnotised by the phrase '[hearing_args[HEARING_RAW_MESSAGE]]' spoken by [key_name(hearing_speaker)]", LOG_VICTIM, color="orange", log_globally = FALSE)
addtimer(CALLBACK(C, TYPE_PROC_REF(/mob/living/carbon, gain_trauma), /datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY, hearing_args[HEARING_RAW_MESSAGE]), 10)
addtimer(CALLBACK(C, TYPE_PROC_REF(/mob/living/carbon, gain_trauma), /datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY, hearing_args[HEARING_RAW_MESSAGE]), 1 SECONDS)
addtimer(CALLBACK(C, TYPE_PROC_REF(/mob/living, Stun), 60, TRUE, TRUE), 15) //Take some time to think about it
qdel(src)

Expand Down
4 changes: 2 additions & 2 deletions code/datums/wires/airalarm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
if(!A.shorted)
A.shorted = TRUE
A.update_appearance()
addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/airalarm, reset), wire), 1200)
addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/airalarm, reset), wire), 2 MINUTES)
if(WIRE_IDSCAN) // Toggle lock.
A.locked = !A.locked
if(WIRE_AI) // Disable AI control for a while.
if(!A.aidisabled)
A.aidisabled = TRUE
addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/airalarm, reset), wire), 100)
addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/airalarm, reset), wire), 10 SECONDS)
if(WIRE_PANIC) // Toggle panic siphon.
if(!A.shorted)
if(istype(A.selected_mode, /datum/air_alarm_mode/filtering))
Expand Down
6 changes: 3 additions & 3 deletions code/datums/wires/autolathe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
switch(wire)
if(WIRE_HACK)
A.adjust_hacked(!A.hacked)
addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60)
addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 6 SECONDS)
if(WIRE_SHOCK)
A.shocked = !A.shocked
addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60)
addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 6 SECONDS)
if(WIRE_DISABLE)
A.disabled = !A.disabled
addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60)
addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 6 SECONDS)

/datum/wires/autolathe/on_cut(wire, mend, source)
var/obj/machinery/autolathe/A = holder
Expand Down
2 changes: 1 addition & 1 deletion code/game/atom/atom_act.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
/atom/proc/hitby(atom/movable/hitting_atom, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
SEND_SIGNAL(src, COMSIG_ATOM_HITBY, hitting_atom, skipcatch, hitpush, blocked, throwingdatum)
if(density && !has_gravity(hitting_atom)) //thrown stuff bounces off dense stuff in no grav, unless the thrown stuff ends up inside what it hit(embedding, bola, etc...).
addtimer(CALLBACK(src, PROC_REF(hitby_react), hitting_atom), 2)
addtimer(CALLBACK(src, PROC_REF(hitby_react), hitting_atom), 0.2 SECONDS)

/**
* We have have actually hit the passed in atom
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/camera/camera.dm
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
change_msg = "reactivates"
triggerCameraAlarm()
if(!QDELETED(src)) //We'll be doing it anyway in destroy
addtimer(CALLBACK(src, PROC_REF(cancelCameraAlarm)), 100)
addtimer(CALLBACK(src, PROC_REF(cancelCameraAlarm)), 10 SECONDS)
if(displaymessage)
if(user)
visible_message(span_danger("[user] [change_msg] [src]!"))
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer/arcade/orion_event.dm
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@
game.say("A miniature black hole suddenly appears in front of [game], devouring [gamer] alive!")
gamer.Stun(200, ignore_canstun = TRUE) //you can't run :^)
var/black_hole = new /obj/singularity/orion(gamer.loc)
addtimer(CALLBACK(game, TYPE_PROC_REF(/atom/movable, say), "[black_hole] winks out, just as suddenly as it appeared."), 50)
addtimer(CALLBACK(game, TYPE_PROC_REF(/atom/movable, say), "[black_hole] winks out, just as suddenly as it appeared."), 5 SECONDS)
QDEL_IN(black_hole, 5 SECONDS)

#define BUTTON_DOCK "Dock"
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer/prisoner/gulag_teleporter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
if("teleport")
if(!teleporter || !beacon)
return
addtimer(CALLBACK(src, PROC_REF(teleport), usr), 5)
addtimer(CALLBACK(src, PROC_REF(teleport), usr), 0.5 SECONDS)
return TRUE

/obj/machinery/computer/prisoner/gulag_teleporter_computer/proc/scan_machinery()
Expand Down
8 changes: 4 additions & 4 deletions code/game/machinery/porta_turret/portable_turret.dm
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ DEFINE_BITFIELD(turret_flags, list(
spark_system.start()
if(on && !(turret_flags & TURRET_FLAG_SHOOT_ALL_REACT) && !(obj_flags & EMAGGED))
turret_flags |= TURRET_FLAG_SHOOT_ALL_REACT
addtimer(CALLBACK(src, PROC_REF(reset_attacked)), 60)
addtimer(CALLBACK(src, PROC_REF(reset_attacked)), 6 SECONDS)

/obj/machinery/porta_turret/proc/reset_attacked()
turret_flags &= ~TURRET_FLAG_SHOOT_ALL_REACT
Expand Down Expand Up @@ -827,9 +827,9 @@ DEFINE_BITFIELD(turret_flags, list(
if(target)
setDir(get_dir(base, target))//even if you can't shoot, follow the target
shootAt(target)
addtimer(CALLBACK(src, PROC_REF(shootAt), target), 5)
addtimer(CALLBACK(src, PROC_REF(shootAt), target), 10)
addtimer(CALLBACK(src, PROC_REF(shootAt), target), 15)
addtimer(CALLBACK(src, PROC_REF(shootAt), target), 0.5 SECONDS)
addtimer(CALLBACK(src, PROC_REF(shootAt), target), 1 SECONDS)
addtimer(CALLBACK(src, PROC_REF(shootAt), target), 1.5 SECONDS)
return TRUE

/obj/machinery/porta_turret/ai
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/roulette_machine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@

playsound(src, 'sound/machines/roulettewheel.ogg', 50)
addtimer(CALLBACK(src, PROC_REF(finish_play), player_id, bet_type, bet_amount, payout, rolled_number), 34) //4 deciseconds more so the animation can play
addtimer(CALLBACK(src, PROC_REF(finish_play_animation)), 30)
addtimer(CALLBACK(src, PROC_REF(finish_play_animation)), 3 SECONDS)

use_energy(active_power_usage)

Expand Down Expand Up @@ -448,7 +448,7 @@
return
loc.visible_message(span_warning("\The [src] begins to beep loudly!"))
used = TRUE
addtimer(CALLBACK(src, PROC_REF(launch_payload)), 40)
addtimer(CALLBACK(src, PROC_REF(launch_payload)), 4 SECONDS)

/obj/item/roulette_wheel_beacon/proc/launch_payload()
var/obj/structure/closet/supplypod/centcompod/toLaunch = new()
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/sheetifier.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
var/mutable_appearance/processing_overlay = mutable_appearance(icon, "processing")
processing_overlay.color = last_inserted_material.color
flick_overlay_static(processing_overlay, src, 64)
addtimer(CALLBACK(src, PROC_REF(finish_processing)), 64)
addtimer(CALLBACK(src, PROC_REF(finish_processing)), 6.4 SECONDS)

/obj/machinery/sheetifier/proc/finish_processing()
busy_processing = FALSE
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/suit_storage_unit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@
if(iscarbon(mob_occupant) && mob_occupant.stat < UNCONSCIOUS)
//Awake, organic and screaming
mob_occupant.emote("scream")
addtimer(CALLBACK(src, PROC_REF(cook)), 50)
addtimer(CALLBACK(src, PROC_REF(cook)), 5 SECONDS)
else
uv_cycles = initial(uv_cycles)
uv = FALSE
Expand Down Expand Up @@ -608,7 +608,7 @@
if(locked)
visible_message(span_notice("You see [user] kicking against the doors of [src]!"), \
span_notice("You start kicking against the doors..."))
addtimer(CALLBACK(src, PROC_REF(resist_open), user), 300)
addtimer(CALLBACK(src, PROC_REF(resist_open), user), 30 SECONDS)
else
open_machine()
dump_inventory_contents()
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/syndicatebomb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@
chem_splash(get_turf(src), reagents, spread_range, list(reactants), temp_boost)

// Detonate it again in one second, until it's out of juice.
addtimer(CALLBACK(src, PROC_REF(detonate)), 10)
addtimer(CALLBACK(src, PROC_REF(detonate)), 1 SECONDS)

// If it's not a time release bomb, do normal explosion

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@

/datum/effect_system/explosion/smoke/start()
..()
addtimer(CALLBACK(src, PROC_REF(create_smoke)), 5)
addtimer(CALLBACK(src, PROC_REF(create_smoke)), 0.5 SECONDS)
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
obj_flags &= ~CAN_BE_HIT
icon_state = "rcd_end"
addtimer(CALLBACK(src, PROC_REF(end)), 15)
addtimer(CALLBACK(src, PROC_REF(end)), 1.5 SECONDS)

/obj/effect/constructing_effect/proc/end()
qdel(src)
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/crab17.dm
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
add_overlay("flaps")
add_overlay("hatch")
add_overlay("legs_retracted")
addtimer(CALLBACK(src, PROC_REF(startUp)), 50)
addtimer(CALLBACK(src, PROC_REF(startUp)), 5 SECONDS)
QDEL_IN(src, 8 MINUTES) //Self-destruct after 8 min
ADD_TRAIT(SSeconomy, TRAIT_MARKET_CRASHING, REF(src))

Expand Down Expand Up @@ -202,7 +202,7 @@
if (account) // get_bank_account() may return FALSE
account.transfer_money(B, amount, "?VIVA¿: !LA CRABBE¡")
B.bank_card_talk("You have lost [percentage_lost * 100]% of your funds! A spacecoin credit deposit machine is located at: [get_area(src)].")
addtimer(CALLBACK(src, PROC_REF(dump)), 150) //Drain every 15 seconds
addtimer(CALLBACK(src, PROC_REF(dump)), 15 SECONDS) //Drain every 15 seconds

/obj/structure/checkoutmachine/process()
var/anydir = pick(GLOB.cardinals)
Expand Down Expand Up @@ -238,7 +238,7 @@
/obj/effect/dumpeet_target/Initialize(mapload, user)
. = ..()
bogdanoff = user
addtimer(CALLBACK(src, PROC_REF(startLaunch)), 100)
addtimer(CALLBACK(src, PROC_REF(startLaunch)), 10 SECONDS)
sound_to_playing_players('sound/items/dump_it.ogg', 20)
deadchat_broadcast("Protocol CRAB-17 has been activated. A space-coin market has been launched at the station!", turf_target = get_turf(src), message_type=DEADCHAT_ANNOUNCEMENT)

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/radio/electropack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
if(shock_cooldown)
return
shock_cooldown = TRUE
addtimer(VARSET_CALLBACK(src, shock_cooldown, FALSE), 100)
addtimer(VARSET_CALLBACK(src, shock_cooldown, FALSE), 10 SECONDS)
var/mob/living/L = loc
step(L, pick(GLOB.cardinals))

Expand Down
Loading

0 comments on commit d7239b8

Please sign in to comment.