diff --git a/.github/guides/STANDARDS.md b/.github/guides/STANDARDS.md index 1350be3735a..4716fa1b655 100644 --- a/.github/guides/STANDARDS.md +++ b/.github/guides/STANDARDS.md @@ -214,7 +214,7 @@ In a lot of our older code, `process()` is frame dependent. Here's some example var/health = 100 var/health_loss = 4 //We want to lose 2 health per second, so 4 per SSmobs process -/mob/testmob/process(delta_time) //SSmobs runs once every 2 seconds +/mob/testmob/process(seconds_per_tick) //SSmobs runs once every 2 seconds health -= health_loss ``` @@ -229,11 +229,11 @@ How do we solve this? By using delta-time. Delta-time is the amount of seconds y var/health = 100 var/health_loss = 2 //Health loss every second -/mob/testmob/process(delta_time) //SSmobs runs once every 2 seconds - health -= health_loss * delta_time +/mob/testmob/process(seconds_per_tick) //SSmobs runs once every 2 seconds + health -= health_loss * seconds_per_tick ``` -In the above example, we made our health_loss variable a per second value rather than per process. In the actual process() proc we then make use of deltatime. Because SSmobs runs once every 2 seconds. Delta_time would have a value of 2. This means that by doing health_loss * delta_time, you end up with the correct amount of health_loss per process, but if for some reason the SSmobs subsystem gets changed to be faster or slower in a PR, your health_loss variable will work the same. +In the above example, we made our health_loss variable a per second value rather than per process. In the actual process() proc we then make use of deltatime. Because SSmobs runs once every 2 seconds. Delta_time would have a value of 2. This means that by doing health_loss * seconds_per_tick, you end up with the correct amount of health_loss per process, but if for some reason the SSmobs subsystem gets changed to be faster or slower in a PR, your health_loss variable will work the same. For example, if SSmobs is set to run once every 4 seconds, it would call process once every 4 seconds and multiply your health_loss var by 4 before subtracting it. Ensuring that your code is frame independent. diff --git a/code/__DEFINES/blob_defines.dm b/code/__DEFINES/blob_defines.dm index 8349ad47a04..4594f9eac50 100644 --- a/code/__DEFINES/blob_defines.dm +++ b/code/__DEFINES/blob_defines.dm @@ -19,7 +19,7 @@ #define BLOB_BRUTE_RESIST 0.5 // Brute damage taken gets multiplied by this value #define BLOB_FIRE_RESIST 1 // Burn damage taken gets multiplied by this value #define BLOB_EXPAND_CHANCE_MULTIPLIER 1 // Increase this value to make blobs naturally expand faster -#define BLOB_REINFORCE_CHANCE 2.5 // The delta_time chance for cores/nodes to reinforce their surroundings +#define BLOB_REINFORCE_CHANCE 2.5 // The seconds_per_tick chance for cores/nodes to reinforce their surroundings #define BLOB_REAGENTATK_VOL 25 // Amount of strain-reagents that get injected when the blob attacks: main source of blob damage 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 5e5864665be..06f1850353c 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm @@ -83,7 +83,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(): (delta_time, times_fired) +/// from start of /mob/living/handle_breathing(): (seconds_per_tick, times_fired) #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/maths.dm b/code/__DEFINES/maths.dm index 3820512db45..cbcea4e5374 100644 --- a/code/__DEFINES/maths.dm +++ b/code/__DEFINES/maths.dm @@ -232,12 +232,12 @@ #define RULE_OF_THREE(a, b, x) ((a*x)/b) -/// Converts a probability/second chance to probability/delta_time chance -/// For example, if you want an event to happen with a 10% per second chance, but your proc only runs every 5 seconds, do `if(prob(100*DT_PROB_RATE(0.1, 5)))` -#define DT_PROB_RATE(prob_per_second, delta_time) (1 - (1 - (prob_per_second)) ** (delta_time)) +/// Converts a probability/second chance to probability/seconds_per_tick chance +/// For example, if you want an event to happen with a 10% per second chance, but your proc only runs every 5 seconds, do `if(prob(100*SPT_PROB_RATE(0.1, 5)))` +#define SPT_PROB_RATE(prob_per_second, seconds_per_tick) (1 - (1 - (prob_per_second)) ** (seconds_per_tick)) -/// Like DT_PROB_RATE but easier to use, simply put `if(DT_PROB(10, 5))` -#define DT_PROB(prob_per_second_percent, delta_time) (prob(100*DT_PROB_RATE((prob_per_second_percent)/100, (delta_time)))) +/// Like SPT_PROB_RATE but easier to use, simply put `if(SPT_PROB(10, 5))` +#define SPT_PROB(prob_per_second_percent, seconds_per_tick) (prob(100*SPT_PROB_RATE((prob_per_second_percent)/100, (seconds_per_tick)))) // ) #define GET_TRUE_DIST(a, b) (a == null || b == null) ? -1 : max(abs(a.x -b.x), abs(a.y-b.y), abs(a.z-b.z)) diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 85851aa6c1a..fafc3212bfd 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -306,7 +306,7 @@ #define WARDROBE_CALLBACK_REMOVE 2 // Subsystem delta times or tickrates, in seconds. I.e, how many seconds in between each process() call for objects being processed by that subsystem. -// Only use these defines if you want to access some other objects processing delta_time, otherwise use the delta_time that is sent as a parameter to process() +// Only use these defines if you want to access some other objects processing seconds_per_tick, otherwise use the seconds_per_tick that is sent as a parameter to process() #define SSFLUIDS_DT (SSplumbing.wait/10) #define SSMACHINES_DT (SSmachines.wait/10) #define SSMOBS_DT (SSmobs.wait/10) diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index e5bf7287f82..bd7a8e5e9e1 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -524,7 +524,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table while(status < DB_QUERY_FINISHED) stoplag() -/datum/db_query/process(delta_time) +/datum/db_query/process(seconds_per_tick) if(status >= DB_QUERY_FINISHED) return diff --git a/code/controllers/subsystem/economy.dm b/code/controllers/subsystem/economy.dm index f61bd87d82a..58c8a6d4228 100644 --- a/code/controllers/subsystem/economy.dm +++ b/code/controllers/subsystem/economy.dm @@ -93,7 +93,7 @@ SUBSYSTEM_DEF(economy) #define ECON_PRICE_UPDATE_STEP "econ_prc_stp" /datum/controller/subsystem/economy/fire(resumed = 0) - var/delta_time = wait / (5 MINUTES) + var/seconds_per_tick = wait / (5 MINUTES) if(!resumed) temporary_total = 0 @@ -139,7 +139,7 @@ SUBSYSTEM_DEF(economy) return var/effective_mailcount = round(living_player_count()/(inflation_value - 0.5)) //More mail at low inflation, and vis versa. - mail_waiting += clamp(effective_mailcount, 1, MAX_MAIL_PER_MINUTE * delta_time) + mail_waiting += clamp(effective_mailcount, 1, MAX_MAIL_PER_MINUTE * seconds_per_tick) /** * Handy proc for obtaining a department's bank account, given the department ID, AKA the define assigned for what department they're under. diff --git a/code/controllers/subsystem/fire_burning.dm b/code/controllers/subsystem/fire_burning.dm index a5e903221a8..345c0e27615 100644 --- a/code/controllers/subsystem/fire_burning.dm +++ b/code/controllers/subsystem/fire_burning.dm @@ -18,7 +18,7 @@ SUBSYSTEM_DEF(fire_burning) //cache for sanic speed (lists are references anyways) var/list/currentrun = src.currentrun - var/delta_time = wait * 0.1 + var/seconds_per_tick = wait * 0.1 while(currentrun.len) var/obj/O = currentrun[currentrun.len] @@ -32,7 +32,7 @@ SUBSYSTEM_DEF(fire_burning) if(O.resistance_flags & ON_FIRE) //in case an object is extinguished while still in currentrun if(!(O.resistance_flags & FIRE_PROOF)) - O.take_damage(10 * delta_time, BURN, FIRE, 0) + O.take_damage(10 * seconds_per_tick, BURN, FIRE, 0) else O.extinguish() diff --git a/code/controllers/subsystem/fluids.dm b/code/controllers/subsystem/fluids.dm index 4a06cb59c35..821c1f6cb2c 100644 --- a/code/controllers/subsystem/fluids.dm +++ b/code/controllers/subsystem/fluids.dm @@ -118,7 +118,7 @@ SUBSYSTEM_DEF(fluids) /datum/controller/subsystem/fluids/fire(resumed) - var/delta_time + var/seconds_per_tick var/cached_bucket_index var/list/obj/effect/particle_effect/fluid/currentrun MC_SPLIT_TICK_INIT(2) @@ -130,14 +130,14 @@ SUBSYSTEM_DEF(fluids) spread_carousel[spread_bucket_index] = list() // Reset the bucket so we don't process an _entire station's worth of foam_ spreading every 2 ticks when the foam flood event happens. resumed_spreading = TRUE - delta_time = spread_wait / (1 SECONDS) + seconds_per_tick = spread_wait / (1 SECONDS) currentrun = currently_spreading while(currentrun.len) var/obj/effect/particle_effect/fluid/to_spread = currentrun[currentrun.len] currentrun.len-- if(!QDELETED(to_spread)) - to_spread.spread(delta_time) + to_spread.spread(seconds_per_tick) to_spread.spread_bucket = null if (MC_TICK_CHECK) @@ -153,14 +153,14 @@ SUBSYSTEM_DEF(fluids) currently_processing = tmp_list.Copy() resumed_effect_processing = TRUE - delta_time = effect_wait / (1 SECONDS) + seconds_per_tick = effect_wait / (1 SECONDS) cached_bucket_index = effect_bucket_index currentrun = currently_processing while(currentrun.len) var/obj/effect/particle_effect/fluid/to_process = currentrun[currentrun.len] currentrun.len-- - if (QDELETED(to_process) || to_process.process(delta_time) == PROCESS_KILL) + if (QDELETED(to_process) || to_process.process(seconds_per_tick) == PROCESS_KILL) effect_carousel[cached_bucket_index] -= to_process to_process.effect_bucket = null to_process.datum_flags &= ~DF_ISPROCESSING diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index da5a48f46da..6375e513237 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -33,12 +33,12 @@ SUBSYSTEM_DEF(mobs) //cache for sanic speed (lists are references anyways) var/list/currentrun = src.currentrun var/times_fired = src.times_fired - var/delta_time = wait / (1 SECONDS) // TODO: Make this actually responsive to stuff like pausing and resuming + var/seconds_per_tick = wait / (1 SECONDS) // TODO: Make this actually responsive to stuff like pausing and resuming while(currentrun.len) var/mob/living/L = currentrun[currentrun.len] currentrun.len-- if(L) - L.Life(delta_time, times_fired) + L.Life(seconds_per_tick, times_fired) else GLOB.mob_living_list.Remove(L) if (MC_TICK_CHECK) diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm index 058645da495..81ff1a5640b 100644 --- a/code/controllers/subsystem/processing/processing.dm +++ b/code/controllers/subsystem/processing/processing.dm @@ -36,15 +36,15 @@ SUBSYSTEM_DEF(processing) * This proc is called on a datum on every "cycle" if it is being processed by a subsystem. The time between each cycle is determined by the subsystem's "wait" setting. * You can start and stop processing a datum using the START_PROCESSING and STOP_PROCESSING defines. * - * Since the wait setting of a subsystem can be changed at any time, it is important that any rate-of-change that you implement in this proc is multiplied by the delta_time that is sent as a parameter, - * Additionally, any "prob" you use in this proc should instead use the DT_PROB define to make sure that the final probability per second stays the same even if the subsystem's wait is altered. + * Since the wait setting of a subsystem can be changed at any time, it is important that any rate-of-change that you implement in this proc is multiplied by the seconds_per_tick that is sent as a parameter, + * Additionally, any "prob" you use in this proc should instead use the SPT_PROB define to make sure that the final probability per second stays the same even if the subsystem's wait is altered. * Examples where this must be considered: - * - Implementing a cooldown timer, use `mytimer -= delta_time`, not `mytimer -= 1`. This way, `mytimer` will always have the unit of seconds - * - Damaging a mob, do `L.adjustFireLoss(20 * delta_time)`, not `L.adjustFireLoss(20)`. This way, the damage per second stays constant even if the wait of the subsystem is changed - * - Probability of something happening, do `if(DT_PROB(25, delta_time))`, not `if(prob(25))`. This way, if the subsystem wait is e.g. lowered, there won't be a higher chance of this event happening per second + * - Implementing a cooldown timer, use `mytimer -= seconds_per_tick`, not `mytimer -= 1`. This way, `mytimer` will always have the unit of seconds + * - Damaging a mob, do `L.adjustFireLoss(20 * seconds_per_tick)`, not `L.adjustFireLoss(20)`. This way, the damage per second stays constant even if the wait of the subsystem is changed + * - Probability of something happening, do `if(SPT_PROB(25, seconds_per_tick))`, not `if(prob(25))`. This way, if the subsystem wait is e.g. lowered, there won't be a higher chance of this event happening per second * * If you override this do not call parent, as it will return PROCESS_KILL. This is done to prevent objects that dont override process() from staying in the processing list */ -/datum/proc/process(delta_time) +/datum/proc/process(seconds_per_tick) set waitfor = FALSE return PROCESS_KILL diff --git a/code/controllers/subsystem/processing/reagents.dm b/code/controllers/subsystem/processing/reagents.dm index 46da5cd9dd9..c4b86a23efc 100644 --- a/code/controllers/subsystem/processing/reagents.dm +++ b/code/controllers/subsystem/processing/reagents.dm @@ -4,7 +4,7 @@ PROCESSING_SUBSYSTEM_DEF(reagents) name = "Reagents" init_order = INIT_ORDER_REAGENTS priority = FIRE_PRIORITY_REAGENTS - wait = 0.25 SECONDS //You might think that rate_up_lim has to be set to half, but since everything is normalised around delta_time, it automatically adjusts it to be per second. Magic! + wait = 0.25 SECONDS //You might think that rate_up_lim has to be set to half, but since everything is normalised around seconds_per_tick, it automatically adjusts it to be per second. Magic! flags = SS_KEEP_TIMING runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME ///What time was it when we last ticked diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index c7c2aa6dedb..2e295066834 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -352,7 +352,7 @@ SUBSYSTEM_DEF(statpanels) /// Takes a client, attempts to generate object images for it /// We will update the client with any improvements we make when we're done -/datum/object_window_info/process(delta_time) +/datum/object_window_info/process(seconds_per_tick) // Cache the datum access for sonic speed var/list/to_make = atoms_to_imagify var/list/newly_seen = atoms_to_images diff --git a/code/datums/ai/_ai_behavior.dm b/code/datums/ai/_ai_behavior.dm index e1bcef0fe1d..9089bb5cf6b 100644 --- a/code/datums/ai/_ai_behavior.dm +++ b/code/datums/ai/_ai_behavior.dm @@ -13,7 +13,7 @@ return TRUE ///Called by the AI controller when this action is performed -/datum/ai_behavior/proc/perform(delta_time, datum/ai_controller/controller, ...) +/datum/ai_behavior/proc/perform(seconds_per_tick, datum/ai_controller/controller, ...) controller.behavior_cooldowns[src] = world.time + action_cooldown return diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm index 8bac40b994a..6526e7e9a8b 100644 --- a/code/datums/ai/_ai_controller.dm +++ b/code/datums/ai/_ai_controller.dm @@ -161,13 +161,13 @@ multiple modular subtrees with behaviors ///Runs any actions that are currently running -/datum/ai_controller/process(delta_time) +/datum/ai_controller/process(seconds_per_tick) if(!able_to_run()) SSmove_manager.stop_looping(pawn) //stop moving return //this should remove them from processing in the future through event-based stuff. if(!LAZYLEN(current_behaviors) && idle_behavior) - idle_behavior.perform_idle_behavior(delta_time, src) //Do some stupid shit while we have nothing to do + idle_behavior.perform_idle_behavior(seconds_per_tick, src) //Do some stupid shit while we have nothing to do return if(current_movement_target) @@ -184,9 +184,9 @@ multiple modular subtrees with behaviors for(var/datum/ai_behavior/current_behavior as anything in current_behaviors) // Convert the current behaviour action cooldown to realtime seconds from deciseconds.current_behavior - // Then pick the max of this and the delta_time passed to ai_controller.process() - // Action cooldowns cannot happen faster than delta_time, so delta_time should be the value used in this scenario. - var/action_delta_time = max(current_behavior.action_cooldown * 0.1, delta_time) + // Then pick the max of this and the seconds_per_tick passed to ai_controller.process() + // Action cooldowns cannot happen faster than seconds_per_tick, so seconds_per_tick should be the value used in this scenario. + var/action_seconds_per_tick = max(current_behavior.action_cooldown * 0.1, seconds_per_tick) if(current_behavior.behavior_flags & AI_BEHAVIOR_REQUIRE_MOVEMENT) //Might need to move closer if(!current_movement_target) @@ -198,7 +198,7 @@ multiple modular subtrees with behaviors if(behavior_cooldowns[current_behavior] > world.time) //Still on cooldown continue - ProcessBehavior(action_delta_time, current_behavior) + ProcessBehavior(action_seconds_per_tick, current_behavior) return else if(ai_movement.moving_controllers[src] != current_movement_target) //We're too far, if we're not already moving start doing it. @@ -207,12 +207,12 @@ multiple modular subtrees with behaviors if(current_behavior.behavior_flags & AI_BEHAVIOR_MOVE_AND_PERFORM) //If we can move and perform then do so. if(behavior_cooldowns[current_behavior] > world.time) //Still on cooldown continue - ProcessBehavior(action_delta_time, current_behavior) + ProcessBehavior(action_seconds_per_tick, current_behavior) return else //No movement required if(behavior_cooldowns[current_behavior] > world.time) //Still on cooldown continue - ProcessBehavior(action_delta_time, current_behavior) + ProcessBehavior(action_seconds_per_tick, current_behavior) return ///Determines whether the AI can currently make a new plan @@ -224,7 +224,7 @@ multiple modular subtrees with behaviors break ///This is where you decide what actions are taken by the AI. -/datum/ai_controller/proc/SelectBehaviors(delta_time) +/datum/ai_controller/proc/SelectBehaviors(seconds_per_tick) SHOULD_NOT_SLEEP(TRUE) //Fuck you don't sleep in procs like this. if(!COOLDOWN_FINISHED(src, failed_planning_cooldown)) return FALSE @@ -234,7 +234,7 @@ multiple modular subtrees with behaviors if(LAZYLEN(planning_subtrees)) for(var/datum/ai_planning_subtree/subtree as anything in planning_subtrees) - if(subtree.SelectBehaviors(src, delta_time) == SUBTREE_RETURN_FINISH_PLANNING) + if(subtree.SelectBehaviors(src, seconds_per_tick) == SUBTREE_RETURN_FINISH_PLANNING) break for(var/datum/ai_behavior/current_behavior as anything in current_behaviors) @@ -286,8 +286,8 @@ multiple modular subtrees with behaviors else behavior_args[behavior_type] = null -/datum/ai_controller/proc/ProcessBehavior(delta_time, datum/ai_behavior/behavior) - var/list/arguments = list(delta_time, src) +/datum/ai_controller/proc/ProcessBehavior(seconds_per_tick, datum/ai_behavior/behavior) + var/list/arguments = list(seconds_per_tick, src) var/list/stored_arguments = behavior_args[behavior.type] if(stored_arguments) arguments += stored_arguments diff --git a/code/datums/ai/_ai_planning_subtree.dm b/code/datums/ai/_ai_planning_subtree.dm index ec69cd3e3e6..6560e91c00f 100644 --- a/code/datums/ai/_ai_planning_subtree.dm +++ b/code/datums/ai/_ai_planning_subtree.dm @@ -3,5 +3,5 @@ ///Determines what behaviors should the controller try processing; if this returns SUBTREE_RETURN_FINISH_PLANNING then the controller won't go through the other subtrees should multiple exist in controller.planning_subtrees -/datum/ai_planning_subtree/proc/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/proc/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) return diff --git a/code/datums/ai/_item_behaviors.dm b/code/datums/ai/_item_behaviors.dm index ef9407fe1bb..cfd55c05c49 100644 --- a/code/datums/ai/_item_behaviors.dm +++ b/code/datums/ai/_item_behaviors.dm @@ -1,7 +1,7 @@ ///This behavior is for obj/items, it is used to free themselves out of the hands of whoever is holding them /datum/ai_behavior/item_escape_grasp -/datum/ai_behavior/item_escape_grasp/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/item_escape_grasp/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() var/obj/item/item_pawn = controller.pawn var/mob/item_holder = item_pawn.loc @@ -30,7 +30,7 @@ return FALSE set_movement_target(controller, target) -/datum/ai_behavior/item_move_close_and_attack/perform(delta_time, datum/ai_controller/controller, target_key, throw_count_key) +/datum/ai_behavior/item_move_close_and_attack/perform(seconds_per_tick, datum/ai_controller/controller, target_key, throw_count_key) . = ..() var/obj/item/item_pawn = controller.pawn var/datum/weakref/target_ref = controller.blackboard[target_key] diff --git a/code/datums/ai/babies/babies_behaviors.dm b/code/datums/ai/babies/babies_behaviors.dm index 6517aebb4c1..569d271d675 100644 --- a/code/datums/ai/babies/babies_behaviors.dm +++ b/code/datums/ai/babies/babies_behaviors.dm @@ -10,7 +10,7 @@ /// Maximum number of children var/max_children = 3 -/datum/ai_behavior/find_partner/perform(delta_time, datum/ai_controller/controller, target_key, partner_types_key, child_types_key) +/datum/ai_behavior/find_partner/perform(seconds_per_tick, datum/ai_controller/controller, target_key, partner_types_key, child_types_key) . = ..() var/mob/pawn_mob = controller.pawn @@ -56,7 +56,7 @@ set_movement_target(controller, target) return TRUE -/datum/ai_behavior/make_babies/perform(delta_time, datum/ai_controller/controller, target_key, child_types_key) +/datum/ai_behavior/make_babies/perform(seconds_per_tick, datum/ai_controller/controller, target_key, child_types_key) . = ..() var/datum/weakref/weak_target = controller.blackboard[target_key] var/mob/target = weak_target?.resolve() diff --git a/code/datums/ai/babies/babies_subtrees.dm b/code/datums/ai/babies/babies_subtrees.dm index 8095ca3a49e..49db0181315 100644 --- a/code/datums/ai/babies/babies_subtrees.dm +++ b/code/datums/ai/babies/babies_subtrees.dm @@ -4,10 +4,10 @@ /datum/ai_planning_subtree/make_babies var/chance = 5 -/datum/ai_planning_subtree/make_babies/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/make_babies/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() - if(controller.pawn.gender != FEMALE || !DT_PROB(chance, delta_time)) + if(controller.pawn.gender != FEMALE || !SPT_PROB(chance, seconds_per_tick)) return var/partner_types = controller.blackboard[BB_BABIES_PARTNER_TYPES] diff --git a/code/datums/ai/bane/bane_subtrees.dm b/code/datums/ai/bane/bane_subtrees.dm index e40be3f147e..b75df3004c9 100644 --- a/code/datums/ai/bane/bane_subtrees.dm +++ b/code/datums/ai/bane/bane_subtrees.dm @@ -1,5 +1,5 @@ ///The bat is broken! -/datum/ai_planning_subtree/bane_hunting/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/bane_hunting/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) var/mob/living/batman = controller.blackboard[BB_BANE_BATMAN] if(!batman) for(var/mob/living/possibly_the_dark_knight in oview(7, controller.pawn)) diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/basic_attacking.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/basic_attacking.dm index 1fa012fc466..58f53e21a99 100644 --- a/code/datums/ai/basic_mobs/basic_ai_behaviors/basic_attacking.dm +++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/basic_attacking.dm @@ -14,7 +14,7 @@ return set_movement_target(controller, target) -/datum/ai_behavior/basic_melee_attack/perform(delta_time, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key) +/datum/ai_behavior/basic_melee_attack/perform(seconds_per_tick, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key) . = ..() var/mob/living/basic/basic_mob = controller.pawn //targetting datum will kill the action if not real anymore @@ -61,7 +61,7 @@ return FALSE set_movement_target(controller, target) -/datum/ai_behavior/basic_ranged_attack/perform(delta_time, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key) +/datum/ai_behavior/basic_ranged_attack/perform(seconds_per_tick, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key) . = ..() var/mob/living/basic/basic_mob = controller.pawn //targetting datum will kill the action if not real anymore diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/pick_up_item.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/pick_up_item.dm index c4b1f1dd9b7..2d5dccea049 100644 --- a/code/datums/ai/basic_mobs/basic_ai_behaviors/pick_up_item.dm +++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/pick_up_item.dm @@ -11,7 +11,7 @@ var/obj/item/target = weak_target?.resolve() return isitem(target) && isturf(target.loc) && !target.anchored -/datum/ai_behavior/pick_up_item/perform(delta_time, datum/ai_controller/controller, target_key, storage_key) +/datum/ai_behavior/pick_up_item/perform(seconds_per_tick, datum/ai_controller/controller, target_key, storage_key) . = ..() var/datum/weakref/weak_target = controller.blackboard[target_key] var/obj/item/target = weak_target?.resolve() diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/run_away_from_target.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/run_away_from_target.dm index 7f152e43ce0..1a3f9abcc80 100644 --- a/code/datums/ai/basic_mobs/basic_ai_behaviors/run_away_from_target.dm +++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/run_away_from_target.dm @@ -15,7 +15,7 @@ return FALSE return ..() -/datum/ai_behavior/run_away_from_target/perform(delta_time, datum/ai_controller/controller, target_key, hiding_location_key) +/datum/ai_behavior/run_away_from_target/perform(seconds_per_tick, datum/ai_controller/controller, target_key, hiding_location_key) . = ..() var/datum/weakref/weak_target = controller.blackboard[hiding_location_key] || controller.blackboard[target_key] var/atom/target = weak_target?.resolve() diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/step_towards_turf.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/step_towards_turf.dm index f40bd739541..d82a0d17a05 100644 --- a/code/datums/ai/basic_mobs/basic_ai_behaviors/step_towards_turf.dm +++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/step_towards_turf.dm @@ -47,7 +47,7 @@ return get_ranged_target_turf(controller.pawn, direction_to_destination, step_distance) // We actually only wanted the movement so if we've arrived we're done -/datum/ai_behavior/step_towards_turf/perform(delta_time, datum/ai_controller/controller, area_key, turf_key) +/datum/ai_behavior/step_towards_turf/perform(seconds_per_tick, datum/ai_controller/controller, area_key, turf_key) . = ..() finish_action(controller, succeeded = TRUE) diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/targeted_mob_ability.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/targeted_mob_ability.dm index 5e366c0f4fd..dc3b3a5ccaf 100644 --- a/code/datums/ai/basic_mobs/basic_ai_behaviors/targeted_mob_ability.dm +++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/targeted_mob_ability.dm @@ -4,7 +4,7 @@ */ /datum/ai_behavior/targeted_mob_ability -/datum/ai_behavior/targeted_mob_ability/perform(delta_time, datum/ai_controller/controller, ability_key, target_key) +/datum/ai_behavior/targeted_mob_ability/perform(seconds_per_tick, datum/ai_controller/controller, ability_key, target_key) var/datum/weakref/weak_ability = controller.blackboard[ability_key] var/datum/action/cooldown/ability = weak_ability?.resolve() diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/targetting.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/targetting.dm index 77b8af9564d..ec6362cee31 100644 --- a/code/datums/ai/basic_mobs/basic_ai_behaviors/targetting.dm +++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/targetting.dm @@ -5,7 +5,7 @@ /// Static typecache list of potentially dangerous objs var/static/list/hostile_machines = typecacheof(list(/obj/machinery/porta_turret, /obj/vehicle/sealed/mecha)) -/datum/ai_behavior/find_potential_targets/perform(delta_time, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key) +/datum/ai_behavior/find_potential_targets/perform(seconds_per_tick, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key) . = ..() var/mob/living/living_mob = controller.pawn var/datum/targetting_datum/targetting_datum = controller.blackboard[targetting_datum_key] diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/tipped_reaction.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/tipped_reaction.dm index 5b13fe6d3ef..ff36fa4c415 100644 --- a/code/datums/ai/basic_mobs/basic_ai_behaviors/tipped_reaction.dm +++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/tipped_reaction.dm @@ -2,7 +2,7 @@ ///type of tipped reaction that is akin to puppy dog eyes /datum/ai_behavior/tipped_reaction -/datum/ai_behavior/tipped_reaction/perform(delta_time, datum/ai_controller/controller, tipper_key, reacting_key) +/datum/ai_behavior/tipped_reaction/perform(seconds_per_tick, datum/ai_controller/controller, tipper_key, reacting_key) . = ..() var/mob/living/carbon/tipper = controller.blackboard[tipper_key] diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/travel_towards.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/travel_towards.dm index fcbf1d328e0..058797e04fc 100644 --- a/code/datums/ai/basic_mobs/basic_ai_behaviors/travel_towards.dm +++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/travel_towards.dm @@ -15,7 +15,7 @@ return FALSE set_movement_target(controller, target) -/datum/ai_behavior/travel_towards/perform(delta_time, datum/ai_controller/controller, target_key) +/datum/ai_behavior/travel_towards/perform(seconds_per_tick, datum/ai_controller/controller, target_key) . = ..() finish_action(controller, TRUE) @@ -34,6 +34,6 @@ return FALSE set_movement_target(controller, target_atom) -/datum/ai_behavior/travel_towards_atom/perform(delta_time, datum/ai_controller/controller, atom/target_atom) +/datum/ai_behavior/travel_towards_atom/perform(seconds_per_tick, datum/ai_controller/controller, atom/target_atom) . = ..() finish_action(controller, TRUE) diff --git a/code/datums/ai/basic_mobs/basic_subtrees/attack_obstacle_in_path.dm b/code/datums/ai/basic_mobs/basic_subtrees/attack_obstacle_in_path.dm index 941063558e2..4df1fb38307 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/attack_obstacle_in_path.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/attack_obstacle_in_path.dm @@ -5,7 +5,7 @@ /// The action to execute, extend to add a different cooldown or something var/attack_behaviour = /datum/ai_behavior/attack_obstructions -/datum/ai_planning_subtree/attack_obstacle_in_path/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/attack_obstacle_in_path/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() var/datum/weakref/weak_target = controller.blackboard[target_key] var/atom/target = weak_target?.resolve() @@ -28,7 +28,7 @@ /// For if you want your mob to be able to attack dense objects var/can_attack_dense_objects = FALSE -/datum/ai_behavior/attack_obstructions/perform(delta_time, datum/ai_controller/controller, target_key) +/datum/ai_behavior/attack_obstructions/perform(seconds_per_tick, datum/ai_controller/controller, target_key) . = ..() var/mob/living/basic/basic_mob = controller.pawn var/datum/weakref/weak_target = controller.blackboard[target_key] diff --git a/code/datums/ai/basic_mobs/basic_subtrees/find_food.dm b/code/datums/ai/basic_mobs/basic_subtrees/find_food.dm index 1a39315d23b..ac03aee7154 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/find_food.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/find_food.dm @@ -1,7 +1,7 @@ /// similar to finding a target but looks for food types in the /datum/ai_planning_subtree/find_food -/datum/ai_planning_subtree/find_food/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/find_food/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() var/atom/target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET] if(target && !QDELETED(target)) diff --git a/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm b/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm index f62bb5699c7..8490f0dd1c0 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm @@ -7,7 +7,7 @@ /// Blackboard key in which to store selected target's hiding place var/hiding_place_key = BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION -/datum/ai_planning_subtree/flee_target/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/flee_target/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() if (!controller.blackboard[BB_BASIC_MOB_FLEEING]) return diff --git a/code/datums/ai/basic_mobs/basic_subtrees/simple_attack_target.dm b/code/datums/ai/basic_mobs/basic_subtrees/simple_attack_target.dm index a68f25f9c20..5489d7c1545 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/simple_attack_target.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/simple_attack_target.dm @@ -1,7 +1,7 @@ /datum/ai_planning_subtree/basic_melee_attack_subtree var/datum/ai_behavior/basic_melee_attack/melee_attack_behavior = /datum/ai_behavior/basic_melee_attack -/datum/ai_planning_subtree/basic_melee_attack_subtree/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/basic_melee_attack_subtree/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() var/datum/weakref/weak_target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET] var/atom/target = weak_target?.resolve() @@ -18,7 +18,7 @@ /datum/ai_planning_subtree/basic_ranged_attack_subtree var/datum/ai_behavior/basic_ranged_attack/ranged_attack_behavior = /datum/ai_behavior/basic_ranged_attack -/datum/ai_planning_subtree/basic_ranged_attack_subtree/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/basic_ranged_attack_subtree/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() var/datum/weakref/weak_target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET] var/atom/target = weak_target?.resolve() diff --git a/code/datums/ai/basic_mobs/basic_subtrees/simple_find_nearest_target_to_flee.dm b/code/datums/ai/basic_mobs/basic_subtrees/simple_find_nearest_target_to_flee.dm index d9f7ab9e337..6ed9486e139 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/simple_find_nearest_target_to_flee.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/simple_find_nearest_target_to_flee.dm @@ -1,7 +1,7 @@ /// Find the nearest thing which we assume is hostile and set it as the flee target /datum/ai_planning_subtree/simple_find_nearest_target_to_flee -/datum/ai_planning_subtree/simple_find_nearest_target_to_flee/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/simple_find_nearest_target_to_flee/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() if (!controller.blackboard[BB_BASIC_MOB_FLEEING]) return @@ -10,7 +10,7 @@ /// Find the nearest thing on our list of 'things which have done damage to me' and set it as the flee target /datum/ai_planning_subtree/find_nearest_thing_which_attacked_me_to_flee -/datum/ai_planning_subtree/find_nearest_thing_which_attacked_me_to_flee/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/find_nearest_thing_which_attacked_me_to_flee/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() if (!controller.blackboard[BB_BASIC_MOB_FLEEING]) return diff --git a/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm b/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm index a4a6aea9b67..5c85d128bb9 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm @@ -1,5 +1,5 @@ /datum/ai_planning_subtree/simple_find_target -/datum/ai_planning_subtree/simple_find_target/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/simple_find_target/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() controller.queue_behavior(/datum/ai_behavior/find_potential_targets, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION) diff --git a/code/datums/ai/basic_mobs/basic_subtrees/sleep_with_no_target.dm b/code/datums/ai/basic_mobs/basic_subtrees/sleep_with_no_target.dm index 1cef3a65147..de04c7e224d 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/sleep_with_no_target.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/sleep_with_no_target.dm @@ -5,26 +5,26 @@ /// Target key to interrogate var/target_key = BB_BASIC_MOB_CURRENT_TARGET -/datum/ai_planning_subtree/sleep_with_no_target/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/sleep_with_no_target/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() controller.queue_behavior(sleep_behaviour, BB_BASIC_MOB_CURRENT_TARGET) /// Disables AI after a certain amount of time spent with no target, you will have to enable the AI again somewhere else /datum/ai_behavior/sleep_after_targetless_time - /// Turn off AI if we spend this many seconds without a target, don't use the macro because delta_time is already in seconds + /// Turn off AI if we spend this many seconds without a target, don't use the macro because seconds_per_tick is already in seconds var/time_to_wait = 10 -/datum/ai_behavior/sleep_after_targetless_time/perform(delta_time, datum/ai_controller/controller, target_key) +/datum/ai_behavior/sleep_after_targetless_time/perform(seconds_per_tick, datum/ai_controller/controller, target_key) var/datum/weakref/weak_target = controller.blackboard[target_key] var/atom/target = weak_target?.resolve() - finish_action(controller, succeeded = !target, delta_time = delta_time) + finish_action(controller, succeeded = !target, seconds_per_tick = seconds_per_tick) -/datum/ai_behavior/sleep_after_targetless_time/finish_action(datum/ai_controller/controller, succeeded, delta_time) +/datum/ai_behavior/sleep_after_targetless_time/finish_action(datum/ai_controller/controller, succeeded, seconds_per_tick) . = ..() if (!succeeded) controller.blackboard[BB_TARGETLESS_TIME] = 0 return - controller.blackboard[BB_TARGETLESS_TIME] += delta_time + controller.blackboard[BB_TARGETLESS_TIME] += seconds_per_tick if (controller.blackboard[BB_TARGETLESS_TIME] > time_to_wait) enter_sleep(controller) diff --git a/code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm b/code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm index 1407f1d40a2..e32c6e69bed 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/speech_subtree.dm @@ -17,8 +17,8 @@ if(emote_see) emote_see = string_list(emote_see) -/datum/ai_planning_subtree/random_speech/SelectBehaviors(datum/ai_controller/controller, delta_time) - if(DT_PROB(speech_chance, delta_time)) +/datum/ai_planning_subtree/random_speech/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) + if(SPT_PROB(speech_chance, seconds_per_tick)) var/audible_emotes_length = emote_hear?.len var/non_audible_emotes_length = emote_see?.len var/speak_lines_length = speak?.len @@ -97,7 +97,7 @@ /datum/ai_planning_subtree/random_speech/dog speech_chance = 1 -/datum/ai_planning_subtree/random_speech/dog/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/random_speech/dog/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) if(!isdog(controller.pawn)) return diff --git a/code/datums/ai/basic_mobs/basic_subtrees/target_retaliate.dm b/code/datums/ai/basic_mobs/basic_subtrees/target_retaliate.dm index 2fb4dc858f4..8e5e922820c 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/target_retaliate.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/target_retaliate.dm @@ -7,7 +7,7 @@ /// Blackboard key in which to store selected target's hiding place var/hiding_place_key = BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION -/datum/ai_planning_subtree/target_retaliate/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/target_retaliate/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() controller.queue_behavior(/datum/ai_behavior/target_from_retaliate_list, BB_BASIC_MOB_RETALIATE_LIST, target_key, targetting_datum_key, hiding_place_key) @@ -28,7 +28,7 @@ /// How far can we see stuff? var/vision_range = 9 -/datum/ai_behavior/target_from_retaliate_list/perform(delta_time, datum/ai_controller/controller, shitlist_key, target_key, targetting_datum_key, hiding_location_key) +/datum/ai_behavior/target_from_retaliate_list/perform(seconds_per_tick, datum/ai_controller/controller, shitlist_key, target_key, targetting_datum_key, hiding_location_key) . = ..() var/mob/living/living_mob = controller.pawn var/datum/targetting_datum/targetting_datum = controller.blackboard[targetting_datum_key] diff --git a/code/datums/ai/basic_mobs/basic_subtrees/targeted_mob_ability.dm b/code/datums/ai/basic_mobs/basic_subtrees/targeted_mob_ability.dm index 1508a9a6f44..67ca10b4c28 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/targeted_mob_ability.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/targeted_mob_ability.dm @@ -9,7 +9,7 @@ /// If true we terminate planning after trying to use the ability. var/finish_planning = TRUE -/datum/ai_planning_subtree/targeted_mob_ability/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/targeted_mob_ability/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) if (!ability_key) CRASH("You forgot to tell this mob where to find its ability") diff --git a/code/datums/ai/basic_mobs/basic_subtrees/tipped_subtree.dm b/code/datums/ai/basic_mobs/basic_subtrees/tipped_subtree.dm index 4dc9af13b6e..b502860a6be 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/tipped_subtree.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/tipped_subtree.dm @@ -1,7 +1,7 @@ ///used by cows /datum/ai_planning_subtree/tip_reaction -/datum/ai_planning_subtree/tip_reaction/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/tip_reaction/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() var/tip_reacting = controller.blackboard[BB_BASIC_MOB_TIP_REACTING] if(!tip_reacting) diff --git a/code/datums/ai/basic_mobs/basic_subtrees/use_mob_ability.dm b/code/datums/ai/basic_mobs/basic_subtrees/use_mob_ability.dm index c7eaf4a996f..a94e7dc2b32 100644 --- a/code/datums/ai/basic_mobs/basic_subtrees/use_mob_ability.dm +++ b/code/datums/ai/basic_mobs/basic_subtrees/use_mob_ability.dm @@ -10,7 +10,7 @@ /// If true we terminate planning after trying to use the ability. var/finish_planning = FALSE -/datum/ai_planning_subtree/use_mob_ability/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/use_mob_ability/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) if (!ability_key) CRASH("You forgot to tell this mob where to find its ability") @@ -25,7 +25,7 @@ /datum/ai_behavior/use_mob_ability -/datum/ai_behavior/use_mob_ability/perform(delta_time, datum/ai_controller/controller, ability_key) +/datum/ai_behavior/use_mob_ability/perform(seconds_per_tick, datum/ai_controller/controller, ability_key) var/datum/weakref/weak_ability = controller.blackboard[ability_key] var/datum/action/cooldown/using_action = weak_ability?.resolve() if (!using_action) diff --git a/code/datums/ai/basic_mobs/pet_commands/fetch.dm b/code/datums/ai/basic_mobs/pet_commands/fetch.dm index 1c0a63566c1..5f697170b20 100644 --- a/code/datums/ai/basic_mobs/pet_commands/fetch.dm +++ b/code/datums/ai/basic_mobs/pet_commands/fetch.dm @@ -15,7 +15,7 @@ return FALSE set_movement_target(controller, fetch_thing) -/datum/ai_behavior/fetch_seek/perform(delta_time, datum/ai_controller/controller, target_key, delivery_key) +/datum/ai_behavior/fetch_seek/perform(seconds_per_tick, datum/ai_controller/controller, target_key, delivery_key) . = ..() var/datum/weakref/thing_ref = controller.blackboard[target_key] var/obj/item/fetch_thing = thing_ref?.resolve() @@ -58,7 +58,7 @@ return FALSE set_movement_target(controller, return_target) -/datum/ai_behavior/deliver_fetched_item/perform(delta_time, datum/ai_controller/controller, delivery_key, storage_key) +/datum/ai_behavior/deliver_fetched_item/perform(seconds_per_tick, datum/ai_controller/controller, delivery_key, storage_key) . = ..() var/datum/weakref/return_ref = controller.blackboard[delivery_key] var/mob/living/return_target = return_ref?.resolve() @@ -108,7 +108,7 @@ return FALSE // This isn't food at all! set_movement_target(controller, snack) -/datum/ai_behavior/eat_fetched_snack/perform(delta_time, datum/ai_controller/controller, target_key, delivery_key) +/datum/ai_behavior/eat_fetched_snack/perform(seconds_per_tick, datum/ai_controller/controller, target_key, delivery_key) . = ..() var/datum/weakref/thing_ref = controller.blackboard[target_key] var/obj/item/snack = thing_ref?.resolve() @@ -122,7 +122,7 @@ if(isturf(snack.loc)) basic_pawn.melee_attack(snack) // snack attack! - else if(iscarbon(snack.loc) && DT_PROB(10, delta_time)) + else if(iscarbon(snack.loc) && SPT_PROB(10, seconds_per_tick)) basic_pawn.manual_emote("Stares at [snack.loc]'s [snack.name] intently.") if(QDELETED(snack)) // we ate it! @@ -150,7 +150,7 @@ if (!length(controller.blackboard[BB_FETCH_IGNORE_LIST])) return -/datum/ai_behavior/forget_failed_fetches/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/forget_failed_fetches/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() COOLDOWN_START(src, reset_ignore_cooldown, cooldown_duration) controller.blackboard[BB_FETCH_IGNORE_LIST] = list() diff --git a/code/datums/ai/basic_mobs/pet_commands/pet_command_planning.dm b/code/datums/ai/basic_mobs/pet_commands/pet_command_planning.dm index 8489bb55ebd..caa4073b699 100644 --- a/code/datums/ai/basic_mobs/pet_commands/pet_command_planning.dm +++ b/code/datums/ai/basic_mobs/pet_commands/pet_command_planning.dm @@ -7,7 +7,7 @@ */ /datum/ai_planning_subtree/pet_planning -/datum/ai_planning_subtree/pet_planning/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/pet_planning/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) var/datum/weakref/weak_command = controller.blackboard[BB_ACTIVE_PET_COMMAND] var/datum/pet_command/command = weak_command?.resolve() if (!command) diff --git a/code/datums/ai/basic_mobs/pet_commands/pet_follow_friend.dm b/code/datums/ai/basic_mobs/pet_commands/pet_follow_friend.dm index 0af3c1d3591..59d3aaad79a 100644 --- a/code/datums/ai/basic_mobs/pet_commands/pet_follow_friend.dm +++ b/code/datums/ai/basic_mobs/pet_commands/pet_follow_friend.dm @@ -10,7 +10,7 @@ return FALSE set_movement_target(controller, target) -/datum/ai_behavior/pet_follow_friend/perform(delta_time, datum/ai_controller/controller, target_key) +/datum/ai_behavior/pet_follow_friend/perform(seconds_per_tick, datum/ai_controller/controller, target_key) . = ..() var/datum/weakref/weak_target = controller.blackboard[target_key] var/atom/target = weak_target?.resolve() diff --git a/code/datums/ai/basic_mobs/pet_commands/pet_use_targetted_ability.dm b/code/datums/ai/basic_mobs/pet_commands/pet_use_targetted_ability.dm index 6cd6458cc29..f86f0a481fc 100644 --- a/code/datums/ai/basic_mobs/pet_commands/pet_use_targetted_ability.dm +++ b/code/datums/ai/basic_mobs/pet_commands/pet_use_targetted_ability.dm @@ -10,7 +10,7 @@ return FALSE set_movement_target(controller, target) -/datum/ai_behavior/pet_use_ability/perform(delta_time, datum/ai_controller/controller, ability_key, target_key) +/datum/ai_behavior/pet_use_ability/perform(seconds_per_tick, datum/ai_controller/controller, ability_key, target_key) var/datum/action/cooldown/mob_cooldown/ability = controller.blackboard[ability_key] var/datum/weakref/weak_target = controller.blackboard[target_key] var/mob/living/target = weak_target?.resolve() diff --git a/code/datums/ai/basic_mobs/pet_commands/play_dead.dm b/code/datums/ai/basic_mobs/pet_commands/play_dead.dm index 5eb86c60309..d788402de7f 100644 --- a/code/datums/ai/basic_mobs/pet_commands/play_dead.dm +++ b/code/datums/ai/basic_mobs/pet_commands/play_dead.dm @@ -9,9 +9,9 @@ basic_pawn.emote("deathgasp", intentional=FALSE) basic_pawn.look_dead() -/datum/ai_behavior/play_dead/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/play_dead/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) finish_action(controller, TRUE) /datum/ai_behavior/play_dead/finish_action(datum/ai_controller/controller, succeeded) diff --git a/code/datums/ai/cursed/cursed_subtrees.dm b/code/datums/ai/cursed/cursed_subtrees.dm index bb20cb6585f..b9edac290f3 100644 --- a/code/datums/ai/cursed/cursed_subtrees.dm +++ b/code/datums/ai/cursed/cursed_subtrees.dm @@ -1,4 +1,4 @@ -/datum/ai_planning_subtree/cursed/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/cursed/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) var/obj/item/item_pawn = controller.pawn //make sure we have a target diff --git a/code/datums/ai/dog/dog_behaviors.dm b/code/datums/ai/dog/dog_behaviors.dm index 36640e260b5..5c6a81a2676 100644 --- a/code/datums/ai/dog/dog_behaviors.dm +++ b/code/datums/ai/dog/dog_behaviors.dm @@ -8,7 +8,7 @@ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_MOVE_AND_PERFORM required_distance = 3 -/datum/ai_behavior/basic_melee_attack/dog/perform(delta_time, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key) +/datum/ai_behavior/basic_melee_attack/dog/perform(seconds_per_tick, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key) controller.behavior_cooldowns[src] = world.time + action_cooldown var/mob/living/living_pawn = controller.pawn if(!(isturf(living_pawn.loc) || HAS_TRAIT(living_pawn, TRAIT_AI_BAGATTACK))) // Void puppies can attack from inside bags @@ -24,11 +24,11 @@ return if (!in_range(living_pawn, target)) - growl_at(living_pawn, target, delta_time) + growl_at(living_pawn, target, seconds_per_tick) return if(!controller.blackboard[BB_DOG_HARASS_HARM]) - paw_harmlessly(living_pawn, target, delta_time) + paw_harmlessly(living_pawn, target, seconds_per_tick) return // Give Ian some teeth @@ -43,18 +43,18 @@ living_pawn.melee_damage_upper = old_melee_upper /// Swat at someone we don't like but won't hurt -/datum/ai_behavior/basic_melee_attack/dog/proc/paw_harmlessly(mob/living/living_pawn, atom/target, delta_time) - if(!DT_PROB(20, delta_time)) +/datum/ai_behavior/basic_melee_attack/dog/proc/paw_harmlessly(mob/living/living_pawn, atom/target, seconds_per_tick) + if(!SPT_PROB(20, seconds_per_tick)) return living_pawn.do_attack_animation(target, ATTACK_EFFECT_DISARM) playsound(target, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) target.visible_message(span_danger("[living_pawn] paws ineffectually at [target]!"), span_danger("[living_pawn] paws ineffectually at you!")) /// Let them know we mean business -/datum/ai_behavior/basic_melee_attack/dog/proc/growl_at(mob/living/living_pawn, atom/target, delta_time) - if(!DT_PROB(15, delta_time)) +/datum/ai_behavior/basic_melee_attack/dog/proc/growl_at(mob/living/living_pawn, atom/target, seconds_per_tick) + if(!SPT_PROB(15, seconds_per_tick)) return living_pawn.manual_emote("[pick("barks", "growls", "stares")] menacingly at [target]!") - if(!DT_PROB(40, delta_time)) + if(!SPT_PROB(40, seconds_per_tick)) return playsound(living_pawn, pick('sound/creatures/dog/growl1.ogg', 'sound/creatures/dog/growl2.ogg'), 50, TRUE, -1) diff --git a/code/datums/ai/dog/dog_subtrees.dm b/code/datums/ai/dog/dog_subtrees.dm index 25f773263dc..fdadd3a9869 100644 --- a/code/datums/ai/dog/dog_subtrees.dm +++ b/code/datums/ai/dog/dog_subtrees.dm @@ -1,8 +1,8 @@ /// Find someone we don't like and annoy them /datum/ai_planning_subtree/dog_harassment -/datum/ai_planning_subtree/dog_harassment/SelectBehaviors(datum/ai_controller/controller, delta_time) - if(!DT_PROB(10, delta_time)) +/datum/ai_planning_subtree/dog_harassment/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) + if(!SPT_PROB(10, seconds_per_tick)) return controller.queue_behavior(/datum/ai_behavior/find_hated_dog_target, BB_DOG_HARASS_TARGET, BB_PET_TARGETTING_DATUM) var/datum/weakref/weak_target = controller.blackboard[BB_DOG_HARASS_TARGET] @@ -35,6 +35,6 @@ controller.blackboard[target_key] = null -/datum/ai_behavior/find_hated_dog_target/perform(delta_time, datum/ai_controller/controller, target_key) +/datum/ai_behavior/find_hated_dog_target/perform(seconds_per_tick, datum/ai_controller/controller, target_key) . = ..() finish_action(controller, TRUE) diff --git a/code/datums/ai/generic/find_and_set.dm b/code/datums/ai/generic/find_and_set.dm index b2897f58276..5d33516d6a6 100644 --- a/code/datums/ai/generic/find_and_set.dm +++ b/code/datums/ai/generic/find_and_set.dm @@ -6,7 +6,7 @@ /datum/ai_behavior/find_and_set action_cooldown = 2 SECONDS -/datum/ai_behavior/find_and_set/perform(delta_time, datum/ai_controller/controller, set_key, locate_path, search_range) +/datum/ai_behavior/find_and_set/perform(seconds_per_tick, datum/ai_controller/controller, set_key, locate_path, search_range) . = ..() var/find_this_thing = search_tactic(controller, locate_path, search_range) if(find_this_thing) diff --git a/code/datums/ai/generic/generic_behaviors.dm b/code/datums/ai/generic/generic_behaviors.dm index a5067357ab1..9934a5c0a6c 100644 --- a/code/datums/ai/generic/generic_behaviors.dm +++ b/code/datums/ai/generic/generic_behaviors.dm @@ -1,5 +1,5 @@ -/datum/ai_behavior/resist/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/resist/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() var/mob/living/living_pawn = controller.pawn living_pawn.execute_resist() @@ -9,7 +9,7 @@ ///List of possible screeches the behavior has var/list/screeches -/datum/ai_behavior/battle_screech/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/battle_screech/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() var/mob/living/living_pawn = controller.pawn INVOKE_ASYNC(living_pawn, TYPE_PROC_REF(/mob, emote), pick(screeches)) @@ -19,7 +19,7 @@ /datum/ai_behavior/move_to_target behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT -/datum/ai_behavior/move_to_target/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/move_to_target/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() finish_action(controller, TRUE) @@ -33,7 +33,7 @@ . = ..() set_movement_target(controller, controller.blackboard[target_key]) -/datum/ai_behavior/break_spine/perform(delta_time, datum/ai_controller/controller, target_key) +/datum/ai_behavior/break_spine/perform(seconds_per_tick, datum/ai_controller/controller, target_key) var/mob/living/batman = controller.blackboard[target_key] var/mob/living/big_guy = controller.pawn //he was molded by the darkness @@ -69,7 +69,7 @@ behavior_flags = AI_BEHAVIOR_MOVE_AND_PERFORM -/datum/ai_behavior/use_in_hand/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/use_in_hand/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() var/mob/living/pawn = controller.pawn var/obj/item/held = pawn.get_active_held_item() @@ -92,7 +92,7 @@ return FALSE set_movement_target(controller, target) -/datum/ai_behavior/use_on_object/perform(delta_time, datum/ai_controller/controller, target_key) +/datum/ai_behavior/use_on_object/perform(seconds_per_tick, datum/ai_controller/controller, target_key) . = ..() var/mob/living/pawn = controller.pawn var/obj/item/held_item = pawn.get_item_by_slot(pawn.get_active_hand()) @@ -121,7 +121,7 @@ var/datum/weakref/target_ref = controller.blackboard[target_key] set_movement_target(controller, target_ref?.resolve()) -/datum/ai_behavior/give/perform(delta_time, datum/ai_controller/controller, target_key) +/datum/ai_behavior/give/perform(seconds_per_tick, datum/ai_controller/controller, target_key) . = ..() var/mob/living/pawn = controller.pawn var/obj/item/held_item = pawn.get_active_held_item() @@ -188,7 +188,7 @@ var/datum/weakref/target_ref = controller.blackboard[target_key] set_movement_target(controller, target_ref?.resolve()) -/datum/ai_behavior/consume/perform(delta_time, datum/ai_controller/controller, target_key, hunger_timer_key) +/datum/ai_behavior/consume/perform(seconds_per_tick, datum/ai_controller/controller, target_key, hunger_timer_key) . = ..() var/mob/living/living_pawn = controller.pawn var/datum/weakref/target_ref = controller.blackboard[target_key] @@ -214,7 +214,7 @@ */ /datum/ai_behavior/drop_item -/datum/ai_behavior/drop_item/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/drop_item/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() var/mob/living/living_pawn = controller.pawn var/obj/item/best_held = GetBestWeapon(controller, null, living_pawn.held_items) @@ -228,7 +228,7 @@ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_MOVE_AND_PERFORM required_distance = 1 -/datum/ai_behavior/attack/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/attack/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() var/mob/living/living_pawn = controller.pawn if(!istype(living_pawn) || !isturf(living_pawn.loc)) @@ -264,7 +264,7 @@ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_MOVE_AND_PERFORM required_distance = 1 -/datum/ai_behavior/follow/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/follow/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() var/mob/living/living_pawn = controller.pawn if(!istype(living_pawn) || !isturf(living_pawn.loc)) @@ -291,7 +291,7 @@ /datum/ai_behavior/perform_emote -/datum/ai_behavior/perform_emote/perform(delta_time, datum/ai_controller/controller, emote) +/datum/ai_behavior/perform_emote/perform(seconds_per_tick, datum/ai_controller/controller, emote) var/mob/living/living_pawn = controller.pawn if(!istype(living_pawn)) return @@ -300,7 +300,7 @@ /datum/ai_behavior/perform_speech -/datum/ai_behavior/perform_speech/perform(delta_time, datum/ai_controller/controller, speech) +/datum/ai_behavior/perform_speech/perform(seconds_per_tick, datum/ai_controller/controller, speech) var/mob/living/living_pawn = controller.pawn if(!istype(living_pawn)) return @@ -311,7 +311,7 @@ /datum/ai_behavior/setup_instrument -/datum/ai_behavior/setup_instrument/perform(delta_time, datum/ai_controller/controller, song_instrument_key, song_lines_key) +/datum/ai_behavior/setup_instrument/perform(seconds_per_tick, datum/ai_controller/controller, song_instrument_key, song_lines_key) . = ..() var/datum/weakref/instrument_ref = controller.blackboard[song_instrument_key] @@ -328,7 +328,7 @@ /datum/ai_behavior/play_instrument -/datum/ai_behavior/play_instrument/perform(delta_time, datum/ai_controller/controller, song_instrument_key) +/datum/ai_behavior/play_instrument/perform(seconds_per_tick, datum/ai_controller/controller, song_instrument_key) . = ..() var/datum/weakref/instrument_ref = controller.blackboard[song_instrument_key] @@ -340,7 +340,7 @@ /datum/ai_behavior/find_nearby -/datum/ai_behavior/find_nearby/perform(delta_time, datum/ai_controller/controller, target_key) +/datum/ai_behavior/find_nearby/perform(seconds_per_tick, datum/ai_controller/controller, target_key) . = ..() var/list/possible_targets = list() diff --git a/code/datums/ai/generic/generic_subtrees.dm b/code/datums/ai/generic/generic_subtrees.dm index 07b33af4c75..dfb37719ebf 100644 --- a/code/datums/ai/generic/generic_subtrees.dm +++ b/code/datums/ai/generic/generic_subtrees.dm @@ -7,7 +7,7 @@ * * BB_SONG_INSTRUMENT - set by this subtree, is the song datum the pawn plays music from. * * BB_SONG_LINES - not set by this subtree, is the song loaded into the song datum. */ -/datum/ai_planning_subtree/generic_play_instrument/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/generic_play_instrument/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) var/datum/weakref/player_ref = controller.blackboard[BB_SONG_INSTRUMENT] var/obj/item/instrument/song_player = player_ref?.resolve() @@ -31,10 +31,10 @@ * relevant blackboards: * * None! */ -/datum/ai_planning_subtree/generic_resist/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/generic_resist/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) var/mob/living/living_pawn = controller.pawn - if(SHOULD_RESIST(living_pawn) && DT_PROB(RESIST_SUBTREE_PROB, delta_time)) + if(SHOULD_RESIST(living_pawn) && SPT_PROB(RESIST_SUBTREE_PROB, seconds_per_tick)) controller.queue_behavior(/datum/ai_behavior/resist) //BRO IM ON FUCKING FIRE BRO return SUBTREE_RETURN_FINISH_PLANNING //IM NOT DOING ANYTHING ELSE BUT EXTINGUISH MYSELF, GOOD GOD HAVE MERCY. @@ -46,7 +46,7 @@ * relevant blackboards: * * BB_NEXT_HUNGRY - set by this subtree, is when the controller is next hungry */ -/datum/ai_planning_subtree/generic_hunger/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/generic_hunger/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) //inits the blackboard timer if(!controller.blackboard[BB_NEXT_HUNGRY]) controller.blackboard[BB_NEXT_HUNGRY] = world.time + rand(0, 30 SECONDS) diff --git a/code/datums/ai/hauntium/hauntium_subtrees.dm b/code/datums/ai/hauntium/hauntium_subtrees.dm index 9d5bd2958e0..0ea459f087a 100644 --- a/code/datums/ai/hauntium/hauntium_subtrees.dm +++ b/code/datums/ai/hauntium/hauntium_subtrees.dm @@ -1,14 +1,14 @@ -/datum/ai_planning_subtree/haunted/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/haunted/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) var/obj/item/item_pawn = controller.pawn if(ismob(item_pawn.loc)) //We're being held, maybe escape? if(controller.blackboard[BB_LIKES_EQUIPPER])//don't unequip from people it's okay with return - if(DT_PROB(HAUNTED_ITEM_ESCAPE_GRASP_CHANCE, delta_time)) + if(SPT_PROB(HAUNTED_ITEM_ESCAPE_GRASP_CHANCE, seconds_per_tick)) controller.queue_behavior(/datum/ai_behavior/item_escape_grasp) return SUBTREE_RETURN_FINISH_PLANNING - if(!DT_PROB(HAUNTED_ITEM_ATTACK_HAUNT_CHANCE, delta_time)) + if(!SPT_PROB(HAUNTED_ITEM_ATTACK_HAUNT_CHANCE, seconds_per_tick)) return var/list/to_haunt_list = controller.blackboard[BB_TO_HAUNT_LIST] diff --git a/code/datums/ai/hunting_behavior/hunting_behaviors.dm b/code/datums/ai/hunting_behavior/hunting_behaviors.dm index 9d84e8a37ac..cb8c07f95f8 100644 --- a/code/datums/ai/hunting_behavior/hunting_behaviors.dm +++ b/code/datums/ai/hunting_behavior/hunting_behaviors.dm @@ -21,8 +21,8 @@ . = ..() hunt_targets = typecacheof(hunt_targets) -/datum/ai_planning_subtree/find_and_hunt_target/SelectBehaviors(datum/ai_controller/controller, delta_time) - if(!DT_PROB(hunt_chance, delta_time)) +/datum/ai_planning_subtree/find_and_hunt_target/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) + if(!SPT_PROB(hunt_chance, seconds_per_tick)) return if(controller.blackboard[BB_HUNTING_COOLDOWN] >= world.time) return @@ -48,7 +48,7 @@ /// Finds a specific atom type to hunt. /datum/ai_behavior/find_hunt_target -/datum/ai_behavior/find_hunt_target/perform(delta_time, datum/ai_controller/controller, hunting_target_key, types_to_hunt, hunt_range) +/datum/ai_behavior/find_hunt_target/perform(seconds_per_tick, datum/ai_controller/controller, hunting_target_key, types_to_hunt, hunt_range) . = ..() var/mob/living/living_mob = controller.pawn @@ -86,7 +86,7 @@ return FALSE set_movement_target(controller, hunt_target) -/datum/ai_behavior/hunt_target/perform(delta_time, datum/ai_controller/controller, hunting_target_key, hunting_cooldown_key) +/datum/ai_behavior/hunt_target/perform(seconds_per_tick, datum/ai_controller/controller, hunting_target_key, hunting_cooldown_key) . = ..() var/mob/living/hunter = controller.pawn var/datum/weakref/hunting_weakref = controller.blackboard[hunting_target_key] diff --git a/code/datums/ai/idle_behaviors/_idle_behavior.dm b/code/datums/ai/idle_behaviors/_idle_behavior.dm index a5ab827636a..315233bb71d 100644 --- a/code/datums/ai/idle_behaviors/_idle_behavior.dm +++ b/code/datums/ai/idle_behaviors/_idle_behavior.dm @@ -1,4 +1,4 @@ /datum/idle_behavior -/datum/idle_behavior/proc/perform_idle_behavior(delta_time, datum/ai_controller/controller) +/datum/idle_behavior/proc/perform_idle_behavior(seconds_per_tick, datum/ai_controller/controller) return diff --git a/code/datums/ai/idle_behaviors/idle_dog.dm b/code/datums/ai/idle_behaviors/idle_dog.dm index a97b16967c5..75ef809e2f8 100644 --- a/code/datums/ai/idle_behaviors/idle_dog.dm +++ b/code/datums/ai/idle_behaviors/idle_dog.dm @@ -1,5 +1,5 @@ ///Dog specific idle behavior. -/datum/idle_behavior/idle_dog/perform_idle_behavior(delta_time, datum/ai_controller/basic_controller/dog/controller) +/datum/idle_behavior/idle_dog/perform_idle_behavior(seconds_per_tick, datum/ai_controller/basic_controller/dog/controller) var/mob/living/living_pawn = controller.pawn if(!isturf(living_pawn.loc) || living_pawn.pulledby) return @@ -7,15 +7,15 @@ var/datum/weakref/weak_item = controller.blackboard[BB_SIMPLE_CARRY_ITEM] var/obj/item/carry_item = weak_item?.resolve() // if we're just ditzing around carrying something, occasionally print a message so people know we have something - if(carry_item && DT_PROB(5, delta_time)) + if(carry_item && SPT_PROB(5, seconds_per_tick)) living_pawn.visible_message(span_notice("[living_pawn] gently teethes on \the [carry_item] in [living_pawn.p_their()] mouth."), vision_distance=COMBAT_MESSAGE_RANGE) // Custom movement rate, for old corgis, etc. var/move_chance = controller.blackboard[BB_DOG_IS_SLOW] ? 2.5 : 5 - if(DT_PROB(move_chance, delta_time) && (living_pawn.mobility_flags & MOBILITY_MOVE)) + if(SPT_PROB(move_chance, seconds_per_tick) && (living_pawn.mobility_flags & MOBILITY_MOVE)) var/move_dir = pick(GLOB.alldirs) living_pawn.Move(get_step(living_pawn, move_dir), move_dir) - else if(DT_PROB(2, delta_time)) + else if(SPT_PROB(2, seconds_per_tick)) living_pawn.manual_emote(pick("dances around.", "chases [living_pawn.p_their()] tail!")) living_pawn.AddComponent(/datum/component/spinny) diff --git a/code/datums/ai/idle_behaviors/idle_haunted.dm b/code/datums/ai/idle_behaviors/idle_haunted.dm index bca1fca98b3..a67b5d6cbe0 100644 --- a/code/datums/ai/idle_behaviors/idle_haunted.dm +++ b/code/datums/ai/idle_behaviors/idle_haunted.dm @@ -3,10 +3,10 @@ ///Chance for item to teleport somewhere else var/teleport_chance = 4 -/datum/idle_behavior/idle_ghost_item/perform_idle_behavior(delta_time, datum/ai_controller/controller) +/datum/idle_behavior/idle_ghost_item/perform_idle_behavior(seconds_per_tick, datum/ai_controller/controller) var/obj/item/item_pawn = controller.pawn if(ismob(item_pawn.loc)) //Being held. dont teleport return - if(DT_PROB(teleport_chance, delta_time)) + if(SPT_PROB(teleport_chance, seconds_per_tick)) playsound(item_pawn.loc, 'sound/items/haunted/ghostitemattack.ogg', 100, TRUE) do_teleport(item_pawn, get_turf(item_pawn), 4, channel = TELEPORT_CHANNEL_MAGIC) diff --git a/code/datums/ai/idle_behaviors/idle_monkey.dm b/code/datums/ai/idle_behaviors/idle_monkey.dm index 0e087b7c111..5b5e189435d 100644 --- a/code/datums/ai/idle_behaviors/idle_monkey.dm +++ b/code/datums/ai/idle_behaviors/idle_monkey.dm @@ -12,15 +12,15 @@ "tail", ) -/datum/idle_behavior/idle_monkey/perform_idle_behavior(delta_time, datum/ai_controller/controller) +/datum/idle_behavior/idle_monkey/perform_idle_behavior(seconds_per_tick, datum/ai_controller/controller) var/mob/living/living_pawn = controller.pawn - if(DT_PROB(25, delta_time) && (living_pawn.mobility_flags & MOBILITY_MOVE) && isturf(living_pawn.loc) && !living_pawn.pulledby) + if(SPT_PROB(25, seconds_per_tick) && (living_pawn.mobility_flags & MOBILITY_MOVE) && isturf(living_pawn.loc) && !living_pawn.pulledby) var/move_dir = pick(GLOB.alldirs) living_pawn.Move(get_step(living_pawn, move_dir), move_dir) - else if(DT_PROB(5, delta_time)) + else if(SPT_PROB(5, seconds_per_tick)) INVOKE_ASYNC(living_pawn, TYPE_PROC_REF(/mob, emote), pick(common_emotes)) - else if(DT_PROB(1, delta_time)) + else if(SPT_PROB(1, seconds_per_tick)) INVOKE_ASYNC(living_pawn, TYPE_PROC_REF(/mob, emote), pick(rare_emotes)) /datum/idle_behavior/idle_monkey/pun_pun diff --git a/code/datums/ai/idle_behaviors/idle_random_walk.dm b/code/datums/ai/idle_behaviors/idle_random_walk.dm index a8e3a81d128..b25f983f313 100644 --- a/code/datums/ai/idle_behaviors/idle_random_walk.dm +++ b/code/datums/ai/idle_behaviors/idle_random_walk.dm @@ -2,13 +2,13 @@ ///Chance that the mob random walks per second var/walk_chance = 25 -/datum/idle_behavior/idle_random_walk/perform_idle_behavior(delta_time, datum/ai_controller/controller) +/datum/idle_behavior/idle_random_walk/perform_idle_behavior(seconds_per_tick, datum/ai_controller/controller) . = ..() var/mob/living/living_pawn = controller.pawn if(LAZYLEN(living_pawn.do_afters)) return - if(DT_PROB(walk_chance, delta_time) && (living_pawn.mobility_flags & MOBILITY_MOVE) && isturf(living_pawn.loc) && !living_pawn.pulledby) + if(SPT_PROB(walk_chance, seconds_per_tick) && (living_pawn.mobility_flags & MOBILITY_MOVE) && isturf(living_pawn.loc) && !living_pawn.pulledby) var/move_dir = pick(GLOB.alldirs) living_pawn.Move(get_step(living_pawn, move_dir), move_dir) diff --git a/code/datums/ai/learn_ai.md b/code/datums/ai/learn_ai.md index c35e1a7ee8c..9906806cfbd 100644 --- a/code/datums/ai/learn_ai.md +++ b/code/datums/ai/learn_ai.md @@ -67,7 +67,7 @@ Okay, so we have blackboard variables, which are considered by subtrees to plan ```dm /// this subtree checks if the mob has a target. if it doesn't, it plans looking for food. if it does, it tries to eat the food via attacking it. -/datum/ai_planning_subtree/find_and_eat_food/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/find_and_eat_food/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) //get things out of blackboard var/datum/weakref/weak_target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET] var/atom/target = weak_target?.resolve() @@ -107,7 +107,7 @@ And one of those behaviors, `basic_melee_attack`. As I have been doing so far, I controller.current_movement_target = target ///perform will run every "action_cooldown" deciseconds as long as the conditions are good for it to do so (we set "AI_BEHAVIOR_REQUIRE_MOVEMENT", so it won't perform until in range). -/datum/ai_behavior/basic_melee_attack/perform(delta_time, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key) +/datum/ai_behavior/basic_melee_attack/perform(seconds_per_tick, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key) . = ..() var/mob/living/basic/basic_mob = controller.pawn //targetting datum will kill the action if not real anymore diff --git a/code/datums/ai/monkey/monkey_behaviors.dm b/code/datums/ai/monkey/monkey_behaviors.dm index ff676398315..0ecb7a75bb9 100644 --- a/code/datums/ai/monkey/monkey_behaviors.dm +++ b/code/datums/ai/monkey/monkey_behaviors.dm @@ -63,13 +63,13 @@ /datum/ai_behavior/monkey_equip/ground required_distance = 0 -/datum/ai_behavior/monkey_equip/ground/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/monkey_equip/ground/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() equip_item(controller) /datum/ai_behavior/monkey_equip/pickpocket -/datum/ai_behavior/monkey_equip/pickpocket/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/monkey_equip/pickpocket/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() if(controller.blackboard[BB_MONKEY_PICKPOCKETING]) //We are pickpocketing, don't do ANYTHING!!!! return @@ -115,7 +115,7 @@ /datum/ai_behavior/monkey_flee -/datum/ai_behavior/monkey_flee/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/monkey_flee/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() var/mob/living/living_pawn = controller.pawn @@ -145,7 +145,7 @@ var/datum/weakref/target_ref = controller.blackboard[target_key] set_movement_target(controller, target_ref?.resolve()) -/datum/ai_behavior/monkey_attack_mob/perform(delta_time, datum/ai_controller/controller, target_key) +/datum/ai_behavior/monkey_attack_mob/perform(seconds_per_tick, datum/ai_controller/controller, target_key) . = ..() var/datum/weakref/target_ref = controller.blackboard[target_key] @@ -165,10 +165,10 @@ break // if the target has a weapon, chance to disarm them - if(W && DT_PROB(MONKEY_ATTACK_DISARM_PROB, delta_time)) - monkey_attack(controller, target, delta_time, TRUE) + if(W && SPT_PROB(MONKEY_ATTACK_DISARM_PROB, seconds_per_tick)) + monkey_attack(controller, target, seconds_per_tick, TRUE) else - monkey_attack(controller, target, delta_time, FALSE) + monkey_attack(controller, target, seconds_per_tick, FALSE) /datum/ai_behavior/monkey_attack_mob/finish_action(datum/ai_controller/controller, succeeded, target_key) @@ -178,7 +178,7 @@ controller.blackboard[target_key] = null /// attack using a held weapon otherwise bite the enemy, then if we are angry there is a chance we might calm down a little -/datum/ai_behavior/monkey_attack_mob/proc/monkey_attack(datum/ai_controller/controller, mob/living/target, delta_time, disarm) +/datum/ai_behavior/monkey_attack_mob/proc/monkey_attack(datum/ai_controller/controller, mob/living/target, seconds_per_tick, disarm) var/mob/living/living_pawn = controller.pawn if(living_pawn.next_move > world.time) @@ -225,7 +225,7 @@ /// mob refs are uids, so this is safe var/datum/weakref/target_ref = WEAKREF(target) - if(DT_PROB(MONKEY_HATRED_REDUCTION_PROB, delta_time)) + if(SPT_PROB(MONKEY_HATRED_REDUCTION_PROB, seconds_per_tick)) controller.blackboard[BB_MONKEY_ENEMIES][target_ref]-- // if we are not angry at our target, go back to idle @@ -249,7 +249,7 @@ controller.blackboard[BB_MONKEY_DISPOSING] = FALSE //No longer disposing controller.blackboard[disposal_target_key] = null //No target disposal -/datum/ai_behavior/disposal_mob/perform(delta_time, datum/ai_controller/controller, attack_target_key, disposal_target_key) +/datum/ai_behavior/disposal_mob/perform(seconds_per_tick, datum/ai_controller/controller, attack_target_key, disposal_target_key) . = ..() if(controller.blackboard[BB_MONKEY_DISPOSING]) //We are disposing, don't do ANYTHING!!!! @@ -297,7 +297,7 @@ finish_action(controller, TRUE, attack_target_key, disposal_target_key) -/datum/ai_behavior/recruit_monkeys/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/recruit_monkeys/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() controller.blackboard[BB_MONKEY_RECRUIT_COOLDOWN] = world.time + MONKEY_RECRUIT_COOLDOWN @@ -307,7 +307,7 @@ if(!HAS_AI_CONTROLLER_TYPE(L, /datum/ai_controller/monkey)) continue - if(!DT_PROB(MONKEY_RECRUIT_PROB, delta_time)) + if(!SPT_PROB(MONKEY_RECRUIT_PROB, seconds_per_tick)) continue var/datum/ai_controller/monkey/monkey_ai = L.ai_controller var/datum/weakref/enemy_ref = controller.blackboard[BB_MONKEY_CURRENT_ATTACK_TARGET] @@ -316,7 +316,7 @@ monkey_ai.blackboard[BB_MONKEY_RECRUIT_COOLDOWN] = world.time + MONKEY_RECRUIT_COOLDOWN finish_action(controller, TRUE) -/datum/ai_behavior/monkey_set_combat_target/perform(delta_time, datum/ai_controller/controller, set_key, enemies_key) +/datum/ai_behavior/monkey_set_combat_target/perform(seconds_per_tick, datum/ai_controller/controller, set_key, enemies_key) var/list/enemies = controller.blackboard[enemies_key] var/list/valids = list() for(var/mob/living/possible_enemy in view(MONKEY_ENEMY_VISION, controller.pawn)) diff --git a/code/datums/ai/monkey/monkey_subtrees.dm b/code/datums/ai/monkey/monkey_subtrees.dm index ec6db291438..898a0481055 100644 --- a/code/datums/ai/monkey/monkey_subtrees.dm +++ b/code/datums/ai/monkey/monkey_subtrees.dm @@ -1,9 +1,9 @@ -/datum/ai_planning_subtree/monkey_shenanigans/SelectBehaviors(datum/ai_controller/monkey/controller, delta_time) +/datum/ai_planning_subtree/monkey_shenanigans/SelectBehaviors(datum/ai_controller/monkey/controller, seconds_per_tick) if(prob(5)) controller.queue_behavior(/datum/ai_behavior/use_in_hand) - if(!DT_PROB(MONKEY_SHENANIGAN_PROB, delta_time)) + if(!SPT_PROB(MONKEY_SHENANIGAN_PROB, seconds_per_tick)) return if(!controller.blackboard[BB_MONKEY_CURRENT_PRESS_TARGET]) @@ -24,7 +24,7 @@ controller.TryFindWeapon() ///monkey combat subtree. -/datum/ai_planning_subtree/monkey_combat/SelectBehaviors(datum/ai_controller/monkey/controller, delta_time) +/datum/ai_planning_subtree/monkey_combat/SelectBehaviors(datum/ai_controller/monkey/controller, seconds_per_tick) var/mob/living/living_pawn = controller.pawn var/list/enemies = controller.blackboard[BB_MONKEY_ENEMIES] diff --git a/code/datums/ai/monkey/punpun_subtrees.dm b/code/datums/ai/monkey/punpun_subtrees.dm index 5daa40d401f..6370393db00 100644 --- a/code/datums/ai/monkey/punpun_subtrees.dm +++ b/code/datums/ai/monkey/punpun_subtrees.dm @@ -1,11 +1,11 @@ -/datum/ai_planning_subtree/punpun_shenanigans/SelectBehaviors(datum/ai_controller/monkey/controller, delta_time) +/datum/ai_planning_subtree/punpun_shenanigans/SelectBehaviors(datum/ai_controller/monkey/controller, seconds_per_tick) controller.set_trip_mode(mode = FALSE) // pun pun doesn't fuck around if(prob(5)) controller.queue_behavior(/datum/ai_behavior/use_in_hand) - if(!DT_PROB(MONKEY_SHENANIGAN_PROB, delta_time)) + if(!SPT_PROB(MONKEY_SHENANIGAN_PROB, seconds_per_tick)) return if(!controller.blackboard[BB_MONKEY_CURRENT_PRESS_TARGET]) diff --git a/code/datums/ai/objects/mod.dm b/code/datums/ai/objects/mod.dm index 7e9bb380dd6..c2c3599ddb1 100644 --- a/code/datums/ai/objects/mod.dm +++ b/code/datums/ai/objects/mod.dm @@ -22,7 +22,7 @@ QDEL_NULL(id_card) return ..() //Run parent at end -/datum/ai_controller/mod/SelectBehaviors(delta_time) +/datum/ai_controller/mod/SelectBehaviors(seconds_per_tick) current_behaviors = list() if(blackboard[BB_MOD_TARGET] && blackboard[BB_MOD_IMPLANT]) queue_behavior(/datum/ai_behavior/mod_attach) @@ -33,7 +33,7 @@ /datum/ai_behavior/mod_attach behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT|AI_BEHAVIOR_MOVE_AND_PERFORM -/datum/ai_behavior/mod_attach/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/mod_attach/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() if(!controller.pawn.Adjacent(controller.blackboard[BB_MOD_TARGET])) return diff --git a/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm b/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm index db5950c71e8..e5d7f2665e9 100644 --- a/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm +++ b/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm @@ -10,7 +10,7 @@ set_movement_target(controller, controller.blackboard[target_key]) -/datum/ai_behavior/vendor_crush/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/vendor_crush/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() if(controller.blackboard[BB_VENDING_BUSY_TILTING]) return @@ -40,7 +40,7 @@ ///Time before machine can tilt again after untilting if last hit was a success var/succes_tilt_cooldown = 5 SECONDS -/datum/ai_behavior/vendor_rise_up/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/vendor_rise_up/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() var/obj/machinery/vending/vendor_pawn = controller.pawn vendor_pawn.visible_message(span_warning("[vendor_pawn] untilts itself!")) diff --git a/code/datums/ai/objects/vending_machines/vending_machine_controller.dm b/code/datums/ai/objects/vending_machines/vending_machine_controller.dm index 9f3e51d654b..c6b6ea79fa8 100644 --- a/code/datums/ai/objects/vending_machines/vending_machine_controller.dm +++ b/code/datums/ai/objects/vending_machines/vending_machine_controller.dm @@ -27,7 +27,7 @@ RemoveElement(/datum/element/footstep, FOOTSTEP_OBJ_MACHINE, 1, -6, sound_vary = TRUE) return ..() //Run parent at end -/datum/ai_controller/vending_machine/SelectBehaviors(delta_time) +/datum/ai_controller/vending_machine/SelectBehaviors(seconds_per_tick) current_behaviors = list() var/obj/machinery/vending/vendor_pawn = pawn diff --git a/code/datums/ai/oldhostile/hostile_tameable.dm b/code/datums/ai/oldhostile/hostile_tameable.dm index 31db515cb4d..4291ff8ec98 100644 --- a/code/datums/ai/oldhostile/hostile_tameable.dm +++ b/code/datums/ai/oldhostile/hostile_tameable.dm @@ -16,7 +16,7 @@ COOLDOWN_DECLARE(command_cooldown) -/datum/ai_controller/hostile_friend/process(delta_time) +/datum/ai_controller/hostile_friend/process(seconds_per_tick) if(isliving(pawn)) var/mob/living/living_pawn = pawn movement_delay = living_pawn.cached_multiplicative_slowdown diff --git a/code/datums/ai/robot_customer/robot_customer_behaviors.dm b/code/datums/ai/robot_customer/robot_customer_behaviors.dm index 0cdf489886e..c78585efc0e 100644 --- a/code/datums/ai/robot_customer/robot_customer_behaviors.dm +++ b/code/datums/ai/robot_customer/robot_customer_behaviors.dm @@ -1,7 +1,7 @@ /datum/ai_behavior/find_seat action_cooldown = 8 SECONDS -/datum/ai_behavior/find_seat/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/find_seat/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() var/mob/living/simple_animal/robot_customer/customer_pawn = controller.pawn var/datum/customer_data/customer_data = controller.blackboard[BB_CUSTOMER_CUSTOMERINFO] @@ -31,8 +31,8 @@ finish_action(controller, TRUE) return - // DT_PROB 1.5 is about a 60% chance that the tourist will have vocalised at least once every minute. - if(!controller.blackboard[BB_CUSTOMER_SAID_CANT_FIND_SEAT_LINE] || DT_PROB(1.5, delta_time)) + // SPT_PROB 1.5 is about a 60% chance that the tourist will have vocalised at least once every minute. + if(!controller.blackboard[BB_CUSTOMER_SAID_CANT_FIND_SEAT_LINE] || SPT_PROB(1.5, seconds_per_tick)) customer_pawn.say(pick(customer_data.cant_find_seat_lines)) controller.blackboard[BB_CUSTOMER_SAID_CANT_FIND_SEAT_LINE] = TRUE @@ -42,7 +42,7 @@ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT required_distance = 0 -/datum/ai_behavior/order_food/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/order_food/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() var/mob/living/simple_animal/robot_customer/customer_pawn = controller.pawn var/datum/customer_data/customer_data = controller.blackboard[BB_CUSTOMER_CUSTOMERINFO] @@ -64,19 +64,19 @@ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_MOVE_AND_PERFORM required_distance = 0 -/datum/ai_behavior/wait_for_food/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/wait_for_food/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() if(controller.blackboard[BB_CUSTOMER_EATING]) finish_action(controller, TRUE) return - controller.blackboard[BB_CUSTOMER_PATIENCE] -= delta_time * 10 // Convert delta_time to a SECONDS equivalent. + controller.blackboard[BB_CUSTOMER_PATIENCE] -= seconds_per_tick * 10 // Convert seconds_per_tick to a SECONDS equivalent. if(controller.blackboard[BB_CUSTOMER_PATIENCE] < 0 || controller.blackboard[BB_CUSTOMER_LEAVING]) // Check if we're leaving because sometthing mightve forced us to finish_action(controller, FALSE) return - // DT_PROB 1.5 is about a 40% chance that the tourist will have vocalised at least once every minute. - if(DT_PROB(0.85, delta_time)) + // SPT_PROB 1.5 is about a 40% chance that the tourist will have vocalised at least once every minute. + if(SPT_PROB(0.85, seconds_per_tick)) var/mob/living/simple_animal/robot_customer/customer_pawn = controller.pawn var/datum/customer_data/customer_data = controller.blackboard[BB_CUSTOMER_CUSTOMERINFO] customer_pawn.say(pick(customer_data.wait_for_food_lines)) @@ -124,7 +124,7 @@ var/datum/venue/attending_venue = controller.blackboard[venue_key] set_movement_target(controller, attending_venue.restaurant_portal) -/datum/ai_behavior/leave_venue/perform(delta_time, datum/ai_controller/controller, venue_key) +/datum/ai_behavior/leave_venue/perform(seconds_per_tick, datum/ai_controller/controller, venue_key) . = ..() qdel(controller.pawn) //save the world, my final message, goodbye. finish_action(controller, TRUE) diff --git a/code/datums/ai/robot_customer/robot_customer_subtrees.dm b/code/datums/ai/robot_customer/robot_customer_subtrees.dm index 74417b1d2e2..b5fb4bd786e 100644 --- a/code/datums/ai/robot_customer/robot_customer_subtrees.dm +++ b/code/datums/ai/robot_customer/robot_customer_subtrees.dm @@ -1,4 +1,4 @@ -/datum/ai_planning_subtree/robot_customer/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/robot_customer/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) if(controller.blackboard[BB_CUSTOMER_LEAVING]) controller.queue_behavior(/datum/ai_behavior/leave_venue, BB_CUSTOMER_ATTENDING_VENUE) return SUBTREE_RETURN_FINISH_PLANNING diff --git a/code/datums/brain_damage/brain_trauma.dm b/code/datums/brain_damage/brain_trauma.dm index 7188ce30ff5..943573f38d1 100644 --- a/code/datums/brain_damage/brain_trauma.dm +++ b/code/datums/brain_damage/brain_trauma.dm @@ -24,7 +24,7 @@ return ..() //Called on life ticks -/datum/brain_trauma/proc/on_life(delta_time, times_fired) +/datum/brain_trauma/proc/on_life(seconds_per_tick, times_fired) return //Called on death diff --git a/code/datums/brain_damage/creepy_trauma.dm b/code/datums/brain_damage/creepy_trauma.dm index 5978148e5cd..0203a78b2f7 100644 --- a/code/datums/brain_damage/creepy_trauma.dm +++ b/code/datums/brain_damage/creepy_trauma.dm @@ -36,7 +36,7 @@ antagonist.greet() RegisterSignal(owner, COMSIG_CARBON_HELPED, PROC_REF(on_hug)) -/datum/brain_trauma/special/obsessed/on_life(delta_time, times_fired) +/datum/brain_trauma/special/obsessed/on_life(seconds_per_tick, times_fired) if(!obsession || obsession.stat == DEAD) viewing = FALSE//important, makes sure you no longer stutter when happy if you murdered them while viewing return @@ -50,10 +50,10 @@ viewing = FALSE if(viewing) owner.add_mood_event("creeping", /datum/mood_event/creeping, obsession.name) - total_time_creeping += delta_time SECONDS + total_time_creeping += seconds_per_tick SECONDS time_spent_away = 0 if(attachedobsessedobj)//if an objective needs to tick down, we can do that since traumas coexist with the antagonist datum - attachedobsessedobj.timer -= delta_time SECONDS //mob subsystem ticks every 2 seconds(?), remove 20 deciseconds from the timer. sure, that makes sense. + attachedobsessedobj.timer -= seconds_per_tick SECONDS //mob subsystem ticks every 2 seconds(?), remove 20 deciseconds from the timer. sure, that makes sense. else out_of_view() diff --git a/code/datums/brain_damage/hypnosis.dm b/code/datums/brain_damage/hypnosis.dm index e1b3c4095ed..dbaa571cacd 100644 --- a/code/datums/brain_damage/hypnosis.dm +++ b/code/datums/brain_damage/hypnosis.dm @@ -57,9 +57,9 @@ ..() owner.mind.remove_antag_datum(/datum/antagonist/hypnotized) -/datum/brain_trauma/hypnosis/on_life(delta_time, times_fired) +/datum/brain_trauma/hypnosis/on_life(seconds_per_tick, times_fired) ..() - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) if(prob(50)) to_chat(owner, span_hypnophrase("...[lowertext(hypnotic_phrase)]...")) else diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm index 57c3387e87e..7b8b1d37590 100644 --- a/code/datums/brain_damage/imaginary_friend.dm +++ b/code/datums/brain_damage/imaginary_friend.dm @@ -16,7 +16,7 @@ make_friend() get_ghost() -/datum/brain_trauma/special/imaginary_friend/on_life(delta_time, times_fired) +/datum/brain_trauma/special/imaginary_friend/on_life(seconds_per_tick, times_fired) 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 8618e5d6cd7..ac27ca65555 100644 --- a/code/datums/brain_damage/magic.dm +++ b/code/datums/brain_damage/magic.dm @@ -15,7 +15,7 @@ COOLDOWN_DECLARE(damage_warning_cooldown) var/next_damage_warning = 0 -/datum/brain_trauma/magic/lumiphobia/on_life(delta_time, times_fired) +/datum/brain_trauma/magic/lumiphobia/on_life(seconds_per_tick, times_fired) ..() var/turf/T = owner.loc if(!istype(T)) @@ -27,7 +27,7 @@ if(COOLDOWN_FINISHED(src, damage_warning_cooldown)) to_chat(owner, span_warning("The light burns you!")) COOLDOWN_START(src, damage_warning_cooldown, 10 SECONDS) - owner.take_overall_damage(burn = 1.5 * delta_time) + owner.take_overall_damage(burn = 1.5 * seconds_per_tick) /datum/brain_trauma/magic/poltergeist name = "Poltergeist" @@ -36,9 +36,9 @@ 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(delta_time, times_fired) +/datum/brain_trauma/magic/poltergeist/on_life(seconds_per_tick, times_fired) ..() - if(!DT_PROB(2, delta_time)) + if(!SPT_PROB(2, seconds_per_tick)) return var/most_violent = -1 //So it can pick up items with 0 throwforce if there's nothing else @@ -92,7 +92,7 @@ QDEL_NULL(stalker) return ..() -/datum/brain_trauma/magic/stalker/on_life(delta_time, times_fired) +/datum/brain_trauma/magic/stalker/on_life(seconds_per_tick, times_fired) // Dead and unconscious people are not interesting to the psychic stalker. if(owner.stat != CONSCIOUS) return @@ -106,7 +106,7 @@ playsound(owner, 'sound/magic/demon_attack1.ogg', 50) owner.visible_message(span_warning("[owner] is torn apart by invisible claws!"), span_userdanger("Ghostly claws tear your body apart!")) owner.take_bodypart_damage(rand(20, 45), wound_bonus=CANT_WOUND) - else if(DT_PROB(30, delta_time)) + else if(SPT_PROB(30, seconds_per_tick)) stalker.forceMove(get_step_towards(stalker, owner)) if(get_dist(owner, stalker) <= 8) if(!close_stalker) diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm index c828881be25..87e6ebe0b22 100644 --- a/code/datums/brain_damage/mild.dm +++ b/code/datums/brain_damage/mild.dm @@ -11,13 +11,13 @@ gain_text = span_warning("You feel your grip on reality slipping...") lose_text = span_notice("You feel more grounded.") -/datum/brain_trauma/mild/hallucinations/on_life(delta_time, times_fired) +/datum/brain_trauma/mild/hallucinations/on_life(seconds_per_tick, times_fired) if(owner.stat != CONSCIOUS || owner.IsSleeping() || owner.IsUnconscious()) return if(HAS_TRAIT(owner, TRAIT_RDS_SUPPRESSED)) return - owner.adjust_hallucinations_up_to(10 SECONDS * delta_time, 100 SECONDS) + owner.adjust_hallucinations_up_to(10 SECONDS * seconds_per_tick, 100 SECONDS) /datum/brain_trauma/mild/hallucinations/on_lose() owner.remove_status_effect(/datum/status_effect/hallucination) @@ -30,8 +30,8 @@ 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(delta_time, times_fired) - owner.adjust_stutter_up_to(5 SECONDS * delta_time, 50 SECONDS) +/datum/brain_trauma/mild/stuttering/on_life(seconds_per_tick, times_fired) + owner.adjust_stutter_up_to(5 SECONDS * seconds_per_tick, 50 SECONDS) /datum/brain_trauma/mild/stuttering/on_lose() owner.remove_status_effect(/datum/status_effect/speech/stutter) @@ -49,11 +49,11 @@ owner.add_mood_event("dumb", /datum/mood_event/oblivious) return ..() -/datum/brain_trauma/mild/dumbness/on_life(delta_time, times_fired) - owner.adjust_derpspeech_up_to(5 SECONDS * delta_time, 50 SECONDS) - if(DT_PROB(1.5, delta_time)) +/datum/brain_trauma/mild/dumbness/on_life(seconds_per_tick, times_fired) + owner.adjust_derpspeech_up_to(5 SECONDS * seconds_per_tick, 50 SECONDS) + if(SPT_PROB(1.5, seconds_per_tick)) owner.emote("drool") - else if(owner.stat == CONSCIOUS && DT_PROB(1.5, delta_time)) + else if(owner.stat == CONSCIOUS && SPT_PROB(1.5, seconds_per_tick)) owner.say(pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage"), forced = "brain damage", filterproof = TRUE) /datum/brain_trauma/mild/dumbness/on_lose() @@ -84,8 +84,8 @@ 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(delta_time, times_fired) - if(DT_PROB(2.5, delta_time)) +/datum/brain_trauma/mild/concussion/on_life(seconds_per_tick, times_fired) + if(SPT_PROB(2.5, seconds_per_tick)) switch(rand(1,11)) if(1) owner.vomit() @@ -116,8 +116,8 @@ owner.apply_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type) return ..() -/datum/brain_trauma/mild/healthy/on_life(delta_time, times_fired) - owner.adjustStaminaLoss(-2.5 * delta_time) //no pain, no fatigue +/datum/brain_trauma/mild/healthy/on_life(seconds_per_tick, times_fired) + owner.adjustStaminaLoss(-2.5 * seconds_per_tick) //no pain, no fatigue /datum/brain_trauma/mild/healthy/on_lose() owner.remove_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type) @@ -130,11 +130,11 @@ 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(delta_time, times_fired) +/datum/brain_trauma/mild/muscle_weakness/on_life(seconds_per_tick, times_fired) var/fall_chance = 1 if(owner.m_intent == MOVE_INTENT_RUN) fall_chance += 2 - if(DT_PROB(0.5 * fall_chance, delta_time) && owner.body_position == STANDING_UP) + if(SPT_PROB(0.5 * fall_chance, seconds_per_tick) && owner.body_position == STANDING_UP) to_chat(owner, span_warning("Your leg gives out!")) owner.Paralyze(35) @@ -142,10 +142,10 @@ var/drop_chance = 1 var/obj/item/I = owner.get_active_held_item() drop_chance += I.w_class - if(DT_PROB(0.5 * drop_chance, delta_time) && owner.dropItemToGround(I)) + if(SPT_PROB(0.5 * drop_chance, seconds_per_tick) && owner.dropItemToGround(I)) to_chat(owner, span_warning("You drop [I]!")) - else if(DT_PROB(1.5, delta_time)) + else if(SPT_PROB(1.5, seconds_per_tick)) to_chat(owner, span_warning("You feel a sudden weakness in your muscles!")) owner.adjustStaminaLoss(50) ..() @@ -172,8 +172,8 @@ gain_text = span_warning("Your throat itches incessantly...") lose_text = span_notice("Your throat stops itching.") -/datum/brain_trauma/mild/nervous_cough/on_life(delta_time, times_fired) - if(DT_PROB(6, delta_time) && !HAS_TRAIT(owner, TRAIT_SOOTHED_THROAT)) +/datum/brain_trauma/mild/nervous_cough/on_life(seconds_per_tick, times_fired) + 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!")]")) owner.Immobilize(20) diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm index 956c0759f9a..a7ac19ad754 100644 --- a/code/datums/brain_damage/phobia.dm +++ b/code/datums/brain_damage/phobia.dm @@ -34,7 +34,7 @@ trigger_species = GLOB.phobia_species[phobia_type] ..() -/datum/brain_trauma/mild/phobia/on_life(delta_time, times_fired) +/datum/brain_trauma/mild/phobia/on_life(seconds_per_tick, times_fired) ..() if(HAS_TRAIT(owner, TRAIT_FEARLESS)) return diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index 75099a99f8a..ffaf8f71857 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -124,7 +124,7 @@ gain_text = span_warning("You have a constant feeling of drowsiness...") lose_text = span_notice("You feel awake and aware again.") -/datum/brain_trauma/severe/narcolepsy/on_life(delta_time, times_fired) +/datum/brain_trauma/severe/narcolepsy/on_life(seconds_per_tick, times_fired) if(owner.IsSleeping()) return @@ -135,11 +135,11 @@ if(drowsy) sleep_chance += 3 - if(DT_PROB(0.5 * sleep_chance, delta_time)) + if(SPT_PROB(0.5 * sleep_chance, seconds_per_tick)) to_chat(owner, span_warning("You fall asleep.")) owner.Sleeping(6 SECONDS) - else if(!drowsy && DT_PROB(sleep_chance, delta_time)) + else if(!drowsy && SPT_PROB(sleep_chance, seconds_per_tick)) to_chat(owner, span_warning("You feel tired...")) owner.adjust_drowsiness(20 SECONDS) @@ -158,14 +158,14 @@ else to_chat(owner, span_notice("You feel safe, as long as you have people around you.")) -/datum/brain_trauma/severe/monophobia/on_life(delta_time, times_fired) +/datum/brain_trauma/severe/monophobia/on_life(seconds_per_tick, times_fired) ..() if(check_alone()) stress = min(stress + 0.5, 100) - if(stress > 10 && DT_PROB(2.5, delta_time)) + if(stress > 10 && SPT_PROB(2.5, seconds_per_tick)) stress_reaction() else - stress = max(stress - (2 * delta_time), 0) + stress = max(stress - (2 * seconds_per_tick), 0) /datum/brain_trauma/severe/monophobia/proc/check_alone() var/check_radius = 7 @@ -266,9 +266,9 @@ ..() owner.remove_status_effect(/datum/status_effect/trance) -/datum/brain_trauma/severe/hypnotic_stupor/on_life(delta_time, times_fired) +/datum/brain_trauma/severe/hypnotic_stupor/on_life(seconds_per_tick, times_fired) ..() - if(DT_PROB(0.5, delta_time) && !owner.has_status_effect(/datum/status_effect/trance)) + 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) /datum/brain_trauma/severe/hypnotic_trigger diff --git a/code/datums/brain_damage/special.dm b/code/datums/brain_damage/special.dm index 177ff7940ea..d0be9df52b4 100644 --- a/code/datums/brain_damage/special.dm +++ b/code/datums/brain_damage/special.dm @@ -10,9 +10,9 @@ 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(delta_time, times_fired) +/datum/brain_trauma/special/godwoken/on_life(seconds_per_tick, times_fired) ..() - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) if(prob(33) && (owner.IsStun() || owner.IsParalyzed() || owner.IsUnconscious())) speak("unstun", TRUE) else if(prob(60) && owner.health <= owner.crit_threshold) @@ -56,7 +56,7 @@ /// Cooldown so we can't teleport literally everywhere on a whim COOLDOWN_DECLARE(portal_cooldown) -/datum/brain_trauma/special/bluespace_prophet/on_life(delta_time, times_fired) +/datum/brain_trauma/special/bluespace_prophet/on_life(seconds_per_tick, times_fired) if(!COOLDOWN_FINISHED(src, portal_cooldown)) return @@ -160,7 +160,7 @@ /// Cooldown for snapbacks COOLDOWN_DECLARE(snapback_cooldown) -/datum/brain_trauma/special/quantum_alignment/on_life(delta_time, times_fired) +/datum/brain_trauma/special/quantum_alignment/on_life(seconds_per_tick, times_fired) if(linked) if(QDELETED(linked_target)) linked_target = null @@ -169,7 +169,7 @@ if(!returning && COOLDOWN_FINISHED(src, snapback_cooldown)) start_snapback() return - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) try_entangle() /datum/brain_trauma/special/quantum_alignment/proc/try_entangle() @@ -306,9 +306,9 @@ /// A cooldown to prevent constantly erratic dolphining through the fabric of reality COOLDOWN_DECLARE(crisis_cooldown) -/datum/brain_trauma/special/existential_crisis/on_life(delta_time, times_fired) +/datum/brain_trauma/special/existential_crisis/on_life(seconds_per_tick, times_fired) ..() - if(!veil && COOLDOWN_FINISHED(src, crisis_cooldown) && DT_PROB(1.5, delta_time)) + if(!veil && COOLDOWN_FINISHED(src, crisis_cooldown) && SPT_PROB(1.5, seconds_per_tick)) if(isturf(owner.loc)) fade_out() diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm index b680cc1e58a..4c7b6a46100 100644 --- a/code/datums/brain_damage/split_personality.dm +++ b/code/datums/brain_damage/split_personality.dm @@ -42,12 +42,12 @@ else qdel(src) -/datum/brain_trauma/severe/split_personality/on_life(delta_time, times_fired) +/datum/brain_trauma/severe/split_personality/on_life(seconds_per_tick, times_fired) if(owner.stat == DEAD) if(current_controller != OWNER) switch_personalities(TRUE) qdel(src) - else if(DT_PROB(1.5, delta_time)) + else if(SPT_PROB(1.5, seconds_per_tick)) switch_personalities() ..() @@ -135,7 +135,7 @@ trauma = _trauma return ..() -/mob/living/split_personality/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/split_personality/Life(seconds_per_tick = SSMOBS_DT, times_fired) if(QDELETED(body)) qdel(src) //in case trauma deletion doesn't already do it @@ -207,7 +207,7 @@ else qdel(src) -/datum/brain_trauma/severe/split_personality/brainwashing/on_life(delta_time, times_fired) +/datum/brain_trauma/severe/split_personality/brainwashing/on_life(seconds_per_tick, times_fired) return //no random switching /datum/brain_trauma/severe/split_personality/brainwashing/handle_hearing(datum/source, list/hearing_args) diff --git a/code/datums/components/acid.dm b/code/datums/components/acid.dm index 4a96313513a..a1594f6f00e 100644 --- a/code/datums/components/acid.dm +++ b/code/datums/components/acid.dm @@ -95,25 +95,25 @@ /// Handles the slow corrosion of the parent [/atom]. -/datum/component/acid/process(delta_time) - process_effect?.InvokeAsync(delta_time) +/datum/component/acid/process(seconds_per_tick) + process_effect?.InvokeAsync(seconds_per_tick) if(QDELING(src)) //The process effect deals damage, and on turfs diminishes the acid volume, potentially destroying the component. Let's not destroy it twice. return - set_volume(acid_volume - (ACID_DECAY_BASE + (ACID_DECAY_SCALING*round(sqrt(acid_volume)))) * delta_time) + set_volume(acid_volume - (ACID_DECAY_BASE + (ACID_DECAY_SCALING*round(sqrt(acid_volume)))) * seconds_per_tick) /// Handles processing on a [/obj]. -/datum/component/acid/proc/process_obj(obj/target, delta_time) +/datum/component/acid/proc/process_obj(obj/target, seconds_per_tick) if(target.resistance_flags & ACID_PROOF) return - target.take_damage(min(1 + round(sqrt(acid_power * acid_volume)*0.3), OBJ_ACID_DAMAGE_MAX) * delta_time, BURN, ACID, 0) + target.take_damage(min(1 + round(sqrt(acid_power * acid_volume)*0.3), OBJ_ACID_DAMAGE_MAX) * seconds_per_tick, BURN, ACID, 0) /// Handles processing on a [/mob/living]. -/datum/component/acid/proc/process_mob(mob/living/target, delta_time) - target.acid_act(acid_power, acid_volume * delta_time) +/datum/component/acid/proc/process_mob(mob/living/target, seconds_per_tick) + target.acid_act(acid_power, acid_volume * seconds_per_tick) /// Handles processing on a [/turf]. -/datum/component/acid/proc/process_turf(turf/target_turf, delta_time) - var/acid_used = min(acid_volume * 0.05, 20) * delta_time +/datum/component/acid/proc/process_turf(turf/target_turf, seconds_per_tick) + var/acid_used = min(acid_volume * 0.05, 20) * seconds_per_tick var/applied_targets = 0 for(var/am in target_turf) var/atom/movable/target_movable = am @@ -127,7 +127,7 @@ if(acid_power < ACID_POWER_MELT_TURF) return - parent_integrity -= delta_time + parent_integrity -= seconds_per_tick if(parent_integrity <= 0) target_turf.visible_message(span_warning("[target_turf] collapses under its own weight into a puddle of goop and undigested debris!")) target_turf.acid_melt() diff --git a/code/datums/components/admin_popup.dm b/code/datums/components/admin_popup.dm index ac5ac409a7d..e22c2073ebd 100644 --- a/code/datums/components/admin_popup.dm +++ b/code/datums/components/admin_popup.dm @@ -93,7 +93,7 @@ STOP_PROCESSING(SSobj, src) return ..() -/atom/movable/screen/admin_popup/process(delta_time) +/atom/movable/screen/admin_popup/process(seconds_per_tick) update_text() /atom/movable/screen/admin_popup/proc/update_text() diff --git a/code/datums/components/aura_healing.dm b/code/datums/components/aura_healing.dm index 38cadccdc44..668e19d5786 100644 --- a/code/datums/components/aura_healing.dm +++ b/code/datums/components/aura_healing.dm @@ -93,7 +93,7 @@ return ..() -/datum/component/aura_healing/process(delta_time) +/datum/component/aura_healing/process(seconds_per_tick) var/should_show_effect = COOLDOWN_FINISHED(src, last_heal_effect_time) if (should_show_effect) COOLDOWN_START(src, last_heal_effect_time, HEAL_EFFECT_COOLDOWN) @@ -117,28 +117,28 @@ new /obj/effect/temp_visual/heal(get_turf(candidate), healing_color) if (iscarbon(candidate) || issilicon(candidate) || isbasicmob(candidate)) - candidate.adjustBruteLoss(-brute_heal * delta_time, updating_health = FALSE) - candidate.adjustFireLoss(-burn_heal * delta_time, updating_health = FALSE) + candidate.adjustBruteLoss(-brute_heal * seconds_per_tick, updating_health = FALSE) + candidate.adjustFireLoss(-burn_heal * seconds_per_tick, updating_health = FALSE) if (iscarbon(candidate)) // Toxin healing is forced for slime people - candidate.adjustToxLoss(-toxin_heal * delta_time, updating_health = FALSE, forced = TRUE) + candidate.adjustToxLoss(-toxin_heal * seconds_per_tick, updating_health = FALSE, forced = TRUE) - candidate.adjustOxyLoss(-suffocation_heal * delta_time, updating_health = FALSE) - candidate.adjustStaminaLoss(-stamina_heal * delta_time, updating_stamina = FALSE) - candidate.adjustCloneLoss(-clone_heal * delta_time, updating_health = FALSE) + candidate.adjustOxyLoss(-suffocation_heal * seconds_per_tick, updating_health = FALSE) + candidate.adjustStaminaLoss(-stamina_heal * seconds_per_tick, updating_stamina = FALSE) + candidate.adjustCloneLoss(-clone_heal * seconds_per_tick, updating_health = FALSE) for (var/organ in organ_healing) - candidate.adjustOrganLoss(organ, -organ_healing[organ] * delta_time) + candidate.adjustOrganLoss(organ, -organ_healing[organ] * seconds_per_tick) else if (isanimal(candidate)) var/mob/living/simple_animal/animal_candidate = candidate - animal_candidate.adjustHealth(-simple_heal * delta_time, updating_health = FALSE) + animal_candidate.adjustHealth(-simple_heal * seconds_per_tick, updating_health = FALSE) else if (isbasicmob(candidate)) var/mob/living/basic/basic_candidate = candidate - basic_candidate.adjust_health(-simple_heal * delta_time, updating_health = FALSE) + basic_candidate.adjust_health(-simple_heal * seconds_per_tick, updating_health = FALSE) if (candidate.blood_volume < BLOOD_VOLUME_NORMAL) - candidate.blood_volume += blood_heal * delta_time + candidate.blood_volume += blood_heal * seconds_per_tick candidate.updatehealth() diff --git a/code/datums/components/bakeable.dm b/code/datums/components/bakeable.dm index 345c84669b1..11bfc7fc8cb 100644 --- a/code/datums/components/bakeable.dm +++ b/code/datums/components/bakeable.dm @@ -50,13 +50,13 @@ who_baked_us = REF(baker.mind) ///Ran every time an item is baked by something -/datum/component/bakeable/proc/on_bake(datum/source, atom/used_oven, delta_time = 1) +/datum/component/bakeable/proc/on_bake(datum/source, atom/used_oven, seconds_per_tick = 1) SIGNAL_HANDLER // Let our signal know if we're baking something good or ... burning something var/baking_result = positive_result ? COMPONENT_BAKING_GOOD_RESULT : COMPONENT_BAKING_BAD_RESULT - current_bake_time += delta_time * 10 //turn it into ds + current_bake_time += seconds_per_tick * 10 //turn it into ds if(current_bake_time >= required_bake_time) finish_baking(used_oven) diff --git a/code/datums/components/curse_of_hunger.dm b/code/datums/components/curse_of_hunger.dm index 296e014196a..a3100c79edb 100644 --- a/code/datums/components/curse_of_hunger.dm +++ b/code/datums/components/curse_of_hunger.dm @@ -105,7 +105,7 @@ cursed_item.AddElement(/datum/element/cursed, cursed_item.slot_equipment_priority[1]) cursed_item.visible_message(span_warning("[cursed_item] begins to move on [cursed_item.p_their()] own...")) -/datum/component/curse_of_hunger/process(delta_time) +/datum/component/curse_of_hunger/process(seconds_per_tick) var/obj/item/cursed_item = parent var/mob/living/carbon/cursed = cursed_item.loc ///check hp @@ -113,7 +113,7 @@ the_curse_ends(cursed) return - hunger += delta_time + hunger += seconds_per_tick if((hunger <= HUNGER_THRESHOLD_TRY_EATING) || prob(80)) return diff --git a/code/datums/components/egg_layer.dm b/code/datums/components/egg_layer.dm index f47fa17c20f..32812b4e3e1 100644 --- a/code/datums/components/egg_layer.dm +++ b/code/datums/components/egg_layer.dm @@ -71,14 +71,14 @@ eggs_left += min(eggs_left + eggs_added_from_eating, max_eggs_held) return COMPONENT_CANCEL_ATTACK_CHAIN -/datum/component/egg_layer/process(delta_time = SSOBJ_DT) +/datum/component/egg_layer/process(seconds_per_tick = SSOBJ_DT) var/atom/at_least_atom = parent if(isliving(at_least_atom)) var/mob/living/potentially_dead_horse = at_least_atom if(potentially_dead_horse.stat != CONSCIOUS) return - if(!eggs_left || !DT_PROB(1.5, delta_time)) + if(!eggs_left || !SPT_PROB(1.5, seconds_per_tick)) return at_least_atom.visible_message(span_alertalien("[at_least_atom] [pick(lay_messages)]")) diff --git a/code/datums/components/electrified_buckle.dm b/code/datums/components/electrified_buckle.dm index d40df49c82b..cf1f13a17cd 100644 --- a/code/datums/components/electrified_buckle.dm +++ b/code/datums/components/electrified_buckle.dm @@ -139,7 +139,7 @@ return TRUE ///where the guinea pig is actually shocked if possible -/datum/component/electrified_buckle/process(delta_time) +/datum/component/electrified_buckle/process(seconds_per_tick) var/atom/movable/parent_as_movable = parent if(QDELETED(parent_as_movable) || !parent_as_movable.has_buckled_mobs()) return PROCESS_KILL diff --git a/code/datums/components/embedded.dm b/code/datums/components/embedded.dm index 395296ce8a6..c6933376d21 100644 --- a/code/datums/components/embedded.dm +++ b/code/datums/components/embedded.dm @@ -123,7 +123,7 @@ /datum/component/embedded/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_CARBON_EMBED_RIP, COMSIG_CARBON_EMBED_REMOVAL, COMSIG_PARENT_ATTACKBY, COMSIG_MAGIC_RECALL)) -/datum/component/embedded/process(delta_time) +/datum/component/embedded/process(seconds_per_tick) var/mob/living/carbon/victim = parent if(!victim || !limb) // in case the victim and/or their limbs exploded (say, due to a sticky bomb) @@ -135,7 +135,7 @@ return var/damage = weapon.w_class * pain_mult - var/pain_chance_current = DT_PROB_RATE(pain_chance / 100, delta_time) * 100 + var/pain_chance_current = SPT_PROB_RATE(pain_chance / 100, seconds_per_tick) * 100 if(pain_stam_pct && HAS_TRAIT_FROM(victim, TRAIT_INCAPACITATED, STAMINA)) //if it's a less-lethal embed, give them a break if they're already stamcritted pain_chance_current *= 0.2 damage *= 0.5 @@ -147,7 +147,7 @@ victim.adjustStaminaLoss(pain_stam_pct * damage) to_chat(victim, span_userdanger("[weapon] embedded in your [limb.plaintext_zone] hurts!")) - var/fall_chance_current = DT_PROB_RATE(fall_chance / 100, delta_time) * 100 + var/fall_chance_current = SPT_PROB_RATE(fall_chance / 100, seconds_per_tick) * 100 if(victim.body_position == LYING_DOWN) fall_chance_current *= 0.2 diff --git a/code/datums/components/fertile_egg.dm b/code/datums/components/fertile_egg.dm index 8491845d048..dba704812b0 100644 --- a/code/datums/components/fertile_egg.dm +++ b/code/datums/components/fertile_egg.dm @@ -48,7 +48,7 @@ STOP_PROCESSING(SSobj, src) . = ..() -/datum/component/fertile_egg/process(delta_time) +/datum/component/fertile_egg/process(seconds_per_tick) var/atom/parent_atom = parent if(location_allowlist && !is_type_in_typecache(parent_atom.loc, location_allowlist)) @@ -57,7 +57,7 @@ qdel(src) return - current_growth += rand(minimum_growth_rate, maximum_growth_rate) * delta_time + current_growth += rand(minimum_growth_rate, maximum_growth_rate) * seconds_per_tick if(current_growth >= total_growth_required) parent_atom.visible_message(span_notice("[parent] hatches with a quiet cracking sound.")) new embryo_type(get_turf(parent_atom)) diff --git a/code/datums/components/fullauto.dm b/code/datums/components/fullauto.dm index 28009784233..2c5fd79c4fc 100644 --- a/code/datums/components/fullauto.dm +++ b/code/datums/components/fullauto.dm @@ -48,7 +48,7 @@ autofire_off() return ..() -/datum/component/automatic_fire/process(delta_time) +/datum/component/automatic_fire/process(seconds_per_tick) if(autofire_stat != AUTOFIRE_STAT_FIRING) STOP_PROCESSING(SSprojectiles, src) return diff --git a/code/datums/components/genetic_damage.dm b/code/datums/components/genetic_damage.dm index 0aecad02a96..c944f7be8e3 100644 --- a/code/datums/components/genetic_damage.dm +++ b/code/datums/components/genetic_damage.dm @@ -42,8 +42,8 @@ /datum/component/genetic_damage/InheritComponent(datum/component/genetic_damage/old_component) total_damage += old_component.total_damage -/datum/component/genetic_damage/process(delta_time) - if (ismonkey(parent) && total_damage >= GORILLA_MUTATION_MINIMUM_DAMAGE && DT_PROB(GORILLA_MUTATION_CHANCE_PER_SECOND, delta_time)) +/datum/component/genetic_damage/process(seconds_per_tick) + if (ismonkey(parent) && total_damage >= GORILLA_MUTATION_MINIMUM_DAMAGE && SPT_PROB(GORILLA_MUTATION_CHANCE_PER_SECOND, seconds_per_tick)) var/mob/living/carbon/carbon_parent = parent carbon_parent.gorillize() qdel(src) @@ -51,9 +51,9 @@ if (total_damage >= minimum_before_damage) var/mob/living/living_mob = parent - living_mob.adjustToxLoss(toxin_damage_per_second * delta_time) + living_mob.adjustToxLoss(toxin_damage_per_second * seconds_per_tick) - total_damage -= remove_per_second * delta_time + total_damage -= remove_per_second * seconds_per_tick if (total_damage <= 0) qdel(src) return PROCESS_KILL diff --git a/code/datums/components/grillable.dm b/code/datums/components/grillable.dm index 418503e82b3..6044d8fde6f 100644 --- a/code/datums/components/grillable.dm +++ b/code/datums/components/grillable.dm @@ -62,7 +62,7 @@ atom_parent.update_appearance() ///Ran every time an item is grilled by something -/datum/component/grillable/proc/on_grill(datum/source, atom/used_grill, delta_time = 1) +/datum/component/grillable/proc/on_grill(datum/source, atom/used_grill, seconds_per_tick = 1) SIGNAL_HANDLER . = COMPONENT_HANDLED_GRILLING @@ -72,7 +72,7 @@ parent_turf.pollute_turf(pollutant_type, 10) //SKYRAT EDIT END - current_cook_time += delta_time * 10 //turn it into ds + current_cook_time += seconds_per_tick * 10 //turn it into ds if(current_cook_time >= required_cook_time) finish_grilling(used_grill) diff --git a/code/datums/components/ground_sinking.dm b/code/datums/components/ground_sinking.dm index 3123172b222..0fb5fb9eac6 100644 --- a/code/datums/components/ground_sinking.dm +++ b/code/datums/components/ground_sinking.dm @@ -129,7 +129,7 @@ animate(filter) living_parent.remove_filter(REGENERATION_FILTER) -/datum/component/ground_sinking/process(delta_time = SSMOBS_DT) +/datum/component/ground_sinking/process(seconds_per_tick = SSMOBS_DT) var/mob/living/basic/living_parent = parent if (living_parent.stat == DEAD) stop_regenerating() @@ -137,6 +137,6 @@ if (living_parent.health == living_parent.maxHealth) stop_regenerating() return - living_parent.heal_overall_damage(health_per_second * delta_time) + living_parent.heal_overall_damage(health_per_second * seconds_per_tick) #undef REGENERATION_FILTER diff --git a/code/datums/components/irradiated.dm b/code/datums/components/irradiated.dm index 762168fe106..c8a57f3761a 100644 --- a/code/datums/components/irradiated.dm +++ b/code/datums/components/irradiated.dm @@ -74,7 +74,7 @@ return ..() -/datum/component/irradiated/process(delta_time) +/datum/component/irradiated/process(seconds_per_tick) if (!ishuman(parent)) return PROCESS_KILL @@ -91,9 +91,9 @@ return if (human_parent.stat > DEAD) - human_parent.dna?.species?.handle_radiation(human_parent, world.time - beginning_of_irradiation, delta_time) + human_parent.dna?.species?.handle_radiation(human_parent, world.time - beginning_of_irradiation, seconds_per_tick) - process_tox_damage(human_parent, delta_time) + process_tox_damage(human_parent, seconds_per_tick) /datum/component/irradiated/proc/should_halt_effects(mob/living/carbon/human/target) if (IS_IN_STASIS(target)) @@ -107,7 +107,7 @@ return FALSE -/datum/component/irradiated/proc/process_tox_damage(mob/living/carbon/human/target, delta_time) +/datum/component/irradiated/proc/process_tox_damage(mob/living/carbon/human/target, seconds_per_tick) if (!COOLDOWN_FINISHED(src, last_tox_damage)) return diff --git a/code/datums/components/keep_me_secure.dm b/code/datums/components/keep_me_secure.dm index 1fafd953306..822031580f0 100644 --- a/code/datums/components/keep_me_secure.dm +++ b/code/datums/components/keep_me_secure.dm @@ -46,7 +46,7 @@ return TRUE -/datum/component/keep_me_secure/process(delta_time) +/datum/component/keep_me_secure/process(seconds_per_tick) if(is_secured()) last_secured_location = get_turf(parent) last_move = world.time diff --git a/code/datums/components/mob_harvest.dm b/code/datums/components/mob_harvest.dm index 0d001f85233..a177b64c836 100644 --- a/code/datums/components/mob_harvest.dm +++ b/code/datums/components/mob_harvest.dm @@ -60,13 +60,13 @@ var/mob/living/living_parent = parent living_parent.update_appearance(UPDATE_ICON_STATE) -/datum/component/mob_harvest/process(delta_time) +/datum/component/mob_harvest/process(seconds_per_tick) ///only track time if we aren't dead and have room for more items var/mob/living/harvest_mob = parent if(harvest_mob.stat == DEAD || amount_ready >= max_ready) return - item_generation_time -= delta_time + item_generation_time -= seconds_per_tick if(item_generation_time > 0) return diff --git a/code/datums/components/radioactive_emitter.dm b/code/datums/components/radioactive_emitter.dm index f956c51e10d..0cb51daf804 100644 --- a/code/datums/components/radioactive_emitter.dm +++ b/code/datums/components/radioactive_emitter.dm @@ -69,7 +69,7 @@ src.threshold = threshold // Don't touch examine text or whatever else. -/datum/component/radioactive_emitter/process(delta_time) +/datum/component/radioactive_emitter/process(seconds_per_tick) if(!COOLDOWN_FINISHED(src, rad_pulse_cooldown)) return diff --git a/code/datums/components/regenerator.dm b/code/datums/components/regenerator.dm index dc219603113..a6182935a3f 100644 --- a/code/datums/components/regenerator.dm +++ b/code/datums/components/regenerator.dm @@ -80,7 +80,7 @@ animate(filter) living_parent.remove_filter(REGENERATION_FILTER) -/datum/component/regenerator/process(delta_time = SSMOBS_DT) +/datum/component/regenerator/process(seconds_per_tick = SSMOBS_DT) var/mob/living/living_parent = parent if (living_parent.stat == DEAD) stop_regenerating() @@ -88,6 +88,6 @@ if (living_parent.health == living_parent.maxHealth) stop_regenerating() return - living_parent.heal_overall_damage(health_per_second * delta_time) + living_parent.heal_overall_damage(health_per_second * seconds_per_tick) #undef REGENERATION_FILTER diff --git a/code/datums/components/scope.dm b/code/datums/components/scope.dm index 2f15c5a66f5..4cc7145bc94 100644 --- a/code/datums/components/scope.dm +++ b/code/datums/components/scope.dm @@ -28,7 +28,7 @@ COMSIG_PARENT_EXAMINE, )) -/datum/component/scope/process(delta_time) +/datum/component/scope/process(seconds_per_tick) var/mob/user_mob = tracker.owner var/client/user_client = user_mob.client if(!user_client) diff --git a/code/datums/components/shielded.dm b/code/datums/components/shielded.dm index 86bcbf5369e..48235fe350c 100644 --- a/code/datums/components/shielded.dm +++ b/code/datums/components/shielded.dm @@ -84,7 +84,7 @@ lost_wearer(src, wearer) // Handle recharging, if we want to -/datum/component/shielded/process(delta_time) +/datum/component/shielded/process(seconds_per_tick) if(current_charges >= max_charges) STOP_PROCESSING(SSdcs, src) return diff --git a/code/datums/components/singularity.dm b/code/datums/components/singularity.dm index c36f771027c..9637a2a746c 100644 --- a/code/datums/components/singularity.dm +++ b/code/datums/components/singularity.dm @@ -133,9 +133,9 @@ COMSIG_PARENT_ATTACKBY, )) -/datum/component/singularity/process(delta_time) +/datum/component/singularity/process(seconds_per_tick) // We want to move and eat once a second, but want to process our turf consume queue the rest of the time - time_since_last_eat += delta_time + time_since_last_eat += seconds_per_tick digest() if(TICK_CHECK) return diff --git a/code/datums/components/smooth_tunes.dm b/code/datums/components/smooth_tunes.dm index 8c5a2f024c2..f05401b523a 100644 --- a/code/datums/components/smooth_tunes.dm +++ b/code/datums/components/smooth_tunes.dm @@ -103,7 +103,7 @@ linked_song = null qdel(src) -/datum/component/smooth_tunes/process(delta_time = SSOBJ_DT) +/datum/component/smooth_tunes/process(seconds_per_tick = SSOBJ_DT) if(linked_songtuner_rite && linked_song) for(var/mob/living/carbon/human/listener in linked_song.hearing_mobs) if(listener == parent || listener.can_block_magic(MAGIC_RESISTANCE_HOLY, charge_cost = 0)) diff --git a/code/datums/components/spin2win.dm b/code/datums/components/spin2win.dm index 543ba15cc41..e277eb54546 100644 --- a/code/datums/components/spin2win.dm +++ b/code/datums/components/spin2win.dm @@ -102,7 +102,7 @@ COOLDOWN_START(src, spin_cooldown, spin_cooldown_time) spinning = FALSE -/datum/component/spin2win/process(delta_time) +/datum/component/spin2win/process(seconds_per_tick) var/obj/item/spinning_item = parent if(!isliving(spinning_item.loc)) stop_spinning() diff --git a/code/datums/components/spinny.dm b/code/datums/components/spinny.dm index 29d5c777c49..bec04b34560 100644 --- a/code/datums/components/spinny.dm +++ b/code/datums/components/spinny.dm @@ -22,7 +22,7 @@ STOP_PROCESSING(SSfastprocess, src) return ..() -/datum/component/spinny/process(delta_time) +/datum/component/spinny/process(seconds_per_tick) steps_left-- var/atom/spinny_boy = parent if(!istype(spinny_boy) || steps_left <= 0) diff --git a/code/datums/components/udder.dm b/code/datums/components/udder.dm index 08e0cc986c4..149cb6ee6f0 100644 --- a/code/datums/components/udder.dm +++ b/code/datums/components/udder.dm @@ -83,7 +83,7 @@ STOP_PROCESSING(SSobj, src) udder_mob = null -/obj/item/udder/process(delta_time) +/obj/item/udder/process(seconds_per_tick) if(udder_mob.stat != DEAD) generate() //callback is on generate() itself as sometimes generate does not add new reagents, or is not called via process @@ -137,7 +137,7 @@ START_PROCESSING(SSobj, src) RegisterSignal(udder_mob, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, PROC_REF(on_mob_attacking)) -/obj/item/udder/gutlunch/process(delta_time) +/obj/item/udder/gutlunch/process(seconds_per_tick) var/mob/living/simple_animal/hostile/asteroid/gutlunch/gutlunch = udder_mob if(reagents.total_volume != reagents.maximum_volume) return diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index d420d838b85..9c164a0ab3d 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -63,17 +63,17 @@ ///Proc to process the disease and decide on whether to advance, cure or make the sympthoms appear. Returns a boolean on whether to continue acting on the symptoms or not. -/datum/disease/proc/stage_act(delta_time, times_fired) +/datum/disease/proc/stage_act(seconds_per_tick, times_fired) var/slowdown = affected_mob.reagents.has_reagent(/datum/reagent/medicine/spaceacillin) ? 0.5 : 1 // spaceacillin slows stage speed by 50% if(has_cure()) - if(DT_PROB(cure_chance, delta_time)) + if(SPT_PROB(cure_chance, seconds_per_tick)) update_stage(max(stage - 1, 1)) - if(disease_flags & CURABLE && DT_PROB(cure_chance, delta_time)) + if(disease_flags & CURABLE && SPT_PROB(cure_chance, seconds_per_tick)) cure() return FALSE - else if(DT_PROB(stage_prob*slowdown, delta_time)) + else if(SPT_PROB(stage_prob*slowdown, seconds_per_tick)) update_stage(min(stage + 1, max_stages)) return !carrier diff --git a/code/datums/diseases/adrenal_crisis.dm b/code/datums/diseases/adrenal_crisis.dm index 65aa63704bc..a0fc1fc10dd 100644 --- a/code/datums/diseases/adrenal_crisis.dm +++ b/code/datums/diseases/adrenal_crisis.dm @@ -16,24 +16,24 @@ visibility_flags = HIDDEN_PANDEMIC bypasses_immunity = TRUE -/datum/disease/adrenal_crisis/stage_act(delta_time, times_fired) +/datum/disease/adrenal_crisis/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(1) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_warning(pick("You feel lightheaded.", "You feel lethargic."))) if(2) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.Unconscious(40) - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) affected_mob.adjust_slurring(14 SECONDS) - if(DT_PROB(7, delta_time)) + if(SPT_PROB(7, seconds_per_tick)) affected_mob.set_dizzy_if_lower(20 SECONDS) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_warning(pick("You feel pain shoot down your legs!", "You feel like you are going to pass out at any moment.", "You feel really dizzy."))) diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 768ddd7a2d1..99c3531d2ff 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -139,7 +139,7 @@ // Randomly pick a symptom to activate. -/datum/disease/advance/stage_act(delta_time, times_fired) +/datum/disease/advance/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm index 29f6bf88721..fb9fa7629b1 100644 --- a/code/datums/diseases/anxiety.dm +++ b/code/datums/diseases/anxiety.dm @@ -12,32 +12,32 @@ severity = DISEASE_SEVERITY_MINOR -/datum/disease/anxiety/stage_act(delta_time, times_fired) +/datum/disease/anxiety/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(2) //also changes say, see say.dm - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_notice("You feel anxious.")) if(3) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_notice("Your stomach flutters.")) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_notice("You feel panicky.")) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(affected_mob, span_danger("You're overtaken with panic!")) affected_mob.adjust_confusion(rand(2 SECONDS, 3 SECONDS)) if(4) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel butterflies in your stomach.")) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.visible_message(span_danger("[affected_mob] stumbles around in a panic."), \ span_userdanger("You have a panic attack!")) affected_mob.adjust_confusion(rand(6 SECONDS, 8 SECONDS)) affected_mob.adjust_jitter(rand(12 SECONDS, 16 SECONDS)) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.visible_message(span_danger("[affected_mob] coughs up butterflies!"), \ span_userdanger("You cough up butterflies!")) new /mob/living/simple_animal/butterfly(affected_mob.loc) diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm index 2410d0eaa15..2023c37b256 100644 --- a/code/datums/diseases/beesease.dm +++ b/code/datums/diseases/beesease.dm @@ -13,29 +13,29 @@ infectable_biotypes = MOB_ORGANIC|MOB_UNDEAD //bees nesting in corpses -/datum/disease/beesease/stage_act(delta_time, times_fired) +/datum/disease/beesease/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(2) //also changes say, see say.dm - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(affected_mob, span_notice("You taste honey in your mouth.")) if(3) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_notice("Your stomach rumbles.")) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(affected_mob, span_danger("Your stomach stings painfully.")) if(prob(20)) affected_mob.adjustToxLoss(2) if(4) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.visible_message(span_danger("[affected_mob] buzzes."), \ span_userdanger("Your stomach buzzes violently!")) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel something moving in your throat.")) - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) affected_mob.visible_message(span_danger("[affected_mob] coughs up a swarm of bees!"), \ span_userdanger("You cough up a swarm of bees!")) new /mob/living/simple_animal/hostile/bee(affected_mob.loc) diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm index 40b5d4db637..1a080efa838 100644 --- a/code/datums/diseases/brainrot.dm +++ b/code/datums/diseases/brainrot.dm @@ -13,46 +13,46 @@ severity = DISEASE_SEVERITY_HARMFUL -/datum/disease/brainrot/stage_act(delta_time, 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, 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 . = ..() if(!.) return switch(stage) if(2) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.emote("blink") - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.emote("yawn") - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(affected_mob, span_danger("You don't feel like yourself.")) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1, 170) if(3) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.emote("stare") - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.emote("drool") - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2, 170) if(prob(2)) to_chat(affected_mob, span_danger("Your try to remember something important...but can't.")) if(4) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.emote("stare") - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.emote("drool") - if(DT_PROB(7.5, delta_time)) + if(SPT_PROB(7.5, seconds_per_tick)) affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 170) if(prob(2)) to_chat(affected_mob, span_danger("Strange buzzing fills your head, removing all thoughts.")) - if(DT_PROB(1.5, delta_time)) + if(SPT_PROB(1.5, seconds_per_tick)) to_chat(affected_mob, span_danger("You lose consciousness...")) affected_mob.visible_message(span_warning("[affected_mob] suddenly collapses!"), \ span_userdanger("You suddenly collapse!")) affected_mob.Unconscious(rand(100, 200)) if(prob(1)) affected_mob.emote("snore") - if(DT_PROB(7.5, delta_time)) + if(SPT_PROB(7.5, seconds_per_tick)) affected_mob.adjust_stutter(6 SECONDS) diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm index 1d63047dc30..5aafb5d12e6 100644 --- a/code/datums/diseases/cold.dm +++ b/code/datums/diseases/cold.dm @@ -11,40 +11,40 @@ severity = DISEASE_SEVERITY_NONTHREAT -/datum/disease/cold/stage_act(delta_time, times_fired) +/datum/disease/cold/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(2) - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) affected_mob.emote("sneeze") - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) affected_mob.emote("cough") - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your throat feels sore.")) - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) to_chat(affected_mob, span_danger("Mucous runs down the back of your throat.")) - if((affected_mob.body_position == LYING_DOWN && DT_PROB(23, delta_time)) || DT_PROB(0.025, delta_time)) //changed FROM prob(10) until sleeping is fixed // Has sleeping been fixed yet? + if((affected_mob.body_position == LYING_DOWN && SPT_PROB(23, seconds_per_tick)) || SPT_PROB(0.025, seconds_per_tick)) //changed FROM prob(10) until sleeping is fixed // Has sleeping been fixed yet? to_chat(affected_mob, span_notice("You feel better.")) cure() return FALSE if(3) - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) affected_mob.emote("sneeze") - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) affected_mob.emote("cough") - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your throat feels sore.")) - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) to_chat(affected_mob, span_danger("Mucous runs down the back of your throat.")) - if(DT_PROB(0.25, delta_time) && !LAZYFIND(affected_mob.disease_resistances, /datum/disease/flu)) + if(SPT_PROB(0.25, seconds_per_tick) && !LAZYFIND(affected_mob.disease_resistances, /datum/disease/flu)) var/datum/disease/Flu = new /datum/disease/flu() affected_mob.ForceContractDisease(Flu, FALSE, TRUE) cure() return FALSE - if((affected_mob.body_position == LYING_DOWN && DT_PROB(12.5, delta_time)) || DT_PROB(0.005, delta_time)) //changed FROM prob(5) until sleeping is fixed + if((affected_mob.body_position == LYING_DOWN && SPT_PROB(12.5, seconds_per_tick)) || SPT_PROB(0.005, seconds_per_tick)) //changed FROM prob(5) until sleeping is fixed to_chat(affected_mob, span_notice("You feel better.")) cure() return FALSE diff --git a/code/datums/diseases/cold9.dm b/code/datums/diseases/cold9.dm index 222644b8f1d..543a021eee8 100644 --- a/code/datums/diseases/cold9.dm +++ b/code/datums/diseases/cold9.dm @@ -11,33 +11,33 @@ severity = DISEASE_SEVERITY_HARMFUL -/datum/disease/cold9/stage_act(delta_time, times_fired) +/datum/disease/cold9/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(2) - affected_mob.adjust_bodytemperature(-5 * delta_time) - if(DT_PROB(0.5, delta_time)) + affected_mob.adjust_bodytemperature(-5 * seconds_per_tick) + if(SPT_PROB(0.5, seconds_per_tick)) affected_mob.emote("sneeze") - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) affected_mob.emote("cough") - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your throat feels sore.")) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel stiff.")) - if(DT_PROB(0.05, delta_time)) + if(SPT_PROB(0.05, seconds_per_tick)) to_chat(affected_mob, span_notice("You feel better.")) cure() return FALSE if(3) - affected_mob.adjust_bodytemperature(-10 * delta_time) - if(DT_PROB(0.5, delta_time)) + affected_mob.adjust_bodytemperature(-10 * seconds_per_tick) + if(SPT_PROB(0.5, seconds_per_tick)) affected_mob.emote("sneeze") - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) affected_mob.emote("cough") - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your throat feels sore.")) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel stiff.")) diff --git a/code/datums/diseases/decloning.dm b/code/datums/diseases/decloning.dm index b9a62a95751..0b7c74f9a03 100644 --- a/code/datums/diseases/decloning.dm +++ b/code/datums/diseases/decloning.dm @@ -14,7 +14,7 @@ spread_text = "Organic meltdown" process_dead = TRUE -/datum/disease/decloning/stage_act(delta_time, times_fired) +/datum/disease/decloning/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return @@ -25,38 +25,38 @@ switch(stage) if(2) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.emote("itch") - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.emote("yawn") if(3) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.emote("itch") - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.emote("drool") - if(DT_PROB(1.5, delta_time)) + if(SPT_PROB(1.5, seconds_per_tick)) affected_mob.adjustCloneLoss(1, FALSE) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(affected_mob, span_danger("Your skin feels strange.")) if(4) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.emote("itch") - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.emote("drool") - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1, 170) affected_mob.adjustCloneLoss(2, FALSE) - if(DT_PROB(7.5, delta_time)) + if(SPT_PROB(7.5, seconds_per_tick)) affected_mob.adjust_stutter(6 SECONDS) if(5) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.emote("itch") - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.emote("drool") - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your skin starts degrading!")) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.adjustCloneLoss(5, FALSE) affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2, 170) if(affected_mob.cloneloss >= 100) diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm index 0aae3eaafa0..17faeda6243 100644 --- a/code/datums/diseases/dna_spread.dm +++ b/code/datums/diseases/dna_spread.dm @@ -14,7 +14,7 @@ severity = DISEASE_SEVERITY_MEDIUM -/datum/disease/dnaspread/stage_act(delta_time, times_fired) +/datum/disease/dnaspread/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return @@ -37,15 +37,15 @@ switch(stage) if(2, 3) //Pretend to be a cold and give time to spread. - if(DT_PROB(4, delta_time)) + if(SPT_PROB(4, seconds_per_tick)) affected_mob.emote("sneeze") - if(DT_PROB(4, delta_time)) + if(SPT_PROB(4, seconds_per_tick)) affected_mob.emote("cough") - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your muscles ache.")) if(prob(20)) affected_mob.take_bodypart_damage(1, updating_health = FALSE) - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your stomach hurts.")) if(prob(20)) affected_mob.adjustToxLoss(2, FALSE) diff --git a/code/datums/diseases/fake_gbs.dm b/code/datums/diseases/fake_gbs.dm index f238e17369e..655439cdc6c 100644 --- a/code/datums/diseases/fake_gbs.dm +++ b/code/datums/diseases/fake_gbs.dm @@ -11,26 +11,26 @@ severity = DISEASE_SEVERITY_BIOHAZARD -/datum/disease/fake_gbs/stage_act(delta_time, times_fired) +/datum/disease/fake_gbs/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(2) - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) affected_mob.emote("sneeze") if(3) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote("cough") - else if(DT_PROB(2.5, delta_time)) + else if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote("gasp") - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_danger("You're starting to feel very weak...")) if(4) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.emote("cough") if(5) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.emote("cough") diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm index 33335160e9c..0da9a5b8e92 100644 --- a/code/datums/diseases/flu.dm +++ b/code/datums/diseases/flu.dm @@ -12,44 +12,44 @@ severity = DISEASE_SEVERITY_MINOR -/datum/disease/flu/stage_act(delta_time, times_fired) +/datum/disease/flu/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(2) - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) affected_mob.emote("sneeze") - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) affected_mob.emote("cough") - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your muscles ache.")) if(prob(20)) affected_mob.take_bodypart_damage(1, updating_health = FALSE) - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your stomach hurts.")) if(prob(20)) affected_mob.adjustToxLoss(1, FALSE) - if(affected_mob.body_position == LYING_DOWN && DT_PROB(10, delta_time)) + if(affected_mob.body_position == LYING_DOWN && SPT_PROB(10, seconds_per_tick)) to_chat(affected_mob, span_notice("You feel better.")) stage-- return if(3) - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) affected_mob.emote("sneeze") - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) affected_mob.emote("cough") - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your muscles ache.")) if(prob(20)) affected_mob.take_bodypart_damage(1, updating_health = FALSE) - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your stomach hurts.")) if(prob(20)) affected_mob.adjustToxLoss(1, FALSE) - if(affected_mob.body_position == LYING_DOWN && DT_PROB(7.5, delta_time)) + if(affected_mob.body_position == LYING_DOWN && SPT_PROB(7.5, seconds_per_tick)) to_chat(affected_mob, span_notice("You feel better.")) stage-- return diff --git a/code/datums/diseases/fluspanish.dm b/code/datums/diseases/fluspanish.dm index d13352b7604..109b7ac470b 100644 --- a/code/datums/diseases/fluspanish.dm +++ b/code/datums/diseases/fluspanish.dm @@ -12,28 +12,28 @@ severity = DISEASE_SEVERITY_DANGEROUS -/datum/disease/fluspanish/stage_act(delta_time, times_fired) +/datum/disease/fluspanish/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(2) - affected_mob.adjust_bodytemperature(5 * delta_time) - if(DT_PROB(2.5, delta_time)) + affected_mob.adjust_bodytemperature(5 * seconds_per_tick) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote("sneeze") - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote("cough") - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) to_chat(affected_mob, span_danger("You're burning in your own skin!")) affected_mob.take_bodypart_damage(0, 5, updating_health = FALSE) if(3) - affected_mob.adjust_bodytemperature(10 * delta_time) - if(DT_PROB(2.5, delta_time)) + affected_mob.adjust_bodytemperature(10 * seconds_per_tick) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote("sneeze") - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote("cough") - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_danger("You're burning in your own skin!")) affected_mob.take_bodypart_damage(0, 5, updating_health = FALSE) diff --git a/code/datums/diseases/gastrolisis.dm b/code/datums/diseases/gastrolisis.dm index 52901f13b8d..455e0773e33 100644 --- a/code/datums/diseases/gastrolisis.dm +++ b/code/datums/diseases/gastrolisis.dm @@ -11,7 +11,7 @@ cures = list(/datum/reagent/consumable/salt, /datum/reagent/medicine/mutadone) -/datum/disease/gastrolosis/stage_act(delta_time, times_fired) +/datum/disease/gastrolosis/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return @@ -22,22 +22,22 @@ switch(stage) if(2) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.emote("gag") - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) var/turf/open/OT = get_turf(affected_mob) if(isopenturf(OT)) OT.MakeSlippery(TURF_WET_LUBE, 40) if(3) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote("gag") - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) var/turf/open/OT = get_turf(affected_mob) if(isopenturf(OT)) OT.MakeSlippery(TURF_WET_LUBE, 100) if(4) var/obj/item/organ/internal/eyes/eyes = locate(/obj/item/organ/internal/eyes/snail) in affected_mob.organs - if(!eyes && DT_PROB(2.5, delta_time)) + if(!eyes && SPT_PROB(2.5, seconds_per_tick)) var/obj/item/organ/internal/eyes/snail/new_eyes = new() new_eyes.Insert(affected_mob, drop_if_replaced = TRUE) affected_mob.visible_message(span_warning("[affected_mob]'s eyes fall out, with snail eyes taking its place!"), \ @@ -48,7 +48,7 @@ var/obj/item/shell = affected_mob.get_item_by_slot(ITEM_SLOT_BACK) if(!istype(shell, /obj/item/storage/backpack/snail)) shell = null - if(!shell && DT_PROB(2.5, delta_time)) + if(!shell && SPT_PROB(2.5, seconds_per_tick)) if(affected_mob.dropItemToGround(affected_mob.get_item_by_slot(ITEM_SLOT_BACK))) affected_mob.equip_to_slot_or_del(new /obj/item/storage/backpack/snail(affected_mob), ITEM_SLOT_BACK) affected_mob.visible_message(span_warning("[affected_mob] grows a grotesque shell on their back!"), \ @@ -57,13 +57,13 @@ return var/obj/item/organ/internal/tongue/tongue = locate(/obj/item/organ/internal/tongue/snail) in affected_mob.organs - if(!tongue && DT_PROB(2.5, delta_time)) + if(!tongue && SPT_PROB(2.5, seconds_per_tick)) var/obj/item/organ/internal/tongue/snail/new_tongue = new() new_tongue.Insert(affected_mob) to_chat(affected_mob, span_userdanger("You feel your speech slow down...")) return - if(shell && eyes && tongue && DT_PROB(2.5, delta_time)) + if(shell && eyes && tongue && SPT_PROB(2.5, seconds_per_tick)) affected_mob.set_species(/datum/species/snail) affected_mob.client?.give_award(/datum/award/achievement/misc/snail, affected_mob) affected_mob.visible_message(span_warning("[affected_mob] turns into a snail!"), \ @@ -71,9 +71,9 @@ cure() return FALSE - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.emote("gag") - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) var/turf/open/OT = get_turf(affected_mob) if(isopenturf(OT)) OT.MakeSlippery(TURF_WET_LUBE, 100) diff --git a/code/datums/diseases/gbs.dm b/code/datums/diseases/gbs.dm index 4362b756a74..22f84cf73a1 100644 --- a/code/datums/diseases/gbs.dm +++ b/code/datums/diseases/gbs.dm @@ -12,23 +12,23 @@ spreading_modifier = 1 severity = DISEASE_SEVERITY_BIOHAZARD -/datum/disease/gbs/stage_act(delta_time, times_fired) +/datum/disease/gbs/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(2) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote("cough") if(3) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote("gasp") - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your body hurts all over!")) if(4) to_chat(affected_mob, span_userdanger("Your body feels as if it's trying to rip itself apart!")) - if(DT_PROB(30, delta_time)) + if(SPT_PROB(30, seconds_per_tick)) affected_mob.investigate_log("has been gibbed by GBS.", INVESTIGATE_DEATHS) affected_mob.gib() return FALSE diff --git a/code/datums/diseases/heart_failure.dm b/code/datums/diseases/heart_failure.dm index dfb40d56318..f996ebbaabc 100644 --- a/code/datums/diseases/heart_failure.dm +++ b/code/datums/diseases/heart_failure.dm @@ -23,7 +23,7 @@ return D -/datum/disease/heart_failure/stage_act(delta_time, times_fired) +/datum/disease/heart_failure/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return @@ -34,25 +34,25 @@ switch(stage) if(1 to 2) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(affected_mob, span_warning("You feel [pick("discomfort", "pressure", "a burning sensation", "pain")] in your chest.")) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(affected_mob, span_warning("You feel dizzy.")) affected_mob.adjust_confusion(6 SECONDS) - if(DT_PROB(1.5, delta_time)) + if(SPT_PROB(1.5, seconds_per_tick)) to_chat(affected_mob, span_warning("You feel [pick("full", "nauseated", "sweaty", "weak", "tired", "short of breath", "uneasy")].")) if(3 to 4) if(!sound) affected_mob.playsound_local(affected_mob, 'sound/health/slowbeat.ogg', 40, FALSE, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE) sound = TRUE - if(DT_PROB(1.5, delta_time)) + if(SPT_PROB(1.5, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel a sharp pain in your chest!")) if(prob(25)) affected_mob.vomit(95) affected_mob.emote("cough") affected_mob.Paralyze(40) affected_mob.losebreath += 4 - if(DT_PROB(1.5, delta_time)) + if(SPT_PROB(1.5, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel very weak and dizzy...")) affected_mob.adjust_confusion(8 SECONDS) affected_mob.adjustStaminaLoss(40, FALSE) diff --git a/code/datums/diseases/magnitis.dm b/code/datums/diseases/magnitis.dm index 6d4c22d5ed1..52156b968f9 100644 --- a/code/datums/diseases/magnitis.dm +++ b/code/datums/diseases/magnitis.dm @@ -14,16 +14,16 @@ process_dead = TRUE -/datum/disease/magnitis/stage_act(delta_time, times_fired) +/datum/disease/magnitis/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(2) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(affected_mob, span_danger("Your skin tingles with energy.")) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) for(var/obj/nearby_object in orange(2, affected_mob)) if(nearby_object.anchored || !(nearby_object.flags_1 & CONDUCT_1)) continue @@ -35,9 +35,9 @@ var/move_dir = get_dir(nearby_silicon, affected_mob) nearby_silicon.Move(get_step(nearby_silicon, move_dir), move_dir) if(3) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(affected_mob, span_danger("Your hair stands on end.")) - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel a light shock course through your body.")) for(var/obj/nearby_object in orange(4, affected_mob)) if(nearby_object.anchored || !(nearby_object.flags_1 & CONDUCT_1)) @@ -50,9 +50,9 @@ for(var/i in 1 to rand(1, 2)) nearby_silicon.throw_at(affected_mob, 4, 3) if(4) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(affected_mob, span_danger("You query upon the nature of miracles.")) - if(DT_PROB(4, delta_time)) + if(SPT_PROB(4, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel a powerful shock course through your body.")) for(var/obj/nearby_object in orange(6, affected_mob)) if(nearby_object.anchored || !(nearby_object.flags_1 & CONDUCT_1)) diff --git a/code/datums/diseases/parasitic_infection.dm b/code/datums/diseases/parasitic_infection.dm index 65ed94687a3..d383db7c3f2 100644 --- a/code/datums/diseases/parasitic_infection.dm +++ b/code/datums/diseases/parasitic_infection.dm @@ -15,7 +15,7 @@ bypasses_immunity = TRUE -/datum/disease/parasite/stage_act(delta_time, times_fired) +/datum/disease/parasite/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return @@ -28,20 +28,20 @@ switch(stage) if(1) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote("cough") if(2) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) if(prob(50)) to_chat(affected_mob, span_notice("You feel the weight loss already!")) affected_mob.adjust_nutrition(-3) if(3) - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) if(prob(20)) to_chat(affected_mob, span_notice("You're... REALLY starting to feel the weight loss.")) affected_mob.adjust_nutrition(-6) if(4) - if(DT_PROB(16, delta_time)) + if(SPT_PROB(16, seconds_per_tick)) if(affected_mob.nutrition >= 100) if(prob(10)) to_chat(affected_mob, span_warning("You feel like your body's shedding weight rapidly!")) diff --git a/code/datums/diseases/parrotpossession.dm b/code/datums/diseases/parrotpossession.dm index 937f735c124..23f68e1a42f 100644 --- a/code/datums/diseases/parrotpossession.dm +++ b/code/datums/diseases/parrotpossession.dm @@ -16,7 +16,7 @@ var/mob/living/simple_animal/parrot/poly/ghost/parrot -/datum/disease/parrot_possession/stage_act(delta_time, times_fired) +/datum/disease/parrot_possession/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return @@ -25,7 +25,7 @@ cure() return FALSE - if(length(parrot.speech_buffer) && DT_PROB(parrot.speak_chance, delta_time)) // I'm not going to dive into polycode trying to adjust that probability. Enjoy doubled ghost parrot speach + if(length(parrot.speech_buffer) && SPT_PROB(parrot.speak_chance, seconds_per_tick)) // I'm not going to dive into polycode trying to adjust that probability. Enjoy doubled ghost parrot speach affected_mob.say(pick(parrot.speech_buffer), forced = "parrot possession") diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index 1cd353a9249..d24afb6fe5b 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -12,23 +12,23 @@ severity = DISEASE_SEVERITY_MEDIUM -/datum/disease/pierrot_throat/stage_act(delta_time, times_fired) +/datum/disease/pierrot_throat/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(1) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel a little silly.")) if(2) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_danger("You start seeing rainbows.")) if(3) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your thoughts are interrupted by a loud HONK!")) if(4) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) , forced = "pierrot's throat") diff --git a/code/datums/diseases/retrovirus.dm b/code/datums/diseases/retrovirus.dm index 76f9cb2ed9c..4c012eaaf80 100644 --- a/code/datums/diseases/retrovirus.dm +++ b/code/datums/diseases/retrovirus.dm @@ -26,41 +26,41 @@ D.restcure = restcure return D -/datum/disease/dna_retrovirus/stage_act(delta_time, times_fired) +/datum/disease/dna_retrovirus/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(1) - if(DT_PROB(4, delta_time)) + if(SPT_PROB(4, seconds_per_tick)) to_chat(affected_mob, span_danger("Your head hurts.")) - if(DT_PROB(4.5, delta_time)) + if(SPT_PROB(4.5, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel a tingling sensation in your chest.")) - if(DT_PROB(4.5, delta_time)) + if(SPT_PROB(4.5, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel angry.")) - if(restcure && affected_mob.body_position == LYING_DOWN && DT_PROB(16, delta_time)) + if(restcure && affected_mob.body_position == LYING_DOWN && SPT_PROB(16, seconds_per_tick)) to_chat(affected_mob, span_notice("You feel better.")) cure() return FALSE if(2) - if(DT_PROB(4, delta_time)) + if(SPT_PROB(4, seconds_per_tick)) to_chat(affected_mob, span_danger("Your skin feels loose.")) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel very strange.")) - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel a stabbing pain in your head!")) affected_mob.Unconscious(40) - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) to_chat(affected_mob, span_danger("Your stomach churns.")) - if(restcure && affected_mob.body_position == LYING_DOWN && DT_PROB(10, delta_time)) + if(restcure && affected_mob.body_position == LYING_DOWN && SPT_PROB(10, seconds_per_tick)) to_chat(affected_mob, span_notice("You feel better.")) cure() return FALSE if(3) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your entire body vibrates.")) - if(DT_PROB(19, delta_time)) + if(SPT_PROB(19, seconds_per_tick)) switch(rand(1,3)) if(1) scramble_dna(affected_mob, 1, 0, 0, rand(15,45)) @@ -68,12 +68,12 @@ scramble_dna(affected_mob, 0, 1, 0, rand(15,45)) if(3) scramble_dna(affected_mob, 0, 0, 1, rand(15,45)) - if(restcure && affected_mob.body_position == LYING_DOWN && DT_PROB(10, delta_time)) + if(restcure && affected_mob.body_position == LYING_DOWN && SPT_PROB(10, seconds_per_tick)) to_chat(affected_mob, span_notice("You feel better.")) cure() return FALSE if(4) - if(DT_PROB(37, delta_time)) + if(SPT_PROB(37, seconds_per_tick)) switch(rand(1,3)) if(1) scramble_dna(affected_mob, 1, 0, 0, rand(50,75)) @@ -81,7 +81,7 @@ scramble_dna(affected_mob, 0, 1, 0, rand(50,75)) if(3) scramble_dna(affected_mob, 0, 0, 1, rand(50,75)) - if(restcure && affected_mob.body_position == LYING_DOWN && DT_PROB(2.5, delta_time)) + if(restcure && affected_mob.body_position == LYING_DOWN && SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_notice("You feel better.")) cure() return FALSE diff --git a/code/datums/diseases/rhumba_beat.dm b/code/datums/diseases/rhumba_beat.dm index 816fc191113..01188137915 100644 --- a/code/datums/diseases/rhumba_beat.dm +++ b/code/datums/diseases/rhumba_beat.dm @@ -10,26 +10,26 @@ spreading_modifier = 1 severity = DISEASE_SEVERITY_BIOHAZARD -/datum/disease/rhumba_beat/stage_act(delta_time, times_fired) +/datum/disease/rhumba_beat/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(2) - if(DT_PROB(26, delta_time)) + if(SPT_PROB(26, seconds_per_tick)) affected_mob.adjustFireLoss(5, FALSE) - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel strange...")) if(3) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel the urge to dance...")) - else if(DT_PROB(2.5, delta_time)) + else if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote("gasp") - else if(DT_PROB(5, delta_time)) + else if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel the need to chick chicky boom...")) if(4) - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) if(prob(50)) affected_mob.adjust_fire_stacks(2) affected_mob.ignite_mob() @@ -38,5 +38,5 @@ to_chat(affected_mob, span_danger("You feel a burning beat inside...")) if(5) to_chat(affected_mob, span_danger("Your body is unable to contain the Rhumba Beat...")) - if(DT_PROB(29, delta_time)) + if(SPT_PROB(29, seconds_per_tick)) explosion(affected_mob, devastation_range = -1, light_impact_range = 2, flame_range = 2, flash_range = 3, adminlog = FALSE, explosion_cause = src) // This is equivalent to a lvl 1 fireball diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 41f2a76787e..8f4e4069a77 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -30,23 +30,23 @@ return D -/datum/disease/transformation/stage_act(delta_time, times_fired) +/datum/disease/transformation/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(1) - if (length(stage1) && DT_PROB(stage_prob, delta_time)) + if (length(stage1) && SPT_PROB(stage_prob, seconds_per_tick)) to_chat(affected_mob, pick(stage1)) if(2) - if (length(stage2) && DT_PROB(stage_prob, delta_time)) + if (length(stage2) && SPT_PROB(stage_prob, seconds_per_tick)) to_chat(affected_mob, pick(stage2)) if(3) - if (length(stage3) && DT_PROB(stage_prob * 2, delta_time)) + if (length(stage3) && SPT_PROB(stage_prob * 2, seconds_per_tick)) to_chat(affected_mob, pick(stage3)) if(4) - if (length(stage4) && DT_PROB(stage_prob * 2, delta_time)) + if (length(stage4) && SPT_PROB(stage_prob * 2, seconds_per_tick)) to_chat(affected_mob, pick(stage4)) if(5) do_disease_transformation(affected_mob) @@ -130,21 +130,21 @@ /datum/disease/transformation/jungle_flu/do_disease_transformation(mob/living/carbon/affected_mob) affected_mob.monkeyize() -/datum/disease/transformation/jungle_flu/stage_act(delta_time, times_fired) +/datum/disease/transformation/jungle_flu/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(2) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(affected_mob, span_notice("Your [pick("arm", "back", "elbow", "head", "leg")] itches.")) if(3) - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel a stabbing pain in your head.")) affected_mob.adjust_confusion(10 SECONDS) if(4) - if(DT_PROB(1.5, delta_time)) + if(SPT_PROB(1.5, seconds_per_tick)) affected_mob.say(pick("Eeee!", "Eeek, ook ook!", "Eee-eeek!", "Ungh, ungh."), forced = "jungle fever") /datum/disease/transformation/robot @@ -171,20 +171,20 @@ bantype = JOB_CYBORG -/datum/disease/transformation/robot/stage_act(delta_time, times_fired) +/datum/disease/transformation/robot/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(3) - if (DT_PROB(4, delta_time)) + if (SPT_PROB(4, seconds_per_tick)) affected_mob.say(pick("beep, beep!", "Beep, boop", "Boop...bop"), forced = "robotic transformation") - if (DT_PROB(2, delta_time)) + if (SPT_PROB(2, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel a stabbing pain in your head.")) affected_mob.Unconscious(40) if(4) - if (DT_PROB(10, delta_time)) + if (SPT_PROB(10, seconds_per_tick)) affected_mob.say(pick("beep, beep!", "Boop bop boop beep.", "I wwwaaannntt tttoo dddiiieeee...", "kkkiiiill mmme"), forced = "robotic transformation") @@ -215,18 +215,18 @@ bantype = ROLE_ALIEN -/datum/disease/transformation/xeno/stage_act(delta_time, times_fired) +/datum/disease/transformation/xeno/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(3) - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel a stabbing pain in your head.")) affected_mob.Unconscious(40) if(4) - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) affected_mob.say(pick("Going to... devour you...", "Hsssshhhhh!", "You look delicious."), forced = "xenomorph transformation") @@ -247,7 +247,7 @@ new_form = /mob/living/simple_animal/slime -/datum/disease/transformation/slime/stage_act(delta_time, times_fired) +/datum/disease/transformation/slime/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return @@ -287,16 +287,16 @@ new_form = /mob/living/basic/pet/dog/corgi -/datum/disease/transformation/corgi/stage_act(delta_time, times_fired) +/datum/disease/transformation/corgi/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(3) - if (DT_PROB(4, delta_time)) + if (SPT_PROB(4, seconds_per_tick)) affected_mob.say(pick("Woof!", "YAP"), forced = "corgi transformation") if(4) - if (DT_PROB(10, delta_time)) + if (SPT_PROB(10, seconds_per_tick)) affected_mob.say(pick("AUUUUUU", "Bark!"), forced = "corgi transformation") @@ -340,28 +340,28 @@ new_form = /mob/living/simple_animal/pet/gondola -/datum/disease/transformation/gondola/stage_act(delta_time, times_fired) +/datum/disease/transformation/gondola/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(2) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote("smile") - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) affected_mob.reagents.add_reagent_list(list(/datum/reagent/pax = 5)) if(3) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote("smile") - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) affected_mob.reagents.add_reagent_list(list(/datum/reagent/pax = 5)) if(4) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote("smile") - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) affected_mob.reagents.add_reagent_list(list(/datum/reagent/pax = 5)) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) var/obj/item/held_item = affected_mob.get_active_held_item() if(held_item) to_chat(affected_mob, span_danger("You let go of what you were holding.")) diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm index ed39e40c264..f40515f6b57 100644 --- a/code/datums/diseases/tuberculosis.dm +++ b/code/datums/diseases/tuberculosis.dm @@ -13,49 +13,49 @@ 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(delta_time, times_fired) //it begins +/datum/disease/tuberculosis/stage_act(seconds_per_tick, times_fired) //it begins . = ..() if(!.) return switch(stage) if(2) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.emote("cough") to_chat(affected_mob, span_danger("Your chest hurts.")) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(affected_mob, span_danger("Your stomach violently rumbles!")) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel a cold sweat form.")) if(4) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(affected_mob, span_userdanger("You see four of everything!")) affected_mob.set_dizzy_if_lower(10 SECONDS) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel a sharp pain from your lower chest!")) affected_mob.adjustOxyLoss(5, FALSE) affected_mob.emote("gasp") - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel air escape from your lungs painfully.")) affected_mob.adjustOxyLoss(25, FALSE) affected_mob.emote("gasp") if(5) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(affected_mob, span_userdanger("[pick("You feel your heart slowing...", "You relax and slow your heartbeat.")]")) affected_mob.adjustStaminaLoss(70, FALSE) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.adjustStaminaLoss(100, FALSE) affected_mob.visible_message(span_warning("[affected_mob] faints!"), span_userdanger("You surrender yourself and feel at peace...")) affected_mob.AdjustSleeping(100) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(affected_mob, span_userdanger("You feel your mind relax and your thoughts drift!")) affected_mob.adjust_confusion_up_to(8 SECONDS, 100 SECONDS) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.vomit(20) - if(DT_PROB(1.5, delta_time)) + if(SPT_PROB(1.5, seconds_per_tick)) to_chat(affected_mob, span_warning("[pick("Your stomach silently rumbles...", "Your stomach seizes up and falls limp, muscles dead and lifeless.", "You could eat a crayon")]")) affected_mob.overeatduration = max(affected_mob.overeatduration - (200 SECONDS), 0) affected_mob.adjust_nutrition(-100) - if(DT_PROB(7.5, delta_time)) + if(SPT_PROB(7.5, seconds_per_tick)) to_chat(affected_mob, span_danger("[pick("You feel uncomfortably hot...", "You feel like unzipping your jumpsuit...", "You feel like taking off some clothes...")]")) affected_mob.adjust_bodytemperature(40) diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index 4ef7aa9a531..f5a716befb3 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -23,30 +23,30 @@ TARCOL MINTI ZHERI - forcewall STI KALY - blind */ -/datum/disease/wizarditis/stage_act(delta_time, times_fired) +/datum/disease/wizarditis/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(2) - if(DT_PROB(0.25, delta_time)) + if(SPT_PROB(0.25, seconds_per_tick)) affected_mob.say(pick("You shall not pass!", "Expeliarmus!", "By Merlins beard!", "Feel the power of the Dark Side!"), forced = "wizarditis") - if(DT_PROB(0.25, delta_time)) + if(SPT_PROB(0.25, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel [pick("that you don't have enough mana", "that the winds of magic are gone", "an urge to summon familiar")].")) if(3) - if(DT_PROB(0.25, delta_time)) + if(SPT_PROB(0.25, seconds_per_tick)) affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!", "STI KALY!", "TARCOL MINTI ZHERI!"), forced = "wizarditis") - if(DT_PROB(0.25, delta_time)) + if(SPT_PROB(0.25, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel [pick("the magic bubbling in your veins","that this location gives you a +1 to INT","an urge to summon familiar")].")) if(4) - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!","STI KALY!","EI NATH!"), forced = "wizarditis") return - if(DT_PROB(0.25, delta_time)) + if(SPT_PROB(0.25, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel [pick("the tidal wave of raw power building inside","that this location gives you a +2 to INT and +1 to WIS","an urge to teleport")].")) spawn_wizard_clothes(50) - if(DT_PROB(0.005, delta_time)) + if(SPT_PROB(0.005, seconds_per_tick)) teleport() diff --git a/code/datums/elements/atmos_requirements.dm b/code/datums/elements/atmos_requirements.dm index caa800bfa9b..b863697d08a 100644 --- a/code/datums/elements/atmos_requirements.dm +++ b/code/datums/elements/atmos_requirements.dm @@ -26,12 +26,12 @@ UnregisterSignal(target, COMSIG_LIVING_HANDLE_BREATHING) ///signal called by the living mob's life() while non stasis -/datum/element/atmos_requirements/proc/on_non_stasis_life(mob/living/target, delta_time = SSMOBS_DT) +/datum/element/atmos_requirements/proc/on_non_stasis_life(mob/living/target, seconds_per_tick = SSMOBS_DT) SIGNAL_HANDLER if(is_breathable_atmos(target)) target.clear_alert(ALERT_NOT_ENOUGH_OXYGEN) return - target.adjustBruteLoss(unsuitable_atmos_damage * delta_time) + target.adjustBruteLoss(unsuitable_atmos_damage * seconds_per_tick) target.throw_alert(ALERT_NOT_ENOUGH_OXYGEN, /atom/movable/screen/alert/not_enough_oxy) /datum/element/atmos_requirements/proc/is_breathable_atmos(mob/living/target) diff --git a/code/datums/elements/basic_body_temp_sensitive.dm b/code/datums/elements/basic_body_temp_sensitive.dm index 97dea51d040..8e11ed92575 100644 --- a/code/datums/elements/basic_body_temp_sensitive.dm +++ b/code/datums/elements/basic_body_temp_sensitive.dm @@ -39,14 +39,14 @@ return ..() -/datum/element/basic_body_temp_sensitive/proc/on_life(datum/target, delta_time, times_fired) +/datum/element/basic_body_temp_sensitive/proc/on_life(datum/target, seconds_per_tick, times_fired) SIGNAL_HANDLER var/mob/living/basic/basic_mob = target var/gave_alert = FALSE if(basic_mob.bodytemperature < min_body_temp) - basic_mob.adjust_health(cold_damage * delta_time) + basic_mob.adjust_health(cold_damage * seconds_per_tick) switch(cold_damage) if(1 to 5) basic_mob.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/cold, 1) @@ -57,7 +57,7 @@ gave_alert = TRUE else if(basic_mob.bodytemperature > max_body_temp) - basic_mob.adjust_health(heat_damage * delta_time) + basic_mob.adjust_health(heat_damage * seconds_per_tick) switch(heat_damage) if(1 to 5) basic_mob.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/hot, 1) diff --git a/code/datums/elements/chewable.dm b/code/datums/elements/chewable.dm index 9dd1e3647b7..21d546be6aa 100644 --- a/code/datums/elements/chewable.dm +++ b/code/datums/elements/chewable.dm @@ -34,7 +34,7 @@ processing -= source UnregisterSignal(source, list(COMSIG_ITEM_DROPPED, COMSIG_ITEM_EQUIPPED)) -/datum/element/chewable/process(delta_time) +/datum/element/chewable/process(seconds_per_tick) if (processing.len == 0) return PROCESS_KILL @@ -45,12 +45,12 @@ processing -= item continue - handle_reagents(item, delta_time) + handle_reagents(item, seconds_per_tick) -/datum/element/chewable/proc/handle_reagents(obj/item/item, delta_time) +/datum/element/chewable/proc/handle_reagents(obj/item/item, seconds_per_tick) var/datum/reagents/reagents = item.reagents - var/metabolism_amount = metabolization_amount * delta_time + var/metabolism_amount = metabolization_amount * seconds_per_tick if (!reagents.trans_to(item.loc, metabolism_amount, methods = INGEST)) reagents.remove_any(metabolism_amount) diff --git a/code/datums/elements/earhealing.dm b/code/datums/elements/earhealing.dm index 696f3deec95..9221f7799b8 100644 --- a/code/datums/elements/earhealing.dm +++ b/code/datums/elements/earhealing.dm @@ -23,12 +23,12 @@ else user_by_item -= source -/datum/element/earhealing/process(delta_time) +/datum/element/earhealing/process(seconds_per_tick) for(var/i in user_by_item) var/mob/living/carbon/user = user_by_item[i] var/obj/item/organ/internal/ears/ears = user.get_organ_slot(ORGAN_SLOT_EARS) if(!ears || !ears.damage || ears.organ_flags & ORGAN_FAILING) continue - ears.deaf = max(ears.deaf - 0.25 * delta_time, (ears.damage < ears.maxHealth ? 0 : 1)) // Do not clear deafness if our ears are too damaged - ears.apply_organ_damage(-0.025 * delta_time) + ears.deaf = max(ears.deaf - 0.25 * seconds_per_tick, (ears.damage < ears.maxHealth ? 0 : 1)) // Do not clear deafness if our ears are too damaged + ears.apply_organ_damage(-0.025 * seconds_per_tick) CHECK_TICK diff --git a/code/datums/elements/obj_regen.dm b/code/datums/elements/obj_regen.dm index fd045e638a3..2db124e7183 100644 --- a/code/datums/elements/obj_regen.dm +++ b/code/datums/elements/obj_regen.dm @@ -45,7 +45,7 @@ /// Handle regenerating attached objects. -/datum/element/obj_regen/process(delta_time) +/datum/element/obj_regen/process(seconds_per_tick) set waitfor = FALSE if(!resumed) diff --git a/code/datums/elements/radioactive.dm b/code/datums/elements/radioactive.dm index 46de2b0742d..e4e8059a7a4 100644 --- a/code/datums/elements/radioactive.dm +++ b/code/datums/elements/radioactive.dm @@ -20,7 +20,7 @@ return ..() -/datum/element/radioactive/process(delta_time) +/datum/element/radioactive/process(seconds_per_tick) for (var/radioactive_object in radioactive_objects) if (world.time - radioactive_objects[radioactive_object] < DELAY_BETWEEN_RADIATION_PULSES) continue diff --git a/code/datums/greyscale/_greyscale_config.dm b/code/datums/greyscale/_greyscale_config.dm index 1e1b601ac42..bd1635d60d1 100644 --- a/code/datums/greyscale/_greyscale_config.dm +++ b/code/datums/greyscale/_greyscale_config.dm @@ -76,7 +76,7 @@ return QDEL_HINT_LETMELIVE return ..() -/datum/greyscale_config/process(delta_time) +/datum/greyscale_config/process(seconds_per_tick) if(!Refresh(loadFromDisk=TRUE)) return if(!live_edit_types) diff --git a/code/datums/mood.dm b/code/datums/mood.dm index 25aad59d398..6dbaab282ff 100644 --- a/code/datums/mood.dm +++ b/code/datums/mood.dm @@ -72,34 +72,34 @@ QDEL_LIST_ASSOC_VAL(mood_events) return ..() -/datum/mood/process(delta_time) +/datum/mood/process(seconds_per_tick) switch(mood_level) if(MOOD_LEVEL_SAD4) - set_sanity(sanity - 0.3 * delta_time, SANITY_INSANE) + set_sanity(sanity - 0.3 * seconds_per_tick, SANITY_INSANE) if(MOOD_LEVEL_SAD3) - set_sanity(sanity - 0.15 * delta_time, SANITY_INSANE) + set_sanity(sanity - 0.15 * seconds_per_tick, SANITY_INSANE) if(MOOD_LEVEL_SAD2) - set_sanity(sanity - 0.1 * delta_time, SANITY_CRAZY) + set_sanity(sanity - 0.1 * seconds_per_tick, SANITY_CRAZY) if(MOOD_LEVEL_SAD1) - set_sanity(sanity - 0.05 * delta_time, SANITY_UNSTABLE) + set_sanity(sanity - 0.05 * seconds_per_tick, SANITY_UNSTABLE) if(MOOD_LEVEL_NEUTRAL) set_sanity(sanity, SANITY_UNSTABLE) //This makes sure that mood gets increased should you be below the minimum. if(MOOD_LEVEL_HAPPY1) - set_sanity(sanity + 0.2 * delta_time, SANITY_UNSTABLE) + set_sanity(sanity + 0.2 * seconds_per_tick, SANITY_UNSTABLE) if(MOOD_LEVEL_HAPPY2) - set_sanity(sanity + 0.3 * delta_time, SANITY_UNSTABLE) + set_sanity(sanity + 0.3 * seconds_per_tick, SANITY_UNSTABLE) if(MOOD_LEVEL_HAPPY3) - set_sanity(sanity + 0.4 * delta_time, SANITY_NEUTRAL, SANITY_MAXIMUM) + set_sanity(sanity + 0.4 * seconds_per_tick, SANITY_NEUTRAL, SANITY_MAXIMUM) if(MOOD_LEVEL_HAPPY4) - set_sanity(sanity + 0.6 * delta_time, SANITY_NEUTRAL, SANITY_MAXIMUM) + set_sanity(sanity + 0.6 * seconds_per_tick, SANITY_NEUTRAL, SANITY_MAXIMUM) handle_nutrition() // 0.416% is 15 successes / 3600 seconds. Calculated with 2 minute // mood runtime, so 50% average uptime across the hour. - if(HAS_TRAIT(mob_parent, TRAIT_DEPRESSION) && DT_PROB(0.416, delta_time)) + if(HAS_TRAIT(mob_parent, TRAIT_DEPRESSION) && SPT_PROB(0.416, seconds_per_tick)) add_mood_event("depression_mild", /datum/mood_event/depression_mild) - if(HAS_TRAIT(mob_parent, TRAIT_JOLLY) && DT_PROB(0.416, delta_time)) + if(HAS_TRAIT(mob_parent, TRAIT_JOLLY) && SPT_PROB(0.416, seconds_per_tick)) add_mood_event("jolly", /datum/mood_event/jolly) /datum/mood/proc/handle_mob_death(datum/source) diff --git a/code/datums/mutations/_mutations.dm b/code/datums/mutations/_mutations.dm index 1e2e683ef0e..44b3b5111f3 100644 --- a/code/datums/mutations/_mutations.dm +++ b/code/datums/mutations/_mutations.dm @@ -125,7 +125,7 @@ /datum/mutation/human/proc/get_visual_indicator() return -/datum/mutation/human/proc/on_life(delta_time, times_fired) +/datum/mutation/human/proc/on_life(seconds_per_tick, times_fired) return /datum/mutation/human/proc/on_losing(mob/living/carbon/human/owner) diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index 5a89da9cc20..cd0d24a3aa2 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -9,8 +9,8 @@ synchronizer_coeff = 1 power_coeff = 1 -/datum/mutation/human/epilepsy/on_life(delta_time, times_fired) - if(DT_PROB(0.5 * GET_MUTATION_SYNCHRONIZER(src), delta_time)) +/datum/mutation/human/epilepsy/on_life(seconds_per_tick, times_fired) + if(SPT_PROB(0.5 * GET_MUTATION_SYNCHRONIZER(src), seconds_per_tick)) trigger_seizure() /datum/mutation/human/epilepsy/proc/trigger_seizure() @@ -84,8 +84,8 @@ synchronizer_coeff = 1 power_coeff = 1 -/datum/mutation/human/cough/on_life(delta_time, times_fired) - if(DT_PROB(2.5 * GET_MUTATION_SYNCHRONIZER(src), delta_time) && owner.stat == CONSCIOUS) +/datum/mutation/human/cough/on_life(seconds_per_tick, times_fired) + if(SPT_PROB(2.5 * GET_MUTATION_SYNCHRONIZER(src), seconds_per_tick) && owner.stat == CONSCIOUS) owner.drop_all_held_items() owner.emote("cough") if(GET_MUTATION_POWER(src) > 1) @@ -100,8 +100,8 @@ text_gain_indication = "You feel screams echo through your mind..." text_lose_indication = "The screaming in your mind fades." -/datum/mutation/human/paranoia/on_life(delta_time, times_fired) - if(DT_PROB(2.5, delta_time) && owner.stat == CONSCIOUS) +/datum/mutation/human/paranoia/on_life(seconds_per_tick, times_fired) + if(SPT_PROB(2.5, seconds_per_tick) && owner.stat == CONSCIOUS) owner.emote("scream") if(prob(25)) owner.adjust_hallucinations(40 SECONDS) @@ -166,8 +166,8 @@ text_gain_indication = "You twitch." synchronizer_coeff = 1 -/datum/mutation/human/tourettes/on_life(delta_time, times_fired) - if(DT_PROB(5 * GET_MUTATION_SYNCHRONIZER(src), delta_time) && owner.stat == CONSCIOUS && !owner.IsStun()) +/datum/mutation/human/tourettes/on_life(seconds_per_tick, times_fired) + if(SPT_PROB(5 * GET_MUTATION_SYNCHRONIZER(src), seconds_per_tick) && owner.stat == CONSCIOUS && !owner.IsStun()) switch(rand(1, 3)) if(1) owner.emote("twitch") @@ -316,8 +316,8 @@ synchronizer_coeff = 1 power_coeff = 1 -/datum/mutation/human/fire/on_life(delta_time, times_fired) - if(DT_PROB((0.05+(100-dna.stability)/19.5) * GET_MUTATION_SYNCHRONIZER(src), delta_time)) +/datum/mutation/human/fire/on_life(seconds_per_tick, times_fired) + 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() @@ -344,8 +344,8 @@ power_coeff = 1 var/warpchance = 0 -/datum/mutation/human/badblink/on_life(delta_time, times_fired) - if(DT_PROB(warpchance, delta_time)) +/datum/mutation/human/badblink/on_life(seconds_per_tick, times_fired) + 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."), span_warning("[owner] does some sort of strange backflip into another dimension. It looks pretty painful."), @@ -359,7 +359,7 @@ warpchance = 0 owner.visible_message(span_danger("[owner] appears out of nowhere!")) else - warpchance += 0.0625 * GET_MUTATION_ENERGY(src) * delta_time + warpchance += 0.0625 * GET_MUTATION_ENERGY(src) * seconds_per_tick /datum/mutation/human/acidflesh name = "Acidic Flesh" @@ -371,8 +371,8 @@ /// The cooldown for the warning message COOLDOWN_DECLARE(msgcooldown) -/datum/mutation/human/acidflesh/on_life(delta_time, times_fired) - if(DT_PROB(13, delta_time)) +/datum/mutation/human/acidflesh/on_life(seconds_per_tick, times_fired) + if(SPT_PROB(13, seconds_per_tick)) if(COOLDOWN_FINISHED(src, msgcooldown)) to_chat(owner, span_danger("Your acid flesh bubbles...")) COOLDOWN_START(src, msgcooldown, 20 SECONDS) diff --git a/code/datums/mutations/chameleon.dm b/code/datums/mutations/chameleon.dm index 83f2c0fa0f8..0ae69e71f66 100644 --- a/code/datums/mutations/chameleon.dm +++ b/code/datums/mutations/chameleon.dm @@ -21,10 +21,10 @@ RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) RegisterSignal(owner, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(on_attack_hand)) -/datum/mutation/human/chameleon/on_life(delta_time, times_fired) +/datum/mutation/human/chameleon/on_life(seconds_per_tick, times_fired) /// SKYRAT EDIT BEGIN if(HAS_TRAIT(owner, TRAIT_CHAMELEON_SKIN)) - owner.alpha = max(owner.alpha - (12.5 * (GET_MUTATION_POWER(src)) * delta_time), 0) + owner.alpha = max(owner.alpha - (12.5 * (GET_MUTATION_POWER(src)) * seconds_per_tick), 0) /// SKYRAT EDIT END /** diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index f0af77b8a43..b0d7005f283 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -71,7 +71,7 @@ if(35 to 41) arm.force_wound_upwards(/datum/wound/blunt/moderate) -/datum/mutation/human/hulk/on_life(delta_time, times_fired) +/datum/mutation/human/hulk/on_life(seconds_per_tick, times_fired) if(owner.health < owner.crit_threshold) on_losing(owner) to_chat(owner, span_danger("You suddenly feel very weak.")) diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index 3a061ac4459..8828cd4a1ea 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -7,8 +7,8 @@ quality = MINOR_NEGATIVE text_gain_indication = "You feel nervous." -/datum/mutation/human/nervousness/on_life(delta_time, times_fired) - if(DT_PROB(5, delta_time)) +/datum/mutation/human/nervousness/on_life(seconds_per_tick, times_fired) + if(SPT_PROB(5, seconds_per_tick)) owner.set_stutter_if_lower(20 SECONDS) /datum/mutation/human/wacky @@ -143,15 +143,15 @@ text_gain_indication = "You feel pretty good, honeydoll." text_lose_indication = "You feel a little less conversation would be great." -/datum/mutation/human/elvis/on_life(delta_time, times_fired) +/datum/mutation/human/elvis/on_life(seconds_per_tick, times_fired) switch(pick(1,2)) if(1) - if(DT_PROB(7.5, delta_time)) + if(SPT_PROB(7.5, seconds_per_tick)) var/list/dancetypes = list("swinging", "fancy", "stylish", "20'th century", "jivin'", "rock and roller", "cool", "salacious", "bashing", "smashing") var/dancemoves = pick(dancetypes) owner.visible_message("[owner] busts out some [dancemoves] moves!") if(2) - if(DT_PROB(7.5, delta_time)) + if(SPT_PROB(7.5, seconds_per_tick)) owner.visible_message("[owner] [pick("jiggles their hips", "rotates their hips", "gyrates their hips", "taps their foot", "dances to an imaginary song", "jiggles their legs", "snaps their fingers")]!") /datum/mutation/human/elvis/on_acquiring(mob/living/carbon/human/owner) diff --git a/code/datums/mutations/void_magnet.dm b/code/datums/mutations/void_magnet.dm index f6fe1e23de8..56b22d664a8 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, delta_time, times_fired) +/datum/action/cooldown/spell/void/cursed/proc/on_life(mob/living/source, seconds_per_tick, times_fired) SIGNAL_HANDLER if(!isliving(source) || IS_IN_STASIS(source) || source.stat == DEAD || source.notransform) @@ -75,7 +75,7 @@ prob_of_curse *= curse_probability_modifier - if(!DT_PROB(prob_of_curse, delta_time)) + if(!SPT_PROB(prob_of_curse, seconds_per_tick)) return cast(source) diff --git a/code/datums/proximity_monitor/fields/projectile_dampener.dm b/code/datums/proximity_monitor/fields/projectile_dampener.dm index ce468d39891..94a7afd279f 100644 --- a/code/datums/proximity_monitor/fields/projectile_dampener.dm +++ b/code/datums/proximity_monitor/fields/projectile_dampener.dm @@ -103,7 +103,7 @@ if(isprojectile(movable) && !(movable in tracked)) capture_projectile(movable) -/datum/proximity_monitor/advanced/projectile_dampener/peaceborg/process(delta_time) +/datum/proximity_monitor/advanced/projectile_dampener/peaceborg/process(seconds_per_tick) for(var/mob/living/silicon/robot/borg in range(current_range, get_turf(host))) if(!borg.has_buckled_mobs()) continue diff --git a/code/datums/quirks/negative_quirks.dm b/code/datums/quirks/negative_quirks.dm index 5eae774e45a..508da4ce6b9 100644 --- a/code/datums/quirks/negative_quirks.dm +++ b/code/datums/quirks/negative_quirks.dm @@ -77,9 +77,9 @@ * Makes the mob lose blood from having the blood deficiency quirk, if possible * * Arguments: - * * delta_time + * * seconds_per_tick */ -/datum/quirk/blooddeficiency/proc/lose_blood(delta_time) +/datum/quirk/blooddeficiency/proc/lose_blood(seconds_per_tick) if(quirk_holder.stat == DEAD) return @@ -90,7 +90,7 @@ if (carbon_target.blood_volume <= min_blood) return // Ensures that we don't reduce total blood volume below min_blood. - carbon_target.blood_volume = max(min_blood, carbon_target.blood_volume - carbon_target.dna.species.blood_deficiency_drain_rate * delta_time) + carbon_target.blood_volume = max(min_blood, carbon_target.blood_volume - carbon_target.dna.species.blood_deficiency_drain_rate * seconds_per_tick) /datum/quirk/item_quirk/blindness name = "Blind" @@ -142,14 +142,14 @@ flavour_text = "These will keep you alive until you can secure a supply of medication. Don't rely on them too much!", ) -/datum/quirk/item_quirk/brainproblems/process(delta_time) +/datum/quirk/item_quirk/brainproblems/process(seconds_per_tick) if(quirk_holder.stat == DEAD) return if(HAS_TRAIT(quirk_holder, TRAIT_TUMOR_SUPPRESSED)) return - quirk_holder.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.2 * delta_time) + quirk_holder.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.2 * seconds_per_tick) /datum/quirk/item_quirk/deafness name = "Deaf" @@ -822,7 +822,7 @@ for(var/addiction_type in subtypesof(/datum/addiction)) quirk_holder.mind.remove_addiction_points(addiction_type, MAX_ADDICTION_POINTS) -/datum/quirk/item_quirk/junkie/process(delta_time) +/datum/quirk/item_quirk/junkie/process(seconds_per_tick) if(HAS_TRAIT(quirk_holder, TRAIT_NOMETABOLISM)) return var/mob/living/carbon/human/human_holder = quirk_holder @@ -878,7 +878,7 @@ smoker_lungs.maxHealth = smoker_lungs.maxHealth * 0.75 smoker_lungs.healing_factor = smoker_lungs.healing_factor * 0.75 -/datum/quirk/item_quirk/junkie/smoker/process(delta_time) +/datum/quirk/item_quirk/junkie/smoker/process(seconds_per_tick) . = ..() var/mob/living/carbon/human/human_holder = quirk_holder var/obj/item/mask_item = human_holder.get_item_by_slot(ITEM_SLOT_MASK) @@ -938,7 +938,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/process(delta_time) +/datum/quirk/item_quirk/allergic/process(seconds_per_tick) if(!iscarbon(quirk_holder)) return @@ -958,9 +958,9 @@ instantiated_med.reagent_removal_skip_list |= ALLERGIC_REMOVAL_SKIP return //intentionally stops the entire proc so we avoid the organ damage after the loop instantiated_med.reagent_removal_skip_list -= ALLERGIC_REMOVAL_SKIP - carbon_quirk_holder.adjustToxLoss(3 * delta_time) - carbon_quirk_holder.reagents.add_reagent(/datum/reagent/toxin/histamine, 3 * delta_time) - if(DT_PROB(10, delta_time)) + carbon_quirk_holder.adjustToxLoss(3 * seconds_per_tick) + carbon_quirk_holder.reagents.add_reagent(/datum/reagent/toxin/histamine, 3 * seconds_per_tick) + if(SPT_PROB(10, seconds_per_tick)) carbon_quirk_holder.vomit() carbon_quirk_holder.adjustOrganLoss(pick(ORGAN_SLOT_BRAIN,ORGAN_SLOT_APPENDIX,ORGAN_SLOT_LUNGS,ORGAN_SLOT_HEART,ORGAN_SLOT_LIVER,ORGAN_SLOT_STOMACH),10) @@ -1009,7 +1009,7 @@ /datum/quirk/claustrophobia/remove() quirk_holder.clear_mood_event("claustrophobia") -/datum/quirk/claustrophobia/process(delta_time) +/datum/quirk/claustrophobia/process(seconds_per_tick) if(quirk_holder.stat != CONSCIOUS || quirk_holder.IsSleeping() || quirk_holder.IsUnconscious()) return @@ -1029,7 +1029,7 @@ quirk_holder.add_mood_event("claustrophobia", /datum/mood_event/claustrophobia) quirk_holder.losebreath += 0.25 // miss a breath one in four times - if(DT_PROB(25, delta_time)) + if(SPT_PROB(25, seconds_per_tick)) if(nick_spotted) to_chat(quirk_holder, span_warning("Santa Claus is here! I gotta get out of here!")) else diff --git a/code/datums/quirks/positive_quirks.dm b/code/datums/quirks/positive_quirks.dm index caa76f20c64..53bdbfcfcdb 100644 --- a/code/datums/quirks/positive_quirks.dm +++ b/code/datums/quirks/positive_quirks.dm @@ -38,17 +38,17 @@ quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_PROCESSES mail_goodies = list(/obj/effect/spawner/random/food_or_drink/booze) -/datum/quirk/drunkhealing/process(delta_time) +/datum/quirk/drunkhealing/process(seconds_per_tick) switch(quirk_holder.get_drunk_amount()) if (6 to 40) - quirk_holder.adjustBruteLoss(-0.1 * delta_time, FALSE, required_bodytype = BODYTYPE_ORGANIC) - quirk_holder.adjustFireLoss(-0.05 * delta_time, required_bodytype = BODYTYPE_ORGANIC) + quirk_holder.adjustBruteLoss(-0.1 * seconds_per_tick, FALSE, required_bodytype = BODYTYPE_ORGANIC) + quirk_holder.adjustFireLoss(-0.05 * seconds_per_tick, required_bodytype = BODYTYPE_ORGANIC) if (41 to 60) - quirk_holder.adjustBruteLoss(-0.4 * delta_time, FALSE, required_bodytype = BODYTYPE_ORGANIC) - quirk_holder.adjustFireLoss(-0.2 * delta_time, required_bodytype = BODYTYPE_ORGANIC) + quirk_holder.adjustBruteLoss(-0.4 * seconds_per_tick, FALSE, required_bodytype = BODYTYPE_ORGANIC) + quirk_holder.adjustFireLoss(-0.2 * seconds_per_tick, required_bodytype = BODYTYPE_ORGANIC) if (61 to INFINITY) - quirk_holder.adjustBruteLoss(-0.8 * delta_time, FALSE, required_bodytype = BODYTYPE_ORGANIC) - quirk_holder.adjustFireLoss(-0.4 * delta_time, required_bodytype = BODYTYPE_ORGANIC) + quirk_holder.adjustBruteLoss(-0.8 * seconds_per_tick, FALSE, required_bodytype = BODYTYPE_ORGANIC) + quirk_holder.adjustFireLoss(-0.4 * seconds_per_tick, required_bodytype = BODYTYPE_ORGANIC) /datum/quirk/empath name = "Empath" diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm index 2480e9b4005..0fe10d9bce0 100644 --- a/code/datums/station_traits/positive_traits.dm +++ b/code/datums/station_traits/positive_traits.dm @@ -15,7 +15,7 @@ . = ..() COOLDOWN_START(src, party_cooldown, rand(PARTY_COOLDOWN_LENGTH_MIN, PARTY_COOLDOWN_LENGTH_MAX)) -/datum/station_trait/lucky_winner/process(delta_time) +/datum/station_trait/lucky_winner/process(seconds_per_tick) if(!COOLDOWN_FINISHED(src, party_cooldown)) return diff --git a/code/datums/status_effects/_status_effect.dm b/code/datums/status_effects/_status_effect.dm index 1da98981ae3..22de13ea670 100644 --- a/code/datums/status_effects/_status_effect.dm +++ b/code/datums/status_effects/_status_effect.dm @@ -81,13 +81,13 @@ // Status effect process. Handles adjusting its duration and ticks. // If you're adding processed effects, put them in [proc/tick] // instead of extending / overriding the process() proc. -/datum/status_effect/process(delta_time, times_fired) +/datum/status_effect/process(seconds_per_tick, times_fired) SHOULD_NOT_OVERRIDE(TRUE) if(QDELETED(owner)) qdel(src) return if(tick_interval < world.time) - tick(delta_time, times_fired) + tick(seconds_per_tick, times_fired) tick_interval = world.time + initial(tick_interval) if(duration != -1 && duration < world.time) qdel(src) @@ -103,7 +103,7 @@ return null /// Called every tick from process(). -/datum/status_effect/proc/tick(delta_time, times_fired) +/datum/status_effect/proc/tick(seconds_per_tick, times_fired) return /// Called whenever the buff expires or is removed (qdeleted) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 7343e9453d2..5c23363dde7 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -469,17 +469,17 @@ tick_interval = 0.4 SECONDS alert_type = /atom/movable/screen/alert/status_effect/nest_sustenance -/datum/status_effect/nest_sustenance/tick(delta_time, times_fired) +/datum/status_effect/nest_sustenance/tick(seconds_per_tick, times_fired) . = ..() if(owner.stat == DEAD) //If the victim has died due to complications in the nest qdel(src) return - owner.adjustBruteLoss(-2 * delta_time, updating_health = FALSE) - owner.adjustFireLoss(-2 * delta_time, updating_health = FALSE) - owner.adjustOxyLoss(-4 * delta_time, updating_health = FALSE) - owner.adjustStaminaLoss(-4 * delta_time, updating_stamina = FALSE) + owner.adjustBruteLoss(-2 * seconds_per_tick, updating_health = FALSE) + owner.adjustFireLoss(-2 * seconds_per_tick, updating_health = FALSE) + owner.adjustOxyLoss(-4 * seconds_per_tick, updating_health = FALSE) + owner.adjustStaminaLoss(-4 * seconds_per_tick, updating_stamina = FALSE) owner.adjust_bodytemperature(BODYTEMP_NORMAL, 0, BODYTEMP_NORMAL) //Won't save you from the void of space, but it will stop you from freezing or suffocating in low pressure diff --git a/code/datums/status_effects/debuffs/blindness.dm b/code/datums/status_effects/debuffs/blindness.dm index 7584e9ca5b1..0bfaaee7485 100644 --- a/code/datums/status_effects/debuffs/blindness.dm +++ b/code/datums/status_effects/debuffs/blindness.dm @@ -100,7 +100,7 @@ /datum/status_effect/temporary_blindness/on_remove() owner.cure_blind(id) -/datum/status_effect/temporary_blindness/tick(delta_time, times_fired) +/datum/status_effect/temporary_blindness/tick(seconds_per_tick, times_fired) if(owner.stat == DEAD) return @@ -116,7 +116,7 @@ return // Otherwise add a chance to let them know that it's working - else if(DT_PROB(5, delta_time)) + else if(SPT_PROB(5, seconds_per_tick)) var/obj/item/thing_covering_eyes = owner.is_eyes_covered() // "Your blindfold soothes your eyes", for example to_chat(owner, span_green("Your [thing_covering_eyes?.name || "eye covering"] soothes your eyes.")) diff --git a/code/datums/status_effects/debuffs/choke.dm b/code/datums/status_effects/debuffs/choke.dm index 89c9d50ab9e..3a4a7fa3019 100644 --- a/code/datums/status_effects/debuffs/choke.dm +++ b/code/datums/status_effects/debuffs/choke.dm @@ -267,23 +267,23 @@ victim.adjustBruteLoss(0.2) return TRUE -/datum/status_effect/choke/tick(delta_time) +/datum/status_effect/choke/tick(seconds_per_tick) if(!should_do_effects()) return - deal_damage(delta_time) + deal_damage(seconds_per_tick) var/client/client_owner = owner.client if(client_owner) do_vfx(client_owner) -/datum/status_effect/choke/proc/deal_damage(delta_time) - owner.losebreath += 1 * delta_time // 1 breath loss a second. This will deal additional breath damage, and prevent breathing +/datum/status_effect/choke/proc/deal_damage(seconds_per_tick) + owner.losebreath += 1 * seconds_per_tick // 1 breath loss a second. This will deal additional breath damage, and prevent breathing if(flaming) var/obj/item/bodypart/head = owner.get_bodypart(BODY_ZONE_HEAD) if(head) - head.receive_damage(0, 2 * delta_time) - owner.adjustStaminaLoss(2 * delta_time) + head.receive_damage(0, 2 * seconds_per_tick) + owner.adjustStaminaLoss(2 * seconds_per_tick) /datum/status_effect/choke/proc/do_vfx(client/vfx_on) var/old_x = delta_x diff --git a/code/datums/status_effects/debuffs/drowsiness.dm b/code/datums/status_effects/debuffs/drowsiness.dm index 0d4fc3b7f21..5bc415d7cd4 100644 --- a/code/datums/status_effects/debuffs/drowsiness.dm +++ b/code/datums/status_effects/debuffs/drowsiness.dm @@ -27,7 +27,7 @@ remove_duration(rand(4 SECONDS, 6 SECONDS)) -/datum/status_effect/drowsiness/tick(delta_time) +/datum/status_effect/drowsiness/tick(seconds_per_tick) // You do not feel drowsy while unconscious or in stasis if(owner.stat >= UNCONSCIOUS || IS_IN_STASIS(owner)) return diff --git a/code/datums/status_effects/debuffs/fire_stacks.dm b/code/datums/status_effects/debuffs/fire_stacks.dm index 2112b9fff31..40354321f40 100644 --- a/code/datums/status_effects/debuffs/fire_stacks.dm +++ b/code/datums/status_effects/debuffs/fire_stacks.dm @@ -151,7 +151,7 @@ /// Stores current fire overlay icon state, for optimisation purposes var/last_icon_state -/datum/status_effect/fire_handler/fire_stacks/tick(delta_time, times_fired) +/datum/status_effect/fire_handler/fire_stacks/tick(seconds_per_tick, times_fired) if(stacks <= 0) qdel(src) return TRUE @@ -159,7 +159,7 @@ if(!on_fire) return TRUE - adjust_stacks(owner.fire_stack_decay_rate * delta_time) + adjust_stacks(owner.fire_stack_decay_rate * seconds_per_tick) if(stacks <= 0) qdel(src) @@ -170,7 +170,7 @@ qdel(src) return TRUE - deal_damage(delta_time, times_fired) + deal_damage(seconds_per_tick, times_fired) update_overlay() update_particles() @@ -189,28 +189,28 @@ * Proc that handles damage dealing and all special effects * * Arguments: - * - delta_time + * - seconds_per_tick * - times_fired * */ -/datum/status_effect/fire_handler/fire_stacks/proc/deal_damage(delta_time, times_fired) - owner.on_fire_stack(delta_time, times_fired, src) +/datum/status_effect/fire_handler/fire_stacks/proc/deal_damage(seconds_per_tick, times_fired) + owner.on_fire_stack(seconds_per_tick, times_fired, src) var/turf/location = get_turf(owner) - location.hotspot_expose(700, 25 * delta_time, TRUE) + location.hotspot_expose(700, 25 * seconds_per_tick, TRUE) /** * Used to deal damage to humans and count their protection. * * Arguments: - * - delta_time + * - seconds_per_tick * - times_fired * - no_protection: When set to TRUE, fire will ignore any possible fire protection * */ -/datum/status_effect/fire_handler/fire_stacks/proc/harm_human(delta_time, times_fired, no_protection = FALSE) +/datum/status_effect/fire_handler/fire_stacks/proc/harm_human(seconds_per_tick, times_fired, no_protection = FALSE) var/mob/living/carbon/human/victim = owner var/thermal_protection = victim.get_thermal_protection() @@ -218,10 +218,10 @@ return if(thermal_protection >= FIRE_SUIT_MAX_TEMP_PROTECT && !no_protection) - victim.adjust_bodytemperature(5.5 * delta_time) + victim.adjust_bodytemperature(5.5 * seconds_per_tick) return - victim.adjust_bodytemperature((BODYTEMP_HEATING_MAX + (stacks * 12)) * 0.5 * delta_time) + victim.adjust_bodytemperature((BODYTEMP_HEATING_MAX + (stacks * 12)) * 0.5 * seconds_per_tick) victim.add_mood_event("on_fire", /datum/mood_event/on_fire) victim.add_mob_memory(/datum/memory/was_burning) @@ -291,8 +291,8 @@ enemy_types = list(/datum/status_effect/fire_handler/fire_stacks) stack_modifier = -1 -/datum/status_effect/fire_handler/wet_stacks/tick(delta_time) - adjust_stacks(-0.5 * delta_time) +/datum/status_effect/fire_handler/wet_stacks/tick(seconds_per_tick) + adjust_stacks(-0.5 * seconds_per_tick) if(stacks <= 0) qdel(src) diff --git a/code/datums/status_effects/debuffs/hallucination.dm b/code/datums/status_effects/debuffs/hallucination.dm index 4ea99564046..4c5e1c305e1 100644 --- a/code/datums/status_effects/debuffs/hallucination.dm +++ b/code/datums/status_effects/debuffs/hallucination.dm @@ -68,7 +68,7 @@ source.cause_hallucination(/datum/hallucination/shock, "hallucinated shock from [bumped]",) return STOP_BUMP -/datum/status_effect/hallucination/tick(delta_time, times_fired) +/datum/status_effect/hallucination/tick(seconds_per_tick, times_fired) if(owner.stat == DEAD) return if(!COOLDOWN_FINISHED(src, hallucination_cooldown)) @@ -94,7 +94,7 @@ /datum/status_effect/hallucination/sanity/refresh(...) update_intervals() -/datum/status_effect/hallucination/sanity/tick(delta_time, times_fired) +/datum/status_effect/hallucination/sanity/tick(seconds_per_tick, times_fired) // Using psicodine / happiness / whatever to become fearless will stop sanity based hallucinations if(HAS_TRAIT(owner, TRAIT_FEARLESS)) return diff --git a/code/datums/status_effects/debuffs/screen_blur.dm b/code/datums/status_effects/debuffs/screen_blur.dm index 9e465e90f40..1af6d36330f 100644 --- a/code/datums/status_effects/debuffs/screen_blur.dm +++ b/code/datums/status_effects/debuffs/screen_blur.dm @@ -31,7 +31,7 @@ var/atom/movable/plane_master_controller/game_plane_master_controller = owner.hud_used.plane_master_controllers[PLANE_MASTERS_GAME] game_plane_master_controller.remove_filter("eye_blur") -/datum/status_effect/eye_blur/tick(delta_time, times_fired) +/datum/status_effect/eye_blur/tick(seconds_per_tick, times_fired) // Blur lessens the closer we are to expiring, so we update per tick. update_blur() diff --git a/code/datums/status_effects/debuffs/terrified.dm b/code/datums/status_effects/debuffs/terrified.dm index f4a2815cef2..8645a0a977c 100644 --- a/code/datums/status_effects/debuffs/terrified.dm +++ b/code/datums/status_effects/debuffs/terrified.dm @@ -38,7 +38,7 @@ UnregisterSignal(owner, COMSIG_CARBON_HELPED) owner.remove_fov_trait(id, FOV_270_DEGREES) -/datum/status_effect/terrified/tick(delta_time, times_fired) +/datum/status_effect/terrified/tick(seconds_per_tick, times_fired) if(check_surrounding_darkness()) if(terror_buildup < DARKNESS_TERROR_CAP) terror_buildup += DARKNESS_TERROR_AMOUNT @@ -50,14 +50,14 @@ return if(terror_buildup >= TERROR_FEAR_THRESHOLD) //The onset, minor effects of terror buildup - owner.adjust_dizzy_up_to(10 SECONDS * delta_time, 10 SECONDS) - owner.adjust_stutter_up_to(10 SECONDS * delta_time, 10 SECONDS) - owner.adjust_jitter_up_to(10 SECONDS * delta_time, 10 SECONDS) + owner.adjust_dizzy_up_to(10 SECONDS * seconds_per_tick, 10 SECONDS) + owner.adjust_stutter_up_to(10 SECONDS * seconds_per_tick, 10 SECONDS) + owner.adjust_jitter_up_to(10 SECONDS * seconds_per_tick, 10 SECONDS) if(terror_buildup >= TERROR_PANIC_THRESHOLD) //If you reach this amount of buildup in an engagement, it's time to start looking for a way out. owner.playsound_local(get_turf(owner), 'sound/health/slowbeat.ogg', 40, 0, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE) owner.add_fov_trait(id, FOV_270_DEGREES) //Terror induced tunnel vision - owner.adjust_eye_blur_up_to(10 SECONDS * delta_time, 10 SECONDS) + owner.adjust_eye_blur_up_to(10 SECONDS * seconds_per_tick, 10 SECONDS) if(prob(5)) //We have a little panic attack. Consider it GENTLE ENCOURAGEMENT to start running away. freak_out(PANIC_ATTACK_TERROR_AMOUNT) owner.visible_message( diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index e97769599a7..a1271c98c1e 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -344,7 +344,7 @@ return /// If var/processing is TRUE, this is run on each life tick -/datum/wound/proc/handle_process(delta_time, times_fired) +/datum/wound/proc/handle_process(seconds_per_tick, times_fired) return /// For use in do_after callback checks @@ -366,7 +366,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(delta_time, times_fired) +/datum/wound/proc/on_stasis(seconds_per_tick, times_fired) return /// Sets our blood flow diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm index 2e4149d149a..73eba054cad 100644 --- a/code/datums/wounds/bones.dm +++ b/code/datums/wounds/bones.dm @@ -64,7 +64,7 @@ UnregisterSignal(victim, COMSIG_HUMAN_EARLY_UNARMED_ATTACK) return ..() -/datum/wound/blunt/handle_process(delta_time, times_fired) +/datum/wound/blunt/handle_process(seconds_per_tick, times_fired) . = ..() if(limb.body_zone == BODY_ZONE_HEAD && brain_trauma_group && world.time > next_trauma_cycle) if(active_trauma) @@ -79,12 +79,12 @@ regen_ticks_current++ if(victim.body_position == LYING_DOWN) - if(DT_PROB(30, delta_time)) + if(SPT_PROB(30, seconds_per_tick)) regen_ticks_current += 1 - if(victim.IsSleeping() && DT_PROB(30, delta_time)) + if(victim.IsSleeping() && SPT_PROB(30, seconds_per_tick)) regen_ticks_current += 1 - if(!is_bone_limb && DT_PROB(severity * 1.5, delta_time)) + if(!is_bone_limb && SPT_PROB(severity * 1.5, seconds_per_tick)) victim.take_bodypart_damage(rand(1, severity * 2), wound_bonus=CANT_WOUND) victim.adjustStaminaLoss(rand(2, severity * 2.5)) if(prob(33)) diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm index cb70066b145..47787d8df26 100644 --- a/code/datums/wounds/burns.dm +++ b/code/datums/wounds/burns.dm @@ -34,11 +34,11 @@ var/strikes_to_lose_limb = 3 -/datum/wound/burn/handle_process(delta_time, times_fired) +/datum/wound/burn/handle_process(seconds_per_tick, times_fired) . = ..() if(strikes_to_lose_limb == 0) // we've already hit sepsis, nothing more to do - victim.adjustToxLoss(0.25 * delta_time) - if(DT_PROB(0.5, delta_time)) + victim.adjustToxLoss(0.25 * seconds_per_tick) + if(SPT_PROB(0.5, seconds_per_tick)) victim.visible_message(span_danger("The infection on the remnants of [victim]'s [limb.plaintext_zone] shift and bubble nauseatingly!"), span_warning("You can feel the infection on the remnants of your [limb.plaintext_zone] coursing through your veins!"), vision_distance = COMBAT_MESSAGE_RANGE) return @@ -52,12 +52,12 @@ flesh_healing += 0.5 if(limb.current_gauze) - limb.seep_gauze(WOUND_BURN_SANITIZATION_RATE * delta_time) + limb.seep_gauze(WOUND_BURN_SANITIZATION_RATE * seconds_per_tick) if(flesh_healing > 0) // good bandages multiply the length of flesh healing var/bandage_factor = limb.current_gauze?.burn_cleanliness_bonus || 1 - flesh_damage = max(flesh_damage - (0.5 * delta_time), 0) - flesh_healing = max(flesh_healing - (0.5 * bandage_factor * delta_time), 0) // good bandages multiply the length of flesh healing + flesh_damage = max(flesh_damage - (0.5 * seconds_per_tick), 0) + flesh_healing = max(flesh_healing - (0.5 * bandage_factor * seconds_per_tick), 0) // good bandages multiply the length of flesh healing // if we have little/no infection, the limb doesn't have much burn damage, and our nutrition is good, heal some flesh if(infestation <= WOUND_INFECTION_MODERATE && (limb.burn_dam < 5) && (victim.nutrition >= NUTRITION_LEVEL_FED)) @@ -72,44 +72,44 @@ // sanitization is checked after the clearing check but before the actual ill-effects, because we freeze the effects of infection while we have sanitization if(sanitization > 0) var/bandage_factor = limb.current_gauze?.burn_cleanliness_bonus || 1 - infestation = max(infestation - (WOUND_BURN_SANITIZATION_RATE * delta_time), 0) - sanitization = max(sanitization - (WOUND_BURN_SANITIZATION_RATE * bandage_factor * delta_time), 0) + infestation = max(infestation - (WOUND_BURN_SANITIZATION_RATE * seconds_per_tick), 0) + sanitization = max(sanitization - (WOUND_BURN_SANITIZATION_RATE * bandage_factor * seconds_per_tick), 0) return - infestation += infestation_rate * delta_time + infestation += infestation_rate * seconds_per_tick switch(infestation) if(0 to WOUND_INFECTION_MODERATE) if(WOUND_INFECTION_MODERATE to WOUND_INFECTION_SEVERE) - if(DT_PROB(15, delta_time)) + if(SPT_PROB(15, seconds_per_tick)) victim.adjustToxLoss(0.2) if(prob(6)) to_chat(victim, span_warning("The blisters on your [limb.plaintext_zone] ooze a strange pus...")) if(WOUND_INFECTION_SEVERE to WOUND_INFECTION_CRITICAL) if(!disabling) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(victim, span_warning("Your [limb.plaintext_zone] completely locks up, as you struggle for control against the infection!")) set_disabling(TRUE) return - else if(DT_PROB(4, delta_time)) + else if(SPT_PROB(4, seconds_per_tick)) to_chat(victim, span_notice("You regain sensation in your [limb.plaintext_zone], but it's still in terrible shape!")) set_disabling(FALSE) return - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) victim.adjustToxLoss(0.5) if(WOUND_INFECTION_CRITICAL to WOUND_INFECTION_SEPTIC) if(!disabling) - if(DT_PROB(1.5, delta_time)) + if(SPT_PROB(1.5, seconds_per_tick)) to_chat(victim, span_warning("You suddenly lose all sensation of the festering infection in your [limb.plaintext_zone]!")) set_disabling(TRUE) return - else if(DT_PROB(1.5, delta_time)) + else if(SPT_PROB(1.5, seconds_per_tick)) to_chat(victim, span_notice("You can barely feel your [limb.plaintext_zone] again, and you have to strain to retain motor control!")) set_disabling(FALSE) return - if(DT_PROB(2.48, delta_time)) + if(SPT_PROB(2.48, seconds_per_tick)) if(prob(20)) to_chat(victim, span_warning("You contemplate life without your [limb.plaintext_zone]...")) victim.adjustToxLoss(0.75) @@ -117,7 +117,7 @@ victim.adjustToxLoss(1) if(WOUND_INFECTION_SEPTIC to INFINITY) - if(DT_PROB(0.5 * infestation, delta_time)) + if(SPT_PROB(0.5 * infestation, seconds_per_tick)) strikes_to_lose_limb-- switch(strikes_to_lose_limb) if(2 to INFINITY) @@ -240,20 +240,20 @@ uv(I, 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/on_stasis(delta_time, times_fired) +/datum/wound/burn/on_stasis(seconds_per_tick, times_fired) . = ..() if(strikes_to_lose_limb == 0) // we've already hit sepsis, nothing more to do - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) victim.visible_message(span_danger("The infection on the remnants of [victim]'s [limb.plaintext_zone] shift and bubble nauseatingly!"), span_warning("You can feel the infection on the remnants of your [limb.plaintext_zone] coursing through your veins!"), vision_distance = COMBAT_MESSAGE_RANGE) return if(flesh_healing > 0) - flesh_damage = max(flesh_damage - (0.1 * delta_time), 0) + flesh_damage = max(flesh_damage - (0.1 * seconds_per_tick), 0) if((flesh_damage <= 0) && (infestation <= 1)) to_chat(victim, span_green("The burns on your [limb.plaintext_zone] have cleared up!")) qdel(src) return if(sanitization > 0) - infestation = max(infestation - (0.1 * WOUND_BURN_SANITIZATION_RATE * delta_time), 0) + infestation = max(infestation - (0.1 * WOUND_BURN_SANITIZATION_RATE * seconds_per_tick), 0) /datum/wound/burn/on_synthflesh(amount) flesh_healing += amount * 0.5 // 20u patch will heal 10 flesh standard diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm index fa6ecaf9ad7..be4180114bc 100644 --- a/code/datums/wounds/pierce.dm +++ b/code/datums/wounds/pierce.dm @@ -62,26 +62,26 @@ return BLOOD_FLOW_DECREASING return BLOOD_FLOW_STEADY -/datum/wound/pierce/handle_process(delta_time, times_fired) +/datum/wound/pierce/handle_process(seconds_per_tick, times_fired) set_blood_flow(min(blood_flow, WOUND_SLASH_MAX_BLOODFLOW)) if(!no_bleeding) if(victim.bodytemperature < (BODYTEMP_NORMAL - 10)) - adjust_blood_flow(-0.1 * delta_time) - if(DT_PROB(2.5, delta_time)) + adjust_blood_flow(-0.1 * seconds_per_tick) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(victim, span_notice("You feel the [lowertext(name)] in your [limb.plaintext_zone] firming up from the cold!")) if(HAS_TRAIT(victim, TRAIT_BLOODY_MESS)) - adjust_blood_flow(0.25 * delta_time) // old heparin used to just add +2 bleed stacks per tick, this adds 0.5 bleed flow to all open cuts which is probably even stronger as long as you can cut them first + adjust_blood_flow(0.25 * seconds_per_tick) // old heparin used to just add +2 bleed stacks per tick, this adds 0.5 bleed flow to all open cuts which is probably even stronger as long as you can cut them first if(limb.current_gauze) - adjust_blood_flow(-limb.current_gauze.absorption_rate * gauzed_clot_rate * delta_time) - limb.current_gauze.absorption_capacity -= limb.current_gauze.absorption_rate * delta_time + adjust_blood_flow(-limb.current_gauze.absorption_rate * gauzed_clot_rate * seconds_per_tick) + limb.current_gauze.absorption_capacity -= limb.current_gauze.absorption_rate * seconds_per_tick if(blood_flow <= 0) qdel(src) -/datum/wound/pierce/on_stasis(delta_time, times_fired) +/datum/wound/pierce/on_stasis(seconds_per_tick, times_fired) . = ..() if(blood_flow <= 0) qdel(src) diff --git a/code/datums/wounds/slash.dm b/code/datums/wounds/slash.dm index 48a987c98fa..e4d4bb718d5 100644 --- a/code/datums/wounds/slash.dm +++ b/code/datums/wounds/slash.dm @@ -110,7 +110,7 @@ if(clot_rate < 0) return BLOOD_FLOW_INCREASING -/datum/wound/slash/handle_process(delta_time, times_fired) +/datum/wound/slash/handle_process(seconds_per_tick, times_fired) // in case the victim has the NOBLOOD trait, the wound will simply not clot on it's own if(!no_bleeding) set_blood_flow(min(blood_flow, WOUND_SLASH_MAX_BLOODFLOW)) @@ -121,12 +121,12 @@ //gauze always reduces blood flow, even for non bleeders if(limb.current_gauze) if(clot_rate > 0) - adjust_blood_flow(-clot_rate * delta_time) - adjust_blood_flow(-limb.current_gauze.absorption_rate * delta_time) - limb.seep_gauze(limb.current_gauze.absorption_rate * delta_time) + adjust_blood_flow(-clot_rate * seconds_per_tick) + adjust_blood_flow(-limb.current_gauze.absorption_rate * seconds_per_tick) + limb.seep_gauze(limb.current_gauze.absorption_rate * seconds_per_tick) //otherwise, only clot if it's a bleeder else if(!no_bleeding) - adjust_blood_flow(-clot_rate * delta_time) + adjust_blood_flow(-clot_rate * seconds_per_tick) if(blood_flow > highest_flow) highest_flow = blood_flow @@ -138,7 +138,7 @@ to_chat(victim, span_green("The cut on your [limb.plaintext_zone] has [no_bleeding ? "healed up" : "stopped bleeding"]!")) qdel(src) -/datum/wound/slash/on_stasis(delta_time, times_fired) +/datum/wound/slash/on_stasis(seconds_per_tick, times_fired) if(blood_flow >= minimum_flow) return if(demotes_to) diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm index eeac6ccf775..28fd60db4e0 100644 --- a/code/game/machinery/bank_machine.dm +++ b/code/game/machinery/bank_machine.dm @@ -55,7 +55,7 @@ return return ..() -/obj/machinery/computer/bank_machine/process(delta_time) +/obj/machinery/computer/bank_machine/process(seconds_per_tick) . = ..() if(!siphoning || !synced_bank_account) return @@ -63,7 +63,7 @@ say("Insufficient power. Halting siphon.") end_siphon() return - var/siphon_am = 100 * delta_time + var/siphon_am = 100 * seconds_per_tick if(!synced_bank_account.has_money(siphon_am)) say("[synced_bank_account.account_holder] depleted. Halting siphon.") end_siphon() diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index e8a594a67c2..5f355ec3637 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -138,13 +138,13 @@ for(var/datum/stock_part/capacitor/capacitor in component_parts) charge_rate *= capacitor.tier -/obj/machinery/cell_charger/process(delta_time) +/obj/machinery/cell_charger/process(seconds_per_tick) if(!charging || !anchored || (machine_stat & (BROKEN|NOPOWER))) return if(charging.percent() >= 100) return - var/main_draw = use_power_from_net(charge_rate * delta_time, take_any = TRUE) //Pulls directly from the Powernet to dump into the cell + var/main_draw = use_power_from_net(charge_rate * seconds_per_tick, take_any = TRUE) //Pulls directly from the Powernet to dump into the cell if(!main_draw) return charging.give(main_draw) diff --git a/code/game/machinery/civilian_bounties.dm b/code/game/machinery/civilian_bounties.dm index 2d976c9fe85..1953a7f0c32 100644 --- a/code/game/machinery/civilian_bounties.dm +++ b/code/game/machinery/civilian_bounties.dm @@ -303,7 +303,7 @@ QDEL_NULL(radio) return COMPONENT_STOP_EXPORT // stops the radio from exporting, not the cube -/obj/item/bounty_cube/process(delta_time) +/obj/item/bounty_cube/process(seconds_per_tick) //if our nag cooldown has finished and we aren't on Centcom or in transit, then nag if(COOLDOWN_FINISHED(src, next_nag_time) && !is_centcom_level(z) && !is_reserved_level(z)) //set up our nag message diff --git a/code/game/machinery/computer/arcade/orion.dm b/code/game/machinery/computer/arcade/orion.dm index d32c6596786..e1bd4005978 100644 --- a/code/game/machinery/computer/arcade/orion.dm +++ b/code/game/machinery/computer/arcade/orion.dm @@ -553,8 +553,8 @@ GLOBAL_LIST_INIT(orion_events, generate_orion_events()) var/datum/component/singularity/singularity = singularity_component.resolve() singularity?.grav_pull = 1 -/obj/singularity/orion/process(delta_time) - if(DT_PROB(0.5, delta_time)) +/obj/singularity/orion/process(seconds_per_tick) + if(SPT_PROB(0.5, seconds_per_tick)) mezzer() #undef ORION_TRAIL_WINTURN diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 27b8eb70cf6..8db31009cb7 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -22,7 +22,7 @@ connected = M break -/obj/machinery/computer/pod/process(delta_time) +/obj/machinery/computer/pod/process(seconds_per_tick) if(COOLDOWN_FINISHED(src, massdriver_countdown)) timing = FALSE // alarm() sleeps, so we want to end processing first and can't rely on return PROCESS_KILL diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm index f15bd2a4bbb..f7e1fb51d55 100644 --- a/code/game/machinery/defibrillator_mount.dm +++ b/code/game/machinery/defibrillator_mount.dm @@ -197,13 +197,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/defibrillator_mount, 28) begin_processing() -/obj/machinery/defibrillator_mount/charging/process(delta_time) +/obj/machinery/defibrillator_mount/charging/process(seconds_per_tick) var/obj/item/stock_parts/cell/C = get_cell() if(!C || !is_operational) return PROCESS_KILL if(C.charge < C.maxcharge) - use_power(active_power_usage * delta_time) - C.give(40 * delta_time) + use_power(active_power_usage * seconds_per_tick) + C.give(40 * seconds_per_tick) defib.update_power() //wallframe, for attaching the mounts easily 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 9cd523cc6db..97b80b91969 100644 --- a/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm @@ -76,7 +76,7 @@ head.unarmed_damage_high = initial(head.unarmed_damage_high) head.unarmed_stun_threshold = initial(head.unarmed_stun_threshold) -/obj/item/organ/internal/tongue/carp/on_life(delta_time, times_fired) +/obj/item/organ/internal/tongue/carp/on_life(seconds_per_tick, times_fired) . = ..() 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 5d9c54fa404..6c8ed316c64 100644 --- a/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm @@ -167,7 +167,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/internal/tongue/rat/on_life(delta_time, times_fired) +/obj/item/organ/internal/tongue/rat/on_life(seconds_per_tick, times_fired) . = ..() if(prob(5)) owner.emote("squeaks") diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index 86f1807302b..f3230f0dd8f 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -63,7 +63,7 @@ ui = new(user, src, "AirlockController", src) ui.open() -/obj/machinery/airlock_controller/process(delta_time) +/obj/machinery/airlock_controller/process(seconds_per_tick) var/process_again = TRUE while(process_again) process_again = FALSE diff --git a/code/game/machinery/fat_sucker.dm b/code/game/machinery/fat_sucker.dm index 5c8c99d797f..afcfde27a2b 100644 --- a/code/game/machinery/fat_sucker.dm +++ b/code/game/machinery/fat_sucker.dm @@ -132,7 +132,7 @@ if(panel_open) . += "[icon_state]_panel" -/obj/machinery/fat_sucker/process(delta_time) +/obj/machinery/fat_sucker/process(seconds_per_tick) if(!processing) return if(!powered() || !occupant || !iscarbon(occupant)) @@ -144,8 +144,8 @@ open_machine() playsound(src, 'sound/machines/microwave/microwave-end.ogg', 100, FALSE) return - C.adjust_nutrition(-bite_size * delta_time) - nutrients += bite_size * delta_time + C.adjust_nutrition(-bite_size * seconds_per_tick) + nutrients += bite_size * seconds_per_tick if(next_fact <= 0) next_fact = initial(next_fact) diff --git a/code/game/machinery/hypnochair.dm b/code/game/machinery/hypnochair.dm index 106740cbc3c..b3d0879204a 100644 --- a/code/game/machinery/hypnochair.dm +++ b/code/game/machinery/hypnochair.dm @@ -101,12 +101,12 @@ update_appearance() timerid = addtimer(CALLBACK(src, PROC_REF(finish_interrogation)), 450, TIMER_STOPPABLE) -/obj/machinery/hypnochair/process(delta_time) +/obj/machinery/hypnochair/process(seconds_per_tick) var/mob/living/carbon/C = occupant if(!istype(C) || C != victim) interrupt_interrogation() return - if(DT_PROB(5, delta_time) && !(C.get_eye_protection() > 0)) + if(SPT_PROB(5, seconds_per_tick) && !(C.get_eye_protection() > 0)) to_chat(C, "[pick(\ "...blue... red... green... blue, red, green, blueredgreen[span_small("blueredgreen")]",\ "...pretty colors...",\ @@ -115,7 +115,7 @@ "...an annoying buzz in your ears..."\ )]") - use_power(active_power_usage * delta_time) + use_power(active_power_usage * seconds_per_tick) /obj/machinery/hypnochair/proc/finish_interrogation() interrogating = FALSE diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 1e54886cc32..b04b325dbcf 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -223,7 +223,7 @@ new /obj/item/stack/sheet/iron(loc) qdel(src) -/obj/machinery/iv_drip/process(delta_time) +/obj/machinery/iv_drip/process(seconds_per_tick) if(!attached) return PROCESS_KILL @@ -250,13 +250,13 @@ // Give reagents if(mode) if(drip_reagents.total_volume) - drip_reagents.trans_to(attached, transfer_rate * delta_time, methods = INJECT, show_message = FALSE) //make reagents reacts, but don't spam messages + drip_reagents.trans_to(attached, transfer_rate * seconds_per_tick, methods = INJECT, show_message = FALSE) //make reagents reacts, but don't spam messages update_appearance(UPDATE_ICON) // Take blood else if (isliving(attached)) var/mob/living/attached_mob = attached - var/amount = min(transfer_rate * delta_time, drip_reagents.maximum_volume - drip_reagents.total_volume) + var/amount = min(transfer_rate * seconds_per_tick, drip_reagents.maximum_volume - drip_reagents.total_volume) // If the beaker is full, ping if(!amount) set_transfer_rate(MIN_IV_TRANSFER_RATE) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index aa26cf3580f..14db68c7063 100755 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -141,7 +141,7 @@ return COMPONENT_CANCEL_ATTACK_CHAIN -/obj/machinery/recharger/process(delta_time) +/obj/machinery/recharger/process(seconds_per_tick) if(machine_stat & (NOPOWER|BROKEN) || !anchored) return PROCESS_KILL @@ -150,8 +150,8 @@ var/obj/item/stock_parts/cell/C = charging.get_cell() if(C) if(C.charge < C.maxcharge) - C.give(C.chargerate * recharge_coeff * delta_time / 2) - use_power(active_power_usage * recharge_coeff * delta_time) + C.give(C.chargerate * recharge_coeff * seconds_per_tick / 2) + use_power(active_power_usage * recharge_coeff * seconds_per_tick) using_power = TRUE update_appearance() @@ -159,7 +159,7 @@ var/obj/item/ammo_box/magazine/recharge/R = charging if(R.stored_ammo.len < R.max_ammo) R.stored_ammo += new R.ammo_type(R) - use_power(active_power_usage * recharge_coeff * delta_time) + use_power(active_power_usage * recharge_coeff * seconds_per_tick) using_power = TRUE update_appearance() return diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 9bc24dbb605..ed6b83be0cf 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -57,9 +57,9 @@ begin_processing() -/obj/machinery/recharge_station/process(delta_time) +/obj/machinery/recharge_station/process(seconds_per_tick) if(occupant) - process_occupant(delta_time) + process_occupant(seconds_per_tick) return 1 /obj/machinery/recharge_station/relaymove(mob/living/user, direction) @@ -114,7 +114,7 @@ icon_state = "borgcharger[state_open ? 0 : (occupant ? 1 : 2)]" return ..() -/obj/machinery/recharge_station/proc/process_occupant(delta_time) +/obj/machinery/recharge_station/proc/process_occupant(seconds_per_tick) if(!occupant) return - SEND_SIGNAL(occupant, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, recharge_speed * delta_time / 2, repairs) + SEND_SIGNAL(occupant, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, recharge_speed * seconds_per_tick / 2, repairs) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index bfd42be6200..6ace282cb6b 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -149,9 +149,9 @@ update_appearance() QDEL_LIST(deployed_shields) -/obj/machinery/shieldgen/process(delta_time) +/obj/machinery/shieldgen/process(seconds_per_tick) if((machine_stat & BROKEN) && active) - if(deployed_shields.len && DT_PROB(2.5, delta_time)) + if(deployed_shields.len && SPT_PROB(2.5, seconds_per_tick)) qdel(pick(deployed_shields)) diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index 83992c31f0e..8283931a583 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -62,12 +62,12 @@ give_payout(balance) return ..() -/obj/machinery/computer/slot_machine/process(delta_time) +/obj/machinery/computer/slot_machine/process(seconds_per_tick) . = ..() //Sanity checks. if(!.) return . - money += round(delta_time / 2) //SPESSH MAJICKS + money += round(seconds_per_tick / 2) //SPESSH MAJICKS /obj/machinery/computer/slot_machine/update_icon_state() if(machine_stat & BROKEN) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index c85bf5ff903..84f7279839e 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -310,7 +310,7 @@ . = ..() QDEL_NULL(beaker) -/obj/machinery/space_heater/improvised_chem_heater/process(delta_time) +/obj/machinery/space_heater/improvised_chem_heater/process(seconds_per_tick) if(!on) update_appearance() return PROCESS_KILL @@ -329,17 +329,17 @@ switch(set_mode) if(HEATER_MODE_AUTO) power_mod *= 0.5 - beaker.reagents.adjust_thermal_energy((target_temperature - beaker.reagents.chem_temp) * power_mod * delta_time * SPECIFIC_HEAT_DEFAULT * beaker.reagents.total_volume) + beaker.reagents.adjust_thermal_energy((target_temperature - beaker.reagents.chem_temp) * power_mod * seconds_per_tick * SPECIFIC_HEAT_DEFAULT * beaker.reagents.total_volume) beaker.reagents.handle_reactions() if(HEATER_MODE_HEAT) if(target_temperature < beaker.reagents.chem_temp) return - beaker.reagents.adjust_thermal_energy((target_temperature - beaker.reagents.chem_temp) * power_mod * delta_time * SPECIFIC_HEAT_DEFAULT * beaker.reagents.total_volume) + beaker.reagents.adjust_thermal_energy((target_temperature - beaker.reagents.chem_temp) * power_mod * seconds_per_tick * SPECIFIC_HEAT_DEFAULT * beaker.reagents.total_volume) if(HEATER_MODE_COOL) if(target_temperature > beaker.reagents.chem_temp) return - beaker.reagents.adjust_thermal_energy((target_temperature - beaker.reagents.chem_temp) * power_mod * delta_time * SPECIFIC_HEAT_DEFAULT * beaker.reagents.total_volume) - var/required_energy = heating_power * delta_time * (power_mod * 4) + beaker.reagents.adjust_thermal_energy((target_temperature - beaker.reagents.chem_temp) * power_mod * seconds_per_tick * SPECIFIC_HEAT_DEFAULT * beaker.reagents.total_volume) + var/required_energy = heating_power * seconds_per_tick * (power_mod * 4) cell.use(required_energy / efficiency) beaker.reagents.handle_reactions() update_appearance() diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 104479fe94b..434efd24cf2 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -453,7 +453,7 @@ if(mob_occupant) dump_inventory_contents() -/obj/machinery/suit_storage_unit/process(delta_time) +/obj/machinery/suit_storage_unit/process(seconds_per_tick) var/obj/item/stock_parts/cell/cell if(suit && istype(suit)) cell = suit.cell @@ -462,9 +462,9 @@ if(!cell || cell.charge == cell.maxcharge) return - var/cell_charged = cell.give(final_charge_rate * delta_time) + var/cell_charged = cell.give(final_charge_rate * seconds_per_tick) if(cell_charged) - use_power((active_power_usage + final_charge_rate) * delta_time) + use_power((active_power_usage + final_charge_rate) * seconds_per_tick) /obj/machinery/suit_storage_unit/proc/shock(mob/user, prb) if(!prob(prb)) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 679bbd1eafb..6844eb4ec6a 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -160,11 +160,11 @@ GLOBAL_LIST_EMPTY(telecomms_list) if(old_on != on) update_appearance() -/obj/machinery/telecomms/process(delta_time) +/obj/machinery/telecomms/process(seconds_per_tick) update_power() if(traffic > 0) - traffic -= netspeed * delta_time + traffic -= netspeed * seconds_per_tick /obj/machinery/telecomms/emp_act(severity) . = ..() diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index bd159e13af2..4a5a87c3a90 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -189,18 +189,18 @@ GLOBAL_LIST_INIT(dye_registry, list( if(!busy) . += span_notice("Right-click with an empty hand to start a wash cycle.") -/obj/machinery/washing_machine/process(delta_time) +/obj/machinery/washing_machine/process(seconds_per_tick) if(!busy) animate(src, transform=matrix(), time=2) return PROCESS_KILL if(anchored) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) var/matrix/M = new M.Translate(rand(-1, 1), rand(0, 1)) animate(src, transform=M, time=1) animate(transform=matrix(), time=1) else - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) step(src, pick(GLOB.cardinals)) var/matrix/M = new M.Translate(rand(-3, 3), rand(-1, 3)) diff --git a/code/game/objects/effects/anomalies/_anomalies.dm b/code/game/objects/effects/anomalies/_anomalies.dm index bd43b788aa2..16c98365edd 100644 --- a/code/game/objects/effects/anomalies/_anomalies.dm +++ b/code/game/objects/effects/anomalies/_anomalies.dm @@ -64,8 +64,8 @@ else countdown.start() -/obj/effect/anomaly/process(delta_time) - anomalyEffect(delta_time) +/obj/effect/anomaly/process(seconds_per_tick) + anomalyEffect(seconds_per_tick) if(death_time < world.time && !immortal) if(loc) detonate() @@ -78,8 +78,8 @@ QDEL_NULL(aSignal) return ..() -/obj/effect/anomaly/proc/anomalyEffect(delta_time) - if(!immobile && DT_PROB(ANOMALY_MOVECHANCE, delta_time)) +/obj/effect/anomaly/proc/anomalyEffect(seconds_per_tick) + if(!immobile && SPT_PROB(ANOMALY_MOVECHANCE, seconds_per_tick)) step(src,pick(GLOB.alldirs)) /obj/effect/anomaly/proc/detonate() diff --git a/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm b/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm index 570e3abd30e..b4ee3713a25 100644 --- a/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm +++ b/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm @@ -11,7 +11,7 @@ /// Range of the anomaly pulse var/range = 5 -/obj/effect/anomaly/bioscrambler/anomalyEffect(delta_time) +/obj/effect/anomaly/bioscrambler/anomalyEffect(seconds_per_tick) . = ..() if(!COOLDOWN_FINISHED(src, pulse_cooldown)) return diff --git a/code/game/objects/effects/anomalies/anomalies_dimensional.dm b/code/game/objects/effects/anomalies/anomalies_dimensional.dm index b0bfa9ea026..2d9b8ec71b4 100644 --- a/code/game/objects/effects/anomalies/anomalies_dimensional.dm +++ b/code/game/objects/effects/anomalies/anomalies_dimensional.dm @@ -21,7 +21,7 @@ animate(src, transform = matrix()*0.85, time = 3, loop = -1) animate(transform = matrix(), time = 3, loop = -1) -/obj/effect/anomaly/dimensional/anomalyEffect(delta_time) +/obj/effect/anomaly/dimensional/anomalyEffect(seconds_per_tick) . = ..() transmute_area() diff --git a/code/game/objects/effects/anomalies/anomalies_ectoplasm.dm b/code/game/objects/effects/anomalies/anomalies_ectoplasm.dm index 51fe6b8cc84..9aa2c5332db 100644 --- a/code/game/objects/effects/anomalies/anomalies_ectoplasm.dm +++ b/code/game/objects/effects/anomalies/anomalies_ectoplasm.dm @@ -34,7 +34,7 @@ if(50 to 100) . += span_alert("The anomaly pulsates heavily, about to burst with unearthly energy. This can't be good.") -/obj/effect/anomaly/ectoplasm/anomalyEffect(delta_time) +/obj/effect/anomaly/ectoplasm/anomalyEffect(seconds_per_tick) . = ..() if(override_ghosts) @@ -149,7 +149,7 @@ playsound(src, pick(spooky_noises), 100, TRUE) QDEL_IN(WEAKREF(src), 2 MINUTES) -/obj/structure/ghost_portal/process(delta_time) +/obj/structure/ghost_portal/process(seconds_per_tick) . = ..() if(prob(5)) diff --git a/code/game/objects/effects/anomalies/anomalies_gravity.dm b/code/game/objects/effects/anomalies/anomalies_gravity.dm index dbe396a2b63..5fcbafce856 100644 --- a/code/game/objects/effects/anomalies/anomalies_gravity.dm +++ b/code/game/objects/effects/anomalies/anomalies_gravity.dm @@ -39,7 +39,7 @@ if(warp) SET_PLANE(warp, PLANE_TO_TRUE(warp.plane), new_turf) -/obj/effect/anomaly/grav/anomalyEffect(delta_time) +/obj/effect/anomaly/grav/anomalyEffect(seconds_per_tick) ..() boing = 1 for(var/obj/O in orange(4, src)) @@ -61,8 +61,8 @@ O.throw_at(target, 5, 10) //anomaly quickly contracts then slowly expands it's ring - animate(warp, time = delta_time*3, transform = matrix().Scale(0.5,0.5)) - animate(time = delta_time*7, transform = matrix()) + animate(warp, time = seconds_per_tick*3, transform = matrix().Scale(0.5,0.5)) + animate(time = seconds_per_tick*7, transform = matrix()) /obj/effect/anomaly/grav/proc/on_entered(datum/source, atom/movable/AM) SIGNAL_HANDLER diff --git a/code/game/objects/effects/anomalies/anomalies_hallucination.dm b/code/game/objects/effects/anomalies/anomalies_hallucination.dm index 10b4c229572..83648601017 100644 --- a/code/game/objects/effects/anomalies/anomalies_hallucination.dm +++ b/code/game/objects/effects/anomalies/anomalies_hallucination.dm @@ -3,7 +3,7 @@ name = "hallucination anomaly" icon_state = "hallucination" aSignal = /obj/item/assembly/signaler/anomaly/hallucination - /// Time passed since the last effect, increased by delta_time of the SSobj + /// Time passed since the last effect, increased by seconds_per_tick of the SSobj var/ticks = 0 /// How many seconds between each small hallucination pulses var/release_delay = 5 @@ -15,9 +15,9 @@ span_warning("You are going insane!"), ) -/obj/effect/anomaly/hallucination/anomalyEffect(delta_time) +/obj/effect/anomaly/hallucination/anomalyEffect(seconds_per_tick) . = ..() - ticks += delta_time + ticks += seconds_per_tick if(ticks < release_delay) return ticks -= release_delay diff --git a/code/game/objects/effects/anomalies/anomalies_pyroclastic.dm b/code/game/objects/effects/anomalies/anomalies_pyroclastic.dm index 1216f7397d6..09d69142e21 100644 --- a/code/game/objects/effects/anomalies/anomalies_pyroclastic.dm +++ b/code/game/objects/effects/anomalies/anomalies_pyroclastic.dm @@ -7,9 +7,9 @@ var/releasedelay = 10 aSignal = /obj/item/assembly/signaler/anomaly/pyro -/obj/effect/anomaly/pyro/anomalyEffect(delta_time) +/obj/effect/anomaly/pyro/anomalyEffect(seconds_per_tick) ..() - ticks += delta_time + ticks += seconds_per_tick if(ticks < releasedelay) return FALSE else @@ -64,7 +64,7 @@ var/mob/living/living = bumpee living.dust() -/obj/effect/anomaly/pyro/big/anomalyEffect(delta_time) +/obj/effect/anomaly/pyro/big/anomalyEffect(seconds_per_tick) . = ..() if(!.) diff --git a/code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm b/code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm index 0d44043197f..ecacfe98998 100644 --- a/code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm +++ b/code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm @@ -76,14 +76,14 @@ transfer_fingerprints_to(result) return result -/obj/effect/particle_effect/fluid/foam/process(delta_time) - var/ds_delta_time = delta_time SECONDS - lifetime -= ds_delta_time +/obj/effect/particle_effect/fluid/foam/process(seconds_per_tick) + var/ds_seconds_per_tick = seconds_per_tick SECONDS + lifetime -= ds_seconds_per_tick if(lifetime <= 0) kill_foam() return - var/fraction = (ds_delta_time * MINIMUM_FOAM_DILUTION) / (initial(lifetime) * max(MINIMUM_FOAM_DILUTION, group.total_size)) + var/fraction = (ds_seconds_per_tick * MINIMUM_FOAM_DILUTION) / (initial(lifetime) * max(MINIMUM_FOAM_DILUTION, group.total_size)) var/turf/location = loc for(var/obj/object in location) if(object == src) @@ -94,9 +94,9 @@ var/hit = 0 for(var/mob/living/foamer in location) - hit += foam_mob(foamer, delta_time) + hit += foam_mob(foamer, seconds_per_tick) if(hit) - lifetime += ds_delta_time //this is so the decrease from mobs hit and the natural decrease don't cumulate. + lifetime += ds_seconds_per_tick //this is so the decrease from mobs hit and the natural decrease don't cumulate. reagents.expose(location, VAPOR, fraction) @@ -105,25 +105,25 @@ * * Arguments: * - [foaming][/mob/living]: The mob that this foam is acting on. - * - delta_time: The amount of time that this foam is acting on them over. + * - seconds_per_tick: The amount of time that this foam is acting on them over. * * Returns: * - [TRUE]: If the foam was successfully applied to the mob. Used to scale how quickly foam dissipates according to the number of mobs it is applied to. * - [FALSE]: Otherwise. */ -/obj/effect/particle_effect/fluid/foam/proc/foam_mob(mob/living/foaming, delta_time) +/obj/effect/particle_effect/fluid/foam/proc/foam_mob(mob/living/foaming, seconds_per_tick) if(lifetime <= 0) return FALSE if(!istype(foaming)) return FALSE - delta_time = min(delta_time SECONDS, lifetime) - var/fraction = (delta_time * MINIMUM_FOAM_DILUTION) / (initial(lifetime) * max(MINIMUM_FOAM_DILUTION, group.total_size)) + seconds_per_tick = min(seconds_per_tick SECONDS, lifetime) + var/fraction = (seconds_per_tick * MINIMUM_FOAM_DILUTION) / (initial(lifetime) * max(MINIMUM_FOAM_DILUTION, group.total_size)) reagents.expose(foaming, VAPOR, fraction) - lifetime -= delta_time + lifetime -= seconds_per_tick return TRUE -/obj/effect/particle_effect/fluid/foam/spread(delta_time = 0.2 SECONDS) +/obj/effect/particle_effect/fluid/foam/spread(seconds_per_tick = 0.2 SECONDS) if(group.total_size > group.target_size) return var/turf/location = get_turf(src) @@ -138,7 +138,7 @@ continue for(var/mob/living/foaming in spread_turf) - foam_mob(foaming, delta_time) + foam_mob(foaming, seconds_per_tick) var/obj/effect/particle_effect/fluid/foam/spread_foam = new type(spread_turf, group, src) reagents.copy_to(spread_foam, (reagents.total_volume)) @@ -256,7 +256,7 @@ absorbed_plasma = 0 return deposit -/obj/effect/particle_effect/fluid/foam/firefighting/foam_mob(mob/living/foaming, delta_time) +/obj/effect/particle_effect/fluid/foam/firefighting/foam_mob(mob/living/foaming, seconds_per_tick) if(!istype(foaming)) return foaming.adjust_wet_stacks(2) diff --git a/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm b/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm index b95926aa7be..c2ba1568a06 100644 --- a/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm @@ -70,7 +70,7 @@ animate(src, time = frames, alpha = 0) -/obj/effect/particle_effect/fluid/smoke/spread(delta_time = 0.1 SECONDS) +/obj/effect/particle_effect/fluid/smoke/spread(seconds_per_tick = 0.1 SECONDS) if(group.total_size > group.target_size) return var/turf/t_loc = get_turf(src) @@ -83,7 +83,7 @@ if(locate(type) in spread_turf) continue // Don't spread smoke where there's already smoke! for(var/mob/living/smoker in spread_turf) - smoke_mob(smoker, delta_time) + smoke_mob(smoker, seconds_per_tick) var/obj/effect/particle_effect/fluid/smoke/spread_smoke = new type(spread_turf, group, src) reagents.copy_to(spread_smoke, reagents.total_volume) @@ -94,13 +94,13 @@ SSfoam.queue_spread(spread_smoke) -/obj/effect/particle_effect/fluid/smoke/process(delta_time) - lifetime -= delta_time SECONDS +/obj/effect/particle_effect/fluid/smoke/process(seconds_per_tick) + lifetime -= seconds_per_tick SECONDS if(lifetime <= 0) kill_smoke() return FALSE for(var/mob/living/smoker in loc) // In case smoke somehow winds up in a locker or something this should still behave sanely. - smoke_mob(smoker, delta_time) + smoke_mob(smoker, seconds_per_tick) return TRUE /** @@ -108,11 +108,11 @@ * * Arguments: * - [smoker][/mob/living/carbon]: The mob that is being exposed to this smoke. - * - delta_time: A scaling factor for the effects this has. Primarily based off of tick rate to normalize effects to units of rate/sec. + * - seconds_per_tick: A scaling factor for the effects this has. Primarily based off of tick rate to normalize effects to units of rate/sec. * * Returns whether the smoke effect was applied to the mob. */ -/obj/effect/particle_effect/fluid/smoke/proc/smoke_mob(mob/living/carbon/smoker, delta_time) +/obj/effect/particle_effect/fluid/smoke/proc/smoke_mob(mob/living/carbon/smoker, seconds_per_tick) if(!istype(smoker)) return FALSE if(lifetime < 1) @@ -344,7 +344,7 @@ color = "#9C3636" lifetime = 20 SECONDS -/obj/effect/particle_effect/fluid/smoke/sleeping/smoke_mob(mob/living/carbon/smoker, delta_time) +/obj/effect/particle_effect/fluid/smoke/sleeping/smoke_mob(mob/living/carbon/smoker, seconds_per_tick) if(..()) smoker.Sleeping(20 SECONDS) smoker.emote("cough") @@ -364,13 +364,13 @@ /obj/effect/particle_effect/fluid/smoke/chem lifetime = 20 SECONDS -/obj/effect/particle_effect/fluid/smoke/chem/process(delta_time) +/obj/effect/particle_effect/fluid/smoke/chem/process(seconds_per_tick) . = ..() if(!.) return var/turf/location = get_turf(src) - var/fraction = (delta_time SECONDS) / initial(lifetime) + var/fraction = (seconds_per_tick SECONDS) / initial(lifetime) for(var/atom/movable/thing as anything in location) if(thing == src) continue @@ -381,7 +381,7 @@ reagents.expose(location, TOUCH, fraction) return TRUE -/obj/effect/particle_effect/fluid/smoke/chem/smoke_mob(mob/living/carbon/smoker, delta_time) +/obj/effect/particle_effect/fluid/smoke/chem/smoke_mob(mob/living/carbon/smoker, seconds_per_tick) if(lifetime < 1) return FALSE if(!istype(smoker)) @@ -389,7 +389,7 @@ if(smoker.internal != null || smoker.has_smoke_protection()) return FALSE - var/fraction = (delta_time SECONDS) / initial(lifetime) + var/fraction = (seconds_per_tick SECONDS) / initial(lifetime) reagents.copy_to(smoker, reagents.total_volume, fraction) reagents.expose(smoker, INGEST, fraction) return TRUE diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 7af8f198533..cfa44095108 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -125,12 +125,12 @@ GLOBAL_VAR_INIT(glowshrooms, 0) * Causes glowshroom spreading across the floor/walls. */ -/obj/structure/glowshroom/process(delta_time) +/obj/structure/glowshroom/process(seconds_per_tick) if(COOLDOWN_FINISHED(src, spread_cooldown)) COOLDOWN_START(src, spread_cooldown, rand(min_delay_spread, max_delay_spread)) Spread() - Decay(rand(idle_decay_min, idle_decay_max) * delta_time) + Decay(rand(idle_decay_min, idle_decay_max) * seconds_per_tick) diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm index 6717d263bf0..f95b9f2e164 100644 --- a/code/game/objects/items/body_egg.dm +++ b/code/game/objects/items/body_egg.dm @@ -29,17 +29,17 @@ egg_owner.med_hud_set_status() INVOKE_ASYNC(src, PROC_REF(RemoveInfectionImages), egg_owner) -/obj/item/organ/internal/body_egg/on_death(delta_time, times_fired) +/obj/item/organ/internal/body_egg/on_death(seconds_per_tick, times_fired) . = ..() if(!owner) return - egg_process(delta_time, times_fired) + egg_process(seconds_per_tick, times_fired) -/obj/item/organ/internal/body_egg/on_life(delta_time, times_fired) +/obj/item/organ/internal/body_egg/on_life(seconds_per_tick, times_fired) . = ..() - egg_process(delta_time, times_fired) + egg_process(seconds_per_tick, times_fired) -/obj/item/organ/internal/body_egg/proc/egg_process(delta_time, times_fired) +/obj/item/organ/internal/body_egg/proc/egg_process(seconds_per_tick, times_fired) return /obj/item/organ/internal/body_egg/proc/RefreshInfectionImage() diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index fdd8aed1662..992a756fac6 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -1242,10 +1242,10 @@ else . += span_notice("The digital timer on the card has [time_left] seconds remaining. Don't do the crime if you can't do the time.") -/obj/item/card/id/advanced/prisoner/process(delta_time) +/obj/item/card/id/advanced/prisoner/process(seconds_per_tick) if(!timed) return - time_left -= delta_time + time_left -= seconds_per_tick if(time_left <= 0) say("Sentence time has been served. Thank you for your cooperation in our corporate rehabilitation program!") STOP_PROCESSING(SSobj, src) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 6bafc9319dc..4d20b58911c 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -30,8 +30,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/burnt = FALSE /// How long the match lasts in seconds -/obj/item/match/process(delta_time) - smoketime -= delta_time * (1 SECONDS) +/obj/item/match/process(seconds_per_tick) + smoketime -= seconds_per_tick * (1 SECONDS) if(smoketime <= 0) matchburnout() else @@ -343,7 +343,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!reagents.trans_to(smoker, to_smoke, methods = INGEST, ignore_stomach = TRUE)) reagents.remove_any(to_smoke) -/obj/item/clothing/mask/cigarette/process(delta_time) +/obj/item/clothing/mask/cigarette/process(seconds_per_tick) var/mob/living/user = isliving(loc) ? loc : null user?.ignite_mob() if(!reagents.has_reagent(/datum/reagent/oxygen)) //cigarettes need oxygen @@ -357,7 +357,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM location.pollute_turf(pollution_type, 5, POLLUTION_PASSIVE_EMITTER_CAP) // SKYRAT EDIT END - smoketime -= delta_time * (1 SECONDS) + smoketime -= seconds_per_tick * (1 SECONDS) if(smoketime <= 0) put_out(user) return @@ -1140,7 +1140,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!reagents.trans_to(vaper, REAGENTS_METABOLISM, methods = INGEST, ignore_stomach = TRUE)) reagents.remove_any(REAGENTS_METABOLISM) -/obj/item/clothing/mask/vape/process(delta_time) +/obj/item/clothing/mask/vape/process(seconds_per_tick) var/mob/living/M = loc if(isliving(loc)) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index fc36009a57c..7e5a0a89ece 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -359,9 +359,9 @@ inhand_icon_state = "[initial(inhand_icon_state)]" + (on ? "-on" : "") update_appearance() -/obj/item/flashlight/flare/process(delta_time) +/obj/item/flashlight/flare/process(seconds_per_tick) open_flame(heat) - fuel = max(fuel - delta_time * (1 SECONDS), 0) + fuel = max(fuel - seconds_per_tick * (1 SECONDS), 0) if(!fuel || !on) turn_off() @@ -441,7 +441,7 @@ turn_off() user.visible_message(span_notice("[user] snuffs [src].")) -/obj/item/flashlight/flare/candle/process(delta_time) +/obj/item/flashlight/flare/candle/process(seconds_per_tick) . = ..() update_appearance() @@ -524,8 +524,8 @@ STOP_PROCESSING(SSobj, src) . = ..() -/obj/item/flashlight/emp/process(delta_time) - charge_timer += delta_time +/obj/item/flashlight/emp/process(seconds_per_tick) + charge_timer += seconds_per_tick if(charge_timer < charge_delay) return FALSE charge_timer -= charge_delay @@ -592,8 +592,8 @@ STOP_PROCESSING(SSobj, src) return ..() -/obj/item/flashlight/glowstick/process(delta_time) - fuel = max(fuel - delta_time * (1 SECONDS), 0) +/obj/item/flashlight/glowstick/process(seconds_per_tick) + fuel = max(fuel - seconds_per_tick * (1 SECONDS), 0) if(fuel <= 0) turn_off() STOP_PROCESSING(SSobj, src) diff --git a/code/game/objects/items/devices/forcefieldprojector.dm b/code/game/objects/items/devices/forcefieldprojector.dm index f6a3a0f4e0d..ea192dec263 100644 --- a/code/game/objects/items/devices/forcefieldprojector.dm +++ b/code/game/objects/items/devices/forcefieldprojector.dm @@ -83,11 +83,11 @@ STOP_PROCESSING(SSobj, src) return ..() -/obj/item/forcefield_projector/process(delta_time) +/obj/item/forcefield_projector/process(seconds_per_tick) if(!LAZYLEN(current_fields)) - shield_integrity = min(shield_integrity + delta_time * 2, max_shield_integrity) + shield_integrity = min(shield_integrity + seconds_per_tick * 2, max_shield_integrity) else - shield_integrity = max(shield_integrity - LAZYLEN(current_fields) * delta_time * 0.5, 0) //fields degrade slowly over time + shield_integrity = max(shield_integrity - LAZYLEN(current_fields) * seconds_per_tick * 0.5, 0) //fields degrade slowly over time for(var/obj/structure/projected_forcefield/F in current_fields) if(shield_integrity <= 0 || get_dist(F,src) > field_distance_limit) qdel(F) diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index b757deb234f..8391ca3078b 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -194,11 +194,11 @@ targloc.flick_overlay_view(I, 10) icon_state = "pointer" -/obj/item/laser_pointer/process(delta_time) +/obj/item/laser_pointer/process(seconds_per_tick) if(!diode) recharging = FALSE return PROCESS_KILL - if(DT_PROB(10 + diode.rating*10 - recharge_locked*1, delta_time)) //t1 is 20, 2 40 + if(SPT_PROB(10 + diode.rating*10 - recharge_locked*1, seconds_per_tick)) //t1 is 20, 2 40 energy += 1 if(energy >= max_energy) energy = max_energy diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm index 8498813bf5e..b5cbb985570 100644 --- a/code/game/objects/items/devices/reverse_bear_trap.dm +++ b/code/game/objects/items/devices/reverse_bear_trap.dm @@ -39,7 +39,7 @@ STOP_PROCESSING(SSprocessing, src) return ..() -/obj/item/reverse_bear_trap/process(delta_time) +/obj/item/reverse_bear_trap/process(seconds_per_tick) if(!ticking) return soundloop2.mid_length = max(0.5, COOLDOWN_TIMELEFT(src, kill_countdown) - 5) //beepbeepbeepbeepbeep diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index d00abaa6319..36cc2bbcbd3 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -259,7 +259,7 @@ effective or pretty fucking useless. if(user && user.get_item_by_slot(ITEM_SLOT_BELT) != src) Deactivate() -/obj/item/shadowcloak/process(delta_time) +/obj/item/shadowcloak/process(seconds_per_tick) if(user.get_item_by_slot(ITEM_SLOT_BELT) != src) Deactivate() return @@ -269,10 +269,10 @@ effective or pretty fucking useless. var/lumcount = T.get_lumcount() if(lumcount > 0.3) - charge = max(0, charge - 12.5 * delta_time)//Quick decrease in light + charge = max(0, charge - 12.5 * seconds_per_tick)//Quick decrease in light else - charge = min(max_charge, charge + 25 * delta_time) //Charge in the dark + charge = min(max_charge, charge + 25 * seconds_per_tick) //Charge in the dark animate(user,alpha = clamp(255 - charge,0,255),time = 10) diff --git a/code/game/objects/items/food/burgers.dm b/code/game/objects/items/food/burgers.dm index 1cdd1c5adc6..764f1d40c3e 100644 --- a/code/game/objects/items/food/burgers.dm +++ b/code/game/objects/items/food/burgers.dm @@ -621,8 +621,8 @@ . = ..() START_PROCESSING(SSobj, src) -/obj/item/food/burger/crazy/process(delta_time) // DIT EES HORRIBLE - if(DT_PROB(2.5, delta_time)) +/obj/item/food/burger/crazy/process(seconds_per_tick) // DIT EES HORRIBLE + if(SPT_PROB(2.5, seconds_per_tick)) var/datum/effect_system/fluid_spread/smoke/bad/green/smoke = new smoke.set_up(0, holder = src, location = src) smoke.start() diff --git a/code/game/objects/items/grenades/festive.dm b/code/game/objects/items/grenades/festive.dm index 99c39759bbb..e9acdd6cfd6 100644 --- a/code/game/objects/items/grenades/festive.dm +++ b/code/game/objects/items/grenades/festive.dm @@ -39,8 +39,8 @@ playsound(src, 'sound/effects/fuse.ogg', 20, TRUE) update_appearance() -/obj/item/sparkler/process(delta_time) - burntime -= delta_time +/obj/item/sparkler/process(seconds_per_tick) + burntime -= seconds_per_tick if(burntime <= 0) new /obj/item/stack/rods(drop_location()) qdel(src) diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index a8a37dd107a..861d082a356 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -92,14 +92,14 @@ user.forceMove(get_turf(src)) user.visible_message(span_warning("[user] scrambles out of [src]!"), span_notice("You climb out of [src]!")) -/obj/item/his_grace/process(delta_time) +/obj/item/his_grace/process(seconds_per_tick) if(!bloodthirst) drowse() return if(bloodthirst < HIS_GRACE_CONSUME_OWNER && !ascended) - adjust_bloodthirst((1 + FLOOR(LAZYLEN(contents) * 0.5, 1)) * delta_time) //Maybe adjust this? + adjust_bloodthirst((1 + FLOOR(LAZYLEN(contents) * 0.5, 1)) * seconds_per_tick) //Maybe adjust this? else - adjust_bloodthirst(1 * delta_time) //don't cool off rapidly once we're at the point where His Grace consumes all. + adjust_bloodthirst(1 * seconds_per_tick) //don't cool off rapidly once we're at the point where His Grace consumes all. var/mob/living/master = get_atom_on_turf(src, /mob/living) if(istype(master) && (src in master.held_items)) switch(bloodthirst) diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index 56744de8d51..1c8899bf9a7 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -80,7 +80,7 @@ user.visible_message(span_suicide("[user] is [pick("slitting [user.p_their()] stomach open with", "falling on")] [src]! It looks like [user.p_theyre()] trying to commit seppuku!")) return (BRUTELOSS|FIRELOSS) -/obj/item/melee/energy/process(delta_time) +/obj/item/melee/energy/process(seconds_per_tick) if(heat) open_flame() diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm index 62d7b63c547..a0f14535c9f 100644 --- a/code/game/objects/items/mop.dm +++ b/code/game/objects/items/mop.dm @@ -93,8 +93,8 @@ to_chat(user, span_notice("You set the condenser switch to the '[refill_enabled ? "ON" : "OFF"]' position.")) playsound(user, 'sound/machines/click.ogg', 30, TRUE) -/obj/item/mop/advanced/process(delta_time) - var/amadd = min(max_reagent_volume - reagents.total_volume, refill_rate * delta_time) +/obj/item/mop/advanced/process(seconds_per_tick) + var/amadd = min(max_reagent_volume - reagents.total_volume, refill_rate * seconds_per_tick) if(amadd > 0) reagents.add_reagent(refill_reagent, amadd) diff --git a/code/game/objects/items/robot/items/hypo.dm b/code/game/objects/items/robot/items/hypo.dm index e08c5e73563..6d65c8d4cac 100644 --- a/code/game/objects/items/robot/items/hypo.dm +++ b/code/game/objects/items/robot/items/hypo.dm @@ -130,8 +130,8 @@ return ..() /// Every [recharge_time] seconds, recharge some reagents for the cyborg -/obj/item/reagent_containers/borghypo/process(delta_time) - charge_timer += delta_time +/obj/item/reagent_containers/borghypo/process(seconds_per_tick) + charge_timer += seconds_per_tick if(charge_timer >= recharge_time) regenerate_reagents(default_reagent_types) if(upgraded) diff --git a/code/game/objects/items/robot/items/tools.dm b/code/game/objects/items/robot/items/tools.dm index 1f3f2089c57..e888cd43087 100644 --- a/code/game/objects/items/robot/items/tools.dm +++ b/code/game/objects/items/robot/items/tools.dm @@ -132,32 +132,32 @@ deactivate_field() return ..() -/obj/item/borg/projectile_dampen/process(delta_time) - process_recharge(delta_time) - process_usage(delta_time) +/obj/item/borg/projectile_dampen/process(seconds_per_tick) + process_recharge(seconds_per_tick) + process_usage(seconds_per_tick) -/obj/item/borg/projectile_dampen/proc/process_usage(delta_time) +/obj/item/borg/projectile_dampen/proc/process_usage(seconds_per_tick) var/usage = 0 for(var/obj/projectile/inner_projectile as anything in tracked) if(!inner_projectile.is_hostile_projectile()) continue - usage += projectile_tick_speed_ecost * delta_time - usage += tracked[inner_projectile] * projectile_damage_tick_ecost_coefficient * delta_time + usage += projectile_tick_speed_ecost * seconds_per_tick + usage += tracked[inner_projectile] * projectile_damage_tick_ecost_coefficient * seconds_per_tick energy = clamp(energy - usage, 0, maxenergy) if(energy <= 0) deactivate_field() visible_message(span_warning("[src] blinks \"ENERGY DEPLETED\".")) -/obj/item/borg/projectile_dampen/proc/process_recharge(delta_time) +/obj/item/borg/projectile_dampen/proc/process_recharge(seconds_per_tick) if(!istype(host)) if(iscyborg(host.loc)) host = host.loc else - energy = clamp(energy + energy_recharge * delta_time, 0, maxenergy) + energy = clamp(energy + energy_recharge * seconds_per_tick, 0, maxenergy) return if(host.cell && (host.cell.charge >= (host.cell.maxcharge * cyborg_cell_critical_percentage)) && (energy < maxenergy)) - host.cell.use(energy_recharge * delta_time * energy_recharge_cyborg_drain_coefficient) - energy += energy_recharge * delta_time + host.cell.use(energy_recharge * seconds_per_tick * energy_recharge_cyborg_drain_coefficient) + energy += energy_recharge * seconds_per_tick /obj/item/borg/projectile_dampen/proc/dampen_projectile(datum/source, obj/projectile/projectile) SIGNAL_HANDLER diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm index fe87009242d..a6890d621b7 100644 --- a/code/game/objects/items/storage/medkit.dm +++ b/code/game/objects/items/storage/medkit.dm @@ -601,7 +601,7 @@ create_reagents(100, TRANSPARENT) START_PROCESSING(SSobj, src) -/obj/item/storage/organbox/process(delta_time) +/obj/item/storage/organbox/process(seconds_per_tick) ///if there is enough coolant var var/using_coolant = coolant_to_spend() if (isnull(using_coolant)) @@ -612,7 +612,7 @@ stored.unfreeze() return - var/amount_used = 0.05 * delta_time + var/amount_used = 0.05 * seconds_per_tick if (using_coolant != /datum/reagent/cryostylane) amount_used *= 2 reagents.remove_reagent(using_coolant, amount_used) diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index 7b768070209..40eb55dbee7 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -273,13 +273,13 @@ return remove_air(moles_needed) -/obj/item/tank/process(delta_time) +/obj/item/tank/process(seconds_per_tick) if(!air_contents) return //Allow for reactions excited = (excited | air_contents.react(src)) - excited = (excited | handle_tolerances(delta_time)) + excited = (excited | handle_tolerances(seconds_per_tick)) excited = (excited | leaking) if(!excited) @@ -299,9 +299,9 @@ * * Returns true if it did anything of significance, false otherwise * Arguments: - * - delta_time: How long has passed between ticks. + * - seconds_per_tick: How long has passed between ticks. */ -/obj/item/tank/proc/handle_tolerances(delta_time) +/obj/item/tank/proc/handle_tolerances(seconds_per_tick) if(!air_contents) return FALSE @@ -309,13 +309,13 @@ var/temperature = air_contents.return_temperature() if(temperature >= TANK_MELT_TEMPERATURE) var/temperature_damage_ratio = (temperature - TANK_MELT_TEMPERATURE) / temperature - take_damage(max_integrity * temperature_damage_ratio * delta_time, BURN, FIRE, FALSE, NONE) + take_damage(max_integrity * temperature_damage_ratio * seconds_per_tick, BURN, FIRE, FALSE, NONE) if(QDELETED(src)) return TRUE if(pressure >= TANK_LEAK_PRESSURE) var/pressure_damage_ratio = (pressure - TANK_LEAK_PRESSURE) / (TANK_RUPTURE_PRESSURE - TANK_LEAK_PRESSURE) - take_damage(max_integrity * pressure_damage_ratio * delta_time, BRUTE, BOMB, FALSE, NONE) + take_damage(max_integrity * pressure_damage_ratio * seconds_per_tick, BRUTE, BOMB, FALSE, NONE) return TRUE return FALSE diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm index c388aa0095f..e2ddc23dcf5 100644 --- a/code/game/objects/items/tanks/watertank.dm +++ b/code/game/objects/items/tanks/watertank.dm @@ -453,7 +453,7 @@ if(ismob(loc)) to_chat(loc, span_notice("[src] turns off.")) -/obj/item/reagent_containers/chemtank/process(delta_time) +/obj/item/reagent_containers/chemtank/process(seconds_per_tick) if(!ishuman(loc)) turn_off() return @@ -465,7 +465,7 @@ turn_off() return - var/inj_am = injection_amount * delta_time + var/inj_am = injection_amount * seconds_per_tick var/used_amount = inj_am / usage_ratio reagents.trans_to(user, used_amount, multiplier=usage_ratio, methods = INJECT) update_appearance() diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index 21cb9326920..514fb18fa22 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -362,8 +362,8 @@ attempt_teleport(user = user, triggered_by_emp = FALSE) return TRUE -/obj/item/syndicate_teleporter/process(delta_time, times_fired) - if(DT_PROB(10, delta_time) && charges < max_charges) +/obj/item/syndicate_teleporter/process(seconds_per_tick, times_fired) + if(SPT_PROB(10, seconds_per_tick) && charges < max_charges) charges++ if(ishuman(loc)) var/mob/living/carbon/human/holder = loc diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 94ce606a817..a87b6d34fcd 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -84,11 +84,11 @@ . += "[initial(icon_state)]-on" -/obj/item/weldingtool/process(delta_time) +/obj/item/weldingtool/process(seconds_per_tick) if(welding) force = 15 damtype = BURN - burned_fuel_for += delta_time + burned_fuel_for += seconds_per_tick if(burned_fuel_for >= WELDER_FUEL_BURN_INTERVAL) use(TRUE) SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD) //SKYRAT EDIT ADDITION diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm index 4c79b5f88b5..9de1ff76362 100644 --- a/code/game/objects/structures/bonfire.dm +++ b/code/game/objects/structures/bonfire.dm @@ -135,26 +135,26 @@ start_burning() visible_message(span_notice("[entered]'s fire spreads to [src], setting it ablaze!")) -/obj/structure/bonfire/proc/bonfire_burn(delta_time = 2) +/obj/structure/bonfire/proc/bonfire_burn(seconds_per_tick = 2) var/turf/current_location = get_turf(src) if(!grill) - current_location.hotspot_expose(1000, 250 * delta_time, 1) + current_location.hotspot_expose(1000, 250 * seconds_per_tick, 1) for(var/burn_target in current_location) if(burn_target == src) continue else if(isliving(burn_target)) var/mob/living/burn_victim = burn_target - burn_victim.adjust_fire_stacks(BONFIRE_FIRE_STACK_STRENGTH * 0.5 * delta_time) + burn_victim.adjust_fire_stacks(BONFIRE_FIRE_STACK_STRENGTH * 0.5 * seconds_per_tick) burn_victim.ignite_mob() else if(isobj(burn_target)) var/obj/burned_object = burn_target if(grill && isitem(burned_object)) var/obj/item/grilled_item = burned_object - SEND_SIGNAL(grilled_item, COMSIG_ITEM_GRILL_PROCESS, src, delta_time) //Not a big fan, maybe make this use fire_act() in the future. + SEND_SIGNAL(grilled_item, COMSIG_ITEM_GRILL_PROCESS, src, seconds_per_tick) //Not a big fan, maybe make this use fire_act() in the future. continue - burned_object.fire_act(1000, 250 * delta_time) + burned_object.fire_act(1000, 250 * seconds_per_tick) -/obj/structure/bonfire/process(delta_time) +/obj/structure/bonfire/process(seconds_per_tick) if(!check_oxygen()) extinguish() return @@ -163,7 +163,7 @@ if(istype(my_turf) && !my_turf.planetary_atmos && !is_centcom_level(my_turf.z)) //Pollute, but only when we're not on planetary atmos or on CentCom my_turf.pollute_turf_list(list(/datum/pollutant/smoke = 15, /datum/pollutant/carbon_air_pollution = 5), POLLUTION_ACTIVE_EMITTER_CAP) //SKYRAT EDIT END - bonfire_burn(delta_time) + bonfire_burn(seconds_per_tick) /obj/structure/bonfire/extinguish() if(burning) diff --git a/code/game/objects/structures/fireplace.dm b/code/game/objects/structures/fireplace.dm index 5d6222865ad..0e7e4f8bd71 100644 --- a/code/game/objects/structures/fireplace.dm +++ b/code/game/objects/structures/fireplace.dm @@ -104,7 +104,7 @@ if(80000 to MAXIMUM_BURN_TIMER) //SKYRAT EDIT original: if(2000 to MAXIMUM_BURN_TIMER) set_light(6) -/obj/structure/fireplace/process(delta_time) +/obj/structure/fireplace/process(seconds_per_tick) if(!lit) return if(world.time > flame_expiry_timer) @@ -113,7 +113,7 @@ playsound(src, 'sound/effects/comfyfire.ogg',50,FALSE, FALSE, TRUE) var/turf/T = get_turf(src) - T.hotspot_expose(700, 2.5 * delta_time) + T.hotspot_expose(700, 2.5 * seconds_per_tick) update_appearance() adjust_light() diff --git a/code/game/objects/structures/petrified_statue.dm b/code/game/objects/structures/petrified_statue.dm index fa724474f30..e3a271e18db 100644 --- a/code/game/objects/structures/petrified_statue.dm +++ b/code/game/objects/structures/petrified_statue.dm @@ -25,10 +25,10 @@ max_integrity = atom_integrity START_PROCESSING(SSobj, src) -/obj/structure/statue/petrified/process(delta_time) +/obj/structure/statue/petrified/process(seconds_per_tick) if(!petrified_mob) STOP_PROCESSING(SSobj, src) - timer -= delta_time + timer -= seconds_per_tick petrified_mob.Stun(40) //So they can't do anything while petrified if(timer <= 0) STOP_PROCESSING(SSobj, src) diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index 36cf270349a..7eb11fe4509 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -289,7 +289,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) return TRUE -/obj/machinery/shower/process(delta_time) +/obj/machinery/shower/process(seconds_per_tick) // the TIMED mode cutoff feature. User has to manually reactivate. if(intended_on && mode == SHOWER_MODE_TIMED && COOLDOWN_FINISHED(src, timed_cooldown)) // the TIMED mode cutoff feature. User has to manually reactivate. @@ -309,7 +309,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) // Reclaim water if(!actually_on) if(has_water_reclaimer && reagents.total_volume < reagents.maximum_volume) - reagents.add_reagent(reagent_id, refill_rate * delta_time) + reagents.add_reagent(reagent_id, refill_rate * seconds_per_tick) return 0 // FOREVER mode stays processing so it can cycle back on. diff --git a/code/game/objects/structures/spawner.dm b/code/game/objects/structures/spawner.dm index f5c388e9821..e54b0ef5a16 100644 --- a/code/game/objects/structures/spawner.dm +++ b/code/game/objects/structures/spawner.dm @@ -125,11 +125,11 @@ span_userdanger("Touching the portal, you are quickly pulled through into a world of unimaginable horror!")) contents.Add(user) -/obj/structure/spawner/nether/process(delta_time) +/obj/structure/spawner/nether/process(seconds_per_tick) for(var/mob/living/living_mob in contents) if(living_mob) playsound(src, 'sound/magic/demon_consume.ogg', 50, TRUE) - living_mob.adjustBruteLoss(60 * delta_time) + living_mob.adjustBruteLoss(60 * seconds_per_tick) new /obj/effect/gibspawner/generic(get_turf(living_mob), living_mob) if(living_mob.stat == DEAD) var/mob/living/basic/blankbody/newmob = new(loc) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 96978464d8f..74c35649f25 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -497,12 +497,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14)) new /obj/item/stock_parts/water_recycler(drop_location()) ..() -/obj/structure/sink/process(delta_time) +/obj/structure/sink/process(seconds_per_tick) // Water reclamation complete? if(!has_water_reclaimer || reagents.total_volume >= reagents.maximum_volume) return PROCESS_KILL - reagents.add_reagent(dispensedreagent, reclaim_rate * delta_time) + reagents.add_reagent(dispensedreagent, reclaim_rate * seconds_per_tick) /obj/structure/sink/proc/drop_materials() if(buildstacktype) diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm index 55863fc9f7e..7b0672f9fd0 100644 --- a/code/game/turfs/open/lava.dm +++ b/code/game/turfs/open/lava.dm @@ -144,8 +144,8 @@ if(burn_stuff(AM)) START_PROCESSING(SSobj, src) -/turf/open/lava/process(delta_time) - if(!burn_stuff(null, delta_time)) +/turf/open/lava/process(seconds_per_tick) + if(!burn_stuff(null, seconds_per_tick)) STOP_PROCESSING(SSobj, src) /turf/open/lava/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) @@ -231,7 +231,7 @@ #define LAVA_BE_BURNING 2 ///Proc that sets on fire something or everything on the turf that's not immune to lava. Returns TRUE to make the turf start processing. -/turf/open/lava/proc/burn_stuff(atom/movable/to_burn, delta_time = 1) +/turf/open/lava/proc/burn_stuff(atom/movable/to_burn, seconds_per_tick = 1) if(is_safe()) return FALSE @@ -243,7 +243,7 @@ if(LAVA_BE_IGNORING) continue if(LAVA_BE_BURNING) - if(!do_burn(burn_target, delta_time)) + if(!do_burn(burn_target, seconds_per_tick)) continue . = TRUE @@ -289,7 +289,7 @@ #undef LAVA_BE_PROCESSING #undef LAVA_BE_BURNING -/turf/open/lava/proc/do_burn(atom/movable/burn_target, delta_time = 1) +/turf/open/lava/proc/do_burn(atom/movable/burn_target, seconds_per_tick = 1) . = TRUE if(isobj(burn_target)) var/obj/burn_obj = burn_target @@ -301,7 +301,7 @@ burn_obj.resistance_flags &= ~FIRE_PROOF if(burn_obj.get_armor_rating(FIRE) > 50) //obj with 100% fire armor still get slowly burned away. burn_obj.set_armor_rating(FIRE, 50) - burn_obj.fire_act(temperature_damage, 1000 * delta_time) + burn_obj.fire_act(temperature_damage, 1000 * seconds_per_tick) if(istype(burn_obj, /obj/structure/closet)) var/obj/structure/closet/burn_closet = burn_obj for(var/burn_content in burn_closet.contents) @@ -312,9 +312,9 @@ ADD_TRAIT(burn_living, TRAIT_PERMANENTLY_ONFIRE, TURF_TRAIT) burn_living.update_fire() - burn_living.adjustFireLoss(lava_damage * delta_time) + burn_living.adjustFireLoss(lava_damage * seconds_per_tick) if(!QDELETED(burn_living)) //mobs turning into object corpses could get deleted here. - burn_living.adjust_fire_stacks(lava_firestacks * delta_time) + burn_living.adjust_fire_stacks(lava_firestacks * seconds_per_tick) burn_living.ignite_mob() /turf/open/lava/smooth @@ -364,7 +364,7 @@ return user.visible_message(span_notice("[user] scoops some plasma from the [src] with [I]."), span_notice("You scoop out some plasma from the [src] using [I].")) -/turf/open/lava/plasma/do_burn(atom/movable/burn_target, delta_time = 1) +/turf/open/lava/plasma/do_burn(atom/movable/burn_target, seconds_per_tick = 1) . = TRUE if(isobj(burn_target)) return FALSE // Does nothing against objects. Old code. @@ -375,7 +375,7 @@ return burn_living.adjust_fire_stacks(20) //dipping into a stream of plasma would probably make you more flammable than usual burn_living.adjust_bodytemperature(-rand(50,65)) //its cold, man - if(!ishuman(burn_living) || DT_PROB(65, delta_time)) + if(!ishuman(burn_living) || SPT_PROB(65, seconds_per_tick)) return var/mob/living/carbon/human/burn_human = burn_living var/datum/species/burn_species = burn_human.dna.species diff --git a/code/modules/NTNet/relays.dm b/code/modules/NTNet/relays.dm index bb6b8b11815..a00d9c5d1b4 100644 --- a/code/modules/NTNet/relays.dm +++ b/code/modules/NTNet/relays.dm @@ -68,13 +68,13 @@ GLOBAL_LIST_EMPTY(ntnet_relays) icon_state = "bus[is_operational ? null : "_off"]" return ..() -/obj/machinery/ntnet_relay/process(delta_time) +/obj/machinery/ntnet_relay/process(seconds_per_tick) update_use_power(is_operational ? ACTIVE_POWER_USE : IDLE_POWER_USE) update_appearance() if(dos_overload > 0) - dos_overload = max(0, dos_overload - dos_dissipate * delta_time) + dos_overload = max(0, dos_overload - dos_dissipate * seconds_per_tick) // If DoS traffic exceeded capacity, crash. if((dos_overload > dos_capacity) && !dos_failure) diff --git a/code/modules/antagonists/_common/antag_hud.dm b/code/modules/antagonists/_common/antag_hud.dm index 9fcca9388db..228bfc354df 100644 --- a/code/modules/antagonists/_common/antag_hud.dm +++ b/code/modules/antagonists/_common/antag_hud.dm @@ -52,7 +52,7 @@ GLOBAL_LIST_EMPTY_TYPED(has_antagonist_huds, /datum/atom_hud/alternate_appearanc /datum/atom_hud/alternate_appearance/basic/antagonist_hud/mobShouldSee(mob/mob) return Master.current_runlevel >= RUNLEVEL_POSTGAME || (mob.client?.combo_hud_enabled && !isnull(mob.client?.holder)) -/datum/atom_hud/alternate_appearance/basic/antagonist_hud/process(delta_time) +/datum/atom_hud/alternate_appearance/basic/antagonist_hud/process(seconds_per_tick) index += 1 update_icon() diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm index 6ef439eba29..60c536802ac 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm @@ -134,8 +134,8 @@ combat_cooldown = 0 START_PROCESSING(SSobj, src) -/obj/item/clothing/suit/armor/abductor/vest/process(delta_time) - combat_cooldown += delta_time +/obj/item/clothing/suit/armor/abductor/vest/process(seconds_per_tick) + combat_cooldown += seconds_per_tick if(combat_cooldown >= initial(combat_cooldown)) STOP_PROCESSING(SSobj, src) @@ -861,13 +861,13 @@ Congratulations! You are now trained for invasive xenobiology research!"} START_PROCESSING(SSobj, src) to_chat(AM, span_danger("You feel a series of tiny pricks!")) -/obj/structure/table/optable/abductor/process(delta_time) +/obj/structure/table/optable/abductor/process(seconds_per_tick) . = PROCESS_KILL for(var/mob/living/carbon/C in get_turf(src)) . = TRUE for(var/chemical in injected_reagents) - if(C.reagents.get_reagent_amount(chemical) < inject_am * delta_time) - C.reagents.add_reagent(chemical, inject_am * delta_time) + if(C.reagents.get_reagent_amount(chemical) < inject_am * seconds_per_tick) + C.reagents.add_reagent(chemical, inject_am * seconds_per_tick) /obj/structure/table/optable/abductor/Destroy() STOP_PROCESSING(SSobj, src) diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm index ca279dbb2d0..056e72fc1a0 100644 --- a/code/modules/antagonists/abductor/equipment/gland.dm +++ b/code/modules/antagonists/abductor/equipment/gland.dm @@ -102,7 +102,7 @@ hud.add_atom_to_hud(gland_owner) update_gland_hud() -/obj/item/organ/internal/heart/gland/on_life(delta_time, times_fired) +/obj/item/organ/internal/heart/gland/on_life(seconds_per_tick, times_fired) if(!beating) // alien glands are immune to stopping. beating = TRUE diff --git a/code/modules/antagonists/blob/blobstrains/cryogenic_poison.dm b/code/modules/antagonists/blob/blobstrains/cryogenic_poison.dm index c3945fa83a4..a20ddf89805 100644 --- a/code/modules/antagonists/blob/blobstrains/cryogenic_poison.dm +++ b/code/modules/antagonists/blob/blobstrains/cryogenic_poison.dm @@ -25,9 +25,9 @@ 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, delta_time, times_fired) - exposed_mob.adjustBruteLoss(0.5 * REM * delta_time, FALSE) - exposed_mob.adjustFireLoss(0.5 * REM * delta_time, FALSE) - exposed_mob.adjustToxLoss(0.5 * REM * delta_time, FALSE) +/datum/reagent/blob/cryogenic_poison/on_mob_life(mob/living/carbon/exposed_mob, seconds_per_tick, times_fired) + exposed_mob.adjustBruteLoss(0.5 * REM * seconds_per_tick, FALSE) + exposed_mob.adjustFireLoss(0.5 * REM * seconds_per_tick, FALSE) + exposed_mob.adjustToxLoss(0.5 * REM * seconds_per_tick, FALSE) . = 1 ..() diff --git a/code/modules/antagonists/blob/blobstrains/regenerative_materia.dm b/code/modules/antagonists/blob/blobstrains/regenerative_materia.dm index 461791666ea..78b67dae650 100644 --- a/code/modules/antagonists/blob/blobstrains/regenerative_materia.dm +++ b/code/modules/antagonists/blob/blobstrains/regenerative_materia.dm @@ -24,8 +24,8 @@ 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, delta_time, times_fired) - metabolizer.adjustToxLoss(1 * REM * delta_time) +/datum/reagent/blob/regenerative_materia/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick, times_fired) + metabolizer.adjustToxLoss(1 * REM * seconds_per_tick) ..() return TRUE diff --git a/code/modules/antagonists/blob/structures/_blob.dm b/code/modules/antagonists/blob/structures/_blob.dm index b9f0337b295..e4a691395be 100644 --- a/code/modules/antagonists/blob/structures/_blob.dm +++ b/code/modules/antagonists/blob/structures/_blob.dm @@ -411,14 +411,14 @@ /// Range this blob free upgrades to reflector blobs at: for the core, and for strains var/reflector_reinforce_range = 0 -/obj/structure/blob/special/proc/reinforce_area(delta_time) // Used by cores and nodes to upgrade their surroundings +/obj/structure/blob/special/proc/reinforce_area(seconds_per_tick) // Used by cores and nodes to upgrade their surroundings if(strong_reinforce_range) for(var/obj/structure/blob/normal/B in range(strong_reinforce_range, src)) - if(DT_PROB(BLOB_REINFORCE_CHANCE, delta_time)) + if(SPT_PROB(BLOB_REINFORCE_CHANCE, seconds_per_tick)) B.change_to(/obj/structure/blob/shield/core, overmind) if(reflector_reinforce_range) for(var/obj/structure/blob/shield/B in range(reflector_reinforce_range, src)) - if(DT_PROB(BLOB_REINFORCE_CHANCE, delta_time)) + if(SPT_PROB(BLOB_REINFORCE_CHANCE, seconds_per_tick)) B.change_to(/obj/structure/blob/shield/reflective/core, overmind) /obj/structure/blob/special/proc/pulse_area(mob/camera/blob/pulsing_overmind, claim_range = 10, pulse_range = 3, expand_range = 2) diff --git a/code/modules/antagonists/blob/structures/core.dm b/code/modules/antagonists/blob/structures/core.dm index e6f27779fbf..2f62ca42785 100644 --- a/code/modules/antagonists/blob/structures/core.dm +++ b/code/modules/antagonists/blob/structures/core.dm @@ -68,7 +68,7 @@ if(overmind) //we should have an overmind, but... overmind.update_health_hud() -/obj/structure/blob/special/core/process(delta_time) +/obj/structure/blob/special/core/process(seconds_per_tick) if(QDELETED(src)) return if(!overmind) @@ -77,7 +77,7 @@ overmind.blobstrain.core_process() overmind.update_health_hud() pulse_area(overmind, claim_range, pulse_range, expand_range) - reinforce_area(delta_time) + reinforce_area(seconds_per_tick) produce_spores() ..() diff --git a/code/modules/antagonists/blob/structures/node.dm b/code/modules/antagonists/blob/structures/node.dm index 9ff56db85e0..aac3f3a4a8e 100644 --- a/code/modules/antagonists/blob/structures/node.dm +++ b/code/modules/antagonists/blob/structures/node.dm @@ -53,8 +53,8 @@ overmind.node_blobs -= src return ..() -/obj/structure/blob/special/node/process(delta_time) +/obj/structure/blob/special/node/process(seconds_per_tick) if(overmind) pulse_area(overmind, claim_range, pulse_range, expand_range) - reinforce_area(delta_time) + reinforce_area(seconds_per_tick) produce_spores() diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index f00f5b14ef4..89b4ffb5266 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -281,16 +281,16 @@ * Signal proc for [COMSIG_LIVING_LIFE]. * Handles regenerating chemicals on life ticks. */ -/datum/antagonist/changeling/proc/on_life(datum/source, delta_time, times_fired) +/datum/antagonist/changeling/proc/on_life(datum/source, seconds_per_tick, times_fired) SIGNAL_HANDLER // If dead, we only regenerate up to half chem storage. if(owner.current.stat == DEAD) - adjust_chemicals((chem_recharge_rate - chem_recharge_slowdown) * delta_time, total_chem_storage * 0.5) + adjust_chemicals((chem_recharge_rate - chem_recharge_slowdown) * seconds_per_tick, total_chem_storage * 0.5) // If we're not dead - we go up to the full chem cap. else - adjust_chemicals((chem_recharge_rate - chem_recharge_slowdown) * delta_time) + adjust_chemicals((chem_recharge_rate - chem_recharge_slowdown) * seconds_per_tick) /** * Signal proc for [COMSIG_LIVING_POST_FULLY_HEAL], getting admin-healed restores our chemicals. diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 02ad54eaa0f..cc2834551bf 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -528,10 +528,10 @@ /obj/item/clothing/suit/space/changeling/toggle_spacesuit_cell(mob/user) return -/obj/item/clothing/suit/space/changeling/process(delta_time) +/obj/item/clothing/suit/space/changeling/process(seconds_per_tick) if(ishuman(loc)) var/mob/living/carbon/human/H = loc - H.reagents.add_reagent(/datum/reagent/medicine/salbutamol, REAGENTS_METABOLISM * (delta_time / SSMOBS_DT)) + H.reagents.add_reagent(/datum/reagent/medicine/salbutamol, REAGENTS_METABOLISM * (seconds_per_tick / SSMOBS_DT)) H.adjust_bodytemperature(temperature_setting - H.bodytemperature) // force changelings to normal temp step mode played badly /obj/item/clothing/head/helmet/space/changeling diff --git a/code/modules/antagonists/clown_ops/clown_weapons.dm b/code/modules/antagonists/clown_ops/clown_weapons.dm index 442fd4d7903..c1f6c030d20 100644 --- a/code/modules/antagonists/clown_ops/clown_weapons.dm +++ b/code/modules/antagonists/clown_ops/clown_weapons.dm @@ -69,11 +69,11 @@ bananium.insert_amount_mat(BANANA_SHOES_MAX_CHARGE, /datum/material/bananium) START_PROCESSING(SSobj, src) -/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/process(delta_time) +/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/process(seconds_per_tick) var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container) var/bananium_amount = bananium.get_material_amount(/datum/material/bananium) if(bananium_amount < BANANA_SHOES_MAX_CHARGE) - bananium.insert_amount_mat(min(BANANA_SHOES_RECHARGE_RATE * delta_time, BANANA_SHOES_MAX_CHARGE - bananium_amount), /datum/material/bananium) + bananium.insert_amount_mat(min(BANANA_SHOES_RECHARGE_RATE * seconds_per_tick, BANANA_SHOES_MAX_CHARGE - bananium_amount), /datum/material/bananium) /obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/attack_self(mob/user) ui_action_click(user) diff --git a/code/modules/antagonists/heretic/items/madness_mask.dm b/code/modules/antagonists/heretic/items/madness_mask.dm index e72e9ccd782..fe80465bfd0 100644 --- a/code/modules/antagonists/heretic/items/madness_mask.dm +++ b/code/modules/antagonists/heretic/items/madness_mask.dm @@ -45,7 +45,7 @@ REMOVE_TRAIT(src, TRAIT_NODROP, CLOTHING_TRAIT) return ..() -/obj/item/clothing/mask/madness_mask/process(delta_time) +/obj/item/clothing/mask/madness_mask/process(seconds_per_tick) if(!local_user) return PROCESS_KILL @@ -56,17 +56,17 @@ if(IS_HERETIC_OR_MONSTER(human_in_range) || human_in_range.is_blind()) continue - human_in_range.mob_mood.direct_sanity_drain(rand(-2, -20) * delta_time) + human_in_range.mob_mood.direct_sanity_drain(rand(-2, -20) * seconds_per_tick) - if(DT_PROB(60, delta_time)) + if(SPT_PROB(60, seconds_per_tick)) human_in_range.adjust_hallucinations_up_to(10 SECONDS, 240 SECONDS) - if(DT_PROB(40, delta_time)) + if(SPT_PROB(40, seconds_per_tick)) human_in_range.set_jitter_if_lower(10 SECONDS) - if(human_in_range.getStaminaLoss() <= 85 && DT_PROB(30, delta_time)) + if(human_in_range.getStaminaLoss() <= 85 && SPT_PROB(30, seconds_per_tick)) human_in_range.emote(pick("giggle", "laugh")) human_in_range.adjustStaminaLoss(10) - if(DT_PROB(25, delta_time)) + if(SPT_PROB(25, seconds_per_tick)) human_in_range.set_dizzy_if_lower(10 SECONDS) diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm index 8b21ae7db74..9c981e5bebf 100644 --- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm @@ -117,7 +117,7 @@ * Gradually heals the heretic ([source]) on rust, * including baton knockdown and stamina damage. */ -/datum/heretic_knowledge/rust_regen/proc/on_life(mob/living/source, delta_time, times_fired) +/datum/heretic_knowledge/rust_regen/proc/on_life(mob/living/source, seconds_per_tick, times_fired) SIGNAL_HANDLER var/turf/our_turf = get_turf(source) @@ -134,7 +134,7 @@ source.AdjustAllImmobility(-0.5 SECONDS) // Heals blood loss if(source.blood_volume < BLOOD_VOLUME_NORMAL) - source.blood_volume += 2.5 * delta_time + source.blood_volume += 2.5 * seconds_per_tick /datum/heretic_knowledge/mark/rust_mark name = "Mark of Rust" @@ -284,7 +284,7 @@ * * Gradually heals the heretic ([source]) on rust. */ -/datum/heretic_knowledge/ultimate/rust_final/proc/on_life(mob/living/source, delta_time, times_fired) +/datum/heretic_knowledge/ultimate/rust_final/proc/on_life(mob/living/source, seconds_per_tick, times_fired) SIGNAL_HANDLER var/turf/our_turf = get_turf(source) @@ -335,8 +335,8 @@ STOP_PROCESSING(SSprocessing, src) return ..() -/datum/rust_spread/process(delta_time) - var/spread_amount = round(spread_per_sec * delta_time) +/datum/rust_spread/process(seconds_per_tick) + var/spread_amount = round(spread_per_sec * seconds_per_tick) if(length(edge_turfs) < spread_amount) compile_turfs() diff --git a/code/modules/antagonists/heretic/knowledge/void_lore.dm b/code/modules/antagonists/heretic/knowledge/void_lore.dm index 93caff1872b..57db8636818 100644 --- a/code/modules/antagonists/heretic/knowledge/void_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/void_lore.dm @@ -221,7 +221,7 @@ * * Also starts storms in any area that doesn't have one. */ -/datum/heretic_knowledge/ultimate/void_final/proc/on_life(mob/living/source, delta_time, times_fired) +/datum/heretic_knowledge/ultimate/void_final/proc/on_life(mob/living/source, seconds_per_tick, times_fired) SIGNAL_HANDLER for(var/mob/living/carbon/close_carbon in view(5, source)) diff --git a/code/modules/antagonists/heretic/magic/ash_ascension.dm b/code/modules/antagonists/heretic/magic/ash_ascension.dm index 2615e332a72..0de92c49c22 100644 --- a/code/modules/antagonists/heretic/magic/ash_ascension.dm +++ b/code/modules/antagonists/heretic/magic/ash_ascension.dm @@ -44,7 +44,7 @@ src.ring_radius = radius return ..() -/datum/status_effect/fire_ring/tick(delta_time, times_fired) +/datum/status_effect/fire_ring/tick(seconds_per_tick, times_fired) if(QDELETED(owner) || owner.stat == DEAD) qdel(src) return @@ -54,9 +54,9 @@ for(var/turf/nearby_turf as anything in RANGE_TURFS(1, owner)) new /obj/effect/hotspot(nearby_turf) - nearby_turf.hotspot_expose(750, 25 * delta_time, 1) + nearby_turf.hotspot_expose(750, 25 * seconds_per_tick, 1) for(var/mob/living/fried_living in nearby_turf.contents - owner) - fried_living.apply_damage(2.5 * delta_time, BURN) + fried_living.apply_damage(2.5 * seconds_per_tick, BURN) /// Creates one, large, expanding ring of fire around the caster, which does not follow them. /datum/action/cooldown/spell/fire_cascade diff --git a/code/modules/antagonists/heretic/magic/fire_blast.dm b/code/modules/antagonists/heretic/magic/fire_blast.dm index 2f0f3013991..8900ea2350a 100644 --- a/code/modules/antagonists/heretic/magic/fire_blast.dm +++ b/code/modules/antagonists/heretic/magic/fire_blast.dm @@ -136,7 +136,7 @@ return TRUE -/datum/status_effect/fire_blasted/tick(delta_time, times_fired) +/datum/status_effect/fire_blasted/tick(seconds_per_tick, times_fired) owner.adjustFireLoss(tick_damage) owner.adjustStaminaLoss(2 * tick_damage) diff --git a/code/modules/antagonists/heretic/magic/realignment.dm b/code/modules/antagonists/heretic/magic/realignment.dm index 56187a76dcf..1b5dd05d059 100644 --- a/code/modules/antagonists/heretic/magic/realignment.dm +++ b/code/modules/antagonists/heretic/magic/realignment.dm @@ -69,7 +69,7 @@ REMOVE_TRAIT(owner, TRAIT_PACIFISM, id) owner.remove_filter(id) -/datum/status_effect/realignment/tick(delta_time, times_fired) +/datum/status_effect/realignment/tick(seconds_per_tick, times_fired) owner.adjustStaminaLoss(-5) owner.AdjustAllImmobility(-0.5 SECONDS) diff --git a/code/modules/antagonists/heretic/magic/star_touch.dm b/code/modules/antagonists/heretic/magic/star_touch.dm index 01dee4e136a..70b757b2584 100644 --- a/code/modules/antagonists/heretic/magic/star_touch.dm +++ b/code/modules/antagonists/heretic/magic/star_touch.dm @@ -134,7 +134,7 @@ active = FALSE return ..() -/datum/status_effect/cosmic_beam/tick(delta_time, times_fired) +/datum/status_effect/cosmic_beam/tick(seconds_per_tick, times_fired) if(!current_target) lose_target() return diff --git a/code/modules/antagonists/nightmare/nightmare_organs.dm b/code/modules/antagonists/nightmare/nightmare_organs.dm index 205e66c5dfc..cf1142ee2fa 100644 --- a/code/modules/antagonists/nightmare/nightmare_organs.dm +++ b/code/modules/antagonists/nightmare/nightmare_organs.dm @@ -81,14 +81,14 @@ /obj/item/organ/internal/heart/nightmare/Stop() return 0 -/obj/item/organ/internal/heart/nightmare/on_death(delta_time, times_fired) +/obj/item/organ/internal/heart/nightmare/on_death(seconds_per_tick, times_fired) if(!owner) return var/turf/T = get_turf(owner) if(istype(T)) var/light_amount = T.get_lumcount() if(light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) - respawn_progress += delta_time SECONDS + respawn_progress += seconds_per_tick SECONDS playsound(owner, 'sound/effects/singlebeat.ogg', 40, TRUE) if(respawn_progress < HEART_RESPAWN_THRESHHOLD) return diff --git a/code/modules/antagonists/nukeop/equipment/pinpointer.dm b/code/modules/antagonists/nukeop/equipment/pinpointer.dm index f5f09a948d5..567df1d0ea7 100644 --- a/code/modules/antagonists/nukeop/equipment/pinpointer.dm +++ b/code/modules/antagonists/nukeop/equipment/pinpointer.dm @@ -23,7 +23,7 @@ if(bomb.timing) . += "Extreme danger. Arming signal detected. Time remaining: [bomb.get_time_left()]." -/obj/item/pinpointer/nuke/process(delta_time) +/obj/item/pinpointer/nuke/process(seconds_per_tick) ..() if(!active || alert) return diff --git a/code/modules/antagonists/revenant/revenant_blight.dm b/code/modules/antagonists/revenant/revenant_blight.dm index 9c86bea0b9d..64bd6ce03bb 100644 --- a/code/modules/antagonists/revenant/revenant_blight.dm +++ b/code/modules/antagonists/revenant/revenant_blight.dm @@ -25,42 +25,42 @@ ..() -/datum/disease/revblight/stage_act(delta_time, times_fired) +/datum/disease/revblight/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return if(!finalstage) - if(affected_mob.body_position == LYING_DOWN && DT_PROB(3 * stage, delta_time)) + if(affected_mob.body_position == LYING_DOWN && SPT_PROB(3 * stage, seconds_per_tick)) cure() return FALSE - if(DT_PROB(1.5 * stage, delta_time)) + if(SPT_PROB(1.5 * stage, seconds_per_tick)) to_chat(affected_mob, span_revennotice("You suddenly feel [pick("sick and tired", "disoriented", "tired and confused", "nauseated", "faint", "dizzy")]...")) affected_mob.adjust_confusion(8 SECONDS) affected_mob.adjustStaminaLoss(20, FALSE) new /obj/effect/temp_visual/revenant(affected_mob.loc) if(stagedamage < stage) stagedamage++ - affected_mob.adjustToxLoss(1 * stage * delta_time, FALSE) //should, normally, do about 30 toxin damage. + affected_mob.adjustToxLoss(1 * stage * seconds_per_tick, FALSE) //should, normally, do about 30 toxin damage. new /obj/effect/temp_visual/revenant(affected_mob.loc) - if(DT_PROB(25, delta_time)) + if(SPT_PROB(25, seconds_per_tick)) affected_mob.adjustStaminaLoss(stage, FALSE) switch(stage) if(2) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote("pale") if(3) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.emote(pick("pale","shiver")) if(4) - if(DT_PROB(7.5, delta_time)) + if(SPT_PROB(7.5, seconds_per_tick)) affected_mob.emote(pick("pale","shiver","cries")) if(5) if(!finalstage) finalstage = TRUE to_chat(affected_mob, span_revenbignotice("You feel like [pick("nothing's worth it anymore", "nobody ever needed your help", "nothing you did mattered", "everything you tried to do was worthless")].")) - affected_mob.adjustStaminaLoss(22.5 * delta_time, FALSE) + affected_mob.adjustStaminaLoss(22.5 * seconds_per_tick, FALSE) new /obj/effect/temp_visual/revenant(affected_mob.loc) if(affected_mob.dna && affected_mob.dna.species) affected_mob.dna.species.handle_mutant_bodyparts(affected_mob,"#1d2953") diff --git a/code/modules/antagonists/space_dragon/carp_rift.dm b/code/modules/antagonists/space_dragon/carp_rift.dm index 47e9e4fbdcf..0e5368e8bad 100644 --- a/code/modules/antagonists/space_dragon/carp_rift.dm +++ b/code/modules/antagonists/space_dragon/carp_rift.dm @@ -131,20 +131,20 @@ dragon = null return ..() -/obj/structure/carp_rift/process(delta_time) +/obj/structure/carp_rift/process(seconds_per_tick) // If we're fully charged, just start mass spawning carp and move around. if(charge_state == CHARGE_COMPLETED) - if(DT_PROB(1.25, delta_time) && dragon) + if(SPT_PROB(1.25, seconds_per_tick) && dragon) var/mob/living/newcarp = new dragon.ai_to_spawn(loc) newcarp.faction = dragon.owner.current.faction.Copy() - if(DT_PROB(1.5, delta_time)) + if(SPT_PROB(1.5, seconds_per_tick)) var/rand_dir = pick(GLOB.cardinals) SSmove_manager.move_to(src, get_step(src, rand_dir), 1) return // Increase time trackers and check for any updated states. - time_charged = min(time_charged + delta_time, max_charge) - last_carp_inc += delta_time + time_charged = min(time_charged + seconds_per_tick, max_charge) + last_carp_inc += seconds_per_tick update_check() /obj/structure/carp_rift/attack_ghost(mob/user) diff --git a/code/modules/antagonists/traitor/objectives/steal.dm b/code/modules/antagonists/traitor/objectives/steal.dm index 52a00daab10..ce0020c8cad 100644 --- a/code/modules/antagonists/traitor/objectives/steal.dm +++ b/code/modules/antagonists/traitor/objectives/steal.dm @@ -202,7 +202,7 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) return succeed_objective() -/datum/traitor_objective/steal_item/process(delta_time) +/datum/traitor_objective/steal_item/process(seconds_per_tick) var/mob/owner = handler.owner?.current if(objective_state != OBJECTIVE_STATE_ACTIVE || !bug.planted_on) return PROCESS_KILL @@ -211,7 +211,7 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) return PROCESS_KILL if(get_dist(get_turf(owner), get_turf(bug)) > max_distance) return - time_fulfilled += delta_time * (1 SECONDS) + time_fulfilled += seconds_per_tick * (1 SECONDS) if(time_fulfilled >= hold_time_required * (1 MINUTES)) progression_reward += extra_progression telecrystal_reward += extra_tc diff --git a/code/modules/antagonists/wizard/grand_ritual/grand_side_effect.dm b/code/modules/antagonists/wizard/grand_ritual/grand_side_effect.dm index 0643b73ead9..4596047da61 100644 --- a/code/modules/antagonists/wizard/grand_ritual/grand_side_effect.dm +++ b/code/modules/antagonists/wizard/grand_ritual/grand_side_effect.dm @@ -315,11 +315,11 @@ STOP_PROCESSING(SSprocessing, src) return ..() -/obj/effect/abstract/local_food_rain/process(delta_time) - create_food(delta_time) +/obj/effect/abstract/local_food_rain/process(seconds_per_tick) + create_food(seconds_per_tick) -/obj/effect/abstract/local_food_rain/proc/create_food(delta_time) - var/to_create = rand(0, max_foods_per_second * delta_time) +/obj/effect/abstract/local_food_rain/proc/create_food(seconds_per_tick) + var/to_create = rand(0, max_foods_per_second * seconds_per_tick) if (to_create == 0) return @@ -331,7 +331,7 @@ while(to_create > 0 && length(valid_turfs) > 0) to_create-- - addtimer(CALLBACK(src, PROC_REF(drop_food), pick_n_take(valid_turfs)), rand(0, (1 SECONDS) * delta_time)) + addtimer(CALLBACK(src, PROC_REF(drop_food), pick_n_take(valid_turfs)), rand(0, (1 SECONDS) * seconds_per_tick)) /obj/effect/abstract/local_food_rain/proc/drop_food(turf/landing_zone) podspawn(list( diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 6d9bff1b2a5..b455f1fad92 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -97,10 +97,10 @@ return TRUE -/obj/item/assembly/prox_sensor/process(delta_time) +/obj/item/assembly/prox_sensor/process(seconds_per_tick) if(!timing) return - time -= delta_time + time -= seconds_per_tick if(time <= 0) timing = FALSE toggle_scan(TRUE) diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index db85d25dc3b..6b8244f54ff 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -63,10 +63,10 @@ timing = TRUE update_appearance() -/obj/item/assembly/timer/process(delta_time) +/obj/item/assembly/timer/process(seconds_per_tick) if(!timing) return - time -= delta_time + time -= seconds_per_tick if(time <= 0) timing = FALSE timer_end() diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_main_processes.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_main_processes.dm index 026aa26e3c0..325ae083dad 100644 --- a/code/modules/atmospherics/machinery/components/fusion/hfr_main_processes.dm +++ b/code/modules/atmospherics/machinery/components/fusion/hfr_main_processes.dm @@ -4,7 +4,7 @@ * fusion_process() handles all the main fusion reaction logic and consequences (lightning, radiation, particles) from an active fusion reaction. */ -/obj/machinery/atmospherics/components/unary/hypertorus/core/process(delta_time) +/obj/machinery/atmospherics/components/unary/hypertorus/core/process(seconds_per_tick) /* *Pre-checks */ @@ -22,14 +22,14 @@ // Run the reaction if it is either live or being started if (start_power || power_level) play_ambience() - fusion_process(delta_time) + fusion_process(seconds_per_tick) // Note that we process damage/healing even if the fusion process aborts. // Running out of fuel won't save you if your moderator and coolant are exploding on their own. check_spill() - process_damageheal(delta_time) + process_damageheal(seconds_per_tick) check_alert() if (start_power) - remove_waste(delta_time) + remove_waste(seconds_per_tick) update_pipenets() check_deconstructable() @@ -38,15 +38,15 @@ * Called by process() * Contains the main fusion calculations and checks, for more informations check the comments along the code. */ -/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/fusion_process(delta_time) +/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/fusion_process(seconds_per_tick) //fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting. Again (and again, and again). Again! Again but with machine! //Fusion Rework Counter: Please increment this if you make a major overhaul to this system again. //7 reworks if (check_power_use()) if (start_cooling) - inject_from_side_components(delta_time) - process_internal_cooling(delta_time) + inject_from_side_components(seconds_per_tick) + process_internal_cooling(seconds_per_tick) else // No power forces bad settings magnetic_constrictor = 100 @@ -55,9 +55,9 @@ fuel_injection_rate = 20 moderator_injection_rate = 50 waste_remove = FALSE - iron_content += 0.02 * power_level * delta_time + iron_content += 0.02 * power_level * seconds_per_tick - update_temperature_status(delta_time) + update_temperature_status(seconds_per_tick) //Store the temperature of the gases after one cicle of the fusion reaction var/archived_heat = internal_fusion.temperature @@ -215,13 +215,13 @@ // Phew. Lets calculate what this means in practice. var/fuel_consumption_rate = clamp(fuel_injection_rate * 0.01 * 5 * power_level, 0.05, 30) - var/consumption_amount = fuel_consumption_rate * delta_time + var/consumption_amount = fuel_consumption_rate * seconds_per_tick var/production_amount switch(power_level) if(3,4) - production_amount = clamp(heat_output * 5e-4, 0, fuel_consumption_rate) * delta_time + production_amount = clamp(heat_output * 5e-4, 0, fuel_consumption_rate) * seconds_per_tick else - production_amount = clamp(heat_output / 10 ** (power_level+1), 0, fuel_consumption_rate) * delta_time + production_amount = clamp(heat_output / 10 ** (power_level+1), 0, fuel_consumption_rate) * seconds_per_tick // antinob production is special, and uses its own calculations from how stale the fusion mix is (via byproduct ratio and fresh fuel rate) var/dirty_production_rate = scaled_fuel_list[scaled_fuel_list[3]] / fuel_injection_rate @@ -229,18 +229,18 @@ // Run the effects of our selected fuel recipe var/datum/gas_mixture/internal_output = new - moderator_fuel_process(delta_time, production_amount, consumption_amount, internal_output, moderator_list, selected_fuel, fuel_list) + moderator_fuel_process(seconds_per_tick, production_amount, consumption_amount, internal_output, moderator_list, selected_fuel, fuel_list) // Run the common effects, committing changes where applicable // This is repetition, but is here as a placeholder for what will need to be done to allow concurrently running multiple recipes var/common_production_amount = production_amount * selected_fuel.gas_production_multiplier - moderator_common_process(delta_time, common_production_amount, internal_output, moderator_list, dirty_production_rate, heat_output, radiation_modifier) + moderator_common_process(seconds_per_tick, common_production_amount, internal_output, moderator_list, dirty_production_rate, heat_output, radiation_modifier) /** * Perform recipe specific actions. Fuel consumption and recipe based gas production happens here. */ -/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/moderator_fuel_process(delta_time, production_amount, consumption_amount, datum/gas_mixture/internal_output, moderator_list, datum/hfr_fuel/fuel, fuel_list) +/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/moderator_fuel_process(seconds_per_tick, production_amount, consumption_amount, datum/gas_mixture/internal_output, moderator_list, datum/hfr_fuel/fuel, fuel_list) // Adjust fusion consumption/production based on this recipe's characteristics var/fuel_consumption = consumption_amount * 0.85 * selected_fuel.fuel_consumption_multiplier var/scaled_production = production_amount * selected_fuel.gas_production_multiplier @@ -283,7 +283,7 @@ * - Temperature modifiers, radiation modifiers, and the application of each * - Committing staged output, performing filtering, and making !FUN! emissions */ -/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/moderator_common_process(delta_time, scaled_production, datum/gas_mixture/internal_output, moderator_list, dirty_production_rate, heat_output, radiation_modifier) +/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/moderator_common_process(seconds_per_tick, scaled_production, datum/gas_mixture/internal_output, moderator_list, dirty_production_rate, heat_output, radiation_modifier) switch(power_level) if(1) if(moderator_list[/datum/gas/plasma] > 100) @@ -325,7 +325,7 @@ internal_output.assert_gases(/datum/gas/healium, /datum/gas/proto_nitrate) internal_output.gases[/datum/gas/proto_nitrate][MOLES] += scaled_production * 1.5 internal_output.gases[/datum/gas/healium][MOLES] += scaled_production * 1.5 - visible_hallucination_pulse(src, HALLUCINATION_HFR(heat_output), 100 SECONDS * power_level * delta_time) + visible_hallucination_pulse(src, HALLUCINATION_HFR(heat_output), 100 SECONDS * power_level * seconds_per_tick) if(5) if(moderator_list[/datum/gas/plasma] > 15) @@ -345,15 +345,15 @@ if(moderator_list[/datum/gas/bz] > 100) internal_output.assert_gases(/datum/gas/healium, /datum/gas/freon) internal_output.gases[/datum/gas/healium][MOLES] += scaled_production - visible_hallucination_pulse(src, HALLUCINATION_HFR(heat_output), 100 SECONDS * power_level * delta_time) + visible_hallucination_pulse(src, HALLUCINATION_HFR(heat_output), 100 SECONDS * power_level * seconds_per_tick) internal_output.gases[/datum/gas/freon][MOLES] += scaled_production * 1.15 if(moderator_list[/datum/gas/healium] > 100) if(critical_threshold_proximity > 400) - critical_threshold_proximity = max(critical_threshold_proximity - (moderator_list[/datum/gas/healium] / 100 * delta_time ), 0) + critical_threshold_proximity = max(critical_threshold_proximity - (moderator_list[/datum/gas/healium] / 100 * seconds_per_tick ), 0) moderator_internal.gases[/datum/gas/healium][MOLES] -= min(moderator_internal.gases[/datum/gas/healium][MOLES], scaled_production * 20) if(moderator_internal.temperature < 1e7 || (moderator_list[/datum/gas/plasma] > 100 && moderator_list[/datum/gas/bz] > 50)) internal_output.assert_gases(/datum/gas/antinoblium) - internal_output.gases[/datum/gas/antinoblium][MOLES] += dirty_production_rate * 0.9 / 0.065 * delta_time + internal_output.gases[/datum/gas/antinoblium][MOLES] += dirty_production_rate * 0.9 / 0.065 * seconds_per_tick if(6) internal_output.assert_gases(/datum/gas/antinoblium) if(moderator_list[/datum/gas/plasma] > 30) @@ -368,20 +368,20 @@ radiation *= 2 heat_output *= 2.25 if(moderator_list[/datum/gas/bz]) - visible_hallucination_pulse(src, HALLUCINATION_HFR(heat_output), 100 SECONDS * power_level * delta_time) - internal_output.gases[/datum/gas/antinoblium][MOLES] += clamp(dirty_production_rate / 0.045, 0, 10) * delta_time + visible_hallucination_pulse(src, HALLUCINATION_HFR(heat_output), 100 SECONDS * power_level * seconds_per_tick) + internal_output.gases[/datum/gas/antinoblium][MOLES] += clamp(dirty_production_rate / 0.045, 0, 10) * seconds_per_tick if(moderator_list[/datum/gas/healium] > 100) if(critical_threshold_proximity > 400) - critical_threshold_proximity = max(critical_threshold_proximity - (moderator_list[/datum/gas/healium] / 100 * delta_time ), 0) + critical_threshold_proximity = max(critical_threshold_proximity - (moderator_list[/datum/gas/healium] / 100 * seconds_per_tick ), 0) moderator_internal.gases[/datum/gas/healium][MOLES] -= min(moderator_internal.gases[/datum/gas/healium][MOLES], scaled_production * 20) - internal_fusion.gases[/datum/gas/antinoblium][MOLES] += dirty_production_rate * 0.01 / 0.095 * delta_time + internal_fusion.gases[/datum/gas/antinoblium][MOLES] += dirty_production_rate * 0.01 / 0.095 * seconds_per_tick //Modifies the internal_fusion temperature with the amount of heat output var/temperature_modifier = selected_fuel.temperature_change_multiplier if(internal_fusion.temperature <= FUSION_MAXIMUM_TEMPERATURE * temperature_modifier) internal_fusion.temperature = clamp(internal_fusion.temperature + heat_output,TCMB,FUSION_MAXIMUM_TEMPERATURE * temperature_modifier) else - internal_fusion.temperature -= heat_limiter_modifier * 0.01 * delta_time + internal_fusion.temperature -= heat_limiter_modifier * 0.01 * seconds_per_tick //heat up and output what's in the internal_output into the linked_output port if(internal_output.total_moles() > 0) @@ -391,7 +391,7 @@ internal_output.temperature = internal_fusion.temperature * METALLIC_VOID_CONDUCTIVITY linked_output.airs[1].merge(internal_output) - evaporate_moderator(delta_time) + evaporate_moderator(seconds_per_tick) check_nuclear_particles(moderator_list) @@ -401,23 +401,23 @@ if(moderator_list[/datum/gas/oxygen] > 150) if(iron_content > 0) var/max_iron_removable = IRON_OXYGEN_HEAL_PER_SECOND - var/iron_removed = min(max_iron_removable * delta_time, iron_content) + var/iron_removed = min(max_iron_removable * seconds_per_tick, iron_content) iron_content -= iron_removed moderator_internal.gases[/datum/gas/oxygen][MOLES] -= iron_removed * OXYGEN_MOLES_CONSUMED_PER_IRON_HEAL - check_gravity_pulse(delta_time) + check_gravity_pulse(seconds_per_tick) radiation_pulse(src, max_range = 6, threshold = 0.3) -/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/evaporate_moderator(delta_time) +/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/evaporate_moderator(seconds_per_tick) // Don't evaporate if the reaction is dead if (!power_level) return // All gases in the moderator slowly burn away over time, whether used for production or not if(moderator_internal.total_moles() > 0) - moderator_internal.remove(moderator_internal.total_moles() * (1 - (1 - 0.0005 * power_level) ** delta_time)) + moderator_internal.remove(moderator_internal.total_moles() * (1 - (1 - 0.0005 * power_level) ** seconds_per_tick)) -/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/process_damageheal(delta_time) +/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/process_damageheal(seconds_per_tick) // Archive current health for damage cap purposes critical_threshold_proximity_archived = critical_threshold_proximity @@ -427,38 +427,38 @@ // If we're operating at an extreme power level, take increasing damage for the amount of fusion mass over a low threshold if(power_level >= HYPERTORUS_OVERFULL_MIN_POWER_LEVEL) var/overfull_damage_taken = HYPERTORUS_OVERFULL_MOLAR_SLOPE * internal_fusion.total_moles() + HYPERTORUS_OVERFULL_TEMPERATURE_SLOPE * coolant_temperature + HYPERTORUS_OVERFULL_CONSTANT - critical_threshold_proximity = max(critical_threshold_proximity + max(overfull_damage_taken * delta_time, 0), 0) + critical_threshold_proximity = max(critical_threshold_proximity + max(overfull_damage_taken * seconds_per_tick, 0), 0) warning_damage_flags |= HYPERTORUS_FLAG_HIGH_POWER_DAMAGE // If we're running on a thin fusion mix, heal up if(internal_fusion.total_moles() < HYPERTORUS_SUBCRITICAL_MOLES && power_level <= 5) var/subcritical_heal_restore = (internal_fusion.total_moles() - HYPERTORUS_SUBCRITICAL_MOLES) / HYPERTORUS_SUBCRITICAL_SCALE - critical_threshold_proximity = max(critical_threshold_proximity + min(subcritical_heal_restore * delta_time, 0), 0) + critical_threshold_proximity = max(critical_threshold_proximity + min(subcritical_heal_restore * seconds_per_tick, 0), 0) // If coolant is sufficiently cold, heal up if(internal_fusion.total_moles() > 0 && (airs[1].total_moles() && coolant_temperature < HYPERTORUS_COLD_COOLANT_THRESHOLD) && power_level <= 4) var/cold_coolant_heal_restore = log(10, max(coolant_temperature, 1) * HYPERTORUS_COLD_COOLANT_SCALE) - (HYPERTORUS_COLD_COOLANT_MAX_RESTORE * 2) - critical_threshold_proximity = max(critical_threshold_proximity + min(cold_coolant_heal_restore * delta_time, 0), 0) + critical_threshold_proximity = max(critical_threshold_proximity + min(cold_coolant_heal_restore * seconds_per_tick, 0), 0) - critical_threshold_proximity += max(iron_content - HYPERTORUS_MAX_SAFE_IRON, 0) * delta_time + critical_threshold_proximity += max(iron_content - HYPERTORUS_MAX_SAFE_IRON, 0) * seconds_per_tick if(iron_content - HYPERTORUS_MAX_SAFE_IRON > 0) warning_damage_flags |= HYPERTORUS_FLAG_IRON_CONTENT_DAMAGE // Apply damage cap - critical_threshold_proximity = min(critical_threshold_proximity_archived + (delta_time * DAMAGE_CAP_MULTIPLIER * melting_point), critical_threshold_proximity) + critical_threshold_proximity = min(critical_threshold_proximity_archived + (seconds_per_tick * DAMAGE_CAP_MULTIPLIER * melting_point), critical_threshold_proximity) // If we have a preposterous amount of mass in the fusion mix, things get bad extremely fast if(internal_fusion.total_moles() >= HYPERTORUS_HYPERCRITICAL_MOLES) var/hypercritical_damage_taken = max((internal_fusion.total_moles() - HYPERTORUS_HYPERCRITICAL_MOLES) * HYPERTORUS_HYPERCRITICAL_SCALE, 0) - critical_threshold_proximity = max(critical_threshold_proximity + min(hypercritical_damage_taken, HYPERTORUS_HYPERCRITICAL_MAX_DAMAGE), 0) * delta_time + critical_threshold_proximity = max(critical_threshold_proximity + min(hypercritical_damage_taken, HYPERTORUS_HYPERCRITICAL_MAX_DAMAGE), 0) * seconds_per_tick warning_damage_flags |= HYPERTORUS_FLAG_HIGH_FUEL_MIX_MOLE // High power fusion might create other matter other than helium, iron is dangerous inside the machine, damage can be seen if(power_level > 4 && prob(IRON_CHANCE_PER_FUSION_LEVEL * power_level))//at power level 6 is 100% - iron_content += IRON_ACCUMULATED_PER_SECOND * delta_time + iron_content += IRON_ACCUMULATED_PER_SECOND * seconds_per_tick warning_damage_flags |= HYPERTORUS_FLAG_IRON_CONTENT_INCREASE if(iron_content > 0 && power_level <= 4 && prob(25 / (power_level + 1))) - iron_content = max(iron_content - 0.01 * delta_time, 0) + iron_content = max(iron_content - 0.01 * seconds_per_tick, 0) iron_content = clamp(iron_content, 0, 1) /obj/machinery/atmospherics/components/unary/hypertorus/core/proc/check_nuclear_particles(moderator_list) @@ -497,8 +497,8 @@ for(var/i in 1 to zap_number) supermatter_zap(src, 5, power_level * 300, flags, zap_cutoff = cutoff, power_level = src.power_level * 1000, zap_icon = zaps_aspect) -/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/check_gravity_pulse(delta_time) - if(DT_PROB(100 - critical_threshold_proximity / 15, delta_time)) +/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/check_gravity_pulse(seconds_per_tick) + if(SPT_PROB(100 - critical_threshold_proximity / 15, seconds_per_tick)) return var/grav_range = round(log(2.5, critical_threshold_proximity)) for(var/mob/alive_mob in GLOB.alive_mob_list) @@ -506,13 +506,13 @@ continue step_towards(alive_mob, loc) -/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/remove_waste(delta_time) +/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/remove_waste(seconds_per_tick) //Gases can be removed from the moderator internal by using the interface. if(!waste_remove) return var/filtering_amount = moderator_scrubbing.len for(var/gas in moderator_internal.gases & moderator_scrubbing) - var/datum/gas_mixture/removed = moderator_internal.remove_specific(gas, (moderator_filtering_rate / filtering_amount) * delta_time) + var/datum/gas_mixture/removed = moderator_internal.remove_specific(gas, (moderator_filtering_rate / filtering_amount) * seconds_per_tick) if(removed) linked_output.airs[1].merge(removed) @@ -520,16 +520,16 @@ var/datum/gas_mixture/internal_remove for(var/gas_id in selected_fuel.primary_products) if(internal_fusion.gases[gas_id][MOLES] > 0) - internal_remove = internal_fusion.remove_specific(gas_id, internal_fusion.gases[gas_id][MOLES] * (1 - (1 - 0.25) ** delta_time)) + internal_remove = internal_fusion.remove_specific(gas_id, internal_fusion.gases[gas_id][MOLES] * (1 - (1 - 0.25) ** seconds_per_tick)) linked_output.airs[1].merge(internal_remove) internal_fusion.garbage_collect() moderator_internal.garbage_collect() -/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/process_internal_cooling(delta_time) +/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/process_internal_cooling(seconds_per_tick) if(moderator_internal.total_moles() > 0 && internal_fusion.total_moles() > 0) //Modifies the moderator_internal temperature based on energy conduction and also the fusion by the same amount var/fusion_temperature_delta = internal_fusion.temperature - moderator_internal.temperature - var/fusion_heat_amount = (1 - (1 - METALLIC_VOID_CONDUCTIVITY) ** delta_time) * fusion_temperature_delta * (internal_fusion.heat_capacity() * moderator_internal.heat_capacity() / (internal_fusion.heat_capacity() + moderator_internal.heat_capacity())) + var/fusion_heat_amount = (1 - (1 - METALLIC_VOID_CONDUCTIVITY) ** seconds_per_tick) * fusion_temperature_delta * (internal_fusion.heat_capacity() * moderator_internal.heat_capacity() / (internal_fusion.heat_capacity() + moderator_internal.heat_capacity())) internal_fusion.temperature = max(internal_fusion.temperature - fusion_heat_amount / internal_fusion.heat_capacity(), TCMB) moderator_internal.temperature = max(moderator_internal.temperature + fusion_heat_amount / moderator_internal.heat_capacity(), TCMB) @@ -540,24 +540,24 @@ //Cooling of the moderator gases with the cooling loop in and out the core if(moderator_internal.total_moles() > 0) var/coolant_temperature_delta = cooling_remove.temperature - moderator_internal.temperature - var/cooling_heat_amount = (1 - (1 - HIGH_EFFICIENCY_CONDUCTIVITY) ** delta_time) * coolant_temperature_delta * (cooling_remove.heat_capacity() * moderator_internal.heat_capacity() / (cooling_remove.heat_capacity() + moderator_internal.heat_capacity())) + var/cooling_heat_amount = (1 - (1 - HIGH_EFFICIENCY_CONDUCTIVITY) ** seconds_per_tick) * coolant_temperature_delta * (cooling_remove.heat_capacity() * moderator_internal.heat_capacity() / (cooling_remove.heat_capacity() + moderator_internal.heat_capacity())) cooling_remove.temperature = max(cooling_remove.temperature - cooling_heat_amount / cooling_remove.heat_capacity(), TCMB) moderator_internal.temperature = max(moderator_internal.temperature + cooling_heat_amount / moderator_internal.heat_capacity(), TCMB) else if(internal_fusion.total_moles() > 0) var/coolant_temperature_delta = cooling_remove.temperature - internal_fusion.temperature - var/cooling_heat_amount = (1 - (1 - METALLIC_VOID_CONDUCTIVITY) ** delta_time) * coolant_temperature_delta * (cooling_remove.heat_capacity() * internal_fusion.heat_capacity() / (cooling_remove.heat_capacity() + internal_fusion.heat_capacity())) + var/cooling_heat_amount = (1 - (1 - METALLIC_VOID_CONDUCTIVITY) ** seconds_per_tick) * coolant_temperature_delta * (cooling_remove.heat_capacity() * internal_fusion.heat_capacity() / (cooling_remove.heat_capacity() + internal_fusion.heat_capacity())) cooling_remove.temperature = max(cooling_remove.temperature - cooling_heat_amount / cooling_remove.heat_capacity(), TCMB) internal_fusion.temperature = max(internal_fusion.temperature + cooling_heat_amount / internal_fusion.heat_capacity(), TCMB) cooling_port.merge(cooling_remove) -/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/inject_from_side_components(delta_time) +/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/inject_from_side_components(seconds_per_tick) update_pipenets() //Check and stores the gases from the moderator input in the moderator internal gasmix var/datum/gas_mixture/moderator_port = linked_moderator.airs[1] if(start_moderator && moderator_port.total_moles()) - moderator_internal.merge(moderator_port.remove(moderator_injection_rate * delta_time)) + moderator_internal.merge(moderator_port.remove(moderator_injection_rate * seconds_per_tick)) linked_moderator.update_parents() //Check if the fuels are present and move them inside the fuel internal gasmix @@ -567,7 +567,7 @@ var/datum/gas_mixture/fuel_port = linked_input.airs[1] for(var/gas_type in selected_fuel.requirements) internal_fusion.assert_gas(gas_type) - internal_fusion.merge(fuel_port.remove_specific(gas_type, fuel_injection_rate * delta_time / length(selected_fuel.requirements))) + internal_fusion.merge(fuel_port.remove_specific(gas_type, fuel_injection_rate * seconds_per_tick / length(selected_fuel.requirements))) linked_input.update_parents() /obj/machinery/atmospherics/components/unary/hypertorus/core/proc/check_deconstructable() diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm index 081d8a44ee3..8184fad1114 100644 --- a/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm +++ b/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm @@ -183,7 +183,7 @@ linked_output.update_parents() linked_moderator.update_parents() -/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/update_temperature_status(delta_time) +/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/update_temperature_status(seconds_per_tick) fusion_temperature_archived = fusion_temperature fusion_temperature = internal_fusion.temperature moderator_temperature_archived = moderator_temperature @@ -192,7 +192,7 @@ coolant_temperature = airs[1].temperature output_temperature_archived = output_temperature output_temperature = linked_output.airs[1].temperature - temperature_period = delta_time + temperature_period = seconds_per_tick //Set the power level of the fusion process switch(fusion_temperature) @@ -579,7 +579,7 @@ return origin_turf.assume_air(remove_mixture) -/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/check_spill(delta_time) +/obj/machinery/atmospherics/components/unary/hypertorus/core/proc/check_spill(seconds_per_tick) var/obj/machinery/atmospherics/components/unary/hypertorus/cracked_part = check_cracked_parts() if (cracked_part) // We have an existing crack @@ -595,7 +595,7 @@ else // Gotta go fast leak_rate = HYPERTORUS_STRONG_SPILL_RATE - spill_gases(cracked_part, moderator_internal, ratio = 1 - (1 - leak_rate) ** delta_time) + spill_gases(cracked_part, moderator_internal, ratio = 1 - (1 - leak_rate) ** seconds_per_tick) return if (moderator_internal.total_moles() < HYPERTORUS_HYPERCRITICAL_MOLES) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 1be0cf135fa..3fdc489645e 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -1,7 +1,7 @@ ///Max temperature allowed inside the cryotube, should break before reaching this heat #define MAX_TEMPERATURE 4000 // Multiply factor is used with efficiency to multiply Tx quantity -// Tx quantity is how much volume should be removed from the cell's beaker - multiplied by delta_time +// Tx quantity is how much volume should be removed from the cell's beaker - multiplied by seconds_per_tick // Throttle Counter Max is how many calls of process() between ones that inject reagents. // These three defines control how fast and efficient cryo is #define CRYO_MULTIPLY_FACTOR 25 @@ -266,7 +266,7 @@ begin_processing() -/obj/machinery/atmospherics/components/unary/cryo_cell/process(delta_time) +/obj/machinery/atmospherics/components/unary/cryo_cell/process(seconds_per_tick) ..() if(!on) @@ -307,7 +307,7 @@ if(air1.total_moles() > CRYO_MIN_GAS_MOLES) if(beaker) - beaker.reagents.trans_to(occupant, (CRYO_TX_QTY / (efficiency * CRYO_MULTIPLY_FACTOR)) * delta_time, efficiency * CRYO_MULTIPLY_FACTOR, methods = VAPOR) // Transfer reagents. + beaker.reagents.trans_to(occupant, (CRYO_TX_QTY / (efficiency * CRYO_MULTIPLY_FACTOR)) * seconds_per_tick, efficiency * CRYO_MULTIPLY_FACTOR, methods = VAPOR) // Transfer reagents. consume_gas = TRUE return TRUE diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm index 8a836eb5e1c..e4393473e90 100644 --- a/code/modules/atmospherics/machinery/other/miner.dm +++ b/code/modules/atmospherics/machinery/other/miner.dm @@ -120,22 +120,22 @@ on_overlay.color = overlay_color . += on_overlay -/obj/machinery/atmospherics/miner/process(delta_time) +/obj/machinery/atmospherics/miner/process(seconds_per_tick) update_power() check_operation() if(active && !broken) if(isnull(spawn_id)) return FALSE if(do_use_power(active_power_usage)) - mine_gas(delta_time) + mine_gas(seconds_per_tick) -/obj/machinery/atmospherics/miner/proc/mine_gas(delta_time = 2) +/obj/machinery/atmospherics/miner/proc/mine_gas(seconds_per_tick = 2) var/turf/open/O = get_turf(src) if(!isopenturf(O)) return FALSE var/datum/gas_mixture/merger = new merger.assert_gas(spawn_id) - merger.gases[spawn_id][MOLES] = spawn_mol * delta_time + merger.gases[spawn_id][MOLES] = spawn_mol * seconds_per_tick merger.temperature = spawn_temp O.assume_air(merger) diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm index b74be49c6e9..05350445370 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm @@ -51,7 +51,7 @@ buckled_mob.bodytemperature = avg_temp pipe_air.temperature = avg_temp -/obj/machinery/atmospherics/pipe/heat_exchanging/process(delta_time) +/obj/machinery/atmospherics/pipe/heat_exchanging/process(seconds_per_tick) if(!parent) return //machines subsystem fires before atmos is initialized so this prevents race condition runtimes @@ -80,7 +80,7 @@ var/heat_limit = 1000 if(pipe_air.temperature > heat_limit + 1) for(var/mob/living/buckled_mob as anything in buckled_mobs) - buckled_mob.apply_damage(delta_time * 2 * log(pipe_air.temperature - heat_limit), BURN, BODY_ZONE_CHEST) + buckled_mob.apply_damage(seconds_per_tick * 2 * log(pipe_air.temperature - heat_limit), BURN, BODY_ZONE_CHEST) /obj/machinery/atmospherics/pipe/heat_exchanging/update_pipe_icon() return diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 2e25be2cc75..ed9e3be476f 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -557,7 +557,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister()) else if(valve_open && holding) user.investigate_log("started a transfer into [holding].", INVESTIGATE_ATMOS) -/obj/machinery/portable_atmospherics/canister/process(delta_time) +/obj/machinery/portable_atmospherics/canister/process(seconds_per_tick) var/our_pressure = air_contents.return_pressure() var/our_temperature = air_contents.return_temperature() @@ -565,7 +565,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister()) protected_contents = FALSE if(shielding_powered) var/power_factor = round(log(10, max(our_pressure - pressure_limit, 1)) + log(10, max(our_temperature - temp_limit, 1))) - var/power_consumed = power_factor * 250 * delta_time + var/power_consumed = power_factor * 250 * seconds_per_tick if(powered(AREA_USAGE_EQUIP, ignore_use_power = TRUE)) use_power(power_consumed, AREA_USAGE_EQUIP) protected_contents = TRUE diff --git a/code/modules/capture_the_flag/ctf_game.dm b/code/modules/capture_the_flag/ctf_game.dm index 61230f173a7..b489ae48ec1 100644 --- a/code/modules/capture_the_flag/ctf_game.dm +++ b/code/modules/capture_the_flag/ctf_game.dm @@ -113,7 +113,7 @@ to_chat(user, span_userdanger("You are now a member of [src.team]. Get the enemy flag and bring it back to your team's controller!")) ctf_game.add_player(team, user.ckey) var/client/new_team_member = user.client - spawn_team_member(new_team_member) + spawn_team_member(new_team_member) /obj/machinery/ctf/spawner/Topic(href, href_list) if(href_list["join"]) @@ -337,10 +337,10 @@ ctf_game.control_points.Remove(src) return ..() -/obj/machinery/ctf/control_point/process(delta_time) +/obj/machinery/ctf/control_point/process(seconds_per_tick) if(controlling_team) - ctf_game.control_point_scoring(controlling_team, point_rate * delta_time) - + ctf_game.control_point_scoring(controlling_team, point_rate * seconds_per_tick) + var/scores if(ctf_game.ctf_enabled) @@ -348,10 +348,10 @@ var/datum/ctf_team/ctf_team = ctf_game.teams[team] scores += UNLINT("[ctf_team.team_color] - [ctf_team.points]/[ctf_game.points_to_win]\n") balloon_alert_to_viewers(scores) - + /obj/machinery/ctf/control_point/attackby(mob/user, params) capture(user) - + /obj/machinery/ctf/control_point/attack_hand(mob/user, list/modifiers) . = ..() if(.) diff --git a/code/modules/cargo/markets/market_telepad.dm b/code/modules/cargo/markets/market_telepad.dm index f5a3e412917..2c077e721bb 100644 --- a/code/modules/cargo/markets/market_telepad.dm +++ b/code/modules/cargo/markets/market_telepad.dm @@ -69,12 +69,12 @@ return queue += purchase -/obj/machinery/ltsrbt/process(delta_time) +/obj/machinery/ltsrbt/process(seconds_per_tick) if(machine_stat & NOPOWER) return if(recharge_cooldown > 0) - recharge_cooldown -= delta_time + recharge_cooldown -= seconds_per_tick return var/turf/T = get_turf(src) diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index 98d3b5f157e..21019939529 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -96,7 +96,7 @@ items += "Cell Charge: [cell ? "[round(cell.percent(), 0.1)]%" : "No Cell!"]" // Space Suit temperature regulation and power usage -/obj/item/clothing/suit/space/process(delta_time) +/obj/item/clothing/suit/space/process(seconds_per_tick) var/mob/living/carbon/human/user = loc if(!user || !ishuman(user) || user.wear_suit != src) return @@ -120,7 +120,7 @@ // If we got here, it means thermals are on, the cell is in and the cell has // just had enough charge subtracted from it to power the thermal regulator - user.adjust_bodytemperature(get_temp_change_amount((temperature_setting - user.bodytemperature), 0.08 * delta_time)) + user.adjust_bodytemperature(get_temp_change_amount((temperature_setting - user.bodytemperature), 0.08 * seconds_per_tick)) update_hud_icon(user) // Clean up the cell on destroy diff --git a/code/modules/escape_menu/details.dm b/code/modules/escape_menu/details.dm index 5a9a755a1cd..b40454c25d0 100644 --- a/code/modules/escape_menu/details.dm +++ b/code/modules/escape_menu/details.dm @@ -27,7 +27,7 @@ GLOBAL_DATUM(escape_menu_details, /atom/movable/screen/escape_menu/details) STOP_PROCESSING(SSescape_menu, src) return ..() -/atom/movable/screen/escape_menu/details/process(delta_time) +/atom/movable/screen/escape_menu/details/process(seconds_per_tick) update_text() /atom/movable/screen/escape_menu/details/proc/update_text() diff --git a/code/modules/escape_menu/home_page.dm b/code/modules/escape_menu/home_page.dm index df50db1aafb..eb536cfe78e 100644 --- a/code/modules/escape_menu/home_page.dm +++ b/code/modules/escape_menu/home_page.dm @@ -238,7 +238,7 @@ return TRUE -/atom/movable/screen/escape_menu/home_button/admin_help/process(delta_time) +/atom/movable/screen/escape_menu/home_button/admin_help/process(seconds_per_tick) if (world.time - last_blink_time < blink_interval) return diff --git a/code/modules/events/space_vines/vine_controller.dm b/code/modules/events/space_vines/vine_controller.dm index 5f01a33a8ee..d4d00ac3181 100644 --- a/code/modules/events/space_vines/vine_controller.dm +++ b/code/modules/events/space_vines/vine_controller.dm @@ -105,7 +105,7 @@ qdel(src) /// Life cycle of a space vine -/datum/spacevine_controller/process(delta_time) +/datum/spacevine_controller/process(seconds_per_tick) var/vine_count = length(vines) if(!vine_count) qdel(src) //space vines exterminated. Remove the controller @@ -116,7 +116,7 @@ /// Base spread rate, depends solely on spread multiplier and vine count var/spread_base = 0.5 * vine_count / spread_multiplier /// Actual maximum spread rate for this process tick - var/spread_max = round(clamp(delta_time * (spread_base + start_spread_bonus), max(delta_time * minimum_spread_rate, 1), spread_cap)) + var/spread_max = round(clamp(seconds_per_tick * (spread_base + start_spread_bonus), max(seconds_per_tick * minimum_spread_rate, 1), spread_cap)) var/amount_processed = 0 for(var/obj/structure/spacevine/vine in growth_queue) if(!vine.can_spread) @@ -128,7 +128,7 @@ if(vine.growth_stage >= 2) //If tile is fully grown vine.entangle_mob() - else if(DT_PROB(10, delta_time)) //If tile isn't fully grown + else if(SPT_PROB(10, seconds_per_tick)) //If tile isn't fully grown vine.grow() vine.spread() diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm index 794a9dc33e4..8e6f6bf6a31 100644 --- a/code/modules/fishing/fish/_fish.dm +++ b/code/modules/fishing/fish/_fish.dm @@ -194,11 +194,11 @@ else stop_flopping() -/obj/item/fish/process(delta_time) +/obj/item/fish/process(seconds_per_tick) if(in_stasis || status != FISH_ALIVE) return - process_health(delta_time) + process_health(seconds_per_tick) if(ready_to_reproduce()) try_to_reproduce() @@ -242,7 +242,7 @@ return FALSE return TRUE -/obj/item/fish/proc/process_health(delta_time) +/obj/item/fish/proc/process_health(seconds_per_tick) var/health_change_per_second = 0 if(!proper_environment()) health_change_per_second -= 3 //Dying here @@ -250,7 +250,7 @@ health_change_per_second -= 0.5 //Starving else health_change_per_second += 0.5 //Slowly healing - adjust_health(health + health_change_per_second * delta_time) + adjust_health(health + health_change_per_second * seconds_per_tick) /obj/item/fish/proc/adjust_health(amt) health = clamp(amt, 0, initial(health)) diff --git a/code/modules/fishing/fish/fish_types.dm b/code/modules/fishing/fish/fish_types.dm index c96ff4221ba..fe6f634fce8 100644 --- a/code/modules/fishing/fish/fish_types.dm +++ b/code/modules/fishing/fish/fish_types.dm @@ -220,17 +220,17 @@ required_fluid_type = AQUARIUM_FLUID_ANADROMOUS stable_population = 3 -/obj/item/fish/emulsijack/process(delta_time) +/obj/item/fish/emulsijack/process(seconds_per_tick) var/emulsified = FALSE var/obj/structure/aquarium/aquarium = loc if(istype(aquarium)) for(var/obj/item/fish/victim in aquarium) if(istype(victim, /obj/item/fish/emulsijack)) continue //no team killing - victim.adjust_health((victim.health - 3) * delta_time) //the victim may heal a bit but this will quickly kill + victim.adjust_health((victim.health - 3) * seconds_per_tick) //the victim may heal a bit but this will quickly kill emulsified = TRUE if(emulsified) - adjust_health((health + 3) * delta_time) + adjust_health((health + 3) * seconds_per_tick) last_feeding = world.time //emulsijack feeds on the emulsion! ..() diff --git a/code/modules/food_and_drinks/machinery/deep_fryer.dm b/code/modules/food_and_drinks/machinery/deep_fryer.dm index 39ecade39a7..4f0b0c72829 100644 --- a/code/modules/food_and_drinks/machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/machinery/deep_fryer.dm @@ -129,7 +129,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( return ..() -/obj/machinery/deepfryer/process(delta_time) +/obj/machinery/deepfryer/process(seconds_per_tick) ..() var/datum/reagent/consumable/cooking_oil/frying_oil = reagents.has_reagent(/datum/reagent/consumable/cooking_oil) if(!frying_oil) @@ -138,8 +138,8 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( if(!frying) return - reagents.trans_to(frying, oil_use * delta_time, multiplier = fry_speed * 3) //Fried foods gain more of the reagent thanks to space magic - cook_time += fry_speed * delta_time + reagents.trans_to(frying, oil_use * seconds_per_tick, multiplier = fry_speed * 3) //Fried foods gain more of the reagent thanks to space magic + cook_time += fry_speed * seconds_per_tick if(cook_time >= DEEPFRYER_COOKTIME && !frying_fried) frying_fried = TRUE //frying... frying... fried playsound(src.loc, 'sound/machines/ding.ogg', 50, TRUE) diff --git a/code/modules/food_and_drinks/machinery/griddle.dm b/code/modules/food_and_drinks/machinery/griddle.dm index 2bb01f65e57..b14ee4ef2a6 100644 --- a/code/modules/food_and_drinks/machinery/griddle.dm +++ b/code/modules/food_and_drinks/machinery/griddle.dm @@ -152,9 +152,9 @@ to_chat(user, span_notice("You dump out [storage_source] onto [src].")) return STORAGE_DUMP_HANDLED -/obj/machinery/griddle/process(delta_time) +/obj/machinery/griddle/process(seconds_per_tick) for(var/obj/item/griddled_item as anything in griddled_objects) - if(SEND_SIGNAL(griddled_item, COMSIG_ITEM_GRILL_PROCESS, src, delta_time) & COMPONENT_HANDLED_GRILLING) + if(SEND_SIGNAL(griddled_item, COMSIG_ITEM_GRILL_PROCESS, src, seconds_per_tick) & COMPONENT_HANDLED_GRILLING) continue griddled_item.fire_act(1000) //Hot hot hot! if(prob(10)) diff --git a/code/modules/food_and_drinks/machinery/grill.dm b/code/modules/food_and_drinks/machinery/grill.dm index 6c5531ba77e..7d11dd7ef99 100644 --- a/code/modules/food_and_drinks/machinery/grill.dm +++ b/code/modules/food_and_drinks/machinery/grill.dm @@ -77,22 +77,22 @@ ..() -/obj/machinery/grill/process(delta_time) +/obj/machinery/grill/process(seconds_per_tick) ..() update_appearance() if(grill_fuel <= 0) return else - grill_fuel -= GRILL_FUELUSAGE_IDLE * delta_time - if(DT_PROB(0.5, delta_time)) + grill_fuel -= GRILL_FUELUSAGE_IDLE * seconds_per_tick + if(SPT_PROB(0.5, seconds_per_tick)) var/datum/effect_system/fluid_spread/smoke/bad/smoke = new smoke.set_up(1, holder = src, location = loc) smoke.start() if(grilled_item) - SEND_SIGNAL(grilled_item, COMSIG_ITEM_GRILL_PROCESS, src, delta_time) - grill_time += delta_time - grilled_item.reagents.add_reagent(/datum/reagent/consumable/char, 0.5 * delta_time) - grill_fuel -= GRILL_FUELUSAGE_ACTIVE * delta_time + SEND_SIGNAL(grilled_item, COMSIG_ITEM_GRILL_PROCESS, src, seconds_per_tick) + grill_time += seconds_per_tick + grilled_item.reagents.add_reagent(/datum/reagent/consumable/char, 0.5 * seconds_per_tick) + grill_fuel -= GRILL_FUELUSAGE_ACTIVE * seconds_per_tick grilled_item.AddComponent(/datum/component/sizzle) /obj/machinery/grill/Exited(atom/movable/gone, direction) diff --git a/code/modules/food_and_drinks/machinery/oven.dm b/code/modules/food_and_drinks/machinery/oven.dm index a63b41ef58e..077d775a442 100644 --- a/code/modules/food_and_drinks/machinery/oven.dm +++ b/code/modules/food_and_drinks/machinery/oven.dm @@ -65,7 +65,7 @@ if(length(used_tray?.contents)) . += emissive_appearance(icon, "[base_icon_state]_light_mask", src, alpha = src.alpha) -/obj/machinery/oven/process(delta_time) +/obj/machinery/oven/process(seconds_per_tick) if(!appears_active()) set_smoke_state(OVEN_SMOKE_STATE_NONE) update_baking_audio() @@ -77,7 +77,7 @@ var/worst_cooked_food_state = 0 for(var/obj/item/baked_item in used_tray.contents) - var/signal_result = SEND_SIGNAL(baked_item, COMSIG_ITEM_OVEN_PROCESS, src, delta_time) + var/signal_result = SEND_SIGNAL(baked_item, COMSIG_ITEM_OVEN_PROCESS, src, seconds_per_tick) if(signal_result & COMPONENT_HANDLED_BAKING) //This means something responded to us baking! if(signal_result & COMPONENT_BAKING_GOOD_RESULT && worst_cooked_food_state < OVEN_SMOKE_STATE_GOOD) @@ -89,7 +89,7 @@ worst_cooked_food_state = OVEN_SMOKE_STATE_BAD baked_item.fire_act(1000) //Hot hot hot! - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) visible_message(span_danger("You smell a burnt smell coming from [src]!")) set_smoke_state(worst_cooked_food_state) update_appearance() diff --git a/code/modules/food_and_drinks/machinery/smartfridge.dm b/code/modules/food_and_drinks/machinery/smartfridge.dm index 4b195bb4a35..5f0b0d9c557 100644 --- a/code/modules/food_and_drinks/machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/machinery/smartfridge.dm @@ -454,9 +454,9 @@ max_n_of_items = 20 * matter_bin.tier repair_rate = max(0, STANDARD_ORGAN_HEALING * (matter_bin.tier - 1) * 0.5) -/obj/machinery/smartfridge/organ/process(delta_time) +/obj/machinery/smartfridge/organ/process(seconds_per_tick) for(var/obj/item/organ/organ in contents) - organ.apply_organ_damage(-repair_rate * organ.maxHealth * delta_time) + organ.apply_organ_damage(-repair_rate * organ.maxHealth * seconds_per_tick) /obj/machinery/smartfridge/organ/Exited(atom/movable/gone, direction) . = ..() diff --git a/code/modules/food_and_drinks/machinery/stove_component.dm b/code/modules/food_and_drinks/machinery/stove_component.dm index cb3e4e051fa..c4dc9f7bd3e 100644 --- a/code/modules/food_and_drinks/machinery/stove_component.dm +++ b/code/modules/food_and_drinks/machinery/stove_component.dm @@ -67,7 +67,7 @@ COMSIG_MACHINERY_REFRESH_PARTS, )) -/datum/component/stove/process(delta_time) +/datum/component/stove/process(seconds_per_tick) var/obj/machinery/real_parent = parent if(real_parent.machine_stat & NOPOWER) turn_off() diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm index d56647abd49..ee19edaea76 100644 --- a/code/modules/food_and_drinks/pizzabox.dm +++ b/code/modules/food_and_drinks/pizzabox.dm @@ -232,10 +232,10 @@ wires.interact(user) ..() -/obj/item/pizzabox/process(delta_time) +/obj/item/pizzabox/process(seconds_per_tick) if(bomb_active && !bomb_defused && (bomb_timer > 0)) playsound(loc, 'sound/items/timer.ogg', 50, FALSE) - bomb_timer -= delta_time + bomb_timer -= seconds_per_tick if(bomb_active && !bomb_defused && (bomb_timer <= 0)) if(bomb in src) bomb.detonate() diff --git a/code/modules/food_and_drinks/restaurant/_venue.dm b/code/modules/food_and_drinks/restaurant/_venue.dm index b31edd5ead8..4c3bc1dbfaa 100644 --- a/code/modules/food_and_drinks/restaurant/_venue.dm +++ b/code/modules/food_and_drinks/restaurant/_venue.dm @@ -31,7 +31,7 @@ ///Seats linked to this venue, assoc list of key holosign of seat position, and value of robot assigned to it, if any. var/list/linked_seats = list() -/datum/venue/process(delta_time) +/datum/venue/process(seconds_per_tick) if(!COOLDOWN_FINISHED(src, visit_cooldown)) return COOLDOWN_START(src, visit_cooldown, rand(min_time_between_visitor, max_time_between_visitor)) diff --git a/code/modules/hallucination/bolted_airlocks.dm b/code/modules/hallucination/bolted_airlocks.dm index 9977365efcd..d805a528a3d 100644 --- a/code/modules/hallucination/bolted_airlocks.dm +++ b/code/modules/hallucination/bolted_airlocks.dm @@ -26,11 +26,11 @@ START_PROCESSING(SSfastprocess, src) return TRUE -/datum/hallucination/bolts/process(delta_time) +/datum/hallucination/bolts/process(seconds_per_tick) if(QDELETED(src)) return - next_action -= (delta_time * 10) + next_action -= (seconds_per_tick * 10) if(next_action > 0) return diff --git a/code/modules/hallucination/hazard.dm b/code/modules/hallucination/hazard.dm index 0d8419661ff..7209087d4be 100644 --- a/code/modules/hallucination/hazard.dm +++ b/code/modules/hallucination/hazard.dm @@ -94,8 +94,8 @@ STOP_PROCESSING(SSobj, src) return ..() -/obj/effect/client_image_holder/hallucination/danger/anomaly/process(delta_time) - if(DT_PROB(ANOMALY_MOVECHANCE, delta_time)) +/obj/effect/client_image_holder/hallucination/danger/anomaly/process(seconds_per_tick) + if(SPT_PROB(ANOMALY_MOVECHANCE, seconds_per_tick)) step(src, pick(GLOB.alldirs)) /obj/effect/client_image_holder/hallucination/danger/anomaly/on_hallucinator_entered(mob/living/afflicted) diff --git a/code/modules/hallucination/on_fire.dm b/code/modules/hallucination/on_fire.dm index 21b901fa62b..cb4a95dd442 100644 --- a/code/modules/hallucination/on_fire.dm +++ b/code/modules/hallucination/on_fire.dm @@ -63,17 +63,17 @@ START_PROCESSING(SSfastprocess, src) -/datum/hallucination/fire/process(delta_time) +/datum/hallucination/fire/process(seconds_per_tick) if(QDELETED(src)) return if(hallucinator.fire_stacks <= 0) clear_fire() - time_spent += delta_time + time_spent += seconds_per_tick if(fire_clearing) - next_action -= delta_time + next_action -= seconds_per_tick if(next_action < 0) stage -= 1 update_temp() @@ -89,7 +89,7 @@ increasing_stages = FALSE else if(times_to_lower_stamina) - next_action -= delta_time + next_action -= seconds_per_tick if(next_action < 0) hallucinator.adjustStaminaLoss(15) next_action += 2 diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index 2f6b1d1053f..da7e44c64dc 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -331,10 +331,10 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf spawned -= to_remove UnregisterSignal(to_remove, COMSIG_PARENT_QDELETING) -/obj/machinery/computer/holodeck/process(delta_time) - if(damaged && DT_PROB(5, delta_time)) +/obj/machinery/computer/holodeck/process(seconds_per_tick) + if(damaged && SPT_PROB(5, seconds_per_tick)) for(var/turf/holo_turf in linked) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) do_sparks(2, 1, holo_turf) return . = ..() diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 4462f617b31..fc35ffc1014 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -245,7 +245,7 @@ update_appearance() -/obj/machinery/biogenerator/process(delta_time) +/obj/machinery/biogenerator/process(seconds_per_tick) if(!processing) return @@ -265,7 +265,7 @@ convert_to_biomass(food_to_convert) - use_power(active_power_usage * delta_time) + use_power(active_power_usage * seconds_per_tick) if(!current_item_count) stop_process(FALSE) diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm index ded97e4218f..a2fee2eb760 100644 --- a/code/modules/hydroponics/fermenting_barrel.dm +++ b/code/modules/hydroponics/fermenting_barrel.dm @@ -132,7 +132,7 @@ soundloop.stop() STOP_PROCESSING(SSobj, src) -/obj/structure/fermenting_barrel/process(delta_time) +/obj/structure/fermenting_barrel/process(seconds_per_tick) process_fermentation() /// Lil gunpowder barrel fer pirates since it's a nice reagent holder diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 90ff669281b..18d5f1463dc 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -299,14 +299,14 @@ if((machine_stat & NOPOWER) && self_sustaining) set_self_sustaining(FALSE) -/obj/machinery/hydroponics/process(delta_time) +/obj/machinery/hydroponics/process(seconds_per_tick) var/needs_update = FALSE // Checks if the icon needs updating so we don't redraw empty trays every time if(self_sustaining) if(powered()) - adjust_waterlevel(rand(1,2) * delta_time * 0.5) - adjust_weedlevel(-0.5 * delta_time) - adjust_pestlevel(-0.5 * delta_time) + adjust_waterlevel(rand(1,2) * seconds_per_tick * 0.5) + adjust_weedlevel(-0.5 * seconds_per_tick) + adjust_pestlevel(-0.5 * seconds_per_tick) else set_self_sustaining(FALSE) visible_message(span_warning("[name]'s auto-grow functionality shuts off!")) diff --git a/code/modules/hydroponics/unique_plant_genes.dm b/code/modules/hydroponics/unique_plant_genes.dm index 5f2a8e0aad4..738d1dc103d 100644 --- a/code/modules/hydroponics/unique_plant_genes.dm +++ b/code/modules/hydroponics/unique_plant_genes.dm @@ -294,7 +294,7 @@ * The processing of our trait. Heats up the mob ([held_mob]) currently holding the source plant ([our_chili]). * Stops processing if we're no longer being held by [held mob]. */ -/datum/plant_gene/trait/backfire/chili_heat/process(delta_time) +/datum/plant_gene/trait/backfire/chili_heat/process(seconds_per_tick) var/mob/living/carbon/our_mob = held_mob?.resolve() var/obj/item/our_plant = our_chili?.resolve() @@ -303,8 +303,8 @@ stop_backfire_effect() return - our_mob.adjust_bodytemperature(7.5 * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time) - if(DT_PROB(5, delta_time)) + our_mob.adjust_bodytemperature(7.5 * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick) + if(SPT_PROB(5, seconds_per_tick)) to_chat(our_mob, span_warning("Your hand holding [our_plant] burns!")) /// Bluespace Tomato squashing on the user on backfire @@ -664,7 +664,7 @@ /* * If the conditions are acceptable and the potency is high enough, release miasma into the air. */ -/datum/plant_gene/trait/gas_production/process(delta_time) +/datum/plant_gene/trait/gas_production/process(seconds_per_tick) var/obj/item/seeds/seed = stinky_seed?.resolve() var/obj/machinery/hydroponics/tray = home_tray?.resolve() @@ -679,7 +679,7 @@ var/datum/gas_mixture/stank = new ADD_GAS(/datum/gas/miasma, stank.gases) - stank.gases[/datum/gas/miasma][MOLES] = (seed.yield + 6) * 3.5 * MIASMA_CORPSE_MOLES * delta_time // this process is only being called about 2/7 as much as corpses so this is 12-32 times a corpses + stank.gases[/datum/gas/miasma][MOLES] = (seed.yield + 6) * 3.5 * MIASMA_CORPSE_MOLES * seconds_per_tick // this process is only being called about 2/7 as much as corpses so this is 12-32 times a corpses stank.temperature = T20C // without this the room would eventually freeze and miasma mining would be easier tray_turf.assume_air(stank) diff --git a/code/modules/industrial_lift/tram/tram_lift_master.dm b/code/modules/industrial_lift/tram/tram_lift_master.dm index 84f48c659ea..c21ed7b7af1 100644 --- a/code/modules/industrial_lift/tram/tram_lift_master.dm +++ b/code/modules/industrial_lift/tram/tram_lift_master.dm @@ -142,7 +142,7 @@ START_PROCESSING(SStramprocess, src) -/datum/lift_master/tram/process(delta_time) +/datum/lift_master/tram/process(seconds_per_tick) if(!travel_distance) update_tram_doors(OPEN_DOORS) addtimer(CALLBACK(src, PROC_REF(unlock_controls)), 2 SECONDS) diff --git a/code/modules/meteors/meteor_dark_matteor.dm b/code/modules/meteors/meteor_dark_matteor.dm index 3c01878e1c0..f9656050482 100644 --- a/code/modules/meteors/meteor_dark_matteor.dm +++ b/code/modules/meteors/meteor_dark_matteor.dm @@ -31,10 +31,10 @@ spark_system.attach(src) START_PROCESSING(SSobj, src) -/obj/effect/meteor/dark_matteor/process(delta_time) +/obj/effect/meteor/dark_matteor/process(seconds_per_tick) //meteor's warp quickly contracts then slowly expands it's ring - animate(warp, time = delta_time*3, transform = matrix().Scale(0.5,0.5)) - animate(time = delta_time*7, transform = matrix()) + animate(warp, time = seconds_per_tick*3, transform = matrix().Scale(0.5,0.5)) + animate(time = seconds_per_tick*7, transform = matrix()) /obj/effect/meteor/dark_matteor/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents) . = ..() diff --git a/code/modules/mining/equipment/monster_organs/brimdust_sac.dm b/code/modules/mining/equipment/monster_organs/brimdust_sac.dm index dcacc4a6457..1051962bbb8 100644 --- a/code/modules/mining/equipment/monster_organs/brimdust_sac.dm +++ b/code/modules/mining/equipment/monster_organs/brimdust_sac.dm @@ -33,7 +33,7 @@ qdel(src) // Every x seconds, if on lavaland, add one stack -/obj/item/organ/internal/monster_core/brimdust_sac/on_life(delta_time, times_fired) +/obj/item/organ/internal/monster_core/brimdust_sac/on_life(seconds_per_tick, times_fired) . = ..() 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 94ceca1ce66..bb56b773d73 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/internal/monster_core/regenerative_core/on_life(delta_time, times_fired) +/obj/item/organ/internal/monster_core/regenerative_core/on_life(seconds_per_tick, times_fired) . = ..() if (owner.health <= owner.crit_threshold) trigger_organ_action() diff --git a/code/modules/mining/equipment/monster_organs/rush_gland.dm b/code/modules/mining/equipment/monster_organs/rush_gland.dm index 4d2ce9ae529..f716f51d7dd 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/internal/monster_core/rush_gland/on_life(delta_time, times_fired) +/obj/item/organ/internal/monster_core/rush_gland/on_life(seconds_per_tick, times_fired) . = ..() if (owner.health <= HEALTH_DANGER_ZONE) trigger_organ_action() diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm index 21f11d1c45d..1989091a04a 100644 --- a/code/modules/mining/lavaland/megafauna_loot.dm +++ b/code/modules/mining/lavaland/megafauna_loot.dm @@ -284,10 +284,10 @@ AddElement(/datum/element/radiation_protected_clothing) AddComponent(/datum/component/gags_recolorable) -/obj/item/clothing/suit/hooded/hostile_environment/process(delta_time) +/obj/item/clothing/suit/hooded/hostile_environment/process(seconds_per_tick) . = ..() var/mob/living/carbon/wearer = loc - if(istype(wearer) && DT_PROB(1, delta_time)) //cursed by bubblegum + if(istype(wearer) && SPT_PROB(1, seconds_per_tick)) //cursed by bubblegum if(prob(7.5)) wearer.cause_hallucination(/datum/hallucination/oh_yeah, "H.E.C.K suit", haunt_them = TRUE) else @@ -593,10 +593,10 @@ . = ..() . += "Blood: [blood_level]/[MAX_BLOOD_LEVEL]" -/mob/living/simple_animal/soulscythe/Life(delta_time, times_fired) +/mob/living/simple_animal/soulscythe/Life(seconds_per_tick, times_fired) . = ..() if(!stat) - blood_level = min(MAX_BLOOD_LEVEL, blood_level + round(1 * delta_time)) + blood_level = min(MAX_BLOOD_LEVEL, blood_level + round(1 * seconds_per_tick)) /obj/projectile/soulscythe name = "soulslash" diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm index 93543500d72..93594321a37 100644 --- a/code/modules/mining/lavaland/tendril_loot.dm +++ b/code/modules/mining/lavaland/tendril_loot.dm @@ -724,9 +724,9 @@ . = ..() . += span_notice("Berserk mode is [berserk_charge]% charged.") -/obj/item/clothing/head/hooded/berserker/process(delta_time) +/obj/item/clothing/head/hooded/berserker/process(seconds_per_tick) if(berserk_active) - berserk_charge = clamp(berserk_charge - CHARGE_DRAINED_PER_SECOND * delta_time, 0, MAX_BERSERK_CHARGE) + berserk_charge = clamp(berserk_charge - CHARGE_DRAINED_PER_SECOND * seconds_per_tick, 0, MAX_BERSERK_CHARGE) if(!berserk_charge) if(ishuman(loc)) end_berserk(loc) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 7d0c66c6ba3..13daabaffaa 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -216,7 +216,7 @@ if(istype(target, /obj/item/stack/ore)) process_ore(target) -/obj/machinery/mineral/processing_unit/process(delta_time) +/obj/machinery/mineral/processing_unit/process(seconds_per_tick) if(!on) end_processing() if(mineral_machine) @@ -224,32 +224,32 @@ return if(selected_material) - smelt_ore(delta_time) + smelt_ore(seconds_per_tick) else if(selected_alloy) - smelt_alloy(delta_time) + smelt_alloy(seconds_per_tick) if(mineral_machine) mineral_machine.updateUsrDialog() -/obj/machinery/mineral/processing_unit/proc/smelt_ore(delta_time = 2) +/obj/machinery/mineral/processing_unit/proc/smelt_ore(seconds_per_tick = 2) var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) var/datum/material/mat = selected_material if(!mat) return - var/sheets_to_remove = (materials.materials[mat] >= (MINERAL_MATERIAL_AMOUNT * SMELT_AMOUNT * delta_time) ) ? SMELT_AMOUNT * delta_time : round(materials.materials[mat] / MINERAL_MATERIAL_AMOUNT) + var/sheets_to_remove = (materials.materials[mat] >= (MINERAL_MATERIAL_AMOUNT * SMELT_AMOUNT * seconds_per_tick) ) ? SMELT_AMOUNT * seconds_per_tick : round(materials.materials[mat] / MINERAL_MATERIAL_AMOUNT) if(!sheets_to_remove) on = FALSE else var/out = get_step(src, output_dir) materials.retrieve_sheets(sheets_to_remove, mat, out) -/obj/machinery/mineral/processing_unit/proc/smelt_alloy(delta_time = 2) +/obj/machinery/mineral/processing_unit/proc/smelt_alloy(seconds_per_tick = 2) var/datum/design/alloy = stored_research.isDesignResearchedID(selected_alloy) //check if it's a valid design if(!alloy) on = FALSE return - var/amount = can_smelt(alloy, delta_time) + var/amount = can_smelt(alloy, seconds_per_tick) if(!amount) on = FALSE @@ -260,11 +260,11 @@ generate_mineral(alloy.build_path) -/obj/machinery/mineral/processing_unit/proc/can_smelt(datum/design/D, delta_time = 2) +/obj/machinery/mineral/processing_unit/proc/can_smelt(datum/design/D, seconds_per_tick = 2) if(D.make_reagent) return FALSE - var/build_amount = SMELT_AMOUNT * delta_time + var/build_amount = SMELT_AMOUNT * seconds_per_tick var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) diff --git a/code/modules/mob/living/basic/basic.dm b/code/modules/mob/living/basic/basic.dm index 6fbde7470c3..2d9709bd44d 100644 --- a/code/modules/mob/living/basic/basic.dm +++ b/code/modules/mob/living/basic/basic.dm @@ -123,10 +123,10 @@ if(unsuitable_cold_damage != 0 && unsuitable_heat_damage != 0) AddElement(/datum/element/basic_body_temp_sensitive, minimum_survivable_temperature, maximum_survivable_temperature, unsuitable_cold_damage, unsuitable_heat_damage) -/mob/living/basic/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/basic/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() if(staminaloss > 0) - adjustStaminaLoss(-stamina_recovery * delta_time, forced = TRUE) + adjustStaminaLoss(-stamina_recovery * seconds_per_tick, forced = TRUE) /mob/living/basic/say_mod(input, list/message_mods = list()) if(length(speak_emote)) @@ -214,8 +214,8 @@ /mob/living/basic/update_stamina() set_varspeed(initial(speed) + (staminaloss * 0.06)) -/mob/living/basic/on_fire_stack(delta_time, times_fired, datum/status_effect/fire_handler/fire_stacks/fire_handler) - adjust_bodytemperature((maximum_survivable_temperature + (fire_handler.stacks * 12)) * 0.5 * delta_time) +/mob/living/basic/on_fire_stack(seconds_per_tick, times_fired, datum/status_effect/fire_handler/fire_stacks/fire_handler) + adjust_bodytemperature((maximum_survivable_temperature + (fire_handler.stacks * 12)) * 0.5 * seconds_per_tick) /mob/living/basic/update_fire_overlay(stacks, on_fire, last_icon_state, suffix = "") var/mutable_appearance/fire_overlay = mutable_appearance('icons/mob/effects/onfire.dmi', "generic_fire") diff --git a/code/modules/mob/living/basic/heretic/star_gazer.dm b/code/modules/mob/living/basic/heretic/star_gazer.dm index 195e8773a98..f6eeb755994 100644 --- a/code/modules/mob/living/basic/heretic/star_gazer.dm +++ b/code/modules/mob/living/basic/heretic/star_gazer.dm @@ -84,7 +84,7 @@ /datum/ai_behavior/basic_melee_attack/star_gazer action_cooldown = 0.6 SECONDS -/datum/ai_behavior/basic_melee_attack/star_gazer/perform(delta_time, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key) +/datum/ai_behavior/basic_melee_attack/star_gazer/perform(seconds_per_tick, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key) . = ..() var/datum/weakref/weak_target = controller.blackboard[target_key] var/atom/target = weak_target?.resolve() diff --git a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_ai.dm b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_ai.dm index f6205a341bd..2877dd2909b 100644 --- a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_ai.dm +++ b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_ai.dm @@ -11,7 +11,7 @@ /datum/ai_planning_subtree/bileworm_attack -/datum/ai_planning_subtree/bileworm_attack/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/bileworm_attack/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) var/datum/weakref/weak_target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET] var/mob/living/target = weak_target?.resolve() @@ -31,7 +31,7 @@ /datum/ai_planning_subtree/bileworm_execute -/datum/ai_planning_subtree/bileworm_execute/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/bileworm_execute/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) var/datum/weakref/weak_target = controller.blackboard[BB_BASIC_MOB_EXECUTION_TARGET] var/mob/living/target = weak_target?.resolve() diff --git a/code/modules/mob/living/basic/pets/dog.dm b/code/modules/mob/living/basic/pets/dog.dm index 12fead972d2..58ddb141a3b 100644 --- a/code/modules/mob/living/basic/pets/dog.dm +++ b/code/modules/mob/living/basic/pets/dog.dm @@ -560,7 +560,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list( is_slow = TRUE speed = 2 -/mob/living/basic/pet/dog/corgi/ian/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/basic/pet/dog/corgi/ian/Life(seconds_per_tick = SSMOBS_DT, times_fired) if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved) Write_Memory(FALSE) memory_saved = TRUE @@ -635,7 +635,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list( unique_pet = TRUE held_state = "narsian" -/mob/living/basic/pet/dog/corgi/narsie/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/basic/pet/dog/corgi/narsie/Life(seconds_per_tick = SSMOBS_DT, times_fired) ..() for(var/mob/living/simple_animal/pet/P in range(1, src)) if(P != src && !istype(P,/mob/living/basic/pet/dog/corgi/narsie)) @@ -822,13 +822,13 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list( to_chat(src, span_notice("Your name is now [new_name]!")) name = new_name -/mob/living/basic/pet/dog/breaddog/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/basic/pet/dog/breaddog/Life(seconds_per_tick = SSMOBS_DT, times_fired) ..() if(stat) return if(health < maxHealth) - adjustBruteLoss(-4 * delta_time) //Fast life regen + adjustBruteLoss(-4 * seconds_per_tick) //Fast life regen for(var/mob/living/carbon/humanoid_entities in view(3, src)) //Mood aura which stay as long you do not wear Sanallite as hat or carry(I will try to make it work with hat someday(obviously weaker than normal one)) humanoid_entities.add_mood_event("kobun", /datum/mood_event/kobun) diff --git a/code/modules/mob/living/basic/space_fauna/carp/carp_ai_actions.dm b/code/modules/mob/living/basic/space_fauna/carp/carp_ai_actions.dm index af71b4a167c..0f35ab97625 100644 --- a/code/modules/mob/living/basic/space_fauna/carp/carp_ai_actions.dm +++ b/code/modules/mob/living/basic/space_fauna/carp/carp_ai_actions.dm @@ -25,7 +25,7 @@ /// Interrupt your attack chain if: you have a spell, it's not on cooldown, and it has a target /datum/ai_behavior/basic_melee_attack/carp/magic -/datum/ai_behavior/basic_melee_attack/carp/magic/perform(delta_time, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key, health_ratio_key) +/datum/ai_behavior/basic_melee_attack/carp/magic/perform(seconds_per_tick, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key, health_ratio_key) var/datum/action/cooldown/using_action = controller.blackboard[BB_MAGICARP_SPELL] if (QDELETED(using_action)) return ..() @@ -41,7 +41,7 @@ */ /datum/ai_planning_subtree/find_nearest_magicarp_spell_target -/datum/ai_planning_subtree/find_nearest_magicarp_spell_target/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/find_nearest_magicarp_spell_target/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) var/datum/weakref/weak_action = controller.blackboard[BB_MAGICARP_SPELL] var/datum/action/cooldown/using_action = weak_action?.resolve() if (QDELETED(using_action)) diff --git a/code/modules/mob/living/basic/space_fauna/carp/carp_ai_migration.dm b/code/modules/mob/living/basic/space_fauna/carp/carp_ai_migration.dm index 86f57687456..ac7bccaa226 100644 --- a/code/modules/mob/living/basic/space_fauna/carp/carp_ai_migration.dm +++ b/code/modules/mob/living/basic/space_fauna/carp/carp_ai_migration.dm @@ -9,7 +9,7 @@ */ /datum/ai_planning_subtree/carp_migration -/datum/ai_planning_subtree/carp_migration/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/carp_migration/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() // If there's a rift nearby take a ride, then cancel everything else because it's not valid any more @@ -44,7 +44,7 @@ */ /datum/ai_behavior/find_next_carp_migration_step -/datum/ai_behavior/find_next_carp_migration_step/perform(delta_time, datum/ai_controller/controller, path_key, target_key) +/datum/ai_behavior/find_next_carp_migration_step/perform(seconds_per_tick, datum/ai_controller/controller, path_key, target_key) var/list/blackboard_points = controller.blackboard[path_key] var/list/potential_migration_points = blackboard_points.Copy() while (length(potential_migration_points)) diff --git a/code/modules/mob/living/basic/space_fauna/carp/carp_ai_rift_actions.dm b/code/modules/mob/living/basic/space_fauna/carp/carp_ai_rift_actions.dm index 9083467a8a0..d94e480493a 100644 --- a/code/modules/mob/living/basic/space_fauna/carp/carp_ai_rift_actions.dm +++ b/code/modules/mob/living/basic/space_fauna/carp/carp_ai_rift_actions.dm @@ -8,7 +8,7 @@ /// If true we finish planning after this var/finish_planning = FALSE -/datum/ai_planning_subtree/make_carp_rift/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/make_carp_rift/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) if (!rift_behaviour) CRASH("Forgot to specify rift behaviour for [src]") @@ -34,7 +34,7 @@ rift_behaviour = /datum/ai_behavior/make_carp_rift/away finish_planning = TRUE -/datum/ai_planning_subtree/make_carp_rift/panic_teleport/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/make_carp_rift/panic_teleport/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) if (!controller.blackboard[BB_BASIC_MOB_FLEEING]) return return ..() @@ -61,7 +61,7 @@ var/atom/target = weak_target?.resolve() return target -/datum/ai_behavior/make_carp_rift/perform(delta_time, datum/ai_controller/controller, ability_key, target_key) +/datum/ai_behavior/make_carp_rift/perform(seconds_per_tick, datum/ai_controller/controller, ability_key, target_key) . = ..() var/datum/weakref/weak_action = controller.blackboard[ability_key] var/datum/action/cooldown/mob_cooldown/lesser_carp_rift/ability = weak_action?.resolve() @@ -186,7 +186,7 @@ /// Minimum distance we should be from the target before we bother performing this action var/minimum_distance = 2 -/datum/ai_planning_subtree/shortcut_to_target_through_carp_rift/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/shortcut_to_target_through_carp_rift/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) var/datum/weakref/weak_target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET] var/mob/living/target = weak_target?.resolve() if (isnull(target)) diff --git a/code/modules/mob/living/basic/space_fauna/faithless.dm b/code/modules/mob/living/basic/space_fauna/faithless.dm index 3ccbfb2d61e..8b0fc1f3cd8 100644 --- a/code/modules/mob/living/basic/space_fauna/faithless.dm +++ b/code/modules/mob/living/basic/space_fauna/faithless.dm @@ -65,7 +65,7 @@ /// How long do we paralyze a target for if we attack them var/paralyze_duration = 2 SECONDS -/datum/ai_behavior/basic_melee_attack/faithless/perform(delta_time, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key) +/datum/ai_behavior/basic_melee_attack/faithless/perform(seconds_per_tick, datum/ai_controller/controller, target_key, targetting_datum_key, hiding_location_key) . = ..() var/datum/weakref/weak_target = controller.blackboard[target_key] var/atom/target = weak_target?.resolve() diff --git a/code/modules/mob/living/basic/space_fauna/giant_spider/spider_subtrees.dm b/code/modules/mob/living/basic/space_fauna/giant_spider/spider_subtrees.dm index dd11ceef92c..ad9015d8e1a 100644 --- a/code/modules/mob/living/basic/space_fauna/giant_spider/spider_subtrees.dm +++ b/code/modules/mob/living/basic/space_fauna/giant_spider/spider_subtrees.dm @@ -1,7 +1,7 @@ /// Search for a nearby location to put webs on /datum/ai_planning_subtree/find_unwebbed_turf -/datum/ai_planning_subtree/find_unwebbed_turf/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/find_unwebbed_turf/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) controller.queue_behavior(/datum/ai_behavior/find_unwebbed_turf) /// Find an unwebbed nearby turf and store it @@ -12,7 +12,7 @@ /// How far do we look for unwebbed turfs? var/scan_range = 3 -/datum/ai_behavior/find_unwebbed_turf/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/find_unwebbed_turf/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() var/mob/living/spider = controller.pawn var/datum/weakref/weak_target = controller.blackboard[target_key] @@ -53,7 +53,7 @@ /// Key where the target turf is stored var/target_key = BB_SPIDER_WEB_TARGET -/datum/ai_planning_subtree/spin_web/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/spin_web/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) var/datum/weakref/weak_action = controller.blackboard[action_key] var/datum/action/cooldown/using_action = weak_action?.resolve() var/datum/weakref/weak_target = controller.blackboard[target_key] @@ -80,7 +80,7 @@ set_movement_target(controller, target_turf) return ..() -/datum/ai_behavior/spin_web/perform(delta_time, datum/ai_controller/controller, action_key, target_key) +/datum/ai_behavior/spin_web/perform(seconds_per_tick, datum/ai_controller/controller, action_key, target_key) . = ..() var/datum/weakref/weak_action = controller.blackboard[action_key] var/datum/action/cooldown/web_action = weak_action?.resolve() 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 eeaa5bd5cfe..3df23393a60 100644 --- a/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm +++ b/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm @@ -49,11 +49,11 @@ var/chosen_sound = pick(migo_sounds) playsound(src, chosen_sound, 50, TRUE) -/mob/living/basic/migo/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/basic/migo/Life(seconds_per_tick = SSMOBS_DT, times_fired) ..() if(stat) return - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) var/chosen_sound = pick(migo_sounds) playsound(src, chosen_sound, 50, TRUE) diff --git a/code/modules/mob/living/basic/vermin/mouse.dm b/code/modules/mob/living/basic/vermin/mouse.dm index a84c9f71a4f..ca9c76b9456 100644 --- a/code/modules/mob/living/basic/vermin/mouse.dm +++ b/code/modules/mob/living/basic/vermin/mouse.dm @@ -378,7 +378,7 @@ /datum/ai_planning_subtree/flee_target/mouse -/datum/ai_planning_subtree/flee_target/mouse/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/flee_target/mouse/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) var/datum/weakref/hunting_weakref = controller.blackboard[BB_CURRENT_HUNTING_TARGET] var/atom/hunted_cheese = hunting_weakref?.resolve() if (!isnull(hunted_cheese)) diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index d9b36ddb86b..a3b1d9d3ba5 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -5,7 +5,7 @@ ****************************************************/ // Takes care blood loss and regeneration -/mob/living/carbon/human/handle_blood(delta_time, times_fired) +/mob/living/carbon/human/handle_blood(seconds_per_tick, times_fired) if(HAS_TRAIT(src, TRAIT_NOBLOOD) || (HAS_TRAIT(src, TRAIT_FAKEDEATH))) return @@ -29,38 +29,38 @@ nutrition_ratio = 1 if(satiety > 80) nutrition_ratio *= 1.25 - adjust_nutrition(-nutrition_ratio * HUNGER_FACTOR * delta_time) - blood_volume = min(blood_volume + (BLOOD_REGEN_FACTOR * nutrition_ratio * delta_time), BLOOD_VOLUME_NORMAL) + adjust_nutrition(-nutrition_ratio * HUNGER_FACTOR * seconds_per_tick) + blood_volume = min(blood_volume + (BLOOD_REGEN_FACTOR * nutrition_ratio * seconds_per_tick), BLOOD_VOLUME_NORMAL) // we call lose_blood() here rather than quirk/process() to make sure that the blood loss happens in sync with life() if(HAS_TRAIT(src, TRAIT_BLOOD_DEFICIENCY)) var/datum/quirk/blooddeficiency/blooddeficiency = get_quirk(/datum/quirk/blooddeficiency) if(!isnull(blooddeficiency)) - blooddeficiency.lose_blood(delta_time) + blooddeficiency.lose_blood(seconds_per_tick) //Effects of bloodloss var/word = pick("dizzy","woozy","faint") switch(blood_volume) if(BLOOD_VOLUME_EXCESS to BLOOD_VOLUME_MAX_LETHAL) - if(DT_PROB(7.5, delta_time)) + if(SPT_PROB(7.5, seconds_per_tick)) to_chat(src, span_userdanger("Blood starts to tear your skin apart. You're going to burst!")) investigate_log("has been gibbed by having too much blood.", INVESTIGATE_DEATHS) inflate_gib() if(BLOOD_VOLUME_MAXIMUM to BLOOD_VOLUME_EXCESS) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(src, span_warning("You feel terribly bloated.")) if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(src, span_warning("You feel [word].")) - adjustOxyLoss(round(0.005 * (BLOOD_VOLUME_NORMAL - blood_volume) * delta_time, 1)) + adjustOxyLoss(round(0.005 * (BLOOD_VOLUME_NORMAL - blood_volume) * seconds_per_tick, 1)) if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY) - adjustOxyLoss(round(0.01 * (BLOOD_VOLUME_NORMAL - blood_volume) * delta_time, 1)) - if(DT_PROB(2.5, delta_time)) + adjustOxyLoss(round(0.01 * (BLOOD_VOLUME_NORMAL - blood_volume) * seconds_per_tick, 1)) + if(SPT_PROB(2.5, seconds_per_tick)) set_eye_blur_if_lower(12 SECONDS) to_chat(src, span_warning("You feel very [word].")) if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD) - adjustOxyLoss(2.5 * delta_time) - if(DT_PROB(7.5, delta_time)) + adjustOxyLoss(2.5 * seconds_per_tick) + if(SPT_PROB(7.5, seconds_per_tick)) Unconscious(rand(20,60)) to_chat(src, span_warning("You feel extremely [word].")) if(-INFINITY to BLOOD_VOLUME_SURVIVE) @@ -72,7 +72,7 @@ //Bleeding out for(var/obj/item/bodypart/iter_part as anything in bodyparts) var/iter_bleed_rate = iter_part.get_modified_bleed_rate() - temp_bleed += iter_bleed_rate * delta_time + temp_bleed += iter_bleed_rate * seconds_per_tick if(iter_part.generic_bleedstacks) // If you don't have any bleedstacks, don't try and heal them iter_part.adjustBleedStacks(-1, 0) diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index 0b9f4cf6bba..78d78bcc7cb 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -270,7 +270,7 @@ owner.mind.set_current(null) return ..() -/obj/item/organ/internal/brain/on_life(delta_time, times_fired) +/obj/item/organ/internal/brain/on_life(seconds_per_tick, times_fired) if(damage >= BRAIN_DAMAGE_DEATH) //rip to_chat(owner, span_userdanger("The last spark of life in your brain fizzles out...")) owner.investigate_log("has been killed by brain damage.", INVESTIGATE_DEATHS) diff --git a/code/modules/mob/living/brain/life.dm b/code/modules/mob/living/brain/life.dm index 66f290e2feb..1cbc979d365 100644 --- a/code/modules/mob/living/brain/life.dm +++ b/code/modules/mob/living/brain/life.dm @@ -1,11 +1,11 @@ -/mob/living/brain/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/brain/Life(seconds_per_tick = SSMOBS_DT, times_fired) if (notransform) return if(!loc) return . = ..() - handle_emp_damage(delta_time, times_fired) + handle_emp_damage(seconds_per_tick, times_fired) /mob/living/brain/update_stat() if(status_flags & GODMODE) @@ -22,11 +22,11 @@ if(BR) BR.set_organ_damage(BRAIN_DAMAGE_DEATH) //beaten to a pulp -/mob/living/brain/proc/handle_emp_damage(delta_time, times_fired) +/mob/living/brain/proc/handle_emp_damage(seconds_per_tick, times_fired) if(!emp_damage) return if(stat == DEAD) emp_damage = 0 else - emp_damage = max(emp_damage - (0.5 * delta_time), 0) + emp_damage = max(emp_damage - (0.5 * seconds_per_tick), 0) diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 092a6806118..c5f85afd09e 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -45,7 +45,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, delta_time, times_fired) +/mob/living/carbon/alien/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired) // Run base mob body temperature proc before taking damage // this balances body temp to the environment and natural stabilization . = ..() @@ -55,18 +55,18 @@ throw_alert(ALERT_XENO_FIRE, /atom/movable/screen/alert/alien_fire) switch(bodytemperature) if(360 to 400) - apply_damage(HEAT_DAMAGE_LEVEL_1 * delta_time, BURN) + apply_damage(HEAT_DAMAGE_LEVEL_1 * seconds_per_tick, BURN) if(400 to 460) - apply_damage(HEAT_DAMAGE_LEVEL_2 * delta_time, BURN) + apply_damage(HEAT_DAMAGE_LEVEL_2 * seconds_per_tick, BURN) if(460 to INFINITY) if(on_fire) - apply_damage(HEAT_DAMAGE_LEVEL_3 * delta_time, BURN) + apply_damage(HEAT_DAMAGE_LEVEL_3 * seconds_per_tick, BURN) else - apply_damage(HEAT_DAMAGE_LEVEL_2 * delta_time, BURN) + apply_damage(HEAT_DAMAGE_LEVEL_2 * seconds_per_tick, BURN) else clear_alert(ALERT_XENO_FIRE) -/mob/living/carbon/alien/reagent_check(datum/reagent/R, delta_time, times_fired) //can metabolize all reagents +/mob/living/carbon/alien/reagent_check(datum/reagent/R, seconds_per_tick, times_fired) //can metabolize all reagents return FALSE /mob/living/carbon/alien/getTrail() diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm index 19e876ac4df..b12f4e71e6e 100644 --- a/code/modules/mob/living/carbon/alien/alien_defense.dm +++ b/code/modules/mob/living/carbon/alien/alien_defense.dm @@ -127,5 +127,5 @@ In all, this is a lot like the monkey code. /N /mob/living/carbon/alien/acid_act(acidpwr, acid_volume) return FALSE//aliens are immune to acid. -/mob/living/carbon/alien/on_fire_stack(delta_time, times_fired, datum/status_effect/fire_handler/fire_stacks/fire_handler) - adjust_bodytemperature((BODYTEMP_HEATING_MAX + (fire_handler.stacks * 12)) * 0.5 * delta_time) +/mob/living/carbon/alien/on_fire_stack(seconds_per_tick, times_fired, datum/status_effect/fire_handler/fire_stacks/fire_handler) + adjust_bodytemperature((BODYTEMP_HEATING_MAX + (fire_handler.stacks * 12)) * 0.5 * seconds_per_tick) diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index ef969253e7d..325e2b10742 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -1,12 +1,12 @@ -/mob/living/carbon/alien/larva/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/carbon/alien/larva/Life(seconds_per_tick = SSMOBS_DT, times_fired) if (notransform) return if(!..() || IS_IN_STASIS(src) || (amount_grown >= max_grown)) return // We're dead, in stasis, or already grown. // GROW! - amount_grown = min(amount_grown + (0.5 * delta_time), max_grown) + amount_grown = min(amount_grown + (0.5 * seconds_per_tick), max_grown) update_icons() diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm index 115ea3c1b7d..f7ecd307517 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(delta_time = SSMOBS_DT, times_fired) +/mob/living/carbon/alien/Life(seconds_per_tick = SSMOBS_DT, times_fired) findQueen() return..() @@ -41,6 +41,6 @@ //BREATH TEMPERATURE handle_breath_temperature(breath) -/mob/living/carbon/alien/adult/Life(delta_time, times_fired) +/mob/living/carbon/alien/adult/Life(seconds_per_tick, times_fired) . = ..() - handle_organs(delta_time, times_fired) + handle_organs(seconds_per_tick, times_fired) diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index c930f62997a..27c69224d62 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -50,22 +50,22 @@ max_plasma = 100 actions_types = list(/datum/action/cooldown/alien/transfer) -/obj/item/organ/internal/alien/plasmavessel/on_life(delta_time, times_fired) +/obj/item/organ/internal/alien/plasmavessel/on_life(seconds_per_tick, times_fired) //If there are alien weeds on the ground then heal if needed or give some plasma if(locate(/obj/structure/alien/weeds) in owner.loc) if(owner.health >= owner.maxHealth) - owner.adjustPlasma(plasma_rate * delta_time) + owner.adjustPlasma(plasma_rate * seconds_per_tick) else var/heal_amt = heal_rate if(!isalien(owner)) heal_amt *= 0.2 - owner.adjustPlasma(0.5 * plasma_rate * delta_time) - owner.adjustBruteLoss(-heal_amt * delta_time) - owner.adjustFireLoss(-heal_amt * delta_time) - owner.adjustOxyLoss(-heal_amt * delta_time) - owner.adjustCloneLoss(-heal_amt * delta_time) + owner.adjustPlasma(0.5 * plasma_rate * seconds_per_tick) + owner.adjustBruteLoss(-heal_amt * seconds_per_tick) + owner.adjustFireLoss(-heal_amt * seconds_per_tick) + owner.adjustOxyLoss(-heal_amt * seconds_per_tick) + owner.adjustCloneLoss(-heal_amt * seconds_per_tick) else - owner.adjustPlasma(0.1 * plasma_rate * delta_time) + owner.adjustPlasma(0.1 * plasma_rate * seconds_per_tick) /obj/item/organ/internal/alien/plasmavessel/on_insert(mob/living/carbon/organ_owner) . = ..() @@ -186,7 +186,7 @@ QDEL_LIST(stomach_contents) return ..() -/obj/item/organ/internal/stomach/alien/on_life(delta_time, times_fired) +/obj/item/organ/internal/stomach/alien/on_life(seconds_per_tick, times_fired) . = ..() if(!owner || SSmobs.times_fired % 3 != 0) return 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 80586887814..cc749edb13a 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -25,37 +25,37 @@ if(prob(10)) attempt_grow(gib_on_success = FALSE) -/obj/item/organ/internal/body_egg/alien_embryo/on_life(delta_time, times_fired) +/obj/item/organ/internal/body_egg/alien_embryo/on_life(seconds_per_tick, times_fired) . = ..() if(QDELETED(src) || QDELETED(owner)) return switch(stage) if(3, 4) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) owner.emote("sneeze") - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) owner.emote("cough") - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(owner, span_danger("Your throat feels sore.")) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) to_chat(owner, span_danger("Mucous runs down the back of your throat.")) if(5) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) owner.emote("sneeze") - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) owner.emote("cough") - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) to_chat(owner, span_danger("Your muscles ache.")) if(prob(20)) owner.take_bodypart_damage(1) - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) to_chat(owner, span_danger("Your stomach hurts.")) if(prob(20)) owner.adjustToxLoss(1) if(6) to_chat(owner, span_danger("You feel something tearing its way out of your chest...")) - owner.adjustToxLoss(5 * delta_time) // Why is this [TOX]? + owner.adjustToxLoss(5 * seconds_per_tick) // Why is this [TOX]? /// Controls Xenomorph Embryo growth. If embryo is fully grown (or overgrown), stop the proc. If not, increase the stage by one and if it's not fully grown (stage 6), add a timer to do this proc again after however long the growth time variable is. /obj/item/organ/internal/body_egg/alien_embryo/proc/advance_embryo_stage() diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm index 2a607f832da..319ce7f5eb6 100644 --- a/code/modules/mob/living/carbon/human/dummy.dm +++ b/code/modules/mob/living/carbon/human/dummy.dm @@ -12,7 +12,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) in_use = FALSE return ..() -/mob/living/carbon/human/dummy/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/carbon/human/dummy/Life(seconds_per_tick = SSMOBS_DT, times_fired) return /mob/living/carbon/human/dummy/attach_rot(mapload) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 0033fd5448d..bac3d339cb4 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -885,13 +885,13 @@ * Used by fire code to damage worn items. * * Arguments: - * - delta_time + * - seconds_per_tick * - times_fired * - stacks: Current amount of firestacks * */ -/mob/living/carbon/human/proc/burn_clothing(delta_time, times_fired, stacks) +/mob/living/carbon/human/proc/burn_clothing(seconds_per_tick, times_fired, stacks) var/list/burning_items = list() var/obscured = check_obscured_slots(TRUE) //HEAD// @@ -936,13 +936,12 @@ burning_items |= leg_clothes for(var/obj/item/burning in burning_items) - burning.fire_act((stacks * 25 * delta_time)) //damage taken is reduced to 2% of this value by fire_act() + burning.fire_act((stacks * 25 * seconds_per_tick)) //damage taken is reduced to 2% of this value by fire_act() -/mob/living/carbon/human/on_fire_stack(delta_time, times_fired, datum/status_effect/fire_handler/fire_stacks/fire_handler) +/mob/living/carbon/human/on_fire_stack(seconds_per_tick, times_fired, datum/status_effect/fire_handler/fire_stacks/fire_handler) SEND_SIGNAL(src, COMSIG_HUMAN_BURNING) - burn_clothing(delta_time, times_fired, fire_handler.stacks) + burn_clothing(seconds_per_tick, times_fired, fire_handler.stacks) var/no_protection = FALSE if(dna && dna.species) - no_protection = dna.species.handle_fire(src, delta_time, times_fired, no_protection) - fire_handler.harm_human(delta_time, times_fired, no_protection) - + no_protection = dna.species.handle_fire(src, seconds_per_tick, times_fired, no_protection) + fire_handler.harm_human(seconds_per_tick, times_fired, no_protection) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 19905b7e047..6637b6174ca 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -110,8 +110,8 @@ //Check inventory slots return (wear_id?.GetID() || belt?.GetID()) -/mob/living/carbon/human/reagent_check(datum/reagent/R, delta_time, times_fired) - return dna.species.handle_chemicals(R, src, delta_time, times_fired) +/mob/living/carbon/human/reagent_check(datum/reagent/R, seconds_per_tick, times_fired) + return dna.species.handle_chemicals(R, src, seconds_per_tick, times_fired) // if it returns 0, it will run the usual on_mob_life for that reagent. otherwise, it will stop after running handle_chemicals for the species. /mob/living/carbon/human/can_use_guns(obj/item/G) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 63846fd493c..214451c1cbe 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(delta_time = SSMOBS_DT, times_fired) +/mob/living/carbon/human/Life(seconds_per_tick = SSMOBS_DT, times_fired) if(notransform) return @@ -27,24 +27,24 @@ return FALSE //Body temperature stability and damage - dna.species.handle_body_temperature(src, delta_time, times_fired) + dna.species.handle_body_temperature(src, seconds_per_tick, times_fired) if(!IS_IN_STASIS(src)) if(.) //not dead for(var/datum/mutation/human/HM in dna.mutations) // Handle active genes - HM.on_life(delta_time, times_fired) + HM.on_life(seconds_per_tick, times_fired) if(stat != DEAD) //heart attack stuff - handle_heart(delta_time, times_fired) - handle_liver(delta_time, times_fired) + handle_heart(seconds_per_tick, times_fired) + handle_liver(seconds_per_tick, times_fired) - dna.species.spec_life(src, delta_time, times_fired) // for mutantraces + dna.species.spec_life(src, seconds_per_tick, times_fired) // for mutantraces else for(var/i in all_wounds) var/datum/wound/iter_wound = i - iter_wound.on_stasis(delta_time, times_fired) + iter_wound.on_stasis(seconds_per_tick, times_fired) //Update our name based on whether our face is obscured/disfigured name = get_visible_name() @@ -103,12 +103,12 @@ lun.check_breath(breath,src) /// Environment handlers for species -/mob/living/carbon/human/handle_environment(datum/gas_mixture/environment, delta_time, times_fired) +/mob/living/carbon/human/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired) // If we are in a cryo bed do not process life functions if(istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell)) return - dna.species.handle_environment(src, environment, delta_time, times_fired) + dna.species.handle_environment(src, environment, seconds_per_tick, times_fired) /** * Adjust the core temperature of a mob @@ -275,14 +275,14 @@ return min(1, thermal_protection) -/mob/living/carbon/human/handle_random_events(delta_time, times_fired) +/mob/living/carbon/human/handle_random_events(seconds_per_tick, times_fired) //Puke if toxloss is too high if(stat) return if(getToxLoss() < 45 || nutrition <= 20) return - lastpuke += DT_PROB(30, delta_time) + lastpuke += SPT_PROB(30, seconds_per_tick) if(lastpuke >= 50) // about 25 second delay I guess // This is actually closer to 150 seconds vomit(20) lastpuke = 0 @@ -301,17 +301,17 @@ return TRUE return ..() -/mob/living/carbon/human/proc/handle_heart(delta_time, times_fired) +/mob/living/carbon/human/proc/handle_heart(seconds_per_tick, times_fired) var/we_breath = !HAS_TRAIT_FROM(src, TRAIT_NOBREATH, SPECIES_TRAIT) if(!undergoing_cardiac_arrest()) return if(we_breath) - adjustOxyLoss(4 * delta_time) + adjustOxyLoss(4 * seconds_per_tick) Unconscious(80) // Tissues die without blood circulation - adjustBruteLoss(1 * delta_time) + adjustBruteLoss(1 * seconds_per_tick) #undef THERMAL_PROTECTION_HEAD #undef THERMAL_PROTECTION_CHEST diff --git a/code/modules/mob/living/carbon/human/monkey/monkey.dm b/code/modules/mob/living/carbon/human/monkey/monkey.dm index a1100b60265..2f1b8535d36 100644 --- a/code/modules/mob/living/carbon/human/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/human/monkey/monkey.dm @@ -85,7 +85,7 @@ GLOBAL_DATUM(the_one_and_only_punpun, /mob/living/carbon/human/species/monkey/pu return ..() -/mob/living/carbon/human/species/monkey/punpun/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/carbon/human/species/monkey/punpun/Life(seconds_per_tick = SSMOBS_DT, times_fired) 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.dm b/code/modules/mob/living/carbon/human/species.dm index 9f95a71b27f..d3441853f81 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -908,14 +908,14 @@ GLOBAL_LIST_EMPTY(features_by_species) /datum/species/proc/randomize_features(mob/living/carbon/human/human_mob) return -/datum/species/proc/spec_life(mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/proc/spec_life(mob/living/carbon/human/H, seconds_per_tick, times_fired) if(HAS_TRAIT(H, TRAIT_NOBREATH)) H.setOxyLoss(0) H.losebreath = 0 var/takes_crit_damage = (!HAS_TRAIT(H, TRAIT_NOCRITDAMAGE)) if((H.health < H.crit_threshold) && takes_crit_damage && H.stat != DEAD) - H.adjustBruteLoss(0.5 * delta_time) + H.adjustBruteLoss(0.5 * seconds_per_tick) /datum/species/proc/spec_death(gibbed, mob/living/carbon/human/H) return @@ -1091,7 +1091,7 @@ GLOBAL_LIST_EMPTY(features_by_species) * Return True to not run the normal metabolism effects. * NOTE: If you return TRUE, that reagent will not be removed liike normal! You must handle it manually. */ -/datum/species/proc/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/proc/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, seconds_per_tick, times_fired) SHOULD_CALL_PARENT(TRUE) if(chem.type == exotic_blood) H.blood_volume = min(H.blood_volume + round(chem.volume, 0.1), BLOOD_VOLUME_MAXIMUM) @@ -1120,25 +1120,25 @@ GLOBAL_LIST_EMPTY(features_by_species) * Arguments: * - [source][/mob/living/carbon/human]: The mob requesting handling * - time_since_irradiated: The amount of time since the mob was first irradiated - * - delta_time: The amount of time that has passed since the last tick + * - seconds_per_tick: The amount of time that has passed since the last tick */ -/datum/species/proc/handle_radiation(mob/living/carbon/human/source, time_since_irradiated, delta_time) - if(time_since_irradiated > RAD_MOB_KNOCKDOWN && DT_PROB(RAD_MOB_KNOCKDOWN_PROB, delta_time)) +/datum/species/proc/handle_radiation(mob/living/carbon/human/source, time_since_irradiated, seconds_per_tick) + if(time_since_irradiated > RAD_MOB_KNOCKDOWN && SPT_PROB(RAD_MOB_KNOCKDOWN_PROB, seconds_per_tick)) if(!source.IsParalyzed()) source.emote("collapse") source.Paralyze(RAD_MOB_KNOCKDOWN_AMOUNT) to_chat(source, span_danger("You feel weak.")) - if(time_since_irradiated > RAD_MOB_VOMIT && DT_PROB(RAD_MOB_VOMIT_PROB, delta_time)) + if(time_since_irradiated > RAD_MOB_VOMIT && SPT_PROB(RAD_MOB_VOMIT_PROB, seconds_per_tick)) source.vomit(10, TRUE) - if(time_since_irradiated > RAD_MOB_MUTATE && DT_PROB(RAD_MOB_MUTATE_PROB, delta_time)) + if(time_since_irradiated > RAD_MOB_MUTATE && SPT_PROB(RAD_MOB_MUTATE_PROB, seconds_per_tick)) to_chat(source, span_danger("You mutate!")) source.easy_random_mutate(NEGATIVE + MINOR_NEGATIVE) source.emote("gasp") source.domutcheck() - if(time_since_irradiated > RAD_MOB_HAIRLOSS && DT_PROB(RAD_MOB_HAIRLOSS_PROB, delta_time)) + if(time_since_irradiated > RAD_MOB_HAIRLOSS && SPT_PROB(RAD_MOB_HAIRLOSS_PROB, seconds_per_tick)) if(!(source.hairstyle == "Bald") && (HAIR in species_traits)) to_chat(source, span_danger("Your hair starts to fall out in clumps...")) addtimer(CALLBACK(src, PROC_REF(go_bald), source), 5 SECONDS) @@ -1510,8 +1510,8 @@ 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, delta_time, times_fired) - handle_environment_pressure(humi, environment, delta_time, times_fired) +/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) /** * Body temperature handler for species @@ -1521,22 +1521,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, delta_time, times_fired) +/datum/species/proc/handle_body_temperature(mob/living/carbon/human/humi, seconds_per_tick, times_fired) //when in a cryo unit we suspend all natural body regulation if(istype(humi.loc, /obj/machinery/atmospherics/components/unary/cryo_cell)) return //Only stabilise core temp when alive and not in statis if(humi.stat < DEAD && !IS_IN_STASIS(humi)) - body_temperature_core(humi, delta_time, times_fired) + body_temperature_core(humi, seconds_per_tick, times_fired) //These do run in statis - body_temperature_skin(humi, delta_time, times_fired) - body_temperature_alerts(humi, delta_time, times_fired) + body_temperature_skin(humi, seconds_per_tick, times_fired) + body_temperature_alerts(humi, seconds_per_tick, times_fired) //Do not cause more damage in statis if(!IS_IN_STASIS(humi)) - body_temperature_damage(humi, delta_time, times_fired) + body_temperature_damage(humi, seconds_per_tick, times_fired) /** * Used to stabilize the core temperature back to normal on living mobs @@ -1545,8 +1545,8 @@ 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, delta_time, times_fired) - var/natural_change = get_temp_change_amount(humi.get_body_temp_normal() - humi.coretemperature, 0.06 * delta_time) +/datum/species/proc/body_temperature_core(mob/living/carbon/human/humi, seconds_per_tick, times_fired) + 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) /** @@ -1556,15 +1556,15 @@ GLOBAL_LIST_EMPTY(features_by_species) * This happens even when dead so bodies revert to room temp over time. * vars: * * humi (required) The mob we will targeting - * - delta_time: The amount of time that is considered as elapsing + * - 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, delta_time, times_fired) +/datum/species/proc/body_temperature_skin(mob/living/carbon/human/humi, seconds_per_tick, times_fired) // change the core based on the skin temp var/skin_core_diff = humi.bodytemperature - humi.coretemperature // change rate of 0.04 per second to be slightly below area to skin change rate and still have a solid curve - var/skin_core_change = get_temp_change_amount(skin_core_diff, 0.04 * delta_time) + var/skin_core_change = get_temp_change_amount(skin_core_diff, 0.04 * seconds_per_tick) humi.adjust_coretemperature(skin_core_change) @@ -1591,7 +1591,7 @@ GLOBAL_LIST_EMPTY(features_by_species) var/area_skin_diff = area_temp - humi.bodytemperature if(!humi.on_fire || area_skin_diff > 0) // change rate of 0.05 as area temp has large impact on the surface - var/area_skin_change = get_temp_change_amount(area_skin_diff, 0.05 * delta_time) + var/area_skin_change = get_temp_change_amount(area_skin_diff, 0.05 * seconds_per_tick) // We need to apply the thermal protection of the clothing when applying area to surface change // If the core bodytemp goes over the normal body temp you are overheating and becom sweaty @@ -1610,7 +1610,7 @@ GLOBAL_LIST_EMPTY(features_by_species) // Get the changes to the skin from the core temp var/core_skin_diff = humi.coretemperature - humi.bodytemperature // change rate of 0.045 to reflect temp back to the skin at the slight higher rate then core to skin - var/core_skin_change = (1 + thermal_protection) * get_temp_change_amount(core_skin_diff, 0.045 * delta_time) + var/core_skin_change = (1 + thermal_protection) * get_temp_change_amount(core_skin_diff, 0.045 * seconds_per_tick) // We do not want to over shoot after using protection if(core_skin_diff > 0) @@ -1679,17 +1679,17 @@ 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, delta_time, times_fired) +/datum/species/proc/body_temperature_damage(mob/living/carbon/human/humi, seconds_per_tick, times_fired) //If the body temp is above the wound limit start adding exposure stacks if(humi.bodytemperature > BODYTEMP_HEAT_WOUND_LIMIT) - humi.heat_exposure_stacks = min(humi.heat_exposure_stacks + (0.5 * delta_time), 40) + humi.heat_exposure_stacks = min(humi.heat_exposure_stacks + (0.5 * seconds_per_tick), 40) else //When below the wound limit, reduce the exposure stacks fast. - humi.heat_exposure_stacks = max(humi.heat_exposure_stacks - (2 * delta_time), 0) + humi.heat_exposure_stacks = max(humi.heat_exposure_stacks - (2 * seconds_per_tick), 0) //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, delta_time, times_fired) + apply_burn_wounds(humi, seconds_per_tick, times_fired) humi.heat_exposure_stacks = 0 // Body temperature is too hot, and we do not have resist traits @@ -1703,7 +1703,7 @@ GLOBAL_LIST_EMPTY(features_by_species) var/burn_damage = max(log(2 - firemodifier, (humi.coretemperature - humi.get_body_temp_normal(apply_change=FALSE))) - 5, 0) // Apply species and physiology modifiers to heat damage - burn_damage = burn_damage * heatmod * humi.physiology.heat_mod * 0.5 * delta_time + burn_damage = burn_damage * heatmod * humi.physiology.heat_mod * 0.5 * seconds_per_tick // 40% for level 3 damage on humans to scream in pain if (humi.stat < UNCONSCIOUS && (prob(burn_damage) * 10) / 4) @@ -1722,11 +1722,11 @@ GLOBAL_LIST_EMPTY(features_by_species) var/damage_mod = coldmod * humi.physiology.cold_mod * (is_hulk ? HULK_COLD_DAMAGE_MOD : 1) // Can't be a switch due to http://www.byond.com/forum/post/2750423 if(humi.coretemperature in 201 to cold_damage_limit) - humi.apply_damage(COLD_DAMAGE_LEVEL_1 * damage_mod * delta_time, damage_type) + humi.apply_damage(COLD_DAMAGE_LEVEL_1 * damage_mod * seconds_per_tick, damage_type) else if(humi.coretemperature in 120 to 200) - humi.apply_damage(COLD_DAMAGE_LEVEL_2 * damage_mod * delta_time, damage_type) + humi.apply_damage(COLD_DAMAGE_LEVEL_2 * damage_mod * seconds_per_tick, damage_type) else - humi.apply_damage(COLD_DAMAGE_LEVEL_3 * damage_mod * delta_time, damage_type) + humi.apply_damage(COLD_DAMAGE_LEVEL_3 * damage_mod * seconds_per_tick, damage_type) /** * Used to apply burn wounds on random limbs @@ -1736,7 +1736,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, delta_time, times_fired) +/datum/species/proc/apply_burn_wounds(mob/living/carbon/human/humi, seconds_per_tick, times_fired) // If we are resistant to heat exit if(HAS_TRAIT(humi, TRAIT_RESISTHEAT)) return @@ -1768,10 +1768,10 @@ GLOBAL_LIST_EMPTY(features_by_species) if(humi.bodytemperature > BODYTEMP_HEAT_WOUND_LIMIT + 2800) burn_damage = HEAT_DAMAGE_LEVEL_3 - humi.apply_damage(burn_damage * delta_time, BURN, bodypart) + humi.apply_damage(burn_damage * seconds_per_tick, BURN, bodypart) /// Handle the air pressure of the environment -/datum/species/proc/handle_environment_pressure(mob/living/carbon/human/H, datum/gas_mixture/environment, delta_time, times_fired) +/datum/species/proc/handle_environment_pressure(mob/living/carbon/human/H, datum/gas_mixture/environment, seconds_per_tick, times_fired) var/pressure = environment.return_pressure() var/adjusted_pressure = H.calculate_affecting_pressure(pressure) @@ -1780,7 +1780,7 @@ GLOBAL_LIST_EMPTY(features_by_species) // Very high pressure, show an alert and take damage if(HAZARD_HIGH_PRESSURE to INFINITY) if(!HAS_TRAIT(H, TRAIT_RESISTHIGHPRESSURE)) - H.adjustBruteLoss(min(((adjusted_pressure / HAZARD_HIGH_PRESSURE) - 1) * PRESSURE_DAMAGE_COEFFICIENT, MAX_HIGH_PRESSURE_DAMAGE) * H.physiology.pressure_mod * delta_time, required_bodytype = BODYTYPE_ORGANIC) + H.adjustBruteLoss(min(((adjusted_pressure / HAZARD_HIGH_PRESSURE) - 1) * PRESSURE_DAMAGE_COEFFICIENT, MAX_HIGH_PRESSURE_DAMAGE) * H.physiology.pressure_mod * seconds_per_tick, required_bodytype = BODYTYPE_ORGANIC) H.throw_alert(ALERT_PRESSURE, /atom/movable/screen/alert/highpressure, 2) else H.clear_alert(ALERT_PRESSURE) @@ -1807,7 +1807,7 @@ GLOBAL_LIST_EMPTY(features_by_species) if(HAS_TRAIT(H, TRAIT_RESISTLOWPRESSURE)) H.clear_alert(ALERT_PRESSURE) else - H.adjustBruteLoss(LOW_PRESSURE_DAMAGE * H.physiology.pressure_mod * delta_time, required_bodytype = BODYTYPE_ORGANIC) + H.adjustBruteLoss(LOW_PRESSURE_DAMAGE * H.physiology.pressure_mod * seconds_per_tick, required_bodytype = BODYTYPE_ORGANIC) H.throw_alert(ALERT_PRESSURE, /atom/movable/screen/alert/lowpressure, 2) @@ -1815,7 +1815,7 @@ GLOBAL_LIST_EMPTY(features_by_species) // FIRE // ////////// -/datum/species/proc/handle_fire(mob/living/carbon/human/H, delta_time, times_fired, no_protection = FALSE) +/datum/species/proc/handle_fire(mob/living/carbon/human/H, seconds_per_tick, times_fired, no_protection = FALSE) return no_protection //////////// diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index 1fb0a1dd0da..dc628dfb086 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -75,7 +75,7 @@ prevent_perspective_change = FALSE human.reset_perspective(human) -/datum/species/dullahan/spec_life(mob/living/carbon/human/human, delta_time, times_fired) +/datum/species/dullahan/spec_life(mob/living/carbon/human/human, seconds_per_tick, times_fired) if(QDELETED(my_head)) my_head = null human.investigate_log("has been gibbed by the loss of [human.p_their()] head.", INVESTIGATE_DEATHS) diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index bea7cb2b054..41cc67a5117 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -25,7 +25,7 @@ examine_limb_id = SPECIES_HUMAN // Prevents felinids from taking toxin damage from carpotoxin -/datum/species/human/felinid/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/human/felinid/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, seconds_per_tick, times_fired) . = ..() if(istype(chem, /datum/reagent/toxin/carpotoxin)) var/datum/reagent/toxin/carpotoxin/fish = chem diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm index dab4a7262bf..d1ee2f73152 100644 --- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm @@ -39,10 +39,10 @@ BODY_ZONE_CHEST = /obj/item/bodypart/chest/fly, ) -/datum/species/fly/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/fly/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, seconds_per_tick, times_fired) if(chem.type == /datum/reagent/toxin/pestkiller) - H.adjustToxLoss(3 * REM * delta_time) - H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * delta_time) + H.adjustToxLoss(3 * REM * seconds_per_tick) + H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * seconds_per_tick) return TRUE return ..() 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 90638ad112a..a13272c23ae 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -128,7 +128,7 @@ var/boom_warning = FALSE var/datum/action/innate/ignite/ignite -/datum/species/golem/plasma/spec_life(mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/golem/plasma/spec_life(mob/living/carbon/human/H, seconds_per_tick, times_fired) if(H.bodytemperature > 750) if(!boom_warning && H.on_fire) to_chat(H, span_userdanger("You feel like you could blow up at any moment!")) @@ -144,7 +144,7 @@ H.investigate_log("has been gibbed as [H.p_their()] body explodes.", INVESTIGATE_DEATHS) H.gib() if(H.fire_stacks < 2) //flammable - H.adjust_fire_stacks(0.5 * delta_time) + H.adjust_fire_stacks(0.5 * seconds_per_tick) ..() /datum/species/golem/plasma/on_species_gain(mob/living/carbon/C, datum/species/old_species) @@ -303,12 +303,12 @@ examine_limb_id = SPECIES_GOLEM //Regenerates because self-repairing super-advanced alien tech -/datum/species/golem/alloy/spec_life(mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/golem/alloy/spec_life(mob/living/carbon/human/H, seconds_per_tick, times_fired) if(H.stat == DEAD) return - H.heal_overall_damage(brute = 1 * delta_time, burn = 1 * delta_time, required_bodytype = BODYTYPE_ORGANIC) - H.adjustToxLoss(-1 * delta_time) - H.adjustOxyLoss(-1 * delta_time) + H.heal_overall_damage(brute = 1 * seconds_per_tick, burn = 1 * seconds_per_tick, required_bodytype = BODYTYPE_ORGANIC) + H.adjustToxLoss(-1 * seconds_per_tick) + H.adjustOxyLoss(-1 * seconds_per_tick) //Since this will usually be created from a collaboration between podpeople and free golems, wood golems are a mix between the two races /datum/species/golem/wood @@ -339,28 +339,28 @@ inherent_factions = list(FACTION_PLANTS, FACTION_VINES) examine_limb_id = SPECIES_GOLEM -/datum/species/golem/wood/spec_life(mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/golem/wood/spec_life(mob/living/carbon/human/H, seconds_per_tick, times_fired) if(H.stat == DEAD) return var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing if(isturf(H.loc)) //else, there's considered to be no light var/turf/T = H.loc light_amount = min(1, T.get_lumcount()) - 0.5 - H.adjust_nutrition(5 * light_amount * delta_time) + H.adjust_nutrition(5 * light_amount * seconds_per_tick) if(H.nutrition > NUTRITION_LEVEL_ALMOST_FULL) H.set_nutrition(NUTRITION_LEVEL_ALMOST_FULL) if(light_amount > 0.2) //if there's enough light, heal - H.heal_overall_damage(brute = 0.5 * delta_time, burn = 0.5 * delta_time, required_bodytype = BODYTYPE_ORGANIC) - H.adjustToxLoss(-0.5 * delta_time) - H.adjustOxyLoss(-0.5 * delta_time) + H.heal_overall_damage(brute = 0.5 * seconds_per_tick, burn = 0.5 * seconds_per_tick, required_bodytype = BODYTYPE_ORGANIC) + H.adjustToxLoss(-0.5 * seconds_per_tick) + H.adjustOxyLoss(-0.5 * seconds_per_tick) if(H.nutrition < NUTRITION_LEVEL_STARVING + 50) H.take_overall_damage(brute = 2, required_bodytype = BODYTYPE_ORGANIC) -/datum/species/golem/wood/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/golem/wood/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, seconds_per_tick, times_fired) if(chem.type == /datum/reagent/toxin/plantbgone) - H.adjustToxLoss(3 * REM * delta_time) - H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * delta_time) + H.adjustToxLoss(3 * REM * seconds_per_tick) + H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * seconds_per_tick) return TRUE return ..() @@ -653,7 +653,7 @@ new/obj/item/grown/bananapeel/specialpeel(get_turf(H)) COOLDOWN_START(src, banana_cooldown, banana_delay) -/datum/species/golem/bananium/spec_life(mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/golem/bananium/spec_life(mob/living/carbon/human/H, seconds_per_tick, times_fired) if(!active && COOLDOWN_FINISHED(src, honkooldown)) active = TRUE playsound(get_turf(H), 'sound/items/bikehorn.ogg', 50, TRUE) @@ -740,16 +740,16 @@ QDEL_NULL(dominate) return ..() -/datum/species/golem/runic/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/golem/runic/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, seconds_per_tick, times_fired) . = ..() if(istype(chem, /datum/reagent/water/holywater)) - H.adjustFireLoss(4 * REM * delta_time) - H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * delta_time) + H.adjustFireLoss(4 * REM * seconds_per_tick) + H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * seconds_per_tick) if(chem.type == /datum/reagent/fuel/unholywater) - H.adjustBruteLoss(-4 * REM * delta_time) - H.adjustFireLoss(-4 * REM * delta_time) - H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * delta_time) + H.adjustBruteLoss(-4 * REM * seconds_per_tick) + H.adjustFireLoss(-4 * REM * seconds_per_tick) + H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * seconds_per_tick) /datum/species/golem/cloth name = "Cloth Golem" @@ -1214,12 +1214,12 @@ bonechill.Remove(C) ..() -/datum/species/golem/bone/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/golem/bone/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, seconds_per_tick, times_fired) . = ..() if(chem.type == /datum/reagent/toxin/bonehurtingjuice) - H.adjustStaminaLoss(7.5 * REM * delta_time, 0) - H.adjustBruteLoss(0.5 * REM * delta_time, 0) - if(DT_PROB(10, delta_time)) + H.adjustStaminaLoss(7.5 * REM * seconds_per_tick, 0) + H.adjustBruteLoss(0.5 * REM * seconds_per_tick, 0) + if(SPT_PROB(10, seconds_per_tick)) switch(rand(1, 3)) if(1) H.say(pick("oof.", "ouch.", "my bones.", "oof ouch.", "oof ouch my bones."), forced = /datum/reagent/toxin/bonehurtingjuice) @@ -1228,7 +1228,7 @@ if(3) to_chat(H, span_warning("Your bones hurt!")) if(chem.overdosed) - if(DT_PROB(2, delta_time) && iscarbon(H)) //big oof + if(SPT_PROB(2, seconds_per_tick) && iscarbon(H)) //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. var/obj/item/bodypart/bp = H.get_bodypart(selected_part) //We're so sorry skeletons, you're so misunderstood if(bp) @@ -1239,7 +1239,7 @@ else to_chat(H, span_warning("Your missing arm aches from wherever you left it.")) H.emote("sigh") - H.reagents.remove_reagent(chem.type, chem.metabolization_rate * delta_time) + H.reagents.remove_reagent(chem.type, chem.metabolization_rate * seconds_per_tick) return TRUE /datum/action/innate/bonechill 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 f1eadf01b3f..b0d990513a0 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -77,29 +77,29 @@ ) return ..() -/datum/species/jelly/spec_life(mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/jelly/spec_life(mob/living/carbon/human/H, seconds_per_tick, times_fired) if(H.stat == DEAD) //can't farm slime jelly from a dead slime/jelly person indefinitely return if(!H.blood_volume) - H.blood_volume += JELLY_REGEN_RATE_EMPTY * delta_time - H.adjustBruteLoss(2.5 * delta_time) + H.blood_volume += JELLY_REGEN_RATE_EMPTY * seconds_per_tick + H.adjustBruteLoss(2.5 * seconds_per_tick) to_chat(H, span_danger("You feel empty!")) if(H.blood_volume < BLOOD_VOLUME_NORMAL) if(H.nutrition >= NUTRITION_LEVEL_STARVING) - H.blood_volume += JELLY_REGEN_RATE * delta_time + H.blood_volume += JELLY_REGEN_RATE * seconds_per_tick if(H.blood_volume <= BLOOD_VOLUME_LOSE_NUTRITION) // don't lose nutrition if we are above a certain threshold, otherwise slimes on IV drips will still lose nutrition - H.adjust_nutrition(-1.25 * delta_time) + H.adjust_nutrition(-1.25 * seconds_per_tick) // we call lose_blood() here rather than quirk/process() to make sure that the blood loss happens in sync with life() if(HAS_TRAIT(H, TRAIT_BLOOD_DEFICIENCY)) var/datum/quirk/blooddeficiency/blooddeficiency = H.get_quirk(/datum/quirk/blooddeficiency) if(!isnull(blooddeficiency)) - blooddeficiency.lose_blood(delta_time) + blooddeficiency.lose_blood(seconds_per_tick) if(H.blood_volume < BLOOD_VOLUME_OKAY) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(H, span_danger("You feel drained!")) if(H.blood_volume < BLOOD_VOLUME_BAD) @@ -247,15 +247,15 @@ /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, delta_time, times_fired) +/datum/species/jelly/slime/spec_life(mob/living/carbon/human/H, seconds_per_tick, times_fired) if(H.blood_volume >= BLOOD_VOLUME_SLIME_SPLIT) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(H, span_notice("You feel very bloated!")) else if(H.nutrition >= NUTRITION_LEVEL_WELL_FED) - H.blood_volume += 1.5 * delta_time + H.blood_volume += 1.5 * seconds_per_tick if(H.blood_volume <= BLOOD_VOLUME_LOSE_NUTRITION) - H.adjust_nutrition(-1.25 * delta_time) + H.adjust_nutrition(-1.25 * 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 50201045501..1dbe2d34189 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -66,7 +66,7 @@ return ..() /// Lizards are cold blooded and do not stabilize body temperature naturally -/datum/species/lizard/body_temperature_core(mob/living/carbon/human/humi, delta_time, times_fired) +/datum/species/lizard/body_temperature_core(mob/living/carbon/human/humi, seconds_per_tick, times_fired) return /datum/species/lizard/random_name(gender,unique,lastname) diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index 0c1d524537e..f9ab8f29217 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -52,11 +52,11 @@ return randname -/datum/species/moth/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/moth/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, seconds_per_tick, times_fired) . = ..() if(chem.type == /datum/reagent/toxin/pestkiller) - H.adjustToxLoss(3 * REM * delta_time) - H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * delta_time) + H.adjustToxLoss(3 * REM * seconds_per_tick) + H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * seconds_per_tick) /datum/species/moth/check_species_weakness(obj/item/weapon, mob/living/attacker) if(istype(weapon, /obj/item/melee/flyswatter)) diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm index 525473ecc22..9143ec22fd7 100644 --- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm @@ -59,10 +59,10 @@ mush.remove(C) QDEL_NULL(mush) -/datum/species/mush/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/mush/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, seconds_per_tick, times_fired) if(chem.type == /datum/reagent/toxin/plantbgone/weedkiller) - H.adjustToxLoss(3 * REM * delta_time) - H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * delta_time) + H.adjustToxLoss(3 * REM * seconds_per_tick) + H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * seconds_per_tick) return TRUE return ..() diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index 1df7bd72b6f..8096e307d64 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -63,7 +63,7 @@ . = ..() C.set_safe_hunger_level() -/datum/species/plasmaman/spec_life(mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/plasmaman/spec_life(mob/living/carbon/human/H, seconds_per_tick, times_fired) var/atmos_sealed = TRUE if(HAS_TRAIT(H, TRAIT_NOFIRE)) atmos_sealed = FALSE @@ -94,10 +94,10 @@ if(environment?.total_moles()) if(environment.gases[/datum/gas/hypernoblium] && (environment.gases[/datum/gas/hypernoblium][MOLES]) >= 5) if(H.on_fire && H.fire_stacks > 0) - H.adjust_fire_stacks(-10 * delta_time) + H.adjust_fire_stacks(-10 * seconds_per_tick) else if(!HAS_TRAIT(H, TRAIT_NOFIRE)) if(environment.gases[/datum/gas/oxygen] && (environment.gases[/datum/gas/oxygen][MOLES]) >= 1) //Same threshhold that extinguishes fire - H.adjust_fire_stacks(0.25 * delta_time) + H.adjust_fire_stacks(0.25 * seconds_per_tick) if(!H.on_fire && H.fire_stacks > 0) H.visible_message(span_danger("[H]'s body reacts with the atmosphere and bursts into flames!"),span_userdanger("Your body reacts with the atmosphere and bursts into flame!")) H.ignite_mob() @@ -113,7 +113,7 @@ H.update_fire() -/datum/species/plasmaman/handle_fire(mob/living/carbon/human/H, delta_time, times_fired, no_protection = FALSE) +/datum/species/plasmaman/handle_fire(mob/living/carbon/human/H, seconds_per_tick, times_fired, no_protection = FALSE) if(internal_fire) no_protection = TRUE . = ..() @@ -135,18 +135,18 @@ return randname -/datum/species/plasmaman/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/plasmaman/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, seconds_per_tick, times_fired) . = ..() if(istype(chem, /datum/reagent/toxin/plasma) || istype(chem, /datum/reagent/toxin/hot_ice)) for(var/i in H.all_wounds) var/datum/wound/iter_wound = i - iter_wound.on_xadone(4 * REM * delta_time) // plasmamen use plasma to reform their bones or whatever + iter_wound.on_xadone(4 * REM * seconds_per_tick) // plasmamen use plasma to reform their bones or whatever return FALSE // do normal metabolism if(istype(chem, /datum/reagent/toxin/bonehurtingjuice)) - H.adjustStaminaLoss(7.5 * REM * delta_time, 0) - H.adjustBruteLoss(0.5 * REM * delta_time, 0) - if(DT_PROB(10, delta_time)) + H.adjustStaminaLoss(7.5 * REM * seconds_per_tick, 0) + H.adjustBruteLoss(0.5 * REM * seconds_per_tick, 0) + if(SPT_PROB(10, seconds_per_tick)) switch(rand(1, 3)) if(1) H.say(pick("oof.", "ouch.", "my bones.", "oof ouch.", "oof ouch my bones."), forced = /datum/reagent/toxin/bonehurtingjuice) @@ -155,7 +155,7 @@ if(3) to_chat(H, span_warning("Your bones hurt!")) if(chem.overdosed) - if(DT_PROB(2, delta_time) && iscarbon(H)) //big oof + if(SPT_PROB(2, seconds_per_tick) && iscarbon(H)) //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. var/obj/item/bodypart/bp = H.get_bodypart(selected_part) //We're so sorry skeletons, you're so misunderstood if(bp) @@ -166,13 +166,13 @@ else to_chat(H, span_warning("Your missing arm aches from wherever you left it.")) H.emote("sigh") - H.reagents.remove_reagent(chem.type, chem.metabolization_rate * delta_time) + H.reagents.remove_reagent(chem.type, chem.metabolization_rate * seconds_per_tick) return TRUE if(istype(chem, /datum/reagent/gunpowder)) - H.set_timed_status_effect(15 SECONDS * delta_time, /datum/status_effect/drugginess) + H.set_timed_status_effect(15 SECONDS * seconds_per_tick, /datum/status_effect/drugginess) if(H.get_timed_status_effect_duration(/datum/status_effect/hallucination) / 10 < chem.volume) - H.adjust_hallucinations(2.5 SECONDS * delta_time) + H.adjust_hallucinations(2.5 SECONDS * seconds_per_tick) // Do normal metabolism return FALSE diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 26754bdce87..d717398bae1 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -49,7 +49,7 @@ ) return ..() -/datum/species/pod/spec_life(mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/pod/spec_life(mob/living/carbon/human/H, seconds_per_tick, times_fired) if(H.stat == DEAD) return @@ -57,23 +57,23 @@ if(isturf(H.loc)) //else, there's considered to be no light var/turf/T = H.loc light_amount = min(1, T.get_lumcount()) - 0.5 - H.adjust_nutrition(5 * light_amount * delta_time) + H.adjust_nutrition(5 * light_amount * seconds_per_tick) if(light_amount > 0.2) //if there's enough light, heal - H.heal_overall_damage(brute = 0.5 * delta_time, burn = 0.5 * delta_time, required_bodytype = BODYTYPE_ORGANIC) - H.adjustToxLoss(-0.5 * delta_time) - H.adjustOxyLoss(-0.5 * delta_time) + H.heal_overall_damage(brute = 0.5 * seconds_per_tick, burn = 0.5 * seconds_per_tick, required_bodytype = BODYTYPE_ORGANIC) + H.adjustToxLoss(-0.5 * seconds_per_tick) + H.adjustOxyLoss(-0.5 * seconds_per_tick) if(H.nutrition > NUTRITION_LEVEL_ALMOST_FULL) //don't make podpeople fat because they stood in the sun for too long H.set_nutrition(NUTRITION_LEVEL_ALMOST_FULL) if(H.nutrition < NUTRITION_LEVEL_STARVING + 50) - H.take_overall_damage(brute = 1 * delta_time, required_bodytype = BODYTYPE_ORGANIC) + H.take_overall_damage(brute = 1 * seconds_per_tick, required_bodytype = BODYTYPE_ORGANIC) ..() -/datum/species/pod/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/pod/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, seconds_per_tick, times_fired) if(chem.type == /datum/reagent/toxin/plantbgone) - H.adjustToxLoss(3 * REM * delta_time) - H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * delta_time) + H.adjustToxLoss(3 * REM * seconds_per_tick) + H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * seconds_per_tick) return TRUE return ..() diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index a325c954a53..07cb138d872 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -93,7 +93,7 @@ desc = "Something that was once a brain, before being remolded by a shadowling. It has adapted to the dark, irreversibly." icon = 'icons/obj/medical/organs/shadow_organs.dmi' -/obj/item/organ/internal/brain/shadow/on_life(delta_time, times_fired) +/obj/item/organ/internal/brain/shadow/on_life(seconds_per_tick, times_fired) . = ..() var/turf/owner_turf = owner.loc if(!isturf(owner_turf)) @@ -101,9 +101,9 @@ var/light_amount = owner_turf.get_lumcount() if(light_amount > SHADOW_SPECIES_LIGHT_THRESHOLD) //if there's enough light, start dying - owner.take_overall_damage(brute = 0.5 * delta_time, burn = 0.5 * delta_time, required_bodytype = BODYTYPE_ORGANIC) + owner.take_overall_damage(brute = 0.5 * seconds_per_tick, burn = 0.5 * seconds_per_tick, required_bodytype = BODYTYPE_ORGANIC) else if (light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) //heal in the dark - owner.heal_overall_damage(brute = 0.5 * delta_time, burn = 0.5 * delta_time, required_bodytype = BODYTYPE_ORGANIC) + owner.heal_overall_damage(brute = 0.5 * seconds_per_tick, burn = 0.5 * seconds_per_tick, required_bodytype = BODYTYPE_ORGANIC) /obj/item/organ/internal/eyes/shadow name = "burning red eyes" diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index de91ee3d702..32b2ca88b71 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -63,12 +63,12 @@ return ..() //Can still metabolize milk through meme magic -/datum/species/skeleton/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/skeleton/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, seconds_per_tick, times_fired) . = ..() if(chem.type == /datum/reagent/toxin/bonehurtingjuice) - H.adjustStaminaLoss(7.5 * REM * delta_time, 0) - H.adjustBruteLoss(0.5 * REM * delta_time, 0) - if(DT_PROB(10, delta_time)) + H.adjustStaminaLoss(7.5 * REM * seconds_per_tick, 0) + H.adjustBruteLoss(0.5 * REM * seconds_per_tick, 0) + if(SPT_PROB(10, seconds_per_tick)) switch(rand(1, 3)) if(1) H.say(pick("oof.", "ouch.", "my bones.", "oof ouch.", "oof ouch my bones."), forced = /datum/reagent/toxin/bonehurtingjuice) @@ -77,7 +77,7 @@ if(3) to_chat(H, span_warning("Your bones hurt!")) if(chem.overdosed) - if(DT_PROB(2, delta_time) && iscarbon(H)) //big oof + if(SPT_PROB(2, seconds_per_tick) && iscarbon(H)) //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. var/obj/item/bodypart/bp = H.get_bodypart(selected_part) //We're so sorry skeletons, you're so misunderstood if(bp) @@ -88,7 +88,7 @@ else to_chat(H, span_warning("Your missing arm aches from wherever you left it.")) H.emote("sigh") - H.reagents.remove_reagent(chem.type, chem.metabolization_rate * delta_time) + H.reagents.remove_reagent(chem.type, chem.metabolization_rate * seconds_per_tick) return TRUE /datum/species/skeleton/get_species_description() diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm index 6f60134d881..e52f7a01462 100644 --- a/code/modules/mob/living/carbon/human/species_types/snail.dm +++ b/code/modules/mob/living/carbon/human/species_types/snail.dm @@ -43,12 +43,12 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/snail ) -/datum/species/snail/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/snail/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, seconds_per_tick, times_fired) . = ..() if(istype(chem,/datum/reagent/consumable/salt)) - H.adjustFireLoss(2 * REM * delta_time) + H.adjustFireLoss(2 * REM * seconds_per_tick) playsound(H, 'sound/weapons/sear.ogg', 30, TRUE) - H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * delta_time) + H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM * seconds_per_tick) return TRUE /datum/species/snail/on_species_gain(mob/living/carbon/new_snailperson, datum/species/old_species, pref_load) 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 c085aa7171e..6dd778affc7 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -46,15 +46,15 @@ new_vampire.update_body(0) new_vampire.set_safe_hunger_level() -/datum/species/vampire/spec_life(mob/living/carbon/human/vampire, delta_time, times_fired) +/datum/species/vampire/spec_life(mob/living/carbon/human/vampire, seconds_per_tick, times_fired) . = ..() if(istype(vampire.loc, /obj/structure/closet/crate/coffin)) - vampire.heal_overall_damage(brute = 2 * delta_time, burn = 2 * delta_time, required_bodytype = BODYTYPE_ORGANIC) - vampire.adjustToxLoss(-2 * delta_time) - vampire.adjustOxyLoss(-2 * delta_time) - vampire.adjustCloneLoss(-2 * delta_time) + vampire.heal_overall_damage(brute = 2 * seconds_per_tick, burn = 2 * seconds_per_tick, required_bodytype = BODYTYPE_ORGANIC) + vampire.adjustToxLoss(-2 * seconds_per_tick) + vampire.adjustOxyLoss(-2 * seconds_per_tick) + vampire.adjustCloneLoss(-2 * seconds_per_tick) return - vampire.blood_volume -= 0.125 * delta_time + vampire.blood_volume -= 0.125 * seconds_per_tick if(vampire.blood_volume <= BLOOD_VOLUME_SURVIVE) to_chat(vampire, span_danger("You ran out of blood!")) vampire.investigate_log("has been dusted by a lack of blood (vampire).", INVESTIGATE_DEATHS) @@ -62,8 +62,8 @@ var/area/A = get_area(vampire) if(istype(A, /area/station/service/chapel)) to_chat(vampire, span_warning("You don't belong here!")) - vampire.adjustFireLoss(10 * delta_time) - vampire.adjust_fire_stacks(3 * delta_time) + vampire.adjustFireLoss(10 * seconds_per_tick) + vampire.adjust_fire_stacks(3 * seconds_per_tick) vampire.ignite_mob() /datum/species/vampire/check_species_weakness(obj/item/weapon, mob/living/attacker) 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 eb0a48ab675..5cf5e2098bc 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -55,7 +55,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, delta_time, times_fired) +/datum/species/zombie/body_temperature_core(mob/living/carbon/human/humi, seconds_per_tick, times_fired) return /datum/species/zombie/check_roundstart_eligible() @@ -139,7 +139,7 @@ if(.) COOLDOWN_START(src, regen_cooldown, REGENERATION_DELAY) -/datum/species/zombie/infectious/spec_life(mob/living/carbon/C, delta_time, times_fired) +/datum/species/zombie/infectious/spec_life(mob/living/carbon/C, seconds_per_tick, times_fired) . = ..() C.set_combat_mode(TRUE) // THE SUFFERING MUST FLOW @@ -149,13 +149,13 @@ var/heal_amt = heal_rate if(HAS_TRAIT(C, TRAIT_CRITICAL_CONDITION)) heal_amt *= 2 - C.heal_overall_damage(heal_amt * delta_time, heal_amt * delta_time) - C.adjustToxLoss(-heal_amt * delta_time) + C.heal_overall_damage(heal_amt * seconds_per_tick, heal_amt * seconds_per_tick) + C.adjustToxLoss(-heal_amt * seconds_per_tick) for(var/i in C.all_wounds) var/datum/wound/iter_wound = i - if(DT_PROB(2-(iter_wound.severity/2), delta_time)) + if(SPT_PROB(2-(iter_wound.severity/2), seconds_per_tick)) iter_wound.remove_wound() - if(!HAS_TRAIT(C, TRAIT_CRITICAL_CONDITION) && DT_PROB(2, delta_time)) + if(!HAS_TRAIT(C, TRAIT_CRITICAL_CONDITION) && SPT_PROB(2, seconds_per_tick)) playsound(C, pick(spooks), 50, TRUE, 10) //Congrats you somehow died so hard you stopped being a zombie diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index bf14672056a..1536970c015 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(delta_time = SSMOBS_DT, times_fired) +/mob/living/carbon/Life(seconds_per_tick = SSMOBS_DT, times_fired) if(notransform) return @@ -16,21 +16,21 @@ if(IS_IN_STASIS(src)) . = ..() - reagents.handle_stasis_chems(src, delta_time, times_fired) + reagents.handle_stasis_chems(src, seconds_per_tick, times_fired) else //Reagent processing needs to come before breathing, to prevent edge cases. - handle_dead_metabolization(delta_time, times_fired) //Dead metabolization first since it can modify life metabolization. - handle_organs(delta_time, times_fired) + handle_dead_metabolization(seconds_per_tick, times_fired) //Dead metabolization first since it can modify life metabolization. + handle_organs(seconds_per_tick, times_fired) . = ..() if(QDELETED(src)) return if(.) //not dead - handle_blood(delta_time, times_fired) + handle_blood(seconds_per_tick, times_fired) if(stat != DEAD) - handle_brain_damage(delta_time, times_fired) + handle_brain_damage(seconds_per_tick, times_fired) if(stat == DEAD) stop_sound_channel(CHANNEL_HEARTBEAT) @@ -38,14 +38,14 @@ if(getStaminaLoss() > 0 && stam_regen_start_time <= world.time) adjustStaminaLoss(-INFINITY) - var/bprv = handle_bodyparts(delta_time, times_fired) + var/bprv = handle_bodyparts(seconds_per_tick, times_fired) if(bprv & BODYPART_LIFE_UPDATE_HEALTH) updatehealth() if(. && mind) //. == not dead for(var/key in mind.addiction_points) var/datum/addiction/addiction = SSaddiction.all_addictions[key] - addiction.process_addiction(src, delta_time, times_fired) + addiction.process_addiction(src, seconds_per_tick, times_fired) if(stat != DEAD) return 1 @@ -54,7 +54,7 @@ /////////////// // Start of a breath chain, calls [carbon/proc/breathe()] -/mob/living/carbon/handle_breathing(delta_time, times_fired) +/mob/living/carbon/handle_breathing(seconds_per_tick, times_fired) var/next_breath = 4 var/obj/item/organ/internal/lungs/L = get_organ_slot(ORGAN_SLOT_LUNGS) var/obj/item/organ/internal/heart/H = get_organ_slot(ORGAN_SLOT_HEART) @@ -66,7 +66,7 @@ next_breath-- if((times_fired % next_breath) == 0 || failed_last_breath) - breathe(delta_time, times_fired) //Breathe per 4 ticks if healthy, down to 2 if our lungs or heart are damaged, unless suffocating + 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(failed_last_breath) add_mood_event("suffocation", /datum/mood_event/suffocation) else @@ -77,7 +77,7 @@ location_as_object.handle_internal_lifeform(src,0) // Second link in a breath chain, calls [carbon/proc/check_breath()] -/mob/living/carbon/proc/breathe(delta_time, times_fired) +/mob/living/carbon/proc/breathe(seconds_per_tick, times_fired) var/obj/item/organ/internal/lungs = get_organ_slot(ORGAN_SLOT_LUNGS) if(SEND_SIGNAL(src, COMSIG_CARBON_ATTEMPT_BREATHE) & COMSIG_CARBON_BLOCK_BREATH) return @@ -480,20 +480,20 @@ // To differentiate between no internals and active, but empty internals. return . || FALSE -/mob/living/carbon/proc/handle_blood(delta_time, times_fired) +/mob/living/carbon/proc/handle_blood(seconds_per_tick, times_fired) return -/mob/living/carbon/proc/handle_bodyparts(delta_time, times_fired) +/mob/living/carbon/proc/handle_bodyparts(seconds_per_tick, times_fired) for(var/obj/item/bodypart/limb as anything in bodyparts) - . |= limb.on_life(delta_time, times_fired) + . |= limb.on_life(seconds_per_tick, times_fired) -/mob/living/carbon/proc/handle_organs(delta_time, times_fired) +/mob/living/carbon/proc/handle_organs(seconds_per_tick, times_fired) if(stat == DEAD) if(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/internal/organ in organs) // On-death is where organ decay is handled - organ?.on_death(delta_time, times_fired) // organ can be null due to reagent metabolization causing organ shuffling + organ?.on_death(seconds_per_tick, times_fired) // organ can be null due to reagent metabolization causing organ shuffling // We need to re-check the stat every organ, as one of our others may have revived us if(stat != DEAD) break @@ -505,25 +505,25 @@ // This code is hot enough that it's just not worth the time var/obj/item/organ/internal/organ = organs_slot[slot] if(organ?.owner) // This exist mostly because reagent metabolization can cause organ reshuffling - organ.on_life(delta_time, times_fired) + organ.on_life(seconds_per_tick, times_fired) -/mob/living/carbon/handle_diseases(delta_time, times_fired) +/mob/living/carbon/handle_diseases(seconds_per_tick, times_fired) for(var/thing in diseases) var/datum/disease/D = thing - if(DT_PROB(D.infectivity, delta_time)) + if(SPT_PROB(D.infectivity, seconds_per_tick)) D.spread() if(stat != DEAD || D.process_dead) - D.stage_act(delta_time, times_fired) + D.stage_act(seconds_per_tick, times_fired) -/mob/living/carbon/handle_wounds(delta_time, times_fired) +/mob/living/carbon/handle_wounds(seconds_per_tick, times_fired) for(var/thing in all_wounds) var/datum/wound/W = thing if(W.processes) // meh - W.handle_process(delta_time, times_fired) + W.handle_process(seconds_per_tick, times_fired) -/mob/living/carbon/handle_mutations(time_since_irradiated, delta_time, times_fired) +/mob/living/carbon/handle_mutations(time_since_irradiated, seconds_per_tick, times_fired) if(!dna?.temporary_mutations.len) return @@ -565,20 +565,20 @@ * Due to how reagent metabolization code works this couldn't be done anywhere else. * * Arguments: - * - delta_time: The amount of time that has elapsed since the last tick. + * - 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(delta_time, times_fired) +/mob/living/carbon/proc/handle_dead_metabolization(seconds_per_tick, times_fired) if (stat != DEAD) return - reagents.metabolize(src, delta_time, times_fired, can_overdose = TRUE, liverless = TRUE, dead = TRUE) // Your liver doesn't work while you're dead. + reagents.metabolize(src, seconds_per_tick, times_fired, 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, delta_time, times_fired) +/mob/living/carbon/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired) var/areatemp = get_temperature(environment) if(stat != DEAD) // If you are dead your body does not stabilize naturally - natural_bodytemperature_stabilization(environment, delta_time, times_fired) + natural_bodytemperature_stabilization(environment, seconds_per_tick, times_fired) if(!on_fire || areatemp > bodytemperature) // If we are not on fire or the area is hotter adjust_bodytemperature((areatemp - bodytemperature), use_insulation=TRUE, use_steps=TRUE) @@ -588,10 +588,10 @@ * * Arguments: * - [environemnt][/datum/gas_mixture]: The environment gas mix - * - delta_time: The amount of time that has elapsed since the last tick + * - 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, delta_time, times_fired) +/mob/living/carbon/proc/natural_bodytemperature_stabilization(datum/gas_mixture/environment, seconds_per_tick, times_fired) var/areatemp = get_temperature(environment) var/body_temperature_difference = get_body_temp_normal() - bodytemperature var/natural_change = 0 @@ -637,7 +637,7 @@ natural_change = (1 / (thermal_protection + 1)) * natural_change // Apply the natural stabilization changes - adjust_bodytemperature(natural_change * delta_time) + adjust_bodytemperature(natural_change * seconds_per_tick) /** * Get the insulation that is appropriate to the temperature you're being exposed to. @@ -741,7 +741,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(delta_time, times_fired) +/mob/living/carbon/proc/handle_liver(seconds_per_tick, times_fired) if(!dna) return @@ -750,13 +750,13 @@ return reagents.end_metabolization(src, keep_liverless = TRUE) //Stops trait-based effects on reagents, to prevent permanent buffs - reagents.metabolize(src, delta_time, times_fired, can_overdose=TRUE, liverless = TRUE) + reagents.metabolize(src, seconds_per_tick, times_fired, can_overdose=TRUE, liverless = TRUE) if(HAS_TRAIT(src, TRAIT_STABLELIVER) || HAS_TRAIT(src, TRAIT_NOMETABOLISM)) return - adjustToxLoss(0.6 * delta_time, TRUE, TRUE) - adjustOrganLoss(pick(ORGAN_SLOT_HEART, ORGAN_SLOT_LUNGS, ORGAN_SLOT_STOMACH, ORGAN_SLOT_EYES, ORGAN_SLOT_EARS), 0.5* delta_time) + adjustToxLoss(0.6 * seconds_per_tick, TRUE, TRUE) + adjustOrganLoss(pick(ORGAN_SLOT_HEART, ORGAN_SLOT_LUNGS, ORGAN_SLOT_STOMACH, ORGAN_SLOT_EYES, ORGAN_SLOT_EARS), 0.5* seconds_per_tick) /mob/living/carbon/proc/undergoing_liver_failure() var/obj/item/organ/internal/liver/liver = get_organ_slot(ORGAN_SLOT_LIVER) @@ -767,10 +767,10 @@ //BRAIN DAMAGE// //////////////// -/mob/living/carbon/proc/handle_brain_damage(delta_time, times_fired) +/mob/living/carbon/proc/handle_brain_damage(seconds_per_tick, times_fired) for(var/T in get_traumas()) var/datum/brain_trauma/BT = T - BT.on_life(delta_time, times_fired) + BT.on_life(seconds_per_tick, times_fired) ///////////////////////////////////// //MONKEYS WITH TOO MUCH CHOLOESTROL// diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index b16cd783fe1..8508b1c2ca8 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -6,13 +6,13 @@ * * * Arguments: - * - delta_time: The amount of time that has elapsed since this last fired. + * - 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(delta_time = SSMOBS_DT, times_fired) +/mob/living/proc/Life(seconds_per_tick = SSMOBS_DT, times_fired) set waitfor = FALSE - SEND_SIGNAL(src, COMSIG_LIVING_LIFE, delta_time, times_fired) + SEND_SIGNAL(src, COMSIG_LIVING_LIFE, seconds_per_tick, times_fired) if (client) var/turf/T = get_turf(src) @@ -43,29 +43,29 @@ if(stat != DEAD) //Mutations and radiation - handle_mutations(delta_time, times_fired) + handle_mutations(seconds_per_tick, times_fired) if(stat != DEAD) //Breathing, if applicable - handle_breathing(delta_time, times_fired) + handle_breathing(seconds_per_tick, times_fired) - handle_diseases(delta_time, 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, 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_wounds(delta_time, times_fired) + handle_wounds(seconds_per_tick, times_fired) if (QDELETED(src)) // diseases can qdel the mob via transformations return if(stat != DEAD) //Random events (vomiting etc) - handle_random_events(delta_time, times_fired) + handle_random_events(seconds_per_tick, times_fired) //Handle temperature/pressure differences between body and environment var/datum/gas_mixture/environment = loc.return_air() if(environment) - handle_environment(environment, delta_time, times_fired) + handle_environment(environment, seconds_per_tick, times_fired) - handle_gravity(delta_time, times_fired) + handle_gravity(seconds_per_tick, times_fired) if(machine) machine.check_eye(src) @@ -73,24 +73,24 @@ if(stat != DEAD) return 1 -/mob/living/proc/handle_breathing(delta_time, times_fired) - SEND_SIGNAL(src, COMSIG_LIVING_HANDLE_BREATHING, delta_time, times_fired) +/mob/living/proc/handle_breathing(seconds_per_tick, times_fired) + SEND_SIGNAL(src, COMSIG_LIVING_HANDLE_BREATHING, seconds_per_tick, times_fired) return -/mob/living/proc/handle_mutations(delta_time, times_fired) +/mob/living/proc/handle_mutations(seconds_per_tick, times_fired) return -/mob/living/proc/handle_diseases(delta_time, times_fired) +/mob/living/proc/handle_diseases(seconds_per_tick, times_fired) return -/mob/living/proc/handle_wounds(delta_time, times_fired) +/mob/living/proc/handle_wounds(seconds_per_tick, times_fired) return -/mob/living/proc/handle_random_events(delta_time, times_fired) +/mob/living/proc/handle_random_events(seconds_per_tick, times_fired) return // Base mob environment handler for body temperature -/mob/living/proc/handle_environment(datum/gas_mixture/environment, delta_time, times_fired) +/mob/living/proc/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired) var/loc_temp = get_temperature(environment) var/temp_delta = loc_temp - bodytemperature @@ -100,9 +100,9 @@ if(temp_delta < 0) // it is cold here if(!on_fire) // do not reduce body temp when on fire - adjust_bodytemperature(max(max(temp_delta / BODYTEMP_DIVISOR, BODYTEMP_COOLING_MAX) * delta_time, temp_delta)) + adjust_bodytemperature(max(max(temp_delta / BODYTEMP_DIVISOR, BODYTEMP_COOLING_MAX) * seconds_per_tick, temp_delta)) else // this is a hot place - adjust_bodytemperature(min(min(temp_delta / BODYTEMP_DIVISOR, BODYTEMP_HEATING_MAX) * delta_time, temp_delta)) + adjust_bodytemperature(min(min(temp_delta / BODYTEMP_DIVISOR, BODYTEMP_HEATING_MAX) * seconds_per_tick, temp_delta)) /** * Get the fullness of the mob @@ -136,9 +136,9 @@ /mob/living/proc/update_damage_hud() return -/mob/living/proc/handle_gravity(delta_time, times_fired) +/mob/living/proc/handle_gravity(seconds_per_tick, times_fired) if(gravity_state > STANDARD_GRAVITY) - handle_high_gravity(gravity_state, delta_time, times_fired) + handle_high_gravity(gravity_state, seconds_per_tick, times_fired) /mob/living/proc/gravity_animate() if(!get_filter("gravity")) @@ -146,11 +146,11 @@ animate(get_filter("gravity"), y = 1, time = 10, loop = -1) animate(y = 0, time = 10) -/mob/living/proc/handle_high_gravity(gravity, delta_time, times_fired) +/mob/living/proc/handle_high_gravity(gravity, seconds_per_tick, times_fired) if(gravity < GRAVITY_DAMAGE_THRESHOLD) //Aka gravity values of 3 or more return var/grav_strength = gravity - GRAVITY_DAMAGE_THRESHOLD - adjustBruteLoss(min(GRAVITY_DAMAGE_SCALING * grav_strength, GRAVITY_DAMAGE_MAXIMUM) * delta_time) + adjustBruteLoss(min(GRAVITY_DAMAGE_SCALING * grav_strength, GRAVITY_DAMAGE_MAXIMUM) * seconds_per_tick) #undef BODYTEMP_DIVISOR diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 03b3853c303..8d0f7a1c9ac 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1679,12 +1679,12 @@ GLOBAL_LIST_EMPTY(fire_appearances) * Handles effects happening when mob is on normal fire * * Vars: - * * delta_time + * * seconds_per_tick * * times_fired * * fire_handler: Current fire status effect that called the proc */ -/mob/living/proc/on_fire_stack(delta_time, times_fired, datum/status_effect/fire_handler/fire_stacks/fire_handler) +/mob/living/proc/on_fire_stack(seconds_per_tick, times_fired, datum/status_effect/fire_handler/fire_stacks/fire_handler) return //Mobs on Fire end diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index b7e64d59622..18a47acf703 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(delta_time = SSMOBS_DT, times_fired) +/mob/living/silicon/ai/Life(seconds_per_tick = SSMOBS_DT, times_fired) if (stat == DEAD) return //Being dead doesn't mean your temperature never changes @@ -31,7 +31,7 @@ if(!lacks_power()) var/area/home = get_area(src) if(home.powered(AREA_USAGE_EQUIP)) - home.use_power(500 * delta_time, AREA_USAGE_EQUIP) + home.use_power(500 * seconds_per_tick, AREA_USAGE_EQUIP) if(aiRestorePowerRoutine >= POWER_RESTORATION_SEARCH_APC) ai_restore_power() diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 9657f49ee08..0f3dde4b359 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(delta_time = SSMOBS_DT, times_fired) +/mob/living/silicon/robot/Life(seconds_per_tick = SSMOBS_DT, times_fired) if (src.notransform) return ..() handle_robot_hud_updates() - handle_robot_cell(delta_time, times_fired) + handle_robot_cell(seconds_per_tick, times_fired) -/mob/living/silicon/robot/proc/handle_robot_cell(delta_time, times_fired) +/mob/living/silicon/robot/proc/handle_robot_cell(seconds_per_tick, times_fired) if(stat == DEAD) return @@ -14,13 +14,13 @@ if(cell?.charge) low_power_mode = FALSE else if(stat == CONSCIOUS) - use_power(delta_time, times_fired) + use_power(seconds_per_tick, times_fired) -/mob/living/silicon/robot/proc/use_power(delta_time, times_fired) +/mob/living/silicon/robot/proc/use_power(seconds_per_tick, times_fired) if(cell?.charge) if(cell.charge <= 100) drop_all_held_items() - var/amt = clamp(lamp_enabled * lamp_intensity * delta_time, 0.5 * delta_time, cell.charge) //Lamp will use a max of 5 charge, depending on brightness of lamp. If lamp is off, borg systems consume 1 point of charge, or the rest of the cell if it's lower than that. + var/amt = clamp(lamp_enabled * lamp_intensity * seconds_per_tick, 0.5 * seconds_per_tick, cell.charge) //Lamp will use a max of 5 charge, depending on brightness of lamp. If lamp is off, borg systems consume 1 point of charge, or the rest of the cell if it's lower than that. cell.use(amt) //Usage table: 0.5/second if off/lowest setting, 4 = 2/second, 6 = 4/second, 8 = 6/second, 10 = 8/second else drop_all_held_items() diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 2a456e194a5..d963b45f8cf 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -417,7 +417,7 @@ /mob/living/silicon/get_inactive_held_item() return FALSE -/mob/living/silicon/handle_high_gravity(gravity, delta_time, times_fired) +/mob/living/silicon/handle_high_gravity(gravity, seconds_per_tick, times_fired) return /mob/living/silicon/rust_heretic_act() diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index d7029fdf766..172a2dd5b4e 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -125,7 +125,7 @@ Read_Memory() . = ..() -/mob/living/simple_animal/pet/cat/runtime/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/pet/cat/runtime/Life(seconds_per_tick = SSMOBS_DT, times_fired) if(!cats_deployed && SSticker.current_state >= GAME_STATE_SETTING_UP) Deploy_The_Cats() if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved) @@ -201,17 +201,17 @@ icon_state = "[icon_living]" -/mob/living/simple_animal/pet/cat/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/pet/cat/Life(seconds_per_tick = SSMOBS_DT, times_fired) if(!stat && !buckled && !client) - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) manual_emote(pick("stretches out for a belly rub.", "wags [p_their()] tail.", "lies down.")) set_resting(TRUE) - else if(DT_PROB(0.5, delta_time)) + else if(SPT_PROB(0.5, seconds_per_tick)) manual_emote(pick("sits down.", "crouches on [p_their()] hind legs.", "looks alert.")) set_resting(TRUE) icon_state = "[icon_living]_sit" cut_overlays() // No collar support in sitting state - else if(DT_PROB(0.5, delta_time)) + else if(SPT_PROB(0.5, seconds_per_tick)) if (resting) manual_emote(pick("gets up and meows.", "walks around.", "stops resting.")) set_resting(FALSE) @@ -313,12 +313,12 @@ to_chat(src, span_notice("Your name is now [new_name]!")) name = new_name -/mob/living/simple_animal/pet/cat/cak/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/pet/cat/cak/Life(seconds_per_tick = SSMOBS_DT, times_fired) ..() if(stat) return if(health < maxHealth) - adjustBruteLoss(-4 * delta_time) //Fast life regen + adjustBruteLoss(-4 * seconds_per_tick) //Fast life regen for(var/obj/item/food/donut/D in range(1, src)) //Frosts nearby donuts! if(!D.is_decorated) D.decorate_donut() diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm index d3b5d1eb9da..7018ba4426a 100644 --- a/code/modules/mob/living/simple_animal/friendly/crab.dm +++ b/code/modules/mob/living/simple_animal/friendly/crab.dm @@ -33,7 +33,7 @@ . = ..() ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) -/mob/living/simple_animal/crab/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/crab/Life(seconds_per_tick = SSMOBS_DT, times_fired) ..() //CRAB movement if(!ckey && !stat) 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 6d1267a8b75..47fbb0d20a5 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -40,14 +40,14 @@ AddComponent(/datum/component/udder) . = ..() -/mob/living/simple_animal/hostile/retaliate/goat/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/retaliate/goat/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() if(.) //chance to go crazy and start wacking stuff - if(!enemies.len && DT_PROB(0.5, delta_time)) + if(!enemies.len && SPT_PROB(0.5, seconds_per_tick)) Retaliate() - if(enemies.len && DT_PROB(5, delta_time)) + if(enemies.len && SPT_PROB(5, seconds_per_tick)) enemies.Cut() LoseTarget() src.visible_message(span_notice("[src] calms down.")) @@ -165,17 +165,17 @@ /mob/living/simple_animal/chick/add_cell_sample() AddElement(/datum/element/swabable, CELL_LINE_TABLE_CHICKEN, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) -/mob/living/simple_animal/chick/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/chick/Life(seconds_per_tick = SSMOBS_DT, times_fired) . =..() if(!.) return if(!stat && !ckey) - amount_grown += rand(0.5 * delta_time, 1 * delta_time) + amount_grown += rand(0.5 * seconds_per_tick, 1 * seconds_per_tick) if(amount_grown >= 100) new /mob/living/simple_animal/chicken(src.loc) qdel(src) -/mob/living/simple_animal/chick/holo/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/chick/holo/Life(seconds_per_tick = SSMOBS_DT, times_fired) ..() amount_grown = 0 diff --git a/code/modules/mob/living/simple_animal/guardian/types/gaseous.dm b/code/modules/mob/living/simple_animal/guardian/types/gaseous.dm index 5baf58bf99e..7808f8a6b48 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/gaseous.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/gaseous.dm @@ -60,17 +60,17 @@ if(. && summoner) RegisterSignal(summoner, COMSIG_ATOM_PRE_PRESSURE_PUSH, PROC_REF(stop_pressure)) -/mob/living/simple_animal/hostile/guardian/gaseous/Life(delta_time, times_fired) +/mob/living/simple_animal/hostile/guardian/gaseous/Life(seconds_per_tick, times_fired) . = ..() if(summoner) summoner.extinguish_mob() summoner.set_fire_stacks(0, remove_wet_stacks = FALSE) - summoner.adjust_bodytemperature(get_temp_change_amount((summoner.get_body_temp_normal() - summoner.bodytemperature), temp_stabilization_rate * delta_time)) + summoner.adjust_bodytemperature(get_temp_change_amount((summoner.get_body_temp_normal() - summoner.bodytemperature), temp_stabilization_rate * seconds_per_tick)) if(!expelled_gas) return var/datum/gas_mixture/mix_to_spawn = new() mix_to_spawn.add_gas(expelled_gas) - mix_to_spawn.gases[expelled_gas][MOLES] = possible_gases[expelled_gas] * delta_time + mix_to_spawn.gases[expelled_gas][MOLES] = possible_gases[expelled_gas] * seconds_per_tick mix_to_spawn.temperature = T20C var/turf/open/our_turf = get_turf(src) our_turf.assume_air(mix_to_spawn) diff --git a/code/modules/mob/living/simple_animal/guardian/types/lightning.dm b/code/modules/mob/living/simple_animal/guardian/types/lightning.dm index df3730a9e60..9739445f7c9 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/lightning.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/lightning.dm @@ -53,7 +53,7 @@ STOP_PROCESSING(SSfastprocess, src) removechains() -/mob/living/simple_animal/hostile/guardian/lightning/process(delta_time) +/mob/living/simple_animal/hostile/guardian/lightning/process(seconds_per_tick) if(!COOLDOWN_FINISHED(src, shock_cooldown)) return if(successfulshocks > 5) diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index 6fec562e0e2..ccbc4171c59 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -150,11 +150,11 @@ /mob/living/simple_animal/hostile/bear/butter/add_cell_sample() return //You cannot grow a real bear from butter. -/mob/living/simple_animal/hostile/bear/butter/Life(delta_time = SSMOBS_DT, times_fired) //Heals butter bear really fast when he takes damage. +/mob/living/simple_animal/hostile/bear/butter/Life(seconds_per_tick = SSMOBS_DT, times_fired) //Heals butter bear really fast when he takes damage. if(stat) return if(health < maxHealth) - heal_overall_damage(5 * delta_time) //Fast life regen, makes it hard for you to get eaten to death. + heal_overall_damage(5 * seconds_per_tick) //Fast life regen, makes it hard for you to get eaten to death. /mob/living/simple_animal/hostile/bear/butter/attack_hand(mob/living/user, list/modifiers) //Borrowed code from Cak, feeds people if they hit you. More nutriment but less vitamin to represent BUTTER. ..() diff --git a/code/modules/mob/living/simple_animal/hostile/blobbernaut.dm b/code/modules/mob/living/simple_animal/hostile/blobbernaut.dm index b9fdb0cea80..507c4c58431 100644 --- a/code/modules/mob/living/simple_animal/hostile/blobbernaut.dm +++ b/code/modules/mob/living/simple_animal/hostile/blobbernaut.dm @@ -36,7 +36,7 @@ /mob/living/simple_animal/hostile/blob/blobbernaut/add_cell_sample() AddElement(/datum/element/swabable, CELL_LINE_TABLE_BLOBBERNAUT, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) -/mob/living/simple_animal/hostile/blob/blobbernaut/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/blob/blobbernaut/Life(seconds_per_tick = SSMOBS_DT, times_fired) if(!..()) return FALSE var/list/blobs_in_area = range(2, src) @@ -53,14 +53,14 @@ damagesources++ else if(locate(/obj/structure/blob/special/core) in blobs_in_area) - adjustHealth(-maxHealth*BLOBMOB_BLOBBERNAUT_HEALING_CORE * delta_time) + adjustHealth(-maxHealth*BLOBMOB_BLOBBERNAUT_HEALING_CORE * seconds_per_tick) var/obj/effect/temp_visual/heal/heal_effect = new /obj/effect/temp_visual/heal(get_turf(src)) //hello yes you are being healed if(overmind) heal_effect.color = overmind.blobstrain.complementary_color else heal_effect.color = "#000000" if(locate(/obj/structure/blob/special/node) in blobs_in_area) - adjustHealth(-maxHealth*BLOBMOB_BLOBBERNAUT_HEALING_NODE * delta_time) + adjustHealth(-maxHealth*BLOBMOB_BLOBBERNAUT_HEALING_NODE * seconds_per_tick) var/obj/effect/temp_visual/heal/heal_effect = new /obj/effect/temp_visual/heal(get_turf(src)) if(overmind) heal_effect.color = overmind.blobstrain.complementary_color @@ -70,7 +70,7 @@ if(!damagesources) return FALSE - adjustHealth(maxHealth * BLOBMOB_BLOBBERNAUT_HEALTH_DECAY * damagesources * delta_time) //take 2.5% of max health as damage when not near the blob or if the naut has no factory, 5% if both + adjustHealth(maxHealth * BLOBMOB_BLOBBERNAUT_HEALTH_DECAY * damagesources * seconds_per_tick) //take 2.5% of max health as damage when not near the blob or if the naut has no factory, 5% if both var/image/image = new('icons/mob/nonhuman-player/blob.dmi', src, "nautdamage", MOB_LAYER+0.01) image.appearance_flags = RESET_COLOR diff --git a/code/modules/mob/living/simple_animal/hostile/blobspore.dm b/code/modules/mob/living/simple_animal/hostile/blobspore.dm index 0325def0e80..9ef4f5b31cd 100644 --- a/code/modules/mob/living/simple_animal/hostile/blobspore.dm +++ b/code/modules/mob/living/simple_animal/hostile/blobspore.dm @@ -49,7 +49,7 @@ var/datum/antagonist/blob_minion/blob_zombie/zombie = new(overmind) mind.add_antag_datum(zombie) -/mob/living/simple_animal/hostile/blob/blobspore/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/blob/blobspore/Life(seconds_per_tick = SSMOBS_DT, times_fired) if(!is_zombie && isturf(loc)) for(var/mob/living/carbon/human/target in view(src,1)) //Only for corpse right next to/on same tile if(!is_weak && target.stat == DEAD) diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm index ae4fd248734..29f628d148e 100644 --- a/code/modules/mob/living/simple_animal/hostile/goose.dm +++ b/code/modules/mob/living/simple_animal/hostile/goose.dm @@ -156,11 +156,11 @@ else addtimer(CALLBACK(src, PROC_REF(suffocate)), 300) -/mob/living/simple_animal/hostile/retaliate/goose/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/retaliate/goose/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() if(choking && !stat) do_jitter_animation(50) - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) emote("gasp") /mob/living/simple_animal/hostile/retaliate/goose/proc/suffocate() diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index 5a6beec6eaf..fcf02fd1293 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -63,9 +63,9 @@ var/datum/mind/origin var/time = 0 -/obj/item/organ/internal/body_egg/changeling_egg/egg_process(delta_time, times_fired) +/obj/item/organ/internal/body_egg/changeling_egg/egg_process(seconds_per_tick, times_fired) // Changeling eggs grow in dead people - time += delta_time * 10 + time += seconds_per_tick * 10 if(time >= EGG_INCUBATION_TIME) Pop() Remove(owner) diff --git a/code/modules/mob/living/simple_animal/hostile/heretic_monsters.dm b/code/modules/mob/living/simple_animal/hostile/heretic_monsters.dm index 3e835f0b334..95b8736987e 100644 --- a/code/modules/mob/living/simple_animal/hostile/heretic_monsters.dm +++ b/code/modules/mob/living/simple_animal/hostile/heretic_monsters.dm @@ -379,14 +379,14 @@ . = ..() playsound(src, 'sound/effects/footstep/rustystep1.ogg', 100, TRUE) -/mob/living/simple_animal/hostile/heretic_summon/rust_spirit/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/heretic_summon/rust_spirit/Life(seconds_per_tick = SSMOBS_DT, times_fired) if(stat == DEAD) return ..() var/turf/our_turf = get_turf(src) if(HAS_TRAIT(our_turf, TRAIT_RUSTY)) - adjustBruteLoss(-1.5 * delta_time, FALSE) - adjustFireLoss(-1.5 * delta_time, FALSE) + adjustBruteLoss(-1.5 * seconds_per_tick, FALSE) + adjustFireLoss(-1.5 * seconds_per_tick, FALSE) return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 6fef79ade33..0e811c25a68 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -101,7 +101,7 @@ GiveTarget(null) return ..() -/mob/living/simple_animal/hostile/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() if(!.) //dead SSmove_manager.stop_looping(src) diff --git a/code/modules/mob/living/simple_animal/hostile/illusion.dm b/code/modules/mob/living/simple_animal/hostile/illusion.dm index cbc90336a54..801a9e75ec8 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 @@ death_message = "vanishes into thin air! It was a fake!" -/mob/living/simple_animal/hostile/illusion/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/illusion/Life(seconds_per_tick = SSMOBS_DT, times_fired) ..() if(world.time > life_span) death() 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 ce23097774a..73b7f6aa626 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm @@ -131,9 +131,9 @@ taste_description = "french cuisine" taste_mult = 1.3 -/datum/reagent/toxin/leaper_venom/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/toxin/leaper_venom/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) if(volume >= 10) - M.adjustToxLoss(5 * REM * delta_time, 0) + M.adjustToxLoss(5 * REM * seconds_per_tick, 0) ..() /obj/effect/temp_visual/leaper_crush @@ -186,7 +186,7 @@ if(!hopping) Hop() -/mob/living/simple_animal/hostile/jungle/leaper/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/jungle/leaper/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() 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 cd7d232f29f..b7caeb42c14 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 @@ -29,7 +29,7 @@ footstep_type = FOOTSTEP_MOB_CLAW var/datum/action/small_sprite/mini_arachnid = new/datum/action/small_sprite/mega_arachnid() -/mob/living/simple_animal/hostile/jungle/mega_arachnid/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/jungle/mega_arachnid/Life(seconds_per_tick = SSMOBS_DT, times_fired) ..() if(target && ranged_cooldown > world.time && iscarbon(target)) var/mob/living/carbon/C = target 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 d7afdc09378..ea7008cdb48 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -339,7 +339,7 @@ Difficulty: Hard new /obj/effect/decal/cleanable/blood(get_turf(src)) . = ..() -/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/Life(seconds_per_tick = SSMOBS_DT, times_fired) return /mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE, required_bodytype) 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 c046f6a969e..84604dabef0 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -396,7 +396,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/hierophant/proc/burst(turf/original, spread_speed) hierophant_burst(src, original, burst_range, spread_speed) -/mob/living/simple_animal/hostile/megafauna/hierophant/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/megafauna/hierophant/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() if(. && spawned_beacon && !QDELETED(spawned_beacon) && !client) if(target || loc == spawned_beacon.loc) diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index 9aa69284179..1cbbd9ec45a 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -117,10 +117,10 @@ GLOBAL_LIST_INIT(animatable_blacklist, list(/obj/structure/table, /obj/structure overlay_googly_eyes = FALSE CopyObject(copy, creator, destroy_original) -/mob/living/simple_animal/hostile/mimic/copy/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/mimic/copy/Life(seconds_per_tick = SSMOBS_DT, times_fired) ..() if(idledamage && !target && !ckey) //Objects eventually revert to normal if no one is around to terrorize - adjustBruteLoss(0.5 * delta_time) + adjustBruteLoss(0.5 * seconds_per_tick) for(var/mob/living/M in contents) //a fix for animated statues from the flesh to stone spell death() 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 3dde18f06b7..4d252ebabf1 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 @@ -133,7 +133,7 @@ . = ..() AddElement(/datum/element/simple_flying) -/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() if(stat == CONSCIOUS) consume_bait() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm index 3511a4c53eb..d9bd88cb889 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm @@ -233,7 +233,7 @@ . = ..() STOP_PROCESSING(SSobj, src) -/obj/item/ore_sensor/process(delta_time) +/obj/item/ore_sensor/process(seconds_per_tick) if(!COOLDOWN_FINISHED(src, ore_sensing_cooldown)) return COOLDOWN_START(src, ore_sensing_cooldown, cooldown) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index 1059b336e07..7c4669fb6b4 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm @@ -257,13 +257,13 @@ While using this makes the system rely on OnFire, it still gives options for tim REMOVE_TRAIT(source, TRAIT_ELITE_CHALLENGER, REF(src)) UnregisterSignal(source, COMSIG_PARENT_QDELETING) -/obj/structure/elite_tumor/process(delta_time) +/obj/structure/elite_tumor/process(seconds_per_tick) if(!isturf(loc)) return for(var/mob/living/simple_animal/hostile/asteroid/elite/elitehere in loc) if(elitehere == mychild && activity == TUMOR_PASSIVE) - mychild.adjustHealth(-mychild.maxHealth * 0.025*delta_time) + mychild.adjustHealth(-mychild.maxHealth * 0.025*seconds_per_tick) var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(mychild)) H.color = "#FF0000" 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 5f482ecb693..07ea2e881af 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 @@ -100,7 +100,7 @@ if(CALL_CHILDREN) call_children() -/mob/living/simple_animal/hostile/asteroid/elite/broodmother/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/asteroid/elite/broodmother/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() 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 f6020a18bcb..0fae77d08ce 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/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/asteroid/elite/pandora/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() if(health >= maxHealth * 0.5) cooldown_time = 2 SECONDS 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 d9d8ebb5289..78679006d52 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 @@ -41,7 +41,7 @@ footstep_type = FOOTSTEP_MOB_HEAVY -/mob/living/simple_animal/hostile/asteroid/goliath/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/asteroid/goliath/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() handle_preattack() @@ -159,7 +159,7 @@ var/turf/last_location var/tentacle_recheck_cooldown = 100 -/mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() if(!.) // dead return 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 2aa5f995385..a69588c9d89 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 @@ -110,7 +110,7 @@ resize = 0.45 update_transform() -/mob/living/simple_animal/hostile/asteroid/gutlunch/grublunch/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/asteroid/gutlunch/grublunch/Life(seconds_per_tick = SSMOBS_DT, times_fired) ..() growth++ if(growth > 50) //originally used a timer for this but it was more of a problem than it was worth. 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 4265ff7a50e..6256a838561 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 @@ -196,7 +196,7 @@ clickbox_max_scale = 2 var/can_infest_dead = FALSE -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() if(stat == DEAD || !isturf(loc)) return 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 5a002dbbf9a..d70a8f9eaa2 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 @@ -46,7 +46,7 @@ aggressive_message_said = TRUE rapid_melee = 2 -/mob/living/simple_animal/hostile/asteroid/polarbear/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/asteroid/polarbear/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() if(!. || target) return 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 6dd2a2b5d72..56a8c77e2fd 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 @@ -53,7 +53,7 @@ retreat_message_said = TRUE retreat_distance = 30 -/mob/living/simple_animal/hostile/asteroid/wolf/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/asteroid/wolf/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() if(!. || target) return diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index dd13e318b30..da86fb17c8d 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -49,10 +49,10 @@ else . += span_info("It looks like it's been roughed up.") -/mob/living/simple_animal/hostile/mushroom/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/mushroom/Life(seconds_per_tick = SSMOBS_DT, times_fired) ..() if(!stat)//Mushrooms slowly regenerate if conscious, for people who want to save them from being eaten - adjustBruteLoss(-1 * delta_time) + adjustBruteLoss(-1 * seconds_per_tick) /mob/living/simple_animal/hostile/mushroom/Initialize(mapload)//Makes every shroom a little unique melee_damage_lower += rand(3, 5) diff --git a/code/modules/mob/living/simple_animal/hostile/ooze.dm b/code/modules/mob/living/simple_animal/hostile/ooze.dm index 1230e68d6db..94231befdf5 100644 --- a/code/modules/mob/living/simple_animal/hostile/ooze.dm +++ b/code/modules/mob/living/simple_animal/hostile/ooze.dm @@ -49,7 +49,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(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/ooze/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() if(!mind && stat != DEAD)//no mind no change @@ -60,7 +60,7 @@ //Eat a bit of all the reagents we have. Gaining nutrition for actual nutritional ones. for(var/i in reagents.reagent_list) var/datum/reagent/reagent = i - var/consumption_amount = min(reagents.get_reagent_amount(reagent.type), ooze_metabolism_modifier * REAGENTS_METABOLISM * delta_time) + var/consumption_amount = min(reagents.get_reagent_amount(reagent.type), ooze_metabolism_modifier * REAGENTS_METABOLISM * seconds_per_tick) if(istype(reagent, /datum/reagent/consumable)) var/datum/reagent/consumable/consumable = reagent nutrition_change += consumption_amount * consumable.nutriment_factor @@ -68,7 +68,7 @@ adjust_ooze_nutrition(nutrition_change) if(ooze_nutrition <= 0) - adjustBruteLoss(0.25 * delta_time) + adjustBruteLoss(0.25 * seconds_per_tick) ///Does ooze_nutrition + supplied amount and clamps it within 0 and 500 /mob/living/simple_animal/hostile/ooze/proc/adjust_ooze_nutrition(amount) diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm index 8a385700e92..93c77b8d810 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm @@ -101,9 +101,9 @@ var/damage_coefficient = rand(devastation_damage_min_percentage, devastation_damage_max_percentage) adjustBruteLoss(initial(maxHealth)*damage_coefficient) -/mob/living/simple_animal/hostile/space_dragon/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/space_dragon/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() - tiredness = max(tiredness - (0.5 * delta_time), 0) + tiredness = max(tiredness - (0.5 * seconds_per_tick), 0) for(var/mob/living/consumed_mob in src) if(consumed_mob.stat == DEAD) continue diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm index 6c99e53e63a..a6388cdf87c 100644 --- a/code/modules/mob/living/simple_animal/hostile/tree.dm +++ b/code/modules/mob/living/simple_animal/hostile/tree.dm @@ -51,7 +51,7 @@ . = ..() add_cell_sample() -/mob/living/simple_animal/hostile/tree/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/tree/Life(seconds_per_tick = SSMOBS_DT, times_fired) ..() if(!is_tree || !isopenturf(loc)) return @@ -60,7 +60,7 @@ return var/co2 = T.air.gases[/datum/gas/carbon_dioxide][MOLES] - if(co2 > 0 && DT_PROB(13, delta_time)) + if(co2 > 0 && SPT_PROB(13, seconds_per_tick)) var/amt = min(co2, 9) T.air.gases[/datum/gas/carbon_dioxide][MOLES] -= amt T.atmos_spawn_air("o2=[amt]") 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 f57fd7b745a..0417b1eb17f 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 @@ -172,7 +172,7 @@ /// Whether or not this plant is ghost possessable var/playable_plant = TRUE -/mob/living/simple_animal/hostile/venus_human_trap/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/venus_human_trap/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() pull_vines() diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 04d4cb8241b..203f765b394 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -383,7 +383,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/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/parrot/Life(seconds_per_tick = SSMOBS_DT, times_fired) ..() //Sprite update for when a parrot gets pulled @@ -927,7 +927,7 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list( . = ..() -/mob/living/simple_animal/parrot/poly/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/parrot/poly/Life(seconds_per_tick = SSMOBS_DT, times_fired) if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved) Write_Memory(FALSE) memory_saved = TRUE diff --git a/code/modules/mob/living/simple_animal/revenant.dm b/code/modules/mob/living/simple_animal/revenant.dm index 822a0ab2319..97ec1d93a69 100644 --- a/code/modules/mob/living/simple_animal/revenant.dm +++ b/code/modules/mob/living/simple_animal/revenant.dm @@ -127,7 +127,7 @@ mind.add_antag_datum(/datum/antagonist/revenant) //Life, Stat, Hud Updates, and Say -/mob/living/simple_animal/revenant/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/revenant/Life(seconds_per_tick = SSMOBS_DT, times_fired) if(stasis) return if(revealed && essence <= 0) @@ -143,7 +143,7 @@ notransform = FALSE to_chat(src, span_revenboldnotice("You can move again!")) if(essence_regenerating && !inhibited && essence < essence_regen_cap) //While inhibited, essence will not regenerate - essence = min(essence + (essence_regen_amount * delta_time), essence_regen_cap) + essence = min(essence + (essence_regen_amount * seconds_per_tick), essence_regen_cap) update_mob_action_buttons() //because we update something required by our spells in life, we need to update our buttons update_spooky_icon() update_health_hud() diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 7e35aca237b..f0e0cf841fa 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -208,10 +208,10 @@ if(isnull(unsuitable_heat_damage)) unsuitable_heat_damage = unsuitable_atmos_damage -/mob/living/simple_animal/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() if(staminaloss > 0) - adjustStaminaLoss(-stamina_recovery * delta_time, FALSE, TRUE) + adjustStaminaLoss(-stamina_recovery * seconds_per_tick, FALSE, TRUE) /mob/living/simple_animal/Destroy() QDEL_NULL(access_card) @@ -357,7 +357,7 @@ if((areatemp < minbodytemp) || (areatemp > maxbodytemp)) . = FALSE -/mob/living/simple_animal/handle_environment(datum/gas_mixture/environment, delta_time, times_fired) +/mob/living/simple_animal/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired) var/atom/A = loc if(isturf(A)) var/areatemp = get_temperature(environment) @@ -365,23 +365,23 @@ if(abs(temp_delta) > 5) if(temp_delta < 0) if(!on_fire) - adjust_bodytemperature(clamp(temp_delta * delta_time / temperature_normalization_speed, temp_delta, 0)) + adjust_bodytemperature(clamp(temp_delta * seconds_per_tick / temperature_normalization_speed, temp_delta, 0)) else - adjust_bodytemperature(clamp(temp_delta * delta_time / temperature_normalization_speed, 0, temp_delta)) + adjust_bodytemperature(clamp(temp_delta * seconds_per_tick / temperature_normalization_speed, 0, temp_delta)) if(!environment_air_is_safe() && unsuitable_atmos_damage) - adjustHealth(unsuitable_atmos_damage * delta_time) + adjustHealth(unsuitable_atmos_damage * seconds_per_tick) if(unsuitable_atmos_damage > 0) throw_alert(ALERT_NOT_ENOUGH_OXYGEN, /atom/movable/screen/alert/not_enough_oxy) else clear_alert(ALERT_NOT_ENOUGH_OXYGEN) - handle_temperature_damage(delta_time, times_fired) + handle_temperature_damage(seconds_per_tick, times_fired) -/mob/living/simple_animal/proc/handle_temperature_damage(delta_time, times_fired) +/mob/living/simple_animal/proc/handle_temperature_damage(seconds_per_tick, times_fired) . = FALSE if((bodytemperature < minbodytemp) && unsuitable_cold_damage) - adjustHealth(unsuitable_cold_damage * delta_time) + adjustHealth(unsuitable_cold_damage * seconds_per_tick) switch(unsuitable_cold_damage) if(1 to 5) throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/cold, 1) @@ -392,7 +392,7 @@ . = TRUE if((bodytemperature > maxbodytemp) && unsuitable_heat_damage) - adjustHealth(unsuitable_heat_damage * delta_time) + adjustHealth(unsuitable_heat_damage * seconds_per_tick) switch(unsuitable_heat_damage) if(1 to 5) throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/hot, 1) diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index 1e5e691cde8..ca578f949df 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/slime/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/slime/Life(seconds_per_tick = SSMOBS_DT, times_fired) if (notransform) return . = ..() @@ -6,21 +6,21 @@ return // We get some passive bruteloss healing if we're not dead - if(stat != DEAD && DT_PROB(16, delta_time)) - adjustBruteLoss(-0.5 * delta_time) + if(stat != DEAD && SPT_PROB(16, seconds_per_tick)) + adjustBruteLoss(-0.5 * seconds_per_tick) if(ismob(buckled)) - handle_feeding(delta_time, times_fired) + handle_feeding(seconds_per_tick, times_fired) if(stat != CONSCIOUS) // Slimes in stasis don't lose nutrition, don't change mood and don't respond to speech return - handle_nutrition(delta_time, times_fired) + handle_nutrition(seconds_per_tick, times_fired) if(QDELETED(src)) // Stop if the slime split during handle_nutrition() return - reagents.remove_all(0.5 * REAGENTS_METABOLISM * reagents.reagent_list.len * delta_time) //Slimes are such snowflakes - handle_targets(delta_time, times_fired) + reagents.remove_all(0.5 * REAGENTS_METABOLISM * reagents.reagent_list.len * seconds_per_tick) //Slimes are such snowflakes + handle_targets(seconds_per_tick, times_fired) if(ckey) return - handle_mood(delta_time, times_fired) - handle_speech(delta_time, times_fired) + handle_mood(seconds_per_tick, times_fired) + handle_speech(seconds_per_tick, times_fired) // Unlike most of the simple animals, slimes support UNCONSCIOUS. This is an ugly hack. @@ -109,7 +109,7 @@ AIproc = 0 -/mob/living/simple_animal/slime/handle_environment(datum/gas_mixture/environment, delta_time, times_fired) +/mob/living/simple_animal/slime/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired) var/loc_temp = get_temperature(environment) var/divisor = 10 /// The divisor controls how fast body temperature changes, lower causes faster changes @@ -119,9 +119,9 @@ if(temp_delta < 0) // It is cold here if(!on_fire) // Do not reduce body temp when on fire - adjust_bodytemperature(clamp((temp_delta / divisor) * delta_time, temp_delta, 0)) + adjust_bodytemperature(clamp((temp_delta / divisor) * seconds_per_tick, temp_delta, 0)) else // This is a hot place - adjust_bodytemperature(clamp((temp_delta / divisor) * delta_time, 0, temp_delta)) + adjust_bodytemperature(clamp((temp_delta / divisor) * seconds_per_tick, 0, temp_delta)) if(bodytemperature < (T0C + 5)) // start calculating temperature damage etc if(bodytemperature <= (T0C - 40)) // stun temperature @@ -131,9 +131,9 @@ if(bodytemperature <= (T0C - 50)) // hurt temperature if(bodytemperature <= 50) // sqrting negative numbers is bad - adjustBruteLoss(100 * delta_time) + adjustBruteLoss(100 * seconds_per_tick) else - adjustBruteLoss(round(sqrt(bodytemperature)) * delta_time) + adjustBruteLoss(round(sqrt(bodytemperature)) * seconds_per_tick) else REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, SLIME_COLD) @@ -159,7 +159,7 @@ updatehealth() -/mob/living/simple_animal/slime/proc/handle_feeding(delta_time, times_fired) +/mob/living/simple_animal/slime/proc/handle_feeding(seconds_per_tick, times_fired) var/mob/living/prey = buckled if(stat) @@ -170,23 +170,23 @@ if(!rabid && !attacked) var/mob/last_to_hurt = prey.LAssailant?.resolve() if(last_to_hurt && last_to_hurt != prey) - if(DT_PROB(30, delta_time)) + if(SPT_PROB(30, seconds_per_tick)) add_friendship(last_to_hurt, 1) else to_chat(src, "This subject does not have a strong enough life energy anymore...") if(prey.client && ishuman(prey)) - if(DT_PROB(61, delta_time)) + if(SPT_PROB(61, seconds_per_tick)) rabid = 1 //we go rabid after finishing to feed on a human with a client. Feedstop() return if(iscarbon(prey)) - prey.adjustCloneLoss(rand(2, 4) * 0.5 * delta_time) - prey.adjustToxLoss(rand(1, 2) * 0.5 * delta_time) + prey.adjustCloneLoss(rand(2, 4) * 0.5 * seconds_per_tick) + prey.adjustToxLoss(rand(1, 2) * 0.5 * seconds_per_tick) - if(DT_PROB(5, delta_time) && prey.client) + if(SPT_PROB(5, seconds_per_tick) && prey.client) to_chat(prey, "[pick("You can feel your body becoming weak!", \ "You feel like you're about to die!", \ "You feel every part of your body screaming in agony!", \ @@ -199,8 +199,8 @@ var/mob/living/animal_victim = prey var/totaldamage = 0 //total damage done to this unfortunate animal - totaldamage += animal_victim.adjustCloneLoss(rand(2, 4) * 0.5 * delta_time) - totaldamage += animal_victim.adjustToxLoss(rand(1, 2) * 0.5 * delta_time) + totaldamage += animal_victim.adjustCloneLoss(rand(2, 4) * 0.5 * seconds_per_tick) + totaldamage += animal_victim.adjustToxLoss(rand(1, 2) * 0.5 * seconds_per_tick) if(totaldamage <= 0) //if we did no(or negative!) damage to it, stop Feedstop(0, 0) @@ -210,27 +210,27 @@ Feedstop(0, 0) return - add_nutrition((rand(7, 15) * 0.5 * delta_time * CONFIG_GET(number/damage_multiplier))) + add_nutrition((rand(7, 15) * 0.5 * seconds_per_tick * CONFIG_GET(number/damage_multiplier))) //Heal yourself. - adjustBruteLoss(-1.5 * delta_time) + adjustBruteLoss(-1.5 * seconds_per_tick) -/mob/living/simple_animal/slime/proc/handle_nutrition(delta_time, times_fired) +/mob/living/simple_animal/slime/proc/handle_nutrition(seconds_per_tick, times_fired) if(docile) //God as my witness, I will never go hungry again set_nutrition(700) //fuck you for using the base nutrition var return - if(DT_PROB(7.5, delta_time)) - adjust_nutrition(-0.5 * (1 + is_adult) * delta_time) + if(SPT_PROB(7.5, seconds_per_tick)) + adjust_nutrition(-0.5 * (1 + is_adult) * seconds_per_tick) if(nutrition <= 0) set_nutrition(0) - if(DT_PROB(50, delta_time)) + if(SPT_PROB(50, seconds_per_tick)) adjustBruteLoss(rand(0,5)) else if (nutrition >= get_grow_nutrition() && amount_grown < SLIME_EVOLUTION_THRESHOLD) - adjust_nutrition(-10 * delta_time) + adjust_nutrition(-10 * seconds_per_tick) amount_grown++ update_mob_action_buttons() @@ -254,7 +254,7 @@ -/mob/living/simple_animal/slime/proc/handle_targets(delta_time, times_fired) +/mob/living/simple_animal/slime/proc/handle_targets(seconds_per_tick, times_fired) if(attacked > 50) attacked = 50 @@ -264,10 +264,10 @@ if(Discipline > 0) if(Discipline >= 5 && rabid) - if(DT_PROB(37, delta_time)) + if(SPT_PROB(37, seconds_per_tick)) rabid = 0 - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) Discipline-- if(!client) @@ -290,11 +290,11 @@ if (nutrition < get_starve_nutrition()) hungry = 2 - else if (nutrition < get_grow_nutrition() && DT_PROB(13, delta_time) || nutrition < get_hunger_nutrition()) + else if (nutrition < get_grow_nutrition() && SPT_PROB(13, seconds_per_tick) || nutrition < get_hunger_nutrition()) hungry = 1 if(hungry == 2 && !client) // if a slime is starving, it starts losing its friends - if(Friends.len > 0 && DT_PROB(0.5, delta_time)) + if(Friends.len > 0 && SPT_PROB(0.5, seconds_per_tick)) var/mob/nofriend = pick(Friends) add_friendship(nofriend, -1) @@ -333,7 +333,7 @@ set_target(targets[1]) // I am attacked and am fighting back or so hungry I don't even care else for(var/mob/living/carbon/C in targets) - if(!Discipline && DT_PROB(2.5, delta_time)) + if(!Discipline && SPT_PROB(2.5, seconds_per_tick)) if(ishuman(C) || isalienadult(C)) set_target(C) break @@ -350,19 +350,19 @@ if(!Target) // If we have no target, we are wandering or following orders if (Leader) if(holding_still) - holding_still = max(holding_still - (0.5 * delta_time), 0) + holding_still = max(holding_still - (0.5 * seconds_per_tick), 0) else if(!HAS_TRAIT(src, TRAIT_IMMOBILIZED) && isturf(loc)) step_to(src, Leader) else if(hungry) if (holding_still) - holding_still = max(holding_still - (0.5 * hungry * delta_time), 0) + holding_still = max(holding_still - (0.5 * hungry * seconds_per_tick), 0) else if(!HAS_TRAIT(src, TRAIT_IMMOBILIZED) && isturf(loc) && prob(50)) step(src, pick(GLOB.cardinals)) else if(holding_still) - holding_still = max(holding_still - (0.5 * delta_time), 0) + holding_still = max(holding_still - (0.5 * seconds_per_tick), 0) else if (docile && pulledby) holding_still = 10 else if(!HAS_TRAIT(src, TRAIT_IMMOBILIZED) && isturf(loc) && prob(33)) @@ -376,7 +376,7 @@ /mob/living/simple_animal/slime/handle_automated_speech() return //slime random speech is currently handled in handle_speech() -/mob/living/simple_animal/slime/proc/handle_mood(delta_time, times_fired) +/mob/living/simple_animal/slime/proc/handle_mood(seconds_per_tick, times_fired) var/newmood = "" if (rabid || attacked) newmood = "angry" @@ -386,20 +386,20 @@ newmood = "mischievous" if (!newmood) - if (Discipline && DT_PROB(13, delta_time)) + if (Discipline && SPT_PROB(13, seconds_per_tick)) newmood = "pout" - else if (DT_PROB(0.5, delta_time)) + else if (SPT_PROB(0.5, seconds_per_tick)) newmood = pick("sad", ":3", "pout") if ((current_mood == "sad" || current_mood == ":3" || current_mood == "pout") && !newmood) - if(DT_PROB(50, delta_time)) + if(SPT_PROB(50, seconds_per_tick)) newmood = current_mood if (newmood != current_mood) // This is so we don't redraw them every time current_mood = newmood regenerate_icons() -/mob/living/simple_animal/slime/proc/handle_speech(delta_time, times_fired) +/mob/living/simple_animal/slime/proc/handle_speech(seconds_per_tick, times_fired) //Speech understanding starts here var/to_say if (speech_buffer.len > 0) @@ -494,7 +494,7 @@ //Speech starts here if (to_say) say (to_say) - else if(DT_PROB(0.5, delta_time)) + else if(SPT_PROB(0.5, seconds_per_tick)) emote(pick("bounce","sway","light","vibrate","jiggle")) else var/t = 10 @@ -513,7 +513,7 @@ t += 10 if (nutrition < get_starve_nutrition()) t += 10 - if (DT_PROB(1, delta_time) && prob(t)) + if (SPT_PROB(1, seconds_per_tick) && prob(t)) var/phrases = list() if (Target) phrases += "[Target]... look yummy..." diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 84ca1e9210c..073dde399a0 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -223,7 +223,7 @@ return FALSE -/mob/proc/reagent_check(datum/reagent/R, delta_time, times_fired) // utilized in the species code +/mob/proc/reagent_check(datum/reagent/R, seconds_per_tick, times_fired) // utilized in the species code return TRUE diff --git a/code/modules/mob_spawn/ghost_roles/spider_roles.dm b/code/modules/mob_spawn/ghost_roles/spider_roles.dm index 39bee894973..cb84fb351e5 100644 --- a/code/modules/mob_spawn/ghost_roles/spider_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/spider_roles.dm @@ -92,8 +92,8 @@ egg = null return ..() -/obj/effect/mob_spawn/ghost_role/spider/process(delta_time) - amount_grown += rand(0, 1) * delta_time +/obj/effect/mob_spawn/ghost_role/spider/process(seconds_per_tick) + amount_grown += rand(0, 1) * seconds_per_tick if(amount_grown >= 100 && !ready) ready = TRUE notify_ghosts("[src] is ready to hatch!", null, enter_link = "(Click to play)", source = src, action = NOTIFY_ORBIT, ignore_key = POLL_IGNORE_SPIDER) diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index b78e4885acc..9a86a5607c3 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -222,7 +222,7 @@ . = ..() . += "[extended_desc]" -/obj/item/mod/control/process(delta_time) +/obj/item/mod/control/process(seconds_per_tick) if(seconds_electrified > MACHINE_NOT_ELECTRIFIED) seconds_electrified-- if(!get_charge() && active && !activating) @@ -231,12 +231,12 @@ var/malfunctioning_charge_drain = 0 if(malfunctioning) malfunctioning_charge_drain = rand(1,20) - subtract_charge((charge_drain + malfunctioning_charge_drain)*delta_time) + subtract_charge((charge_drain + malfunctioning_charge_drain)*seconds_per_tick) update_charge_alert() for(var/obj/item/mod/module/module as anything in modules) - if(malfunctioning && module.active && DT_PROB(5, delta_time)) + if(malfunctioning && module.active && SPT_PROB(5, seconds_per_tick)) module.on_deactivation(display_message = TRUE) - module.on_process(delta_time) + module.on_process(seconds_per_tick) /obj/item/mod/control/equipped(mob/user, slot) ..() diff --git a/code/modules/mod/modules/_module.dm b/code/modules/mod/modules/_module.dm index c5247a84a99..a29a888df8c 100644 --- a/code/modules/mod/modules/_module.dm +++ b/code/modules/mod/modules/_module.dm @@ -188,18 +188,18 @@ return COMSIG_MOB_CANCEL_CLICKON /// Called on the MODsuit's process -/obj/item/mod/module/proc/on_process(delta_time) +/obj/item/mod/module/proc/on_process(seconds_per_tick) if(active) - if(!drain_power(active_power_cost * delta_time)) + if(!drain_power(active_power_cost * seconds_per_tick)) on_deactivation() return FALSE - on_active_process(delta_time) + on_active_process(seconds_per_tick) else - drain_power(idle_power_cost * delta_time) + drain_power(idle_power_cost * seconds_per_tick) return TRUE /// Called on the MODsuit's process if it is an active module -/obj/item/mod/module/proc/on_active_process(delta_time) +/obj/item/mod/module/proc/on_active_process(seconds_per_tick) return /// Called from MODsuit's install() proc, so when the module is installed. @@ -378,12 +378,12 @@ return return ..() -/obj/item/mod/module/anomaly_locked/on_process(delta_time) +/obj/item/mod/module/anomaly_locked/on_process(seconds_per_tick) . = ..() if(!core) return FALSE -/obj/item/mod/module/anomaly_locked/on_active_process(delta_time) +/obj/item/mod/module/anomaly_locked/on_active_process(seconds_per_tick) if(!core) return FALSE return TRUE diff --git a/code/modules/mod/modules/module_kinesis.dm b/code/modules/mod/modules/module_kinesis.dm index 0007bbf72ed..52cd556b35e 100644 --- a/code/modules/mod/modules/module_kinesis.dm +++ b/code/modules/mod/modules/module_kinesis.dm @@ -82,7 +82,7 @@ return clear_grab(playsound = !deleting) -/obj/item/mod/module/anomaly_locked/kinesis/process(delta_time) +/obj/item/mod/module/anomaly_locked/kinesis/process(seconds_per_tick) if(!mod.wearer.client || mod.wearer.incapacitated(IGNORE_GRAB)) clear_grab() return diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm index 718b5575fe8..4531b84f15a 100644 --- a/code/modules/mod/modules/modules_engineering.dm +++ b/code/modules/mod/modules/modules_engineering.dm @@ -34,7 +34,7 @@ /// T-ray scan range. var/range = 4 -/obj/item/mod/module/t_ray/on_active_process(delta_time) +/obj/item/mod/module/t_ray/on_active_process(seconds_per_tick) t_ray_scan(mod.wearer, 0.8 SECONDS, range) ///Magnetic Stability - Gives the user a slowdown but makes them negate gravity and be immune to slips. diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index e98744b4f61..d52939f927b 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -260,7 +260,7 @@ set_light_flags(light_flags & ~LIGHT_ATTACHED) set_light_on(active) -/obj/item/mod/module/flashlight/on_process(delta_time) +/obj/item/mod/module/flashlight/on_process(seconds_per_tick) active_power_cost = base_power * light_range return ..() @@ -378,8 +378,8 @@ if("temperature_setting") temperature_setting = clamp(value + T0C, min_temp, max_temp) -/obj/item/mod/module/thermal_regulator/on_active_process(delta_time) - mod.wearer.adjust_bodytemperature(get_temp_change_amount((temperature_setting - mod.wearer.bodytemperature), 0.08 * delta_time)) +/obj/item/mod/module/thermal_regulator/on_active_process(seconds_per_tick) + mod.wearer.adjust_bodytemperature(get_temp_change_amount((temperature_setting - mod.wearer.bodytemperature), 0.08 * seconds_per_tick)) ///DNA Lock - Prevents people without the set DNA from activating the suit. /obj/item/mod/module/dna_lock diff --git a/code/modules/mod/modules/modules_maint.dm b/code/modules/mod/modules/modules_maint.dm index 2e39293fe02..9829321f640 100644 --- a/code/modules/mod/modules/modules_maint.dm +++ b/code/modules/mod/modules/modules_maint.dm @@ -124,7 +124,7 @@ for(var/mutable_appearance/appearance as anything in .) appearance.color = active ? rainbow_order[rave_number] : null -/obj/item/mod/module/visor/rave/on_active_process(delta_time) +/obj/item/mod/module/visor/rave/on_active_process(seconds_per_tick) rave_number++ if(rave_number > length(rainbow_order)) rave_number = 1 diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm index 7b1d33d985e..1dd92418921 100644 --- a/code/modules/mod/modules/modules_medical.dm +++ b/code/modules/mod/modules/modules_medical.dm @@ -333,7 +333,7 @@ ripped_clothing[clothing] = shared_flags clothing.body_parts_covered &= ~shared_flags -/obj/item/mod/module/thread_ripper/on_process(delta_time) +/obj/item/mod/module/thread_ripper/on_process(seconds_per_tick) . = ..() if(!.) return diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm index 9117a476daf..5f9ab1aca98 100644 --- a/code/modules/mod/modules/modules_security.dm +++ b/code/modules/mod/modules/modules_security.dm @@ -199,7 +199,7 @@ /// Our linked bodybag. var/obj/structure/closet/body_bag/linked_bodybag -/obj/item/mod/module/criminalcapture/on_process(delta_time) +/obj/item/mod/module/criminalcapture/on_process(seconds_per_tick) idle_power_cost = linked_bodybag ? (DEFAULT_CHARGE_DRAIN * 3) : 0 return ..() diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm index 3da8e0aebc5..2d27b292760 100644 --- a/code/modules/mod/modules/modules_supply.dm +++ b/code/modules/mod/modules/modules_supply.dm @@ -540,7 +540,7 @@ INVOKE_ASYNC(bomb, TYPE_PROC_REF(/obj/projectile, fire)) drain_power(use_power_cost) -/obj/item/mod/module/sphere_transform/on_active_process(delta_time) +/obj/item/mod/module/sphere_transform/on_active_process(seconds_per_tick) animate(mod.wearer) //stop the animation mod.wearer.SpinAnimation(1.5) //start it back again if(!mod.wearer.has_gravity()) diff --git a/code/modules/mod/modules/modules_timeline.dm b/code/modules/mod/modules/modules_timeline.dm index 4f393041464..4fa348659da 100644 --- a/code/modules/mod/modules/modules_timeline.dm +++ b/code/modules/mod/modules/modules_timeline.dm @@ -363,7 +363,7 @@ mob_underlay.icon_state = "frame[RPpos]" underlays += mob_underlay -/obj/structure/chrono_field/process(delta_time) +/obj/structure/chrono_field/process(seconds_per_tick) if(!captured) qdel(src) return @@ -387,14 +387,14 @@ update_appearance() if(tem) if(tem.field_check(src)) - timetokill -= delta_time + timetokill -= seconds_per_tick else tem = null return else if(!attached) - timetokill -= delta_time + timetokill -= seconds_per_tick else - timetokill += delta_time + timetokill += seconds_per_tick /obj/structure/chrono_field/bullet_act(obj/projectile/projectile) diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 2d40f0dafba..ae0b3d10581 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -463,7 +463,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar return FALSE // Process currently calls handle_power(), may be expanded in future if more things are added. -/obj/item/modular_computer/process(delta_time) +/obj/item/modular_computer/process(seconds_per_tick) if(!enabled) // The computer is turned off last_power_usage = 0 return @@ -479,7 +479,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar if(idle_programs.program_state == PROGRAM_STATE_KILLED) idle_threads.Remove(idle_programs) continue - idle_programs.process_tick(delta_time) + idle_programs.process_tick(seconds_per_tick) idle_programs.ntnet_status = get_ntnet_status() if(idle_programs.requires_ntnet && !idle_programs.ntnet_status) idle_programs.event_networkfailure(TRUE) @@ -488,10 +488,10 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar if(active_program.program_state == PROGRAM_STATE_KILLED) active_program = null else - active_program.process_tick(delta_time) + active_program.process_tick(seconds_per_tick) active_program.ntnet_status = get_ntnet_status() - handle_power(delta_time) // Handles all computer power interaction + handle_power(seconds_per_tick) // Handles all computer power interaction /** * Displays notification text alongside a soundbeep when requested to by a program. diff --git a/code/modules/modular_computers/computers/item/computer_power.dm b/code/modules/modular_computers/computers/item/computer_power.dm index e8587347396..bea16f18546 100644 --- a/code/modules/modular_computers/computers/item/computer_power.dm +++ b/code/modules/modular_computers/computers/item/computer_power.dm @@ -31,7 +31,7 @@ shutdown_computer(0) // Handles power-related things, such as battery interaction, recharging, shutdown when it's discharged -/obj/item/modular_computer/proc/handle_power(delta_time) +/obj/item/modular_computer/proc/handle_power(seconds_per_tick) var/power_usage = screen_on ? base_active_power_usage : base_idle_power_usage if(use_power(power_usage)) diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index b952e4e1f1c..71b5c6173ae 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -88,7 +88,7 @@ return TRUE // Called by Process() on device that runs us, once every tick. -/datum/computer_file/program/proc/process_tick(delta_time) +/datum/computer_file/program/proc/process_tick(seconds_per_tick) return TRUE /** diff --git a/code/modules/modular_computers/file_system/programs/airestorer.dm b/code/modules/modular_computers/file_system/programs/airestorer.dm index 1551da4df37..0fac55e26b1 100644 --- a/code/modules/modular_computers/file_system/programs/airestorer.dm +++ b/code/modules/modular_computers/file_system/programs/airestorer.dm @@ -34,7 +34,7 @@ try_eject(forced = TRUE) return ..() -/datum/computer_file/program/ai_restorer/process_tick(delta_time) +/datum/computer_file/program/ai_restorer/process_tick(seconds_per_tick) . = ..() if(!restoring) //Put the check here so we don't check for an ai all the time return diff --git a/code/modules/modular_computers/file_system/programs/alarm.dm b/code/modules/modular_computers/file_system/programs/alarm.dm index 7b48ad10252..1979672080d 100644 --- a/code/modules/modular_computers/file_system/programs/alarm.dm +++ b/code/modules/modular_computers/file_system/programs/alarm.dm @@ -26,7 +26,7 @@ QDEL_NULL(alert_control) return ..() -/datum/computer_file/program/alarm_monitor/process_tick(delta_time) +/datum/computer_file/program/alarm_monitor/process_tick(seconds_per_tick) ..() if(has_alert) diff --git a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm index 0645fa67a5a..0a80f1834ea 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm @@ -16,7 +16,7 @@ var/error = "" var/executed = 0 -/datum/computer_file/program/ntnet_dos/process_tick(delta_time) +/datum/computer_file/program/ntnet_dos/process_tick(seconds_per_tick) dos_speed = 0 switch(ntnet_status) if(1) diff --git a/code/modules/modular_computers/file_system/programs/borg_monitor.dm b/code/modules/modular_computers/file_system/programs/borg_monitor.dm index aedf67dd412..a94497b5a34 100644 --- a/code/modules/modular_computers/file_system/programs/borg_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/borg_monitor.dm @@ -40,7 +40,7 @@ borgo.logevent("File request by [username]: /var/logs/syslog") return TRUE -/datum/computer_file/program/borg_monitor/process_tick(delta_time) +/datum/computer_file/program/borg_monitor/process_tick(seconds_per_tick) if(!DL_source) DL_progress = -1 return diff --git a/code/modules/modular_computers/file_system/programs/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/ntdownloader.dm index 48b0fd5ef13..852987dc440 100644 --- a/code/modules/modular_computers/file_system/programs/ntdownloader.dm +++ b/code/modules/modular_computers/file_system/programs/ntdownloader.dm @@ -81,7 +81,7 @@ download_completion = FALSE ui_header = "downloader_finished.gif" -/datum/computer_file/program/ntnetdownload/process_tick(delta_time) +/datum/computer_file/program/ntnetdownload/process_tick(seconds_per_tick) if(!downloaded_file) return if(download_completion >= downloaded_file.size) diff --git a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm index 095b89f6d06..3e7b8f19f13 100644 --- a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm @@ -176,7 +176,7 @@ COOLDOWN_START(src, ping_cooldown, PING_COOLDOWN_TIME) return TRUE -/datum/computer_file/program/chatclient/process_tick(delta_time) +/datum/computer_file/program/chatclient/process_tick(seconds_per_tick) . = ..() var/datum/ntnet_conversation/channel = SSmodular_computers.get_chat_channel_by_id(active_channel) if(program_state != PROGRAM_STATE_KILLED) diff --git a/code/modules/modular_computers/file_system/programs/powermonitor.dm b/code/modules/modular_computers/file_system/programs/powermonitor.dm index 1fdd91878fb..e82821d75e4 100644 --- a/code/modules/modular_computers/file_system/programs/powermonitor.dm +++ b/code/modules/modular_computers/file_system/programs/powermonitor.dm @@ -31,7 +31,7 @@ history["demand"] = list() -/datum/computer_file/program/power_monitor/process_tick(delta_time) +/datum/computer_file/program/power_monitor/process_tick(seconds_per_tick) if(!get_powernet()) search() else diff --git a/code/modules/modular_computers/file_system/programs/radar.dm b/code/modules/modular_computers/file_system/programs/radar.dm index 186f019dda5..d5e78f23fd3 100644 --- a/code/modules/modular_computers/file_system/programs/radar.dm +++ b/code/modules/modular_computers/file_system/programs/radar.dm @@ -196,7 +196,7 @@ computer.setDir(get_dir(here_turf, target_turf)) //We can use process_tick to restart fast processing, since the computer will be running this constantly either way. -/datum/computer_file/program/radar/process_tick(delta_time) +/datum/computer_file/program/radar/process_tick(seconds_per_tick) if(computer.active_program == src) START_PROCESSING(SSfastprocess, src) diff --git a/code/modules/modular_computers/file_system/programs/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/sm_monitor.dm index 3bf0136c50b..876ebe61204 100644 --- a/code/modules/modular_computers/file_system/programs/sm_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/sm_monitor.dm @@ -106,7 +106,7 @@ for(var/obj/machinery/power/supermatter_crystal/S in supermatters) . = max(., S.get_status()) -/datum/computer_file/program/supermatter_monitor/process_tick(delta_time) +/datum/computer_file/program/supermatter_monitor/process_tick(seconds_per_tick) ..() var/new_status = get_status() if(last_status != new_status) diff --git a/code/modules/pai/pai.dm b/code/modules/pai/pai.dm index 204b6fdcecf..6b886e2d7b6 100644 --- a/code/modules/pai/pai.dm +++ b/code/modules/pai/pai.dm @@ -230,8 +230,8 @@ laws = new /datum/ai_laws/pai() return TRUE -/mob/living/silicon/pai/process(delta_time) - holochassis_health = clamp((holochassis_health + (HOLOCHASSIS_REGEN_PER_SECOND * delta_time)), -50, HOLOCHASSIS_MAX_HEALTH) +/mob/living/silicon/pai/process(seconds_per_tick) + holochassis_health = clamp((holochassis_health + (HOLOCHASSIS_REGEN_PER_SECOND * seconds_per_tick)), -50, HOLOCHASSIS_MAX_HEALTH) /mob/living/silicon/pai/Process_Spacemove(movement_dir = 0, continuous_move = FALSE) . = ..() diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm index d2e5f7a0e38..f871f94bf92 100644 --- a/code/modules/paperwork/fax.dm +++ b/code/modules/paperwork/fax.dm @@ -90,9 +90,9 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department return STOP_PROCESSING(SSmachines, src) -/obj/machinery/fax/process(delta_time) +/obj/machinery/fax/process(seconds_per_tick) if(seconds_electrified > MACHINE_NOT_ELECTRIFIED) - seconds_electrified -= delta_time + seconds_electrified -= seconds_per_tick /obj/machinery/fax/attack_hand(mob/user, list/modifiers) if(seconds_electrified && !(machine_stat & NOPOWER)) diff --git a/code/modules/plumbing/plumbers/acclimator.dm b/code/modules/plumbing/plumbers/acclimator.dm index 84501303775..a256413be57 100644 --- a/code/modules/plumbing/plumbers/acclimator.dm +++ b/code/modules/plumbing/plumbers/acclimator.dm @@ -34,7 +34,7 @@ . = ..() AddComponent(/datum/component/plumbing/acclimator, bolt, layer) -/obj/machinery/plumbing/acclimator/process(delta_time) +/obj/machinery/plumbing/acclimator/process(seconds_per_tick) if(machine_stat & NOPOWER || !enabled || !reagents.total_volume || reagents.chem_temp == target_temperature) if(acclimate_state != NEUTRAL) acclimate_state = NEUTRAL @@ -56,9 +56,9 @@ emptying = TRUE if(!emptying) //suspend heating/cooling during emptying phase - reagents.adjust_thermal_energy((target_temperature - reagents.chem_temp) * heater_coefficient * delta_time * SPECIFIC_HEAT_DEFAULT * reagents.total_volume) //keep constant with chem heater + reagents.adjust_thermal_energy((target_temperature - reagents.chem_temp) * heater_coefficient * seconds_per_tick * SPECIFIC_HEAT_DEFAULT * reagents.total_volume) //keep constant with chem heater reagents.handle_reactions() - use_power(active_power_usage * delta_time) + use_power(active_power_usage * seconds_per_tick) else if(acclimate_state != NEUTRAL) acclimate_state = NEUTRAL update_appearance() diff --git a/code/modules/plumbing/plumbers/bottler.dm b/code/modules/plumbing/plumbers/bottler.dm index 5e5ffaab8cc..219accbc3b5 100644 --- a/code/modules/plumbing/plumbers/bottler.dm +++ b/code/modules/plumbing/plumbers/bottler.dm @@ -71,7 +71,7 @@ wanted_amount = new_amount to_chat(user, span_notice(" The [src] will now fill for [wanted_amount]u.")) -/obj/machinery/plumbing/bottler/process(delta_time) +/obj/machinery/plumbing/bottler/process(seconds_per_tick) if(machine_stat & NOPOWER) return // Sanity check the result locations and stop processing if they don't exist @@ -81,7 +81,7 @@ ///see if machine has enough to fill, is anchored down and has any inputspot objects to pick from if(reagents.total_volume >= wanted_amount && anchored && length(inputspot.contents)) - use_power(active_power_usage * delta_time) + use_power(active_power_usage * seconds_per_tick) var/obj/AM = pick(inputspot.contents)///pick a reagent_container that could be used if((is_reagent_container(AM) && !istype(AM, /obj/item/reagent_containers/hypospray/medipen)) || istype(AM, /obj/item/ammo_casing/shotgun/dart)) var/obj/item/reagent_containers/B = AM diff --git a/code/modules/plumbing/plumbers/destroyer.dm b/code/modules/plumbing/plumbers/destroyer.dm index 58a322fe34f..082a1fe2fa3 100644 --- a/code/modules/plumbing/plumbers/destroyer.dm +++ b/code/modules/plumbing/plumbers/destroyer.dm @@ -14,14 +14,14 @@ . = ..() AddComponent(/datum/component/plumbing/simple_demand, bolt, layer) -/obj/machinery/plumbing/disposer/process(delta_time) +/obj/machinery/plumbing/disposer/process(seconds_per_tick) if(machine_stat & NOPOWER) return if(reagents.total_volume) if(icon_state != initial(icon_state) + "_working") //threw it here instead of update icon since it only has two states icon_state = initial(icon_state) + "_working" - reagents.remove_any(disposal_rate * delta_time) - use_power(active_power_usage * delta_time) + reagents.remove_any(disposal_rate * seconds_per_tick) + use_power(active_power_usage * seconds_per_tick) else if(icon_state != initial(icon_state)) icon_state = initial(icon_state) diff --git a/code/modules/plumbing/plumbers/pill_press.dm b/code/modules/plumbing/plumbers/pill_press.dm index 0e12f5228b6..28c35ae27d8 100644 --- a/code/modules/plumbing/plumbers/pill_press.dm +++ b/code/modules/plumbing/plumbers/pill_press.dm @@ -48,7 +48,7 @@ AddComponent(/datum/component/plumbing/simple_demand, bolt, layer) -/obj/machinery/plumbing/pill_press/process(delta_time) +/obj/machinery/plumbing/pill_press/process(seconds_per_tick) if(machine_stat & NOPOWER) return if(reagents.total_volume >= current_volume) @@ -94,7 +94,7 @@ stored_products -= AM AM.forceMove(drop_location()) - use_power(active_power_usage * delta_time) + use_power(active_power_usage * seconds_per_tick) /obj/machinery/plumbing/pill_press/proc/load_styles() //expertly copypasted from chemmasters diff --git a/code/modules/plumbing/plumbers/pumps.dm b/code/modules/plumbing/plumbers/pumps.dm index 5dc246da533..4176630de6d 100644 --- a/code/modules/plumbing/plumbers/pumps.dm +++ b/code/modules/plumbing/plumbers/pumps.dm @@ -32,7 +32,7 @@ update_appearance() geyserless = FALSE //we switched state, so lets just set this back aswell -/obj/machinery/plumbing/liquid_pump/process(delta_time) +/obj/machinery/plumbing/liquid_pump/process(seconds_per_tick) if(!anchored || panel_open || geyserless) return @@ -46,13 +46,13 @@ playsound(src, 'sound/machines/buzz-sigh.ogg', 50) return - pump(delta_time) + pump(seconds_per_tick) ///pump up that sweet geyser nectar -/obj/machinery/plumbing/liquid_pump/proc/pump(delta_time) +/obj/machinery/plumbing/liquid_pump/proc/pump(seconds_per_tick) if(!geyser || !geyser.reagents) return - geyser.reagents.trans_to(src, pump_power * delta_time) + geyser.reagents.trans_to(src, pump_power * seconds_per_tick) /obj/machinery/plumbing/liquid_pump/update_icon_state() if(geyser) diff --git a/code/modules/plumbing/plumbers/reaction_chamber.dm b/code/modules/plumbing/plumbers/reaction_chamber.dm index b7061bd6363..582d670e94d 100644 --- a/code/modules/plumbing/plumbers/reaction_chamber.dm +++ b/code/modules/plumbing/plumbers/reaction_chamber.dm @@ -48,12 +48,12 @@ holder.flags |= NO_REACT return NONE -/obj/machinery/plumbing/reaction_chamber/process(delta_time) +/obj/machinery/plumbing/reaction_chamber/process(seconds_per_tick) if(!emptying || reagents.is_reacting) //suspend heating/cooling during emptying phase - reagents.adjust_thermal_energy((target_temperature - reagents.chem_temp) * heater_coefficient * delta_time * SPECIFIC_HEAT_DEFAULT * reagents.total_volume) //keep constant with chem heater + reagents.adjust_thermal_energy((target_temperature - reagents.chem_temp) * heater_coefficient * seconds_per_tick * SPECIFIC_HEAT_DEFAULT * reagents.total_volume) //keep constant with chem heater reagents.handle_reactions() - use_power(active_power_usage * delta_time) + use_power(active_power_usage * seconds_per_tick) /obj/machinery/plumbing/reaction_chamber/power_change() . = ..() @@ -149,12 +149,12 @@ QDEL_NULL(alkaline_beaker) return ..() -/obj/machinery/plumbing/reaction_chamber/chem/process(delta_time) +/obj/machinery/plumbing/reaction_chamber/chem/process(seconds_per_tick) //add acidic/alkaine buffer if over/under limit if(reagents.is_reacting && reagents.ph < alkaline_limit) - alkaline_beaker.reagents.trans_to(reagents, 1 * delta_time) + alkaline_beaker.reagents.trans_to(reagents, 1 * seconds_per_tick) if(reagents.is_reacting && reagents.ph > acidic_limit) - acidic_beaker.reagents.trans_to(reagents, 1 * delta_time) + acidic_beaker.reagents.trans_to(reagents, 1 * seconds_per_tick) ..() /obj/machinery/plumbing/reaction_chamber/chem/ui_interact(mob/user, datum/tgui/ui) diff --git a/code/modules/plumbing/plumbers/synthesizer.dm b/code/modules/plumbing/plumbers/synthesizer.dm index 228eb32f6d6..66d96f7d978 100644 --- a/code/modules/plumbing/plumbers/synthesizer.dm +++ b/code/modules/plumbing/plumbers/synthesizer.dm @@ -49,13 +49,13 @@ . = ..() AddComponent(/datum/component/plumbing/simple_supply, bolt, layer) -/obj/machinery/plumbing/synthesizer/process(delta_time) +/obj/machinery/plumbing/synthesizer/process(seconds_per_tick) if(machine_stat & NOPOWER || !reagent_id || !amount) return - if(reagents.total_volume >= amount*delta_time*0.5) //otherwise we get leftovers, and we need this to be precise + if(reagents.total_volume >= amount*seconds_per_tick*0.5) //otherwise we get leftovers, and we need this to be precise return - reagents.add_reagent(reagent_id, amount*delta_time*0.5) - use_power(active_power_usage * amount * delta_time * 0.5) + reagents.add_reagent(reagent_id, amount*seconds_per_tick*0.5) + use_power(active_power_usage * amount * seconds_per_tick * 0.5) /obj/machinery/plumbing/synthesizer/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) diff --git a/code/modules/plumbing/plumbers/teleporter.dm b/code/modules/plumbing/plumbers/teleporter.dm index 35d46dd80a6..1d18959fc86 100644 --- a/code/modules/plumbing/plumbers/teleporter.dm +++ b/code/modules/plumbing/plumbers/teleporter.dm @@ -78,7 +78,7 @@ to_chat(user, span_notice("You store linkage information in [I]'s buffer.")) return TRUE -/obj/machinery/plumbing/receiver/process(delta_time) +/obj/machinery/plumbing/receiver/process(seconds_per_tick) if(machine_stat & NOPOWER || panel_open) return @@ -97,7 +97,7 @@ next_index++ - use_power(active_power_usage * delta_time) + use_power(active_power_usage * seconds_per_tick) ///Notify all senders to forget us /obj/machinery/plumbing/receiver/proc/lose_senders() diff --git a/code/modules/power/energy_accumulator.dm b/code/modules/power/energy_accumulator.dm index b8c14ca732e..80c76f3916d 100644 --- a/code/modules/power/energy_accumulator.dm +++ b/code/modules/power/energy_accumulator.dm @@ -28,9 +28,9 @@ // Always consume at least 2kJ of energy if we have at least that much stored return min(stored_energy, (stored_energy*ACCUMULATOR_STORED_OUTPUT)+joules_to_energy(2000)) -/obj/machinery/power/energy_accumulator/process(delta_time) +/obj/machinery/power/energy_accumulator/process(seconds_per_tick) // NB: stored_energy is stored in energy units, a unit of measurement which already includes SSmachines.wait - // Do not multiply by delta_time here. It is already accounted for by being energy units. + // Do not multiply by seconds_per_tick here. It is already accounted for by being energy units. var/power_produced = get_power_output() release_energy(power_produced) stored_energy -= power_produced diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm index 7b160de2ce4..e204bdfd0d8 100644 --- a/code/modules/power/lighting/light.dm +++ b/code/modules/power/lighting/light.dm @@ -292,14 +292,14 @@ var/delay = rand(BROKEN_SPARKS_MIN, BROKEN_SPARKS_MAX) addtimer(CALLBACK(src, PROC_REF(broken_sparks)), delay, TIMER_UNIQUE | TIMER_NO_HASH_WAIT) -/obj/machinery/light/process(delta_time) +/obj/machinery/light/process(seconds_per_tick) if(has_power()) //If the light is being powered by the station. if(cell) if(cell.charge == cell.maxcharge && !reagents) //If the cell is done mooching station power, and reagents don't need processing, stop processing return PROCESS_KILL cell.charge = min(cell.maxcharge, cell.charge + LIGHT_EMERGENCY_POWER_USE) //Recharge emergency power automatically while not using it if(reagents) //with most reagents coming out at 300, and with most meaningful reactions coming at 370+, this rate gives a few seconds of time to place it in and get out of dodge regardless of input. - reagents.adjust_thermal_energy(8 * reagents.total_volume * SPECIFIC_HEAT_DEFAULT * delta_time) + reagents.adjust_thermal_energy(8 * reagents.total_volume * SPECIFIC_HEAT_DEFAULT * seconds_per_tick) reagents.handle_reactions() if(low_power_mode && !use_emergency_power(LIGHT_EMERGENCY_POWER_USE)) update(FALSE) //Disables emergency mode and sets the color to normal diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 5c8d22abb81..5146898d230 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -175,7 +175,7 @@ togglelock(user) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN -/obj/machinery/power/emitter/process(delta_time) +/obj/machinery/power/emitter/process(seconds_per_tick) if(machine_stat & (BROKEN)) return if(!welded || (!powernet && active_power_usage)) @@ -198,7 +198,7 @@ update_appearance() investigate_log("regained power and turned ON at [AREACOORD(src)]", INVESTIGATE_ENGINE) if(charge <= 80) - charge += 2.5 * delta_time + charge += 2.5 * seconds_per_tick if(!check_delay() || manual == TRUE) return FALSE fire_beam() diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index ea7d1513ecd..d9acb977366 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -161,22 +161,22 @@ if(EXPLODE_LIGHT) energy -= round(((energy + 1) / 4), 1) -/obj/singularity/process(delta_time) - time_since_act += delta_time +/obj/singularity/process(seconds_per_tick) + time_since_act += seconds_per_tick if(time_since_act < 2) return time_since_act = 0 if(current_size >= STAGE_TWO) if(prob(event_chance)) event() - dissipate(delta_time) + dissipate(seconds_per_tick) check_energy() -/obj/singularity/proc/dissipate(delta_time) +/obj/singularity/proc/dissipate(seconds_per_tick) if (!dissipate) return - time_since_last_dissipiation += delta_time + time_since_last_dissipiation += seconds_per_tick // Uses a while in case of especially long delta times while (time_since_last_dissipiation >= dissipate_delay) diff --git a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm index 60d644946fe..019f411c052 100644 --- a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm +++ b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm @@ -62,7 +62,7 @@ var/current_spawn = rand(5 SECONDS, 10 SECONDS) var/next_spawn = rand(5 SECONDS, 10 SECONDS) var/extended_spawn = 0 - if(DT_PROB(1, next_spawn)) + if(SPT_PROB(1, next_spawn)) extended_spawn = rand(5 MINUTES, 15 MINUTES) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(supermatter_anomaly_gen), anomaly_location, anomaly_to_spawn, TRUE), current_spawn + extended_spawn) return TRUE diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 93a15708bfa..c8d082f3928 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -83,7 +83,7 @@ return ..() -/obj/machinery/power/energy_accumulator/tesla_coil/process(delta_time) +/obj/machinery/power/energy_accumulator/tesla_coil/process(seconds_per_tick) . = ..() zap_sound_volume = min(energy_to_joules(stored_energy)/200000, 100) zap_sound_range = min(energy_to_joules(stored_energy)/4000000, 10) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index c524a603ce7..b6cf2a454f2 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -143,9 +143,9 @@ update_appearance() return ..() -/obj/item/gun/energy/process(delta_time) +/obj/item/gun/energy/process(seconds_per_tick) if(selfcharge && cell && cell.percent() < 100) - charge_timer += delta_time + charge_timer += seconds_per_tick if(charge_timer < charge_delay) return charge_timer = 0 diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm index 19e6cc24d8f..2c013ee257a 100644 --- a/code/modules/projectiles/guns/energy/energy_gun.dm +++ b/code/modules/projectiles/guns/energy/energy_gun.dm @@ -125,9 +125,9 @@ var/fail_tick = 0 var/fail_chance = 0 -/obj/item/gun/energy/e_gun/nuclear/process(delta_time) +/obj/item/gun/energy/e_gun/nuclear/process(seconds_per_tick) if(fail_tick > 0) - fail_tick -= delta_time * 0.5 + fail_tick -= seconds_per_tick * 0.5 ..() /obj/item/gun/energy/e_gun/nuclear/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1) diff --git a/code/modules/projectiles/guns/energy/laser_gatling.dm b/code/modules/projectiles/guns/energy/laser_gatling.dm index f12a62d2c26..94dcb3bba7b 100644 --- a/code/modules/projectiles/guns/energy/laser_gatling.dm +++ b/code/modules/projectiles/guns/energy/laser_gatling.dm @@ -32,8 +32,8 @@ STOP_PROCESSING(SSobj, src) return ..() -/obj/item/minigunpack/process(delta_time) - overheat = max(0, overheat - heat_diffusion * delta_time) +/obj/item/minigunpack/process(seconds_per_tick) + overheat = max(0, overheat - heat_diffusion * seconds_per_tick) //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/minigunpack/attack_hand(mob/living/carbon/user, list/modifiers) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 630b02d40e9..017844db70b 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -411,7 +411,7 @@ else . += "It has infinite coins available for use." -/obj/item/gun/energy/marksman_revolver/process(delta_time) +/obj/item/gun/energy/marksman_revolver/process(seconds_per_tick) if(!max_coins || coin_count >= max_coins) STOP_PROCESSING(SSobj, src) return diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 884ce7c6360..762e95544c5 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -103,11 +103,11 @@ return ..() -/obj/item/gun/magic/process(delta_time) +/obj/item/gun/magic/process(seconds_per_tick) if (charges >= max_charges) charge_timer = 0 return - charge_timer += delta_time + charge_timer += seconds_per_tick if(charge_timer < recharge_rate) return 0 charge_timer = 0 diff --git a/code/modules/reagents/chemistry/equilibrium.dm b/code/modules/reagents/chemistry/equilibrium.dm index 6ec28e34b03..7d7aff20fae 100644 --- a/code/modules/reagents/chemistry/equilibrium.dm +++ b/code/modules/reagents/chemistry/equilibrium.dm @@ -179,25 +179,25 @@ return TRUE /* -* Deals with lag - allows a reaction to speed up to 3x from delta_time +* Deals with lag - allows a reaction to speed up to 3x from seconds_per_tick * "Charged" time (time_deficit) discharges by incrementing reactions by doubling them -* If delta_time is greater than 1.5, then we save the extra time for the next ticks +* If seconds_per_tick is greater than 1.5, then we save the extra time for the next ticks * * Arguments: -* * delta_time - the time between the last proc in world.time +* * seconds_per_tick - the time between the last proc in world.time */ -/datum/equilibrium/proc/deal_with_time(delta_time) - if(delta_time > 1) - time_deficit += delta_time - 1 - delta_time = 1 //Lets make sure reactions aren't super speedy and blow people up from a big lag spike +/datum/equilibrium/proc/deal_with_time(seconds_per_tick) + if(seconds_per_tick > 1) + time_deficit += seconds_per_tick - 1 + seconds_per_tick = 1 //Lets make sure reactions aren't super speedy and blow people up from a big lag spike else if (time_deficit) if(time_deficit < 0.25) - delta_time += time_deficit + seconds_per_tick += time_deficit time_deficit = 0 else - delta_time += 0.25 + seconds_per_tick += 0.25 time_deficit -= 0.25 - return delta_time + return seconds_per_tick /* * Main method of checking for explosive - or failed states @@ -239,10 +239,10 @@ * Then adds/removes reagents * Then alters the holder pH and temperature, and calls reaction_step * Arguments: -* * delta_time - the time displacement between the last call and the current, 1 is a standard step +* * seconds_per_tick - the time displacement between the last call and the current, 1 is a standard step * * purity_modifier - how much to modify the step's purity by (0 - 1) */ -/datum/equilibrium/proc/react_timestep(delta_time, purity_modifier = 1) +/datum/equilibrium/proc/react_timestep(seconds_per_tick, purity_modifier = 1) if(to_delete) //This occurs when it explodes return FALSE @@ -252,7 +252,7 @@ if(!calculate_yield())//So that this can detect if we're missing reagents to_delete = TRUE return - delta_time = deal_with_time(delta_time) + seconds_per_tick = deal_with_time(seconds_per_tick) delta_t = 0 //how far off optimal temp we care delta_ph = 0 //How far off the pH we are @@ -319,7 +319,7 @@ purity *= purity_modifier //Now we calculate how much to add - this is normalised to the rate up limiter - var/delta_chem_factor = (reaction.rate_up_lim*delta_t)*delta_time//add/remove factor + var/delta_chem_factor = (reaction.rate_up_lim*delta_t)*seconds_per_tick//add/remove factor var/total_step_added = 0 //keep limited if(delta_chem_factor > step_target_vol) @@ -362,7 +362,7 @@ if(GLOB.Debug2) //I want my spans for my sanity message_admins("Reaction step active for:[reaction.type]") message_admins("|Reaction conditions| Temp: [holder.chem_temp], pH: [holder.ph], reactions: [length(holder.reaction_list)], awaiting reactions: [length(holder.failed_but_capable_reactions)], no. reagents:[length(holder.reagent_list)], no. prev reagents: [length(holder.previous_reagent_list)]") - message_admins("Reaction vars: PreReacted:[reacted_vol] of [step_target_vol] of total [target_vol]. delta_t [delta_t], multiplier [multiplier], delta_chem_factor [delta_chem_factor] Pfactor [product_ratio], purity of [purity] from a delta_ph of [delta_ph]. DeltaTime: [delta_time]") + message_admins("Reaction vars: PreReacted:[reacted_vol] of [step_target_vol] of total [target_vol]. delta_t [delta_t], multiplier [multiplier], delta_chem_factor [delta_chem_factor] Pfactor [product_ratio], purity of [purity] from a delta_ph of [delta_ph]. DeltaTime: [seconds_per_tick]") #endif //Apply thermal output of reaction to beaker diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index b8dfe753925..87215e24969 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -709,12 +709,12 @@ * * Arguments: * * mob/living/carbon/carbon - The mob to metabolize in, if null it uses [/datum/reagents/var/my_atom] - * * delta_time - the time in server seconds between proc calls (when performing normally it will be 2) + * * seconds_per_tick - the time in server seconds between proc calls (when performing normally it will be 2) * * times_fired - the number of times the owner's life() tick has been called aka The number of times SSmobs has fired * * 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, delta_time, times_fired, can_overdose = FALSE, liverless = FALSE, dead = FALSE) +/datum/reagents/proc/metabolize(mob/living/carbon/owner, seconds_per_tick, times_fired, can_overdose = FALSE, liverless = FALSE, dead = FALSE) var/list/cached_reagents = reagent_list if(owner) expose_temperature(owner.bodytemperature, 0.25) @@ -736,10 +736,10 @@ amount += belly.reagents.get_reagent_amount(toxin.type) if(amount <= liver_tolerance) - owner.reagents.remove_reagent(toxin.type, toxin.metabolization_rate * owner.metabolism_efficiency * delta_time) + owner.reagents.remove_reagent(toxin.type, toxin.metabolization_rate * owner.metabolism_efficiency * seconds_per_tick) continue - need_mob_update += metabolize_reagent(owner, reagent, delta_time, times_fired, can_overdose, liverless, dead) + need_mob_update += metabolize_reagent(owner, reagent, seconds_per_tick, times_fired, can_overdose, liverless, dead) if(owner && need_mob_update) //some of the metabolized reagents had effects on the mob that requires some updates. owner.updatehealth() @@ -750,12 +750,12 @@ * * Arguments: * * mob/living/carbon/owner - The mob to metabolize in, if null it uses [/datum/reagents/var/my_atom] - * * delta_time - the time in server seconds between proc calls (when performing normally it will be 2) + * * seconds_per_tick - the time in server seconds between proc calls (when performing normally it will be 2) * * times_fired - the number of times the owner's life() tick has been called aka The number of times SSmobs has fired * * 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, delta_time, times_fired, can_overdose = FALSE, liverless = FALSE, dead = FALSE) +/datum/reagents/proc/metabolize_reagent(mob/living/carbon/owner, datum/reagent/reagent, seconds_per_tick, times_fired, can_overdose = FALSE, liverless = FALSE, dead = FALSE) var/need_mob_update = FALSE if(QDELETED(reagent.holder)) return FALSE @@ -788,7 +788,7 @@ //SKYRAT EDIT ADDITION END if(owner && reagent && (!dead || (reagent.chemical_flags & REAGENT_DEAD_PROCESS))) - if(owner.reagent_check(reagent, delta_time, times_fired)) + if(owner.reagent_check(reagent, seconds_per_tick, times_fired)) return if(liverless && !reagent.self_consuming) //need to be metabolized return @@ -805,11 +805,11 @@ owner.mind?.add_addiction_points(addiction, reagent.addiction_types[addiction] * REAGENTS_METABOLISM) if(reagent.overdosed) - need_mob_update += reagent.overdose_process(owner, delta_time, times_fired) + need_mob_update += reagent.overdose_process(owner, seconds_per_tick, times_fired) if(!dead) - need_mob_update += reagent.on_mob_life(owner, delta_time, times_fired) + need_mob_update += reagent.on_mob_life(owner, seconds_per_tick, times_fired) if(dead) - need_mob_update += reagent.on_mob_dead(owner, delta_time) + need_mob_update += reagent.on_mob_dead(owner, seconds_per_tick) return need_mob_update /// Signals that metabolization has stopped, triggering the end of trait-based effects @@ -855,12 +855,12 @@ return added_volume ///Processes any chems that have the REAGENT_IGNORE_STASIS bitflag ONLY -/datum/reagents/proc/handle_stasis_chems(mob/living/carbon/owner, delta_time, times_fired) +/datum/reagents/proc/handle_stasis_chems(mob/living/carbon/owner, seconds_per_tick, times_fired) 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, delta_time, times_fired, can_overdose = TRUE) + need_mob_update += metabolize_reagent(owner, reagent, seconds_per_tick, times_fired, 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() @@ -1025,9 +1025,9 @@ * If any are ended, it displays the reaction message and removes it from the reaction list * If the list is empty at the end it finishes reacting. * Arguments: -* * delta_time - the time between each time step +* * seconds_per_tick - the time between each time step */ -/datum/reagents/process(delta_time) +/datum/reagents/process(seconds_per_tick) if(!is_reacting) force_stop_reacting() stack_trace("[src] | [my_atom] was forced to stop reacting. This might be unintentional.") @@ -1038,7 +1038,7 @@ var/num_reactions = 0 for(var/datum/equilibrium/equilibrium as anything in reaction_list) //Continue reacting - equilibrium.react_timestep(delta_time) + equilibrium.react_timestep(seconds_per_tick) num_reactions++ //if it's been flagged to delete if(equilibrium.to_delete) @@ -1048,7 +1048,7 @@ continue SSblackbox.record_feedback("tally", "chemical_reaction", 1, "[equilibrium.reaction.type] total reaction steps") if(num_reactions) - SEND_SIGNAL(src, COMSIG_REAGENTS_REACTION_STEP, num_reactions, delta_time) + SEND_SIGNAL(src, COMSIG_REAGENTS_REACTION_STEP, num_reactions, seconds_per_tick) if(length(mix_message)) //This is only at the end my_atom.audible_message(span_notice("[icon2html(my_atom, viewers(DEFAULT_MESSAGE_RANGE, src))] [mix_message.Join()]")) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 4023229739b..807c4132c1a 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -160,14 +160,14 @@ begin_processing() -/obj/machinery/chem_dispenser/process(delta_time) +/obj/machinery/chem_dispenser/process(seconds_per_tick) if (recharge_counter >= 8) var/usedpower = cell.give(recharge_amount) if(usedpower) use_power(active_power_usage + recharge_amount) recharge_counter = 0 return - recharge_counter += delta_time + recharge_counter += seconds_per_tick /obj/machinery/chem_dispenser/proc/display_beaker() var/mutable_appearance/b_o = beaker_overlay || mutable_appearance(icon, "disp_beaker") diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index c221951a3d9..06386e0f50c 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -99,7 +99,7 @@ if(in_range(user, src) || isobserver(user)) . += span_notice("The status display reads: Heating reagents at [heater_coefficient*1000]% speed.") -/obj/machinery/chem_heater/process(delta_time) +/obj/machinery/chem_heater/process(seconds_per_tick) ..() //Tutorial logics if(tutorial_active) @@ -151,10 +151,10 @@ if(beaker.reagents.is_reacting)//on_reaction_step() handles this return //keep constant with the chemical acclimator please - beaker.reagents.adjust_thermal_energy((target_temperature - beaker.reagents.chem_temp) * heater_coefficient * delta_time * SPECIFIC_HEAT_DEFAULT * beaker.reagents.total_volume) + beaker.reagents.adjust_thermal_energy((target_temperature - beaker.reagents.chem_temp) * heater_coefficient * seconds_per_tick * SPECIFIC_HEAT_DEFAULT * beaker.reagents.total_volume) beaker.reagents.handle_reactions() - use_power(active_power_usage * delta_time) + use_power(active_power_usage * seconds_per_tick) /obj/machinery/chem_heater/attackby(obj/item/I, mob/user, params) if(default_deconstruction_screwdriver(user, "mixer0b", "mixer0b", I)) @@ -190,10 +190,10 @@ return ..() ///Forces a UI update every time a reaction step happens inside of the beaker it contains. This is so the UI is in sync with the reaction since it's important that the output matches the current conditions for pH adjustment and temperature. -/obj/machinery/chem_heater/proc/on_reaction_step(datum/reagents/holder, num_reactions, delta_time) +/obj/machinery/chem_heater/proc/on_reaction_step(datum/reagents/holder, num_reactions, seconds_per_tick) SIGNAL_HANDLER if(on) - holder.adjust_thermal_energy((target_temperature - beaker.reagents.chem_temp) * heater_coefficient * delta_time * SPECIFIC_HEAT_DEFAULT * beaker.reagents.total_volume * (rand(8,11) * 0.1))//Give it a little wiggle room since we're actively reacting + holder.adjust_thermal_energy((target_temperature - beaker.reagents.chem_temp) * heater_coefficient * seconds_per_tick * SPECIFIC_HEAT_DEFAULT * beaker.reagents.total_volume * (rand(8,11) * 0.1))//Give it a little wiggle room since we're actively reacting for(var/ui_client in ui_client_list) var/datum/tgui/ui = ui_client if(!ui) diff --git a/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm b/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm index 9a88c785d83..2acf0027a72 100644 --- a/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm +++ b/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm @@ -299,7 +299,7 @@ This will not clean any inverted reagents. Inverted reagents will still be corre /* processing procs */ ///Increments time if it's progressing - if it's past time then it purifies and stops processing -/obj/machinery/chem_mass_spec/process(delta_time) +/obj/machinery/chem_mass_spec/process(seconds_per_tick) . = ..() if(!is_operational) return FALSE @@ -313,7 +313,7 @@ This will not clean any inverted reagents. Inverted reagents will still be corre end_processing() update_appearance() return TRUE - progress_time += delta_time + progress_time += seconds_per_tick return FALSE /* diff --git a/code/modules/reagents/chemistry/machinery/chem_recipe_debug.dm b/code/modules/reagents/chemistry/machinery/chem_recipe_debug.dm index de4477dd3ba..ce409dd29a8 100644 --- a/code/modules/reagents/chemistry/machinery/chem_recipe_debug.dm +++ b/code/modules/reagents/chemistry/machinery/chem_recipe_debug.dm @@ -90,7 +90,7 @@ * The main loop that sets up, creates and displays results from a reaction * warning: this code is a hot mess */ -/obj/machinery/chem_recipe_debug/process(delta_time) +/obj/machinery/chem_recipe_debug/process(seconds_per_tick) if(processing == FALSE) setup_reactions() if(should_force_ph) @@ -98,7 +98,7 @@ if(should_force_temp) reagents.chem_temp = force_temp if(reagents.is_reacting == TRUE) - react_time += delta_time + react_time += seconds_per_tick return if(reaction_stated == TRUE) reaction_stated = FALSE diff --git a/code/modules/reagents/chemistry/machinery/chem_separator.dm b/code/modules/reagents/chemistry/machinery/chem_separator.dm index 24806b4b00c..10aaded82e2 100644 --- a/code/modules/reagents/chemistry/machinery/chem_separator.dm +++ b/code/modules/reagents/chemistry/machinery/chem_separator.dm @@ -213,7 +213,7 @@ return FALSE return TRUE -/obj/structure/chem_separator/process(delta_time) +/obj/structure/chem_separator/process(seconds_per_tick) var/datum/gas_mixture/air = return_air() if(!can_process(air)) return stop() @@ -221,7 +221,7 @@ var/turf/location = loc location.hotspot_expose(exposed_temperature = 700, exposed_volume = 5) if(reagents.chem_temp < required_temp) - reagents.adjust_thermal_energy(heating_rate * delta_time * SPECIFIC_HEAT_DEFAULT * reagents.maximum_volume) + reagents.adjust_thermal_energy(heating_rate * seconds_per_tick * SPECIFIC_HEAT_DEFAULT * reagents.maximum_volume) reagents.chem_temp = min(reagents.chem_temp, required_temp) update_appearance(UPDATE_ICON) return @@ -229,7 +229,7 @@ if(!boiling) boiling = TRUE soundloop.start() - var/vapor_amount = distillation_rate * delta_time + var/vapor_amount = distillation_rate * seconds_per_tick // Vapor to condenser reagents.trans_id_to(condenser, separating_reagent.type, vapor_amount) // Cool the vapor down diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm index f8dbd09ddb9..b2916787093 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -156,11 +156,11 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent()) return /// Called from [/datum/reagents/proc/metabolize] -/datum/reagent/proc/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/proc/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) current_cycle++ if(length(reagent_removal_skip_list)) return - holder.remove_reagent(type, metabolization_rate * M.metabolism_efficiency * delta_time) //By default it slowly disappears. + holder.remove_reagent(type, metabolization_rate * M.metabolism_efficiency * seconds_per_tick) //By default it slowly disappears. /* Used to run functions before a reagent is transfered. Returning TRUE will block the transfer attempt. @@ -192,13 +192,13 @@ Primarily used in reagents/reaction_agents return /// Called when a reagent is inside of a mob when they are dead -/datum/reagent/proc/on_mob_dead(mob/living/carbon/C, delta_time) +/datum/reagent/proc/on_mob_dead(mob/living/carbon/C, seconds_per_tick) if(!(chemical_flags & REAGENT_DEAD_PROCESS)) return current_cycle++ if(length(reagent_removal_skip_list)) return - holder.remove_reagent(type, metabolization_rate * C.metabolism_efficiency * delta_time) + holder.remove_reagent(type, metabolization_rate * C.metabolism_efficiency * seconds_per_tick) /// Called by [/datum/reagents/proc/conditional_update_move] /datum/reagent/proc/on_move(mob/M) @@ -218,7 +218,7 @@ Primarily used in reagents/reaction_agents return /// Called if the reagent has passed the overdose threshold and is set to be triggering overdose effects -/datum/reagent/proc/overdose_process(mob/living/M, delta_time, times_fired) +/datum/reagent/proc/overdose_process(mob/living/M, seconds_per_tick, times_fired) return /// Called when an overdose starts diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 59336ce4d85..db7c2302e74 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -49,7 +49,7 @@ addiction_types = list(/datum/addiction/alcohol = 0.05 * boozepwr) return ..() -/datum/reagent/consumable/ethanol/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(drinker.get_drunk_amount() < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER || boozepwr < 0) var/booze_power = boozepwr if(HAS_TRAIT(drinker, TRAIT_ALCOHOL_TOLERANCE)) //we're an accomplished drinker @@ -57,11 +57,11 @@ if(HAS_TRAIT(drinker, TRAIT_LIGHT_DRINKER)) booze_power *= 2 // Volume, power, and server alcohol rate effect how quickly one gets drunk - drinker.adjust_drunk_effect(sqrt(volume) * booze_power * ALCOHOL_RATE * REM * delta_time) + drinker.adjust_drunk_effect(sqrt(volume) * booze_power * ALCOHOL_RATE * REM * seconds_per_tick) if(boozepwr > 0) var/obj/item/organ/internal/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER) if (istype(liver)) - liver.apply_organ_damage(((max(sqrt(volume) * (boozepwr ** ALCOHOL_EXPONENT) * liver.alcohol_tolerance * delta_time, 0))/150)) + liver.apply_organ_damage(((max(sqrt(volume) * (boozepwr ** ALCOHOL_EXPONENT) * liver.alcohol_tolerance * seconds_per_tick, 0))/150)) return ..() /datum/reagent/consumable/ethanol/expose_obj(obj/exposed_obj, reac_volume) @@ -160,7 +160,7 @@ desc = "A freezing pint of green beer. Festive." icon_state = "greenbeerglass" -/datum/reagent/consumable/ethanol/beer/green/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/beer/green/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(drinker.color != color) drinker.add_atom_colour(color, TEMPORARY_COLOUR_PRIORITY) return ..() @@ -186,10 +186,10 @@ desc = "DAMN, THIS THING LOOKS ROBUST!" icon_state ="kahluaglass" -/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.set_dizzy_if_lower(10 SECONDS * REM * delta_time) - drinker.adjust_drowsiness(-6 SECONDS * REM * delta_time) - drinker.AdjustSleeping(-40 * REM * delta_time) +/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.set_dizzy_if_lower(10 SECONDS * REM * seconds_per_tick) + drinker.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick) + drinker.AdjustSleeping(-40 * REM * seconds_per_tick) if(!HAS_TRAIT(drinker, TRAIT_ALCOHOL_TOLERANCE)) drinker.set_jitter_if_lower(10 SECONDS) ..() @@ -245,9 +245,9 @@ name = "glass of candy corn liquor" desc = "Good for your Imagination." -/datum/reagent/consumable/ethanol/whiskey/candycorn/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - if(DT_PROB(5, delta_time)) - drinker.adjust_hallucinations(4 SECONDS * REM * delta_time) +/datum/reagent/consumable/ethanol/whiskey/candycorn/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + if(SPT_PROB(5, seconds_per_tick)) + drinker.adjust_hallucinations(4 SECONDS * REM * seconds_per_tick) ..() /datum/reagent/consumable/ethanol/thirteenloko @@ -267,10 +267,10 @@ desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass." icon_state = "thirteen_loko_glass" -/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.adjust_drowsiness(-14 SECONDS * REM * delta_time) - drinker.AdjustSleeping(-40 * REM * delta_time) - drinker.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, drinker.get_body_temp_normal()) +/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.adjust_drowsiness(-14 SECONDS * REM * seconds_per_tick) + drinker.AdjustSleeping(-40 * REM * seconds_per_tick) + drinker.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, drinker.get_body_temp_normal()) if(!HAS_TRAIT(drinker, TRAIT_ALCOHOL_TOLERANCE)) drinker.set_jitter_if_lower(10 SECONDS) ..() @@ -281,18 +281,18 @@ drinker.set_jitter_if_lower(40 SECONDS) drinker.Stun(1.5 SECONDS) -/datum/reagent/consumable/ethanol/thirteenloko/overdose_process(mob/living/drinker, delta_time, times_fired) - if(DT_PROB(3.5, delta_time) && iscarbon(drinker)) +/datum/reagent/consumable/ethanol/thirteenloko/overdose_process(mob/living/drinker, seconds_per_tick, times_fired) + if(SPT_PROB(3.5, seconds_per_tick) && iscarbon(drinker)) var/obj/item/held_item = drinker.get_active_held_item() if(held_item) drinker.dropItemToGround(held_item) to_chat(drinker, span_notice("Your hands jitter and you drop what you were holding!")) drinker.set_jitter_if_lower(20 SECONDS) - if(DT_PROB(3.5, delta_time)) + if(SPT_PROB(3.5, seconds_per_tick)) to_chat(drinker, span_notice("[pick("You have a really bad headache.", "Your eyes hurt.", "You find it hard to stay still.", "You feel your heart practically beating out of your chest.")]")) - if(DT_PROB(2.5, delta_time) && iscarbon(drinker)) + if(SPT_PROB(2.5, seconds_per_tick) && iscarbon(drinker)) var/obj/item/organ/internal/eyes/eyes = drinker.get_organ_slot(ORGAN_SLOT_EYES) if(drinker.is_blind()) if(istype(eyes)) @@ -306,12 +306,12 @@ eyes.apply_organ_damage(eyes.maxHealth) drinker.emote("scream") - if(DT_PROB(1.5, delta_time) && iscarbon(drinker)) + if(SPT_PROB(1.5, seconds_per_tick) && iscarbon(drinker)) drinker.visible_message(span_danger("[drinker] starts having a seizure!"), span_userdanger("You have a seizure!")) drinker.Unconscious(10 SECONDS) drinker.set_jitter_if_lower(700 SECONDS) - if(DT_PROB(0.5, delta_time) && iscarbon(drinker)) + if(SPT_PROB(0.5, seconds_per_tick) && iscarbon(drinker)) var/datum/disease/heart_attack = new /datum/disease/heart_failure drinker.ForceContractDisease(heart_attack) to_chat(drinker, span_userdanger("You're pretty sure you just felt your heart stop for a second there..")) @@ -352,8 +352,8 @@ desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis." icon_state = "glass_brown" -/datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - if(drinker.getBruteLoss() && DT_PROB(5, delta_time)) +/datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + if(drinker.getBruteLoss() && SPT_PROB(5, seconds_per_tick)) drinker.heal_bodypart_damage(brute = 1) . = TRUE return ..() || . @@ -375,8 +375,8 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "threemileislandglass" -/datum/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.set_drugginess(100 SECONDS * REM * delta_time) +/datum/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.set_drugginess(100 SECONDS * REM * seconds_per_tick) return ..() /datum/reagent/consumable/ethanol/gin @@ -571,8 +571,8 @@ desc = "It's as strong as it smells." icon_state = "absinthe" -/datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - if(DT_PROB(5, delta_time) && !HAS_TRAIT(drinker, TRAIT_ALCOHOL_TOLERANCE)) +/datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + if(SPT_PROB(5, seconds_per_tick) && !HAS_TRAIT(drinker, TRAIT_ALCOHOL_TOLERANCE)) drinker.adjust_hallucinations(8 SECONDS) ..() @@ -723,12 +723,12 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "cubalibreglass" -/datum/reagent/consumable/ethanol/cuba_libre/on_mob_life(mob/living/carbon/cubano, delta_time, times_fired) +/datum/reagent/consumable/ethanol/cuba_libre/on_mob_life(mob/living/carbon/cubano, seconds_per_tick, times_fired) if(cubano.mind && cubano.mind.has_antag_datum(/datum/antagonist/rev)) //Cuba Libre, the traditional drink of revolutions! Heals revolutionaries. - cubano.adjustBruteLoss(-1 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - cubano.adjustFireLoss(-1 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - cubano.adjustToxLoss(-1 * REM * delta_time, FALSE, required_biotype = affected_biotype) - cubano.adjustOxyLoss(-5 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + cubano.adjustBruteLoss(-1 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + cubano.adjustFireLoss(-1 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + cubano.adjustToxLoss(-1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + cubano.adjustOxyLoss(-5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) . = TRUE return ..() || . @@ -843,12 +843,12 @@ COMSIG_REAGENTS_REACTED, )) -/datum/reagent/consumable/ethanol/screwdrivercocktail/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/screwdrivercocktail/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) var/obj/item/organ/internal/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER) if(HAS_TRAIT(liver, TRAIT_ENGINEER_METABOLISM)) ADD_TRAIT(drinker, TRAIT_HALT_RADIATION_EFFECTS, "[type]") if (HAS_TRAIT(drinker, TRAIT_IRRADIATED)) - drinker.adjustToxLoss(-2 * REM * delta_time, required_biotype = affected_biotype) + drinker.adjustToxLoss(-2 * REM * seconds_per_tick, required_biotype = affected_biotype) return ..() @@ -887,9 +887,9 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "bloodymaryglass" -/datum/reagent/consumable/ethanol/bloody_mary/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/bloody_mary/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(drinker.blood_volume < BLOOD_VOLUME_NORMAL) - drinker.blood_volume = min(drinker.blood_volume + (1 * REM * delta_time), BLOOD_VOLUME_NORMAL) //Bloody Mary quickly restores blood loss. // SKYRAT EDIT - Bloodshot is now the go-to drink for bloodloss, not Bloody Mary - ORIGINAL: drinker.blood_volume = min(drinker.blood_volume + (3 * REM * delta_time), BLOOD_VOLUME_NORMAL) + drinker.blood_volume = min(drinker.blood_volume + (1 * REM * seconds_per_tick), BLOOD_VOLUME_NORMAL) //Bloody Mary quickly restores blood loss. // SKYRAT EDIT - Bloodshot is now the go-to drink for bloodloss, not Bloody Mary - ORIGINAL: drinker.blood_volume = min(drinker.blood_volume + (3 * REM * delta_time), BLOOD_VOLUME_NORMAL) ..() /datum/reagent/consumable/ethanol/brave_bull @@ -946,7 +946,7 @@ light_holder = new(drinker) light_holder.set_light(3, 0.7, "#FFCC00") //Tequila Sunrise makes you radiate dim light, like a sunrise! -/datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(QDELETED(light_holder)) holder.del_reagent(type) //If we lost our light object somehow, remove the reagent else if(light_holder.loc != drinker) @@ -978,8 +978,8 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "toxinsspecialglass" -/datum/reagent/consumable/ethanol/toxins_special/on_mob_life(mob/living/drinker, delta_time, times_fired) - drinker.adjust_bodytemperature(15 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, 0, drinker.get_body_temp_normal() + 20) //310.15 is the normal bodytemp. +/datum/reagent/consumable/ethanol/toxins_special/on_mob_life(mob/living/drinker, seconds_per_tick, times_fired) + drinker.adjust_bodytemperature(15 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, drinker.get_body_temp_normal() + 20) //310.15 is the normal bodytemp. return ..() /datum/reagent/consumable/ethanol/beepsky_smash @@ -1012,16 +1012,16 @@ drinker.gain_trauma(beepsky_hallucination, TRAUMA_RESILIENCE_ABSOLUTE) ..() -/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) drinker.set_jitter_if_lower(4 SECONDS) var/obj/item/organ/internal/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER) // if you have a liver and that liver is an officer's liver if(liver && HAS_TRAIT(liver, TRAIT_LAW_ENFORCEMENT_METABOLISM)) . = TRUE - drinker.adjustStaminaLoss(-10 * REM * delta_time, required_biotype = affected_biotype) - if(DT_PROB(10, delta_time)) + drinker.adjustStaminaLoss(-10 * REM * seconds_per_tick, required_biotype = affected_biotype) + if(SPT_PROB(10, seconds_per_tick)) drinker.cause_hallucination(get_random_valid_hallucination_subtype(/datum/hallucination/nearby_fake_item), name) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) drinker.cause_hallucination(/datum/hallucination/stray_bullet, name) ..() @@ -1077,10 +1077,10 @@ 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, delta_time, times_fired) +/datum/reagent/consumable/ethanol/manly_dorf/on_mob_life(mob/living/carbon/dwarf, seconds_per_tick, times_fired) if(dorf_mode) - dwarf.adjustBruteLoss(-2 * REM * delta_time, required_bodytype = affected_bodytype) - dwarf.adjustFireLoss(-2 * REM * delta_time, required_bodytype = affected_bodytype) + dwarf.adjustBruteLoss(-2 * REM * seconds_per_tick, required_bodytype = affected_bodytype) + dwarf.adjustFireLoss(-2 * REM * seconds_per_tick, required_bodytype = affected_bodytype) return ..() /datum/reagent/consumable/ethanol/longislandicedtea @@ -1220,8 +1220,8 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "proj_manhattanglass" -/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.set_drugginess(1 MINUTES * REM * delta_time) +/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.set_drugginess(1 MINUTES * REM * seconds_per_tick) return ..() /datum/reagent/consumable/ethanol/whiskeysoda @@ -1255,8 +1255,8 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "antifreeze" -/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.adjust_bodytemperature(20 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, 0, drinker.get_body_temp_normal() + 20) //310.15 is the normal bodytemp. +/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.adjust_bodytemperature(20 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, drinker.get_body_temp_normal() + 20) //310.15 is the normal bodytemp. return ..() /datum/reagent/consumable/ethanol/barefoot @@ -1275,11 +1275,11 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "b&p" -/datum/reagent/consumable/ethanol/barefoot/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/barefoot/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) 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 if(!unshoed.shoes) - unshoed.adjustBruteLoss(-3 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) + unshoed.adjustBruteLoss(-3 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) . = TRUE return ..() || . @@ -1458,8 +1458,8 @@ REMOVE_TRAIT(drinker, TRAIT_MADNESS_IMMUNE, type) drinker.remove_filter("singulo_rays") -/datum/reagent/consumable/ethanol/singulo/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - if(DT_PROB(2.5, delta_time)) +/datum/reagent/consumable/ethanol/singulo/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + if(SPT_PROB(2.5, seconds_per_tick)) // 20u = 1x1, 45u = 2x2, 80u = 3x3 var/volume_to_radius = FLOOR(sqrt(volume/5), 1) - 1 var/suck_range = clamp(volume_to_radius, 0, 3) @@ -1492,8 +1492,8 @@ taste_description = "hot and spice" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.adjust_bodytemperature(50 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, 0, BODYTEMP_HEAT_DAMAGE_LIMIT) //310.15 is the normal bodytemp. +/datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.adjust_bodytemperature(50 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, BODYTEMP_HEAT_DAMAGE_LIMIT) //310.15 is the normal bodytemp. return ..() /datum/reagent/consumable/ethanol/red_mead @@ -1543,8 +1543,8 @@ desc = "A beer so frosty, the air around it freezes." icon_state = "iced_beerglass" -/datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.adjust_bodytemperature(-20 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, T0C) //310.15 is the normal bodytemp. +/datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.adjust_bodytemperature(-20 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, T0C) //310.15 is the normal bodytemp. return ..() /datum/reagent/consumable/ethanol/grog @@ -1658,9 +1658,9 @@ icon = 'icons/obj/drinks/soda.dmi' icon_state = "changelingsting" -/datum/reagent/consumable/ethanol/changelingsting/on_mob_life(mob/living/carbon/target, delta_time, times_fired) +/datum/reagent/consumable/ethanol/changelingsting/on_mob_life(mob/living/carbon/target, seconds_per_tick, times_fired) var/datum/antagonist/changeling/changeling = target.mind?.has_antag_datum(/datum/antagonist/changeling) - changeling?.adjust_chemicals(metabolization_rate * REM * delta_time) + changeling?.adjust_chemicals(metabolization_rate * REM * seconds_per_tick) return ..() /datum/reagent/consumable/ethanol/irishcarbomb @@ -1694,8 +1694,8 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "syndicatebomb" -/datum/reagent/consumable/ethanol/syndicatebomb/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - if(DT_PROB(2.5, delta_time)) +/datum/reagent/consumable/ethanol/syndicatebomb/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + if(SPT_PROB(2.5, seconds_per_tick)) playsound(get_turf(drinker), 'sound/effects/explosionfar.ogg', 100, TRUE) return ..() @@ -1765,10 +1765,10 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "bananahonkglass" -/datum/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) var/obj/item/organ/internal/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER) if((liver && HAS_TRAIT(liver, TRAIT_COMEDY_METABOLISM)) || ismonkey(drinker)) - drinker.heal_bodypart_damage(1 * REM * delta_time, 1 * REM * delta_time) + drinker.heal_bodypart_damage(1 * REM * seconds_per_tick, 1 * REM * seconds_per_tick) . = TRUE return ..() || . @@ -1789,10 +1789,10 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "silencerglass" -/datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(ishuman(drinker) && HAS_TRAIT(drinker, TRAIT_MIMING)) drinker.set_silence_if_lower(MIMEDRINK_SILENCE_DURATION) - drinker.heal_bodypart_damage(1 * REM * delta_time, 1 * REM * delta_time) + drinker.heal_bodypart_damage(1 * REM * seconds_per_tick, 1 * REM * seconds_per_tick) . = TRUE return ..() || . @@ -1863,7 +1863,7 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "fetching_fizz" -/datum/reagent/consumable/ethanol/fetching_fizz/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/fetching_fizz/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) for(var/obj/item/stack/ore/O in orange(3, drinker)) step_towards(O, get_turf(drinker)) return ..() @@ -1886,13 +1886,13 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "hearty_punch" -/datum/reagent/consumable/ethanol/hearty_punch/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/hearty_punch/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(drinker.health <= 0) - drinker.adjustBruteLoss(-3 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - drinker.adjustFireLoss(-3 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - drinker.adjustCloneLoss(-5 * REM * delta_time, 0) - drinker.adjustOxyLoss(-4 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - drinker.adjustToxLoss(-3 * REM * delta_time, FALSE, required_biotype = affected_biotype) + drinker.adjustBruteLoss(-3 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + drinker.adjustFireLoss(-3 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + drinker.adjustCloneLoss(-5 * REM * seconds_per_tick, 0) + drinker.adjustOxyLoss(-4 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + drinker.adjustToxLoss(-3 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) . = TRUE return ..() || . @@ -1927,19 +1927,19 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "atomicbombglass" -/datum/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.set_drugginess(100 SECONDS * REM * delta_time) +/datum/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.set_drugginess(100 SECONDS * REM * seconds_per_tick) if(!HAS_TRAIT(drinker, TRAIT_ALCOHOL_TOLERANCE)) - drinker.adjust_confusion(2 SECONDS * REM * delta_time) - drinker.set_dizzy_if_lower(20 SECONDS * REM * delta_time) - drinker.adjust_slurring(6 SECONDS * REM * delta_time) + drinker.adjust_confusion(2 SECONDS * REM * seconds_per_tick) + drinker.set_dizzy_if_lower(20 SECONDS * REM * seconds_per_tick) + drinker.adjust_slurring(6 SECONDS * REM * seconds_per_tick) switch(current_cycle) if(51 to 200) - drinker.Sleeping(100 * REM * delta_time) + drinker.Sleeping(100 * REM * seconds_per_tick) . = TRUE if(201 to INFINITY) - drinker.AdjustSleeping(40 * REM * delta_time) - drinker.adjustToxLoss(2 * REM * delta_time, FALSE, required_biotype = affected_biotype) + drinker.AdjustSleeping(40 * REM * seconds_per_tick) + drinker.adjustToxLoss(2 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) . = TRUE ..() @@ -1959,19 +1959,19 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "gargleblasterglass" -/datum/reagent/consumable/ethanol/gargle_blaster/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.adjust_dizzy(3 SECONDS * REM * delta_time) +/datum/reagent/consumable/ethanol/gargle_blaster/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.adjust_dizzy(3 SECONDS * REM * seconds_per_tick) switch(current_cycle) if(15 to 45) - drinker.adjust_slurring(3 SECONDS * REM * delta_time) + drinker.adjust_slurring(3 SECONDS * REM * seconds_per_tick) if(45 to 55) - if(DT_PROB(30, delta_time)) - drinker.adjust_confusion(3 SECONDS * REM * delta_time) + if(SPT_PROB(30, seconds_per_tick)) + drinker.adjust_confusion(3 SECONDS * REM * seconds_per_tick) if(55 to 200) - drinker.set_drugginess(110 SECONDS * REM * delta_time) + drinker.set_drugginess(110 SECONDS * REM * seconds_per_tick) if(200 to INFINITY) - drinker.adjustToxLoss(2 * REM * delta_time, FALSE, required_biotype = affected_biotype) + drinker.adjustToxLoss(2 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) . = TRUE ..() @@ -1995,22 +1995,22 @@ /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, delta_time, times_fired) - drinker.set_drugginess(100 SECONDS * REM * delta_time) - drinker.adjust_dizzy(4 SECONDS * REM * delta_time) - drinker.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1 * REM * delta_time, 150, required_organtype = affected_organtype) - if(DT_PROB(10, delta_time)) +/datum/reagent/consumable/ethanol/neurotoxin/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.set_drugginess(100 SECONDS * REM * seconds_per_tick) + drinker.adjust_dizzy(4 SECONDS * REM * seconds_per_tick) + drinker.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1 * REM * seconds_per_tick, 150, required_organtype = affected_organtype) + if(SPT_PROB(10, seconds_per_tick)) drinker.adjustStaminaLoss(10, required_biotype = affected_biotype) drinker.drop_all_held_items() to_chat(drinker, span_notice("You cant feel your hands!")) if(current_cycle > 5) - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) var/paralyzed_limb = pick_paralyzed_limb() ADD_TRAIT(drinker, paralyzed_limb, type) drinker.adjustStaminaLoss(10, required_biotype = affected_biotype) if(current_cycle > 30) - drinker.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2 * REM * delta_time, required_organtype = affected_organtype) - if(current_cycle > 50 && DT_PROB(7.5, delta_time)) + drinker.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2 * REM * seconds_per_tick, required_organtype = affected_organtype) + if(current_cycle > 50 && SPT_PROB(7.5, seconds_per_tick)) if(!drinker.undergoing_cardiac_arrest() && drinker.can_heartattack()) drinker.set_heartattack(TRUE) if(drinker.stat == CONSCIOUS) @@ -2044,34 +2044,34 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "hippiesdelightglass" -/datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.set_slurring_if_lower(1 SECONDS * REM * delta_time) +/datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.set_slurring_if_lower(1 SECONDS * REM * seconds_per_tick) switch(current_cycle) if(1 to 5) - drinker.set_dizzy_if_lower(20 SECONDS * REM * delta_time) - drinker.set_drugginess(1 MINUTES * REM * delta_time) - if(DT_PROB(5, delta_time)) + drinker.set_dizzy_if_lower(20 SECONDS * REM * seconds_per_tick) + drinker.set_drugginess(1 MINUTES * REM * seconds_per_tick) + if(SPT_PROB(5, seconds_per_tick)) drinker.emote(pick("twitch","giggle")) if(5 to 10) - drinker.set_jitter_if_lower(40 SECONDS * REM * delta_time) - drinker.set_dizzy_if_lower(40 SECONDS * REM * delta_time) - drinker.set_drugginess(1.5 MINUTES * REM * delta_time) - if(DT_PROB(10, delta_time)) + drinker.set_jitter_if_lower(40 SECONDS * REM * seconds_per_tick) + drinker.set_dizzy_if_lower(40 SECONDS * REM * seconds_per_tick) + drinker.set_drugginess(1.5 MINUTES * REM * seconds_per_tick) + if(SPT_PROB(10, seconds_per_tick)) drinker.emote(pick("twitch","giggle")) if (10 to 200) - drinker.set_jitter_if_lower(80 SECONDS * REM * delta_time) - drinker.set_dizzy_if_lower(80 SECONDS * REM * delta_time) - drinker.set_drugginess(2 MINUTES * REM * delta_time) - if(DT_PROB(16, delta_time)) + drinker.set_jitter_if_lower(80 SECONDS * REM * seconds_per_tick) + drinker.set_dizzy_if_lower(80 SECONDS * REM * seconds_per_tick) + drinker.set_drugginess(2 MINUTES * REM * seconds_per_tick) + if(SPT_PROB(16, seconds_per_tick)) drinker.emote(pick("twitch","giggle")) if(200 to INFINITY) - drinker.set_jitter_if_lower(120 SECONDS * REM * delta_time) - drinker.set_dizzy_if_lower(120 SECONDS * REM * delta_time) - drinker.set_drugginess(2.5 MINUTES * REM * delta_time) - if(DT_PROB(23, delta_time)) + drinker.set_jitter_if_lower(120 SECONDS * REM * seconds_per_tick) + drinker.set_dizzy_if_lower(120 SECONDS * REM * seconds_per_tick) + drinker.set_drugginess(2.5 MINUTES * REM * seconds_per_tick) + if(SPT_PROB(23, seconds_per_tick)) drinker.emote(pick("twitch","giggle")) - if(DT_PROB(16, delta_time)) + if(SPT_PROB(16, seconds_per_tick)) drinker.adjustToxLoss(2, FALSE, required_biotype = affected_biotype) . = TRUE ..() @@ -2116,9 +2116,9 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "narsour" -/datum/reagent/consumable/ethanol/narsour/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.adjust_timed_status_effect(6 SECONDS * REM * delta_time, /datum/status_effect/speech/slurring/cult, max_duration = 6 SECONDS) - drinker.adjust_stutter_up_to(6 SECONDS * REM * delta_time, 6 SECONDS) +/datum/reagent/consumable/ethanol/narsour/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + 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) return ..() /datum/reagent/consumable/ethanol/triple_sec @@ -2193,11 +2193,11 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "quadruple_sec" -/datum/reagent/consumable/ethanol/quadruple_sec/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/quadruple_sec/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) //Securidrink in line with the Screwdriver for engineers or Nothing for mimes var/obj/item/organ/internal/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER) if(liver && HAS_TRAIT(liver, TRAIT_LAW_ENFORCEMENT_METABOLISM)) - drinker.heal_bodypart_damage(1 * REM * delta_time, 1 * REM * delta_time) + drinker.heal_bodypart_damage(1 * REM * seconds_per_tick, 1 * REM * seconds_per_tick) . = TRUE return ..() @@ -2217,12 +2217,12 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "quintuple_sec" -/datum/reagent/consumable/ethanol/quintuple_sec/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/quintuple_sec/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) //Securidrink in line with the Screwdriver for engineers or Nothing for mimes but STRONG.. var/obj/item/organ/internal/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER) if(liver && HAS_TRAIT(liver, TRAIT_LAW_ENFORCEMENT_METABOLISM)) - drinker.heal_bodypart_damage(2 * REM * delta_time, 2 * REM * delta_time) - drinker.adjustStaminaLoss(-2 * REM * delta_time, required_biotype = affected_biotype) + drinker.heal_bodypart_damage(2 * REM * seconds_per_tick, 2 * REM * seconds_per_tick) + drinker.adjustStaminaLoss(-2 * REM * seconds_per_tick, required_biotype = affected_biotype) . = TRUE return ..() @@ -2295,13 +2295,13 @@ 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, delta_time, times_fired) +/datum/reagent/consumable/ethanol/bastion_bourbon/on_mob_life(mob/living/drinker, seconds_per_tick, times_fired) if(drinker.health > 0) - drinker.adjustBruteLoss(-1 * REM * delta_time, required_bodytype = affected_bodytype) - drinker.adjustFireLoss(-1 * REM * delta_time, required_bodytype = affected_bodytype) - drinker.adjustToxLoss(-0.5 * REM * delta_time, required_biotype = affected_biotype) - drinker.adjustOxyLoss(-3 * REM * delta_time, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - drinker.adjustStaminaLoss(-5 * REM * delta_time, required_biotype = affected_biotype) + drinker.adjustBruteLoss(-1 * REM * seconds_per_tick, required_bodytype = affected_bodytype) + drinker.adjustFireLoss(-1 * REM * seconds_per_tick, required_bodytype = affected_bodytype) + drinker.adjustToxLoss(-0.5 * REM * seconds_per_tick, required_biotype = affected_biotype) + drinker.adjustOxyLoss(-3 * REM * seconds_per_tick, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + drinker.adjustStaminaLoss(-5 * REM * seconds_per_tick, required_biotype = affected_biotype) . = TRUE ..() @@ -2325,8 +2325,8 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "squirt_cider" -/datum/reagent/consumable/ethanol/squirt_cider/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.satiety += 5 * REM * delta_time //for context, vitamins give 15 satiety per second +/datum/reagent/consumable/ethanol/squirt_cider/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.satiety += 5 * REM * seconds_per_tick //for context, vitamins give 15 satiety per second ..() . = TRUE @@ -2363,8 +2363,8 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "sugar_rush" -/datum/reagent/consumable/ethanol/sugar_rush/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.satiety -= 10 * REM * delta_time //junky as hell! a whole glass will keep you from being able to eat junk food +/datum/reagent/consumable/ethanol/sugar_rush/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.satiety -= 10 * REM * seconds_per_tick //junky as hell! a whole glass will keep you from being able to eat junk food ..() . = TRUE @@ -2418,9 +2418,9 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "peppermint_patty" -/datum/reagent/consumable/ethanol/peppermint_patty/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/peppermint_patty/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) drinker.apply_status_effect(/datum/status_effect/throat_soothed) - drinker.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, 0, drinker.get_body_temp_normal()) + drinker.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, drinker.get_body_temp_normal()) ..() @@ -2450,7 +2450,7 @@ to_chat(the_human, span_notice("[the_shield] appears polished, although you don't recall polishing it.")) return TRUE -/datum/reagent/consumable/ethanol/alexander/on_mob_life(mob/living/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/alexander/on_mob_life(mob/living/drinker, seconds_per_tick, times_fired) ..() if(mighty_shield && !(mighty_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) @@ -2511,7 +2511,7 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "between_the_sheets" -/datum/reagent/consumable/ethanol/between_the_sheets/on_mob_life(mob/living/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/between_the_sheets/on_mob_life(mob/living/drinker, seconds_per_tick, times_fired) ..() var/is_between_the_sheets = FALSE for(var/obj/item/bedsheet/bedsheet in range(drinker.loc, 0)) @@ -2525,13 +2525,13 @@ if(drinker.getBruteLoss() && drinker.getFireLoss()) //If you are damaged by both types, slightly increased healing but it only heals one. The more the merrier wink wink. if(prob(50)) - drinker.adjustBruteLoss(-0.25 * REM * delta_time, required_bodytype = affected_bodytype) + drinker.adjustBruteLoss(-0.25 * REM * seconds_per_tick, required_bodytype = affected_bodytype) else - drinker.adjustFireLoss(-0.25 * REM * delta_time, required_bodytype = affected_bodytype) + drinker.adjustFireLoss(-0.25 * REM * seconds_per_tick, required_bodytype = affected_bodytype) else if(drinker.getBruteLoss()) //If you have only one, it still heals but not as well. - drinker.adjustBruteLoss(-0.2 * REM * delta_time, required_bodytype = affected_bodytype) + drinker.adjustBruteLoss(-0.2 * REM * seconds_per_tick, required_bodytype = affected_bodytype) else if(drinker.getFireLoss()) - drinker.adjustFireLoss(-0.2 * REM * delta_time, required_bodytype = affected_bodytype) + drinker.adjustFireLoss(-0.2 * REM * seconds_per_tick, required_bodytype = affected_bodytype) /datum/reagent/consumable/ethanol/kamikaze name = "Kamikaze" @@ -2595,10 +2595,10 @@ name = "glass of fernet" desc = "A glass of pure Fernet. Only an absolute madman would drink this alone." //Hi Kevum -/datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(drinker.nutrition <= NUTRITION_LEVEL_STARVING) - drinker.adjustToxLoss(1 * REM * delta_time, FALSE, required_biotype = affected_biotype) - drinker.adjust_nutrition(-5 * REM * delta_time) + drinker.adjustToxLoss(1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + drinker.adjust_nutrition(-5 * REM * seconds_per_tick) drinker.overeatduration = 0 return ..() @@ -2618,10 +2618,10 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "godlyblend" -/datum/reagent/consumable/ethanol/fernet_cola/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/fernet_cola/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(drinker.nutrition <= NUTRITION_LEVEL_STARVING) - drinker.adjustToxLoss(0.5 * REM * delta_time, FALSE, required_biotype = affected_biotype) - drinker.adjust_nutrition(-3 * REM * delta_time) + drinker.adjustToxLoss(0.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + drinker.adjust_nutrition(-3 * REM * seconds_per_tick) drinker.overeatduration = 0 return ..() @@ -2641,8 +2641,8 @@ desc = "A glass of Fanciulli. It's just Manhattan with Fernet." icon_state = "fanciulli" -/datum/reagent/consumable/ethanol/fanciulli/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.adjust_nutrition(-5 * REM * delta_time) +/datum/reagent/consumable/ethanol/fanciulli/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.adjust_nutrition(-5 * REM * seconds_per_tick) drinker.overeatduration = 0 return ..() @@ -2668,8 +2668,8 @@ desc = "A glass of Branca Menta, perfect for those lazy and hot Sunday summer afternoons." //Get lazy literally by drinking this icon_state = "minted_fernet" -/datum/reagent/consumable/ethanol/branca_menta/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.adjust_bodytemperature(-20 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, T0C) +/datum/reagent/consumable/ethanol/branca_menta/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.adjust_bodytemperature(-20 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, T0C) return ..() /datum/reagent/consumable/ethanol/branca_menta/on_mob_metabolize(mob/living/drinker) @@ -2695,10 +2695,10 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "blank_paper" -/datum/reagent/consumable/ethanol/blank_paper/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/blank_paper/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(ishuman(drinker) && HAS_TRAIT(drinker, TRAIT_MIMING)) drinker.set_silence_if_lower(MIMEDRINK_SILENCE_DURATION) - drinker.heal_bodypart_damage(1 * REM * delta_time, 1 * REM * delta_time) + drinker.heal_bodypart_damage(1 * REM * seconds_per_tick, 1 * REM * seconds_per_tick) . = TRUE return ..() @@ -2846,13 +2846,13 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "wizz_fizz" -/datum/reagent/consumable/ethanol/wizz_fizz/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/wizz_fizz/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) //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)) - drinker.heal_bodypart_damage(1 * REM * delta_time, 1 * REM * delta_time) - drinker.adjustOxyLoss(-1 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - drinker.adjustToxLoss(-1 * REM * delta_time, FALSE, required_biotype = affected_biotype) - drinker.adjustStaminaLoss(-1 * REM * delta_time, required_biotype = affected_biotype) + drinker.heal_bodypart_damage(1 * REM * seconds_per_tick, 1 * REM * seconds_per_tick) + drinker.adjustOxyLoss(-1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + drinker.adjustToxLoss(-1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + drinker.adjustStaminaLoss(-1 * REM * seconds_per_tick, required_biotype = affected_biotype) return ..() /datum/reagent/consumable/ethanol/bug_spray @@ -2871,10 +2871,10 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "bug_spray" -/datum/reagent/consumable/ethanol/bug_spray/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/bug_spray/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) //Bugs should not drink Bug spray. if(ismoth(drinker) || isflyperson(drinker)) - drinker.adjustToxLoss(1 * REM * delta_time, FALSE, required_biotype = affected_biotype) + drinker.adjustToxLoss(1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) return ..() /datum/reagent/consumable/ethanol/bug_spray/on_mob_metabolize(mob/living/carbon/drinker) @@ -2933,10 +2933,10 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "turbo" -/datum/reagent/consumable/ethanol/turbo/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - if(DT_PROB(2, delta_time)) +/datum/reagent/consumable/ethanol/turbo/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + 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..")]")) - drinker.adjustStaminaLoss(-0.25 * drinker.get_drunk_amount() * REM * delta_time, required_biotype = affected_biotype) + drinker.adjustStaminaLoss(-0.25 * drinker.get_drunk_amount() * REM * seconds_per_tick, required_biotype = affected_biotype) return ..() /datum/reagent/consumable/ethanol/old_timer @@ -2955,8 +2955,8 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "old_timer" -/datum/reagent/consumable/ethanol/old_timer/on_mob_life(mob/living/carbon/human/metabolizer, delta_time, times_fired) - if(DT_PROB(10, delta_time) && istype(metabolizer)) +/datum/reagent/consumable/ethanol/old_timer/on_mob_life(mob/living/carbon/human/metabolizer, seconds_per_tick, times_fired) + if(SPT_PROB(10, seconds_per_tick) && istype(metabolizer)) metabolizer.age += 1 if(metabolizer.age > 70) metabolizer.facial_hair_color = "#cccccc" @@ -3030,11 +3030,11 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "trappistglass" -/datum/reagent/consumable/ethanol/trappist/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/trappist/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(drinker.mind?.holy_role) - drinker.adjustFireLoss(-2.5 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - drinker.adjust_jitter(-2 SECONDS * REM * delta_time) - drinker.adjust_stutter(-2 SECONDS * REM * delta_time) + drinker.adjustFireLoss(-2.5 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + drinker.adjust_jitter(-2 SECONDS * REM * seconds_per_tick) + drinker.adjust_stutter(-2 SECONDS * REM * seconds_per_tick) return ..() /datum/reagent/consumable/ethanol/blazaam @@ -3052,13 +3052,13 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "blazaamglass" -/datum/reagent/consumable/ethanol/blazaam/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/blazaam/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(drinker.get_drunk_amount() > 40) if(stored_teleports) do_teleport(drinker, get_turf(drinker), rand(1,3), channel = TELEPORT_CHANNEL_WORMHOLE) stored_teleports-- - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) stored_teleports += rand(2, 6) if(prob(70)) drinker.vomit(vomit_type = VOMIT_PURPLE) @@ -3094,10 +3094,10 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "mauna_loa" -/datum/reagent/consumable/ethanol/mauna_loa/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/mauna_loa/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) // 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 * delta_time) - if (DT_PROB(2.5, delta_time)) + drinker.adjust_bodytemperature(25 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick) + if (SPT_PROB(2.5, seconds_per_tick)) drinker.adjust_fire_stacks(1) drinker.ignite_mob() ..() @@ -3141,10 +3141,10 @@ 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, delta_time, times_fired) - if(DT_PROB(8, delta_time)) +/datum/reagent/consumable/ethanol/pina_olivada/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + 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")) - if(DT_PROB(3, delta_time)) + if(SPT_PROB(3, seconds_per_tick)) var/static/list/messages = list( "A horrible aftertaste coats your mouth.", "You feel like you're going to choke on the oil in your throat.", @@ -3175,8 +3175,8 @@ desc = "Fermented prison wine made from fruit, sugar, and despair. Security loves to confiscate this, which is the only kind thing Security has ever done." icon_state = "glass_orange" -/datum/reagent/consumable/ethanol/pruno/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.adjust_disgust(5 * REM * delta_time) +/datum/reagent/consumable/ethanol/pruno/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.adjust_disgust(5 * REM * seconds_per_tick) ..() /datum/reagent/consumable/ethanol/ginger_amaretto @@ -3243,8 +3243,8 @@ desc = "The fermented nectar of the Korta nut, as enjoyed by lizards galaxywide." icon_state = "kortara_glass" -/datum/reagent/consumable/ethanol/kortara/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - if(drinker.getBruteLoss() && DT_PROB(10, delta_time)) +/datum/reagent/consumable/ethanol/kortara/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + if(drinker.getBruteLoss() && SPT_PROB(10, seconds_per_tick)) drinker.heal_bodypart_damage(1,0) . = TRUE @@ -3264,7 +3264,7 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "sea_breeze" -/datum/reagent/consumable/ethanol/sea_breeze/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/sea_breeze/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) drinker.apply_status_effect(/datum/status_effect/throat_soothed) ..() @@ -3300,7 +3300,7 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "drunken_espatier" -/datum/reagent/consumable/ethanol/drunken_espatier/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/drunken_espatier/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) drinker.add_mood_event("numb", /datum/mood_event/narcotic_medium, name) //comfortably numb ..() @@ -3329,12 +3329,12 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "protein_blend" -/datum/reagent/consumable/ethanol/protein_blend/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - drinker.adjust_nutrition(2 * REM * delta_time) +/datum/reagent/consumable/ethanol/protein_blend/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + drinker.adjust_nutrition(2 * REM * seconds_per_tick) if(!islizard(drinker)) - drinker.adjust_disgust(5 * REM * delta_time) + drinker.adjust_disgust(5 * REM * seconds_per_tick) else - drinker.adjust_disgust(2 * REM * delta_time) + drinker.adjust_disgust(2 * REM * seconds_per_tick) ..() /datum/reagent/consumable/ethanol/mushi_kombucha @@ -3367,7 +3367,7 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "triumphal_arch" -/datum/reagent/consumable/ethanol/triumphal_arch/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/triumphal_arch/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(islizard(drinker)) drinker.add_mood_event("triumph", /datum/mood_event/memories_of_home, name) ..() @@ -3613,9 +3613,9 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "helianthus" -/datum/reagent/consumable/ethanol/helianthus/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) - if(DT_PROB(5, delta_time)) - drinker.adjust_hallucinations_up_to(4 SECONDS * REM * delta_time, 48 SECONDS) +/datum/reagent/consumable/ethanol/helianthus/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + if(SPT_PROB(5, seconds_per_tick)) + drinker.adjust_hallucinations_up_to(4 SECONDS * REM * seconds_per_tick, 48 SECONDS) ..() @@ -3667,8 +3667,8 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "gin_garden" -/datum/reagent/consumable/ethanol/gin_garden/on_mob_life(mob/living/carbon/doll, delta_time, times_fired) - doll.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, doll.get_body_temp_normal()) +/datum/reagent/consumable/ethanol/gin_garden/on_mob_life(mob/living/carbon/doll, seconds_per_tick, times_fired) + doll.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, doll.get_body_temp_normal()) ..() #undef ALCOHOL_EXPONENT diff --git a/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm b/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm index cfbd0b2adee..690d20fdd67 100644 --- a/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/atmos_gas_reagents.dm @@ -51,10 +51,10 @@ breather.SetSleeping(10) return ..() -/datum/reagent/healium/on_mob_life(mob/living/breather, delta_time, times_fired) - breather.adjustFireLoss(-2 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - breather.adjustToxLoss(-5 * REM * delta_time, FALSE, required_biotype = affected_biotype) - breather.adjustBruteLoss(-2 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) +/datum/reagent/healium/on_mob_life(mob/living/breather, seconds_per_tick, times_fired) + breather.adjustFireLoss(-2 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + breather.adjustToxLoss(-5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + breather.adjustBruteLoss(-2 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) return ..() /datum/reagent/hypernoblium @@ -66,15 +66,10 @@ taste_description = "searingly cold" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/hypernoblium/on_mob_metabolize(mob/living/breather) - . = ..() +/datum/reagent/hypernoblium/on_mob_life(mob/living/carbon/breather, seconds_per_tick, times_fired) if(isplasmaman(breather)) - ADD_TRAIT(breather, TRAIT_NOFIRE, type) - -/datum/reagent/hypernoblium/on_mob_end_metabolize(mob/living/breather) - if(isplasmaman(breather)) - REMOVE_TRAIT(breather, TRAIT_NOFIRE, type) - return ..() + breather.set_timed_status_effect(10 SECONDS * REM * seconds_per_tick, /datum/status_effect/hypernob_protection) + ..() /datum/reagent/nitrium_high_metabolization name = "Nitrosyl plasmide" @@ -95,9 +90,9 @@ REMOVE_TRAIT(breather, TRAIT_SLEEPIMMUNE, type) return ..() -/datum/reagent/nitrium_high_metabolization/on_mob_life(mob/living/carbon/breather, delta_time, times_fired) - breather.adjustStaminaLoss(-2 * REM * delta_time, FALSE, required_biotype = affected_biotype) - breather.adjustToxLoss(0.1 * current_cycle * REM * delta_time, FALSE, required_biotype = affected_biotype) // 1 toxin damage per cycle at cycle 10 +/datum/reagent/nitrium_high_metabolization/on_mob_life(mob/living/carbon/breather, seconds_per_tick, times_fired) + breather.adjustStaminaLoss(-2 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + breather.adjustToxLoss(0.1 * current_cycle * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) // 1 toxin damage per cycle at cycle 10 return ..() /datum/reagent/nitrium_low_metabolization @@ -127,12 +122,12 @@ taste_description = "irradiated air" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/pluoxium/on_mob_life(mob/living/carbon/breather, delta_time, times_fired) +/datum/reagent/pluoxium/on_mob_life(mob/living/carbon/breather, seconds_per_tick, times_fired) if(!HAS_TRAIT(breather, TRAIT_KNOCKEDOUT)) return ..() for(var/obj/item/organ/organ_being_healed as anything in breather.organs) - organ_being_healed.apply_organ_damage(-0.5 * REM * delta_time) + organ_being_healed.apply_organ_damage(-0.5 * REM * seconds_per_tick) return ..() @@ -147,9 +142,9 @@ 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, delta_time, times_fired) - breather.adjustBruteLoss(6 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - breather.adjustOxyLoss(1 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - breather.adjustFireLoss(2 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - breather.adjustToxLoss(2 * REM * delta_time, FALSE, required_biotype = affected_biotype) +/datum/reagent/zauker/on_mob_life(mob/living/breather, seconds_per_tick, times_fired) + breather.adjustBruteLoss(6 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + breather.adjustOxyLoss(1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + breather.adjustFireLoss(2 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + breather.adjustToxLoss(2 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) return ..() diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm index 4762090de99..fd9bddc00f8 100644 --- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm @@ -26,7 +26,7 @@ var/reaping = FALSE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/c2/helbital/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/c2/helbital/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = TRUE var/death_is_coming = (affected_mob.getToxLoss() + affected_mob.getOxyLoss() + affected_mob.getFireLoss() + affected_mob.getBruteLoss())*normalise_creation_purity() var/thou_shall_heal = 0 @@ -34,16 +34,16 @@ switch(affected_mob.stat) if(CONSCIOUS) //bad thou_shall_heal = death_is_coming/50 - affected_mob.adjustOxyLoss(2 * REM * delta_time, TRUE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustOxyLoss(2 * REM * seconds_per_tick, TRUE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) if(SOFT_CRIT) //meh convert thou_shall_heal = round(death_is_coming/47,0.1) - affected_mob.adjustOxyLoss(1 * REM * delta_time, TRUE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustOxyLoss(1 * REM * seconds_per_tick, TRUE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) else //no convert thou_shall_heal = round(death_is_coming/45, 0.1) good_kind_of_healing = TRUE - affected_mob.adjustBruteLoss(-thou_shall_heal * REM * delta_time, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustBruteLoss(-thou_shall_heal * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) - if(good_kind_of_healing && !reaping && DT_PROB(0.00005, delta_time)) //janken with the grim reaper! + if(good_kind_of_healing && !reaping && SPT_PROB(0.00005, seconds_per_tick)) //janken with the grim reaper! reaping = TRUE var/list/RockPaperScissors = list("rock" = "paper", "paper" = "scissors", "scissors" = "rock") //choice = loses to if(affected_mob.apply_status_effect(/datum/status_effect/necropolis_curse, CURSE_BLINDING)) @@ -77,7 +77,7 @@ ..() return -/datum/reagent/medicine/c2/helbital/overdose_process(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/c2/helbital/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(!helbent) affected_mob.apply_necropolis_curse(CURSE_WASTING | CURSE_BLINDING) helbent = TRUE @@ -98,9 +98,9 @@ reagent_state = SOLID chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/c2/libital/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.3 * REM * delta_time, required_organtype = affected_organtype) - affected_mob.adjustBruteLoss(-3 * REM * normalise_creation_purity() * delta_time, required_bodytype = affected_bodytype) +/datum/reagent/medicine/c2/libital/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.3 * REM * seconds_per_tick, required_organtype = affected_organtype) + affected_mob.adjustBruteLoss(-3 * REM * normalise_creation_purity() * seconds_per_tick, required_bodytype = affected_bodytype) ..() return TRUE @@ -115,8 +115,8 @@ 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, delta_time, times_fired) - affected_mob.adjustBruteLoss(-2.25 * REM * normalise_creation_purity() * delta_time, FALSE, required_bodytype = affected_bodytype) +/datum/reagent/medicine/c2/probital/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustBruteLoss(-2.25 * REM * normalise_creation_purity() * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) var/ooo_youaregettingsleepy = 3.5 switch(round(affected_mob.getStaminaLoss())) if(10 to 40) @@ -125,14 +125,14 @@ ooo_youaregettingsleepy = 2.5 if(61 to 200) //you really can only go to 120 ooo_youaregettingsleepy = 2 - affected_mob.adjustStaminaLoss(ooo_youaregettingsleepy * REM * delta_time, FALSE, required_biotype = affected_biotype) + affected_mob.adjustStaminaLoss(ooo_youaregettingsleepy * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) ..() . = TRUE -/datum/reagent/medicine/c2/probital/overdose_process(mob/living/affected_mob, delta_time, times_fired) - affected_mob.adjustStaminaLoss(3 * REM * delta_time, FALSE, required_biotype = affected_biotype) +/datum/reagent/medicine/c2/probital/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustStaminaLoss(3 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) if(affected_mob.getStaminaLoss() >= 80) - affected_mob.adjust_drowsiness(2 SECONDS * REM * delta_time) + affected_mob.adjust_drowsiness(2 SECONDS * REM * seconds_per_tick) if(affected_mob.getStaminaLoss() >= 100) to_chat(affected_mob,span_warning("You feel more tired than you usually do, perhaps if you rest your eyes for a bit...")) affected_mob.adjustStaminaLoss(-100, TRUE, required_biotype = affected_biotype) @@ -161,9 +161,9 @@ var/spammer = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/c2/lenturi/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustFireLoss(-3 * REM * normalise_creation_purity() * delta_time, required_bodytype = affected_bodytype) - affected_mob.adjustOrganLoss(ORGAN_SLOT_STOMACH, 0.4 * REM * delta_time, required_organtype = affected_organtype) +/datum/reagent/medicine/c2/lenturi/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustFireLoss(-3 * REM * normalise_creation_purity() * seconds_per_tick, required_bodytype = affected_bodytype) + affected_mob.adjustOrganLoss(ORGAN_SLOT_STOMACH, 0.4 * REM * seconds_per_tick, required_organtype = affected_organtype) ..() return TRUE @@ -177,9 +177,9 @@ var/message_cd = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/c2/aiuri/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustFireLoss(-2 * REM * normalise_creation_purity() * delta_time, required_bodytype = affected_bodytype) - affected_mob.adjustOrganLoss(ORGAN_SLOT_EYES, 0.25 * REM * delta_time, required_organtype = affected_organtype) +/datum/reagent/medicine/c2/aiuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustFireLoss(-2 * REM * normalise_creation_purity() * seconds_per_tick, required_bodytype = affected_bodytype) + affected_mob.adjustOrganLoss(ORGAN_SLOT_EYES, 0.25 * REM * seconds_per_tick, required_organtype = affected_organtype) ..() return TRUE @@ -195,17 +195,17 @@ inverse_chem_val = 0.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/c2/hercuri/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/c2/hercuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(affected_mob.getFireLoss() > 50) - affected_mob.adjustFireLoss(-2 * REM * delta_time * normalise_creation_purity(), FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustFireLoss(-2 * REM * seconds_per_tick * normalise_creation_purity(), FALSE, required_bodytype = affected_bodytype) else - affected_mob.adjustFireLoss(-1.25 * REM * delta_time * normalise_creation_purity(), FALSE, required_bodytype = affected_bodytype) - affected_mob.adjust_bodytemperature(rand(-25,-5) * TEMPERATURE_DAMAGE_COEFFICIENT * REM * delta_time, 50) + affected_mob.adjustFireLoss(-1.25 * REM * seconds_per_tick * normalise_creation_purity(), FALSE, required_bodytype = affected_bodytype) + affected_mob.adjust_bodytemperature(rand(-25,-5) * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, 50) if(ishuman(affected_mob)) var/mob/living/carbon/human/humi = affected_mob - humi.adjust_coretemperature(rand(-25,-5) * TEMPERATURE_DAMAGE_COEFFICIENT * REM * delta_time, 50) - affected_mob.reagents?.chem_temp += (-10 * REM * delta_time) - affected_mob.adjust_fire_stacks(-1 * REM * delta_time) + humi.adjust_coretemperature(rand(-25,-5) * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, 50) + affected_mob.reagents?.chem_temp += (-10 * REM * seconds_per_tick) + affected_mob.adjust_fire_stacks(-1 * REM * seconds_per_tick) ..() . = TRUE @@ -219,11 +219,11 @@ if(reac_volume >= metabolization_rate) exposed_mob.extinguish_mob() -/datum/reagent/medicine/c2/hercuri/overdose_process(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_bodytemperature(-10 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * delta_time, 50) //chilly chilly +/datum/reagent/medicine/c2/hercuri/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_bodytemperature(-10 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, 50) //chilly chilly if(ishuman(affected_mob)) var/mob/living/carbon/human/humi = affected_mob - humi.adjust_coretemperature(-10 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * delta_time, 50) + humi.adjust_coretemperature(-10 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, 50) ..() @@ -242,18 +242,18 @@ inverse_chem = /datum/reagent/inverse/healing/convermol chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/c2/convermol/on_mob_life(mob/living/carbon/human/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/c2/convermol/on_mob_life(mob/living/carbon/human/affected_mob, seconds_per_tick, times_fired) var/oxycalc = 2.5 * REM * current_cycle if(!overdosed) oxycalc = min(oxycalc, affected_mob.getOxyLoss() + 0.5) //if NOT overdosing, we lower our toxdamage to only the damage we actually healed with a minimum of 0.1*current_cycle. IE if we only heal 10 oxygen damage but we COULD have healed 20, we will only take toxdamage for the 10. We would take the toxdamage for the extra 10 if we were overdosing. - affected_mob.adjustOxyLoss(-oxycalc * delta_time * normalise_creation_purity(), FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - affected_mob.adjustToxLoss(oxycalc * delta_time / CONVERMOL_RATIO, FALSE, required_biotype = affected_biotype) - if(DT_PROB(current_cycle / 2, delta_time) && affected_mob.losebreath) + affected_mob.adjustOxyLoss(-oxycalc * seconds_per_tick * normalise_creation_purity(), FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustToxLoss(oxycalc * seconds_per_tick / CONVERMOL_RATIO, FALSE, required_biotype = affected_biotype) + if(SPT_PROB(current_cycle / 2, seconds_per_tick) && affected_mob.losebreath) affected_mob.losebreath-- ..() return TRUE -/datum/reagent/medicine/c2/convermol/overdose_process(mob/living/carbon/human/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/c2/convermol/overdose_process(mob/living/carbon/human/affected_mob, seconds_per_tick, times_fired) metabolization_rate += 2.5 * REAGENTS_METABOLISM ..() return TRUE @@ -272,9 +272,9 @@ /// A cooldown for spacing bursts of stamina damage COOLDOWN_DECLARE(drowsycd) -/datum/reagent/medicine/c2/tirimol/on_mob_life(mob/living/carbon/human/affected_mob, delta_time, times_fired) - affected_mob.adjustOxyLoss(-3 * REM * delta_time * normalise_creation_purity(), required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - affected_mob.adjustStaminaLoss(2 * REM * delta_time, required_biotype = affected_biotype) +/datum/reagent/medicine/c2/tirimol/on_mob_life(mob/living/carbon/human/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustOxyLoss(-3 * REM * seconds_per_tick * normalise_creation_purity(), required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustStaminaLoss(2 * REM * seconds_per_tick, required_biotype = affected_biotype) if(drowsycd && COOLDOWN_FINISHED(src, drowsycd)) affected_mob.adjust_drowsiness(20 SECONDS) COOLDOWN_START(src, drowsycd, 45 SECONDS) @@ -306,19 +306,19 @@ . = ..() 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/human/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/c2/seiver/on_mob_life(mob/living/carbon/human/affected_mob, seconds_per_tick, times_fired) var/chemtemp = min(holder.chem_temp, 1000) chemtemp = chemtemp ? chemtemp : T0C //why do you have null sweaty var/healypoints = 0 //5 healypoints = 1 heart damage; 5 rads = 1 tox damage healed for the purpose of healypoints //you're hot - var/toxcalc = min(round(5 + ((chemtemp-1000)/175), 0.1), 5) * REM * delta_time * normalise_creation_purity() //max 2.5 tox healing per second + var/toxcalc = min(round(5 + ((chemtemp-1000)/175), 0.1), 5) * REM * seconds_per_tick * normalise_creation_purity() //max 2.5 tox healing per second if(toxcalc > 0) affected_mob.adjustToxLoss(-toxcalc, required_biotype = affected_biotype) healypoints += toxcalc //and you're cold - var/radcalc = round((T0C-chemtemp) / 6, 0.1) * REM * delta_time //max ~45 rad loss unless you've hit below 0K. if so, wow. + var/radcalc = round((T0C-chemtemp) / 6, 0.1) * REM * seconds_per_tick //max ~45 rad loss unless you've hit below 0K. if so, wow. if(radcalc > 0 && HAS_TRAIT(affected_mob, TRAIT_IRRADIATED)) radcalc *= normalise_creation_purity() // extra rad healing if you are SUPER cold @@ -342,7 +342,7 @@ ph = 9.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/c2/multiver/on_mob_life(mob/living/carbon/human/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/c2/multiver/on_mob_life(mob/living/carbon/human/affected_mob, seconds_per_tick, times_fired) var/medibonus = 0 //it will always have itself which makes it REALLY start @ 1 for(var/r in affected_mob.reagents.reagent_list) var/datum/reagent/the_reagent = r @@ -350,8 +350,8 @@ medibonus += 1 if(creation_purity >= 1) //Perfectly pure multivers gives a bonus of 2! medibonus += 1 - affected_mob.adjustToxLoss(-0.5 * min(medibonus, 3 * normalise_creation_purity()) * REM * delta_time, required_biotype = affected_biotype) //not great at healing but if you have nothing else it will work - affected_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5 * REM * delta_time, required_organtype = affected_organtype) //kills at 40u + affected_mob.adjustToxLoss(-0.5 * min(medibonus, 3 * normalise_creation_purity()) * REM * seconds_per_tick, required_biotype = affected_biotype) //not great at healing but if you have nothing else it will work + affected_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5 * REM * seconds_per_tick, required_organtype = affected_organtype) //kills at 40u for(var/r2 in affected_mob.reagents.reagent_list) var/datum/reagent/the_reagent2 = r2 if(the_reagent2 == src) @@ -359,7 +359,7 @@ var/amount2purge = 3 if(medibonus >= 3 && istype(the_reagent2, /datum/reagent/medicine)) //3 unique meds (2+multiver) | (1 + pure multiver) will make it not purge medicines continue - affected_mob.reagents.remove_reagent(the_reagent2.type, amount2purge * REM * delta_time) + affected_mob.reagents.remove_reagent(the_reagent2.type, amount2purge * REM * seconds_per_tick) ..() return TRUE @@ -397,21 +397,21 @@ C.reagents.add_reagent(/datum/reagent/medicine/c2/musiver, conversion_amount) ..() -/datum/reagent/medicine/c2/syriniver/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.8 * REM * delta_time, required_organtype = affected_organtype) - affected_mob.adjustToxLoss(-1 * REM * delta_time, FALSE, required_biotype = affected_biotype) +/datum/reagent/medicine/c2/syriniver/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.8 * REM * seconds_per_tick, required_organtype = affected_organtype) + affected_mob.adjustToxLoss(-1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) for(var/datum/reagent/R in affected_mob.reagents.reagent_list) if(issyrinormusc(R)) continue - affected_mob.reagents.remove_reagent(R.type, 0.4 * REM * delta_time) + affected_mob.reagents.remove_reagent(R.type, 0.4 * REM * seconds_per_tick) ..() . = TRUE -/datum/reagent/medicine/c2/syriniver/overdose_process(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5 * REM * delta_time, required_organtype = affected_organtype) - affected_mob.adjust_disgust(3 * REM * delta_time) - affected_mob.reagents.add_reagent(/datum/reagent/medicine/c2/musiver, 0.225 * REM * delta_time) +/datum/reagent/medicine/c2/syriniver/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5 * REM * seconds_per_tick, required_organtype = affected_organtype) + affected_mob.adjust_disgust(3 * REM * seconds_per_tick) + affected_mob.reagents.add_reagent(/datum/reagent/medicine/c2/musiver, 0.225 * REM * seconds_per_tick) ..() . = TRUE @@ -426,13 +426,13 @@ var/datum/brain_trauma/mild/muscle_weakness/trauma chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/c2/musiver/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.1 * REM * delta_time, required_organtype = affected_organtype) - affected_mob.adjustToxLoss(-1 * REM * delta_time * normalise_creation_purity(), FALSE, required_biotype = affected_biotype) +/datum/reagent/medicine/c2/musiver/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.1 * REM * seconds_per_tick, required_organtype = affected_organtype) + affected_mob.adjustToxLoss(-1 * REM * seconds_per_tick * normalise_creation_purity(), FALSE, required_biotype = affected_biotype) for(var/datum/reagent/R in affected_mob.reagents.reagent_list) if(issyrinormusc(R)) continue - affected_mob.reagents.remove_reagent(R.type, 0.2 * REM * delta_time) + affected_mob.reagents.remove_reagent(R.type, 0.2 * REM * seconds_per_tick) ..() . = TRUE @@ -446,9 +446,9 @@ QDEL_NULL(trauma) return ..() -/datum/reagent/medicine/c2/musiver/overdose_process(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5 * REM * delta_time, required_organtype = affected_organtype) - affected_mob.adjust_disgust(3 * REM * delta_time) +/datum/reagent/medicine/c2/musiver/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5 * REM * seconds_per_tick, required_organtype = affected_organtype) + affected_mob.adjust_disgust(3 * REM * seconds_per_tick) ..() . = TRUE @@ -529,24 +529,24 @@ user.throw_alert("penthrite", /atom/movable/screen/alert/penthrite) user.add_traits(subject_traits, type) -/datum/reagent/medicine/c2/penthrite/on_mob_life(mob/living/carbon/human/H, delta_time, times_fired) +/datum/reagent/medicine/c2/penthrite/on_mob_life(mob/living/carbon/human/H, seconds_per_tick, times_fired) H.adjustStaminaLoss(-25 * REM) //SKYRAT EDIT ADDITION - COMBAT - makes your heart beat faster, fills you with energy. For miners - H.adjustOrganLoss(ORGAN_SLOT_STOMACH, 0.25 * REM * delta_time, required_organtype = affected_organtype) + H.adjustOrganLoss(ORGAN_SLOT_STOMACH, 0.25 * REM * seconds_per_tick, required_organtype = affected_organtype) if(H.health <= HEALTH_THRESHOLD_CRIT && H.health > (H.crit_threshold + HEALTH_THRESHOLD_FULLCRIT * (2 * normalise_creation_purity()))) //we cannot save someone below our lowered crit threshold. - H.adjustToxLoss(-2 * REM * delta_time, FALSE, required_biotype = affected_biotype) - H.adjustBruteLoss(-2 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - H.adjustFireLoss(-2 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - H.adjustOxyLoss(-6 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + H.adjustToxLoss(-2 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + H.adjustBruteLoss(-2 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + H.adjustFireLoss(-2 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + H.adjustOxyLoss(-6 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) H.losebreath = 0 - H.adjustOrganLoss(ORGAN_SLOT_HEART, max(volume/10, 1) * REM * delta_time, required_organtype = affected_organtype) // your heart is barely keeping up! + H.adjustOrganLoss(ORGAN_SLOT_HEART, max(volume/10, 1) * REM * seconds_per_tick, required_organtype = affected_organtype) // your heart is barely keeping up! - H.set_jitter_if_lower(rand(0 SECONDS, 4 SECONDS) * REM * delta_time) - H.set_dizzy_if_lower(rand(0 SECONDS, 4 SECONDS) * REM * delta_time) + H.set_jitter_if_lower(rand(0 SECONDS, 4 SECONDS) * REM * seconds_per_tick) + H.set_dizzy_if_lower(rand(0 SECONDS, 4 SECONDS) * REM * seconds_per_tick) - if(DT_PROB(18, delta_time)) + if(SPT_PROB(18, seconds_per_tick)) to_chat(H,span_danger("Your body is trying to give up, but your heart is still beating!")) if(H.health <= (H.crit_threshold + HEALTH_THRESHOLD_FULLCRIT*(2*normalise_creation_purity()))) //certain death below this threshold @@ -562,10 +562,10 @@ user.remove_traits(subject_traits, type) . = ..() -/datum/reagent/medicine/c2/penthrite/overdose_process(mob/living/carbon/human/H, delta_time, times_fired) +/datum/reagent/medicine/c2/penthrite/overdose_process(mob/living/carbon/human/H, seconds_per_tick, times_fired) REMOVE_TRAIT(H, TRAIT_STABLEHEART, type) - H.adjustStaminaLoss(10 * REM * delta_time, required_biotype = affected_biotype) - H.adjustOrganLoss(ORGAN_SLOT_HEART, 10 * REM * delta_time, required_organtype = affected_organtype) + H.adjustStaminaLoss(10 * REM * seconds_per_tick, required_biotype = affected_biotype) + H.adjustOrganLoss(ORGAN_SLOT_HEART, 10 * REM * seconds_per_tick, required_organtype = affected_organtype) H.set_heartattack(TRUE) diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 3a32a98e799..a76916d1c61 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -27,8 +27,8 @@ icon_state = "orangebox" drink_type = FRUIT | BREAKFAST -/datum/reagent/consumable/orangejuice/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(affected_mob.getOxyLoss() && DT_PROB(16, delta_time)) +/datum/reagent/consumable/orangejuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(affected_mob.getOxyLoss() && SPT_PROB(16, seconds_per_tick)) affected_mob.adjustOxyLoss(-1, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) . = TRUE ..() @@ -47,8 +47,8 @@ desc = "Are you sure this is tomato juice?" icon_state = "glass_red" -/datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(affected_mob.getFireLoss() && DT_PROB(10, delta_time)) +/datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(affected_mob.getFireLoss() && SPT_PROB(10, seconds_per_tick)) affected_mob.heal_bodypart_damage(0, 1) . = TRUE ..() @@ -68,8 +68,8 @@ desc = "A glass of sweet-sour lime juice." icon_state = "glass_green" -/datum/reagent/consumable/limejuice/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(affected_mob.getToxLoss() && DT_PROB(10, delta_time)) +/datum/reagent/consumable/limejuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(affected_mob.getToxLoss() && SPT_PROB(10, seconds_per_tick)) affected_mob.adjustToxLoss(-1, FALSE, required_biotype = affected_biotype) . = TRUE ..() @@ -87,14 +87,14 @@ desc = "It's just like a carrot but without crunching." icon_state = "carrotjuice" -/datum/reagent/consumable/carrotjuice/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_eye_blur(-2 SECONDS * REM * delta_time) - affected_mob.adjust_temp_blindness(-2 SECONDS * REM * delta_time) +/datum/reagent/consumable/carrotjuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_eye_blur(-2 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_temp_blindness(-2 SECONDS * REM * seconds_per_tick) switch(current_cycle) if(1 to 20) //nothing if(21 to 110) - if(DT_PROB(100 * (1 - (sqrt(110 - current_cycle) / 10)), delta_time)) + if(SPT_PROB(100 * (1 - (sqrt(110 - current_cycle) / 10)), seconds_per_tick)) affected_mob.adjustOrganLoss(ORGAN_SLOT_EYES, -2) if(110 to INFINITY) affected_mob.adjustOrganLoss(ORGAN_SLOT_EYES, -2) @@ -140,8 +140,8 @@ desc = "Berry juice. Or maybe it's poison. Who cares?" icon_state = "poisonberryjuice" -/datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustToxLoss(1 * REM * delta_time, FALSE, required_biotype = affected_biotype) +/datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) . = TRUE ..() @@ -185,10 +185,10 @@ desc = "The raw essence of a banana. HONK." icon_state = "banana" -/datum/reagent/consumable/banana/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/consumable/banana/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) var/obj/item/organ/internal/liver/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER) if((liver && HAS_TRAIT(liver, TRAIT_COMEDY_METABOLISM)) || ismonkey(affected_mob)) - affected_mob.heal_bodypart_damage(1 * REM * delta_time, 1 * REM * delta_time) + affected_mob.heal_bodypart_damage(1 * REM * seconds_per_tick, 1 * REM * seconds_per_tick) . = TRUE ..() @@ -208,10 +208,10 @@ desc = "Absolutely nothing." icon_state = "nothing" -/datum/reagent/consumable/nothing/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/nothing/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(ishuman(drinker) && HAS_TRAIT(drinker, TRAIT_MIMING)) drinker.set_silence_if_lower(MIMEDRINK_SILENCE_DURATION) - drinker.heal_bodypart_damage(1 * REM * delta_time, 1 * REM * delta_time) + drinker.heal_bodypart_damage(1 * REM * seconds_per_tick, 1 * REM * seconds_per_tick) . = TRUE ..() @@ -223,7 +223,7 @@ taste_description = "laughter" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/laughter/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/consumable/laughter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) affected_mob.emote("laugh") affected_mob.add_mood_event("chemical_laughter", /datum/mood_event/chemical_laughter) ..() @@ -236,8 +236,8 @@ taste_description = "laughter" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/superlaughter/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(DT_PROB(16, delta_time)) +/datum/reagent/consumable/superlaughter/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + 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!")) affected_mob.Stun(5) affected_mob.add_mood_event("chemical_laughter", /datum/mood_event/chemical_superlaughter) @@ -316,12 +316,12 @@ mytray.adjust_waterlevel(round(chems.get_reagent_amount(type) * 0.3)) myseed?.adjust_potency(-chems.get_reagent_amount(type) * 0.5) -/datum/reagent/consumable/milk/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(affected_mob.getBruteLoss() && DT_PROB(10, delta_time)) +/datum/reagent/consumable/milk/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(affected_mob.getBruteLoss() && SPT_PROB(10, seconds_per_tick)) affected_mob.heal_bodypart_damage(1,0) . = TRUE if(holder.has_reagent(/datum/reagent/consumable/capsaicin)) - holder.remove_reagent(/datum/reagent/consumable/capsaicin, 1 * delta_time) + holder.remove_reagent(/datum/reagent/consumable/capsaicin, 1 * seconds_per_tick) ..() /datum/reagent/consumable/soymilk @@ -338,8 +338,8 @@ desc = "White and nutritious soy goodness!" icon_state = "glass_white" -/datum/reagent/consumable/soymilk/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(affected_mob.getBruteLoss() && DT_PROB(10, delta_time)) +/datum/reagent/consumable/soymilk/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(affected_mob.getBruteLoss() && SPT_PROB(10, seconds_per_tick)) affected_mob.heal_bodypart_damage(1, 0) . = TRUE ..() @@ -358,8 +358,8 @@ desc = "Ewwww..." icon_state = "glass_white" -/datum/reagent/consumable/cream/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(affected_mob.getBruteLoss() && DT_PROB(10, delta_time)) +/datum/reagent/consumable/cream/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(affected_mob.getBruteLoss() && SPT_PROB(10, seconds_per_tick)) affected_mob.heal_bodypart_damage(1, 0) . = TRUE ..() @@ -380,18 +380,18 @@ desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere." icon_state = "glass_brown" -/datum/reagent/consumable/coffee/overdose_process(mob/living/affected_mob, delta_time, times_fired) - affected_mob.set_jitter_if_lower(10 SECONDS * REM * delta_time) +/datum/reagent/consumable/coffee/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) ..() -/datum/reagent/consumable/coffee/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_dizzy(-10 SECONDS * REM * delta_time) - affected_mob.adjust_drowsiness(-6 SECONDS * REM * delta_time) - affected_mob.AdjustSleeping(-40 * REM * delta_time) +/datum/reagent/consumable/coffee/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick) + affected_mob.AdjustSleeping(-40 * REM * seconds_per_tick) //310.15 is the normal bodytemp. - affected_mob.adjust_bodytemperature(25 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, 0, affected_mob.get_body_temp_normal()) + affected_mob.adjust_bodytemperature(25 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal()) if(holder.has_reagent(/datum/reagent/consumable/frostoil)) - holder.remove_reagent(/datum/reagent/consumable/frostoil, 5 * REM * delta_time) + holder.remove_reagent(/datum/reagent/consumable/frostoil, 5 * REM * seconds_per_tick) ..() . = TRUE @@ -411,14 +411,14 @@ desc = "Drinking it from here would not seem right." icon_state = "teaglass" -/datum/reagent/consumable/tea/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_dizzy(-4 SECONDS * REM * delta_time) - affected_mob.adjust_drowsiness(-2 SECONDS * REM * delta_time) - affected_mob.adjust_jitter(-6 SECONDS * REM * delta_time) - affected_mob.AdjustSleeping(-20 * REM * delta_time) - if(affected_mob.getToxLoss() && DT_PROB(10, delta_time)) +/datum/reagent/consumable/tea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_dizzy(-4 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_drowsiness(-2 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_jitter(-6 SECONDS * REM * seconds_per_tick) + affected_mob.AdjustSleeping(-20 * REM * seconds_per_tick) + if(affected_mob.getToxLoss() && SPT_PROB(10, seconds_per_tick)) affected_mob.adjustToxLoss(-1, FALSE, required_biotype = affected_biotype) - affected_mob.adjust_bodytemperature(20 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, 0, affected_mob.get_body_temp_normal()) + affected_mob.adjust_bodytemperature(20 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal()) ..() . = TRUE @@ -454,8 +454,8 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "arnold_palmer" -/datum/reagent/consumable/tea/arnold_palmer/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(DT_PROB(2.5, delta_time)) +/datum/reagent/consumable/tea/arnold_palmer/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + 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.")]")) ..() . = TRUE @@ -475,12 +475,12 @@ icon = 'icons/obj/drinks/coffee.dmi' icon_state = "icedcoffeeglass" -/datum/reagent/consumable/icecoffee/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_dizzy(-10 SECONDS * REM * delta_time) - affected_mob.adjust_drowsiness(-6 SECONDS * REM * delta_time) - affected_mob.AdjustSleeping(-40 * REM * delta_time) - affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) - affected_mob.set_jitter_if_lower(10 SECONDS * REM * delta_time) +/datum/reagent/consumable/icecoffee/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick) + affected_mob.AdjustSleeping(-40 * REM * seconds_per_tick) + affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) + affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) ..() . = TRUE @@ -499,13 +499,13 @@ icon = 'icons/obj/drinks/coffee.dmi' icon_state = "hoticecoffee" -/datum/reagent/consumable/hot_ice_coffee/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_dizzy(-10 SECONDS * REM * delta_time) - affected_mob.adjust_drowsiness(-6 SECONDS * REM * delta_time) - affected_mob.AdjustSleeping(-60 * REM * delta_time) - affected_mob.adjust_bodytemperature(-7 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) - affected_mob.set_jitter_if_lower(10 SECONDS * REM * delta_time) - affected_mob.adjustToxLoss(1 * REM * delta_time, FALSE, required_biotype = affected_biotype) +/datum/reagent/consumable/hot_ice_coffee/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick) + affected_mob.AdjustSleeping(-60 * REM * seconds_per_tick) + affected_mob.adjust_bodytemperature(-7 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) + affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) + affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) ..() . = TRUE @@ -524,13 +524,13 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "icedteaglass" -/datum/reagent/consumable/icetea/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_dizzy(-4 SECONDS * REM * delta_time) - affected_mob.adjust_drowsiness(-2 SECONDS * REM * delta_time) - affected_mob.AdjustSleeping(-40 * REM * delta_time) - if(affected_mob.getToxLoss() && DT_PROB(10, delta_time)) +/datum/reagent/consumable/icetea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_dizzy(-4 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_drowsiness(-2 SECONDS * REM * seconds_per_tick) + affected_mob.AdjustSleeping(-40 * REM * seconds_per_tick) + if(affected_mob.getToxLoss() && SPT_PROB(10, seconds_per_tick)) affected_mob.adjustToxLoss(-1, FALSE, required_biotype = affected_biotype) - affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) + affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) ..() . = TRUE @@ -547,9 +547,9 @@ desc = "A glass of refreshing Space Cola." icon_state = "spacecola" -/datum/reagent/consumable/space_cola/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_drowsiness(-10 SECONDS * REM * delta_time) - affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) +/datum/reagent/consumable/space_cola/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_drowsiness(-10 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) ..() /datum/reagent/consumable/roy_rogers @@ -566,10 +566,10 @@ desc = "90% sugar in a glass." icon_state = "royrogers" -/datum/reagent/consumable/roy_rogers/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.set_jitter_if_lower(12 SECONDS * REM * delta_time) - affected_mob.adjust_drowsiness(-10 SECONDS * REM * delta_time) - affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) +/datum/reagent/consumable/roy_rogers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + 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()) return ..() /datum/reagent/consumable/nuka_cola @@ -595,13 +595,13 @@ affected_mob.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/nuka_cola) ..() -/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.set_jitter_if_lower(40 SECONDS * REM * delta_time) - affected_mob.set_drugginess(1 MINUTES * REM * delta_time) - affected_mob.adjust_dizzy(3 SECONDS * REM * delta_time) +/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.set_jitter_if_lower(40 SECONDS * REM * seconds_per_tick) + affected_mob.set_drugginess(1 MINUTES * REM * seconds_per_tick) + affected_mob.adjust_dizzy(3 SECONDS * REM * seconds_per_tick) affected_mob.remove_status_effect(/datum/status_effect/drowsiness) - affected_mob.AdjustSleeping(-40 * REM * delta_time) - affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) + affected_mob.AdjustSleeping(-40 * REM * seconds_per_tick) + affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) ..() . = TRUE @@ -631,17 +631,17 @@ affected_mob.adjust_drowsiness(current_cycle * 2 SECONDS) ..() -/datum/reagent/consumable/rootbeer/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/consumable/rootbeer/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) 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...")) ADD_TRAIT(affected_mob, TRAIT_DOUBLE_TAP, type) effect_enabled = TRUE - affected_mob.set_jitter_if_lower(4 SECONDS * REM * delta_time) + affected_mob.set_jitter_if_lower(4 SECONDS * REM * seconds_per_tick) if(prob(50)) - affected_mob.adjust_dizzy(2 SECONDS * REM * delta_time) + affected_mob.adjust_dizzy(2 SECONDS * REM * seconds_per_tick) if(current_cycle > 10) - affected_mob.adjust_dizzy(3 SECONDS * REM * delta_time) + affected_mob.adjust_dizzy(3 SECONDS * REM * seconds_per_tick) ..() . = TRUE @@ -668,12 +668,12 @@ REMOVE_TRAIT(affected_mob, TRAIT_SHOCKIMMUNE, type) ..() -/datum/reagent/consumable/grey_bull/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.set_jitter_if_lower(40 SECONDS * REM * delta_time) - affected_mob.adjust_dizzy(2 SECONDS * REM * delta_time) +/datum/reagent/consumable/grey_bull/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.set_jitter_if_lower(40 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_dizzy(2 SECONDS * REM * seconds_per_tick) affected_mob.remove_status_effect(/datum/status_effect/drowsiness) - affected_mob.AdjustSleeping(-40 * REM * delta_time) - affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) + affected_mob.AdjustSleeping(-40 * REM * seconds_per_tick) + affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) ..() /datum/reagent/consumable/spacemountainwind @@ -689,11 +689,11 @@ desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind." icon_state = "Space_mountain_wind_glass" -/datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_drowsiness(-14 SECONDS * REM * delta_time) - affected_mob.AdjustSleeping(-20 * REM * delta_time) - affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) - affected_mob.set_jitter_if_lower(10 SECONDS * REM * delta_time) +/datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_drowsiness(-14 SECONDS * REM * seconds_per_tick) + affected_mob.AdjustSleeping(-20 * REM * seconds_per_tick) + affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) + affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) ..() . = TRUE @@ -710,9 +710,9 @@ desc = "Dr. Gibb. Not as dangerous as the container_name might imply." icon_state = "dr_gibb_glass" -/datum/reagent/consumable/dr_gibb/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_drowsiness(-12 SECONDS * REM * delta_time) - affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) +/datum/reagent/consumable/dr_gibb/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + 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()) ..() /datum/reagent/consumable/space_up @@ -728,8 +728,8 @@ desc = "Space-up. It helps you keep your cool." icon_state = "space-up_glass" -/datum/reagent/consumable/space_up/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) +/datum/reagent/consumable/space_up/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) ..() /datum/reagent/consumable/lemon_lime @@ -745,8 +745,8 @@ desc = "You're pretty certain a real fruit has never actually touched this." icon_state = "lemonlime" -/datum/reagent/consumable/lemon_lime/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) +/datum/reagent/consumable/lemon_lime/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) ..() /datum/reagent/consumable/pwr_game @@ -769,9 +769,9 @@ to_chat(exposed_mob, "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, delta_time, times_fired) - affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) - if(DT_PROB(5, delta_time)) +/datum/reagent/consumable/pwr_game/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + 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)) affected_mob.mind?.adjust_experience(/datum/skill/gaming, 5) ..() @@ -788,8 +788,8 @@ desc = "Mmm mm, shambly." icon_state = "shamblerjuice" -/datum/reagent/consumable/shamblers/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) +/datum/reagent/consumable/shamblers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) ..() /datum/reagent/consumable/sodawater @@ -814,10 +814,10 @@ mytray.adjust_waterlevel(round(chems.get_reagent_amount(type))) mytray.adjust_plant_health(round(chems.get_reagent_amount(type) * 0.1)) -/datum/reagent/consumable/sodawater/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_dizzy(-10 SECONDS * REM * delta_time) - affected_mob.adjust_drowsiness(-6 SECONDS * REM * delta_time) - affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) +/datum/reagent/consumable/sodawater/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) ..() /datum/reagent/consumable/tonic @@ -833,11 +833,11 @@ desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." icon_state = "glass_clearcarb" -/datum/reagent/consumable/tonic/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_dizzy(-10 SECONDS * REM * delta_time) - affected_mob.adjust_drowsiness(-6 SECONDS * REM * delta_time) - affected_mob.AdjustSleeping(-40 * REM * delta_time) - affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) +/datum/reagent/consumable/tonic/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick) + affected_mob.AdjustSleeping(-40 * REM * seconds_per_tick) + affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) ..() . = TRUE @@ -855,12 +855,12 @@ desc = "You can unleash the ape, but without the pop of the can?" icon_state = "monkey_energy_glass" -/datum/reagent/consumable/monkey_energy/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.set_jitter_if_lower(80 SECONDS * REM * delta_time) - affected_mob.adjust_dizzy(2 SECONDS * REM * delta_time) +/datum/reagent/consumable/monkey_energy/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.set_jitter_if_lower(80 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_dizzy(2 SECONDS * REM * seconds_per_tick) affected_mob.remove_status_effect(/datum/status_effect/drowsiness) - affected_mob.AdjustSleeping(-40 * REM * delta_time) - affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) + affected_mob.AdjustSleeping(-40 * REM * seconds_per_tick) + affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) ..() /datum/reagent/consumable/monkey_energy/on_mob_metabolize(mob/living/affected_mob) @@ -872,8 +872,8 @@ affected_mob.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/monkey_energy) ..() -/datum/reagent/consumable/monkey_energy/overdose_process(mob/living/affected_mob, delta_time, times_fired) - if(DT_PROB(7.5, delta_time)) +/datum/reagent/consumable/monkey_energy/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(7.5, seconds_per_tick)) affected_mob.say(pick_list_replacements(BOOMER_FILE, "boomer"), forced = /datum/reagent/consumable/monkey_energy) ..() @@ -892,8 +892,8 @@ desc = "Generally, you're supposed to put something else in there too..." icon_state = "iceglass" -/datum/reagent/consumable/ice/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) +/datum/reagent/consumable/ice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) ..() /datum/reagent/consumable/soy_latte @@ -912,13 +912,13 @@ icon = 'icons/obj/drinks/coffee.dmi' icon_state = "soy_latte" -/datum/reagent/consumable/soy_latte/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_dizzy(-10 SECONDS * REM * delta_time) - affected_mob.adjust_drowsiness(-6 SECONDS * REM * delta_time) +/datum/reagent/consumable/soy_latte/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick) affected_mob.SetSleeping(0) - affected_mob.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, 0, affected_mob.get_body_temp_normal()) - affected_mob.set_jitter_if_lower(10 SECONDS * REM * delta_time) - if(affected_mob.getBruteLoss() && DT_PROB(10, delta_time)) + affected_mob.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal()) + affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) + if(affected_mob.getBruteLoss() && SPT_PROB(10, seconds_per_tick)) affected_mob.heal_bodypart_damage(1,0) ..() . = TRUE @@ -939,13 +939,13 @@ icon = 'icons/obj/drinks/coffee.dmi' icon_state = "cafe_latte" -/datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_dizzy(-10 SECONDS * REM * delta_time) - affected_mob.adjust_drowsiness(-12 SECONDS * REM * delta_time) +/datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_drowsiness(-12 SECONDS * REM * seconds_per_tick) affected_mob.SetSleeping(0) - affected_mob.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, 0, affected_mob.get_body_temp_normal()) - affected_mob.set_jitter_if_lower(10 SECONDS * REM * delta_time) - if(affected_mob.getBruteLoss() && DT_PROB(10, delta_time)) + affected_mob.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal()) + affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) + if(affected_mob.getBruteLoss() && SPT_PROB(10, seconds_per_tick)) affected_mob.heal_bodypart_damage(1, 0) ..() . = TRUE @@ -965,16 +965,16 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "doctorsdelightglass" -/datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustBruteLoss(-0.5 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustFireLoss(-0.5 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustToxLoss(-0.5 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjustOxyLoss(-0.5 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) +/datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustBruteLoss(-0.5 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustFireLoss(-0.5 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustToxLoss(-0.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjustOxyLoss(-0.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) if(affected_mob.nutrition && (affected_mob.nutrition - 2 > 0)) var/obj/item/organ/internal/liver/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER) if(!(HAS_TRAIT(liver, TRAIT_MEDICAL_METABOLISM))) // Drains the nutrition of the holder. Not medical doctors though, since it's the Doctor's Delight! - affected_mob.adjust_nutrition(-2 * REM * delta_time) + affected_mob.adjust_nutrition(-2 * REM * seconds_per_tick) ..() . = TRUE @@ -993,8 +993,8 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "cinderella" -/datum/reagent/consumable/cinderella/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_disgust(-5 * REM * delta_time) +/datum/reagent/consumable/cinderella/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_disgust(-5 * REM * seconds_per_tick) return ..() /datum/reagent/consumable/cherryshake @@ -1187,8 +1187,8 @@ required_drink_type = /datum/reagent/consumable/grape_soda name = "glass of grape juice" -/datum/reagent/consumable/grape_soda/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) +/datum/reagent/consumable/grape_soda/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) ..() /datum/reagent/consumable/milk/chocolate_milk @@ -1221,13 +1221,13 @@ icon_state = "chocolateglass" drink_type = SUGAR | DAIRY -/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, 0, affected_mob.get_body_temp_normal()) - if(affected_mob.getBruteLoss() && DT_PROB(10, delta_time)) +/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal()) + if(affected_mob.getBruteLoss() && SPT_PROB(10, seconds_per_tick)) affected_mob.heal_bodypart_damage(1, 0) . = TRUE if(holder.has_reagent(/datum/reagent/consumable/capsaicin)) - holder.remove_reagent(/datum/reagent/consumable/capsaicin, 2 * REM * delta_time) + holder.remove_reagent(/datum/reagent/consumable/capsaicin, 2 * REM * seconds_per_tick) ..() /datum/reagent/consumable/italian_coco @@ -1246,8 +1246,8 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "italiancoco" -/datum/reagent/consumable/italian_coco/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, 0, affected_mob.get_body_temp_normal()) +/datum/reagent/consumable/italian_coco/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal()) return ..() /datum/reagent/consumable/menthol @@ -1264,7 +1264,7 @@ desc = "Tastes naturally minty, and imparts a very mild numbing sensation." icon_state = "glass_green" -/datum/reagent/consumable/menthol/on_mob_life(mob/living/affected_mob, delta_time, times_fired) +/datum/reagent/consumable/menthol/on_mob_life(mob/living/affected_mob, seconds_per_tick, times_fired) affected_mob.apply_status_effect(/datum/status_effect/throat_soothed) ..() @@ -1340,8 +1340,8 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "cream_soda" -/datum/reagent/consumable/cream_soda/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) +/datum/reagent/consumable/cream_soda/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) ..() /datum/reagent/consumable/sol_dry @@ -1358,8 +1358,8 @@ desc = "A soothing, mellow drink made from ginger." icon_state = "soldry" -/datum/reagent/consumable/sol_dry/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_disgust(-5 * REM * delta_time) +/datum/reagent/consumable/sol_dry/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_disgust(-5 * REM * seconds_per_tick) ..() /datum/reagent/consumable/shirley_temple @@ -1377,8 +1377,8 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "shirleytemple" -/datum/reagent/consumable/shirley_temple/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_disgust(-3 * REM * delta_time) +/datum/reagent/consumable/shirley_temple/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_disgust(-3 * REM * seconds_per_tick) return ..() /datum/reagent/consumable/red_queen @@ -1397,8 +1397,8 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "red_queen" -/datum/reagent/consumable/red_queen/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(DT_PROB(50, delta_time)) +/datum/reagent/consumable/red_queen/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(50, seconds_per_tick)) return ..() var/newsize = pick(0.5, 0.75, 1, 1.50, 2) @@ -1406,7 +1406,7 @@ affected_mob.resize = newsize/current_size current_size = newsize affected_mob.update_transform() - if(DT_PROB(23, delta_time)) + if(SPT_PROB(23, seconds_per_tick)) affected_mob.emote("sneeze") ..() @@ -1455,8 +1455,8 @@ desc = "A healthy and refreshing juice." icon_state = "glass_yellow" -/datum/reagent/consumable/aloejuice/on_mob_life(mob/living/affected_mob, delta_time, times_fired) - if(affected_mob.getToxLoss() && DT_PROB(16, delta_time)) +/datum/reagent/consumable/aloejuice/on_mob_life(mob/living/affected_mob, seconds_per_tick, times_fired) + if(affected_mob.getToxLoss() && SPT_PROB(16, seconds_per_tick)) affected_mob.adjustToxLoss(-1, FALSE, required_biotype = affected_biotype) ..() . = TRUE @@ -1476,9 +1476,9 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "aguafresca" -/datum/reagent/consumable/agua_fresca/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) - if(affected_mob.getToxLoss() && DT_PROB(10, delta_time)) +/datum/reagent/consumable/agua_fresca/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) + if(affected_mob.getToxLoss() && SPT_PROB(10, seconds_per_tick)) affected_mob.adjustToxLoss(-0.5, FALSE, required_biotype = affected_biotype) return ..() @@ -1496,9 +1496,9 @@ desc = "Oddly savoury for a drink." icon_state = "mushroom_tea_glass" -/datum/reagent/consumable/mushroom_tea/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/consumable/mushroom_tea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(islizard(affected_mob)) - affected_mob.adjustOxyLoss(-0.5 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustOxyLoss(-0.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) ..() . = TRUE @@ -1649,9 +1649,9 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "cucumber_lemonade" -/datum/reagent/consumable/cucumberlemonade/on_mob_life(mob/living/carbon/doll, delta_time, times_fired) - doll.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, doll.get_body_temp_normal()) - if(doll.getToxLoss() && DT_PROB(10, delta_time)) +/datum/reagent/consumable/cucumberlemonade/on_mob_life(mob/living/carbon/doll, seconds_per_tick, times_fired) + doll.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, doll.get_body_temp_normal()) + if(doll.getToxLoss() && SPT_PROB(10, seconds_per_tick)) doll.adjustToxLoss(-0.5, FALSE, required_biotype = affected_biotype) return ..() @@ -1669,14 +1669,14 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "mississippiglass" -/datum/reagent/consumable/mississippi_queen/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/mississippi_queen/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) switch(current_cycle) if(10 to 20) - drinker.adjust_dizzy(4 SECONDS * REM * delta_time) + drinker.adjust_dizzy(4 SECONDS * REM * seconds_per_tick) if(20 to 30) - if(DT_PROB(15, delta_time)) - drinker.adjust_confusion(4 SECONDS * REM * delta_time) + if(SPT_PROB(15, seconds_per_tick)) + drinker.adjust_confusion(4 SECONDS * REM * seconds_per_tick) if(30 to 200) - drinker.adjust_hallucinations(60 SECONDS * REM * delta_time) + drinker.adjust_hallucinations(60 SECONDS * REM * seconds_per_tick) return ..() diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 91e098f0d1a..af5933794b9 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -17,11 +17,11 @@ 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, delta_time, times_fired) - affected_mob.set_drugginess(30 SECONDS * REM * delta_time) - if(isturf(affected_mob.loc) && !isspaceturf(affected_mob.loc) && !HAS_TRAIT(affected_mob, TRAIT_IMMOBILIZED) && DT_PROB(5, delta_time)) +/datum/reagent/drug/space_drugs/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + 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)) step(affected_mob, pick(GLOB.cardinals)) - if(DT_PROB(3.5, delta_time)) + if(SPT_PROB(3.5, seconds_per_tick)) affected_mob.emote(pick("twitch","drool","moan","giggle")) ..() @@ -29,9 +29,9 @@ 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, delta_time, times_fired) +/datum/reagent/drug/space_drugs/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) var/hallucination_duration_in_seconds = (affected_mob.get_timed_status_effect_duration(/datum/status_effect/hallucination) / 10) - if(hallucination_duration_in_seconds < volume && DT_PROB(10, delta_time)) + if(hallucination_duration_in_seconds < volume && SPT_PROB(10, seconds_per_tick)) affected_mob.adjust_hallucinations(10 SECONDS) ..() @@ -44,18 +44,18 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED metabolization_rate = 0.125 * REAGENTS_METABOLISM -/datum/reagent/drug/cannabis/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/drug/cannabis/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) affected_mob.apply_status_effect(/datum/status_effect/stoned) - if(DT_PROB(1, delta_time)) + if(SPT_PROB(1, seconds_per_tick)) var/smoke_message = pick("You feel relaxed.","You feel calmed.","Your mouth feels dry.","You could use some water.","Your heart beats quickly.","You feel clumsy.","You crave junk food.","You notice you've been moving more slowly.") to_chat(affected_mob, "[smoke_message]") - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) affected_mob.emote(pick("smile","laugh","giggle")) - affected_mob.adjust_nutrition(-0.15 * REM * delta_time) //munchies - if(DT_PROB(4, delta_time) && affected_mob.body_position == LYING_DOWN && !affected_mob.IsSleeping()) //chance to fall asleep if lying down + affected_mob.adjust_nutrition(-0.15 * REM * seconds_per_tick) //munchies + if(SPT_PROB(4, seconds_per_tick) && affected_mob.body_position == LYING_DOWN && !affected_mob.IsSleeping()) //chance to fall asleep if lying down to_chat(affected_mob, "You doze off...") affected_mob.Sleeping(10 SECONDS) - if(DT_PROB(4, delta_time) && affected_mob.buckled && affected_mob.body_position != LYING_DOWN && !affected_mob.IsParalyzed()) //chance to be couchlocked if sitting + if(SPT_PROB(4, seconds_per_tick) && affected_mob.buckled && affected_mob.body_position != LYING_DOWN && !affected_mob.IsParalyzed()) //chance to be couchlocked if sitting to_chat(affected_mob, "It's too comfy to move...") affected_mob.Paralyze(10 SECONDS) return ..() @@ -81,23 +81,23 @@ mytray.adjust_toxic(round(chems.get_reagent_amount(type))) mytray.adjust_pestlevel(-rand(1, 2)) -/datum/reagent/drug/nicotine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(DT_PROB(0.5, delta_time)) +/datum/reagent/drug/nicotine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(0.5, seconds_per_tick)) var/smoke_message = pick("You feel relaxed.", "You feel calmed.","You feel alert.","You feel rugged.") to_chat(affected_mob, span_notice("[smoke_message]")) affected_mob.add_mood_event("smoked", /datum/mood_event/smoked, name) affected_mob.remove_status_effect(/datum/status_effect/jitter) - affected_mob.AdjustStun(-50 * REM * delta_time) - affected_mob.AdjustKnockdown(-50 * REM * delta_time) - affected_mob.AdjustUnconscious(-50 * REM * delta_time) - affected_mob.AdjustParalyzed(-50 * REM * delta_time) - affected_mob.AdjustImmobilized(-50 * REM * delta_time) + affected_mob.AdjustStun(-50 * REM * seconds_per_tick) + affected_mob.AdjustKnockdown(-50 * REM * seconds_per_tick) + affected_mob.AdjustUnconscious(-50 * REM * seconds_per_tick) + affected_mob.AdjustParalyzed(-50 * REM * seconds_per_tick) + affected_mob.AdjustImmobilized(-50 * REM * seconds_per_tick) ..() . = TRUE -/datum/reagent/drug/nicotine/overdose_process(mob/living/affected_mob, delta_time, times_fired) - affected_mob.adjustToxLoss(0.1 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjustOxyLoss(1.1 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) +/datum/reagent/drug/nicotine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustToxLoss(0.1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjustOxyLoss(1.1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) ..() . = TRUE @@ -112,9 +112,9 @@ addiction_types = list(/datum/addiction/opioids = 18) //7.2 per 2 seconds -/datum/reagent/drug/krokodil/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/drug/krokodil/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) var/high_message = pick("You feel calm.", "You feel collected.", "You feel like you need to relax.") - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_notice("[high_message]")) affected_mob.add_mood_event("smacked out", /datum/mood_event/narcotic_heavy, name) if(current_cycle == 35 && creation_purity <= 0.6) @@ -128,9 +128,9 @@ affected_mob.adjustBruteLoss(50 * REM, FALSE, required_bodytype = affected_bodytype) // holy shit your skin just FELL THE FUCK OFF ..() -/datum/reagent/drug/krokodil/overdose_process(mob/living/affected_mob, delta_time, times_fired) - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.25 * REM * delta_time, required_organtype = affected_organtype) - affected_mob.adjustToxLoss(0.25 * REM * delta_time, FALSE, required_biotype = affected_biotype) +/datum/reagent/drug/krokodil/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.25 * REM * seconds_per_tick, required_organtype = affected_organtype) + affected_mob.adjustToxLoss(0.25 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) ..() . = TRUE @@ -170,36 +170,36 @@ L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/methamphetamine) ..() -/datum/reagent/drug/methamphetamine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/drug/methamphetamine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) var/high_message = pick("You feel hyper.", "You feel like you need to go faster.", "You feel like you can run the world.") - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_notice("[high_message]")) affected_mob.add_mood_event("tweaking", /datum/mood_event/stimulant_medium, name) - affected_mob.AdjustStun(-40 * REM * delta_time) - affected_mob.AdjustKnockdown(-40 * REM * delta_time) - affected_mob.AdjustUnconscious(-40 * REM * delta_time) - affected_mob.AdjustParalyzed(-40 * REM * delta_time) - affected_mob.AdjustImmobilized(-40 * REM * delta_time) - affected_mob.adjustStaminaLoss(-2 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.set_jitter_if_lower(4 SECONDS * REM * delta_time) - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(1, 4) * REM * delta_time, required_organtype = affected_organtype) - if(DT_PROB(2.5, delta_time)) + affected_mob.AdjustStun(-40 * REM * seconds_per_tick) + affected_mob.AdjustKnockdown(-40 * REM * seconds_per_tick) + affected_mob.AdjustUnconscious(-40 * REM * seconds_per_tick) + affected_mob.AdjustParalyzed(-40 * REM * seconds_per_tick) + affected_mob.AdjustImmobilized(-40 * REM * seconds_per_tick) + affected_mob.adjustStaminaLoss(-2 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.set_jitter_if_lower(4 SECONDS * REM * seconds_per_tick) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, rand(1, 4) * REM * seconds_per_tick, required_organtype = affected_organtype) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote(pick("twitch", "shiver")) ..() . = TRUE -/datum/reagent/drug/methamphetamine/overdose_process(mob/living/affected_mob, delta_time, times_fired) +/datum/reagent/drug/methamphetamine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) if(!HAS_TRAIT(affected_mob, TRAIT_IMMOBILIZED) && !ismovable(affected_mob.loc)) - for(var/i in 1 to round(4 * REM * delta_time, 1)) + for(var/i in 1 to round(4 * REM * seconds_per_tick, 1)) step(affected_mob, pick(GLOB.cardinals)) - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) affected_mob.emote("laugh") - if(DT_PROB(18, delta_time)) + if(SPT_PROB(18, seconds_per_tick)) affected_mob.visible_message(span_danger("[affected_mob]'s hands flip out and flail everywhere!")) affected_mob.drop_all_held_items() ..() - affected_mob.adjustToxLoss(1 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, (rand(5, 10) / 10) * REM * delta_time, required_organtype = affected_organtype) + affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, (rand(5, 10) / 10) * REM * seconds_per_tick, required_organtype = affected_organtype) . = TRUE /datum/reagent/drug/bath_salts @@ -228,28 +228,28 @@ QDEL_NULL(rage) ..() -/datum/reagent/drug/bath_salts/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/drug/bath_salts/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.") - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_notice("[high_message]")) affected_mob.add_mood_event("salted", /datum/mood_event/stimulant_heavy, name) - affected_mob.adjustStaminaLoss(-5 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 4 * REM * delta_time, required_organtype = affected_organtype) - affected_mob.adjust_hallucinations(10 SECONDS * REM * delta_time) + affected_mob.adjustStaminaLoss(-5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 4 * REM * seconds_per_tick, required_organtype = affected_organtype) + affected_mob.adjust_hallucinations(10 SECONDS * REM * seconds_per_tick) if(!HAS_TRAIT(affected_mob, TRAIT_IMMOBILIZED) && !ismovable(affected_mob.loc)) step(affected_mob, pick(GLOB.cardinals)) step(affected_mob, pick(GLOB.cardinals)) ..() . = TRUE -/datum/reagent/drug/bath_salts/overdose_process(mob/living/affected_mob, delta_time, times_fired) - affected_mob.adjust_hallucinations(10 SECONDS * REM * delta_time) +/datum/reagent/drug/bath_salts/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_hallucinations(10 SECONDS * REM * seconds_per_tick) if(!HAS_TRAIT(affected_mob, TRAIT_IMMOBILIZED) && !ismovable(affected_mob.loc)) - for(var/i in 1 to round(8 * REM * delta_time, 1)) + for(var/i in 1 to round(8 * REM * seconds_per_tick, 1)) step(affected_mob, pick(GLOB.cardinals)) - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) affected_mob.emote(pick("twitch","drool","moan")) - if(DT_PROB(28, delta_time)) + if(SPT_PROB(28, seconds_per_tick)) affected_mob.drop_all_held_items() ..() @@ -261,13 +261,13 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED addiction_types = list(/datum/addiction/stimulants = 8) -/datum/reagent/drug/aranesp/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/drug/aranesp/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.") - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_notice("[high_message]")) - affected_mob.adjustStaminaLoss(-18 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjustToxLoss(0.5 * REM * delta_time, FALSE, required_biotype = affected_biotype) - if(DT_PROB(30, delta_time)) + affected_mob.adjustStaminaLoss(-18 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjustToxLoss(0.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + if(SPT_PROB(30, seconds_per_tick)) affected_mob.losebreath++ affected_mob.adjustOxyLoss(1, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) ..() @@ -293,16 +293,16 @@ L.clear_mood_event("happiness_drug") ..() -/datum/reagent/drug/happiness/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/drug/happiness/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) affected_mob.remove_status_effect(/datum/status_effect/jitter) affected_mob.remove_status_effect(/datum/status_effect/confusion) affected_mob.disgust = 0 - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.2 * REM * delta_time, required_organtype = affected_organtype) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.2 * REM * seconds_per_tick, required_organtype = affected_organtype) ..() . = TRUE -/datum/reagent/drug/happiness/overdose_process(mob/living/affected_mob, delta_time, times_fired) - if(DT_PROB(16, delta_time)) +/datum/reagent/drug/happiness/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(16, seconds_per_tick)) var/reaction = rand(1,3) switch(reaction) if(1) @@ -314,7 +314,7 @@ if(3) affected_mob.emote("frown") affected_mob.add_mood_event("happiness_drug", /datum/mood_event/happiness_drug_bad_od) - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.5 * REM * delta_time, required_organtype = affected_organtype) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.5 * REM * seconds_per_tick, required_organtype = affected_organtype) ..() . = TRUE @@ -336,12 +336,12 @@ REMOVE_TRAIT(L, TRAIT_BATON_RESISTANCE, type) ..() -/datum/reagent/drug/pumpup/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.set_jitter_if_lower(10 SECONDS * REM * delta_time) +/datum/reagent/drug/pumpup/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_notice("[pick("Go! Go! GO!", "You feel ready...", "You feel invincible...")]")) - if(DT_PROB(7.5, delta_time)) + if(SPT_PROB(7.5, seconds_per_tick)) affected_mob.losebreath++ affected_mob.adjustToxLoss(2, FALSE, required_biotype = affected_biotype) ..() @@ -350,16 +350,16 @@ /datum/reagent/drug/pumpup/overdose_start(mob/living/affected_mob) 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, delta_time, times_fired) - affected_mob.set_jitter_if_lower(10 SECONDS * REM * delta_time) - if(DT_PROB(2.5, delta_time)) +/datum/reagent/drug/pumpup/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.drop_all_held_items() - if(DT_PROB(7.5, delta_time)) + if(SPT_PROB(7.5, seconds_per_tick)) affected_mob.emote(pick("twitch","drool")) - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) affected_mob.losebreath++ affected_mob.adjustStaminaLoss(4, FALSE, required_biotype = affected_biotype) - if(DT_PROB(7.5, delta_time)) + if(SPT_PROB(7.5, seconds_per_tick)) affected_mob.adjustToxLoss(2, FALSE, required_biotype = affected_biotype) ..() @@ -377,22 +377,22 @@ 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, delta_time, times_fired) +/datum/reagent/drug/maint/powder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.1 * REM * delta_time, required_organtype = affected_organtype) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.1 * REM * seconds_per_tick, required_organtype = affected_organtype) // 5x if you want to OD, you can potentially go higher, but good luck managing the brain damage. var/amt = max(round(volume/3, 0.1), 1) affected_mob?.mind?.experience_multiplier_reasons |= type - affected_mob?.mind?.experience_multiplier_reasons[type] = amt * REM * delta_time + affected_mob?.mind?.experience_multiplier_reasons[type] = amt * REM * seconds_per_tick /datum/reagent/drug/maint/powder/on_mob_end_metabolize(mob/living/affected_mob) . = ..() 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, delta_time, times_fired) +/datum/reagent/drug/maint/powder/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) . = ..() - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 6 * REM * delta_time, required_organtype = affected_organtype) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 6 * REM * seconds_per_tick, required_organtype = affected_organtype) /datum/reagent/drug/maint/sludge name = "Maintenance Sludge" @@ -409,22 +409,22 @@ . = ..() ADD_TRAIT(L,TRAIT_HARDLY_WOUNDED,type) -/datum/reagent/drug/maint/sludge/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/drug/maint/sludge/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() - affected_mob.adjustToxLoss(0.5 * REM * delta_time, required_biotype = affected_biotype) + affected_mob.adjustToxLoss(0.5 * REM * seconds_per_tick, required_biotype = affected_biotype) /datum/reagent/drug/maint/sludge/on_mob_end_metabolize(mob/living/affected_mob) . = ..() REMOVE_TRAIT(affected_mob, TRAIT_HARDLY_WOUNDED,type) -/datum/reagent/drug/maint/sludge/overdose_process(mob/living/affected_mob, delta_time, times_fired) +/datum/reagent/drug/maint/sludge/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) . = ..() if(!iscarbon(affected_mob)) return var/mob/living/carbon/carbie = affected_mob //You will be vomiting so the damage is really for a few ticks before you flush it out of your system - carbie.adjustToxLoss(1 * REM * delta_time, required_biotype = affected_biotype) - if(DT_PROB(5, delta_time)) + carbie.adjustToxLoss(1 * REM * seconds_per_tick, required_biotype = affected_biotype) + if(SPT_PROB(5, seconds_per_tick)) carbie.adjustToxLoss(5, required_biotype = affected_biotype) carbie.vomit() @@ -437,21 +437,21 @@ 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, delta_time, times_fired) +/datum/reagent/drug/maint/tar/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() - affected_mob.AdjustStun(-10 * REM * delta_time) - affected_mob.AdjustKnockdown(-10 * REM * delta_time) - affected_mob.AdjustUnconscious(-10 * REM * delta_time) - affected_mob.AdjustParalyzed(-10 * REM * delta_time) - affected_mob.AdjustImmobilized(-10 * REM * delta_time) - affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5 * REM * delta_time, required_organtype = affected_organtype) + affected_mob.AdjustStun(-10 * REM * seconds_per_tick) + affected_mob.AdjustKnockdown(-10 * REM * seconds_per_tick) + affected_mob.AdjustUnconscious(-10 * REM * seconds_per_tick) + affected_mob.AdjustParalyzed(-10 * REM * seconds_per_tick) + affected_mob.AdjustImmobilized(-10 * REM * seconds_per_tick) + affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 1.5 * REM * seconds_per_tick, required_organtype = affected_organtype) -/datum/reagent/drug/maint/tar/overdose_process(mob/living/affected_mob, delta_time, times_fired) +/datum/reagent/drug/maint/tar/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) . = ..() - affected_mob.adjustToxLoss(5 * REM * delta_time, required_biotype = affected_biotype) - affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 3 * REM * delta_time, required_organtype = affected_organtype) + affected_mob.adjustToxLoss(5 * REM * seconds_per_tick, required_biotype = affected_biotype) + affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 3 * REM * seconds_per_tick, required_organtype = affected_organtype) /datum/reagent/drug/mushroomhallucinogen name = "Mushroom Hallucinogen" @@ -464,20 +464,20 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED addiction_types = list(/datum/addiction/hallucinogens = 12) -/datum/reagent/drug/mushroomhallucinogen/on_mob_life(mob/living/carbon/psychonaut, delta_time, times_fired) - psychonaut.set_slurring_if_lower(1 SECONDS * REM * delta_time) +/datum/reagent/drug/mushroomhallucinogen/on_mob_life(mob/living/carbon/psychonaut, seconds_per_tick, times_fired) + psychonaut.set_slurring_if_lower(1 SECONDS * REM * seconds_per_tick) switch(current_cycle) if(1 to 5) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) psychonaut.emote(pick("twitch","giggle")) if(5 to 10) - psychonaut.set_jitter_if_lower(20 SECONDS * REM * delta_time) - if(DT_PROB(10, delta_time)) + psychonaut.set_jitter_if_lower(20 SECONDS * REM * seconds_per_tick) + if(SPT_PROB(10, seconds_per_tick)) psychonaut.emote(pick("twitch","giggle")) if (10 to INFINITY) - psychonaut.set_jitter_if_lower(40 SECONDS * REM * delta_time) - if(DT_PROB(16, delta_time)) + psychonaut.set_jitter_if_lower(40 SECONDS * REM * seconds_per_tick) + if(SPT_PROB(16, seconds_per_tick)) psychonaut.emote(pick("twitch","giggle")) ..() @@ -517,12 +517,12 @@ game_plane_master_controller.remove_filter("rainbow") game_plane_master_controller.remove_filter("psilocybin_wave") -/datum/reagent/drug/mushroomhallucinogen/overdose_process(mob/living/psychonaut, delta_time, times_fired) +/datum/reagent/drug/mushroomhallucinogen/overdose_process(mob/living/psychonaut, seconds_per_tick, times_fired) . = ..() - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) psychonaut.emote(pick("twitch","drool","moan")) - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) psychonaut.apply_status_effect(/datum/status_effect/tower_of_babel) /datum/reagent/drug/blastoff @@ -589,20 +589,20 @@ game_plane_master_controller.remove_filter("blastoff_wave") dancer.sound_environment_override = NONE -/datum/reagent/drug/blastoff/on_mob_life(mob/living/carbon/dancer, delta_time, times_fired) +/datum/reagent/drug/blastoff/on_mob_life(mob/living/carbon/dancer, seconds_per_tick, times_fired) . = ..() - dancer.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.3 * REM * delta_time, required_organtype = affected_organtype) + dancer.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.3 * REM * seconds_per_tick, required_organtype = affected_organtype) dancer.AdjustKnockdown(-20) - if(DT_PROB(BLASTOFF_DANCE_MOVE_CHANCE_PER_UNIT * volume, delta_time)) + 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, delta_time, times_fired) +/datum/reagent/drug/blastoff/overdose_process(mob/living/dancer, seconds_per_tick, times_fired) . = ..() - dancer.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.3 * REM * delta_time, required_organtype = affected_organtype) + dancer.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.3 * REM * seconds_per_tick, required_organtype = affected_organtype) - if(DT_PROB(BLASTOFF_DANCE_MOVE_CHANCE_PER_UNIT * volume, delta_time)) + if(SPT_PROB(BLASTOFF_DANCE_MOVE_CHANCE_PER_UNIT * volume, seconds_per_tick)) dancer.emote("spin") ///This proc listens to the flip signal and throws the mob every third flip @@ -661,9 +661,9 @@ 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, delta_time, times_fired) +/datum/reagent/drug/saturnx/on_mob_life(mob/living/carbon/invisible_man, seconds_per_tick, times_fired) . = ..() - invisible_man.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.3 * REM * delta_time, required_organtype = affected_organtype) + invisible_man.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.3 * REM * seconds_per_tick, required_organtype = affected_organtype) /datum/reagent/drug/saturnx/on_mob_metabolize(mob/living/invisible_man) . = ..() @@ -741,13 +741,13 @@ 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, delta_time, times_fired) +/datum/reagent/drug/saturnx/overdose_process(mob/living/invisible_man, seconds_per_tick, times_fired) . = ..() - if(DT_PROB(7.5, delta_time)) + if(SPT_PROB(7.5, seconds_per_tick)) invisible_man.emote("giggle") - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) invisible_man.emote("laugh") - invisible_man.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.4 * REM * delta_time, required_organtype = affected_organtype) + invisible_man.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.4 * REM * seconds_per_tick, required_organtype = affected_organtype) /datum/reagent/drug/saturnx/stable name = "Stabilized Saturn-X" @@ -786,13 +786,13 @@ druggo.adjustStaminaLoss(-4 * trans_volume, 0) //I wish i could give it some kind of bonus when smoked, but we don't have an INHALE method. -/datum/reagent/drug/kronkaine/on_mob_life(mob/living/carbon/kronkaine_fiend, delta_time, times_fired) +/datum/reagent/drug/kronkaine/on_mob_life(mob/living/carbon/kronkaine_fiend, seconds_per_tick, times_fired) . = ..() kronkaine_fiend.add_mood_event("tweaking", /datum/mood_event/stimulant_medium, name) - kronkaine_fiend.adjustOrganLoss(ORGAN_SLOT_HEART, 0.4 * REM * delta_time, required_organtype = affected_organtype) - kronkaine_fiend.set_jitter_if_lower(20 SECONDS * REM * delta_time) - kronkaine_fiend.AdjustSleeping(-20 * REM * delta_time) - kronkaine_fiend.adjust_drowsiness(-10 SECONDS * REM * delta_time) + kronkaine_fiend.adjustOrganLoss(ORGAN_SLOT_HEART, 0.4 * REM * seconds_per_tick, required_organtype = affected_organtype) + kronkaine_fiend.set_jitter_if_lower(20 SECONDS * REM * seconds_per_tick) + kronkaine_fiend.AdjustSleeping(-20 * REM * seconds_per_tick) + kronkaine_fiend.adjust_drowsiness(-10 SECONDS * REM * seconds_per_tick) if(volume < 10) return for(var/possible_purger in kronkaine_fiend.reagents.reagent_list) @@ -800,11 +800,11 @@ kronkaine_fiend.ForceContractDisease(new /datum/disease/adrenal_crisis(), FALSE, TRUE) //We punish players for purging, since unchecked purging would allow players to reap the stamina healing benefits without any drawbacks. This also has the benefit of making haloperidol a counter, like it is supposed to be. break -/datum/reagent/drug/kronkaine/overdose_process(mob/living/kronkaine_fiend, delta_time, times_fired) +/datum/reagent/drug/kronkaine/overdose_process(mob/living/kronkaine_fiend, seconds_per_tick, times_fired) . = ..() - kronkaine_fiend.adjustOrganLoss(ORGAN_SLOT_HEART, 1 * REM * delta_time, required_organtype = affected_organtype) - kronkaine_fiend.set_jitter_if_lower(20 SECONDS * REM * delta_time) - if(DT_PROB(10, delta_time)) + kronkaine_fiend.adjustOrganLoss(ORGAN_SLOT_HEART, 1 * REM * seconds_per_tick, required_organtype = affected_organtype) + kronkaine_fiend.set_jitter_if_lower(20 SECONDS * REM * seconds_per_tick) + if(SPT_PROB(10, seconds_per_tick)) to_chat(kronkaine_fiend, span_danger(pick("You feel like your heart is going to explode!", "Your ears are ringing!", "You sweat like a pig!", "You clench your jaw and grind your teeth.", "You feel prickles of pain in your chest."))) ///dirty kronkaine, aka gore. far worse overdose effects. diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 3952366f6c0..d99a795c3e0 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -18,15 +18,15 @@ /// affects mood, typically higher for mixed drinks with more complex recipes' var/quality = 0 -/datum/reagent/consumable/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/consumable/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) current_cycle++ if(ishuman(M)) var/mob/living/carbon/human/H = M if(!HAS_TRAIT(H, TRAIT_NOHUNGER)) - H.adjust_nutrition(nutriment_factor * REM * delta_time) + H.adjust_nutrition(nutriment_factor * REM * seconds_per_tick) if(length(reagent_removal_skip_list)) return - holder.remove_reagent(type, metabolization_rate * delta_time) + holder.remove_reagent(type, metabolization_rate * seconds_per_tick) /datum/reagent/consumable/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) . = ..() @@ -70,8 +70,8 @@ mytray.adjust_plant_health(round(chems.get_reagent_amount(type) * 0.2)) -/datum/reagent/consumable/nutriment/on_mob_life(mob/living/carbon/M, delta_time, times_fired) - if(DT_PROB(30, delta_time)) +/datum/reagent/consumable/nutriment/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) + if(SPT_PROB(30, seconds_per_tick)) M.heal_bodypart_damage(brute = brute_heal, burn = burn_heal, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC) . = TRUE ..() @@ -125,9 +125,9 @@ brute_heal = 1 burn_heal = 1 -/datum/reagent/consumable/nutriment/vitamin/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/consumable/nutriment/vitamin/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) if(M.satiety < MAX_SATIETY) - M.satiety += 30 * REM * delta_time + M.satiety += 30 * REM * seconds_per_tick . = ..() /// The basic resource of vat growing. @@ -154,7 +154,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/M, delta_time, times_fired) +/datum/reagent/consumable/nutriment/cloth_fibers/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) if(M.satiety < MAX_SATIETY) M.adjust_nutrition(CLOTHING_NUTRITION_GAIN) delayed_satiety_drain += CLOTHING_NUTRITION_GAIN @@ -249,8 +249,8 @@ M.AdjustSleeping(600) . = TRUE -/datum/reagent/consumable/sugar/overdose_process(mob/living/M, delta_time, times_fired) - M.AdjustSleeping(40 * REM * delta_time) +/datum/reagent/consumable/sugar/overdose_process(mob/living/M, seconds_per_tick, times_fired) + M.AdjustSleeping(40 * REM * seconds_per_tick) ..() . = TRUE @@ -295,13 +295,13 @@ taste_mult = 1.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/capsaicin/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/consumable/capsaicin/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) var/heating = 0 switch(current_cycle) if(1 to 15) heating = 5 if(holder.has_reagent(/datum/reagent/cryostylane)) - holder.remove_reagent(/datum/reagent/cryostylane, 5 * REM * delta_time) + holder.remove_reagent(/datum/reagent/cryostylane, 5 * REM * seconds_per_tick) if(isslime(M)) heating = rand(5, 20) if(15 to 25) @@ -316,7 +316,7 @@ heating = 20 if(isslime(M)) heating = rand(20, 25) - M.adjust_bodytemperature(heating * TEMPERATURE_DAMAGE_COEFFICIENT * REM * delta_time) + M.adjust_bodytemperature(heating * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick) ..() /datum/reagent/consumable/frostoil @@ -330,13 +330,13 @@ specific_heat = 40 default_container = /obj/item/reagent_containers/cup/bottle/frostoil -/datum/reagent/consumable/frostoil/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/consumable/frostoil/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) var/cooling = 0 switch(current_cycle) if(1 to 15) cooling = -10 if(holder.has_reagent(/datum/reagent/consumable/capsaicin)) - holder.remove_reagent(/datum/reagent/consumable/capsaicin, 5 * REM * delta_time) + holder.remove_reagent(/datum/reagent/consumable/capsaicin, 5 * REM * seconds_per_tick) if(isslime(M)) cooling = -rand(5, 20) if(15 to 25) @@ -355,7 +355,7 @@ M.emote("shiver") if(isslime(M)) cooling = -rand(20, 25) - M.adjust_bodytemperature(cooling * TEMPERATURE_DAMAGE_COEFFICIENT * REM * delta_time, 50) + M.adjust_bodytemperature(cooling * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, 50) ..() /datum/reagent/consumable/frostoil/expose_turf(turf/exposed_turf, reac_volume) @@ -414,9 +414,9 @@ if(prob(5)) victim.vomit() -/datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) if(!holder.has_reagent(/datum/reagent/consumable/milk)) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) M.visible_message(span_warning("[M] [pick("dry heaves!","coughs!","splutters!")]")) ..() @@ -471,16 +471,16 @@ . = ..() REMOVE_TRAIT(L, TRAIT_GARLIC_BREATH, type) -/datum/reagent/consumable/garlic/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/consumable/garlic/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) if(isvampire(M)) //incapacitating but not lethal. Unfortunately, vampires cannot vomit. - if(DT_PROB(min(current_cycle/2, 12.5), delta_time)) + if(SPT_PROB(min(current_cycle/2, 12.5), seconds_per_tick)) to_chat(M, span_danger("You can't get the scent of garlic out of your nose! You can barely think...")) M.Paralyze(10) M.set_jitter_if_lower(20 SECONDS) else var/obj/item/organ/internal/liver/liver = M.get_organ_slot(ORGAN_SLOT_LIVER) if(liver && HAS_TRAIT(liver, TRAIT_CULINARY_METABOLISM)) - if(DT_PROB(10, delta_time)) //stays in the system much longer than sprinkles/banana juice, so heals slower to partially compensate + if(SPT_PROB(10, seconds_per_tick)) //stays in the system much longer than sprinkles/banana juice, so heals slower to partially compensate M.heal_bodypart_damage(brute = 1, burn = 1) . = TRUE ..() @@ -512,10 +512,10 @@ taste_description = "childhood whimsy" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) var/obj/item/organ/internal/liver/liver = M.get_organ_slot(ORGAN_SLOT_LIVER) if(liver && HAS_TRAIT(liver, TRAIT_LAW_ENFORCEMENT_METABOLISM)) - M.heal_bodypart_damage(1 * REM * delta_time, 1 * REM * delta_time, 0) + M.heal_bodypart_damage(1 * REM * seconds_per_tick, 1 * REM * seconds_per_tick, 0) . = TRUE ..() @@ -574,8 +574,8 @@ taste_description = "your imprisonment" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/carbon/M, delta_time, times_fired) - M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * delta_time, 0, M.get_body_temp_normal()) +/datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) + M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, 0, M.get_body_temp_normal()) ..() /datum/reagent/consumable/hell_ramen @@ -586,8 +586,8 @@ 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/target_mob, delta_time, times_fired) - target_mob.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * delta_time) +/datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/carbon/target_mob, seconds_per_tick, times_fired) + target_mob.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick) ..() /datum/reagent/consumable/flour @@ -673,8 +673,8 @@ taste_description = "sweet slime" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/carbon/M, delta_time, times_fired) - holder.add_reagent(/datum/reagent/consumable/sugar, 3 * REM * delta_time) +/datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) + holder.add_reagent(/datum/reagent/consumable/sugar, 3 * REM * seconds_per_tick) ..() /datum/reagent/consumable/honey @@ -698,9 +698,9 @@ mytray.adjust_weedlevel(rand(1,2)) mytray.adjust_pestlevel(rand(1,2)) -/datum/reagent/consumable/honey/on_mob_life(mob/living/carbon/M, delta_time, times_fired) - holder.add_reagent(/datum/reagent/consumable/sugar, 3 * REM * delta_time) - if(DT_PROB(33, delta_time)) +/datum/reagent/consumable/honey/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) + holder.add_reagent(/datum/reagent/consumable/sugar, 3 * REM * seconds_per_tick) + if(SPT_PROB(33, seconds_per_tick)) M.adjustBruteLoss(-1, FALSE, required_bodytype = affected_bodytype) M.adjustFireLoss(-1, FALSE, required_bodytype = affected_bodytype) M.adjustOxyLoss(-1, FALSE, required_biotype = affected_biotype) @@ -746,9 +746,9 @@ color = "#664330" // rgb: 102, 67, 48 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/nutriment/stabilized/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/consumable/nutriment/stabilized/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) if(M.nutrition > NUTRITION_LEVEL_FULL - 25) - M.adjust_nutrition(-3 * REM * nutriment_factor * delta_time) + M.adjust_nutrition(-3 * REM * nutriment_factor * seconds_per_tick) ..() ////Lavaland Flora Reagents//// @@ -762,11 +762,11 @@ ph = 12 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/entpoly/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/consumable/entpoly/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) if(current_cycle >= 10) - M.Unconscious(40 * REM * delta_time, FALSE) + M.Unconscious(40 * REM * seconds_per_tick, FALSE) . = TRUE - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) M.losebreath += 4 M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2*REM, 150, affected_biotype) M.adjustToxLoss(3*REM, FALSE, required_biotype = affected_biotype) @@ -819,8 +819,8 @@ ph = 10.4 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/vitfro/on_mob_life(mob/living/carbon/M, delta_time, times_fired) - if(DT_PROB(55, delta_time)) +/datum/reagent/consumable/vitfro/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) + if(SPT_PROB(55, seconds_per_tick)) M.adjustBruteLoss(-1, FALSE, required_bodytype = affected_bodytype) M.adjustFireLoss(-1, FALSE, required_bodytype = affected_bodytype) . = TRUE @@ -847,10 +847,10 @@ if(istype(stomach)) stomach.adjust_charge(reac_volume * 30) -/datum/reagent/consumable/liquidelectricity/enriched/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/consumable/liquidelectricity/enriched/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) if(isethereal(M)) - M.blood_volume += 1 * delta_time - else if(DT_PROB(10, delta_time)) //lmao at the newbs who eat energy bars + M.blood_volume += 1 * seconds_per_tick + else if(SPT_PROB(10, seconds_per_tick)) //lmao at the newbs who eat energy bars M.electrocute_act(rand(5,10), "Liquid Electricity in their body", 1, SHOCK_NOGLOVES) //the shock is coming from inside the house playsound(M, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) return ..() @@ -867,9 +867,9 @@ overdose_threshold = 17 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/astrotame/overdose_process(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/consumable/astrotame/overdose_process(mob/living/carbon/M, seconds_per_tick, times_fired) if(M.disgust < 80) - M.adjust_disgust(10 * REM * delta_time) + M.adjust_disgust(10 * REM * seconds_per_tick) ..() . = TRUE @@ -916,8 +916,8 @@ overdose_threshold = 15 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/char/overdose_process(mob/living/M, delta_time, times_fired) - if(DT_PROB(13, delta_time)) +/datum/reagent/consumable/char/overdose_process(mob/living/M, seconds_per_tick, times_fired) + if(SPT_PROB(13, seconds_per_tick)) M.say(pick_list_replacements(BOOMER_FILE, "boomer"), forced = /datum/reagent/consumable/char) ..() return @@ -1030,10 +1030,10 @@ 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/M, delta_time, times_fired) //ET loves peanut butter +/datum/reagent/consumable/peanut_butter/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) //ET loves peanut butter if(isabductor(M)) M.add_mood_event("ET_pieces", /datum/mood_event/et_pieces, name) - M.set_drugginess(30 SECONDS * REM * delta_time) + M.set_drugginess(30 SECONDS * REM * seconds_per_tick) ..() /datum/reagent/consumable/vinegar @@ -1100,7 +1100,7 @@ taste_description = "mint" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/consumable/mintextract/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/consumable/mintextract/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(HAS_TRAIT(affected_mob, TRAIT_FAT)) affected_mob.investigate_log("has been gibbed by consuming [src] while fat.", INVESTIGATE_DEATHS) affected_mob.inflate_gib() diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents.dm index ffe50c8b117..682ca6f9f0b 100644 --- a/code/modules/reagents/chemistry/reagents/impure_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/impure_reagents.dm @@ -14,12 +14,12 @@ 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, delta_time, times_fired) +/datum/reagent/impurity/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) var/obj/item/organ/internal/liver/L = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER) if(!L)//Though, lets be safe - affected_mob.adjustToxLoss(1 * REM * delta_time, FALSE, required_biotype = affected_biotype)//Incase of no liver! + affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype)//Incase of no liver! return ..() - affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, liver_damage * REM * delta_time, required_organtype = affected_organtype) + affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, liver_damage * REM * seconds_per_tick, required_organtype = affected_organtype) return ..() //Basically just so people don't forget to adjust metabolization_rate @@ -34,8 +34,8 @@ var/tox_damage = 1 -/datum/reagent/inverse/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustToxLoss(tox_damage * REM * delta_time, FALSE, required_biotype = affected_biotype) +/datum/reagent/inverse/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustToxLoss(tox_damage * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) return ..() //Failed chems - generally use inverse if you want to use a impure subtype for it @@ -105,7 +105,7 @@ cryostylane_alert.attached_effect = src //so the alert can reference us, if it needs to ..() -/datum/reagent/inverse/cryostylane/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/inverse/cryostylane/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(!cube || affected_mob.loc != cube) affected_mob.reagents.remove_reagent(type, volume) //remove it all if we're past 60s if(current_cycle > 60) 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 8c6155fa8b8..b4d86963167 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/owner, delta_time, times_fired) +/datum/reagent/impurity/healing/medicine_failure/on_mob_life(mob/living/carbon/owner, seconds_per_tick, times_fired) var/pick = pick("brute", "burn", "tox", "oxy") switch(pick) if("brute") @@ -57,7 +57,7 @@ metabolization_rate = 1*REM //This is fast tox_damage = 0.25 ph = 14 - //Compensates for delta_time lag by spawning multiple hands at the end + //Compensates for seconds_per_tick lag by spawning multiple hands at the end var/lag_remainder = 0 //Keeps track of the hand timer so we can cleanup on removal var/list/timer_ids @@ -71,25 +71,25 @@ //Sends hands after you for your hubris /* How it works: -Standard delta_time for a reagent is 2s - and volume consumption is equal to the volume * delta_time. +Standard seconds_per_tick for a reagent is 2s - and volume consumption is equal to the volume * seconds_per_tick. In this chem, I want to consume 0.5u for 1 hand created (since 1*REM is 0.5) so on a single tick I create a hand and set up a callback for another one in 1s from now. But since delta time can vary, I want to be able to create more hands for when the delay is longer. -Initally I round delta_time to the nearest whole number, and take the part that I am rounding down from (i.e. the decimal numbers) and keep track of them. If the decimilised numbers go over 1, then the number is reduced down and an extra hand is created that tick. +Initally I round seconds_per_tick to the nearest whole number, and take the part that I am rounding down from (i.e. the decimal numbers) and keep track of them. If the decimilised numbers go over 1, then the number is reduced down and an extra hand is created that tick. -Then I attempt to calculate the how many hands to created based off the current delta_time, since I can't know the delay to the next one it assumes the next will be in 2s. -I take the 2s interval period and divide it by the number of hands I want to make (i.e. the current delta_time) 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, delta_time, no hands will be created on the next expected tick. +Then I attempt to calculate the how many hands to created based off the current seconds_per_tick, since I can't know the delay to the next one it assumes the next will be in 2s. +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/owner, delta_time, times_fired) +/datum/reagent/inverse/helgrasp/on_mob_life(mob/living/carbon/owner, seconds_per_tick, times_fired) spawn_hands(owner) - lag_remainder += delta_time - FLOOR(delta_time, 1) - delta_time = FLOOR(delta_time, 1) + lag_remainder += seconds_per_tick - FLOOR(seconds_per_tick, 1) + seconds_per_tick = FLOOR(seconds_per_tick, 1) if(lag_remainder >= 1) - delta_time += 1 + seconds_per_tick += 1 lag_remainder -= 1 var/hands = 1 - var/time = 2 / delta_time - while(hands < delta_time) //we already made a hand now so start from 1 + var/time = 2 / seconds_per_tick + while(hands < seconds_per_tick) //we already made a hand now so start from 1 LAZYADD(timer_ids, addtimer(CALLBACK(src, PROC_REF(spawn_hands), owner), (time*hands) SECONDS, TIMER_STOPPABLE)) //keep track of all the timers we set up hands += time return ..() @@ -195,9 +195,9 @@ Basically, we fill the time between now and 2s from now with hands based off the description = "These inhibitory peptides cause cellular damage and cost nutrition to the patient!" ph = 2.1 -/datum/reagent/peptides_failed/on_mob_life(mob/living/carbon/owner, delta_time, times_fired) - owner.adjustCloneLoss(0.25 * delta_time) - owner.adjust_nutrition(-5 * REAGENTS_METABOLISM * delta_time) +/datum/reagent/peptides_failed/on_mob_life(mob/living/carbon/owner, seconds_per_tick, times_fired) + owner.adjustCloneLoss(0.25 * seconds_per_tick) + owner.adjust_nutrition(-5 * REAGENTS_METABOLISM * seconds_per_tick) . = ..() //Lenturi @@ -231,7 +231,7 @@ Basically, we fill the time between now and 2s from now with hands based off the var/spammer = 0 //Just the removed itching mechanism - omage to it's origins. -/datum/reagent/inverse/ichiyuri/on_mob_life(mob/living/carbon/owner, delta_time, times_fired) +/datum/reagent/inverse/ichiyuri/on_mob_life(mob/living/carbon/owner, seconds_per_tick, times_fired) if(prob(resetting_probability) && !(HAS_TRAIT(owner, TRAIT_RESTRAINED) || owner.incapacitated())) if(spammer < world.time) to_chat(owner,span_warning("You can't help but itch yourself.")) @@ -240,7 +240,7 @@ Basically, we fill the time between now and 2s from now with hands based off the owner.adjustBruteLoss(scab*REM) owner.bleed(scab) resetting_probability = 0 - resetting_probability += (5*(current_cycle/10) * delta_time) // 10 iterations = >51% to itch + resetting_probability += (5*(current_cycle/10) * seconds_per_tick) // 10 iterations = >51% to itch ..() return TRUE @@ -277,9 +277,9 @@ 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/owner, delta_time, times_fired) +/datum/reagent/inverse/hercuri/on_mob_life(mob/living/carbon/owner, seconds_per_tick, times_fired) . = ..() - var/heating = rand(5, 25) * creation_purity * REM * delta_time + var/heating = rand(5, 25) * creation_purity * REM * seconds_per_tick owner.reagents?.chem_temp += heating owner.adjust_bodytemperature(heating * TEMPERATURE_DAMAGE_COEFFICIENT) if(!ishuman(owner)) @@ -295,10 +295,10 @@ 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/owner, delta_time, times_fired) +/datum/reagent/inverse/hercuri/overdose_process(mob/living/carbon/owner, seconds_per_tick, times_fired) . = ..() - owner.adjustOrganLoss(ORGAN_SLOT_LIVER, 2 * REM * delta_time, required_organtype = affected_organtype) //Makes it so you can't abuse it with pyroxadone very easily (liver dies from 25u unless it's fully upgraded) - var/heating = 10 * creation_purity * REM * delta_time * TEMPERATURE_DAMAGE_COEFFICIENT + owner.adjustOrganLoss(ORGAN_SLOT_LIVER, 2 * REM * seconds_per_tick, required_organtype = affected_organtype) //Makes it so you can't abuse it with pyroxadone very easily (liver dies from 25u unless it's fully upgraded) + var/heating = 10 * creation_purity * REM * seconds_per_tick * TEMPERATURE_DAMAGE_COEFFICIENT owner.adjust_bodytemperature(heating) //hot hot if(ishuman(owner)) var/mob/living/carbon/human/human = owner @@ -314,7 +314,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/owner, delta_time, times_fired) +/datum/reagent/inverse/healing/tirimol/on_mob_life(mob/living/carbon/owner, seconds_per_tick, times_fired) switch(current_cycle) if(1 to 10)//same delay as chloral hydrate if(prob(50)) @@ -436,8 +436,8 @@ 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/owner, delta_time, times_fired) - time_until_next_poison -= delta_time * (1 SECONDS) +/datum/reagent/inverse/technetium/on_mob_life(mob/living/carbon/owner, seconds_per_tick, times_fired) + time_until_next_poison -= seconds_per_tick * (1 SECONDS) if (time_until_next_poison <= 0) time_until_next_poison = poison_interval owner.adjustToxLoss(creation_purity * 1, required_biotype = affected_biotype) @@ -489,11 +489,11 @@ 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, delta_time, times_fired) +/datum/reagent/inverse/healing/monover/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(length(affected_mob.reagents.reagent_list) > 1) - affected_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5 * delta_time, required_organtype = affected_organtype) //Hey! It's everyone's favourite drawback from multiver! + affected_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5 * seconds_per_tick, required_organtype = affected_organtype) //Hey! It's everyone's favourite drawback from multiver! return ..() - affected_mob.adjustToxLoss(-2 * REM * creation_purity * delta_time, FALSE, required_biotype = affected_biotype) + affected_mob.adjustToxLoss(-2 * REM * creation_purity * seconds_per_tick, FALSE, required_biotype = affected_biotype) ..() return TRUE @@ -523,7 +523,7 @@ Basically, we fill the time between now and 2s from now with hands based off the TRAIT_STABLEHEART, ) -/datum/reagent/inverse/penthrite/on_mob_dead(mob/living/carbon/affected_mob, delta_time) +/datum/reagent/inverse/penthrite/on_mob_dead(mob/living/carbon/affected_mob, seconds_per_tick) var/obj/item/organ/internal/heart/heart = affected_mob.get_organ_slot(ORGAN_SLOT_HEART) if(!heart || heart.organ_flags & ORGAN_FAILING) return ..() @@ -543,7 +543,7 @@ Basically, we fill the time between now and 2s from now with hands based off the affected_mob.playsound_local(affected_mob, 'sound/health/fastbeat.ogg', 65) ..() -/datum/reagent/inverse/penthrite/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/inverse/penthrite/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(!back_from_the_dead) return ..() //Following is for those brought back from the dead only @@ -551,8 +551,8 @@ Basically, we fill the time between now and 2s from now with hands based off the REMOVE_TRAIT(affected_mob, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT) for(var/datum/wound/iter_wound as anything in affected_mob.all_wounds) iter_wound.adjust_blood_flow(1-creation_purity) - affected_mob.adjustBruteLoss(5 * (1-creation_purity) * delta_time, required_bodytype = affected_bodytype) - affected_mob.adjustOrganLoss(ORGAN_SLOT_HEART, (1 + (1-creation_purity)) * delta_time, required_organtype = affected_organtype) + affected_mob.adjustBruteLoss(5 * (1-creation_purity) * seconds_per_tick, required_bodytype = affected_bodytype) + affected_mob.adjustOrganLoss(ORGAN_SLOT_HEART, (1 + (1-creation_purity)) * seconds_per_tick, required_organtype = affected_organtype) if(affected_mob.health < HEALTH_THRESHOLD_CRIT) affected_mob.add_movespeed_modifier(/datum/movespeed_modifier/reagent/nooartrium) if(affected_mob.health < HEALTH_THRESHOLD_FULLCRIT) @@ -645,11 +645,11 @@ 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, delta_time, times_fired) +/datum/reagent/inverse/neurine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) .=..() if(temp_trauma) return - if(!(DT_PROB(creation_purity*10, delta_time))) + if(!(SPT_PROB(creation_purity*10, seconds_per_tick))) return var/traumalist = subtypesof(/datum/brain_trauma) var/list/forbiddentraumas = list( @@ -756,9 +756,9 @@ 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, delta_time, times_fired) +/datum/reagent/inverse/antihol/on_mob_life(mob/living/carbon/C, seconds_per_tick, times_fired) for(var/datum/reagent/consumable/ethanol/alcohol in C.reagents.reagent_list) - alcohol.boozepwr += delta_time + alcohol.boozepwr += seconds_per_tick ..() /datum/reagent/inverse/oculine @@ -775,10 +775,10 @@ 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, delta_time, times_fired) +/datum/reagent/inverse/oculine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(headache) return ..() - if(DT_PROB(100 * creation_purity, delta_time)) + if(SPT_PROB(100 * creation_purity, seconds_per_tick)) affected_mob.become_blind(IMPURE_OCULINE) to_chat(affected_mob, span_danger("You suddenly develop a pounding headache as your vision fluxuates.")) headache = TRUE @@ -803,7 +803,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/randomSpan -/datum/reagent/impurity/inacusiate/on_mob_metabolize(mob/living/affected_mob, delta_time, times_fired) +/datum/reagent/impurity/inacusiate/on_mob_metabolize(mob/living/affected_mob, seconds_per_tick, times_fired) randomSpan = pick(list("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)) to_chat(affected_mob, span_warning("Your hearing seems to be a bit off!")) 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 81beeb2b2a9..12912b80a15 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 @@ -28,9 +28,9 @@ ph = 7 liver_damage = 0 -/datum/reagent/impurity/methanol/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/impurity/methanol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) var/obj/item/organ/internal/eyes/eyes = affected_mob.get_organ_slot(ORGAN_SLOT_EYES) - eyes?.apply_organ_damage(0.5 * REM * delta_time, required_organtype = affected_organtype) + eyes?.apply_organ_damage(0.5 * REM * seconds_per_tick, required_organtype = affected_organtype) return ..() //Chloral Hydrate - Impure Version @@ -42,8 +42,8 @@ ph = 7 liver_damage = 0 -/datum/reagent/impurity/chloralax/on_mob_life(mob/living/carbon/owner, delta_time) - owner.adjustToxLoss(1 * REM * delta_time, FALSE, required_biotype = affected_biotype) +/datum/reagent/impurity/chloralax/on_mob_life(mob/living/carbon/owner, seconds_per_tick) + owner.adjustToxLoss(1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) ..() @@ -57,13 +57,13 @@ liver_damage = 0 metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/impurity/rosenol/on_mob_life(mob/living/carbon/owner, delta_time) +/datum/reagent/impurity/rosenol/on_mob_life(mob/living/carbon/owner, seconds_per_tick) var/obj/item/organ/internal/tongue/tongue = owner.get_organ_slot(ORGAN_SLOT_TONGUE) if(!tongue) return ..() - if(DT_PROB(4.0, delta_time)) + if(SPT_PROB(4.0, seconds_per_tick)) owner.manual_emote("clicks with [owner.p_their()] tongue.") owner.say("Noice.", forced = /datum/reagent/impurity/rosenol) - if(DT_PROB(2.0, delta_time)) + if(SPT_PROB(2.0, seconds_per_tick)) owner.say(pick("Ah! That was a mistake!", "Horrible.", "Watch out everybody, the potato is really hot.", "When I was six I ate a bag of plums.", "And if there is one thing I can't stand it's tomatoes.", "And if there is one thing I love it's tomatoes.", "We had a captain who was so strict, you weren't allowed to breathe in their station.", "The unrobust ones just used to keel over and die, you'd hear them going down behind you."), forced = /datum/reagent/impurity/rosenol) ..() diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 068ba31f86d..d6be97ef69d 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -9,11 +9,11 @@ /datum/reagent/medicine taste_description = "bitterness" -/datum/reagent/medicine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) current_cycle++ if(length(reagent_removal_skip_list)) return - holder.remove_reagent(type, metabolization_rate * delta_time / affected_mob.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism + holder.remove_reagent(type, metabolization_rate * seconds_per_tick / affected_mob.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism /datum/reagent/medicine/leporazine name = "Leporazine" @@ -22,18 +22,18 @@ color = "#DB90C6" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/leporazine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/leporazine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) var/target_temp = affected_mob.get_body_temp_normal(apply_change = FALSE) if(affected_mob.bodytemperature > target_temp) - affected_mob.adjust_bodytemperature(-40 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * delta_time, target_temp) + affected_mob.adjust_bodytemperature(-40 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, target_temp) else if(affected_mob.bodytemperature < (target_temp + 1)) - affected_mob.adjust_bodytemperature(40 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * delta_time, 0, target_temp) + affected_mob.adjust_bodytemperature(40 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, 0, target_temp) if(ishuman(affected_mob)) var/mob/living/carbon/human/affected_human = affected_mob if(affected_human.coretemperature > target_temp) - affected_human.adjust_coretemperature(-40 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * delta_time, target_temp) + affected_human.adjust_coretemperature(-40 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, target_temp) else if(affected_human.coretemperature < (target_temp + 1)) - affected_human.adjust_coretemperature(40 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * delta_time, 0, target_temp) + affected_human.adjust_coretemperature(40 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, 0, target_temp) ..() /datum/reagent/medicine/adminordrazine //An OP chemical for admins @@ -66,9 +66,9 @@ if(prob(20)) mytray.visible_message(span_warning("Nothing happens...")) -/datum/reagent/medicine/adminordrazine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.heal_bodypart_damage(5 * REM * delta_time, 5 * REM * delta_time, 0, FALSE, affected_bodytype) - affected_mob.adjustToxLoss(-5 * REM * delta_time, FALSE, TRUE, affected_biotype) +/datum/reagent/medicine/adminordrazine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.heal_bodypart_damage(5 * REM * seconds_per_tick, 5 * REM * seconds_per_tick, 0, FALSE, affected_bodytype) + affected_mob.adjustToxLoss(-5 * REM * seconds_per_tick, FALSE, TRUE, affected_biotype) // Heal everything! That we want to. But really don't heal reagents. Otherwise we'll lose ... us. affected_mob.fully_heal(full_heal_flags & ~HEAL_ALL_REAGENTS) return ..() @@ -86,17 +86,17 @@ ph = 4 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_drowsiness(-10 SECONDS * REM * delta_time) - affected_mob.AdjustStun(-20 * REM * delta_time) - affected_mob.AdjustKnockdown(-20 * REM * delta_time) - affected_mob.AdjustUnconscious(-20 * REM * delta_time) - affected_mob.AdjustImmobilized(-20 * REM * delta_time) - affected_mob.AdjustParalyzed(-20 * REM * delta_time) +/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_drowsiness(-10 SECONDS * REM * seconds_per_tick) + affected_mob.AdjustStun(-20 * REM * seconds_per_tick) + affected_mob.AdjustKnockdown(-20 * REM * seconds_per_tick) + affected_mob.AdjustUnconscious(-20 * REM * seconds_per_tick) + affected_mob.AdjustImmobilized(-20 * REM * seconds_per_tick) + affected_mob.AdjustParalyzed(-20 * REM * seconds_per_tick) if(holder.has_reagent(/datum/reagent/toxin/mindbreaker)) - holder.remove_reagent(/datum/reagent/toxin/mindbreaker, 5 * REM * delta_time) - affected_mob.adjust_hallucinations(-20 SECONDS * REM * delta_time) - if(DT_PROB(16, delta_time)) + holder.remove_reagent(/datum/reagent/toxin/mindbreaker, 5 * REM * seconds_per_tick) + affected_mob.adjust_hallucinations(-20 SECONDS * REM * seconds_per_tick) + if(SPT_PROB(16, seconds_per_tick)) affected_mob.adjustToxLoss(1, FALSE, required_biotype = affected_biotype) . = TRUE ..() @@ -108,14 +108,14 @@ ph = 5.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/synaphydramine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_drowsiness(-10 SECONDS * REM * delta_time) +/datum/reagent/medicine/synaphydramine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_drowsiness(-10 SECONDS * REM * seconds_per_tick) if(holder.has_reagent(/datum/reagent/toxin/mindbreaker)) - holder.remove_reagent(/datum/reagent/toxin/mindbreaker, 5 * REM * delta_time) + holder.remove_reagent(/datum/reagent/toxin/mindbreaker, 5 * REM * seconds_per_tick) if(holder.has_reagent(/datum/reagent/toxin/histamine)) - holder.remove_reagent(/datum/reagent/toxin/histamine, 5 * REM * delta_time) - affected_mob.adjust_hallucinations(-20 SECONDS * REM * delta_time) - if(DT_PROB(16, delta_time)) + holder.remove_reagent(/datum/reagent/toxin/histamine, 5 * REM * seconds_per_tick) + affected_mob.adjust_hallucinations(-20 SECONDS * REM * seconds_per_tick) + if(SPT_PROB(16, seconds_per_tick)) affected_mob.adjustToxLoss(1, FALSE, required_biotype = affected_biotype) . = TRUE ..() @@ -130,20 +130,20 @@ burning_volume = 0.1 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) metabolization_rate = REAGENTS_METABOLISM * (0.00001 * (affected_mob.bodytemperature ** 2) + 0.5) if(affected_mob.bodytemperature >= T0C || !HAS_TRAIT(affected_mob, TRAIT_KNOCKEDOUT)) ..() return var/power = -0.00003 * (affected_mob.bodytemperature ** 2) + 3 - affected_mob.adjustOxyLoss(-3 * power * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - affected_mob.adjustBruteLoss(-power * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustFireLoss(-power * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustToxLoss(-power * REM * delta_time, FALSE, TRUE, affected_biotype) //heals TOXINLOVERs - affected_mob.adjustCloneLoss(-power * REM * delta_time, FALSE, affected_biotype) + affected_mob.adjustOxyLoss(-3 * power * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustBruteLoss(-power * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustFireLoss(-power * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustToxLoss(-power * REM * seconds_per_tick, FALSE, TRUE, affected_biotype) //heals TOXINLOVERs + affected_mob.adjustCloneLoss(-power * REM * seconds_per_tick, FALSE, affected_biotype) for(var/i in affected_mob.all_wounds) var/datum/wound/iter_wound = i - iter_wound.on_xadone(power * REM * delta_time) + iter_wound.on_xadone(power * REM * seconds_per_tick) REMOVE_TRAIT(affected_mob, TRAIT_DISFIGURED, TRAIT_GENERIC) //fixes common causes for disfiguration ..() return TRUE @@ -164,9 +164,9 @@ ph = 13 metabolization_rate = 1.5 * REAGENTS_METABOLISM -/datum/reagent/medicine/clonexadone/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/clonexadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(affected_mob.bodytemperature < T0C) - affected_mob.adjustCloneLoss((0.00006 * (affected_mob.bodytemperature ** 2) - 6) * REM * delta_time, FALSE) + affected_mob.adjustCloneLoss((0.00006 * (affected_mob.bodytemperature ** 2) - 6) * REM * seconds_per_tick, FALSE) REMOVE_TRAIT(affected_mob, TRAIT_DISFIGURED, TRAIT_GENERIC) . = TRUE metabolization_rate = REAGENTS_METABOLISM * (0.000015 * (affected_mob.bodytemperature ** 2) + 0.75) @@ -180,7 +180,7 @@ ph = 12 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/pyroxadone/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/pyroxadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(affected_mob.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT) var/power = 0 switch(affected_mob.bodytemperature) @@ -193,14 +193,14 @@ if(affected_mob.on_fire) power *= 2 - affected_mob.adjustOxyLoss(-2 * power * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - affected_mob.adjustBruteLoss(-power * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustFireLoss(-1.5 * power * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustToxLoss(-power * REM * delta_time, FALSE, TRUE, affected_biotype) - affected_mob.adjustCloneLoss(-power * REM * delta_time, FALSE, required_biotype = affected_biotype) + affected_mob.adjustOxyLoss(-2 * power * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustBruteLoss(-power * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustFireLoss(-1.5 * power * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustToxLoss(-power * REM * seconds_per_tick, FALSE, TRUE, affected_biotype) + affected_mob.adjustCloneLoss(-power * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) for(var/i in affected_mob.all_wounds) var/datum/wound/iter_wound = i - iter_wound.on_xadone(power * REM * delta_time) + iter_wound.on_xadone(power * REM * seconds_per_tick) REMOVE_TRAIT(affected_mob, TRAIT_DISFIGURED, TRAIT_GENERIC) . = TRUE ..() @@ -215,17 +215,17 @@ taste_description = "fish" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/rezadone/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/rezadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) affected_mob.setCloneLoss(0) //Rezadone is almost never used in favor of cryoxadone. Hopefully this will change that. // No such luck so far - affected_mob.heal_bodypart_damage(1 * REM * delta_time, 1 * REM * delta_time) + affected_mob.heal_bodypart_damage(1 * REM * seconds_per_tick, 1 * REM * seconds_per_tick) REMOVE_TRAIT(affected_mob, TRAIT_DISFIGURED, TRAIT_GENERIC) ..() . = TRUE -/datum/reagent/medicine/rezadone/overdose_process(mob/living/affected_mob, delta_time, times_fired) - affected_mob.adjustToxLoss(1 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.set_dizzy_if_lower(10 SECONDS * REM * delta_time) - affected_mob.set_jitter_if_lower(10 SECONDS * REM * delta_time) +/datum/reagent/medicine/rezadone/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.set_dizzy_if_lower(10 SECONDS * REM * seconds_per_tick) + affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick) ..() . = TRUE @@ -264,17 +264,17 @@ ph = 10.7 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/oxandrolone/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/oxandrolone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(affected_mob.getFireLoss() > 25) - affected_mob.adjustFireLoss(-4 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) //Twice as effective as AIURI for severe burns + affected_mob.adjustFireLoss(-4 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) //Twice as effective as AIURI for severe burns else - affected_mob.adjustFireLoss(-0.5 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) //But only a quarter as effective for more minor ones + affected_mob.adjustFireLoss(-0.5 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) //But only a quarter as effective for more minor ones ..() . = TRUE -/datum/reagent/medicine/oxandrolone/overdose_process(mob/living/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/oxandrolone/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) if(affected_mob.getFireLoss()) //It only makes existing burns worse - affected_mob.adjustFireLoss(4.5 * REM * delta_time, FALSE, FALSE, BODYTYPE_ORGANIC) // it's going to be healing either 4 or 0.5 + affected_mob.adjustFireLoss(4.5 * REM * seconds_per_tick, FALSE, FALSE, BODYTYPE_ORGANIC) // it's going to be healing either 4 or 0.5 . = TRUE ..() @@ -292,7 +292,7 @@ ph = 5.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(last_added) affected_mob.blood_volume -= last_added last_added = 0 @@ -300,23 +300,23 @@ var/amount_to_add = min(affected_mob.blood_volume, 5*volume) var/new_blood_level = min(affected_mob.blood_volume + amount_to_add, maximum_reachable) last_added = new_blood_level - affected_mob.blood_volume - affected_mob.blood_volume = new_blood_level + (extra_regen * REM * delta_time) - if(DT_PROB(18, delta_time)) + affected_mob.blood_volume = new_blood_level + (extra_regen * REM * seconds_per_tick) + if(SPT_PROB(18, seconds_per_tick)) affected_mob.adjustBruteLoss(-0.5, FALSE, required_bodytype = affected_bodytype) affected_mob.adjustFireLoss(-0.5, FALSE, required_bodytype = affected_bodytype) . = TRUE ..() -/datum/reagent/medicine/salglu_solution/overdose_process(mob/living/affected_mob, delta_time, times_fired) - if(DT_PROB(1.5, delta_time)) +/datum/reagent/medicine/salglu_solution/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(1.5, seconds_per_tick)) to_chat(affected_mob, span_warning("You feel salty.")) holder.add_reagent(/datum/reagent/consumable/salt, 1) holder.remove_reagent(/datum/reagent/medicine/salglu_solution, 0.5) - else if(DT_PROB(1.5, delta_time)) + else if(SPT_PROB(1.5, seconds_per_tick)) to_chat(affected_mob, span_warning("You feel sweet.")) holder.add_reagent(/datum/reagent/consumable/sugar, 1) holder.remove_reagent(/datum/reagent/medicine/salglu_solution, 0.5) - if(DT_PROB(18, delta_time)) + if(SPT_PROB(18, seconds_per_tick)) affected_mob.adjustBruteLoss(0.5, FALSE, FALSE, BODYTYPE_ORGANIC) affected_mob.adjustFireLoss(0.5, FALSE, FALSE, BODYTYPE_ORGANIC) . = TRUE @@ -331,9 +331,9 @@ ph = 2.6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustBruteLoss(-0.25 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustFireLoss(-0.25 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) +/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustBruteLoss(-0.25 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustFireLoss(-0.25 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) ..() return TRUE @@ -376,19 +376,19 @@ ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/omnizine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustToxLoss(-healing * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjustOxyLoss(-healing * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - affected_mob.adjustBruteLoss(-healing * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustFireLoss(-healing * REM * delta_time, FALSE, required_bodytype = affected_bodytype) +/datum/reagent/medicine/omnizine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustToxLoss(-healing * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjustOxyLoss(-healing * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustBruteLoss(-healing * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustFireLoss(-healing * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) ..() . = TRUE -/datum/reagent/medicine/omnizine/overdose_process(mob/living/affected_mob, delta_time, times_fired) - affected_mob.adjustToxLoss(1.5 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjustOxyLoss(1.5 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - affected_mob.adjustBruteLoss(1.5 * REM * delta_time, FALSE, FALSE, BODYTYPE_ORGANIC) - affected_mob.adjustFireLoss(1.5 * REM * delta_time, FALSE, FALSE, BODYTYPE_ORGANIC) +/datum/reagent/medicine/omnizine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustToxLoss(1.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjustOxyLoss(1.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustBruteLoss(1.5 * REM * seconds_per_tick, FALSE, FALSE, BODYTYPE_ORGANIC) + affected_mob.adjustFireLoss(1.5 * REM * seconds_per_tick, FALSE, FALSE, BODYTYPE_ORGANIC) ..() . = TRUE @@ -411,20 +411,20 @@ ph = 1.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/calomel/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/calomel/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) for(var/datum/reagent/target_reagent in affected_mob.reagents.reagent_list) if(istype(target_reagent, /datum/reagent/medicine/calomel)) continue - affected_mob.reagents.remove_reagent(target_reagent.type, 3 * REM * delta_time) + affected_mob.reagents.remove_reagent(target_reagent.type, 3 * REM * seconds_per_tick) var/toxin_amount = round(affected_mob.health / 40, 0.1) - affected_mob.adjustToxLoss(toxin_amount * REM * delta_time, FALSE, required_biotype = affected_biotype) + affected_mob.adjustToxLoss(toxin_amount * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) ..() return TRUE -/datum/reagent/medicine/calomel/overdose_process(mob/living/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/calomel/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) for(var/datum/reagent/medicine/calomel/target_reagent in affected_mob.reagents.reagent_list) - affected_mob.reagents.remove_reagent(target_reagent.type, 2 * REM * delta_time) - affected_mob.adjustToxLoss(2.5 * REM * delta_time, FALSE, required_biotype = affected_biotype) + affected_mob.reagents.remove_reagent(target_reagent.type, 2 * REM * seconds_per_tick) + affected_mob.adjustToxLoss(2.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) ..() return TRUE @@ -441,21 +441,21 @@ ph = 7 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/ammoniated_mercury/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/ammoniated_mercury/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) var/toxin_chem_amount = 0 for(var/datum/reagent/toxin/target_reagent in affected_mob.reagents.reagent_list) toxin_chem_amount += 1 - affected_mob.reagents.remove_reagent(target_reagent.type, 5 * REM * delta_time) + affected_mob.reagents.remove_reagent(target_reagent.type, 5 * REM * seconds_per_tick) var/toxin_amount = round(affected_mob.getBruteLoss() / 15, 0.1) + round(affected_mob.getFireLoss() / 30, 0.1) - 3 - affected_mob.adjustToxLoss(toxin_amount * REM * delta_time, FALSE, required_biotype = affected_biotype) + affected_mob.adjustToxLoss(toxin_amount * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) if(toxin_chem_amount == 0) 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 * delta_time) + affected_mob.reagents.remove_reagent(target_reagent.type, 1 * REM * seconds_per_tick) ..() return TRUE -/datum/reagent/medicine/ammoniated_mercury/overdose_process(mob/living/affected_mob, delta_time, times_fired) - affected_mob.adjustToxLoss(3 * REM * delta_time, FALSE, required_biotype = affected_biotype) +/datum/reagent/medicine/ammoniated_mercury/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustToxLoss(3 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) ..() return TRUE @@ -476,9 +476,9 @@ REMOVE_TRAIT(affected_mob, TRAIT_HALT_RADIATION_EFFECTS, "[type]") return ..() -/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if (HAS_TRAIT(affected_mob, TRAIT_IRRADIATED)) - affected_mob.adjustToxLoss(-1 * REM * delta_time, required_biotype = affected_biotype) + affected_mob.adjustToxLoss(-1 * REM * seconds_per_tick, required_biotype = affected_biotype) ..() @@ -499,11 +499,11 @@ REMOVE_TRAIT(affected_mob, TRAIT_HALT_RADIATION_EFFECTS, "[type]") return ..() -/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustToxLoss(-2 * REM * delta_time, FALSE, required_biotype = affected_biotype) +/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustToxLoss(-2 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) for(var/datum/reagent/R in affected_mob.reagents.reagent_list) if(R != src) - affected_mob.reagents.remove_reagent(R.type, 2 * REM * delta_time) + affected_mob.reagents.remove_reagent(R.type, 2 * REM * seconds_per_tick) ..() . = TRUE @@ -517,17 +517,17 @@ ph = 2.1 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(affected_mob.getBruteLoss() > 25) - affected_mob.adjustBruteLoss(-4 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustBruteLoss(-4 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) else - affected_mob.adjustBruteLoss(-0.5 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustBruteLoss(-0.5 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) ..() . = TRUE -/datum/reagent/medicine/sal_acid/overdose_process(mob/living/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/sal_acid/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) if(affected_mob.getBruteLoss()) //It only makes existing bruises worse - affected_mob.adjustBruteLoss(4.5 * REM * delta_time, FALSE, FALSE, BODYTYPE_ORGANIC) // it's going to be healing either 4 or 0.5 + affected_mob.adjustBruteLoss(4.5 * REM * seconds_per_tick, FALSE, FALSE, BODYTYPE_ORGANIC) // it's going to be healing either 4 or 0.5 . = TRUE ..() @@ -540,13 +540,13 @@ ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustOxyLoss(-3 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) +/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustOxyLoss(-3 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) if(affected_mob.losebreath >= 4) var/obj/item/organ/internal/lungs/affected_lungs = affected_mob.get_organ_slot(ORGAN_SLOT_LUNGS) var/our_respiration_type = affected_lungs ? affected_lungs.respiration_type : affected_mob.mob_respiration_type // use lungs' respiration type or mob_respiration_type if no lungs if(our_respiration_type & affected_respiration_type) - affected_mob.losebreath -= 2 * REM * delta_time + affected_mob.losebreath -= 2 * REM * seconds_per_tick ..() . = TRUE @@ -574,29 +574,29 @@ REMOVE_TRAIT(affected_mob, TRAIT_BATON_RESISTANCE, type) ..() -/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(DT_PROB(10 * (1-creation_purity), delta_time) && iscarbon(affected_mob)) +/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(10 * (1-creation_purity), seconds_per_tick) && iscarbon(affected_mob)) var/obj/item/I = affected_mob.get_active_held_item() if(I && affected_mob.dropItemToGround(I)) to_chat(affected_mob, span_notice("Your hands spaz out and you drop what you were holding!")) affected_mob.set_jitter_if_lower(20 SECONDS) - affected_mob.AdjustAllImmobility(-20 * REM * delta_time * normalise_creation_purity()) - affected_mob.adjustStaminaLoss(-1 * REM * delta_time * normalise_creation_purity(), FALSE) + affected_mob.AdjustAllImmobility(-20 * REM * seconds_per_tick * normalise_creation_purity()) + affected_mob.adjustStaminaLoss(-1 * REM * seconds_per_tick * normalise_creation_purity(), FALSE) ..() return TRUE -/datum/reagent/medicine/ephedrine/overdose_process(mob/living/affected_mob, delta_time, times_fired) - if(DT_PROB(1 * (1 + (1-normalise_creation_purity())), delta_time) && iscarbon(affected_mob)) +/datum/reagent/medicine/ephedrine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(1 * (1 + (1-normalise_creation_purity())), seconds_per_tick) && iscarbon(affected_mob)) var/datum/disease/D = new /datum/disease/heart_failure affected_mob.ForceContractDisease(D) to_chat(affected_mob, span_userdanger("You're pretty sure you just felt your heart stop for a second there..")) affected_mob.playsound_local(affected_mob, 'sound/effects/singlebeat.ogg', 100, 0) - if(DT_PROB(3.5 * (1 + (1-normalise_creation_purity())), delta_time)) + if(SPT_PROB(3.5 * (1 + (1-normalise_creation_purity())), seconds_per_tick)) to_chat(affected_mob, span_notice("[pick("Your head pounds.", "You feel a tight pain in your chest.", "You find it hard to stay still.", "You feel your heart practically beating out of your chest.")]")) - if(DT_PROB(18 * (1 + (1-normalise_creation_purity())), delta_time)) + if(SPT_PROB(18 * (1 + (1-normalise_creation_purity())), seconds_per_tick)) affected_mob.adjustToxLoss(1, FALSE, required_biotype = affected_biotype) affected_mob.losebreath++ . = TRUE @@ -611,11 +611,11 @@ ph = 11.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(DT_PROB(5, delta_time)) +/datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.adjust_drowsiness(2 SECONDS) - affected_mob.adjust_jitter(-2 SECONDS * REM * delta_time) - holder.remove_reagent(/datum/reagent/toxin/histamine, 3 * REM * delta_time) + affected_mob.adjust_jitter(-2 SECONDS * REM * seconds_per_tick) + holder.remove_reagent(/datum/reagent/toxin/histamine, 3 * REM * seconds_per_tick) ..() /datum/reagent/medicine/morphine @@ -641,21 +641,21 @@ affected_mob.clear_alert("numbed") // SKYRAT EDIT ADD END ..() -/datum/reagent/medicine/morphine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/morphine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(current_cycle >= 5) affected_mob.add_mood_event("numb", /datum/mood_event/narcotic_medium, name) switch(current_cycle) if(11) to_chat(affected_mob, span_warning("You start to feel tired...") ) if(12 to 24) - affected_mob.adjust_drowsiness(2 SECONDS * REM * delta_time) + affected_mob.adjust_drowsiness(2 SECONDS * REM * seconds_per_tick) if(24 to INFINITY) - affected_mob.Sleeping(40 * REM * delta_time) + affected_mob.Sleeping(40 * REM * seconds_per_tick) . = TRUE ..() -/datum/reagent/medicine/morphine/overdose_process(mob/living/affected_mob, delta_time, times_fired) - if(DT_PROB(18, delta_time)) +/datum/reagent/medicine/morphine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(18, seconds_per_tick)) affected_mob.drop_all_held_items() affected_mob.set_dizzy_if_lower(4 SECONDS) affected_mob.set_jitter_if_lower(4 SECONDS) @@ -710,16 +710,16 @@ var/obj/item/organ/internal/eyes/eyes = organ restore_eyesight(prev_affected_mob, eyes) -/datum/reagent/medicine/oculine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/oculine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) var/normalized_purity = normalise_creation_purity() - affected_mob.adjust_temp_blindness(-4 SECONDS * REM * delta_time * normalized_purity) - affected_mob.adjust_eye_blur(-4 SECONDS * REM * delta_time * normalized_purity) + affected_mob.adjust_temp_blindness(-4 SECONDS * REM * seconds_per_tick * normalized_purity) + affected_mob.adjust_eye_blur(-4 SECONDS * REM * seconds_per_tick * normalized_purity) var/obj/item/organ/internal/eyes/eyes = affected_mob.get_organ_slot(ORGAN_SLOT_EYES) if(eyes) // Healing eye damage will cure nearsightedness and blindness from ... eye damage - eyes.apply_organ_damage(-2 * REM * delta_time * normalise_creation_purity(), required_organtype = affected_organtype) + eyes.apply_organ_damage(-2 * REM * seconds_per_tick * normalise_creation_purity(), required_organtype = affected_organtype) // If our eyes are seriously damaged, we have a probability of causing eye blur while healing depending on purity - if(eyes.damaged && DT_PROB(16 - min(normalized_purity * 6, 12), delta_time)) + if(eyes.damaged && SPT_PROB(16 - min(normalized_purity * 6, 12), seconds_per_tick)) // While healing, gives some eye blur if(affected_mob.is_blind_from(EYE_DAMAGE)) to_chat(affected_mob, span_warning("Your vision slowly returns...")) @@ -762,11 +762,11 @@ if(message_mods[WHISPER_MODE]) message = composer.compose_message(affected_mob, message_language, message, null, spans, message_mods) -/datum/reagent/medicine/inacusiate/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/inacusiate/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) var/obj/item/organ/internal/ears/ears = affected_mob.get_organ_slot(ORGAN_SLOT_EARS) if(!ears) return ..() - ears.adjustEarDamage(-4 * REM * delta_time * normalise_creation_purity(), -4 * REM * delta_time * normalise_creation_purity()) + ears.adjustEarDamage(-4 * REM * seconds_per_tick * normalise_creation_purity(), -4 * REM * seconds_per_tick * normalise_creation_purity()) ..() /datum/reagent/medicine/inacusiate/on_mob_delete(mob/living/affected_mob) @@ -791,27 +791,27 @@ REMOVE_TRAIT(affected_mob, TRAIT_PREVENT_IMPLANT_AUTO_EXPLOSION, "[type]") return ..() -/datum/reagent/medicine/atropine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/atropine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(affected_mob.health <= affected_mob.crit_threshold) - affected_mob.adjustToxLoss(-2 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjustBruteLoss(-2* REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustFireLoss(-2 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustOxyLoss(-5 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustToxLoss(-2 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjustBruteLoss(-2* REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustFireLoss(-2 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustOxyLoss(-5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) . = TRUE var/obj/item/organ/internal/lungs/affected_lungs = affected_mob.get_organ_slot(ORGAN_SLOT_LUNGS) var/our_respiration_type = affected_lungs ? affected_lungs.respiration_type : affected_mob.mob_respiration_type if(our_respiration_type & affected_respiration_type) affected_mob.losebreath = 0 - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) 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, delta_time, times_fired) - affected_mob.adjustToxLoss(0.5 * REM * delta_time, FALSE, required_biotype = affected_biotype) +/datum/reagent/medicine/atropine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustToxLoss(0.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) . = TRUE - affected_mob.set_dizzy_if_lower(2 SECONDS * REM * delta_time) - affected_mob.set_jitter_if_lower(2 SECONDS * REM * delta_time) + affected_mob.set_dizzy_if_lower(2 SECONDS * REM * seconds_per_tick) + affected_mob.set_jitter_if_lower(2 SECONDS * REM * seconds_per_tick) ..() /datum/reagent/medicine/epinephrine @@ -832,34 +832,34 @@ REMOVE_TRAIT(affected_mob, TRAIT_NOCRITDAMAGE, type) ..() -/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = TRUE if(holder.has_reagent(/datum/reagent/toxin/lexorin)) - holder.remove_reagent(/datum/reagent/toxin/lexorin, 2 * REM * delta_time) - holder.remove_reagent(/datum/reagent/medicine/epinephrine, 1 * REM * delta_time) - if(DT_PROB(10, delta_time)) + holder.remove_reagent(/datum/reagent/toxin/lexorin, 2 * REM * seconds_per_tick) + holder.remove_reagent(/datum/reagent/medicine/epinephrine, 1 * REM * seconds_per_tick) + if(SPT_PROB(10, seconds_per_tick)) holder.add_reagent(/datum/reagent/toxin/histamine, 4) ..() return if(affected_mob.health <= affected_mob.crit_threshold) - affected_mob.adjustToxLoss(-0.5 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjustBruteLoss(-0.5 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustFireLoss(-0.5 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustOxyLoss(-0.5 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustToxLoss(-0.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjustBruteLoss(-0.5 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustFireLoss(-0.5 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustOxyLoss(-0.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) if(affected_mob.losebreath >= 4) var/obj/item/organ/internal/lungs/affected_lungs = affected_mob.get_organ_slot(ORGAN_SLOT_LUNGS) var/our_respiration_type = affected_lungs ? affected_lungs.respiration_type : affected_mob.mob_respiration_type if(our_respiration_type & affected_respiration_type) - affected_mob.losebreath -= 2 * REM * delta_time + affected_mob.losebreath -= 2 * REM * seconds_per_tick if(affected_mob.losebreath < 0) affected_mob.losebreath = 0 - affected_mob.adjustStaminaLoss(-0.5 * REM * delta_time, 0) - if(DT_PROB(10, delta_time)) + affected_mob.adjustStaminaLoss(-0.5 * REM * seconds_per_tick, 0) + if(SPT_PROB(10, seconds_per_tick)) affected_mob.AdjustAllImmobility(-20) ..() -/datum/reagent/medicine/epinephrine/overdose_process(mob/living/affected_mob, delta_time, times_fired) - if(DT_PROB(18, REM * delta_time)) +/datum/reagent/medicine/epinephrine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(18, REM * seconds_per_tick)) affected_mob.adjustStaminaLoss(2.5, 0) affected_mob.adjustToxLoss(1, FALSE, required_biotype = affected_biotype) var/obj/item/organ/internal/lungs/affected_lungs = affected_mob.get_organ_slot(ORGAN_SLOT_LUNGS) @@ -970,10 +970,10 @@ return ..() -/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) var/damage_at_random = rand(0, 250)/100 //0 to 2.5 - affected_mob.adjustBruteLoss(damage_at_random * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustFireLoss(damage_at_random * REM * delta_time, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustBruteLoss(damage_at_random * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustFireLoss(damage_at_random * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) return ..() /datum/reagent/medicine/mannitol @@ -988,8 +988,8 @@ inverse_chem = /datum/reagent/inverse inverse_chem_val = 0.45 -/datum/reagent/medicine/mannitol/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, -2 * REM * delta_time * normalise_creation_purity(), required_organtype = affected_organtype) +/datum/reagent/medicine/mannitol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, -2 * REM * seconds_per_tick * normalise_creation_purity(), required_organtype = affected_organtype) ..() //Having mannitol in you will pause the brain damage from brain tumor (so it heals an even 2 brain damage instead of 1.8) @@ -1004,13 +1004,13 @@ /datum/reagent/medicine/mannitol/overdose_start(mob/living/affected_mob) 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, delta_time, times_fired) - if(DT_PROB(65, delta_time)) +/datum/reagent/medicine/mannitol/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(65, seconds_per_tick)) return var/list/tips - if(DT_PROB(50, delta_time)) + if(SPT_PROB(50, seconds_per_tick)) tips = world.file2list("strings/tips.txt") - if(DT_PROB(50, delta_time)) + if(SPT_PROB(50, seconds_per_tick)) tips = world.file2list("strings/sillytips.txt") else tips = world.file2list("strings/chemistrytips.txt") @@ -1047,15 +1047,15 @@ if(initial_bdamage < affected_carbon.get_organ_loss(ORGAN_SLOT_BRAIN)) affected_carbon.setOrganLoss(ORGAN_SLOT_BRAIN, initial_bdamage) -/datum/reagent/medicine/neurine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/neurine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(holder.has_reagent(/datum/reagent/consumable/ethanol/neurotoxin)) - holder.remove_reagent(/datum/reagent/consumable/ethanol/neurotoxin, 5 * REM * delta_time * normalise_creation_purity()) - if(DT_PROB(8 * normalise_creation_purity(), delta_time)) + holder.remove_reagent(/datum/reagent/consumable/ethanol/neurotoxin, 5 * REM * seconds_per_tick * normalise_creation_purity()) + if(SPT_PROB(8 * normalise_creation_purity(), seconds_per_tick)) affected_mob.cure_trauma_type(resilience = TRAUMA_RESILIENCE_BASIC) ..() -/datum/reagent/medicine/neurine/on_mob_dead(mob/living/carbon/affected_mob, delta_time) - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1 * REM * delta_time * normalise_creation_purity(), required_organtype = affected_organtype) +/datum/reagent/medicine/neurine/on_mob_dead(mob/living/carbon/affected_mob, seconds_per_tick) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1 * REM * seconds_per_tick * normalise_creation_purity(), required_organtype = affected_organtype) ..() /datum/reagent/medicine/mutadone @@ -1066,7 +1066,7 @@ ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) affected_mob.remove_status_effect(/datum/status_effect/jitter) if(affected_mob.has_dna()) affected_mob.dna.remove_all_mutations(list(MUT_NORMAL, MUT_EXTRA), TRUE) @@ -1092,12 +1092,12 @@ /datum/status_effect/speech/slurring/drunk, ) -/datum/reagent/medicine/antihol/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/antihol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) for(var/effect in status_effects_to_clear) affected_mob.remove_status_effect(effect) - affected_mob.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 3 * REM * delta_time * normalise_creation_purity(), FALSE, TRUE) - affected_mob.adjustToxLoss(-0.2 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjust_drunk_effect(-10 * REM * delta_time * normalise_creation_purity()) + affected_mob.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 3 * REM * seconds_per_tick * normalise_creation_purity(), FALSE, TRUE) + affected_mob.adjustToxLoss(-0.2 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjust_drunk_effect(-10 * REM * seconds_per_tick * normalise_creation_purity()) ..() . = TRUE @@ -1121,19 +1121,19 @@ REMOVE_TRAIT(affected_mob, TRAIT_BATON_RESISTANCE, type) ..() -/datum/reagent/medicine/stimulants/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/stimulants/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(affected_mob.health < 50 && affected_mob.health > 0) - affected_mob.adjustOxyLoss(-1 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - affected_mob.adjustToxLoss(-1 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjustBruteLoss(-1 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustFireLoss(-1 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.AdjustAllImmobility(-60 * REM * delta_time) - affected_mob.adjustStaminaLoss(-5 * REM * delta_time, FALSE, required_biotype = affected_biotype) + affected_mob.adjustOxyLoss(-1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustToxLoss(-1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjustBruteLoss(-1 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustFireLoss(-1 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.AdjustAllImmobility(-60 * REM * seconds_per_tick) + affected_mob.adjustStaminaLoss(-5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) ..() . = TRUE -/datum/reagent/medicine/stimulants/overdose_process(mob/living/affected_mob, delta_time, times_fired) - if(DT_PROB(18, delta_time)) +/datum/reagent/medicine/stimulants/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(18, seconds_per_tick)) affected_mob.adjustStaminaLoss(2.5, FALSE, required_biotype = affected_biotype) affected_mob.adjustToxLoss(1, FALSE, required_biotype = affected_biotype) affected_mob.losebreath++ @@ -1149,10 +1149,10 @@ ph = 6.7 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/insulin/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(affected_mob.AdjustSleeping(-20 * REM * delta_time)) +/datum/reagent/medicine/insulin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(affected_mob.AdjustSleeping(-20 * REM * seconds_per_tick)) . = TRUE - holder.remove_reagent(/datum/reagent/consumable/sugar, 3 * REM * delta_time) + holder.remove_reagent(/datum/reagent/consumable/sugar, 3 * REM * seconds_per_tick) ..() //Trek Chems, used primarily by medibots. Only heals a specific damage type, but is very efficient. @@ -1165,9 +1165,9 @@ ph = 8.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(affected_mob.losebreath >= 5) - affected_mob.losebreath -= 5 * REM * delta_time + affected_mob.losebreath -= 5 * REM * seconds_per_tick ..() /datum/reagent/medicine/regen_jelly @@ -1193,11 +1193,11 @@ exposed_human.update_mutant_bodyparts(force_update=TRUE) // SKYRAT EDIT END -/datum/reagent/medicine/regen_jelly/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustBruteLoss(-1.5 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustFireLoss(-1.5 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustOxyLoss(-1.5 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - affected_mob.adjustToxLoss(-1.5 * REM * delta_time, FALSE, TRUE, affected_biotype) //heals TOXINLOVERs +/datum/reagent/medicine/regen_jelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustBruteLoss(-1.5 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustFireLoss(-1.5 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustOxyLoss(-1.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustToxLoss(-1.5 * REM * seconds_per_tick, FALSE, TRUE, affected_biotype) //heals TOXINLOVERs ..() . = TRUE @@ -1210,18 +1210,18 @@ 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, delta_time, times_fired) - affected_mob.adjustBruteLoss(-5 * REM * delta_time, FALSE) //A ton of healing - this is a 50 telecrystal investment. - affected_mob.adjustFireLoss(-5 * REM * delta_time, FALSE) - affected_mob.adjustOxyLoss(-15 * REM * delta_time, FALSE) - affected_mob.adjustToxLoss(-5 * REM * delta_time, FALSE) - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, -15 * REM * delta_time) - affected_mob.adjustCloneLoss(-3 * REM * delta_time, FALSE) +/datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustBruteLoss(-5 * REM * seconds_per_tick, FALSE) //A ton of healing - this is a 50 telecrystal investment. + affected_mob.adjustFireLoss(-5 * REM * seconds_per_tick, FALSE) + affected_mob.adjustOxyLoss(-15 * REM * seconds_per_tick, FALSE) + affected_mob.adjustToxLoss(-5 * REM * seconds_per_tick, FALSE) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, -15 * REM * seconds_per_tick) + affected_mob.adjustCloneLoss(-3 * REM * seconds_per_tick, FALSE) ..() . = TRUE -/datum/reagent/medicine/syndicate_nanites/overdose_process(mob/living/carbon/affected_mob, delta_time, times_fired) //wtb flavortext messages that hint that you're vomitting up robots - if(DT_PROB(13, delta_time)) +/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 + 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 affected_mob.vomit(20) // nanite safety protocols make your body expel them to prevent harmies ..() @@ -1237,27 +1237,27 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED addiction_types = list(/datum/addiction/hallucinogens = 14) -/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(current_cycle <= 25) //10u has to be processed before u get into THE FUN ZONE - affected_mob.adjustBruteLoss(-1 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustFireLoss(-1 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustOxyLoss(-0.5 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - affected_mob.adjustToxLoss(-0.5 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjustCloneLoss(-0.1 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjustStaminaLoss(-0.5 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1 * REM * delta_time, 150, affected_organtype) //This does, after all, come from ambrosia, and the most powerful ambrosia in existence, at that! + affected_mob.adjustBruteLoss(-1 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustFireLoss(-1 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustOxyLoss(-0.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustToxLoss(-0.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjustCloneLoss(-0.1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjustStaminaLoss(-0.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1 * REM * seconds_per_tick, 150, affected_organtype) //This does, after all, come from ambrosia, and the most powerful ambrosia in existence, at that! else - affected_mob.adjustBruteLoss(-5 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) //slow to start, but very quick healing once it gets going - affected_mob.adjustFireLoss(-5 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustOxyLoss(-3 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - affected_mob.adjustToxLoss(-3 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjustCloneLoss(-1 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjustStaminaLoss(-3 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjust_jitter_up_to(6 SECONDS * REM * delta_time, 1 MINUTES) - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2 * REM * delta_time, 150, affected_organtype) - if(DT_PROB(5, delta_time)) + affected_mob.adjustBruteLoss(-5 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) //slow to start, but very quick healing once it gets going + affected_mob.adjustFireLoss(-5 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustOxyLoss(-3 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustToxLoss(-3 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjustCloneLoss(-1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjustStaminaLoss(-3 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjust_jitter_up_to(6 SECONDS * REM * seconds_per_tick, 1 MINUTES) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2 * REM * seconds_per_tick, 150, affected_organtype) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.say(return_hippie_line(), forced = /datum/reagent/medicine/earthsblood) - affected_mob.adjust_drugginess_up_to(20 SECONDS * REM * delta_time, 30 SECONDS * REM * delta_time) + affected_mob.adjust_drugginess_up_to(20 SECONDS * REM * seconds_per_tick, 30 SECONDS * REM * seconds_per_tick) ..() . = TRUE @@ -1269,12 +1269,12 @@ REMOVE_TRAIT(affected_mob, TRAIT_PACIFISM, type) ..() -/datum/reagent/medicine/earthsblood/overdose_process(mob/living/affected_mob, delta_time, times_fired) - affected_mob.adjust_hallucinations_up_to(10 SECONDS * REM * delta_time, 120 SECONDS) +/datum/reagent/medicine/earthsblood/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_hallucinations_up_to(10 SECONDS * REM * seconds_per_tick, 120 SECONDS) if(current_cycle > 25) - affected_mob.adjustToxLoss(4 * REM * delta_time, FALSE, required_biotype = affected_biotype) + affected_mob.adjustToxLoss(4 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) if(current_cycle > 100) //podpeople get out reeeeeeeeeeeeeeeeeeeee - affected_mob.adjustToxLoss(6 * REM * delta_time, FALSE, required_biotype = affected_biotype) + affected_mob.adjustToxLoss(6 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) if(iscarbon(affected_mob)) var/mob/living/carbon/hippie = affected_mob hippie.gain_trauma(/datum/brain_trauma/severe/pacifism) @@ -1304,20 +1304,20 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED harmful = TRUE -/datum/reagent/medicine/haloperidol/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/haloperidol/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) for(var/datum/reagent/drug/R in affected_mob.reagents.reagent_list) - affected_mob.reagents.remove_reagent(R.type, 5 * REM * delta_time) - affected_mob.adjust_drowsiness(4 SECONDS * REM * delta_time) + affected_mob.reagents.remove_reagent(R.type, 5 * REM * seconds_per_tick) + affected_mob.adjust_drowsiness(4 SECONDS * REM * seconds_per_tick) if(affected_mob.get_timed_status_effect_duration(/datum/status_effect/jitter) >= 6 SECONDS) - affected_mob.adjust_jitter(-6 SECONDS * REM * delta_time) + affected_mob.adjust_jitter(-6 SECONDS * REM * seconds_per_tick) if (affected_mob.get_timed_status_effect_duration(/datum/status_effect/hallucination) >= 10 SECONDS) - affected_mob.adjust_hallucinations(-10 SECONDS * REM * delta_time) + affected_mob.adjust_hallucinations(-10 SECONDS * REM * seconds_per_tick) - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1, 50, affected_organtype) - affected_mob.adjustStaminaLoss(2.5 * REM * delta_time, FALSE, required_biotype = affected_biotype) + affected_mob.adjustStaminaLoss(2.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) ..() return TRUE @@ -1329,12 +1329,12 @@ overdose_threshold = 30 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/carbon/metabolizer, delta_time, times_fired) +/datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick, times_fired) ..() - metabolizer.AdjustAllImmobility(-20 * REM * delta_time) - metabolizer.adjustStaminaLoss(-10 * REM * delta_time, 0) - metabolizer.set_jitter_if_lower(20 SECONDS * REM * delta_time) - metabolizer.set_dizzy_if_lower(20 SECONDS * REM * delta_time) + metabolizer.AdjustAllImmobility(-20 * REM * seconds_per_tick) + metabolizer.adjustStaminaLoss(-10 * REM * seconds_per_tick, 0) + metabolizer.set_jitter_if_lower(20 SECONDS * REM * seconds_per_tick) + metabolizer.set_dizzy_if_lower(20 SECONDS * REM * seconds_per_tick) return TRUE /datum/reagent/medicine/changelingadrenaline/on_mob_metabolize(mob/living/affected_mob) @@ -1349,8 +1349,8 @@ affected_mob.remove_status_effect(/datum/status_effect/dizziness) affected_mob.remove_status_effect(/datum/status_effect/jitter) -/datum/reagent/medicine/changelingadrenaline/overdose_process(mob/living/metabolizer, delta_time, times_fired) - metabolizer.adjustToxLoss(1 * REM * delta_time, FALSE) +/datum/reagent/medicine/changelingadrenaline/overdose_process(mob/living/metabolizer, seconds_per_tick, times_fired) + metabolizer.adjustToxLoss(1 * REM * seconds_per_tick, FALSE) ..() return TRUE @@ -1369,8 +1369,8 @@ affected_mob.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/changelinghaste) ..() -/datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/carbon/metabolizer, delta_time, times_fired) - metabolizer.adjustToxLoss(2 * REM * delta_time, FALSE) +/datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick, times_fired) + metabolizer.adjustToxLoss(2 * REM * seconds_per_tick, FALSE) ..() return TRUE @@ -1437,12 +1437,12 @@ REMOVE_TRAIT(affected_mob, TRAIT_SLEEPIMMUNE, type) ..() -/datum/reagent/medicine/modafinil/on_mob_life(mob/living/carbon/metabolizer, delta_time, times_fired) +/datum/reagent/medicine/modafinil/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick, times_fired) if(!overdosed) // We do not want any effects on OD - overdose_threshold = overdose_threshold + ((rand(-10, 10) / 10) * REM * delta_time) // for extra fun - metabolizer.AdjustAllImmobility(-5 * REM * delta_time) - metabolizer.adjustStaminaLoss(-0.5 * REM * delta_time, FALSE, required_biotype = affected_biotype) - metabolizer.set_jitter_if_lower(1 SECONDS * REM * delta_time) + overdose_threshold = overdose_threshold + ((rand(-10, 10) / 10) * REM * seconds_per_tick) // for extra fun + metabolizer.AdjustAllImmobility(-5 * REM * seconds_per_tick) + metabolizer.adjustStaminaLoss(-0.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + metabolizer.set_jitter_if_lower(1 SECONDS * REM * seconds_per_tick) metabolization_rate = 0.005 * REAGENTS_METABOLISM * rand(5, 20) // randomizes metabolism between 0.02 and 0.08 per second . = TRUE ..() @@ -1451,36 +1451,36 @@ 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, delta_time, times_fired) +/datum/reagent/medicine/modafinil/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) overdose_progress++ switch(overdose_progress) if(1 to 40) - affected_mob.adjust_jitter_up_to(2 SECONDS * REM * delta_time, 20 SECONDS) - affected_mob.adjust_stutter_up_to(2 SECONDS * REM * delta_time, 20 SECONDS) - affected_mob.set_dizzy_if_lower(10 SECONDS * REM * delta_time) - if(DT_PROB(30, delta_time)) + affected_mob.adjust_jitter_up_to(2 SECONDS * REM * seconds_per_tick, 20 SECONDS) + affected_mob.adjust_stutter_up_to(2 SECONDS * REM * seconds_per_tick, 20 SECONDS) + affected_mob.set_dizzy_if_lower(10 SECONDS * REM * seconds_per_tick) + if(SPT_PROB(30, seconds_per_tick)) affected_mob.losebreath++ if(41 to 80) - affected_mob.adjustOxyLoss(0.1 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - affected_mob.adjustStaminaLoss(0.1 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjust_jitter_up_to(2 SECONDS * REM * delta_time, 40 SECONDS) - affected_mob.adjust_stutter_up_to(2 SECONDS * REM * delta_time, 40 SECONDS) - affected_mob.set_dizzy_if_lower(20 SECONDS * REM * delta_time) - if(DT_PROB(30, delta_time)) + affected_mob.adjustOxyLoss(0.1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustStaminaLoss(0.1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjust_jitter_up_to(2 SECONDS * REM * seconds_per_tick, 40 SECONDS) + affected_mob.adjust_stutter_up_to(2 SECONDS * REM * seconds_per_tick, 40 SECONDS) + affected_mob.set_dizzy_if_lower(20 SECONDS * REM * seconds_per_tick) + if(SPT_PROB(30, seconds_per_tick)) affected_mob.losebreath++ - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) to_chat(affected_mob, span_userdanger("You have a sudden fit!")) affected_mob.emote("moan") affected_mob.Paralyze(20) // you should be in a bad spot at this point unless epipen has been used if(81) to_chat(affected_mob, span_userdanger("You feel too exhausted to continue!")) // at this point you will eventually die unless you get charcoal - affected_mob.adjustOxyLoss(0.1 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - affected_mob.adjustStaminaLoss(0.1 * REM * delta_time, FALSE, required_biotype = affected_biotype) + affected_mob.adjustOxyLoss(0.1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustStaminaLoss(0.1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) if(82 to INFINITY) REMOVE_TRAIT(affected_mob, TRAIT_SLEEPIMMUNE, type) - affected_mob.Sleeping(100 * REM * delta_time) - affected_mob.adjustOxyLoss(1.5 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - affected_mob.adjustStaminaLoss(1.5 * REM * delta_time, FALSE, required_biotype = affected_biotype) + affected_mob.Sleeping(100 * REM * seconds_per_tick) + affected_mob.adjustOxyLoss(1.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustStaminaLoss(1.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) ..() return TRUE @@ -1502,19 +1502,19 @@ REMOVE_TRAIT(affected_mob, TRAIT_FEARLESS, type) ..() -/datum/reagent/medicine/psicodine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_jitter(-12 SECONDS * REM * delta_time) - affected_mob.adjust_dizzy(-12 SECONDS * REM * delta_time) - affected_mob.adjust_confusion(-6 SECONDS * REM * delta_time) - affected_mob.disgust = max(affected_mob.disgust - (6 * REM * delta_time), 0) +/datum/reagent/medicine/psicodine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_jitter(-12 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_dizzy(-12 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_confusion(-6 SECONDS * REM * seconds_per_tick) + affected_mob.disgust = max(affected_mob.disgust - (6 * REM * seconds_per_tick), 0) 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.set_sanity(min(affected_mob.mob_mood.sanity + (5 * REM * delta_time), SANITY_NEUTRAL)) // set minimum to prevent unwanted spiking over neutral + affected_mob.mob_mood.set_sanity(min(affected_mob.mob_mood.sanity + (5 * REM * seconds_per_tick), SANITY_NEUTRAL)) // set minimum to prevent unwanted spiking over neutral ..() . = TRUE -/datum/reagent/medicine/psicodine/overdose_process(mob/living/affected_mob, delta_time, times_fired) - affected_mob.adjust_hallucinations_up_to(10 SECONDS * REM * delta_time, 120 SECONDS) - affected_mob.adjustToxLoss(1 * REM * delta_time, FALSE, required_biotype = affected_biotype) +/datum/reagent/medicine/psicodine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_hallucinations_up_to(10 SECONDS * REM * seconds_per_tick, 120 SECONDS) + affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) ..() . = TRUE @@ -1532,8 +1532,8 @@ /datum/reagent/medicine/metafactor/overdose_start(mob/living/carbon/affected_mob) metabolization_rate = 2 * REAGENTS_METABOLISM -/datum/reagent/medicine/metafactor/overdose_process(mob/living/carbon/affected_mob, delta_time, times_fired) - if(DT_PROB(13, delta_time)) +/datum/reagent/medicine/metafactor/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(13, seconds_per_tick)) affected_mob.vomit() ..() @@ -1545,8 +1545,8 @@ metabolization_rate = 1.5 * REAGENTS_METABOLISM chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/silibinin/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, -2 * REM * delta_time, required_organtype = affected_organtype)//Add a chance to cure liver trauma once implemented. +/datum/reagent/medicine/silibinin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, -2 * REM * seconds_per_tick, required_organtype = affected_organtype)//Add a chance to cure liver trauma once implemented. ..() . = TRUE @@ -1560,10 +1560,10 @@ taste_description = "numbing bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/polypyr/on_mob_life(mob/living/carbon/affected_mob, delta_time, 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, times_fired) //I wanted a collection of small positive effects, this is as hard to obtain as coniine after all. . = ..() - affected_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS, -0.25 * REM * delta_time, required_organtype = affected_organtype) - affected_mob.adjustBruteLoss(-0.35 * REM * delta_time, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS, -0.25 * REM * seconds_per_tick, required_organtype = affected_organtype) + affected_mob.adjustBruteLoss(-0.35 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) return TRUE /datum/reagent/medicine/polypyr/expose_mob(mob/living/carbon/human/exposed_human, methods=TOUCH, reac_volume) @@ -1574,8 +1574,8 @@ exposed_human.facial_hair_color = "#9922ff" exposed_human.update_body_parts() -/datum/reagent/medicine/polypyr/overdose_process(mob/living/affected_mob, delta_time, times_fired) - affected_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5 * REM * delta_time, required_organtype = affected_organtype) +/datum/reagent/medicine/polypyr/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5 * REM * seconds_per_tick, required_organtype = affected_organtype) ..() . = TRUE @@ -1588,17 +1588,17 @@ metabolization_rate = 0.5 * REAGENTS_METABOLISM //same as C2s chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/medicine/granibitaluri/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/granibitaluri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) var/healamount = max(0.5 - round(0.01 * (affected_mob.getBruteLoss() + affected_mob.getFireLoss()), 0.1), 0) //base of 0.5 healing per cycle and loses 0.1 healing for every 10 combined brute/burn damage you have - affected_mob.adjustBruteLoss(-healamount * REM * delta_time, FALSE, required_bodytype = affected_bodytype) - affected_mob.adjustFireLoss(-healamount * REM * delta_time, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustBruteLoss(-healamount * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustFireLoss(-healamount * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) ..() . = TRUE -/datum/reagent/medicine/granibitaluri/overdose_process(mob/living/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/granibitaluri/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) . = TRUE - affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.2 * REM * delta_time, required_organtype = affected_organtype) - affected_mob.adjustToxLoss(0.2 * REM * delta_time, FALSE, required_biotype = affected_biotype) //Only really deadly if you eat over 100u + affected_mob.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.2 * REM * seconds_per_tick, required_organtype = affected_organtype) + affected_mob.adjustToxLoss(0.2 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) //Only really deadly if you eat over 100u ..() // helps bleeding wounds clot faster @@ -1637,7 +1637,7 @@ return ..() -/datum/reagent/medicine/coagulant/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/coagulant/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() if(!affected_mob.blood_volume || !affected_mob.all_wounds) return @@ -1654,16 +1654,16 @@ if(!was_working) to_chat(affected_mob, span_green("You can feel your flowing blood start thickening!")) was_working = TRUE - bloodiest_wound.adjust_blood_flow(-clot_rate * REM * delta_time) + bloodiest_wound.adjust_blood_flow(-clot_rate * REM * seconds_per_tick) else if(was_working) was_working = FALSE -/datum/reagent/medicine/coagulant/overdose_process(mob/living/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/coagulant/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) . = ..() if(!affected_mob.blood_volume) return - if(DT_PROB(7.5, delta_time)) + if(SPT_PROB(7.5, seconds_per_tick)) affected_mob.losebreath += rand(2, 4) affected_mob.adjustOxyLoss(rand(1, 3), required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) if(prob(30)) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 4553eba0636..16ea2b8b029 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -279,10 +279,10 @@ #undef WATER_TO_WET_STACKS_FACTOR_VAPOR -/datum/reagent/water/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/water/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() if(affected_mob.blood_volume) - affected_mob.blood_volume += 0.1 * REM * delta_time // water is good for you! + affected_mob.blood_volume += 0.1 * REM * seconds_per_tick // water is good for you! ///For weird backwards situations where water manages to get added to trays nutrients, as opposed to being snowflaked away like usual. /datum/reagent/water/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray) @@ -335,23 +335,23 @@ if(IS_CULTIST(exposed_mob)) to_chat(exposed_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, delta_time, times_fired) +/datum/reagent/water/holywater/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(affected_mob.blood_volume) - affected_mob.blood_volume += 0.1 * REM * delta_time // water is good for you! + affected_mob.blood_volume += 0.1 * REM * seconds_per_tick // water is good for you! if(!data) data = list("misc" = 0) - data["misc"] += delta_time SECONDS * REM - affected_mob.adjust_jitter_up_to(4 SECONDS * delta_time, 20 SECONDS) + data["misc"] += seconds_per_tick SECONDS * REM + affected_mob.adjust_jitter_up_to(4 SECONDS * seconds_per_tick, 20 SECONDS) if(IS_CULTIST(affected_mob)) for(var/datum/action/innate/cult/blood_magic/BM in affected_mob.actions) to_chat(affected_mob, span_cultlarge("Your blood rites falter as holy water scours your body!")) for(var/datum/action/innate/cult/blood_spell/BS in BM.spells) qdel(BS) if(data["misc"] >= (25 SECONDS)) // 10 units - affected_mob.adjust_stutter_up_to(4 SECONDS * delta_time, 20 SECONDS) + affected_mob.adjust_stutter_up_to(4 SECONDS * seconds_per_tick, 20 SECONDS) affected_mob.set_dizzy_if_lower(10 SECONDS) - if(IS_CULTIST(affected_mob) && DT_PROB(10, delta_time)) + if(IS_CULTIST(affected_mob) && SPT_PROB(10, seconds_per_tick)) affected_mob.say(pick("Av'te Nar'Sie","Pa'lid Mors","INO INO ORA ANA","SAT ANA!","Daim'niodeis Arc'iai Le'eones","R'ge Na'sie","Diabo us Vo'iscum","Eld' Mon Nobis"), forced = "holy water") if(prob(10)) affected_mob.visible_message(span_danger("[affected_mob] starts having a seizure!"), span_userdanger("You have a seizure!")) @@ -366,7 +366,7 @@ affected_mob.remove_status_effect(/datum/status_effect/speech/stutter) holder.remove_reagent(type, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better?? return - holder.remove_reagent(type, 1 * REAGENTS_METABOLISM * delta_time) //fixed consumption to prevent balancing going out of whack + holder.remove_reagent(type, 1 * REAGENTS_METABOLISM * seconds_per_tick) //fixed consumption to prevent balancing going out of whack /datum/reagent/water/holywater/expose_turf(turf/exposed_turf, reac_volume) . = ..() @@ -431,23 +431,23 @@ ph = 6.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/fuel/unholywater/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/fuel/unholywater/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(IS_CULTIST(affected_mob)) - affected_mob.adjust_drowsiness(-10 SECONDS * REM * delta_time) - affected_mob.AdjustAllImmobility(-40 * REM * delta_time) - affected_mob.adjustStaminaLoss(-10 * REM * delta_time, 0) - affected_mob.adjustToxLoss(-2 * REM * delta_time, 0) - affected_mob.adjustOxyLoss(-2 * REM * delta_time, 0) - affected_mob.adjustBruteLoss(-2 * REM * delta_time, 0) - affected_mob.adjustFireLoss(-2 * REM * delta_time, 0) + affected_mob.adjust_drowsiness(-10 SECONDS * REM * seconds_per_tick) + affected_mob.AdjustAllImmobility(-40 * REM * seconds_per_tick) + affected_mob.adjustStaminaLoss(-10 * REM * seconds_per_tick, 0) + affected_mob.adjustToxLoss(-2 * REM * seconds_per_tick, 0) + affected_mob.adjustOxyLoss(-2 * REM * seconds_per_tick, 0) + affected_mob.adjustBruteLoss(-2 * REM * seconds_per_tick, 0) + affected_mob.adjustFireLoss(-2 * REM * seconds_per_tick, 0) if(ishuman(affected_mob) && affected_mob.blood_volume < BLOOD_VOLUME_NORMAL) - affected_mob.blood_volume += 3 * REM * delta_time + affected_mob.blood_volume += 3 * REM * seconds_per_tick else // Will deal about 90 damage when 50 units are thrown - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3 * REM * delta_time, 150) - affected_mob.adjustToxLoss(1 * REM * delta_time, 0) - affected_mob.adjustFireLoss(1 * REM * delta_time, 0) - affected_mob.adjustOxyLoss(1 * REM * delta_time, 0) - affected_mob.adjustBruteLoss(1 * REM * delta_time, 0) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3 * REM * seconds_per_tick, 150) + affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, 0) + affected_mob.adjustFireLoss(1 * REM * seconds_per_tick, 0) + affected_mob.adjustOxyLoss(1 * REM * seconds_per_tick, 0) + affected_mob.adjustBruteLoss(1 * REM * seconds_per_tick, 0) ..() /datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldrich god @@ -457,13 +457,13 @@ ph = 0.1 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/hellwater/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.set_fire_stacks(min(affected_mob.fire_stacks + (1.5 * delta_time), 5)) +/datum/reagent/hellwater/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + 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 - affected_mob.adjustToxLoss(0.5*delta_time, 0) - affected_mob.adjustFireLoss(0.5*delta_time, 0) //Hence the other damages... ain't I a bastard? - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2.5*delta_time, 150) - holder.remove_reagent(type, 0.5*delta_time) + affected_mob.adjustToxLoss(0.5*seconds_per_tick, 0) + affected_mob.adjustFireLoss(0.5*seconds_per_tick, 0) //Hence the other damages... ain't I a bastard? + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2.5*seconds_per_tick, 150) + holder.remove_reagent(type, 0.5*seconds_per_tick) /datum/reagent/medicine/omnizine/godblood name = "Godblood" @@ -568,7 +568,7 @@ to_chat(exposed_mob, span_notice("That tasted horrible.")) -/datum/reagent/spraytan/overdose_process(mob/living/affected_mob, delta_time, times_fired) +/datum/reagent/spraytan/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) metabolization_rate = 1 * REAGENTS_METABOLISM if(ishuman(affected_mob)) @@ -585,12 +585,12 @@ else if(MUTCOLORS in affected_human.dna.species.species_traits) //Aliens with custom colors simply get turned orange affected_human.dna.features["mcolor"] = "#ff8800" affected_human.update_body(is_creating = TRUE) - if(DT_PROB(3.5, delta_time)) + if(SPT_PROB(3.5, seconds_per_tick)) if(affected_human.w_uniform) affected_mob.visible_message(pick("[affected_mob]'s collar pops up without warning.", "[affected_mob] flexes [affected_mob.p_their()] arms.")) else affected_mob.visible_message("[affected_mob] flexes [affected_mob.p_their()] arms.") - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.say(pick("Shit was SO cash.", "You are everything bad in the world.", "What sports do you play, other than 'jack off to naked drawn Japanese people?'", "Don???t be a stranger. Just hit me with your best shot.", "My name is John and I hate every single one of you."), forced = /datum/reagent/spraytan) ..() return @@ -613,14 +613,14 @@ "You feel as though you're about to change at any moment!" = MUT_MSG_ABOUT2TURN) var/cycles_to_turn = 20 //the current_cycle threshold / iterations needed before one can transform -/datum/reagent/mutationtoxin/on_mob_life(mob/living/carbon/human/affected_mob, delta_time, times_fired) +/datum/reagent/mutationtoxin/on_mob_life(mob/living/carbon/human/affected_mob, seconds_per_tick, times_fired) . = TRUE if(!istype(affected_mob)) return if(!(affected_mob.dna?.species) || !(affected_mob.mob_biotypes & MOB_ORGANIC)) return - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) var/list/pick_ur_fav = list() var/filter = NONE if(current_cycle <= (cycles_to_turn*0.3)) @@ -698,7 +698,7 @@ taste_description = "grandma's gelatin" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/mutationtoxin/jelly/on_mob_life(mob/living/carbon/human/affected_mob, delta_time, times_fired) +/datum/reagent/mutationtoxin/jelly/on_mob_life(mob/living/carbon/human/affected_mob, seconds_per_tick, times_fired) if(isjellyperson(affected_mob)) to_chat(affected_mob, span_warning("Your jelly shifts and morphs, turning you into another subspecies!")) var/species_type = pick(subtypesof(/datum/species/jelly)) @@ -803,7 +803,7 @@ taste_description = "slime" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/mulligan/on_mob_life(mob/living/carbon/human/affected_mob, delta_time, times_fired) +/datum/reagent/mulligan/on_mob_life(mob/living/carbon/human/affected_mob, seconds_per_tick, times_fired) ..() if (!istype(affected_mob)) return @@ -845,9 +845,9 @@ ph = 10 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/serotrotium/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/serotrotium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(ishuman(affected_mob)) - if(DT_PROB(3.5, delta_time)) + if(SPT_PROB(3.5, seconds_per_tick)) affected_mob.emote(pick("twitch","drool","moan","gasp")) ..() @@ -925,12 +925,12 @@ taste_mult = 0 // apparently tasteless. chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/mercury/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/mercury/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(!HAS_TRAIT(src, TRAIT_IMMOBILIZED) && !isspaceturf(affected_mob.loc)) step(affected_mob, pick(GLOB.cardinals)) - if(DT_PROB(3.5, delta_time)) + if(SPT_PROB(3.5, seconds_per_tick)) affected_mob.emote(pick("twitch","drool","moan")) - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.5*delta_time) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.5*seconds_per_tick) ..() /datum/reagent/sulfur @@ -982,8 +982,8 @@ // White Phosphorous + water -> phosphoric acid. That's not a good thing really. -/datum/reagent/chlorine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.take_bodypart_damage(0.5*REM*delta_time, 0) +/datum/reagent/chlorine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.take_bodypart_damage(0.5*REM*seconds_per_tick, 0) . = TRUE ..() @@ -1006,8 +1006,8 @@ mytray.adjust_waterlevel(-round(chems.get_reagent_amount(type) * 0.5)) mytray.adjust_weedlevel(-rand(1,4)) -/datum/reagent/fluorine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustToxLoss(0.5*REM*delta_time, 0) +/datum/reagent/fluorine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustToxLoss(0.5*REM*seconds_per_tick, 0) . = TRUE ..() @@ -1047,10 +1047,10 @@ ph = 11.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/lithium/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/lithium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(!HAS_TRAIT(affected_mob, TRAIT_IMMOBILIZED) && !isspaceturf(affected_mob.loc) && isturf(affected_mob.loc)) step(affected_mob, pick(GLOB.cardinals)) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.emote(pick("twitch","drool","moan")) ..() @@ -1088,9 +1088,9 @@ color = "#606060" //pure iron? let's make it violet of course ph = 6 -/datum/reagent/iron/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/iron/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(affected_mob.blood_volume < BLOOD_VOLUME_NORMAL) - affected_mob.blood_volume += 0.25 * delta_time + affected_mob.blood_volume += 0.25 * seconds_per_tick ..() /datum/reagent/gold @@ -1124,8 +1124,8 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED default_container = /obj/effect/decal/cleanable/greenglow -/datum/reagent/uranium/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustToxLoss(tox_damage * delta_time * REM) +/datum/reagent/uranium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustToxLoss(tox_damage * seconds_per_tick * REM) ..() /datum/reagent/uranium/expose_turf(turf/exposed_turf, reac_volume) @@ -1184,8 +1184,8 @@ if(methods & (TOUCH|VAPOR)) 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, delta_time, times_fired) - if(current_cycle > 10 && DT_PROB(7.5, delta_time)) +/datum/reagent/bluespace/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(current_cycle > 10 && SPT_PROB(7.5, seconds_per_tick)) to_chat(affected_mob, span_warning("You feel unstable...")) affected_mob.set_jitter_if_lower(2 SECONDS) current_cycle = 1 @@ -1236,8 +1236,8 @@ if(methods & (TOUCH|VAPOR)) exposed_mob.adjust_fire_stacks(reac_volume / 10) -/datum/reagent/fuel/on_mob_life(mob/living/carbon/victim, delta_time, times_fired) - victim.adjustToxLoss(0.5 * delta_time, FALSE, required_biotype = affected_biotype) +/datum/reagent/fuel/on_mob_life(mob/living/carbon/victim, seconds_per_tick, times_fired) + victim.adjustToxLoss(0.5 * seconds_per_tick, FALSE, required_biotype = affected_biotype) ..() return TRUE @@ -1296,10 +1296,10 @@ ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/space_cleaner/ez_clean/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustBruteLoss(1.665*delta_time) - affected_mob.adjustFireLoss(1.665*delta_time) - affected_mob.adjustToxLoss(1.665*delta_time) +/datum/reagent/space_cleaner/ez_clean/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustBruteLoss(1.665*seconds_per_tick) + affected_mob.adjustFireLoss(1.665*seconds_per_tick) + affected_mob.adjustToxLoss(1.665*seconds_per_tick) ..() /datum/reagent/space_cleaner/ez_clean/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) @@ -1317,7 +1317,7 @@ ph = 11.9 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/cryptobiolin/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/cryptobiolin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) affected_mob.set_dizzy_if_lower(2 SECONDS) // Cryptobiolin adjusts the mob's confusion down to 20 seconds if it's higher, @@ -1340,13 +1340,13 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED addiction_types = list(/datum/addiction/opioids = 10) -/datum/reagent/impedrezene/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_jitter(-5 SECONDS * delta_time) - if(DT_PROB(55, delta_time)) +/datum/reagent/impedrezene/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_jitter(-5 SECONDS * seconds_per_tick) + if(SPT_PROB(55, seconds_per_tick)) affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2) - if(DT_PROB(30, delta_time)) + if(SPT_PROB(30, seconds_per_tick)) affected_mob.adjust_drowsiness(6 SECONDS) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.emote("drool") ..() @@ -1501,12 +1501,12 @@ var/drowsiness_to_apply = max(round(reac_volume, 1) * 2 SECONDS, 4 SECONDS) exposed_mob.adjust_drowsiness(drowsiness_to_apply) -/datum/reagent/nitrous_oxide/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_drowsiness(4 SECONDS * REM * delta_time) +/datum/reagent/nitrous_oxide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_drowsiness(4 SECONDS * REM * seconds_per_tick) if(ishuman(affected_mob)) var/mob/living/carbon/human/affected_human = affected_mob - affected_human.blood_volume = max(affected_human.blood_volume - (10 * REM * delta_time), 0) - if(DT_PROB(10, delta_time)) + affected_human.blood_volume = max(affected_human.blood_volume - (10 * REM * seconds_per_tick), 0) + if(SPT_PROB(10, seconds_per_tick)) affected_mob.losebreath += 2 affected_mob.adjust_confusion_up_to(2 SECONDS, 5 SECONDS) ..() @@ -1652,8 +1652,8 @@ taste_description = "plant food" ph = 3 -/datum/reagent/plantnutriment/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(DT_PROB(tox_prob, delta_time)) +/datum/reagent/plantnutriment/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(tox_prob, seconds_per_tick)) affected_mob.adjustToxLoss(1, FALSE, required_biotype = affected_biotype) . = TRUE ..() @@ -1761,8 +1761,8 @@ ph = 1.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/stable_plasma/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustPlasma(10 * REM * delta_time) +/datum/reagent/stable_plasma/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustPlasma(10 * REM * seconds_per_tick) ..() /datum/reagent/iodine @@ -1848,20 +1848,20 @@ 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, delta_time, times_fired) +/datum/reagent/carpet/royal/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() var/obj/item/organ/internal/liver/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER) if(liver) // Heads of staff and the captain have a "royal metabolism" if(HAS_TRAIT(liver, TRAIT_ROYAL_METABOLISM)) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, "You feel like royalty.") - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.say(pick("Peasants..","This carpet is worth more than your contracts!","I could fire you at any time..."), forced = "royal carpet") // The quartermaster, as a semi-head, has a "pretender royal" metabolism else if(HAS_TRAIT(liver, TRAIT_PRETENDER_ROYAL_METABOLISM)) - if(DT_PROB(8, delta_time)) + if(SPT_PROB(8, seconds_per_tick)) to_chat(affected_mob, "You feel like an impostor...") /datum/reagent/carpet/royal/black @@ -2095,7 +2095,7 @@ color_callback = null color = pick(random_color_list) -/datum/reagent/colorful_reagent/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/colorful_reagent/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(can_colour_mobs) affected_mob.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY) return ..() @@ -2175,7 +2175,7 @@ exposed_human.facial_hairstyle = "Beard (Very Long)" exposed_human.update_body_parts() -/datum/reagent/concentrated_barbers_aid/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/concentrated_barbers_aid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() if(current_cycle > 20 / creation_purity) if(!ishuman(affected_mob)) @@ -2332,8 +2332,8 @@ ph = 3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/royal_bee_jelly/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(DT_PROB(1, delta_time)) +/datum/reagent/royal_bee_jelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(1, seconds_per_tick)) affected_mob.say(pick("Bzzz...","BZZ BZZ","Bzzzzzzzzzzz..."), forced = "royal bee jelly") ..() @@ -2366,7 +2366,7 @@ color = "#00f041" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/magillitis/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/magillitis/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) ..() if((ishuman(affected_mob)) && current_cycle >= 10) affected_mob.gorillize() @@ -2379,7 +2379,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, delta_time, times_fired) +/datum/reagent/growthserum/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) var/newsize = current_size switch(volume) if(0 to 19) @@ -2487,11 +2487,11 @@ ..() REMOVE_TRAIT(ling, CHANGELING_HIVEMIND_MUTE, type) -/datum/reagent/bz_metabolites/on_mob_life(mob/living/carbon/target, delta_time, times_fired) +/datum/reagent/bz_metabolites/on_mob_life(mob/living/carbon/target, seconds_per_tick, times_fired) if(target.mind) var/datum/antagonist/changeling/changeling = target.mind.has_antag_datum(/datum/antagonist/changeling) if(changeling) - changeling.adjust_chemicals(-4 * REM * delta_time) //SKYRAT EDIT - BZ-BUFF-VS-LING - ORIGINAL: changeling.adjust_chemicals(-2 * REM * delta_time) + changeling.adjust_chemicals(-4 * REM * seconds_per_tick) //SKYRAT EDIT - BZ-BUFF-VS-LING - ORIGINAL: changeling.adjust_chemicals(-2 * REM * delta_time) return ..() /datum/reagent/pax/peaceborg @@ -2507,11 +2507,11 @@ 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, delta_time, times_fired) - affected_mob.adjust_confusion_up_to(3 SECONDS * REM * delta_time, 5 SECONDS) - affected_mob.adjust_dizzy_up_to(6 SECONDS * REM * delta_time, 12 SECONDS) +/datum/reagent/peaceborg/confuse/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + 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) - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) to_chat(affected_mob, "You feel confused and disoriented.") ..() @@ -2522,11 +2522,11 @@ 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, delta_time, times_fired) +/datum/reagent/peaceborg/tire/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) 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. if(affected_mob.getStaminaLoss() < (45 - healthcomp)) //At 50 health you would have 200 - 150 health meaning 50 compensation. 60 - 50 = 10, so would only do 10-19 stamina.) - affected_mob.adjustStaminaLoss(10 * REM * delta_time) - if(DT_PROB(16, delta_time)) + affected_mob.adjustStaminaLoss(10 * REM * seconds_per_tick) + if(SPT_PROB(16, seconds_per_tick)) to_chat(affected_mob, "You should sit down and take a rest...") ..() @@ -2572,9 +2572,9 @@ #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, delta_time, times_fired) +/datum/reagent/yuck/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(!yuck_cycle) - if(DT_PROB(4, delta_time)) + if(SPT_PROB(4, seconds_per_tick)) var/dread = pick("Something is moving in your stomach...", \ "A wet growl echoes from your stomach...", \ "For a moment you feel like your surroundings are moving, but it's your stomach...") @@ -2725,7 +2725,7 @@ affected_mob.remove_status_effect(/datum/status_effect/determined) ..() -/datum/reagent/determination/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/determination/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(!significant && volume >= WOUND_DETERMINATION_SEVERE) significant = TRUE affected_mob.apply_status_effect(/datum/status_effect/determined) // in addition to the slight healing, limping cooldowns are divided by 4 during the combat high @@ -2736,8 +2736,8 @@ var/datum/wound/W = thing var/obj/item/bodypart/wounded_part = W.limb if(wounded_part) - wounded_part.heal_damage(0.25 * REM * delta_time, 0.25 * REM * delta_time) - affected_mob.adjustStaminaLoss(-0.25 * REM * delta_time) // the more wounds, the more stamina regen + wounded_part.heal_damage(0.25 * REM * seconds_per_tick, 0.25 * REM * seconds_per_tick) + affected_mob.adjustStaminaLoss(-0.25 * REM * seconds_per_tick) // the more wounds, the more stamina regen ..() // unholy water, but for heretics. @@ -2754,23 +2754,23 @@ 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, delta_time, times_fired) +/datum/reagent/eldritch/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(IS_HERETIC(drinker)) - drinker.adjust_drowsiness(-10 * REM * delta_time) - drinker.AdjustAllImmobility(-40 * REM * delta_time) - drinker.adjustStaminaLoss(-10 * REM * delta_time, FALSE) - drinker.adjustToxLoss(-2 * REM * delta_time, FALSE, forced = TRUE) - drinker.adjustOxyLoss(-2 * REM * delta_time, FALSE) - drinker.adjustBruteLoss(-2 * REM * delta_time, FALSE) - drinker.adjustFireLoss(-2 * REM * delta_time, FALSE) + drinker.adjust_drowsiness(-10 * REM * seconds_per_tick) + drinker.AdjustAllImmobility(-40 * REM * seconds_per_tick) + drinker.adjustStaminaLoss(-10 * REM * seconds_per_tick, FALSE) + drinker.adjustToxLoss(-2 * REM * seconds_per_tick, FALSE, forced = TRUE) + drinker.adjustOxyLoss(-2 * REM * seconds_per_tick, FALSE) + drinker.adjustBruteLoss(-2 * REM * seconds_per_tick, FALSE) + drinker.adjustFireLoss(-2 * REM * seconds_per_tick, FALSE) if(drinker.blood_volume < BLOOD_VOLUME_NORMAL) - drinker.blood_volume += 3 * REM * delta_time + drinker.blood_volume += 3 * REM * seconds_per_tick else - drinker.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3 * REM * delta_time, 150) - drinker.adjustToxLoss(2 * REM * delta_time, FALSE) - drinker.adjustFireLoss(2 * REM * delta_time, FALSE) - drinker.adjustOxyLoss(2 * REM * delta_time, FALSE) - drinker.adjustBruteLoss(2 * REM * delta_time, FALSE) + drinker.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3 * REM * seconds_per_tick, 150) + drinker.adjustToxLoss(2 * REM * seconds_per_tick, FALSE) + drinker.adjustFireLoss(2 * REM * seconds_per_tick, FALSE) + drinker.adjustOxyLoss(2 * REM * seconds_per_tick, FALSE) + drinker.adjustBruteLoss(2 * REM * seconds_per_tick, FALSE) ..() return TRUE @@ -2817,19 +2817,19 @@ name = "glass of ants" desc = "Bottoms up...?" -/datum/reagent/ants/on_mob_life(mob/living/carbon/victim, delta_time) +/datum/reagent/ants/on_mob_life(mob/living/carbon/victim, seconds_per_tick) victim.adjustBruteLoss(max(0.1, round((ant_damage * 0.025),0.1))) //Scales with time. Roughly 32 brute with 100u. ant_damage++ if(ant_damage < 5) // Makes ant food a little more appetizing, since you won't be screaming as much. return ..() - if(DT_PROB(5, delta_time)) - if(DT_PROB(5, delta_time)) //Super rare statement + if(SPT_PROB(5, seconds_per_tick)) + if(SPT_PROB(5, seconds_per_tick)) //Super rare statement victim.say("AUGH NO NOT THE ANTS! NOT THE ANTS! AAAAUUGH THEY'RE IN MY EYES! MY EYES! AUUGH!!", forced = /datum/reagent/ants) else victim.say(pick(ant_screams), forced = /datum/reagent/ants) - if(DT_PROB(15, delta_time)) + if(SPT_PROB(15, seconds_per_tick)) victim.emote("scream") - if(DT_PROB(2, delta_time)) // Stuns, but purges ants. + if(SPT_PROB(2, seconds_per_tick)) // Stuns, but purges ants. victim.vomit(rand(5,10), FALSE, TRUE, 1, TRUE, FALSE, purge_ratio = 1) return ..() @@ -2905,9 +2905,9 @@ taste_description = "burning" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/brimdust/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/brimdust/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() - affected_mob.adjustFireLoss((ispodperson(affected_mob) ? -1 : 1) * delta_time) + affected_mob.adjustFireLoss((ispodperson(affected_mob) ? -1 : 1) * seconds_per_tick) /datum/reagent/brimdust/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user) if(!check_tray(chems, mytray)) @@ -2945,11 +2945,11 @@ deleted_from.clear_mood_event(name) deleted_from.add_mood_event(name, /datum/mood_event/love_reagent, duration_of_moodlet) -/datum/reagent/love/overdose_process(mob/living/metabolizer, delta_time, times_fired) +/datum/reagent/love/overdose_process(mob/living/metabolizer, seconds_per_tick, times_fired) var/mob/living/carbon/carbon_metabolizer = metabolizer if(!istype(carbon_metabolizer) || !carbon_metabolizer.can_heartattack() || carbon_metabolizer.undergoing_cardiac_arrest()) metabolizer.reagents.del_reagent(type) return - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) carbon_metabolizer.set_heartattack(TRUE) diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm index f9f37447b56..6ffc0be1bf0 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm @@ -12,8 +12,8 @@ if(reac_volume >= 1) exposed_turf.AddComponent(/datum/component/thermite, reac_volume) -/datum/reagent/thermite/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustFireLoss(1 * REM * delta_time, 0) +/datum/reagent/thermite/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustFireLoss(1 * REM * seconds_per_tick, 0) ..() return TRUE @@ -49,9 +49,9 @@ penetrates_skin = NONE chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/clf3/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_fire_stacks(2 * REM * delta_time) - affected_mob.adjustFireLoss(0.3 * max(affected_mob.fire_stacks, 1) * REM * delta_time, 0) +/datum/reagent/clf3/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_fire_stacks(2 * REM * seconds_per_tick) + affected_mob.adjustFireLoss(0.3 * max(affected_mob.fire_stacks, 1) * REM * seconds_per_tick, 0) ..() return TRUE @@ -179,9 +179,9 @@ exposed_mob.adjustFireLoss(burndmg, 0) exposed_mob.ignite_mob() -/datum/reagent/phlogiston/on_mob_life(mob/living/carbon/metabolizer, delta_time, times_fired) - metabolizer.adjust_fire_stacks(1 * REM * delta_time) - metabolizer.adjustFireLoss(0.3 * max(metabolizer.fire_stacks, 0.15) * REM * delta_time, 0) +/datum/reagent/phlogiston/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick, times_fired) + metabolizer.adjust_fire_stacks(1 * REM * seconds_per_tick) + metabolizer.adjustFireLoss(0.3 * max(metabolizer.fire_stacks, 0.15) * REM * seconds_per_tick, 0) ..() return TRUE @@ -206,8 +206,8 @@ 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, delta_time, times_fired) - affected_mob.adjust_fire_stacks(1 * REM * delta_time) +/datum/reagent/napalm/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_fire_stacks(1 * REM * seconds_per_tick) ..() /datum/reagent/napalm/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) @@ -249,18 +249,18 @@ affected_mob.color = COLOR_WHITE //Pauses decay! Does do something, I promise. -/datum/reagent/cryostylane/on_mob_dead(mob/living/carbon/affected_mob, delta_time) +/datum/reagent/cryostylane/on_mob_dead(mob/living/carbon/affected_mob, seconds_per_tick) . = ..() metabolization_rate = 0.05 * REM //slower consumption when dead -/datum/reagent/cryostylane/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/cryostylane/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) metabolization_rate = 0.25 * REM//faster consumption when alive if(affected_mob.reagents.has_reagent(/datum/reagent/oxygen)) - affected_mob.reagents.remove_reagent(/datum/reagent/oxygen, 0.5 * REM * delta_time) - affected_mob.adjust_bodytemperature(-15 * REM * delta_time) + affected_mob.reagents.remove_reagent(/datum/reagent/oxygen, 0.5 * REM * seconds_per_tick) + affected_mob.adjust_bodytemperature(-15 * REM * seconds_per_tick) if(ishuman(affected_mob)) var/mob/living/carbon/human/humi = affected_mob - humi.adjust_coretemperature(-15 * REM * delta_time) + humi.adjust_coretemperature(-15 * REM * seconds_per_tick) ..() /datum/reagent/cryostylane/expose_turf(turf/exposed_turf, reac_volume) @@ -284,13 +284,13 @@ burning_volume = 0.05 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/pyrosium/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/pyrosium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(holder.has_reagent(/datum/reagent/oxygen)) - holder.remove_reagent(/datum/reagent/oxygen, 0.5 * REM * delta_time) - affected_mob.adjust_bodytemperature(15 * REM * delta_time) + holder.remove_reagent(/datum/reagent/oxygen, 0.5 * REM * seconds_per_tick) + affected_mob.adjust_bodytemperature(15 * REM * seconds_per_tick) if(ishuman(affected_mob)) var/mob/living/carbon/human/humi = affected_mob - humi.adjust_coretemperature(15 * REM * delta_time) + humi.adjust_coretemperature(15 * REM * seconds_per_tick) ..() /datum/reagent/pyrosium/burn(datum/reagents/holder) @@ -310,7 +310,7 @@ var/shock_timer = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/teslium/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/teslium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) shock_timer++ if(shock_timer >= rand(5, 30)) //Random shocks are wildly unpredictable shock_timer = 0 @@ -338,15 +338,15 @@ taste_description = "jelly" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/teslium/energized_jelly/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/teslium/energized_jelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(isjellyperson(affected_mob)) shock_timer = 0 //immune to shocks - affected_mob.AdjustAllImmobility(-40 *REM * delta_time) - affected_mob.adjustStaminaLoss(-2 * REM * delta_time, 0) + affected_mob.AdjustAllImmobility(-40 *REM * seconds_per_tick) + affected_mob.adjustStaminaLoss(-2 * REM * seconds_per_tick, 0) if(is_species(affected_mob, /datum/species/jelly/luminescent)) var/mob/living/carbon/human/affected_human = affected_mob var/datum/species/jelly/luminescent/slime_species = affected_human.dna.species - slime_species.extract_cooldown = max(slime_species.extract_cooldown - (2 SECONDS * REM * delta_time), 0) + slime_species.extract_cooldown = max(slime_species.extract_cooldown - (2 SECONDS * REM * seconds_per_tick), 0) ..() /datum/reagent/firefighting_foam diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 8ec993b46c1..6d2792a3817 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -23,9 +23,9 @@ mytray.adjust_toxic(round(chems.get_reagent_amount(type) * 2)) -/datum/reagent/toxin/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(toxpwr && affected_mob.health > health_required) - affected_mob.adjustToxLoss(toxpwr * REM * normalise_creation_purity() * delta_time, FALSE, required_biotype = affected_biotype) + affected_mob.adjustToxLoss(toxpwr * REM * normalise_creation_purity() * seconds_per_tick, FALSE, required_biotype = affected_biotype) . = TRUE ..() @@ -64,8 +64,8 @@ exposed_mob.updateappearance() exposed_mob.domutcheck() -/datum/reagent/toxin/mutagen/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustToxLoss(0.5 * delta_time * REM, required_biotype = affected_biotype) +/datum/reagent/toxin/mutagen/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustToxLoss(0.5 * seconds_per_tick * REM, required_biotype = affected_biotype) return ..() /datum/reagent/toxin/mutagen/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user) @@ -102,10 +102,10 @@ UnregisterSignal(holder, COMSIG_REAGENTS_TEMP_CHANGE) return ..() -/datum/reagent/toxin/plasma/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/plasma/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(holder.has_reagent(/datum/reagent/medicine/epinephrine)) - holder.remove_reagent(/datum/reagent/medicine/epinephrine, 2 * REM * delta_time) - affected_mob.adjustPlasma(20 * REM * delta_time) + holder.remove_reagent(/datum/reagent/medicine/epinephrine, 2 * REM * seconds_per_tick) + affected_mob.adjustPlasma(20 * REM * seconds_per_tick) return ..() /datum/reagent/toxin/plasma/on_mob_metabolize(mob/living/carbon/affected_mob) @@ -156,14 +156,14 @@ material = /datum/material/hot_ice chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/hot_ice/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/hot_ice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(holder.has_reagent(/datum/reagent/medicine/epinephrine)) - holder.remove_reagent(/datum/reagent/medicine/epinephrine, 2 * REM * delta_time) - affected_mob.adjustPlasma(20 * REM * delta_time) - affected_mob.adjust_bodytemperature(-7 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * delta_time, affected_mob.get_body_temp_normal()) + holder.remove_reagent(/datum/reagent/medicine/epinephrine, 2 * REM * seconds_per_tick) + affected_mob.adjustPlasma(20 * REM * seconds_per_tick) + affected_mob.adjust_bodytemperature(-7 * TEMPERATURE_DAMAGE_COEFFICIENT * REM * seconds_per_tick, affected_mob.get_body_temp_normal()) if(ishuman(affected_mob)) var/mob/living/carbon/human/humi = affected_mob - humi.adjust_coretemperature(-7 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, affected_mob.get_body_temp_normal()) + humi.adjust_coretemperature(-7 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal()) return ..() /datum/reagent/toxin/hot_ice/on_mob_metabolize(mob/living/carbon/affected_mob) @@ -184,16 +184,16 @@ ph = 1.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/lexorin/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/lexorin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = TRUE if(HAS_TRAIT(affected_mob, TRAIT_NOBREATH)) . = FALSE if(.) - affected_mob.adjustOxyLoss(5 * REM * normalise_creation_purity() * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - affected_mob.losebreath += 2 * REM * normalise_creation_purity() * delta_time - if(DT_PROB(10, delta_time)) + affected_mob.adjustOxyLoss(5 * REM * normalise_creation_purity() * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.losebreath += 2 * REM * normalise_creation_purity() * seconds_per_tick + if(SPT_PROB(10, seconds_per_tick)) affected_mob.emote("gasp") ..() @@ -217,12 +217,12 @@ ph = 10 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/slimejelly/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(DT_PROB(5, delta_time)) +/datum/reagent/toxin/slimejelly/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your insides are burning!")) affected_mob.adjustToxLoss(rand(20, 60), FALSE, required_biotype = affected_biotype) . = TRUE - else if(DT_PROB(23, delta_time)) + else if(SPT_PROB(23, seconds_per_tick)) affected_mob.heal_bodypart_damage(5) . = TRUE ..() @@ -269,17 +269,17 @@ LAZYINITLIST(zombiepowder.data) zombiepowder.data["method"] |= INGEST -/datum/reagent/toxin/zombiepowder/on_mob_life(mob/living/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/zombiepowder/on_mob_life(mob/living/affected_mob, seconds_per_tick, times_fired) if(HAS_TRAIT(affected_mob, TRAIT_FAKEDEATH) && HAS_TRAIT(affected_mob, TRAIT_DEATHCOMA)) ..() return TRUE switch(current_cycle) if(1 to 5) - affected_mob.adjust_confusion(1 SECONDS * REM * delta_time) - affected_mob.adjust_drowsiness(2 SECONDS * REM * delta_time) - affected_mob.adjust_slurring(6 SECONDS * REM * delta_time) + affected_mob.adjust_confusion(1 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_drowsiness(2 SECONDS * REM * seconds_per_tick) + affected_mob.adjust_slurring(6 SECONDS * REM * seconds_per_tick) if(5 to 8) - affected_mob.adjustStaminaLoss(40 * REM * delta_time, 0) + affected_mob.adjustStaminaLoss(40 * REM * seconds_per_tick, 0) if(9 to INFINITY) affected_mob.fakedeath(type) ..() @@ -305,8 +305,8 @@ REMOVE_TRAIT(affected_mob, TRAIT_FAKEDEATH, type) ..() -/datum/reagent/toxin/ghoulpowder/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustOxyLoss(1 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) +/datum/reagent/toxin/ghoulpowder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustOxyLoss(1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) ..() . = TRUE @@ -332,14 +332,14 @@ . = ..() REMOVE_TRAIT(metabolizer, TRAIT_RDS_SUPPRESSED, type) -/datum/reagent/toxin/mindbreaker/on_mob_life(mob/living/carbon/metabolizer, delta_time, times_fired) +/datum/reagent/toxin/mindbreaker/on_mob_life(mob/living/carbon/metabolizer, seconds_per_tick, times_fired) // mindbreaker toxin assuages hallucinations in those plagued with it, mentally if(metabolizer.has_trauma_type(/datum/brain_trauma/mild/hallucinations)) metabolizer.remove_status_effect(/datum/status_effect/hallucination) // otherwise it creates hallucinations. truly a miracle medicine. else - metabolizer.adjust_hallucinations(10 SECONDS * REM * delta_time) + metabolizer.adjust_hallucinations(10 SECONDS * REM * seconds_per_tick) return ..() @@ -451,10 +451,10 @@ ph = 11 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/toxin/spore/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/spore/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) affected_mob.damageoverlaytemp = 60 affected_mob.update_damage_hud() - affected_mob.set_eye_blur_if_lower(6 SECONDS * REM * delta_time) + affected_mob.set_eye_blur_if_lower(6 SECONDS * REM * seconds_per_tick) return ..() /datum/reagent/toxin/spore_burning @@ -466,8 +466,8 @@ 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, delta_time, times_fired) - affected_mob.adjust_fire_stacks(2 * REM * delta_time) +/datum/reagent/toxin/spore_burning/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_fire_stacks(2 * REM * seconds_per_tick) affected_mob.ignite_mob() return ..() @@ -485,17 +485,17 @@ inverse_chem = /datum/reagent/impurity/chloralax chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/chloralhydrate/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/chloralhydrate/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) switch(current_cycle) if(1 to 10) - affected_mob.adjust_confusion(2 SECONDS * REM * normalise_creation_purity() * delta_time) - affected_mob.adjust_drowsiness(4 SECONDS * REM * normalise_creation_purity() * delta_time) + affected_mob.adjust_confusion(2 SECONDS * REM * normalise_creation_purity() * seconds_per_tick) + affected_mob.adjust_drowsiness(4 SECONDS * REM * normalise_creation_purity() * seconds_per_tick) if(10 to 50) - affected_mob.Sleeping(40 * REM * normalise_creation_purity() * delta_time) + affected_mob.Sleeping(40 * REM * normalise_creation_purity() * seconds_per_tick) . = TRUE if(51 to INFINITY) - affected_mob.Sleeping(40 * REM * normalise_creation_purity() * delta_time) - affected_mob.adjustToxLoss(1 * (current_cycle - 50) * REM * normalise_creation_purity() * delta_time, FALSE, required_biotype = affected_biotype) + affected_mob.Sleeping(40 * REM * normalise_creation_purity() * seconds_per_tick) + affected_mob.adjustToxLoss(1 * (current_cycle - 50) * REM * normalise_creation_purity() * seconds_per_tick, FALSE, required_biotype = affected_biotype) . = TRUE ..() @@ -520,13 +520,13 @@ icon = initial(copy_from.icon) icon_state = initial(copy_from.icon_state) -/datum/reagent/toxin/fakebeer/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/fakebeer/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) switch(current_cycle) if(1 to 50) - affected_mob.Sleeping(40 * REM * delta_time) + affected_mob.Sleeping(40 * REM * seconds_per_tick) if(51 to INFINITY) - affected_mob.Sleeping(40 * REM * delta_time) - affected_mob.adjustToxLoss(1 * (current_cycle - 50) * REM * delta_time, FALSE, required_biotype = affected_biotype) + affected_mob.Sleeping(40 * REM * seconds_per_tick) + affected_mob.adjustToxLoss(1 * (current_cycle - 50) * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) return ..() /datum/reagent/toxin/coffeepowder @@ -570,9 +570,9 @@ ph = 12.2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/mutetoxin/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/mutetoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) // Gain approximately 12 seconds * creation purity seconds of silence every metabolism tick. - affected_mob.set_silence_if_lower(6 SECONDS * REM * normalise_creation_purity() * delta_time) + affected_mob.set_silence_if_lower(6 SECONDS * REM * normalise_creation_purity() * seconds_per_tick) ..() /datum/reagent/toxin/staminatoxin @@ -584,8 +584,8 @@ toxpwr = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/staminatoxin/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustStaminaLoss(data * REM * delta_time, 0) +/datum/reagent/toxin/staminatoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustStaminaLoss(data * REM * seconds_per_tick, 0) data = max(data - 1, 3) ..() . = TRUE @@ -599,11 +599,11 @@ toxpwr = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/toxin/polonium/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/polonium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if (!HAS_TRAIT(affected_mob, TRAIT_IRRADIATED) && SSradiation.can_irradiate_basic(affected_mob)) affected_mob.AddComponent(/datum/component/irradiated) else - affected_mob.adjustToxLoss(1 * REM * delta_time, required_biotype = affected_biotype) + affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, required_biotype = affected_biotype) ..() @@ -618,8 +618,8 @@ toxpwr = 0 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/toxin/histamine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(DT_PROB(30, delta_time)) +/datum/reagent/toxin/histamine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(30, seconds_per_tick)) switch(pick(1, 2, 3, 4)) if(1) to_chat(affected_mob, span_danger("You can barely see!")) @@ -635,10 +635,10 @@ . = TRUE ..() -/datum/reagent/toxin/histamine/overdose_process(mob/living/affected_mob, delta_time, times_fired) - affected_mob.adjustOxyLoss(2 * REM * delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - affected_mob.adjustBruteLoss(2 * REM * delta_time, FALSE, FALSE, BODYTYPE_ORGANIC) - affected_mob.adjustToxLoss(2 * REM * delta_time, FALSE, required_biotype = affected_biotype) +/datum/reagent/toxin/histamine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustOxyLoss(2 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.adjustBruteLoss(2 * REM * seconds_per_tick, FALSE, FALSE, BODYTYPE_ORGANIC) + affected_mob.adjustToxLoss(2 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) ..() . = TRUE @@ -656,8 +656,8 @@ inverse_chem = /datum/reagent/impurity/methanol chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(DT_PROB(2.5, delta_time)) +/datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(2.5, seconds_per_tick)) holder.add_reagent(/datum/reagent/toxin/histamine, pick(5,15)) holder.remove_reagent(/datum/reagent/toxin/formaldehyde, 1.2) else @@ -674,16 +674,16 @@ ///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, delta_time, times_fired) +/datum/reagent/toxin/venom/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) var/newsize = 1.1 * RESIZE_DEFAULT_SIZE affected_mob.resize = newsize/current_size current_size = newsize affected_mob.update_transform() toxpwr = 0.1 * volume - affected_mob.adjustBruteLoss((0.3 * volume) * REM * delta_time, FALSE, required_bodytype = affected_bodytype) + affected_mob.adjustBruteLoss((0.3 * volume) * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) . = TRUE - if(DT_PROB(8, delta_time)) + if(SPT_PROB(8, seconds_per_tick)) holder.add_reagent(/datum/reagent/toxin/histamine, pick(5, 10)) holder.remove_reagent(/datum/reagent/toxin/venom, 1.1) else @@ -708,14 +708,14 @@ 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, delta_time, times_fired) - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3 * REM * normalise_creation_purity() * delta_time, 150) +/datum/reagent/toxin/fentanyl/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3 * REM * normalise_creation_purity() * seconds_per_tick, 150) if(affected_mob.toxloss <= 60) - affected_mob.adjustToxLoss(1 * REM * normalise_creation_purity() * delta_time, FALSE, required_biotype = affected_biotype) + affected_mob.adjustToxLoss(1 * REM * normalise_creation_purity() * seconds_per_tick, FALSE, required_biotype = affected_biotype) if(current_cycle >= 4) affected_mob.add_mood_event("smacked out", /datum/mood_event/narcotic_heavy, name) if(current_cycle >= 18) - affected_mob.Sleeping(40 * REM * normalise_creation_purity() * delta_time) + affected_mob.Sleeping(40 * REM * normalise_creation_purity() * seconds_per_tick) ..() return TRUE @@ -731,10 +731,10 @@ ph = 9.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/cyanide/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(DT_PROB(2.5, delta_time)) +/datum/reagent/toxin/cyanide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(2.5, seconds_per_tick)) affected_mob.losebreath += 1 - if(DT_PROB(4, delta_time)) + if(SPT_PROB(4, seconds_per_tick)) to_chat(affected_mob, span_danger("You feel horrendously weak!")) affected_mob.Stun(40) affected_mob.adjustToxLoss(2*REM * normalise_creation_purity(), FALSE, required_biotype = affected_biotype) @@ -764,20 +764,20 @@ penetrates_skin = TOUCH|VAPOR chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/itching_powder/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(DT_PROB(8, delta_time)) +/datum/reagent/toxin/itching_powder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(8, seconds_per_tick)) to_chat(affected_mob, span_danger("You scratch at your head.")) affected_mob.adjustBruteLoss(0.2*REM, FALSE, required_bodytype = affected_bodytype) . = TRUE - if(DT_PROB(8, delta_time)) + if(SPT_PROB(8, seconds_per_tick)) to_chat(affected_mob, span_danger("You scratch at your leg.")) affected_mob.adjustBruteLoss(0.2*REM, FALSE, required_bodytype = affected_bodytype) . = TRUE - if(DT_PROB(8, delta_time)) + if(SPT_PROB(8, seconds_per_tick)) to_chat(affected_mob, span_danger("You scratch at your arm.")) affected_mob.adjustBruteLoss(0.2*REM, FALSE, required_bodytype = affected_bodytype) . = TRUE - if(DT_PROB(1.5, delta_time)) + if(SPT_PROB(1.5, seconds_per_tick)) holder.add_reagent(/datum/reagent/toxin/histamine,rand(1,3)) holder.remove_reagent(/datum/reagent/toxin/itching_powder,1.2) return @@ -793,8 +793,8 @@ 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, delta_time, times_fired) - if(DT_PROB(13, delta_time)) +/datum/reagent/toxin/initropidril/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + if(SPT_PROB(13, seconds_per_tick)) var/picked_option = rand(1,3) switch(picked_option) if(1) @@ -826,11 +826,11 @@ 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, delta_time, times_fired) +/datum/reagent/toxin/pancuronium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(current_cycle >= 10) - affected_mob.Stun(40 * REM * delta_time) + affected_mob.Stun(40 * REM * seconds_per_tick) . = TRUE - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) affected_mob.losebreath += 4 ..() @@ -852,10 +852,10 @@ . = ..() REMOVE_TRAIT(affected_mob, TRAIT_ANTICONVULSANT, name) -/datum/reagent/toxin/sodium_thiopental/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/sodium_thiopental/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(current_cycle >= 10) - affected_mob.Sleeping(40 * REM * delta_time) - affected_mob.adjustStaminaLoss(10 * REM * delta_time, 0) + affected_mob.Sleeping(40 * REM * seconds_per_tick) + affected_mob.adjustStaminaLoss(10 * REM * seconds_per_tick, 0) ..() return TRUE @@ -872,9 +872,9 @@ ph = 6 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/sulfonal/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/sulfonal/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(current_cycle >= 22) - affected_mob.Sleeping(40 * REM * normalise_creation_purity() * delta_time) + affected_mob.Sleeping(40 * REM * normalise_creation_purity() * seconds_per_tick) return ..() /datum/reagent/toxin/amanitin @@ -888,8 +888,8 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED var/delayed_toxin_damage = 0 -/datum/reagent/toxin/amanitin/on_mob_life(mob/living/affected_mob, delta_time, times_fired) - delayed_toxin_damage += (delta_time * 3) +/datum/reagent/toxin/amanitin/on_mob_life(mob/living/affected_mob, seconds_per_tick, times_fired) + delayed_toxin_damage += (seconds_per_tick * 3) . = ..() /datum/reagent/toxin/amanitin/on_mob_delete(mob/living/affected_mob) @@ -912,10 +912,10 @@ inverse_chem = /datum/reagent/impurity/ipecacide chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/lipolicide/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/lipolicide/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(affected_mob.nutrition <= NUTRITION_LEVEL_STARVING) - affected_mob.adjustToxLoss(1 * REM * delta_time, FALSE, required_biotype = affected_biotype) - affected_mob.adjust_nutrition(-3 * REM * normalise_creation_purity() * delta_time) // making the chef more valuable, one meme trap at a time + affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + affected_mob.adjust_nutrition(-3 * REM * normalise_creation_purity() * seconds_per_tick) // making the chef more valuable, one meme trap at a time affected_mob.overeatduration = 0 return ..() @@ -928,9 +928,9 @@ toxpwr = 1.75 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/coniine/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/coniine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(affected_mob.losebreath < 5) - affected_mob.losebreath = min(affected_mob.losebreath + 5 * REM * delta_time, 5) + affected_mob.losebreath = min(affected_mob.losebreath + 5 * REM * seconds_per_tick, 5) return ..() /datum/reagent/toxin/spewium @@ -944,17 +944,17 @@ 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, delta_time, times_fired) +/datum/reagent/toxin/spewium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) .=..() - if(current_cycle >= 11 && DT_PROB(min(30, current_cycle), delta_time)) + if(current_cycle >= 11 && SPT_PROB(min(30, current_cycle), seconds_per_tick)) affected_mob.vomit(10, prob(10), prob(50), rand(0,4), TRUE) for(var/datum/reagent/toxin/R in affected_mob.reagents.reagent_list) if(R != src) affected_mob.reagents.remove_reagent(R.type,1) -/datum/reagent/toxin/spewium/overdose_process(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/spewium/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() - if(current_cycle >= 33 && DT_PROB(7.5, delta_time)) + if(current_cycle >= 33 && SPT_PROB(7.5, seconds_per_tick)) affected_mob.spew_organ() affected_mob.vomit(0, TRUE, TRUE, 4) to_chat(affected_mob, span_userdanger("You feel something lumpy come up as you vomit.")) @@ -968,10 +968,10 @@ toxpwr = 1 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/toxin/curare/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/curare/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(current_cycle >= 11) - affected_mob.Paralyze(60 * REM * delta_time) - affected_mob.adjustOxyLoss(0.5*REM*delta_time, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + affected_mob.Paralyze(60 * REM * seconds_per_tick) + affected_mob.adjustOxyLoss(0.5*REM*seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) . = TRUE ..() @@ -1010,7 +1010,7 @@ taste_description = "spinning" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/rotatium/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/rotatium/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(affected_mob.hud_used) if(current_cycle >= 20 && (current_cycle % 20) == 0) var/atom/movable/plane_master_controller/pm_controller = affected_mob.hud_used.plane_master_controllers[PLANE_MASTERS_GAME] @@ -1040,12 +1040,12 @@ ph = 8 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/anacea/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/anacea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) var/remove_amt = 5 if(holder.has_reagent(/datum/reagent/medicine/calomel) || holder.has_reagent(/datum/reagent/medicine/pen_acid)) remove_amt = 0.5 for(var/datum/reagent/medicine/R in affected_mob.reagents.reagent_list) - affected_mob.reagents.remove_reagent(R.type, remove_amt * REM * normalise_creation_purity() * delta_time) + affected_mob.reagents.remove_reagent(R.type, remove_amt * REM * normalise_creation_purity() * seconds_per_tick) return ..() //ACID @@ -1118,8 +1118,8 @@ mytray.adjust_toxic(round(chems.get_reagent_amount(type) * 3)) mytray.adjust_weedlevel(-rand(1,4)) -/datum/reagent/toxin/acid/fluacid/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustFireLoss((current_cycle/15) * REM * normalise_creation_purity() * delta_time, FALSE, required_bodytype = affected_bodytype) +/datum/reagent/toxin/acid/fluacid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustFireLoss((current_cycle/15) * REM * normalise_creation_purity() * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) . = TRUE ..() @@ -1134,8 +1134,8 @@ ph = 1.3 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/acid/nitracid/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustFireLoss((volume/10) * REM * normalise_creation_purity() * delta_time, FALSE, required_bodytype = affected_bodytype) //here you go nervar +/datum/reagent/toxin/acid/nitracid/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustFireLoss((volume/10) * REM * normalise_creation_purity() * seconds_per_tick, FALSE, required_bodytype = affected_bodytype) //here you go nervar . = TRUE ..() @@ -1150,11 +1150,11 @@ var/delay = 30 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_NO_RANDOM_RECIPE -/datum/reagent/toxin/delayed/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/toxin/delayed/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(current_cycle > delay) - holder.remove_reagent(type, actual_metaboliztion_rate * affected_mob.metabolism_efficiency * delta_time) - affected_mob.adjustToxLoss(actual_toxpwr * REM * delta_time, FALSE, required_biotype = affected_biotype) - if(DT_PROB(5, delta_time)) + holder.remove_reagent(type, actual_metaboliztion_rate * affected_mob.metabolism_efficiency * seconds_per_tick) + affected_mob.adjustToxLoss(actual_toxpwr * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.Paralyze(20) . = TRUE ..() @@ -1194,9 +1194,9 @@ affected_mob.say("oof ouch my bones", forced = /datum/reagent/toxin/bonehurtingjuice) return ..() -/datum/reagent/toxin/bonehurtingjuice/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustStaminaLoss(7.5 * REM * delta_time, 0) - if(DT_PROB(10, delta_time)) +/datum/reagent/toxin/bonehurtingjuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustStaminaLoss(7.5 * REM * seconds_per_tick, 0) + if(SPT_PROB(10, seconds_per_tick)) switch(rand(1, 3)) if(1) affected_mob.say(pick("oof.", "ouch.", "my bones.", "oof ouch.", "oof ouch my bones."), forced = /datum/reagent/toxin/bonehurtingjuice) @@ -1206,8 +1206,8 @@ to_chat(affected_mob, span_warning("Your bones hurt!")) return ..() -/datum/reagent/toxin/bonehurtingjuice/overdose_process(mob/living/carbon/affected_mob, delta_time, times_fired) - if(DT_PROB(2, delta_time) && iscarbon(affected_mob)) //big oof +/datum/reagent/toxin/bonehurtingjuice/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + 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. var/obj/item/bodypart/BP = affected_mob.get_bodypart(selected_part) if(BP) @@ -1230,8 +1230,8 @@ taste_description = "tannin" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/bungotoxin/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustOrganLoss(ORGAN_SLOT_HEART, 3 * REM * delta_time) +/datum/reagent/toxin/bungotoxin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustOrganLoss(ORGAN_SLOT_HEART, 3 * REM * seconds_per_tick) // If our mob's currently dizzy from anything else, we will also gain confusion var/mob_dizziness = affected_mob.get_timed_status_effect_duration(/datum/status_effect/confusion) @@ -1239,7 +1239,7 @@ // Gain confusion equal to about half the duration of our current dizziness affected_mob.set_confusion(mob_dizziness / 2) - if(current_cycle >= 12 && DT_PROB(4, delta_time)) + if(current_cycle >= 12 && SPT_PROB(4, seconds_per_tick)) var/tox_message = pick("You feel your heart spasm in your chest.", "You feel faint.","You feel you need to catch your breath.","You feel a prickle of pain in your chest.") to_chat(affected_mob, span_notice("[tox_message]")) . = TRUE @@ -1255,10 +1255,10 @@ taste_description = "sugary sweetness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/toxin/leadacetate/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustOrganLoss(ORGAN_SLOT_EARS, 1 * REM * delta_time) - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1 * REM * delta_time) - if(DT_PROB(0.5, delta_time)) +/datum/reagent/toxin/leadacetate/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustOrganLoss(ORGAN_SLOT_EARS, 1 * REM * seconds_per_tick) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1 * REM * seconds_per_tick) + if(SPT_PROB(0.5, seconds_per_tick)) to_chat(affected_mob, span_notice("Ah, what was that? You thought you heard something...")) affected_mob.adjust_confusion(5 SECONDS) return ..() @@ -1274,6 +1274,6 @@ description = "An extremely toxic chemical produced by the rare viper spider. Brings their prey to the brink of death and causes hallucinations." health_required = 10 -/datum/reagent/toxin/viperspider/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjust_hallucinations(10 SECONDS * REM * delta_time) +/datum/reagent/toxin/viperspider/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_hallucinations(10 SECONDS * REM * seconds_per_tick) return ..() diff --git a/code/modules/reagents/reagent_containers/misc.dm b/code/modules/reagents/reagent_containers/misc.dm index bfddf6bb475..44e778647db 100644 --- a/code/modules/reagents/reagent_containers/misc.dm +++ b/code/modules/reagents/reagent_containers/misc.dm @@ -27,16 +27,16 @@ if(cell && cell.charge > 0) . += span_notice("Ctrl+Click to toggle the power.") -/obj/item/reagent_containers/cup/maunamug/process(delta_time) +/obj/item/reagent_containers/cup/maunamug/process(seconds_per_tick) ..() if(on && (!cell || cell.charge <= 0)) //Check if we ran out of power change_power_status(FALSE) return FALSE - cell.use(5 * delta_time) //Basic cell goes for like 200 seconds, bluespace for 8000 + cell.use(5 * seconds_per_tick) //Basic cell goes for like 200 seconds, bluespace for 8000 if(!reagents.total_volume) return FALSE var/max_temp = min(500 + (500 * (0.2 * cell.rating)), 1000) // 373 to 1000 - reagents.adjust_thermal_energy(0.4 * cell.maxcharge * reagents.total_volume * delta_time, max_temp = max_temp) // 4 kelvin every tick on a basic cell. 160k on bluespace + reagents.adjust_thermal_energy(0.4 * cell.maxcharge * reagents.total_volume * seconds_per_tick, max_temp = max_temp) // 4 kelvin every tick on a basic cell. 160k on bluespace reagents.handle_reactions() update_appearance() if(reagents.chem_temp >= max_temp) diff --git a/code/modules/reagents/reagent_containers/watering_can.dm b/code/modules/reagents/reagent_containers/watering_can.dm index f1d484931a5..e237f73d141 100644 --- a/code/modules/reagents/reagent_containers/watering_can.dm +++ b/code/modules/reagents/reagent_containers/watering_can.dm @@ -36,9 +36,9 @@ . = ..() START_PROCESSING(SSobj, src) -/obj/item/reagent_containers/cup/watering_can/advanced/process(delta_time) +/obj/item/reagent_containers/cup/watering_can/advanced/process(seconds_per_tick) ///How much to refill - var/refill_add = min(volume - reagents.total_volume, refill_rate * delta_time) + var/refill_add = min(volume - reagents.total_volume, refill_rate * seconds_per_tick) if(refill_add > 0) reagents.add_reagent(refill_reagent, refill_add) diff --git a/code/modules/reagents/withdrawal/_addiction.dm b/code/modules/reagents/withdrawal/_addiction.dm index eb79201a007..3345aed7a37 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, delta_time, times_fired) +/datum/addiction/proc/process_addiction(mob/living/carbon/affected_carbon, seconds_per_tick, times_fired) 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 @@ -79,7 +79,7 @@ withdrawal_stage = 0 if(!on_drug_of_this_addiction && !HAS_TRAIT(affected_carbon, TRAIT_HOPELESSLY_ADDICTED)) - if(affected_carbon.mind.remove_addiction_points(type, addiction_loss_per_stage[withdrawal_stage + 1] * delta_time)) //If true was returned, we lost the addiction! + if(affected_carbon.mind.remove_addiction_points(type, addiction_loss_per_stage[withdrawal_stage + 1] * seconds_per_tick)) //If true was returned, we lost the addiction! return if(!current_addiction_cycle) //Dont do the effects if were not on drugs @@ -96,13 +96,13 @@ ///One cycle is 2 seconds switch(withdrawal_stage) if(1) - withdrawal_stage_1_process(affected_carbon, delta_time) + withdrawal_stage_1_process(affected_carbon, seconds_per_tick) if(2) - withdrawal_stage_2_process(affected_carbon, delta_time) + withdrawal_stage_2_process(affected_carbon, seconds_per_tick) if(3) - withdrawal_stage_3_process(affected_carbon, delta_time) + withdrawal_stage_3_process(affected_carbon, seconds_per_tick) - LAZYADDASSOC(affected_carbon.mind.active_addictions, type, 1 * delta_time) //Next cycle! + LAZYADDASSOC(affected_carbon.mind.active_addictions, type, 1 * seconds_per_tick) //Next cycle! /// Called when addiction enters stage 1 /datum/addiction/proc/withdrawal_enters_stage_1(mob/living/carbon/affected_carbon) @@ -121,16 +121,16 @@ affected_carbon.clear_mood_event("[type]_addiction") /// Called when addiction is in stage 1 every process -/datum/addiction/proc/withdrawal_stage_1_process(mob/living/carbon/affected_carbon, delta_time) - if(DT_PROB(5, delta_time)) +/datum/addiction/proc/withdrawal_stage_1_process(mob/living/carbon/affected_carbon, seconds_per_tick) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_carbon, span_danger("[withdrawal_stage_messages[1]]")) /// Called when addiction is in stage 2 every process -/datum/addiction/proc/withdrawal_stage_2_process(mob/living/carbon/affected_carbon, delta_time) - if(DT_PROB(10, delta_time) ) +/datum/addiction/proc/withdrawal_stage_2_process(mob/living/carbon/affected_carbon, seconds_per_tick) + if(SPT_PROB(10, seconds_per_tick) ) to_chat(affected_carbon, span_danger("[withdrawal_stage_messages[2]]")) /// Called when addiction is in stage 3 every process -/datum/addiction/proc/withdrawal_stage_3_process(mob/living/carbon/affected_carbon, delta_time) - if(DT_PROB(15, delta_time)) +/datum/addiction/proc/withdrawal_stage_3_process(mob/living/carbon/affected_carbon, seconds_per_tick) + if(SPT_PROB(15, seconds_per_tick)) to_chat(affected_carbon, span_danger("[withdrawal_stage_messages[3]]")) diff --git a/code/modules/reagents/withdrawal/generic_addictions.dm b/code/modules/reagents/withdrawal/generic_addictions.dm index 96f7354a286..0cb94b5f1b0 100644 --- a/code/modules/reagents/withdrawal/generic_addictions.dm +++ b/code/modules/reagents/withdrawal/generic_addictions.dm @@ -3,19 +3,19 @@ name = "opioid" withdrawal_stage_messages = list("I feel aches in my bodies..", "I need some pain relief...", "It aches all over...I need some opioids!") -/datum/addiction/opioids/withdrawal_stage_1_process(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/opioids/withdrawal_stage_1_process(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) affected_carbon.emote("yawn") /datum/addiction/opioids/withdrawal_enters_stage_2(mob/living/carbon/affected_carbon) . = ..() affected_carbon.apply_status_effect(/datum/status_effect/high_blood_pressure) -/datum/addiction/opioids/withdrawal_stage_3_process(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/opioids/withdrawal_stage_3_process(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() - if(affected_carbon.disgust < DISGUST_LEVEL_DISGUSTED && DT_PROB(7.5, delta_time)) - affected_carbon.adjust_disgust(12.5 * delta_time) + if(affected_carbon.disgust < DISGUST_LEVEL_DISGUSTED && SPT_PROB(7.5, seconds_per_tick)) + affected_carbon.adjust_disgust(12.5 * seconds_per_tick) /datum/addiction/opioids/end_withdrawal(mob/living/carbon/affected_carbon) . = ..() @@ -51,20 +51,20 @@ name = "alcohol" withdrawal_stage_messages = list("I could use a drink...", "Maybe the bar is still open?..", "God I need a drink!") -/datum/addiction/alcohol/withdrawal_stage_1_process(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/alcohol/withdrawal_stage_1_process(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() - affected_carbon.set_jitter_if_lower(10 SECONDS * delta_time) + affected_carbon.set_jitter_if_lower(10 SECONDS * seconds_per_tick) -/datum/addiction/alcohol/withdrawal_stage_2_process(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/alcohol/withdrawal_stage_2_process(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() - affected_carbon.set_jitter_if_lower(20 SECONDS * delta_time) + affected_carbon.set_jitter_if_lower(20 SECONDS * seconds_per_tick) affected_carbon.set_hallucinations_if_lower(10 SECONDS) -/datum/addiction/alcohol/withdrawal_stage_3_process(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/alcohol/withdrawal_stage_3_process(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() - affected_carbon.set_jitter_if_lower(30 SECONDS * delta_time) + affected_carbon.set_jitter_if_lower(30 SECONDS * seconds_per_tick) affected_carbon.set_hallucinations_if_lower(10 SECONDS) - if(DT_PROB(4, delta_time) && !HAS_TRAIT(affected_carbon, TRAIT_ANTICONVULSANT)) + if(SPT_PROB(4, seconds_per_tick) && !HAS_TRAIT(affected_carbon, TRAIT_ANTICONVULSANT)) affected_carbon.apply_status_effect(/datum/status_effect/seizure) /datum/addiction/hallucinogens @@ -97,9 +97,9 @@ . = ..() affected_carbon.apply_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type) -/datum/addiction/maintenance_drugs/withdrawal_stage_1_process(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/maintenance_drugs/withdrawal_stage_1_process(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() - if(DT_PROB(7.5, delta_time)) + if(SPT_PROB(7.5, seconds_per_tick)) affected_carbon.emote("growls") /datum/addiction/maintenance_drugs/withdrawal_enters_stage_2(mob/living/carbon/affected_carbon) @@ -127,7 +127,7 @@ ADD_TRAIT(affected_human, TRAIT_NIGHT_VISION, "maint_drug_addiction") empowered_eyes?.refresh() -/datum/addiction/maintenance_drugs/withdrawal_stage_3_process(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/maintenance_drugs/withdrawal_stage_3_process(mob/living/carbon/affected_carbon, seconds_per_tick) if(!ishuman(affected_carbon)) return var/mob/living/carbon/human/affected_human = affected_carbon @@ -136,7 +136,7 @@ if(lums > 0.5) affected_human.add_mood_event("too_bright", /datum/mood_event/bright_light) affected_human.adjust_dizzy_up_to(6 SECONDS, 80 SECONDS) - affected_human.adjust_confusion_up_to(0.5 SECONDS * delta_time, 20 SECONDS) + affected_human.adjust_confusion_up_to(0.5 SECONDS * seconds_per_tick, 20 SECONDS) else affected_carbon.clear_mood_event("too_bright") @@ -176,9 +176,9 @@ return health_doll_ref = WEAKREF(health_doll) -/datum/addiction/medicine/withdrawal_stage_1_process(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/medicine/withdrawal_stage_1_process(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) affected_carbon.emote("cough") /datum/addiction/medicine/withdrawal_enters_stage_2(mob/living/carbon/affected_carbon) @@ -209,18 +209,18 @@ return fake_alert_ref = WEAKREF(fake_alert) -/datum/addiction/medicine/withdrawal_stage_2_process(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/medicine/withdrawal_stage_2_process(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() var/datum/hallucination/fake_health_doll/hallucination = health_doll_ref?.resolve() if(QDELETED(hallucination)) health_doll_ref = null return - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) hallucination.add_fake_limb(severity = 1) return - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) hallucination.increment_fake_damage() return @@ -228,18 +228,18 @@ . = ..() affected_carbon.apply_status_effect(/datum/status_effect/grouped/screwy_hud/fake_crit, type) -/datum/addiction/medicine/withdrawal_stage_3_process(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/medicine/withdrawal_stage_3_process(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() var/datum/hallucination/fake_health_doll/hallucination = health_doll_ref?.resolve() - if(!QDELETED(hallucination) && DT_PROB(5, delta_time)) + if(!QDELETED(hallucination) && SPT_PROB(5, seconds_per_tick)) hallucination.increment_fake_damage() return - if(DT_PROB(15, delta_time)) + if(SPT_PROB(15, seconds_per_tick)) affected_carbon.emote("cough") return - if(DT_PROB(65, delta_time)) + if(SPT_PROB(65, seconds_per_tick)) return if(affected_carbon.stat >= SOFT_CRIT) @@ -272,19 +272,19 @@ medium_withdrawal_moodlet = /datum/mood_event/nicotine_withdrawal_moderate severe_withdrawal_moodlet = /datum/mood_event/nicotine_withdrawal_severe -/datum/addiction/nicotine/withdrawal_enters_stage_1(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/nicotine/withdrawal_enters_stage_1(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() - affected_carbon.set_jitter_if_lower(10 SECONDS * delta_time) + affected_carbon.set_jitter_if_lower(10 SECONDS * seconds_per_tick) -/datum/addiction/nicotine/withdrawal_stage_2_process(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/nicotine/withdrawal_stage_2_process(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() - affected_carbon.set_jitter_if_lower(20 SECONDS * delta_time) - if(DT_PROB(10, delta_time)) + affected_carbon.set_jitter_if_lower(20 SECONDS * seconds_per_tick) + if(SPT_PROB(10, seconds_per_tick)) affected_carbon.emote("cough") -/datum/addiction/nicotine/withdrawal_stage_3_process(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/nicotine/withdrawal_stage_3_process(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() - affected_carbon.set_jitter_if_lower(30 SECONDS * delta_time) - if(DT_PROB(15, delta_time)) + affected_carbon.set_jitter_if_lower(30 SECONDS * seconds_per_tick) + if(SPT_PROB(15, seconds_per_tick)) affected_carbon.emote("cough") */ diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index 3e0a2b23932..39af6595984 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -438,7 +438,7 @@ //timed process //charge the gas reservoir and perform flush if ready -/obj/machinery/disposal/bin/process(delta_time) +/obj/machinery/disposal/bin/process(seconds_per_tick) if(machine_stat & BROKEN) //nothing can happen if broken return @@ -470,7 +470,7 @@ return var/pressure_delta = (SEND_PRESSURE*1.01) - air_contents.return_pressure() - var/transfer_moles = 0.05 * delta_time * (pressure_delta*air_contents.volume)/(env.temperature * R_IDEAL_GAS_EQUATION) + var/transfer_moles = 0.05 * seconds_per_tick * (pressure_delta*air_contents.volume)/(env.temperature * R_IDEAL_GAS_EQUATION) //Actually transfer the gas var/datum/gas_mixture/removed = env.remove(transfer_moles) diff --git a/code/modules/religion/burdened/psyker.dm b/code/modules/religion/burdened/psyker.dm index 07f6630277a..537d163161d 100644 --- a/code/modules/religion/burdened/psyker.dm +++ b/code/modules/religion/burdened/psyker.dm @@ -20,16 +20,16 @@ qdel(removed_from.GetComponent(/datum/component/echolocation)) qdel(removed_from.GetComponent(/datum/component/anti_magic)) -/obj/item/organ/internal/brain/psyker/on_life(delta_time, times_fired) +/obj/item/organ/internal/brain/psyker/on_life(seconds_per_tick, times_fired) . = ..() var/obj/item/bodypart/head/psyker/psyker_head = owner.get_bodypart(zone) if(istype(psyker_head)) return - if(!DT_PROB(2, delta_time)) + if(!SPT_PROB(2, seconds_per_tick)) return to_chat(owner, span_userdanger("Your head hurts... It can't fit your brain!")) - owner.adjust_disgust(33 * delta_time) - apply_organ_damage(5 * delta_time, 199) + owner.adjust_disgust(33 * seconds_per_tick) + apply_organ_damage(5 * seconds_per_tick, 199) /obj/item/bodypart/head/psyker limb_id = BODYPART_ID_PSYKER @@ -306,7 +306,7 @@ game_plane_master_controller.remove_filter("psychic_blur") game_plane_master_controller.remove_filter("psychic_wave") -/datum/status_effect/psychic_projection/tick(delta_time, times_fired) +/datum/status_effect/psychic_projection/tick(seconds_per_tick, times_fired) var/obj/item/gun/held_gun = owner?.is_holding_item_of_type(/obj/item/gun) if(!held_gun) return diff --git a/code/modules/research/xenobiology/crossbreeding/_weapons.dm b/code/modules/research/xenobiology/crossbreeding/_weapons.dm index 7fe7b3f878b..4e2adcb958b 100644 --- a/code/modules/research/xenobiology/crossbreeding/_weapons.dm +++ b/code/modules/research/xenobiology/crossbreeding/_weapons.dm @@ -106,8 +106,8 @@ Slimecrossing Weapons . = ..() ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT) -/obj/item/gun/magic/bloodchill/process(delta_time) - charge_timer += delta_time +/obj/item/gun/magic/bloodchill/process(seconds_per_tick) + charge_timer += seconds_per_tick if(charge_timer < recharge_rate || charges >= max_charges) return FALSE charge_timer = 0 diff --git a/code/modules/research/xenobiology/crossbreeding/recurring.dm b/code/modules/research/xenobiology/crossbreeding/recurring.dm index 5f7e2b2e0fc..2c9f5f2d21c 100644 --- a/code/modules/research/xenobiology/crossbreeding/recurring.dm +++ b/code/modules/research/xenobiology/crossbreeding/recurring.dm @@ -26,9 +26,9 @@ Recurring extracts: src.forceMove(extract) START_PROCESSING(SSobj,src) -/obj/item/slimecross/recurring/process(delta_time) +/obj/item/slimecross/recurring/process(seconds_per_tick) if(cooldown > 0) - cooldown -= delta_time + cooldown -= seconds_per_tick else if(extract.Uses < 10 && extract.Uses > 0) extract.Uses++ cooldown = max_cooldown diff --git a/code/modules/spells/spell_types/jaunt/shadow_walk.dm b/code/modules/spells/spell_types/jaunt/shadow_walk.dm index a3d18f5f340..29bb8063367 100644 --- a/code/modules/spells/spell_types/jaunt/shadow_walk.dm +++ b/code/modules/spells/spell_types/jaunt/shadow_walk.dm @@ -44,7 +44,7 @@ /obj/effect/dummy/phased_mob/shadow name = "shadows" - /// The amount that shadow heals us per SSobj tick (times delta_time) + /// The amount that shadow heals us per SSobj tick (times seconds_per_tick) var/healing_rate = 1.5 /// When cooldown is active, you are prevented from moving into tiles that would eject you from your jaunt COOLDOWN_DECLARE(light_step_cooldown) @@ -59,7 +59,7 @@ STOP_PROCESSING(SSobj, src) return ..() -/obj/effect/dummy/phased_mob/shadow/process(delta_time) +/obj/effect/dummy/phased_mob/shadow/process(seconds_per_tick) var/turf/T = get_turf(src) if(!jaunter || jaunter.loc != src) qdel(src) @@ -70,7 +70,7 @@ if(!QDELETED(jaunter) && isliving(jaunter)) //heal in the dark var/mob/living/living_jaunter = jaunter - living_jaunter.heal_overall_damage(brute = (healing_rate * delta_time), burn = (healing_rate * delta_time), required_bodytype = BODYTYPE_ORGANIC) + living_jaunter.heal_overall_damage(brute = (healing_rate * seconds_per_tick), burn = (healing_rate * seconds_per_tick), required_bodytype = BODYTYPE_ORGANIC) /obj/effect/dummy/phased_mob/shadow/relaymove(mob/living/user, direction) var/turf/oldloc = loc diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index ffb7c615305..89cbf277348 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -424,7 +424,7 @@ return bodypart_organs //Return TRUE to get whatever mob this is in to update health. -/obj/item/bodypart/proc/on_life(delta_time, times_fired) +/obj/item/bodypart/proc/on_life(seconds_per_tick, times_fired) SHOULD_CALL_PARENT(TRUE) //Applies brute and burn damage to the organ. Returns 1 if the damage-icon states changed at all. diff --git a/code/modules/surgery/organs/_organ.dm b/code/modules/surgery/organs/_organ.dm index bfa34b69042..72af231e56e 100644 --- a/code/modules/surgery/organs/_organ.dm +++ b/code/modules/surgery/organs/_organ.dm @@ -186,13 +186,13 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) /obj/item/organ/proc/on_find(mob/living/finder) return -/obj/item/organ/process(delta_time, times_fired) +/obj/item/organ/process(seconds_per_tick, times_fired) return -/obj/item/organ/proc/on_death(delta_time, times_fired) +/obj/item/organ/proc/on_death(seconds_per_tick, times_fired) return -/obj/item/organ/proc/on_life(delta_time, times_fired) +/obj/item/organ/proc/on_life(seconds_per_tick, times_fired) CRASH("Oh god oh fuck something is calling parent organ life") /obj/item/organ/examine(mob/user) @@ -327,16 +327,16 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) ears.Insert(src) ears.set_organ_damage(0) -/obj/item/organ/proc/handle_failing_organs(delta_time) +/obj/item/organ/proc/handle_failing_organs(seconds_per_tick) return /** organ_failure * generic proc for handling dying organs * * Arguments: - * delta_time - seconds since last tick + * seconds_per_tick - seconds since last tick */ -/obj/item/organ/proc/organ_failure(delta_time) +/obj/item/organ/proc/organ_failure(seconds_per_tick) return /** get_availability diff --git a/code/modules/surgery/organs/appendix.dm b/code/modules/surgery/organs/appendix.dm index 3f98c660cac..10b190060bf 100644 --- a/code/modules/surgery/organs/appendix.dm +++ b/code/modules/surgery/organs/appendix.dm @@ -27,7 +27,7 @@ icon_state = "[base_icon_state][inflamation_stage ? "inflamed" : ""]" return ..() -/obj/item/organ/internal/appendix/on_life(delta_time, times_fired) +/obj/item/organ/internal/appendix/on_life(seconds_per_tick, times_fired) ..() var/mob/living/carbon/organ_owner = owner if(!organ_owner) @@ -35,10 +35,10 @@ if(organ_flags & ORGAN_FAILING) // forced to ensure people don't use it to gain tox as slime person - organ_owner.adjustToxLoss(2 * delta_time, updating_health = TRUE, forced = TRUE) + organ_owner.adjustToxLoss(2 * seconds_per_tick, updating_health = TRUE, forced = TRUE) else if(inflamation_stage) - inflamation(delta_time) - else if(DT_PROB(APPENDICITIS_PROB, delta_time)) + inflamation(seconds_per_tick) + else if(SPT_PROB(APPENDICITIS_PROB, seconds_per_tick)) become_inflamed() /obj/item/organ/internal/appendix/proc/become_inflamed() @@ -48,23 +48,23 @@ ADD_TRAIT(owner, TRAIT_DISEASELIKE_SEVERITY_MEDIUM, type) owner.med_hud_set_status() -/obj/item/organ/internal/appendix/proc/inflamation(delta_time) +/obj/item/organ/internal/appendix/proc/inflamation(seconds_per_tick) var/mob/living/carbon/organ_owner = owner - if(inflamation_stage < 3 && DT_PROB(INFLAMATION_ADVANCEMENT_PROB, delta_time)) + if(inflamation_stage < 3 && SPT_PROB(INFLAMATION_ADVANCEMENT_PROB, seconds_per_tick)) inflamation_stage += 1 switch(inflamation_stage) if(1) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) organ_owner.emote("cough") if(2) - if(DT_PROB(1.5, delta_time)) + if(SPT_PROB(1.5, seconds_per_tick)) to_chat(organ_owner, span_warning("You feel a stabbing pain in your abdomen!")) organ_owner.adjustOrganLoss(ORGAN_SLOT_APPENDIX, 5) organ_owner.Stun(rand(40, 60)) organ_owner.adjustToxLoss(1, updating_health = TRUE, forced = TRUE) if(3) - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) organ_owner.vomit(95) organ_owner.adjustOrganLoss(ORGAN_SLOT_APPENDIX, 15) diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm index 9c88b515839..9dcac8ef5ce 100644 --- a/code/modules/surgery/organs/augments_chest.dm +++ b/code/modules/surgery/organs/augments_chest.dm @@ -15,14 +15,14 @@ var/poison_amount = 5 slot = ORGAN_SLOT_STOMACH_AID -/obj/item/organ/internal/cyberimp/chest/nutriment/on_life(delta_time, times_fired) +/obj/item/organ/internal/cyberimp/chest/nutriment/on_life(seconds_per_tick, times_fired) if(synthesizing) return if(owner.nutrition <= hunger_threshold) synthesizing = TRUE to_chat(owner, span_notice("You feel less hungry...")) - owner.adjust_nutrition(25 * delta_time) + owner.adjust_nutrition(25 * seconds_per_tick) addtimer(CALLBACK(src, PROC_REF(synth_cool)), 50) /obj/item/organ/internal/cyberimp/chest/nutriment/proc/synth_cool() @@ -55,7 +55,7 @@ COOLDOWN_DECLARE(reviver_cooldown) -/obj/item/organ/internal/cyberimp/chest/reviver/on_life(delta_time, times_fired) +/obj/item/organ/internal/cyberimp/chest/reviver/on_life(seconds_per_tick, times_fired) if(reviving) switch(owner.stat) if(UNCONSCIOUS, HARD_CRIT) diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm index f0253f8933f..93be04d6348 100644 --- a/code/modules/surgery/organs/ears.dm +++ b/code/modules/surgery/organs/ears.dm @@ -28,7 +28,7 @@ // Multiplier for both long term and short term ear damage var/damage_multiplier = 1 -/obj/item/organ/internal/ears/on_life(delta_time, times_fired) +/obj/item/organ/internal/ears/on_life(seconds_per_tick, times_fired) // 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.")) @@ -41,8 +41,8 @@ if((organ_flags & ORGAN_FAILING)) deaf = max(deaf, 1) // if we're failing we always have at least 1 deaf stack (and thus deafness) else // only clear deaf stacks if we're not failing - deaf = max(deaf - (0.5 * delta_time), 0) - if((damage > low_threshold) && DT_PROB(damage / 60, delta_time)) + deaf = max(deaf - (0.5 * seconds_per_tick), 0) + if((damage > low_threshold) && SPT_PROB(damage / 60, seconds_per_tick)) adjustEarDamage(0, 4) SEND_SOUND(owner, sound('sound/weapons/flash_ring.ogg')) diff --git a/code/modules/surgery/organs/external/_external_organs.dm b/code/modules/surgery/organs/external/_external_organs.dm index 6565f2d9c2c..895adb3abb9 100644 --- a/code/modules/surgery/organs/external/_external_organs.dm +++ b/code/modules/surgery/organs/external/_external_organs.dm @@ -156,7 +156,7 @@ ownerlimb.update_icon_dropped() //else if(use_mob_sprite_as_obj_sprite) //are we out in the world, unprotected by flesh? -/obj/item/organ/external/on_life(delta_time, times_fired) +/obj/item/organ/external/on_life(seconds_per_tick, times_fired) return /obj/item/organ/external/update_overlays() diff --git a/code/modules/surgery/organs/external/wings/functional_wings.dm b/code/modules/surgery/organs/external/wings/functional_wings.dm index 1a5726de579..b9233da81c8 100644 --- a/code/modules/surgery/organs/external/wings/functional_wings.dm +++ b/code/modules/surgery/organs/external/wings/functional_wings.dm @@ -45,7 +45,7 @@ if(wings_open) toggle_flight(organ_owner) -/obj/item/organ/external/wings/functional/on_life(delta_time, times_fired) +/obj/item/organ/external/wings/functional/on_life(seconds_per_tick, times_fired) . = ..() handle_flight(owner) diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 34aca916487..262de707378 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -616,7 +616,7 @@ adapt_light.update_brightness(eye_owner) ADD_TRAIT(eye_owner, TRAIT_UNNATURAL_RED_GLOWY_EYES, ORGAN_TRAIT) -/obj/item/organ/internal/eyes/night_vision/maintenance_adapted/on_life(delta_time, times_fired) +/obj/item/organ/internal/eyes/night_vision/maintenance_adapted/on_life(seconds_per_tick, times_fired) if(!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/heart.dm b/code/modules/surgery/organs/heart.dm index 6de50db6272..5faa98b24d0 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -59,7 +59,7 @@ beating = FALSE update_appearance() -/obj/item/organ/internal/heart/on_life(delta_time, times_fired) +/obj/item/organ/internal/heart/on_life(seconds_per_tick, times_fired) ..() // If the owner doesn't need a heart, we don't need to do anything with it. @@ -150,7 +150,7 @@ accursed.adjustFireLoss(-heal_burn) accursed.adjustOxyLoss(-heal_oxy) -/obj/item/organ/internal/heart/cursed/on_life(delta_time, times_fired) +/obj/item/organ/internal/heart/cursed/on_life(seconds_per_tick, times_fired) if(!owner.client || !ishuman(owner)) // Let's be fair, if you're not here to pump, you're not here to suffer. last_pump = world.time return @@ -247,7 +247,7 @@ span_userdanger("You feel a terrible pain in your chest, as if your heart has stopped!")) addtimer(CALLBACK(src, PROC_REF(Restart)), 10 SECONDS) -/obj/item/organ/internal/heart/cybernetic/on_life(delta_time, times_fired) +/obj/item/organ/internal/heart/cybernetic/on_life(seconds_per_tick, times_fired) . = ..() if(dose_available && owner.health <= owner.crit_threshold && !owner.reagents.has_reagent(rid)) used_dose() @@ -267,7 +267,7 @@ /// The cooldown until the next time this heart can give the host an adrenaline boost. COOLDOWN_DECLARE(adrenaline_cooldown) -/obj/item/organ/internal/heart/freedom/on_life(delta_time, times_fired) +/obj/item/organ/internal/heart/freedom/on_life(seconds_per_tick, times_fired) . = ..() if(owner.health < 5 && COOLDOWN_FINISHED(src, adrenaline_cooldown)) COOLDOWN_START(src, adrenaline_cooldown, rand(25 SECONDS, 1 MINUTES)) diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm index 26be1babdbe..4865441b1e7 100755 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -90,14 +90,14 @@ #define HAS_NO_TOXIN 1 #define HAS_PAINFUL_TOXIN 2 -/obj/item/organ/internal/liver/on_life(delta_time, times_fired) +/obj/item/organ/internal/liver/on_life(seconds_per_tick, times_fired) var/mob/living/carbon/liver_owner = owner . = ..() //perform general on_life() if(!istype(liver_owner)) return if(organ_flags & ORGAN_FAILING || HAS_TRAIT(liver_owner, TRAIT_NOMETABOLISM)) //If your liver is failing or you lack a metabolism then we use the liverless version of metabolize - liver_owner.reagents.metabolize(liver_owner, delta_time, times_fired, can_overdose=TRUE, liverless=TRUE) + liver_owner.reagents.metabolize(liver_owner, seconds_per_tick, times_fired, can_overdose=TRUE, liverless=TRUE) return var/obj/belly = liver_owner.get_organ_slot(ORGAN_SLOT_STOMACH) @@ -119,21 +119,21 @@ if(provide_pain_message != HAS_PAINFUL_TOXIN) provide_pain_message = toxin.silent_toxin ? HAS_SILENT_TOXIN : HAS_PAINFUL_TOXIN - liver_owner.reagents.metabolize(liver_owner, delta_time, times_fired, can_overdose=TRUE) + liver_owner.reagents.metabolize(liver_owner, seconds_per_tick, times_fired, can_overdose=TRUE) if(liver_damage) - apply_organ_damage(min(liver_damage * delta_time , MAX_TOXIN_LIVER_DAMAGE * delta_time)) + apply_organ_damage(min(liver_damage * seconds_per_tick , MAX_TOXIN_LIVER_DAMAGE * seconds_per_tick)) - if(provide_pain_message && damage > 10 && DT_PROB(damage/6, delta_time)) //the higher the damage the higher the probability + if(provide_pain_message && damage > 10 && SPT_PROB(damage/6, seconds_per_tick)) //the higher the damage the higher the probability to_chat(liver_owner, span_warning("You feel a dull pain in your abdomen.")) -/obj/item/organ/internal/liver/handle_failing_organs(delta_time) +/obj/item/organ/internal/liver/handle_failing_organs(seconds_per_tick) if(HAS_TRAIT(owner, TRAIT_STABLELIVER) || HAS_TRAIT(owner, TRAIT_NOMETABOLISM)) return return ..() -/obj/item/organ/internal/liver/organ_failure(delta_time) +/obj/item/organ/internal/liver/organ_failure(seconds_per_tick) switch(failure_time/LIVER_FAILURE_STAGE_SECONDS) if(1) to_chat(owner, span_userdanger("You feel stabbing pain in your abdomen!")) @@ -157,30 +157,30 @@ switch(failure_time) //After 60 seconds we begin to feel the effects if(1 * LIVER_FAILURE_STAGE_SECONDS to 2 * LIVER_FAILURE_STAGE_SECONDS - 1) - owner.adjustToxLoss(0.2 * delta_time,forced = TRUE) - owner.adjust_disgust(0.1 * delta_time) + owner.adjustToxLoss(0.2 * seconds_per_tick,forced = TRUE) + owner.adjust_disgust(0.1 * seconds_per_tick) if(2 * LIVER_FAILURE_STAGE_SECONDS to 3 * LIVER_FAILURE_STAGE_SECONDS - 1) - owner.adjustToxLoss(0.4 * delta_time,forced = TRUE) - owner.adjust_drowsiness(0.5 SECONDS * delta_time) - owner.adjust_disgust(0.3 * delta_time) + owner.adjustToxLoss(0.4 * seconds_per_tick,forced = TRUE) + owner.adjust_drowsiness(0.5 SECONDS * seconds_per_tick) + owner.adjust_disgust(0.3 * seconds_per_tick) if(3 * LIVER_FAILURE_STAGE_SECONDS to 4 * LIVER_FAILURE_STAGE_SECONDS - 1) - owner.adjustToxLoss(0.6 * delta_time,forced = TRUE) - owner.adjustOrganLoss(pick(ORGAN_SLOT_HEART,ORGAN_SLOT_LUNGS,ORGAN_SLOT_STOMACH,ORGAN_SLOT_EYES,ORGAN_SLOT_EARS),0.2 * delta_time) - owner.adjust_drowsiness(1 SECONDS * delta_time) - owner.adjust_disgust(0.6 * delta_time) + owner.adjustToxLoss(0.6 * seconds_per_tick,forced = TRUE) + owner.adjustOrganLoss(pick(ORGAN_SLOT_HEART,ORGAN_SLOT_LUNGS,ORGAN_SLOT_STOMACH,ORGAN_SLOT_EYES,ORGAN_SLOT_EARS),0.2 * seconds_per_tick) + owner.adjust_drowsiness(1 SECONDS * seconds_per_tick) + owner.adjust_disgust(0.6 * seconds_per_tick) - if(DT_PROB(1.5, delta_time)) + if(SPT_PROB(1.5, seconds_per_tick)) owner.emote("drool") if(4 * LIVER_FAILURE_STAGE_SECONDS to INFINITY) - owner.adjustToxLoss(0.8 * delta_time,forced = TRUE) - owner.adjustOrganLoss(pick(ORGAN_SLOT_HEART,ORGAN_SLOT_LUNGS,ORGAN_SLOT_STOMACH,ORGAN_SLOT_EYES,ORGAN_SLOT_EARS),0.5 * delta_time) - owner.adjust_drowsiness(1.6 SECONDS * delta_time) - owner.adjust_disgust(1.2 * delta_time) + owner.adjustToxLoss(0.8 * seconds_per_tick,forced = TRUE) + owner.adjustOrganLoss(pick(ORGAN_SLOT_HEART,ORGAN_SLOT_LUNGS,ORGAN_SLOT_STOMACH,ORGAN_SLOT_EYES,ORGAN_SLOT_EARS),0.5 * seconds_per_tick) + owner.adjust_drowsiness(1.6 SECONDS * seconds_per_tick) + owner.adjust_disgust(1.2 * seconds_per_tick) - if(DT_PROB(3, delta_time)) + if(SPT_PROB(3, seconds_per_tick)) owner.emote("drool") /obj/item/organ/internal/liver/on_owner_examine(datum/source, mob/user, list/examine_list) diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 7e866c77e94..d27447aac0e 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -776,13 +776,13 @@ // The air you breathe out should match your body temperature breath.temperature = breather.bodytemperature -/obj/item/organ/internal/lungs/on_life(delta_time, times_fired) +/obj/item/organ/internal/lungs/on_life(seconds_per_tick, times_fired) . = ..() if(failed && !(organ_flags & ORGAN_FAILING)) failed = FALSE return if(damage >= low_threshold) - var/do_i_cough = DT_PROB((damage < high_threshold) ? 2.5 : 5, delta_time) // between : past high + var/do_i_cough = SPT_PROB((damage < high_threshold) ? 2.5 : 5, seconds_per_tick) // between : past high if(do_i_cough) owner.emote("cough") if(organ_flags & ORGAN_FAILING && owner.stat == CONSCIOUS) diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index cae11fa3cba..a51ad9dd1fe 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -37,28 +37,28 @@ START_PROCESSING(SSobj, src) -/obj/item/organ/internal/process(delta_time, times_fired) - on_death(delta_time, times_fired) //Kinda hate doing it like this, but I really don't want to call process directly. +/obj/item/organ/internal/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/internal/on_death(delta_time, times_fired) //runs decay when outside of a person +/obj/item/organ/internal/on_death(seconds_per_tick, times_fired) //runs decay when outside of a person if(organ_flags & (ORGAN_SYNTHETIC | ORGAN_FROZEN)) return - apply_organ_damage(decay_factor * maxHealth * delta_time) + apply_organ_damage(decay_factor * maxHealth * seconds_per_tick) /// Called once every life tick on every organ in a carbon's body /// NOTE: THIS IS VERY HOT. Be careful what you put in here /// To give you some scale, if there's 100 carbons in the game, they each have maybe 9 organs /// So that's 900 calls to this proc every life process. Please don't be dumb -/obj/item/organ/internal/on_life(delta_time, times_fired) //repair organ damage if the organ is not failing +/obj/item/organ/internal/on_life(seconds_per_tick, times_fired) //repair organ damage if the organ is not failing if(organ_flags & ORGAN_FAILING) - handle_failing_organs(delta_time) + handle_failing_organs(seconds_per_tick) return if(failure_time > 0) failure_time-- if(organ_flags & ORGAN_SYNTHETIC_EMP) //Synthetic organ has been emped, is now failing. - apply_organ_damage(decay_factor * maxHealth * delta_time) + apply_organ_damage(decay_factor * maxHealth * seconds_per_tick) return if(!damage) // No sense healing if you're not even hurt bro @@ -68,7 +68,7 @@ var/healing_amount = healing_factor ///Damage decrements again by a percent of its maxhealth, up to a total of 4 extra times depending on the owner's health healing_amount += (owner.satiety > 0) ? (4 * healing_factor * owner.satiety / MAX_SATIETY) : 0 - apply_organ_damage(-healing_amount * maxHealth * delta_time, damage) // pass curent damage incase we are over cap + apply_organ_damage(-healing_amount * maxHealth * seconds_per_tick, damage) // pass curent damage incase we are over cap ///Used as callbacks by object pooling /obj/item/organ/internal/exit_wardrobe() @@ -79,9 +79,9 @@ STOP_PROCESSING(SSobj, src) ///Organs don't die instantly, and neither should you when you get fucked up -/obj/item/organ/internal/handle_failing_organs(delta_time) +/obj/item/organ/internal/handle_failing_organs(seconds_per_tick) if(owner.stat == DEAD) return - failure_time += delta_time - organ_failure(delta_time) + failure_time += seconds_per_tick + organ_failure(seconds_per_tick) diff --git a/code/modules/surgery/organs/stomach/_stomach.dm b/code/modules/surgery/organs/stomach/_stomach.dm index 3bc55e21e3f..566c5fbfaac 100644 --- a/code/modules/surgery/organs/stomach/_stomach.dm +++ b/code/modules/surgery/organs/stomach/_stomach.dm @@ -40,14 +40,14 @@ else reagents.flags |= REAGENT_HOLDER_ALIVE -/obj/item/organ/internal/stomach/on_life(delta_time, times_fired) +/obj/item/organ/internal/stomach/on_life(seconds_per_tick, times_fired) . = ..() //Manage species digestion if(ishuman(owner)) var/mob/living/carbon/human/humi = owner if(!(organ_flags & ORGAN_FAILING)) - handle_hunger(humi, delta_time, times_fired) + handle_hunger(humi, seconds_per_tick, times_fired) var/mob/living/carbon/body = owner @@ -71,7 +71,7 @@ amount_max = max(amount_max - amount_food, 0) // Transfer the amount of reagents based on volume with a min amount of 1u - var/amount = min((round(metabolism_efficiency * amount_max, 0.05) + rate_min) * delta_time, amount_max) + var/amount = min((round(metabolism_efficiency * amount_max, 0.05) + rate_min) * seconds_per_tick, amount_max) if(amount <= 0) continue @@ -83,7 +83,7 @@ //Handle disgust if(body) - handle_disgust(body, delta_time, times_fired) + handle_disgust(body, seconds_per_tick, times_fired) //If the stomach is not damage exit out if(damage < low_threshold) @@ -106,17 +106,17 @@ return //The stomach is damage has nutriment but low on theshhold, lo prob of vomit - if(DT_PROB(0.0125 * damage * nutri_vol * nutri_vol, delta_time)) + if(SPT_PROB(0.0125 * damage * nutri_vol * nutri_vol, seconds_per_tick)) body.vomit(damage) to_chat(body, span_warning("Your stomach reels in pain as you're incapable of holding down all that food!")) return // the change of vomit is now high - if(damage > high_threshold && DT_PROB(0.05 * damage * nutri_vol * nutri_vol, delta_time)) + if(damage > high_threshold && SPT_PROB(0.05 * damage * nutri_vol * nutri_vol, seconds_per_tick)) body.vomit(damage) to_chat(body, span_warning("Your stomach reels in pain as you're incapable of holding down all that food!")) -/obj/item/organ/internal/stomach/proc/handle_hunger(mob/living/carbon/human/human, delta_time, times_fired) +/obj/item/organ/internal/stomach/proc/handle_hunger(mob/living/carbon/human/human, seconds_per_tick, times_fired) if(HAS_TRAIT(human, TRAIT_NOHUNGER)) return //hunger is for BABIES @@ -151,19 +151,19 @@ human.satiety = -MAX_SATIETY else if(human.satiety < 0) human.satiety++ - if(DT_PROB(round(-human.satiety/77), delta_time)) + if(SPT_PROB(round(-human.satiety/77), seconds_per_tick)) human.set_jitter_if_lower(10 SECONDS) hunger_rate = 3 * HUNGER_FACTOR hunger_rate *= human.physiology.hunger_mod - human.adjust_nutrition(-hunger_rate * delta_time) + human.adjust_nutrition(-hunger_rate * seconds_per_tick) var/nutrition = human.nutrition if(nutrition > NUTRITION_LEVEL_FULL) if(human.overeatduration < 20 MINUTES) //capped so people don't take forever to unfat - human.overeatduration = min(human.overeatduration + (1 SECONDS * delta_time), 20 MINUTES) + human.overeatduration = min(human.overeatduration + (1 SECONDS * seconds_per_tick), 20 MINUTES) else if(human.overeatduration > 0) - human.overeatduration = max(human.overeatduration - (2 SECONDS * delta_time), 0) //doubled the unfat rate + human.overeatduration = max(human.overeatduration - (2 SECONDS * seconds_per_tick), 0) //doubled the unfat rate //metabolism change if(nutrition > NUTRITION_LEVEL_FAT) @@ -212,30 +212,30 @@ /obj/item/organ/internal/stomach/proc/after_eat(atom/edible) return -/obj/item/organ/internal/stomach/proc/handle_disgust(mob/living/carbon/human/disgusted, delta_time, times_fired) +/obj/item/organ/internal/stomach/proc/handle_disgust(mob/living/carbon/human/disgusted, seconds_per_tick, times_fired) var/old_disgust = disgusted.old_disgust var/disgust = disgusted.disgust if(disgust) var/pukeprob = 2.5 + (0.025 * disgust) if(disgust >= DISGUST_LEVEL_GROSS) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) disgusted.adjust_stutter(2 SECONDS) disgusted.adjust_confusion(2 SECONDS) - if(DT_PROB(5, delta_time) && !disgusted.stat) + if(SPT_PROB(5, seconds_per_tick) && !disgusted.stat) to_chat(disgusted, span_warning("You feel kind of iffy...")) disgusted.adjust_jitter(-6 SECONDS) if(disgust >= DISGUST_LEVEL_VERYGROSS) - if(DT_PROB(pukeprob, delta_time)) //iT hAndLeS mOrE ThaN PukInG + if(SPT_PROB(pukeprob, seconds_per_tick)) //iT hAndLeS mOrE ThaN PukInG disgusted.adjust_confusion(2.5 SECONDS) disgusted.adjust_stutter(2 SECONDS) disgusted.vomit(10, distance = 0, vomit_type = NONE) disgusted.set_dizzy_if_lower(10 SECONDS) if(disgust >= DISGUST_LEVEL_DISGUSTED) - if(DT_PROB(13, delta_time)) + if(SPT_PROB(13, seconds_per_tick)) disgusted.set_eye_blur_if_lower(6 SECONDS) //We need to add more shit down here - disgusted.adjust_disgust(-0.25 * disgust_metabolism * delta_time) + disgusted.adjust_disgust(-0.25 * disgust_metabolism * seconds_per_tick) // I would consider breaking this up into steps matching the disgust levels // But disgust is used so rarely it wouldn't save a significant amount of time, and it makes the code just way worse @@ -276,18 +276,18 @@ /// How much [BURN] damage milk heals every second var/milk_burn_healing = 2.5 -/obj/item/organ/internal/stomach/bone/on_life(delta_time, times_fired) +/obj/item/organ/internal/stomach/bone/on_life(seconds_per_tick, times_fired) var/datum/reagent/consumable/milk/milk = locate(/datum/reagent/consumable/milk) in reagents.reagent_list if(milk) var/mob/living/carbon/body = owner if(milk.volume > 50) reagents.remove_reagent(milk.type, milk.volume - 5) to_chat(owner, span_warning("The excess milk is dripping off your bones!")) - body.heal_bodypart_damage(milk_brute_healing * REM * delta_time, milk_burn_healing * REM * delta_time) + body.heal_bodypart_damage(milk_brute_healing * REM * seconds_per_tick, milk_burn_healing * REM * seconds_per_tick) for(var/datum/wound/iter_wound as anything in body.all_wounds) - iter_wound.on_xadone(1 * REM * delta_time) - reagents.remove_reagent(milk.type, milk.metabolization_rate * delta_time) + iter_wound.on_xadone(1 * REM * seconds_per_tick) + reagents.remove_reagent(milk.type, milk.metabolization_rate * seconds_per_tick) return ..() /obj/item/organ/internal/stomach/bone/plasmaman diff --git a/code/modules/surgery/organs/stomach/stomach_ethereal.dm b/code/modules/surgery/organs/stomach/stomach_ethereal.dm index afbf6031203..4d43b6a3a0a 100644 --- a/code/modules/surgery/organs/stomach/stomach_ethereal.dm +++ b/code/modules/surgery/organs/stomach/stomach_ethereal.dm @@ -8,10 +8,10 @@ ///used to keep ethereals from spam draining power sources var/drain_time = 0 -/obj/item/organ/internal/stomach/ethereal/on_life(delta_time, times_fired) +/obj/item/organ/internal/stomach/ethereal/on_life(seconds_per_tick, times_fired) . = ..() - adjust_charge(-ETHEREAL_CHARGE_FACTOR * delta_time) - handle_charge(owner, delta_time, times_fired) + adjust_charge(-ETHEREAL_CHARGE_FACTOR * seconds_per_tick) + handle_charge(owner, seconds_per_tick, times_fired) /obj/item/organ/internal/stomach/ethereal/on_insert(mob/living/carbon/stomach_owner) . = ..() @@ -43,7 +43,7 @@ /obj/item/organ/internal/stomach/ethereal/proc/adjust_charge(amount) crystal_charge = clamp(crystal_charge + amount, ETHEREAL_CHARGE_NONE, ETHEREAL_CHARGE_DANGEROUS) -/obj/item/organ/internal/stomach/ethereal/proc/handle_charge(mob/living/carbon/carbon, delta_time, times_fired) +/obj/item/organ/internal/stomach/ethereal/proc/handle_charge(mob/living/carbon/carbon, seconds_per_tick, times_fired) switch(crystal_charge) if(-INFINITY to ETHEREAL_CHARGE_NONE) carbon.add_mood_event("charge", /datum/mood_event/decharged) @@ -54,7 +54,7 @@ carbon.add_mood_event("charge", /datum/mood_event/decharged) carbon.throw_alert(ALERT_ETHEREAL_CHARGE, /atom/movable/screen/alert/lowcell/ethereal, 3) if(carbon.health > 10.5) - carbon.apply_damage(0.325 * delta_time, TOX, null, null, carbon) + carbon.apply_damage(0.325 * seconds_per_tick, TOX, null, null, carbon) if(ETHEREAL_CHARGE_LOWPOWER to ETHEREAL_CHARGE_NORMAL) carbon.add_mood_event("charge", /datum/mood_event/lowpower) carbon.throw_alert(ALERT_ETHEREAL_CHARGE, /atom/movable/screen/alert/lowcell/ethereal, 2) @@ -67,8 +67,8 @@ if(ETHEREAL_CHARGE_OVERLOAD to ETHEREAL_CHARGE_DANGEROUS) carbon.add_mood_event("charge", /datum/mood_event/supercharged) carbon.throw_alert(ALERT_ETHEREAL_OVERCHARGE, /atom/movable/screen/alert/ethereal_overcharge, 2) - carbon.apply_damage(0.325 * delta_time, TOX, null, null, carbon) - if(DT_PROB(5, delta_time)) // 5% each seacond for ethereals to explosively release excess energy if it reaches dangerous levels + carbon.apply_damage(0.325 * seconds_per_tick, TOX, null, null, carbon) + if(SPT_PROB(5, seconds_per_tick)) // 5% each seacond for ethereals to explosively release excess energy if it reaches dangerous levels discharge_process(carbon) else owner.clear_mood_event("charge") diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index 6c1d17d5e4f..64bd496f2bb 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -278,7 +278,7 @@ * Run an update cycle for this UI. Called internally by SStgui * every second or so. */ -/datum/tgui/process(delta_time, force = FALSE) +/datum/tgui/process(seconds_per_tick, force = FALSE) if(closing) return var/datum/host = src_object.ui_host(user) diff --git a/code/modules/unit_tests/mouse_bite_cable.dm b/code/modules/unit_tests/mouse_bite_cable.dm index e5b8cb1d2b7..0fa72ce0cf1 100644 --- a/code/modules/unit_tests/mouse_bite_cable.dm +++ b/code/modules/unit_tests/mouse_bite_cable.dm @@ -17,7 +17,7 @@ // relocate the rat biter.forceMove(stage) - // Ai controlling processes expect a delta_time, supply a real-fake dt + // Ai controlling processes expect a seconds_per_tick, supply a real-fake dt var/fake_dt = SSai_controllers.wait * 0.1 // Select behavior - this will queue finding the cable biter.ai_controller.SelectBehaviors(fake_dt) diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm index eedfbed358c..bf923cd6c3c 100644 --- a/code/modules/vehicles/atv.dm +++ b/code/modules/vehicles/atv.dm @@ -107,10 +107,10 @@ START_PROCESSING(SSobj, src) return ..() -/obj/vehicle/ridden/atv/process(delta_time) +/obj/vehicle/ridden/atv/process(seconds_per_tick) if(atom_integrity >= integrity_failure * max_integrity) return PROCESS_KILL - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) return var/datum/effect_system/fluid_spread/smoke/smoke = new smoke.set_up(0, holder = src, location = src) diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index d78ceb9d9eb..37af7006831 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -479,27 +479,27 @@ return examine_text //processing internal damage, temperature, air regulation, alert updates, lights power use. -/obj/vehicle/sealed/mecha/process(delta_time) +/obj/vehicle/sealed/mecha/process(seconds_per_tick) if(internal_damage) if(internal_damage & MECHA_INT_FIRE) - if(!(internal_damage & MECHA_INT_TEMP_CONTROL) && DT_PROB(2.5, delta_time)) + if(!(internal_damage & MECHA_INT_TEMP_CONTROL) && SPT_PROB(2.5, seconds_per_tick)) clear_internal_damage(MECHA_INT_FIRE) if(internal_tank) var/datum/gas_mixture/int_tank_air = internal_tank.return_air() if(int_tank_air.return_pressure() > internal_tank.maximum_pressure && !(internal_damage & MECHA_INT_TANK_BREACH)) set_internal_damage(MECHA_INT_TANK_BREACH) if(int_tank_air && int_tank_air.return_volume() > 0) //heat the air_contents - int_tank_air.temperature = min(6000+T0C, int_tank_air.temperature+rand(5,7.5)*delta_time) + int_tank_air.temperature = min(6000+T0C, int_tank_air.temperature+rand(5,7.5)*seconds_per_tick) if(cabin_air && cabin_air.return_volume()>0) - cabin_air.temperature = min(6000+T0C, cabin_air.return_temperature()+rand(5,7.5)*delta_time) + cabin_air.temperature = min(6000+T0C, cabin_air.return_temperature()+rand(5,7.5)*seconds_per_tick) if(cabin_air.return_temperature() > max_temperature/2) - take_damage(delta_time*2/round(max_temperature/cabin_air.return_temperature(),0.1), BURN, 0, 0) + take_damage(seconds_per_tick*2/round(max_temperature/cabin_air.return_temperature(),0.1), BURN, 0, 0) if(internal_damage & MECHA_INT_TANK_BREACH) //remove some air from internal tank if(internal_tank) var/datum/gas_mixture/int_tank_air = internal_tank.return_air() - var/datum/gas_mixture/leaked_gas = int_tank_air.remove_ratio(DT_PROB_RATE(0.05, delta_time)) + var/datum/gas_mixture/leaked_gas = int_tank_air.remove_ratio(SPT_PROB_RATE(0.05, seconds_per_tick)) if(loc) loc.assume_air(leaked_gas) else @@ -508,13 +508,13 @@ if(internal_damage & MECHA_INT_SHORT_CIRCUIT) if(get_charge()) spark_system.start() - cell.charge -= min(10 * delta_time, cell.charge) - cell.maxcharge -= min(10 * delta_time, cell.maxcharge) + cell.charge -= min(10 * seconds_per_tick, cell.charge) + cell.maxcharge -= min(10 * seconds_per_tick, cell.maxcharge) if(!(internal_damage & MECHA_INT_TEMP_CONTROL)) if(cabin_air && cabin_air.return_volume() > 0) var/delta = cabin_air.temperature - T20C - cabin_air.temperature -= clamp(round(delta / 8, 0.1), -5, 5) * delta_time + cabin_air.temperature -= clamp(round(delta / 8, 0.1), -5, 5) * seconds_per_tick if(internal_tank) var/datum/gas_mixture/tank_air = internal_tank.return_air() @@ -584,7 +584,7 @@ checking = checking.loc if(mecha_flags & LIGHTS_ON) - use_power(2*delta_time) + use_power(2*seconds_per_tick) //Diagnostic HUD updates diag_hud_set_mechhealth() diff --git a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm index 86f5e777054..a34f09642b6 100644 --- a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm @@ -207,7 +207,7 @@ /obj/item/mecha_parts/mecha_equipment/medical/sleeper/container_resist_act(mob/living/user) go_out() -/obj/item/mecha_parts/mecha_equipment/medical/sleeper/process(delta_time) +/obj/item/mecha_parts/mecha_equipment/medical/sleeper/process(seconds_per_tick) . = ..() if(.) return @@ -225,12 +225,12 @@ STOP_PROCESSING(SSobj, src) patient = null if(ex_patient.health > 0) - ex_patient.adjustOxyLoss(-0.5 * delta_time) - ex_patient.AdjustStun(-40 * delta_time) - ex_patient.AdjustKnockdown(-40 * delta_time) - ex_patient.AdjustParalyzed(-40 * delta_time) - ex_patient.AdjustImmobilized(-40 * delta_time) - ex_patient.AdjustUnconscious(-40 * delta_time) + ex_patient.adjustOxyLoss(-0.5 * seconds_per_tick) + ex_patient.AdjustStun(-40 * seconds_per_tick) + ex_patient.AdjustKnockdown(-40 * seconds_per_tick) + ex_patient.AdjustParalyzed(-40 * seconds_per_tick) + ex_patient.AdjustImmobilized(-40 * seconds_per_tick) + ex_patient.AdjustUnconscious(-40 * seconds_per_tick) if(ex_patient.reagents.get_reagent_amount(/datum/reagent/medicine/epinephrine) < 5) ex_patient.reagents.add_reagent(/datum/reagent/medicine/epinephrine, 5) chassis.use_power(energy_drain) @@ -471,7 +471,7 @@ return NONE -/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/process(delta_time) +/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/process(seconds_per_tick) . = ..() if(.) return @@ -479,7 +479,7 @@ to_chat(chassis.occupants, "[icon2html(src, chassis.occupants)][span_alert("Reagent processing stopped.")]") log_message("Reagent processing stopped.", LOG_MECHA) return PROCESS_KILL - var/amount = delta_time * synth_speed / LAZYLEN(processed_reagents) + var/amount = seconds_per_tick * synth_speed / LAZYLEN(processed_reagents) for(var/reagent in processed_reagents) reagents.add_reagent(reagent,amount) chassis.use_power(energy_drain) diff --git a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm index a6963c2ed70..8e24f802db2 100644 --- a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm @@ -239,14 +239,14 @@ chassis.add_overlay(droid_overlay) -/obj/item/mecha_parts/mecha_equipment/repair_droid/process(delta_time) +/obj/item/mecha_parts/mecha_equipment/repair_droid/process(seconds_per_tick) if(!chassis) return PROCESS_KILL - var/h_boost = health_boost * delta_time + var/h_boost = health_boost * seconds_per_tick var/repaired = FALSE if(chassis.internal_damage & MECHA_INT_SHORT_CIRCUIT) h_boost *= -2 - else if(chassis.internal_damage && DT_PROB(8, delta_time)) + else if(chassis.internal_damage && SPT_PROB(8, seconds_per_tick)) for(var/int_dam_flag in repairable_damage) if(!(chassis.internal_damage & int_dam_flag)) continue @@ -346,7 +346,7 @@ /obj/item/mecha_parts/mecha_equipment/generator/attackby(weapon,mob/user, params) load_fuel(weapon) -/obj/item/mecha_parts/mecha_equipment/generator/process(delta_time) +/obj/item/mecha_parts/mecha_equipment/generator/process(seconds_per_tick) if(!chassis) activated = FALSE return PROCESS_KILL @@ -364,8 +364,8 @@ var/use_fuel = fuelrate_idle if(cur_charge < chassis.cell.maxcharge) use_fuel = fuelrate_active - chassis.give_power(rechargerate * delta_time) - fuel.amount -= min(delta_time * use_fuel / MINERAL_MATERIAL_AMOUNT, fuel.amount) + chassis.give_power(rechargerate * seconds_per_tick) + fuel.amount -= min(seconds_per_tick * use_fuel / MINERAL_MATERIAL_AMOUNT, fuel.amount) /////////////////////////////////////////// THRUSTERS ///////////////////////////////////////////// diff --git a/code/modules/vehicles/mecha/mech_bay.dm b/code/modules/vehicles/mecha/mech_bay.dm index f61aec92718..b139af62faf 100644 --- a/code/modules/vehicles/mecha/mech_bay.dm +++ b/code/modules/vehicles/mecha/mech_bay.dm @@ -52,7 +52,7 @@ if(in_range(user, src) || isobserver(user)) . += span_notice("The status display reads: Recharge power [siunit(recharge_power, "W", 1)].") -/obj/machinery/mech_bay_recharge_port/process(delta_time) +/obj/machinery/mech_bay_recharge_port/process(seconds_per_tick) if(machine_stat & NOPOWER || !recharge_console) return var/obj/vehicle/sealed/mecha/recharging_mech = recharging_mech_ref?.resolve() @@ -64,7 +64,7 @@ if(!recharging_mech?.cell) return if(recharging_mech.cell.charge < recharging_mech.cell.maxcharge) - var/delta = min(recharge_power * delta_time, recharging_mech.cell.maxcharge - recharging_mech.cell.charge) + var/delta = min(recharge_power * seconds_per_tick, recharging_mech.cell.maxcharge - recharging_mech.cell.charge) recharging_mech.give_power(delta) use_power(delta + active_power_usage) else diff --git a/code/modules/vehicles/secway.dm b/code/modules/vehicles/secway.dm index 2f14dc767ef..337c154d869 100644 --- a/code/modules/vehicles/secway.dm +++ b/code/modules/vehicles/secway.dm @@ -25,10 +25,10 @@ START_PROCESSING(SSobj, src) return ..() -/obj/vehicle/ridden/secway/process(delta_time) +/obj/vehicle/ridden/secway/process(seconds_per_tick) if(atom_integrity >= integrity_failure * max_integrity) return PROCESS_KILL - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) return var/datum/effect_system/fluid_spread/smoke/smoke = new smoke.set_up(0, holder = src, location = src) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 08f523673c7..173e6c0dab3 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -1119,7 +1119,7 @@ SSblackbox.record_feedback("nested tally", "vending_machine_usage", 1, list("[type]", "[R.product_path]")) vend_ready = TRUE -/obj/machinery/vending/process(delta_time) +/obj/machinery/vending/process(seconds_per_tick) if(machine_stat & (BROKEN|NOPOWER)) return PROCESS_KILL if(!active) @@ -1129,12 +1129,12 @@ seconds_electrified-- //Pitch to the people! Really sell it! - if(last_slogan + slogan_delay <= world.time && slogan_list.len > 0 && !shut_up && DT_PROB(2.5, delta_time)) + if(last_slogan + slogan_delay <= world.time && slogan_list.len > 0 && !shut_up && SPT_PROB(2.5, seconds_per_tick)) var/slogan = pick(slogan_list) speak(slogan) last_slogan = world.time - if(shoot_inventory && DT_PROB(shoot_inventory_chance, delta_time)) + if(shoot_inventory && SPT_PROB(shoot_inventory_chance, seconds_per_tick)) throw_item() /** * Speak the given message verbally diff --git a/code/modules/wiremod/components/utility/clock.dm b/code/modules/wiremod/components/utility/clock.dm index af11c4a00dc..07cd95ebb39 100644 --- a/code/modules/wiremod/components/utility/clock.dm +++ b/code/modules/wiremod/components/utility/clock.dm @@ -34,7 +34,7 @@ stop_process() return ..() -/obj/item/circuit_component/clock/process(delta_time) +/obj/item/circuit_component/clock/process(seconds_per_tick) signal.set_output(COMPONENT_SIGNAL) /** diff --git a/code/modules/wiremod/core/usb_cable.dm b/code/modules/wiremod/core/usb_cable.dm index c636037bb15..d188f03c58a 100644 --- a/code/modules/wiremod/core/usb_cable.dm +++ b/code/modules/wiremod/core/usb_cable.dm @@ -32,7 +32,7 @@ // Look, I'm not happy about this either, but moving an object doesn't call Moved if it's inside something else. // There's good reason for this, but there's no element or similar yet to track it as far as I know. // SSobj runs infrequently, this is only ran while there's an attached circuit, its performance cost is negligible. -/obj/item/usb_cable/process(delta_time) +/obj/item/usb_cable/process(seconds_per_tick) if (!check_in_range()) return PROCESS_KILL diff --git a/code/modules/wiremod/shell/brain_computer_interface.dm b/code/modules/wiremod/shell/brain_computer_interface.dm index ec10945f66f..c40ac7d1580 100644 --- a/code/modules/wiremod/shell/brain_computer_interface.dm +++ b/code/modules/wiremod/shell/brain_computer_interface.dm @@ -274,7 +274,7 @@ to_chat(owner, span_info("[circuit_component.parent]'s [cell.name] has [cell.percent()]% charge left.")) to_chat(owner, span_info("You can recharge it by using a cyborg recharging station.")) -/datum/action/innate/bci_charge_action/process(delta_time) +/datum/action/innate/bci_charge_action/process(seconds_per_tick) build_all_button_icons(UPDATE_BUTTON_STATUS) /datum/action/innate/bci_charge_action/update_button_status(atom/movable/screen/movable/action_button/button, force = FALSE) diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm index ee6edfa1b4a..3530146f1a2 100644 --- a/code/modules/zombie/organs.dm +++ b/code/modules/zombie/organs.dm @@ -42,7 +42,7 @@ web of pus and viscera, bound tightly around the brain like some \ biological harness.") -/obj/item/organ/internal/zombie_infection/process(delta_time, times_fired) +/obj/item/organ/internal/zombie_infection/process(seconds_per_tick, times_fired) if(!owner) return if(!(src in owner.organs)) @@ -50,8 +50,8 @@ if(owner.mob_biotypes & MOB_MINERAL)//does not process in inorganic things return if (causes_damage && !iszombie(owner) && owner.stat != DEAD) - owner.adjustToxLoss(0.5 * delta_time) - if (DT_PROB(5, delta_time)) + owner.adjustToxLoss(0.5 * seconds_per_tick) + if (SPT_PROB(5, seconds_per_tick)) to_chat(owner, span_danger("You feel sick...")) if(timer_id || HAS_TRAIT(owner, TRAIT_SUICIDED) || !owner.get_organ_by_type(/obj/item/organ/internal/brain)) return diff --git a/modular_skyrat/master_files/code/datums/components/shielded_suit.dm b/modular_skyrat/master_files/code/datums/components/shielded_suit.dm index dc962b749dc..94601de771a 100644 --- a/modular_skyrat/master_files/code/datums/components/shielded_suit.dm +++ b/modular_skyrat/master_files/code/datums/components/shielded_suit.dm @@ -1,6 +1,6 @@ /datum/component/shielded/suit -/datum/component/shielded/suit/process(delta_time) +/datum/component/shielded/suit/process(seconds_per_tick) if(current_charges >= max_charges) STOP_PROCESSING(SSdcs, src) return diff --git a/modular_skyrat/master_files/code/modules/events/spacevine.dm b/modular_skyrat/master_files/code/modules/events/spacevine.dm index 7e64a965d5a..01f4cf7c84a 100644 --- a/modular_skyrat/master_files/code/modules/events/spacevine.dm +++ b/modular_skyrat/master_files/code/modules/events/spacevine.dm @@ -842,13 +842,13 @@ kudzu_seed.set_production(11 - (spread_cap / initial(spread_cap)) * 5) // Reverts spread_cap formula so resulting seed gets original production stat or equivalent back. qdel(src) -/datum/spacevine_controller/process(delta_time) +/datum/spacevine_controller/process(seconds_per_tick) var/vine_count = length(vines) if(!vine_count) qdel(src) // space vines exterminated. Remove the controller return - var/spread_max = round(clamp(delta_time * 0.5 * vine_count / spread_multiplier, 1, spread_cap)) + var/spread_max = round(clamp(seconds_per_tick * 0.5 * vine_count / spread_multiplier, 1, spread_cap)) var/amount_processed = 0 for(var/obj/structure/spacevine/current_vine as anything in growth_queue) if(!current_vine) @@ -860,7 +860,7 @@ if(current_vine.energy >= 2) // If tile is fully grown current_vine.entangle_mob() - else if(DT_PROB(10, delta_time)) // If tile isn't fully grown + else if(SPT_PROB(10, seconds_per_tick)) // If tile isn't fully grown current_vine.grow() current_vine.spread() diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bumbles.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bumbles.dm index 0c4ddd3457b..070bdc6cf93 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bumbles.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bumbles.dm @@ -143,14 +143,14 @@ /datum/ai_planning_subtree/bumbles_rest var/chance = 0.5 -/datum/ai_planning_subtree/bumbles_rest/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/bumbles_rest/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() var/mob/living/living_pawn = controller.pawn if(!istype(living_pawn)) return - if(living_pawn.buckled || !DT_PROB(chance, delta_time)) + if(living_pawn.buckled || !SPT_PROB(chance, seconds_per_tick)) return controller.queue_behavior(/datum/ai_behavior/bumbles_rest) @@ -158,7 +158,7 @@ /// Bumbles rests or sits up. /datum/ai_behavior/bumbles_rest -/datum/ai_behavior/bumbles_rest/perform(delta_time, datum/ai_controller/controller) +/datum/ai_behavior/bumbles_rest/perform(seconds_per_tick, datum/ai_controller/controller) . = ..() var/mob/living/living_pawn = controller.pawn diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm index d0cd331517d..115f624628e 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm @@ -262,7 +262,7 @@ /// Range to immediately target enemies var/view_range = 10 -/datum/ai_planning_subtree/emagged_borgi/SelectBehaviors(datum/ai_controller/controller, delta_time) +/datum/ai_planning_subtree/emagged_borgi/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) . = ..() // Emagged borgi? @@ -274,7 +274,7 @@ var/datum/weakref/weak_target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET] var/atom/target = weak_target?.resolve() if(QDELETED(target)) - if(!DT_PROB(chance, delta_time)) + if(!SPT_PROB(chance, seconds_per_tick)) return controller.queue_behavior(/datum/ai_behavior/find_potential_targets, BB_BASIC_MOB_CURRENT_TARGET, BB_PET_TARGETTING_DATUM, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION) @@ -290,7 +290,7 @@ /datum/ai_behavior/emagged_borgi_attack action_cooldown = 3 SECONDS -/datum/ai_behavior/emagged_borgi_attack/perform(delta_time, datum/ai_controller/controller, target_key) +/datum/ai_behavior/emagged_borgi_attack/perform(seconds_per_tick, datum/ai_controller/controller, target_key) var/atom/target = controller.blackboard[target_key] if(QDELETED(target)) return diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/poppy.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/poppy.dm index 5f1f10c2157..4bf62fa12a8 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/poppy.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/poppy.dm @@ -81,7 +81,7 @@ set_light_on(TRUE) regenerate_icons() -/mob/living/simple_animal/pet/poppy/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/pet/poppy/Life(seconds_per_tick = SSMOBS_DT, times_fired) if(client || stat) return @@ -92,7 +92,7 @@ near_engine = FALSE panic() - if(!DT_PROB(0.5, delta_time)) + if(!SPT_PROB(0.5, seconds_per_tick)) return if(!resting) manual_emote(pick("lets out a hiss before resting.", "catches a break.", "gives a simmering hiss before lounging.", "exams her surroundings before relaxing.")) diff --git a/modular_skyrat/master_files/code/modules/reagents/withdrawal/generic_addictions.dm b/modular_skyrat/master_files/code/modules/reagents/withdrawal/generic_addictions.dm index 1645f7cac96..098f57e0d3a 100644 --- a/modular_skyrat/master_files/code/modules/reagents/withdrawal/generic_addictions.dm +++ b/modular_skyrat/master_files/code/modules/reagents/withdrawal/generic_addictions.dm @@ -6,11 +6,11 @@ medium_withdrawal_moodlet = /datum/mood_event/nicotine_withdrawal_moderate severe_withdrawal_moodlet = /datum/mood_event/nicotine_withdrawal_severe -/datum/addiction/nicotine/proc/trigger_random_side_effect(mob/living/carbon/affected_carbon, delta_time, strength) +/datum/addiction/nicotine/proc/trigger_random_side_effect(mob/living/carbon/affected_carbon, seconds_per_tick, strength) switch(rand(1, 10)) if(1 to 3) if(!HAS_TRAIT(affected_carbon, TRAIT_NOHUNGER)) - affected_carbon.adjust_nutrition(-delta_time * 10 * strength) + affected_carbon.adjust_nutrition(-seconds_per_tick * 10 * strength) if(3 to 5) affected_carbon.emote("cough") if(5 to 7) @@ -24,24 +24,24 @@ to_chat(affected_carbon, span_warning("You feel tired.")) affected_carbon.adjustStaminaLoss(6 * strength) -/datum/addiction/nicotine/withdrawal_enters_stage_1(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/nicotine/withdrawal_enters_stage_1(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() affected_carbon.set_jitter_if_lower(10 SECONDS) -/datum/addiction/nicotine/withdrawal_enters_stage_2(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/nicotine/withdrawal_enters_stage_2(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() affected_carbon.set_jitter_if_lower(20 SECONDS) -/datum/addiction/nicotine/withdrawal_enters_stage_3(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/nicotine/withdrawal_enters_stage_3(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() affected_carbon.set_jitter_if_lower(30 SECONDS) -/datum/addiction/nicotine/withdrawal_stage_2_process(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/nicotine/withdrawal_stage_2_process(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() - if(DT_PROB(3, delta_time)) - trigger_random_side_effect(affected_carbon, delta_time, 1) + if(SPT_PROB(3, seconds_per_tick)) + trigger_random_side_effect(affected_carbon, seconds_per_tick, 1) -/datum/addiction/nicotine/withdrawal_stage_3_process(mob/living/carbon/affected_carbon, delta_time) +/datum/addiction/nicotine/withdrawal_stage_3_process(mob/living/carbon/affected_carbon, seconds_per_tick) . = ..() - if(DT_PROB(5, delta_time)) - trigger_random_side_effect(affected_carbon, delta_time, 2) + if(SPT_PROB(5, seconds_per_tick)) + trigger_random_side_effect(affected_carbon, seconds_per_tick, 2) diff --git a/modular_skyrat/modules/apocolypse_of_scythes/code/venus.dm b/modular_skyrat/modules/apocolypse_of_scythes/code/venus.dm index bf1a704a18a..7dafe18a755 100644 --- a/modular_skyrat/modules/apocolypse_of_scythes/code/venus.dm +++ b/modular_skyrat/modules/apocolypse_of_scythes/code/venus.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/hostile/venus_human_trap/Life(delta_time = SSMOBS_DT, times_fired) +/mob/living/simple_animal/hostile/venus_human_trap/Life(seconds_per_tick = SSMOBS_DT, times_fired) . = ..() check_vines() diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm b/modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm index 63c8f4e9a01..16d30c6427d 100644 --- a/modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm +++ b/modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm @@ -114,7 +114,7 @@ . += span_notice("You can use goliath hides to increase the amount dropped per harvest!") . += span_notice("You can use a regenerative core to force the plant to drop four harvests!") -/obj/structure/simple_farm/process(delta_time) +/obj/structure/simple_farm/process(seconds_per_tick) update_appearance() /obj/structure/simple_farm/update_appearance(updates) diff --git a/modular_skyrat/modules/assault_operatives/code/sunbeam.dm b/modular_skyrat/modules/assault_operatives/code/sunbeam.dm index 6dbda443aaf..1c1eac8e250 100644 --- a/modular_skyrat/modules/assault_operatives/code/sunbeam.dm +++ b/modular_skyrat/modules/assault_operatives/code/sunbeam.dm @@ -71,7 +71,7 @@ beam_overlay.pixel_y = beam_offset_y * i . += beam_overlay -/obj/effect/sunbeam/process(delta_time) +/obj/effect/sunbeam/process(seconds_per_tick) if(target_atom && COOLDOWN_FINISHED(src, movement_delay)) step_towards(src, target_atom) COOLDOWN_START(src, movement_delay, movement_cooldown) diff --git a/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_controller.dm b/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_controller.dm index d0b2e389a26..b6251000d92 100644 --- a/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_controller.dm +++ b/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_controller.dm @@ -189,7 +189,7 @@ active_resin[potato] = TRUE return -/datum/biohazard_blob_controller/process(delta_time) +/datum/biohazard_blob_controller/process(seconds_per_tick) progress_to_spread++ if(stalled && progress_to_spread < SPREAD_STALLED_PROCESS) return diff --git a/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_disease.dm b/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_disease.dm index 00ecd1a607f..398fb3ce0ec 100644 --- a/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_disease.dm +++ b/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_disease.dm @@ -13,57 +13,57 @@ severity = DISEASE_SEVERITY_BIOHAZARD bypasses_immunity = TRUE -/datum/disease/cryptococcus/stage_act(delta_time, times_fired) +/datum/disease/cryptococcus/stage_act(seconds_per_tick, times_fired) . = ..() if(!.) return switch(stage) if(1) - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) to_chat(affected_mob, span_danger("Your brain feels fuzzy. That's not right.")) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_danger("Your head hurts. Were the ceiling tiles always moving like that?")) if(2) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.emote("twitch") to_chat(affected_mob, span_danger("You twitch involuntarily. That's not right.")) - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) to_chat(affected_mob, span_danger("You sniff, smelling green slime. Does green have a smell?")) - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) to_chat(affected_mob, span_danger("Your head hurts. Were the ceiling tiles always moving like that?")) if(3) - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) to_chat(affected_mob, span_userdanger("You see four of everything!")) affected_mob.set_dizzy_if_lower(10 SECONDS) - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) to_chat(affected_mob, span_userdanger("You suddenly feel exhausted. Your movements are starting to feel stiff. Something seriously isn't right...")) affected_mob.adjustStaminaLoss(30, FALSE) - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) to_chat(affected_mob, span_userdanger("You feel hot. Very hot. Your muscles feel okay for a moment, but the pain returns.")) affected_mob.adjust_bodytemperature(20) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_userdanger("You feel air escape from your lungs painfully. You didn't intend to exhale, they seem to be seizing up on their own.")) affected_mob.adjustOxyLoss(25, FALSE) affected_mob.emote("gasp") if(4) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_userdanger("[pick("Your muscles seize!", "You collapse!")]")) affected_mob.adjustStaminaLoss(50, FALSE) affected_mob.Paralyze(40, FALSE) affected_mob.adjustBruteLoss(5) //It's damaging the muscles - if(DT_PROB(2, delta_time)) + if(SPT_PROB(2, seconds_per_tick)) affected_mob.adjustStaminaLoss(100, FALSE) affected_mob.visible_message(span_warning("[affected_mob] faints!"), span_userdanger("You surrender yourself and feel at peace...")) affected_mob.AdjustSleeping(100) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) to_chat(affected_mob, span_userdanger("You feel your mind relax and your thoughts drift!")) affected_mob.adjust_confusion(10 SECONDS) affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10) - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) to_chat(affected_mob, span_danger("[pick("You feel uncomfortably hot...", "You feel like unzipping your jumpsuit", "You feel like taking off some clothes...")]")) affected_mob.adjust_bodytemperature(30) - if(DT_PROB(5, delta_time)) + if(SPT_PROB(5, seconds_per_tick)) affected_mob.vomit(20) /datum/reagent/cryptococcus_spores diff --git a/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_structures.dm b/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_structures.dm index 299f97a37ca..448e107e913 100644 --- a/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_structures.dm +++ b/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_structures.dm @@ -427,7 +427,7 @@ START_PROCESSING(SSobj, src) -/obj/structure/biohazard_blob/structure/conditioner/process(delta_time) +/obj/structure/biohazard_blob/structure/conditioner/process(seconds_per_tick) if(!happy_atmos) return if(puff_delay > world.time) diff --git a/modular_skyrat/modules/black_mesa/code/healing_puddle.dm b/modular_skyrat/modules/black_mesa/code/healing_puddle.dm index 40aed533e2d..855959e0e15 100644 --- a/modular_skyrat/modules/black_mesa/code/healing_puddle.dm +++ b/modular_skyrat/modules/black_mesa/code/healing_puddle.dm @@ -11,7 +11,7 @@ . = ..() START_PROCESSING(SSobj, src) -/obj/structure/water_source/puddle/healing/process(delta_time) +/obj/structure/water_source/puddle/healing/process(seconds_per_tick) for(var/mob/living/iterating_mob in loc) iterating_mob.heal_overall_damage(2, 2) playsound(src, 'modular_skyrat/modules/emotes/sound/emotes/jelly_scream.ogg', 100) diff --git a/modular_skyrat/modules/cell_component/code/flashlight.dm b/modular_skyrat/modules/cell_component/code/flashlight.dm index 9b151811bc0..4d12fc97e67 100644 --- a/modular_skyrat/modules/cell_component/code/flashlight.dm +++ b/modular_skyrat/modules/cell_component/code/flashlight.dm @@ -95,7 +95,7 @@ update_brightness() update_item_action_buttons() -/obj/item/flashlight/process(delta_time) +/obj/item/flashlight/process(seconds_per_tick) if(!on) STOP_PROCESSING(SSobj, src) return diff --git a/modular_skyrat/modules/chadian/code/chadian.dm b/modular_skyrat/modules/chadian/code/chadian.dm index 8ce783dbc94..fc1e1048235 100644 --- a/modular_skyrat/modules/chadian/code/chadian.dm +++ b/modular_skyrat/modules/chadian/code/chadian.dm @@ -13,7 +13,7 @@ idle_behavior = /datum/idle_behavior/idle_dog/chadian /// Actual idle behavior that adds chad ian emotes -/datum/idle_behavior/idle_dog/chadian/perform_idle_behavior(delta_time, datum/ai_controller/basic_controller/dog/controller) +/datum/idle_behavior/idle_dog/chadian/perform_idle_behavior(seconds_per_tick, datum/ai_controller/basic_controller/dog/controller) . = ..() var/mob/living/basic/pet/dog/corgi/ian/ian_pawn = controller.pawn @@ -21,13 +21,13 @@ if(ian_pawn.buckled || ian_pawn.pulledby || ian_pawn.inventory_head || ian_pawn.inventory_back) return - if(DT_PROB(0.5, delta_time)) + if(SPT_PROB(0.5, seconds_per_tick)) ian_pawn.manual_emote(pick("flops forward laying flat.", "wags [p_their()] tail.", "lies down.")) ian_pawn.set_rest_state(RESTING_STATE_REST) - else if(DT_PROB(0.5, delta_time)) + else if(SPT_PROB(0.5, seconds_per_tick)) ian_pawn.manual_emote(pick("sits down.", "crouches on [p_their()] hind legs.", "looks alert.")) ian_pawn.set_rest_state(RESTING_STATE_SIT) - else if(DT_PROB(0.5, delta_time)) + else if(SPT_PROB(0.5, seconds_per_tick)) if (ian_pawn.resting_state) ian_pawn.manual_emote(pick("gets up and barks.", "walks around.", "stops resting.")) ian_pawn.set_rest_state(RESTING_STATE_NONE) diff --git a/modular_skyrat/modules/clock_cult/code/structures/_powered.dm b/modular_skyrat/modules/clock_cult/code/structures/_powered.dm index 9c2b6d71bcb..6d654f8d908 100644 --- a/modular_skyrat/modules/clock_cult/code/structures/_powered.dm +++ b/modular_skyrat/modules/clock_cult/code/structures/_powered.dm @@ -92,7 +92,7 @@ icon_state = base_icon_state + "_active" -/obj/structure/destructible/clockwork/gear_base/powered/process(delta_time) +/obj/structure/destructible/clockwork/gear_base/powered/process(seconds_per_tick) if(!use_power(passive_consumption)) depowered() insufficient_power = TRUE diff --git a/modular_skyrat/modules/clock_cult/code/structures/interdiction_lens.dm b/modular_skyrat/modules/clock_cult/code/structures/interdiction_lens.dm index 885eb6c675a..f855f0273d1 100644 --- a/modular_skyrat/modules/clock_cult/code/structures/interdiction_lens.dm +++ b/modular_skyrat/modules/clock_cult/code/structures/interdiction_lens.dm @@ -31,12 +31,12 @@ return ..() -/obj/structure/destructible/clockwork/gear_base/powered/interdiction_lens/process(delta_time) +/obj/structure/destructible/clockwork/gear_base/powered/interdiction_lens/process(seconds_per_tick) . = ..() if(!.) return - if(DT_PROB(3, delta_time)) + if(SPT_PROB(3, seconds_per_tick)) new /obj/effect/temp_visual/steam_release(get_turf(src)) for(var/mob/living/living_mob in viewers(INTERDICTION_LENS_RANGE, src)) diff --git a/modular_skyrat/modules/clock_cult/code/structures/ocular_warden.dm b/modular_skyrat/modules/clock_cult/code/structures/ocular_warden.dm index 710a498d86d..14686041ac7 100644 --- a/modular_skyrat/modules/clock_cult/code/structures/ocular_warden.dm +++ b/modular_skyrat/modules/clock_cult/code/structures/ocular_warden.dm @@ -29,7 +29,7 @@ bomb = 20 bio = 0 -/obj/structure/destructible/clockwork/gear_base/powered/ocular_warden/process(delta_time) +/obj/structure/destructible/clockwork/gear_base/powered/ocular_warden/process(seconds_per_tick) . = ..() if(!.) return @@ -61,7 +61,7 @@ dir = get_dir(get_turf(src), get_turf(target)) // Apply 15 damage (- 1 for each tile away they are), or 7.5, whichever is larger - target.apply_damage(max(BASE_DAMAGE - (get_dist(src, target) * DAMAGE_FALLOFF), MINIMUM_DAMAGE) * delta_time, BURN) + target.apply_damage(max(BASE_DAMAGE - (get_dist(src, target) * DAMAGE_FALLOFF), MINIMUM_DAMAGE) * seconds_per_tick, BURN) new /obj/effect/temp_visual/ratvar/ocular_warden(get_turf(target)) new /obj/effect/temp_visual/ratvar/ocular_warden(get_turf(src)) diff --git a/modular_skyrat/modules/clock_cult/code/structures/prosperity_prism.dm b/modular_skyrat/modules/clock_cult/code/structures/prosperity_prism.dm index d8d04ad90b7..a3db1b5ad46 100644 --- a/modular_skyrat/modules/clock_cult/code/structures/prosperity_prism.dm +++ b/modular_skyrat/modules/clock_cult/code/structures/prosperity_prism.dm @@ -13,7 +13,7 @@ passive_consumption = POWER_PER_USE / 2 -/obj/structure/destructible/clockwork/gear_base/powered/prosperity_prism/process(delta_time) +/obj/structure/destructible/clockwork/gear_base/powered/prosperity_prism/process(seconds_per_tick) . = ..() if(!.) return @@ -26,16 +26,16 @@ continue if(use_power(POWER_PER_USE)) - possible_cultist.adjustToxLoss(-2.5 * delta_time) - possible_cultist.adjustStaminaLoss(-7.5 * delta_time) - possible_cultist.adjustBruteLoss(-2.5 * delta_time) - possible_cultist.adjustFireLoss(-2.5 * delta_time) - possible_cultist.adjustOxyLoss(-2.5 * delta_time) - possible_cultist.adjustCloneLoss(-1 * delta_time) + possible_cultist.adjustToxLoss(-2.5 * seconds_per_tick) + possible_cultist.adjustStaminaLoss(-7.5 * seconds_per_tick) + possible_cultist.adjustBruteLoss(-2.5 * seconds_per_tick) + possible_cultist.adjustFireLoss(-2.5 * seconds_per_tick) + possible_cultist.adjustOxyLoss(-2.5 * seconds_per_tick) + possible_cultist.adjustCloneLoss(-1 * seconds_per_tick) new /obj/effect/temp_visual/heal(get_turf(possible_cultist), "#45dd8a") for(var/datum/reagent/toxin/toxin_chem in possible_cultist.reagents.reagent_list) - possible_cultist.reagents.remove_reagent(toxin_chem.type, 2.5 * delta_time) + possible_cultist.reagents.remove_reagent(toxin_chem.type, 2.5 * seconds_per_tick) #undef POWER_PER_USE diff --git a/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm b/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm index 132a4976706..258cd9463d6 100644 --- a/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm +++ b/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm @@ -267,7 +267,7 @@ GLOBAL_LIST_EMPTY(cortical_borers) . += "2) [GLOB.objective_willing_hosts] willing hosts: [length(GLOB.willing_hosts)]/[GLOB.objective_willing_hosts]" . += "3) [GLOB.objective_blood_borer] borers learning [GLOB.objective_blood_chem] from the blood: [GLOB.successful_blood_chem]/[GLOB.objective_blood_borer]" -/mob/living/basic/cortical_borer/Life(delta_time, times_fired) +/mob/living/basic/cortical_borer/Life(seconds_per_tick, times_fired) . = ..() //can only do stuff when we are inside a LIVING human if(!inside_human() || human_host?.stat == DEAD) @@ -334,7 +334,7 @@ GLOBAL_LIST_EMPTY(cortical_borers) return FALSE /// Base mob environment handler for body temperature, overridden to take into consideration being inside a host -/mob/living/basic/cortical_borer/handle_environment(datum/gas_mixture/environment, delta_time, times_fired) +/mob/living/basic/cortical_borer/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired) var/loc_temp if(human_host) loc_temp = human_host.coretemperature // set the local temp to that of the host's core temp @@ -348,9 +348,9 @@ GLOBAL_LIST_EMPTY(cortical_borers) if(temp_delta < 0) // it is cold here if(!on_fire) // do not reduce body temp when on fire - adjust_bodytemperature(max(max(temp_delta / BODYTEMP_DIVISOR, BODYTEMP_COOLING_MAX) * delta_time, temp_delta)) + adjust_bodytemperature(max(max(temp_delta / BODYTEMP_DIVISOR, BODYTEMP_COOLING_MAX) * seconds_per_tick, temp_delta)) else // this is a hot place - adjust_bodytemperature(min(min(temp_delta / BODYTEMP_DIVISOR, BODYTEMP_HEATING_MAX) * delta_time, temp_delta)) + adjust_bodytemperature(min(min(temp_delta / BODYTEMP_DIVISOR, BODYTEMP_HEATING_MAX) * seconds_per_tick, temp_delta)) //leave the host, forced or not /mob/living/basic/cortical_borer/proc/leave_host() diff --git a/modular_skyrat/modules/cortical_borer/code/cortical_borer_chems.dm b/modular_skyrat/modules/cortical_borer/code/cortical_borer_chems.dm index 892485c29d5..b69f69a31ec 100644 --- a/modular_skyrat/modules/cortical_borer/code/cortical_borer_chems.dm +++ b/modular_skyrat/modules/cortical_borer/code/cortical_borer_chems.dm @@ -2,19 +2,19 @@ name = "Unknown Methamphetamine Isomer" overdose_threshold = 40 -/datum/reagent/drug/methamphetamine/borer_version/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/drug/methamphetamine/borer_version/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) var/high_message = pick("You feel hyper.", "You feel like you need to go faster.", "You feel like you can run the world.") - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(M, span_notice("[high_message]")) M.add_mood_event("tweaking", /datum/mood_event/stimulant_medium, name) - M.AdjustStun(-40 * REM * delta_time) - M.AdjustKnockdown(-40 * REM * delta_time) - M.AdjustUnconscious(-40 * REM * delta_time) - M.AdjustParalyzed(-40 * REM * delta_time) - M.AdjustImmobilized(-40 * REM * delta_time) - M.adjustStaminaLoss(-2 * REM * delta_time, 0) + M.AdjustStun(-40 * REM * seconds_per_tick) + M.AdjustKnockdown(-40 * REM * seconds_per_tick) + M.AdjustUnconscious(-40 * REM * seconds_per_tick) + M.AdjustParalyzed(-40 * REM * seconds_per_tick) + M.AdjustImmobilized(-40 * REM * seconds_per_tick) + M.adjustStaminaLoss(-2 * REM * seconds_per_tick, 0) M.set_jitter_if_lower(5 SECONDS) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) M.emote(pick("twitch", "shiver")) ..() . = TRUE diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm index e4bc8ea5729..e176aff1cd9 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm @@ -115,7 +115,7 @@ new_hemophage.set_safe_hunger_level() -/datum/species/hemophage/spec_life(mob/living/carbon/human/hemophage, delta_time, times_fired) +/datum/species/hemophage/spec_life(mob/living/carbon/human/hemophage, seconds_per_tick, times_fired) . = ..() if(hemophage.stat >= DEAD) return @@ -128,7 +128,7 @@ if(!affected_organ || !(affected_organ.organ_flags & ORGAN_TUMOR_CORRUPTED)) continue - hemophage.adjustOrganLoss(organ_slot, TUMORLESS_ORGAN_DAMAGE * delta_time, TUMORLESS_ORGAN_DAMAGE_MAX) + hemophage.adjustOrganLoss(organ_slot, TUMORLESS_ORGAN_DAMAGE * seconds_per_tick, TUMORLESS_ORGAN_DAMAGE_MAX) return // We don't actually want to do any healing or blood loss without a tumor, y'know. @@ -143,7 +143,7 @@ // We have to check for the damaged bodyparts like this as well, to account for robotic bodyparts, as we don't want to heal those. Stupid, I know, but that's the best proc we got to check that currently. if(brute_damage && length(hemophage.get_damaged_bodyparts(brute = TRUE, burn = FALSE, required_bodytype = BODYTYPE_ORGANIC))) - brutes_to_heal = min(max_blood_for_regen, min(BLOOD_REGEN_BRUTE_AMOUNT, brute_damage) * delta_time) + brutes_to_heal = min(max_blood_for_regen, min(BLOOD_REGEN_BRUTE_AMOUNT, brute_damage) * seconds_per_tick) blood_used += brutes_to_heal * blood_to_health_multiplier max_blood_for_regen -= brutes_to_heal * blood_to_health_multiplier @@ -151,7 +151,7 @@ var/burn_damage = hemophage.getFireLoss() if(burn_damage && max_blood_for_regen > NONE && length(hemophage.get_damaged_bodyparts(brute = FALSE, burn = TRUE, required_bodytype = BODYTYPE_ORGANIC))) - burns_to_heal = min(max_blood_for_regen, min(BLOOD_REGEN_BURN_AMOUNT, burn_damage) * delta_time) + burns_to_heal = min(max_blood_for_regen, min(BLOOD_REGEN_BURN_AMOUNT, burn_damage) * seconds_per_tick) blood_used += burns_to_heal * blood_to_health_multiplier max_blood_for_regen -= burns_to_heal * blood_to_health_multiplier @@ -161,7 +161,7 @@ var/toxin_damage = hemophage.getToxLoss() if(toxin_damage && max_blood_for_regen > NONE) - var/toxins_to_heal = min(max_blood_for_regen, min(BLOOD_REGEN_TOXIN_AMOUNT, toxin_damage) * delta_time) + var/toxins_to_heal = min(max_blood_for_regen, min(BLOOD_REGEN_TOXIN_AMOUNT, toxin_damage) * seconds_per_tick) blood_used += toxins_to_heal * blood_to_health_multiplier max_blood_for_regen -= toxins_to_heal * blood_to_health_multiplier hemophage.adjustToxLoss(-toxins_to_heal) @@ -169,7 +169,7 @@ var/cellular_damage = hemophage.getCloneLoss() if(cellular_damage && max_blood_for_regen > NONE) - var/cells_to_heal = min(max_blood_for_regen, min(BLOOD_REGEN_TOXIN_AMOUNT, cellular_damage) * delta_time) + var/cells_to_heal = min(max_blood_for_regen, min(BLOOD_REGEN_TOXIN_AMOUNT, cellular_damage) * seconds_per_tick) blood_used += cells_to_heal * blood_to_health_multiplier max_blood_for_regen -= cells_to_heal * blood_to_health_multiplier hemophage.adjustCloneLoss(-cells_to_heal) @@ -185,7 +185,7 @@ if(in_closet(hemophage)) // No regular bloodloss if you're in a closet return - hemophage.blood_volume = (hemophage.blood_volume * FLOATING_POINT_ERROR_AVOIDING_FACTOR - NORMAL_BLOOD_DRAIN * delta_time * bloodloss_speed_multiplier * FLOATING_POINT_ERROR_AVOIDING_FACTOR) / FLOATING_POINT_ERROR_AVOIDING_FACTOR + hemophage.blood_volume = (hemophage.blood_volume * FLOATING_POINT_ERROR_AVOIDING_FACTOR - NORMAL_BLOOD_DRAIN * seconds_per_tick * bloodloss_speed_multiplier * FLOATING_POINT_ERROR_AVOIDING_FACTOR) / FLOATING_POINT_ERROR_AVOIDING_FACTOR if(hemophage.blood_volume <= BLOOD_VOLUME_SURVIVE) to_chat(hemophage, span_danger("You ran out of blood!")) @@ -474,7 +474,7 @@ body.vomit(lost_nutrition = 0, stun = FALSE, distance = 1, force = TRUE, purge_ratio = HEMOPHAGE_VOMIT_PURGE_RATIO) return ..() -/obj/item/organ/internal/stomach/hemophage/on_life(delta_time, times_fired) +/obj/item/organ/internal/stomach/hemophage/on_life(seconds_per_tick, times_fired) var/datum/reagent/blood/blood = reagents.get_reagent(/datum/reagent/blood) if(blood) blood.metabolization_rate = BLOOD_METABOLIZATION_RATE diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/podweak.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/podweak.dm index 640f555381a..2d2f57bea2e 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/podweak.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/podweak.dm @@ -30,7 +30,7 @@ always_customizable = FALSE -/datum/species/pod/podweak/spec_life(mob/living/carbon/human/H, delta_time, times_fired) +/datum/species/pod/podweak/spec_life(mob/living/carbon/human/H, seconds_per_tick, times_fired) if(H.stat != CONSCIOUS) return @@ -38,17 +38,17 @@ if(isturf(H.loc)) //else, there's considered to be no light var/turf/T = H.loc light_amount = min(1, T.get_lumcount()) - 0.5 - H.adjust_nutrition(5 * light_amount * delta_time) + H.adjust_nutrition(5 * light_amount * seconds_per_tick) if(H.nutrition > NUTRITION_LEVEL_ALMOST_FULL) H.set_nutrition(NUTRITION_LEVEL_ALMOST_FULL) if(light_amount > 0.2) //if there's enough light, heal - H.heal_overall_damage(0.2 * delta_time, 0.2 * delta_time, 0) - H.adjustStaminaLoss(-0.2 * delta_time) - H.adjustToxLoss(-0.2 * delta_time) - H.adjustOxyLoss(-0.2 * delta_time) + H.heal_overall_damage(0.2 * seconds_per_tick, 0.2 * seconds_per_tick, 0) + H.adjustStaminaLoss(-0.2 * seconds_per_tick) + H.adjustToxLoss(-0.2 * seconds_per_tick) + H.adjustOxyLoss(-0.2 * seconds_per_tick) if(H.nutrition < NUTRITION_LEVEL_STARVING + 50) - H.take_overall_damage(1 * delta_time, 0) + H.take_overall_damage(1 * seconds_per_tick, 0) /datum/species/pod/prepare_human_for_preview(mob/living/carbon/human/human) diff --git a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 2ec13d335e1..33aa6413c75 100644 --- a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -256,8 +256,8 @@ name = "glass of hotlime miami" desc = "This looks very aesthetically pleasing." -/datum/reagent/consumable/ethanol/hotlime_miami/on_mob_life(mob/living/carbon/M, delta_time, times_fired) - M.set_drugginess(1.5 MINUTES * REM * delta_time) +/datum/reagent/consumable/ethanol/hotlime_miami/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) + M.set_drugginess(1.5 MINUTES * REM * seconds_per_tick) M.adjustStaminaLoss(-2) return ..() @@ -633,9 +633,9 @@ #undef BLOODSHOT_DISGUST -/datum/reagent/consumable/ethanol/bloodshot/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/bloodshot/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(drinker.blood_volume < drinker.blood_volume_normal) - drinker.blood_volume = max(drinker.blood_volume, min(drinker.blood_volume + (3 * REM * delta_time), BLOOD_VOLUME_NORMAL)) //Bloodshot quickly restores blood loss. + drinker.blood_volume = max(drinker.blood_volume, min(drinker.blood_volume + (3 * REM * seconds_per_tick), BLOOD_VOLUME_NORMAL)) //Bloodshot quickly restores blood loss. return ..() @@ -734,12 +734,12 @@ quality = DRINK_FANTASTIC return ..() -/datum/reagent/consumable/ethanol/hippie_hooch/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/hippie_hooch/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) for(var/effect in status_effects_to_clear) drinker.remove_status_effect(effect) - drinker.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 3 * REM * delta_time, FALSE, TRUE) - drinker.adjustToxLoss(-0.2 * REM * delta_time, FALSE, required_biotype = affected_biotype) - drinker.adjust_drunk_effect(-10 * REM * delta_time) + drinker.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 3 * REM * seconds_per_tick, FALSE, TRUE) + drinker.adjustToxLoss(-0.2 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype) + drinker.adjust_drunk_effect(-10 * REM * seconds_per_tick) ..() . = TRUE @@ -764,7 +764,7 @@ quality = DRINK_GOOD return ..() -/datum/reagent/consumable/ethanol/research_rum/on_mob_life(mob/living/carbon/drinker, delta_time, times_fired) +/datum/reagent/consumable/ethanol/research_rum/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) if(prob(5)) drinker.say(pick_list_replacements(VISTA_FILE, "ballmer_good_msg"), forced = "ballmer") ..() diff --git a/modular_skyrat/modules/decay_subsystem/code/nests.dm b/modular_skyrat/modules/decay_subsystem/code/nests.dm index 32c3446276e..a4d1dbb79aa 100644 --- a/modular_skyrat/modules/decay_subsystem/code/nests.dm +++ b/modular_skyrat/modules/decay_subsystem/code/nests.dm @@ -66,7 +66,7 @@ STOP_PROCESSING(SSobj, src) return ..() -/obj/structure/mob_spawner/process(delta_time) +/obj/structure/mob_spawner/process(seconds_per_tick) if(passive_spawning) if(spawned_mobs >= max_mobs) return diff --git a/modular_skyrat/modules/electric_welder/code/electric_welder.dm b/modular_skyrat/modules/electric_welder/code/electric_welder.dm index 99bdcb735a0..a0e6b030644 100644 --- a/modular_skyrat/modules/electric_welder/code/electric_welder.dm +++ b/modular_skyrat/modules/electric_welder/code/electric_welder.dm @@ -54,7 +54,7 @@ update_appearance() STOP_PROCESSING(SSobj, src) -/obj/item/weldingtool/electric/process(delta_time) +/obj/item/weldingtool/electric/process(seconds_per_tick) if(!powered) switched_off() return diff --git a/modular_skyrat/modules/fauna_reagent/fauna_reagent.dm b/modular_skyrat/modules/fauna_reagent/fauna_reagent.dm index 4b28667949a..cee0e7efab5 100644 --- a/modular_skyrat/modules/fauna_reagent/fauna_reagent.dm +++ b/modular_skyrat/modules/fauna_reagent/fauna_reagent.dm @@ -13,7 +13,7 @@ /mob/living/simple_animal/hostile/asteroid reagent_health = TRUE -/mob/living/simple_animal/Life(delta_time, times_fired) +/mob/living/simple_animal/Life(seconds_per_tick, times_fired) . = ..() if(reagent_health && reagents) for(var/datum/reagent/reagents_within as anything in reagents.reagent_list) diff --git a/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm b/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm index c50af2b55af..67ff99a8d4c 100644 --- a/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm +++ b/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm @@ -85,9 +85,9 @@ . = ..() . += span_warning("Berserk mode is usable at 100% charge and requires the helmet to be closed in order to remain active.") //woag!!! -/obj/item/clothing/head/hooded/berserker/gatsu/process(delta_time) +/obj/item/clothing/head/hooded/berserker/gatsu/process(seconds_per_tick) if(berserk_active) - berserk_charge = clamp(berserk_charge - CHARGE_DRAINED_PER_SECOND * delta_time, 0, BERSERK_MAX_CHARGE) + berserk_charge = clamp(berserk_charge - CHARGE_DRAINED_PER_SECOND * seconds_per_tick, 0, BERSERK_MAX_CHARGE) if(!berserk_charge) if(ishuman(loc)) end_berserk(loc) diff --git a/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm b/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm index 056f03584ce..645ebb894fb 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm @@ -128,9 +128,9 @@ RegisterSignal(src, COMSIG_GUN_FIRED, PROC_REF(process_heat)) START_PROCESSING(SSobj, src) -/obj/item/gun/ballistic/automatic/mg34/mg42/process(delta_time) +/obj/item/gun/ballistic/automatic/mg34/mg42/process(seconds_per_tick) if(barrel_heat > 0) - barrel_heat -= BARREL_COOLDOWN_RATE * delta_time + barrel_heat -= BARREL_COOLDOWN_RATE * seconds_per_tick update_appearance() /obj/item/gun/ballistic/automatic/mg34/mg42/examine(mob/user) diff --git a/modular_skyrat/modules/hev_suit/code/hev_suit.dm b/modular_skyrat/modules/hev_suit/code/hev_suit.dm index c874d199819..2c155f3aa04 100644 --- a/modular_skyrat/modules/hev_suit/code/hev_suit.dm +++ b/modular_skyrat/modules/hev_suit/code/hev_suit.dm @@ -537,7 +537,7 @@ send_message("CALIBRATING DEFENSIVE WEAPON SELECTION SYSTEMS...") timer_id = addtimer(CALLBACK(src, PROC_REF(weaponselect)), 3 SECONDS, TIMER_STOPPABLE) -/obj/item/clothing/suit/space/hev_suit/process(delta_time) +/obj/item/clothing/suit/space/hev_suit/process(seconds_per_tick) if(!activated) return if(current_user.blood_volume < BLOOD_VOLUME_OKAY) diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm index dd8daf6dbfa..c43e01ba92f 100644 --- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm +++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm @@ -127,7 +127,7 @@ /obj/machinery/plumbing/floor_pump/proc/should_regulator_permit(turf/affected_turf) CRASH("should_regulator_permit() must be overriden.") -/obj/machinery/plumbing/floor_pump/process(delta_time) +/obj/machinery/plumbing/floor_pump/process(seconds_per_tick) var/was_pumping = is_pumping if(!can_run()) @@ -160,17 +160,17 @@ // We're good, actually pump. for(var/turf/affected_turf as anything in affected_turfs) - pump_turf(affected_turf, delta_time, multiplier) + pump_turf(affected_turf, seconds_per_tick, multiplier) /** * Pump out the liquids on a turf. * * Arguments: * * affected_turf - the turf to pump liquids out of. - * * delta_time - machine process delta time + * * seconds_per_tick - machine process delta time * * multiplier - Multiplier to apply to final volume we want to pump. */ -/obj/machinery/plumbing/floor_pump/proc/pump_turf(turf/affected_turf, delta_time, multiplier) +/obj/machinery/plumbing/floor_pump/proc/pump_turf(turf/affected_turf, seconds_per_tick, multiplier) CRASH("pump_turf() must be overriden.") @@ -191,8 +191,8 @@ /obj/machinery/plumbing/floor_pump/input/should_regulator_permit(turf/affected_turf) return affected_turf.liquids && affected_turf.liquids.height > height_regulator -/obj/machinery/plumbing/floor_pump/input/pump_turf(turf/affected_turf, delta_time, multiplier) - var/target_value = delta_time * (drain_flat + (affected_turf.liquids.total_reagents * drain_percent)) * multiplier +/obj/machinery/plumbing/floor_pump/input/pump_turf(turf/affected_turf, seconds_per_tick, multiplier) + var/target_value = seconds_per_tick * (drain_flat + (affected_turf.liquids.total_reagents * drain_percent)) * multiplier //Free space handling var/free_space = reagents.maximum_volume - reagents.total_volume if(target_value > free_space) @@ -274,8 +274,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/plumbing/floor_pump/input/on/waste, 0 return FALSE return TRUE -/obj/machinery/plumbing/floor_pump/output/pump_turf(turf/affected_turf, delta_time, multiplier) - var/target_value = delta_time * (drain_flat + (reagents.total_volume * drain_percent)) * multiplier +/obj/machinery/plumbing/floor_pump/output/pump_turf(turf/affected_turf, seconds_per_tick, multiplier) + var/target_value = seconds_per_tick * (drain_flat + (reagents.total_volume * drain_percent)) * multiplier if(target_value > reagents.total_volume) target_value = reagents.total_volume diff --git a/modular_skyrat/modules/microfusion/code/microfusion_cell.dm b/modular_skyrat/modules/microfusion/code/microfusion_cell.dm index 1d103a508cc..6e3701401dc 100644 --- a/modular_skyrat/modules/microfusion/code/microfusion_cell.dm +++ b/modular_skyrat/modules/microfusion/code/microfusion_cell.dm @@ -115,9 +115,9 @@ Essentially, power cells that malfunction if not used in an MCR, and should only playsound(src, 'sound/items/screwdriver.ogg', 70, TRUE) balloon_alert(user, "attachments removed") -/obj/item/stock_parts/cell/microfusion/process(delta_time) +/obj/item/stock_parts/cell/microfusion/process(seconds_per_tick) for(var/obj/item/microfusion_cell_attachment/microfusion_cell_attachment as anything in attachments) - microfusion_cell_attachment.process_attachment(src, delta_time) + microfusion_cell_attachment.process_attachment(src, seconds_per_tick) /obj/item/stock_parts/cell/microfusion/examine(mob/user) . = ..() diff --git a/modular_skyrat/modules/microfusion/code/microfusion_cell_attachments.dm b/modular_skyrat/modules/microfusion/code/microfusion_cell_attachments.dm index 99026811c5f..e6e751cf6ce 100644 --- a/modular_skyrat/modules/microfusion/code/microfusion_cell_attachments.dm +++ b/modular_skyrat/modules/microfusion/code/microfusion_cell_attachments.dm @@ -20,7 +20,7 @@ For adding unique abilities to microfusion cells. These cannot directly interact START_PROCESSING(SSobj, microfusion_cell) return -/obj/item/microfusion_cell_attachment/proc/process_attachment(obj/item/stock_parts/cell/microfusion/microfusion_cell, delta_time) +/obj/item/microfusion_cell_attachment/proc/process_attachment(obj/item/stock_parts/cell/microfusion/microfusion_cell, seconds_per_tick) return PROCESS_KILL /obj/item/microfusion_cell_attachment/proc/remove_attachment(obj/item/stock_parts/cell/microfusion/microfusion_cell) @@ -103,11 +103,11 @@ If the cell isn't stabilised by a stabiliser, it may emit a radiation pulse. . = ..() microfusion_cell.self_charging = FALSE -/obj/item/microfusion_cell_attachment/selfcharging/process_attachment(obj/item/stock_parts/cell/microfusion/microfusion_cell, delta_time) +/obj/item/microfusion_cell_attachment/selfcharging/process_attachment(obj/item/stock_parts/cell/microfusion/microfusion_cell, seconds_per_tick) if(!microfusion_cell.parent_gun) return if(microfusion_cell.charge < microfusion_cell.maxcharge) - microfusion_cell.charge = clamp(microfusion_cell.charge + (self_charge_amount * delta_time), 0, microfusion_cell.maxcharge) + microfusion_cell.charge = clamp(microfusion_cell.charge + (self_charge_amount * seconds_per_tick), 0, microfusion_cell.maxcharge) microfusion_cell.parent_gun.update_appearance() - if(!microfusion_cell.stabilised && DT_PROB(1, delta_time)) + if(!microfusion_cell.stabilised && SPT_PROB(1, seconds_per_tick)) radiation_pulse(src, 1, RAD_MEDIUM_INSULATION) diff --git a/modular_skyrat/modules/microfusion/code/phase_emitter.dm b/modular_skyrat/modules/microfusion/code/phase_emitter.dm index 7db88d0c9a0..f213ff4896f 100644 --- a/modular_skyrat/modules/microfusion/code/phase_emitter.dm +++ b/modular_skyrat/modules/microfusion/code/phase_emitter.dm @@ -46,7 +46,7 @@ parent_gun = null return ..() -/obj/item/microfusion_phase_emitter/process(delta_time) +/obj/item/microfusion_phase_emitter/process(seconds_per_tick) if(current_heat == 0) return var/calculated_heat_dissipation_per_tick = heat_dissipation_per_tick @@ -59,9 +59,9 @@ if(cooling_system && parent_gun && parent_gun.cell && parent_gun.cell.use(cooling_system_rate)) calculated_heat_dissipation_per_tick += cooling_system_rate - current_heat = clamp(current_heat - (calculated_heat_dissipation_per_tick * delta_time) * 0.5, 0, INFINITY) + current_heat = clamp(current_heat - (calculated_heat_dissipation_per_tick * seconds_per_tick) * 0.5, 0, INFINITY) if(current_heat > max_heat) - integrity = integrity - current_heat / 1000 * delta_time * 0.5 + integrity = integrity - current_heat / 1000 * seconds_per_tick * 0.5 process_fire_delay_and_sound() diff --git a/modular_skyrat/modules/modular_implants/code/nifs.dm b/modular_skyrat/modules/modular_implants/code/nifs.dm index e8b88d6909f..a1acf453d78 100644 --- a/modular_skyrat/modules/modular_implants/code/nifs.dm +++ b/modular_skyrat/modules/modular_implants/code/nifs.dm @@ -175,7 +175,7 @@ return TRUE -/obj/item/organ/internal/cyberimp/brain/nif/process(delta_time) +/obj/item/organ/internal/cyberimp/brain/nif/process(seconds_per_tick) . = ..() if(!linked_mob || broken || IS_IN_STASIS(linked_mob)) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/ballgag.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/ballgag.dm index 65ed60161e1..42a38254c0e 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/ballgag.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/ballgag.dm @@ -111,7 +111,7 @@ STOP_PROCESSING(SSobj, src) return ..() -/obj/item/clothing/mask/ballgag/choking/process(delta_time) +/obj/item/clothing/mask/ballgag/choking/process(seconds_per_tick) var/mob/living/carbon/human/wearer = loc if(!istype(wearer)) return @@ -119,7 +119,7 @@ return if(!chokes_wearer) return - choke_timer += delta_time + choke_timer += seconds_per_tick if(choke_timer < choke_interval) return switch(gag_size) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm index 926078bdabc..593d160caa8 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm @@ -229,7 +229,7 @@ STOP_PROCESSING(SSobj, src) // Mask choke processor -/obj/item/clothing/mask/gas/bdsm_mask/process(delta_time) +/obj/item/clothing/mask/gas/bdsm_mask/process(seconds_per_tick) var/mob/living/affected_mob = loc var/mob/living/carbon/affected_carbon = affected_mob @@ -260,9 +260,9 @@ breath_status = TRUE temp_check = FALSE else - tt -= delta_time + tt -= seconds_per_tick else - time_to_choke_left -= delta_time + time_to_choke_left -= seconds_per_tick /* * FILTERS diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm index 73903ac529b..f5a8c6544a2 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm @@ -133,9 +133,9 @@ owner.clear_alert("hypnosis") ..() -/datum/brain_trauma/very_special/induced_hypnosis/on_life(delta_time, times_fired) +/datum/brain_trauma/very_special/induced_hypnosis/on_life(seconds_per_tick, times_fired) ..() - if(!(DT_PROB(1, delta_time))) + if(!(SPT_PROB(1, seconds_per_tick))) return switch(rand(1, 2)) if(1) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm index 47683f2e269..39f4d78811e 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm @@ -183,15 +183,15 @@ STOP_PROCESSING(SSobj, src) . = ..() -/obj/item/clothing/suit/straight_jacket/kinky_sleepbag/process(delta_time) +/obj/item/clothing/suit/straight_jacket/kinky_sleepbag/process(seconds_per_tick) if(time_to_sound_left <= 0) if(tt <= 0) playsound(loc, 'modular_skyrat/modules/modular_items/lewd_items/sounds/latex.ogg', 100, TRUE, ignore_walls = FALSE) tt = rand(15, 35) //to do random funny sounds when character inside that thing. else - tt -= delta_time + tt -= seconds_per_tick else - time_to_sound_left -= delta_time + time_to_sound_left -= seconds_per_tick /obj/item/clothing/suit/straight_jacket/kinky_sleepbag/doStrip(mob/stripper, mob/owner) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm index bd4a8dc70cd..587cbcc80b9 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm @@ -77,7 +77,7 @@ if(SHIBARI_TIGHTNESS_HIGH) tightness = SHIBARI_TIGHTNESS_LOW -/obj/item/clothing/under/shibari/process(delta_time) +/obj/item/clothing/under/shibari/process(seconds_per_tick) if(!ishuman(loc)) return PROCESS_KILL var/mob/living/carbon/human/hooman = loc @@ -87,11 +87,11 @@ src.dropped(hooman) return PROCESS_KILL if(tightness == SHIBARI_TIGHTNESS_LOW && hooman.arousal < 15) - hooman.adjust_arousal(0.6 * delta_time) + hooman.adjust_arousal(0.6 * seconds_per_tick) if(tightness == SHIBARI_TIGHTNESS_MED && hooman.arousal < 25) - hooman.adjust_arousal(0.6 * delta_time) + hooman.adjust_arousal(0.6 * seconds_per_tick) if(tightness == SHIBARI_TIGHTNESS_HIGH && hooman.arousal < 30) - hooman.adjust_arousal(0.6 * delta_time) + hooman.adjust_arousal(0.6 * seconds_per_tick) //stuff to apply processing on equip and add mood event for perverts /obj/item/clothing/under/shibari/equipped(mob/user, slot) @@ -127,13 +127,13 @@ greyscale_colors = "#bd8fcf" //processing stuff -/obj/item/clothing/under/shibari/torso/process(delta_time) +/obj/item/clothing/under/shibari/torso/process(seconds_per_tick) . = ..() if(. == PROCESS_KILL) return PROCESS_KILL var/mob/living/carbon/human/hooman = loc if(tightness == SHIBARI_TIGHTNESS_HIGH && hooman.pain < 25) - hooman.adjust_pain(0.6 * delta_time) + hooman.adjust_pain(0.6 * seconds_per_tick) /obj/item/clothing/under/shibari/groin name = "crotch rope shibari" @@ -155,17 +155,17 @@ return..() //processing stuff -/obj/item/clothing/under/shibari/groin/process(delta_time) +/obj/item/clothing/under/shibari/groin/process(seconds_per_tick) . = ..() if(. == PROCESS_KILL) return PROCESS_KILL var/mob/living/carbon/human/hooman = loc if(tightness == SHIBARI_TIGHTNESS_LOW && hooman.pleasure < 20) - hooman.adjust_pleasure(0.6 * delta_time) + hooman.adjust_pleasure(0.6 * seconds_per_tick) if(tightness == SHIBARI_TIGHTNESS_MED && hooman.pleasure < 60) - hooman.adjust_pleasure(0.6 * delta_time) + hooman.adjust_pleasure(0.6 * seconds_per_tick) if(tightness == SHIBARI_TIGHTNESS_HIGH) - hooman.adjust_pleasure(0.6 * delta_time) + hooman.adjust_pleasure(0.6 * seconds_per_tick) /obj/item/clothing/under/shibari/full name = "shibari fullbody ropes" @@ -182,19 +182,19 @@ greyscale_colors = "#bd8fcf#bd8fcf" //processing stuff -/obj/item/clothing/under/shibari/full/process(delta_time) +/obj/item/clothing/under/shibari/full/process(seconds_per_tick) . = ..() if(. == PROCESS_KILL) return PROCESS_KILL var/mob/living/carbon/human/hooman = loc if(tightness == SHIBARI_TIGHTNESS_LOW && hooman.pleasure< 20) - hooman.adjust_pleasure(0.6 * delta_time) + hooman.adjust_pleasure(0.6 * seconds_per_tick) if(tightness == SHIBARI_TIGHTNESS_MED && hooman.pleasure < 60) - hooman.adjust_pleasure(0.6 * delta_time) + hooman.adjust_pleasure(0.6 * seconds_per_tick) if(tightness == SHIBARI_TIGHTNESS_HIGH) - hooman.adjust_pleasure(0.6 * delta_time) + hooman.adjust_pleasure(0.6 * seconds_per_tick) if(hooman.pain < 40) - hooman.adjust_pain(0.6 * delta_time) + hooman.adjust_pain(0.6 * seconds_per_tick) #undef SHIBARI_TIGHTNESS_LOW #undef SHIBARI_TIGHTNESS_MED diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/organs.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/organs.dm index a90348ca396..1730e8f121a 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/organs.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/organs.dm @@ -1,6 +1,6 @@ -/obj/item/organ/internal/brain/on_life(delta_time, times_fired) //All your horny is here *points to the head* +/obj/item/organ/internal/brain/on_life(seconds_per_tick, times_fired) //All your horny is here *points to the head* . = ..() var/mob/living/carbon/human/brain_owner = owner if(istype(brain_owner, /mob/living/carbon/human) && brain_owner.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy)) if(!(organ_flags & ORGAN_FAILING)) - brain_owner.dna.species.handle_arousal(brain_owner, delta_time, times_fired) + brain_owner.dna.species.handle_arousal(brain_owner, seconds_per_tick, times_fired) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm index c368a5f8189..c5647bbc6da 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm @@ -121,21 +121,21 @@ . = ..() STOP_PROCESSING(SSobj, src) -/obj/item/clothing/sextoy/eggvib/process(delta_time) +/obj/item/clothing/sextoy/eggvib/process(seconds_per_tick) if(!toy_on) return var/mob/living/carbon/human/target = loc if(!istype(target)) return if(vibration_mode == "low") - target.adjust_arousal(0.5 * delta_time) - target.adjust_pleasure(0.5 * delta_time) + target.adjust_arousal(0.5 * seconds_per_tick) + target.adjust_pleasure(0.5 * seconds_per_tick) if(vibration_mode == "medium") - target.adjust_arousal(0.6 * delta_time) - target.adjust_pleasure(0.6 * delta_time) + target.adjust_arousal(0.6 * seconds_per_tick) + target.adjust_pleasure(0.6 * seconds_per_tick) if(vibration_mode == "high") - target.adjust_arousal(0.7 * delta_time) - target.adjust_pleasure(0.7 * delta_time) + target.adjust_arousal(0.7 * seconds_per_tick) + target.adjust_pleasure(0.7 * seconds_per_tick) /* * SIGNALLER CONTROLLED EGG diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/buttplug.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/buttplug.dm index 1ad9e101588..9d33364a924 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/buttplug.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/buttplug.dm @@ -101,20 +101,20 @@ . = ..() STOP_PROCESSING(SSobj, src) -/obj/item/clothing/sextoy/buttplug/process(delta_time) +/obj/item/clothing/sextoy/buttplug/process(seconds_per_tick) var/mob/living/carbon/human/target = loc if(!istype(target)) return // I tried using switch here, but it need static value, and u.arousal can't be it. So fuck switches. Reject it, embrace the IFs if(current_size == "small" && target.arousal < 30) - target.adjust_arousal(0.6 * delta_time) - target.adjust_pleasure(0.7 * delta_time) + target.adjust_arousal(0.6 * seconds_per_tick) + target.adjust_pleasure(0.7 * seconds_per_tick) else if(current_size == "medium" && target.arousal < 40) - target.adjust_arousal(0.8 * delta_time) - target.adjust_pleasure(0.8 * delta_time) + target.adjust_arousal(0.8 * seconds_per_tick) + target.adjust_pleasure(0.8 * seconds_per_tick) else if(current_size == "big" && target.arousal < 50) - target.adjust_arousal(delta_time) - target.adjust_pleasure(delta_time) + target.adjust_arousal(seconds_per_tick) + target.adjust_pleasure(seconds_per_tick) if(!(target.pain < 22.5)) //yeah, this will cause pain. No buttplug gib intended, sry return - target.adjust_pain(target * delta_time) + target.adjust_pain(target * seconds_per_tick) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/clamps.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/clamps.dm index 51bb6feaa1f..e40ebbb6da6 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/clamps.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/clamps.dm @@ -67,18 +67,18 @@ breast_type = null breast_size = null -/obj/item/clothing/sextoy/nipple_clamps/process(delta_time) +/obj/item/clothing/sextoy/nipple_clamps/process(seconds_per_tick) . = ..() var/mob/living/carbon/human/target = loc var/obj/item/organ/external/genital/breasts/target_breast = target.get_organ_slot(ORGAN_SLOT_BREASTS) if(!target || !target_breast) return - target.adjust_arousal(1 * delta_time) + target.adjust_arousal(1 * seconds_per_tick) if(target.pain < 27.5) //To prevent maxing pain by just pair of clamps. - target.adjust_pain(1 * delta_time) + target.adjust_pain(1 * seconds_per_tick) if(target.arousal < 15) - target.adjust_arousal(1 * delta_time) + target.adjust_arousal(1 * seconds_per_tick) if(target_breast.aroused != AROUSAL_CANT) target_breast.aroused = AROUSAL_FULL //Clamps keeping nipples aroused diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm index 293f962aeda..d9ed38aa3d9 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm @@ -77,19 +77,19 @@ . = ..() STOP_PROCESSING(SSobj, src) -/obj/item/clothing/sextoy/dildo/process(delta_time) +/obj/item/clothing/sextoy/dildo/process(seconds_per_tick) var/mob/living/carbon/human/user = loc if(!istype(user)) return if(poly_size == "small" && user.arousal < (AROUSAL_REGULAR_THRESHOLD * 0.8)) - user.adjust_arousal(0.6 * delta_time) - user.adjust_pleasure(0.6 * delta_time) + user.adjust_arousal(0.6 * seconds_per_tick) + user.adjust_pleasure(0.6 * seconds_per_tick) else if(poly_size == "medium" && user.arousal < AROUSAL_REGULAR_THRESHOLD) - user.adjust_arousal(0.8 * delta_time) - user.adjust_pleasure(0.8 * delta_time) + user.adjust_arousal(0.8 * seconds_per_tick) + user.adjust_pleasure(0.8 * seconds_per_tick) else if(poly_size == "big" && user.arousal < (AROUSAL_REGULAR_THRESHOLD * 1.2)) - user.adjust_arousal(1 * delta_time) - user.adjust_pleasure(1 * delta_time) + user.adjust_arousal(1 * seconds_per_tick) + user.adjust_pleasure(1 * seconds_per_tick) /obj/item/clothing/sextoy/dildo/attack(mob/living/carbon/human/target, mob/living/carbon/human/user) . = ..() @@ -382,13 +382,13 @@ GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors QDEL_NULL(the_toy) in_hands = FALSE -/obj/item/clothing/sextoy/dildo/double_dildo/process(delta_time) +/obj/item/clothing/sextoy/dildo/double_dildo/process(seconds_per_tick) var/mob/living/carbon/human/user = loc if(!istype(user)) return FALSE if(user.arousal < AROUSAL_REGULAR_THRESHOLD) - user.adjust_arousal(0.8 * delta_time) - user.adjust_pleasure(0.8 * delta_time) + user.adjust_arousal(0.8 * seconds_per_tick) + user.adjust_pleasure(0.8 * seconds_per_tick) /obj/item/clothing/sextoy/dildo/double_dildo/dropped(mob/living/carbon/human/user) . = ..() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm index e9ea3eaa069..52dd318bb1d 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm @@ -69,20 +69,20 @@ . = ..() STOP_PROCESSING(SSobj, src) -/obj/item/clothing/sextoy/magic_wand/process(delta_time) +/obj/item/clothing/sextoy/magic_wand/process(seconds_per_tick) var/mob/living/carbon/human/vibrated = loc if(!istype(vibrated)) return // I tried using switch here, but it need static value, and u.arousal can't be it. So fuck switches. Reject it, embrace the IFs if(vibration_mode == "low" && vibrated.arousal < 30) - vibrated.adjust_arousal(0.6 * delta_time) - vibrated.adjust_pleasure(0.7 * delta_time) + vibrated.adjust_arousal(0.6 * seconds_per_tick) + vibrated.adjust_pleasure(0.7 * seconds_per_tick) else if(vibration_mode == "medium" && vibrated.arousal < 60) - vibrated.adjust_arousal(0.8 * delta_time) - vibrated.adjust_pleasure(0.8 * delta_time) + vibrated.adjust_arousal(0.8 * seconds_per_tick) + vibrated.adjust_pleasure(0.8 * seconds_per_tick) else if(vibration_mode == "hard") - vibrated.adjust_arousal(1 * delta_time) - vibrated.adjust_pleasure(1 * delta_time) + vibrated.adjust_arousal(1 * seconds_per_tick) + vibrated.adjust_pleasure(1 * seconds_per_tick) /obj/item/clothing/sextoy/magic_wand/attack(mob/living/carbon/human/target, mob/living/carbon/human/user) . = ..() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm index 92de2ef0b70..3c08efc7f9c 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm @@ -102,7 +102,7 @@ put_out_candle() return ..() -/obj/item/bdsm_candle/process(delta_time) +/obj/item/bdsm_candle/process(seconds_per_tick) if(!lit) return PROCESS_KILL open_flame() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm index b39e9a0a5a4..0086a1bdef2 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm @@ -89,23 +89,23 @@ . = ..() STOP_PROCESSING(SSobj, src) -/obj/item/clothing/sextoy/vibrator/process(delta_time) +/obj/item/clothing/sextoy/vibrator/process(seconds_per_tick) var/mob/living/carbon/human/user = loc if(!istype(user)) return if(toy_on) if(vibration_mode == "low" && user.arousal < 40) //prevent non-stop cumming from wearing this thing - user.adjust_arousal(0.7 * delta_time) - user.adjust_pleasure(0.7 * delta_time) + user.adjust_arousal(0.7 * seconds_per_tick) + user.adjust_pleasure(0.7 * seconds_per_tick) if(vibration_mode == "medium" && user.arousal < 70) - user.adjust_arousal(1 * delta_time) - user.adjust_pleasure(1 * delta_time) + user.adjust_arousal(1 * seconds_per_tick) + user.adjust_pleasure(1 * seconds_per_tick) if(vibration_mode == "hard") //no mercy - user.adjust_arousal(1.5 * delta_time) - user.adjust_pleasure(1.5 * delta_time) + user.adjust_arousal(1.5 * seconds_per_tick) + user.adjust_pleasure(1.5 * seconds_per_tick) else if(!toy_on && user.arousal < 30) - user.adjust_arousal(0.5 * delta_time) - user.adjust_pleasure(0.5 * delta_time) + user.adjust_arousal(0.5 * seconds_per_tick) + user.adjust_pleasure(0.5 * seconds_per_tick) //SHITCODESHITCODESHITCODESHITCODESHITCODESHITCODESHITCODESHITCODESHITCODESHITCODESHITCODESHITCODESHITCODESHITCODESHITCODESHITCODE /obj/item/clothing/sextoy/vibrator/attack(mob/living/carbon/human/target, mob/living/carbon/human/user) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm index f09ce73291a..8bcc19fa124 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm @@ -78,14 +78,14 @@ . = ..() STOP_PROCESSING(SSobj, src) -/obj/item/clothing/sextoy/vibroring/process(delta_time) +/obj/item/clothing/sextoy/vibroring/process(seconds_per_tick) var/mob/living/carbon/human/user = loc if(!user || !istype(user)) return PROCESS_KILL var/obj/item/organ/external/genital/testicles/balls = user.get_organ_slot(ORGAN_SLOT_PENIS) if(!toy_on || !balls) return - user.adjust_arousal(1 * delta_time) - user.adjust_pleasure(1 * delta_time) + user.adjust_arousal(1 * seconds_per_tick) + user.adjust_pleasure(1 * seconds_per_tick) if(balls.aroused != AROUSAL_CANT) balls.aroused = AROUSAL_FULL //Vibroring keep penis erected. diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm index b723786104a..f0171518213 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm @@ -428,7 +428,7 @@ object.forceMove(drop_location()) // Machine Workflow Processor -/obj/structure/chair/milking_machine/process(delta_time) +/obj/structure/chair/milking_machine/process(seconds_per_tick) // Check if the machine should work if(!current_mob) update_all_visuals() @@ -462,15 +462,15 @@ if(current_mode != mode_list[1]) pump_state = pump_state_list[2] - retrive_liquids_from_selected_organ(delta_time) - increase_current_mob_arousal(delta_time) + retrive_liquids_from_selected_organ(seconds_per_tick) + increase_current_mob_arousal(seconds_per_tick) else current_mode = mode_list[1] pump_state = pump_state_list[1] update_all_visuals() // Liquid intake handler -/obj/structure/chair/milking_machine/proc/retrive_liquids_from_selected_organ(delta_time) +/obj/structure/chair/milking_machine/proc/retrive_liquids_from_selected_organ(seconds_per_tick) // Climax check var/fluid_multiplier = 1 if(current_mob != null) @@ -479,17 +479,17 @@ if(istype(current_selected_organ, /obj/item/organ/external/genital/breasts)) if(current_selected_organ.reagents.total_volume > 0) - current_selected_organ.transfer_internal_fluid(milk_vessel.reagents, milk_retrive_amount[current_mode] * fluid_multiplier * delta_time) + current_selected_organ.transfer_internal_fluid(milk_vessel.reagents, milk_retrive_amount[current_mode] * fluid_multiplier * seconds_per_tick) else return else if (istype(current_selected_organ, /obj/item/organ/external/genital/vagina)) if(current_selected_organ.reagents.total_volume > 0) - current_selected_organ.transfer_internal_fluid(girlcum_vessel.reagents, girlcum_retrive_amount[current_mode] * fluid_multiplier * delta_time) + current_selected_organ.transfer_internal_fluid(girlcum_vessel.reagents, girlcum_retrive_amount[current_mode] * fluid_multiplier * seconds_per_tick) else return else if (istype(current_selected_organ, /obj/item/organ/external/genital/testicles)) if(current_selected_organ.reagents.total_volume > 0) - current_selected_organ.transfer_internal_fluid(semen_vessel.reagents, semen_retrive_amount[current_mode] * fluid_multiplier * delta_time) + current_selected_organ.transfer_internal_fluid(semen_vessel.reagents, semen_retrive_amount[current_mode] * fluid_multiplier * seconds_per_tick) else return else @@ -497,10 +497,10 @@ return // Handling the process of the impact of the machine on the organs of the mob -/obj/structure/chair/milking_machine/proc/increase_current_mob_arousal(delta_time) - current_mob.adjust_arousal(arousal_amounts[current_mode] * delta_time) - current_mob.adjust_pleasure(pleasure_amounts[current_mode] * delta_time) - current_mob.adjust_pain(pain_amounts[current_mode] * delta_time) +/obj/structure/chair/milking_machine/proc/increase_current_mob_arousal(seconds_per_tick) + current_mob.adjust_arousal(arousal_amounts[current_mode] * seconds_per_tick) + current_mob.adjust_pleasure(pleasure_amounts[current_mode] * seconds_per_tick) + current_mob.adjust_pain(pain_amounts[current_mode] * seconds_per_tick) // Drag and drop mob buckle handler into the machine /obj/structure/chair/milking_machine/MouseDrop(over_object, src_location, over_location) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_quirks.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_quirks.dm index 181f4439da9..36b036f3003 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_quirks.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_quirks.dm @@ -257,7 +257,7 @@ random_gain = FALSE resilience = TRAUMA_RESILIENCE_ABSOLUTE -/datum/brain_trauma/very_special/sadism/on_life(delta_time, times_fired) +/datum/brain_trauma/very_special/sadism/on_life(seconds_per_tick, times_fired) var/mob/living/carbon/human/affected_mob = owner if(someone_suffering() && affected_mob.client?.prefs?.read_preference(/datum/preference/toggle/erp)) affected_mob.adjust_arousal(2) diff --git a/modular_skyrat/modules/modular_reagents/code/reagents/medicine.dm b/modular_skyrat/modules/modular_reagents/code/reagents/medicine.dm index de8ae40703e..49e4020d4eb 100644 --- a/modular_skyrat/modules/modular_reagents/code/reagents/medicine.dm +++ b/modular_skyrat/modules/modular_reagents/code/reagents/medicine.dm @@ -21,8 +21,8 @@ L.clear_alert("numbed") ..() -/datum/reagent/medicine/lidocaine/overdose_process(mob/living/M, delta_time, times_fired) - M.adjustOrganLoss(ORGAN_SLOT_HEART,3 * REM * delta_time, 80) +/datum/reagent/medicine/lidocaine/overdose_process(mob/living/M, seconds_per_tick, times_fired) + M.adjustOrganLoss(ORGAN_SLOT_HEART,3 * REM * seconds_per_tick, 80) ..() //Inverse Medicines// @@ -36,11 +36,11 @@ ph = 6.09 tox_damage = 0 -/datum/reagent/inverse/lidocaine/on_mob_life(mob/living/carbon/owner, delta_time, times_fired) +/datum/reagent/inverse/lidocaine/on_mob_life(mob/living/carbon/owner, seconds_per_tick, times_fired) ..() to_chat(owner, span_userdanger("Your body aches with unimaginable pain!")) - owner.adjustOrganLoss(ORGAN_SLOT_HEART,3 * REM * delta_time, 85) - owner.adjustStaminaLoss(5 * REM * delta_time, 0) + owner.adjustOrganLoss(ORGAN_SLOT_HEART,3 * REM * seconds_per_tick, 85) + owner.adjustStaminaLoss(5 * REM * seconds_per_tick, 0) if(prob(30)) INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), "scream") diff --git a/modular_skyrat/modules/morenarcotics/code/cocaine.dm b/modular_skyrat/modules/morenarcotics/code/cocaine.dm index b10b0070c61..2c819bf469c 100644 --- a/modular_skyrat/modules/morenarcotics/code/cocaine.dm +++ b/modular_skyrat/modules/morenarcotics/code/cocaine.dm @@ -42,18 +42,18 @@ REMOVE_TRAIT(containing_mob, TRAIT_BATON_RESISTANCE, type) ..() -/datum/reagent/drug/cocaine/on_mob_life(mob/living/carbon/M, delta_time, times_fired) - if(DT_PROB(2.5, delta_time)) +/datum/reagent/drug/cocaine/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) + if(SPT_PROB(2.5, seconds_per_tick)) var/high_message = pick("You feel jittery.", "You feel like you gotta go fast.", "You feel like you need to step it up.") to_chat(M, span_notice("[high_message]")) M.add_mood_event("zoinked", /datum/mood_event/stimulant_heavy, name) - M.AdjustStun(-15 * REM * delta_time) - M.AdjustKnockdown(-15 * REM * delta_time) - M.AdjustUnconscious(-15 * REM * delta_time) - M.AdjustImmobilized(-15 * REM * delta_time) - M.AdjustParalyzed(-15 * REM * delta_time) - M.adjustStaminaLoss(-2 * REM * delta_time, 0) - if(DT_PROB(2.5, delta_time)) + M.AdjustStun(-15 * REM * seconds_per_tick) + M.AdjustKnockdown(-15 * REM * seconds_per_tick) + M.AdjustUnconscious(-15 * REM * seconds_per_tick) + M.AdjustImmobilized(-15 * REM * seconds_per_tick) + M.AdjustParalyzed(-15 * REM * seconds_per_tick) + M.adjustStaminaLoss(-2 * REM * seconds_per_tick, 0) + if(SPT_PROB(2.5, seconds_per_tick)) M.emote("shiver") ..() . = TRUE @@ -61,14 +61,14 @@ /datum/reagent/drug/cocaine/overdose_start(mob/living/M) to_chat(M, span_userdanger("Your heart beats is beating so fast, it hurts...")) -/datum/reagent/drug/cocaine/overdose_process(mob/living/M, delta_time, times_fired) - M.adjustToxLoss(1 * REM * delta_time, 0) - M.adjustOrganLoss(ORGAN_SLOT_HEART, (rand(10, 20) / 10) * REM * delta_time) +/datum/reagent/drug/cocaine/overdose_process(mob/living/M, seconds_per_tick, times_fired) + M.adjustToxLoss(1 * REM * seconds_per_tick, 0) + M.adjustOrganLoss(ORGAN_SLOT_HEART, (rand(10, 20) / 10) * REM * seconds_per_tick) M.set_jitter_if_lower(5 SECONDS) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) M.emote(pick("twitch","drool")) if(!HAS_TRAIT(M, TRAIT_FLOORED)) - if(DT_PROB(1.5, delta_time)) + if(SPT_PROB(1.5, seconds_per_tick)) M.visible_message(span_danger("[M] collapses onto the floor!")) M.Paralyze(135,TRUE) M.drop_all_held_items() diff --git a/modular_skyrat/modules/morenarcotics/code/crackpipe.dm b/modular_skyrat/modules/morenarcotics/code/crackpipe.dm index 19c97c812b0..42d09c707ba 100644 --- a/modular_skyrat/modules/morenarcotics/code/crackpipe.dm +++ b/modular_skyrat/modules/morenarcotics/code/crackpipe.dm @@ -8,8 +8,8 @@ icon_off = "glass_pipeoff" chem_volume = 20 -/obj/item/clothing/mask/cigarette/pipe/crackpipe/process(delta_time) - smoketime -= delta_time +/obj/item/clothing/mask/cigarette/pipe/crackpipe/process(seconds_per_tick) + smoketime -= seconds_per_tick if(smoketime <= 0) if(ismob(loc)) var/mob/living/smoking_mob = loc diff --git a/modular_skyrat/modules/morenarcotics/code/opium.dm b/modular_skyrat/modules/morenarcotics/code/opium.dm index fa6ada5d6b3..008ef21f5e1 100644 --- a/modular_skyrat/modules/morenarcotics/code/opium.dm +++ b/modular_skyrat/modules/morenarcotics/code/opium.dm @@ -106,20 +106,20 @@ taste_description = "flowers" addiction_types = list(/datum/addiction/opioids = 18) -/datum/reagent/drug/opium/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/drug/opium/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) var/high_message = pick("You feel euphoric.", "You feel on top of the world.") - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(M, span_notice("[high_message]")) M.add_mood_event("smacked out", /datum/mood_event/narcotic_heavy, name) - M.adjustBruteLoss(-0.1 * REM * delta_time, 0) //can be used as a (shitty) painkiller - M.adjustFireLoss(-0.1 * REM * delta_time, 0) + M.adjustBruteLoss(-0.1 * REM * seconds_per_tick, 0) //can be used as a (shitty) painkiller + M.adjustFireLoss(-0.1 * REM * seconds_per_tick, 0) M.overlay_fullscreen("heroin_euphoria", /atom/movable/screen/fullscreen/color_vision/heroin_color) return ..() -/datum/reagent/drug/opium/overdose_process(mob/living/M, delta_time, times_fired) - M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.5 * REM * delta_time) - M.adjustToxLoss(1 * REM * delta_time, 0) - M.adjust_drowsiness(1 SECONDS * REM * normalise_creation_purity() * delta_time) +/datum/reagent/drug/opium/overdose_process(mob/living/M, seconds_per_tick, times_fired) + M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.5 * REM * seconds_per_tick) + M.adjustToxLoss(1 * REM * seconds_per_tick, 0) + M.adjust_drowsiness(1 SECONDS * REM * normalise_creation_purity() * seconds_per_tick) return TRUE /datum/reagent/drug/opium/on_mob_metabolize(mob/living/metabolizer) @@ -142,12 +142,12 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED inverse_chem = /datum/reagent/drug/opium/blacktar/liquid -/datum/reagent/drug/opium/heroin/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/drug/opium/heroin/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) var/high_message = pick("You feel like nothing can stop you.", "You feel like God.") - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(M, span_notice("[high_message]")) - M.adjustBruteLoss(-0.4 * REM * delta_time, 0) //more powerful as a painkiller, possibly actually useful to medical now - M.adjustFireLoss(-0.4 * REM * delta_time, 0) + M.adjustBruteLoss(-0.4 * REM * seconds_per_tick, 0) //more powerful as a painkiller, possibly actually useful to medical now + M.adjustFireLoss(-0.4 * REM * seconds_per_tick, 0) ..() /datum/reagent/drug/opium/blacktar @@ -160,13 +160,13 @@ taste_description = "flowers" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/drug/opium/blacktar/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/drug/opium/blacktar/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) var/high_message = pick("You feel like tar.", "The blood in your veins feel like syrup.") - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(M, span_notice("[high_message]")) - M.set_drugginess(20 SECONDS * REM * delta_time) - M.adjustToxLoss(0.5 * REM * delta_time, 0) //toxin damage + M.set_drugginess(20 SECONDS * REM * seconds_per_tick) + M.adjustToxLoss(0.5 * REM * seconds_per_tick, 0) //toxin damage return ..() /datum/reagent/drug/opium/blacktar/liquid //prevents self-duplication by going one step down when mixed diff --git a/modular_skyrat/modules/morenarcotics/code/pcp.dm b/modular_skyrat/modules/morenarcotics/code/pcp.dm index 1b0699ef977..8feba43b03a 100644 --- a/modular_skyrat/modules/morenarcotics/code/pcp.dm +++ b/modular_skyrat/modules/morenarcotics/code/pcp.dm @@ -41,22 +41,22 @@ C.gain_trauma(pcp_rage, TRAUMA_RESILIENCE_ABSOLUTE) C.gain_trauma(pcp_tenacity, TRAUMA_RESILIENCE_ABSOLUTE) -/datum/reagent/drug/pcp/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/drug/pcp/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) var/high_message = pick("You feel like KILLING!", "Someone's about to fucking die!", "Rip and tear!") if(M.hud_used!=null) var/atom/movable/plane_master_controller/game_plane_master_controller = M.hud_used.plane_master_controllers[PLANE_MASTERS_GAME] game_plane_master_controller.add_filter("pcp_blur", 10, angular_blur_filter(0, 0, 0.7)) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(M, span_warning("[high_message]")) - M.AdjustKnockdown(-20 * REM * delta_time) - M.AdjustImmobilized(-20 * REM * delta_time) - M.adjustStaminaLoss(-10 * REM * delta_time, 0) - M.AdjustStun(-10 * REM * delta_time) //this is absolutely rediculous + M.AdjustKnockdown(-20 * REM * seconds_per_tick) + M.AdjustImmobilized(-20 * REM * seconds_per_tick) + M.adjustStaminaLoss(-10 * REM * seconds_per_tick, 0) + M.AdjustStun(-10 * REM * seconds_per_tick) //this is absolutely rediculous M.overlay_fullscreen("pcp_rage", /atom/movable/screen/fullscreen/color_vision/rage_color) M.sound_environment_override = SOUND_ENVIRONMENT_DRUGGED - if(DT_PROB(3.5, delta_time)) + if(SPT_PROB(3.5, seconds_per_tick)) M.emote(pick("scream","twitch")) - pcp_lifetime+= 3 * REM * delta_time + pcp_lifetime+= 3 * REM * seconds_per_tick ..() /datum/reagent/drug/pcp/on_mob_end_metabolize(mob/living/L) @@ -76,15 +76,15 @@ L.drop_all_held_items() ..() -/datum/reagent/drug/pcp/overdose_process(mob/living/M, delta_time, times_fired) - M.adjustToxLoss(2 * REM * delta_time, 0) - M.adjustOrganLoss(ORGAN_SLOT_HEART, (2 * REM * delta_time)) - M.adjustOrganLoss(ORGAN_SLOT_BRAIN, (2 * REM * delta_time)) - M.adjustStaminaLoss(15 * REM * delta_time, 0) //reverses stamina loss +/datum/reagent/drug/pcp/overdose_process(mob/living/M, seconds_per_tick, times_fired) + M.adjustToxLoss(2 * REM * seconds_per_tick, 0) + M.adjustOrganLoss(ORGAN_SLOT_HEART, (2 * REM * seconds_per_tick)) + M.adjustOrganLoss(ORGAN_SLOT_BRAIN, (2 * REM * seconds_per_tick)) + M.adjustStaminaLoss(15 * REM * seconds_per_tick, 0) //reverses stamina loss M.set_jitter_if_lower(5 SECONDS) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) M.emote(pick("twitch","drool")) - if(DT_PROB(1.5, delta_time)) + if(SPT_PROB(1.5, seconds_per_tick)) M.visible_message(span_danger("[M] flails their arms around everywhere!")) M.drop_all_held_items() ..() diff --git a/modular_skyrat/modules/morenarcotics/code/quaalude.dm b/modular_skyrat/modules/morenarcotics/code/quaalude.dm index b8a61f9e1ed..12e316eb810 100644 --- a/modular_skyrat/modules/morenarcotics/code/quaalude.dm +++ b/modular_skyrat/modules/morenarcotics/code/quaalude.dm @@ -21,20 +21,20 @@ game_plane_master_controller.add_filter("quaalude_wave", 10, wave_filter(300, 300, 3, 0, WAVE_SIDEWAYS)) -/datum/reagent/drug/quaalude/on_mob_life(mob/living/carbon/affected_carbon, delta_time, times_fired) - if(DT_PROB(2.5, delta_time)) +/datum/reagent/drug/quaalude/on_mob_life(mob/living/carbon/affected_carbon, seconds_per_tick, times_fired) + if(SPT_PROB(2.5, seconds_per_tick)) var/high_message = pick("You feel relaxed.", "You feel like you're on the moon.", "You feel like you could walk 20 miles for a quaalude.") to_chat(affected_carbon, span_notice(high_message)) - affected_carbon.set_drugginess(1 MINUTES * REM * delta_time) + affected_carbon.set_drugginess(1 MINUTES * REM * seconds_per_tick) affected_carbon.adjust_slurring_up_to(30 SECONDS, 2 MINUTES) - affected_carbon.set_dizzy_if_lower(5 * REM * delta_time * 2 SECONDS) - affected_carbon.adjustStaminaLoss(-5 * REM * delta_time, 0) + affected_carbon.set_dizzy_if_lower(5 * REM * seconds_per_tick * 2 SECONDS) + affected_carbon.adjustStaminaLoss(-5 * REM * seconds_per_tick, 0) - if(DT_PROB(3.5, delta_time)) + if(SPT_PROB(3.5, seconds_per_tick)) affected_carbon.emote(pick("laugh", "drool")) - if(DT_PROB(1, delta_time) && !HAS_TRAIT(affected_carbon, TRAIT_FLOORED)) + if(SPT_PROB(1, seconds_per_tick) && !HAS_TRAIT(affected_carbon, TRAIT_FLOORED)) affected_carbon.visible_message(span_danger("[affected_carbon]'s legs become too weak to carry their own weight!")) affected_carbon.Knockdown(90, TRUE) affected_carbon.drop_all_held_items() @@ -48,17 +48,17 @@ game_plane_master_controller.remove_filter("quaalude_wave") -/datum/reagent/drug/quaalude/overdose_process(mob/living/affected_carbon, delta_time, times_fired) +/datum/reagent/drug/quaalude/overdose_process(mob/living/affected_carbon, seconds_per_tick, times_fired) var/kidfrombrooklyn_message = pick("BRING BACK THE FUCKING QUAALUDES!", "I'd walk 20 miles for a quaalude, let me tell ya'!", "There's nothing like a fuckin' quaalude!") - if(DT_PROB(1.5, delta_time)) + if(SPT_PROB(1.5, seconds_per_tick)) affected_carbon.say(kidfrombrooklyn_message) - affected_carbon.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.25 * REM * delta_time) - affected_carbon.adjustToxLoss(0.25 * REM * delta_time, 0) - affected_carbon.adjust_drowsiness(0.5 SECONDS * REM * normalise_creation_purity() * delta_time) + affected_carbon.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.25 * REM * seconds_per_tick) + affected_carbon.adjustToxLoss(0.25 * REM * seconds_per_tick, 0) + affected_carbon.adjust_drowsiness(0.5 SECONDS * REM * normalise_creation_purity() * seconds_per_tick) - if(DT_PROB(3.5, delta_time)) + if(SPT_PROB(3.5, seconds_per_tick)) affected_carbon.emote("twitch") return TRUE diff --git a/modular_skyrat/modules/morenarcotics/code/thc.dm b/modular_skyrat/modules/morenarcotics/code/thc.dm index 1e97689c0d9..74bdc3c637d 100644 --- a/modular_skyrat/modules/morenarcotics/code/thc.dm +++ b/modular_skyrat/modules/morenarcotics/code/thc.dm @@ -46,19 +46,19 @@ ph = 6 taste_description = "skunk" -/datum/reagent/drug/thc/on_mob_life(mob/living/carbon/M, delta_time, times_fired) +/datum/reagent/drug/thc/on_mob_life(mob/living/carbon/M, seconds_per_tick, times_fired) var/high_message = pick("You feel relaxed.", "You feel fucked up.", "You feel totally wrecked...") if(M.hud_used!=null) var/atom/movable/plane_master_controller/game_plane_master_controller = M.hud_used.plane_master_controllers[PLANE_MASTERS_GAME] game_plane_master_controller.add_filter("weed_blur", 10, angular_blur_filter(0, 0, 0.45)) - if(DT_PROB(2.5, delta_time)) + if(SPT_PROB(2.5, seconds_per_tick)) to_chat(M, span_notice("[high_message]")) M.add_mood_event("stoned", /datum/mood_event/stoned, name) M.throw_alert("stoned", /atom/movable/screen/alert/stoned) M.sound_environment_override = SOUND_ENVIRONMENT_DRUGGED - M.set_dizzy_if_lower(5 * REM * delta_time * 2 SECONDS) - M.adjust_nutrition(-1 * REM * delta_time) //munchies - if(DT_PROB(3.5, delta_time)) + M.set_dizzy_if_lower(5 * REM * seconds_per_tick * 2 SECONDS) + M.adjust_nutrition(-1 * REM * seconds_per_tick) //munchies + if(SPT_PROB(3.5, seconds_per_tick)) M.emote(pick("laugh","giggle")) ..() @@ -69,12 +69,12 @@ M.clear_alert("stoned") M.sound_environment_override = SOUND_ENVIRONMENT_NONE -/datum/reagent/drug/thc/overdose_process(mob/living/M, delta_time, times_fired) +/datum/reagent/drug/thc/overdose_process(mob/living/M, seconds_per_tick, times_fired) var/cg420_message = pick("It's major...", "Oh my goodness...",) - if(DT_PROB(1.5, delta_time)) + if(SPT_PROB(1.5, seconds_per_tick)) M.say("[cg420_message]") - M.adjust_drowsiness(0.2 SECONDS * REM * normalise_creation_purity() * delta_time) - if(DT_PROB(3.5, delta_time)) + M.adjust_drowsiness(0.2 SECONDS * REM * normalise_creation_purity() * seconds_per_tick) + if(SPT_PROB(3.5, seconds_per_tick)) playsound(M, pick('modular_skyrat/master_files/sound/effects/lungbust_cough1.ogg','modular_skyrat/master_files/sound/effects/lungbust_cough2.ogg'), 50, TRUE) M.emote("cough") ..() diff --git a/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm b/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm index feef1954602..cadc6ac4f03 100644 --- a/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm +++ b/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm @@ -76,9 +76,9 @@ current_user = null return ..() -/obj/machinery/mounted_machine_gun/process(delta_time) +/obj/machinery/mounted_machine_gun/process(seconds_per_tick) if(barrel_heat) - barrel_heat -= passive_barrel_cooldown_rate * delta_time + barrel_heat -= passive_barrel_cooldown_rate * seconds_per_tick update_appearance() /obj/machinery/mounted_machine_gun/update_overlays() diff --git a/modular_skyrat/modules/multicellcharger/code/multi_cell_charger.dm b/modular_skyrat/modules/multicellcharger/code/multi_cell_charger.dm index ed99bbe2b8b..9a54cbfe3d4 100644 --- a/modular_skyrat/modules/multicellcharger/code/multi_cell_charger.dm +++ b/modular_skyrat/modules/multicellcharger/code/multi_cell_charger.dm @@ -88,14 +88,14 @@ return return ..() -/obj/machinery/cell_charger_multi/process(delta_time) +/obj/machinery/cell_charger_multi/process(seconds_per_tick) if(!charging_batteries.len || !anchored || (machine_stat & (BROKEN|NOPOWER))) return for(var/obj/item/stock_parts/cell/charging in charging_batteries) if(charging.percent() >= 100) continue - var/main_draw = use_power_from_net(charge_rate * delta_time, take_any = TRUE) //Pulls directly from the Powernet to dump into the cell + var/main_draw = use_power_from_net(charge_rate * seconds_per_tick, take_any = TRUE) //Pulls directly from the Powernet to dump into the cell if(!main_draw) return charging.give(main_draw) diff --git a/modular_skyrat/modules/mutants/code/mutant_component.dm b/modular_skyrat/modules/mutants/code/mutant_component.dm index c80fd0d58e9..99233cb2656 100644 --- a/modular_skyrat/modules/mutants/code/mutant_component.dm +++ b/modular_skyrat/modules/mutants/code/mutant_component.dm @@ -87,17 +87,17 @@ /mob/living/carbon/human/proc/remove_mutant_immunity() REMOVE_TRAIT(src, TRAIT_MUTANT_IMMUNE, "mutant_virus") -/datum/component/mutant_infection/process(delta_time) +/datum/component/mutant_infection/process(seconds_per_tick) if(!ismutant(host) && host.stat != DEAD) var/toxloss = host.getToxLoss() if(toxloss < 50) - host.adjustToxLoss(tox_loss_mod * delta_time) - if(DT_PROB(5, delta_time)) + host.adjustToxLoss(tox_loss_mod * seconds_per_tick) + if(SPT_PROB(5, seconds_per_tick)) to_chat(host, span_userdanger("You feel your motor controls seize up for a moment!")) host.Paralyze(10) else - host.adjustToxLoss((tox_loss_mod * 2) * delta_time) - if(DT_PROB(10, delta_time)) + host.adjustToxLoss((tox_loss_mod * 2) * seconds_per_tick) + if(SPT_PROB(10, seconds_per_tick)) var/obj/item/bodypart/wound_area = host.get_bodypart(BODY_ZONE_CHEST) if(wound_area) var/datum/wound/slash/moderate/rotting_wound = new diff --git a/modular_skyrat/modules/mutants/code/mutant_species.dm b/modular_skyrat/modules/mutants/code/mutant_species.dm index 48861baaa74..5e790e992f6 100644 --- a/modular_skyrat/modules/mutants/code/mutant_species.dm +++ b/modular_skyrat/modules/mutants/code/mutant_species.dm @@ -96,7 +96,7 @@ heal_rate = 1.5 /// mutants do not stabilize body temperature they are the walking dead and are cold blooded -/datum/species/mutant/body_temperature_core(mob/living/carbon/human/humi, delta_time, times_fired) +/datum/species/mutant/body_temperature_core(mob/living/carbon/human/humi, seconds_per_tick, times_fired) return /datum/species/mutant/infectious/check_roundstart_eligible() @@ -110,21 +110,21 @@ if(.) COOLDOWN_START(src, regen_cooldown, REGENERATION_DELAY) -/datum/species/mutant/infectious/spec_life(mob/living/carbon/carbon_mob, delta_time, times_fired) +/datum/species/mutant/infectious/spec_life(mob/living/carbon/carbon_mob, seconds_per_tick, times_fired) . = ..() //mutants never actually die, they just fall down until they regenerate enough to rise back up. if(COOLDOWN_FINISHED(src, regen_cooldown)) var/heal_amt = heal_rate if(HAS_TRAIT(carbon_mob, TRAIT_CRITICAL_CONDITION)) heal_amt *= 2 - carbon_mob.heal_overall_damage(heal_amt * delta_time, heal_amt * delta_time) - carbon_mob.adjustStaminaLoss(-heal_amt * delta_time) - carbon_mob.adjustToxLoss(-heal_amt * delta_time) + carbon_mob.heal_overall_damage(heal_amt * seconds_per_tick, heal_amt * seconds_per_tick) + carbon_mob.adjustStaminaLoss(-heal_amt * seconds_per_tick) + carbon_mob.adjustToxLoss(-heal_amt * seconds_per_tick) for(var/i in carbon_mob.all_wounds) var/datum/wound/iter_wound = i - if(DT_PROB(2-(iter_wound.severity/2), delta_time)) + if(SPT_PROB(2-(iter_wound.severity/2), seconds_per_tick)) iter_wound.remove_wound() - if(!HAS_TRAIT(carbon_mob, TRAIT_CRITICAL_CONDITION) && DT_PROB(2, delta_time)) + if(!HAS_TRAIT(carbon_mob, TRAIT_CRITICAL_CONDITION) && SPT_PROB(2, seconds_per_tick)) playsound(carbon_mob, pick(spooks), 50, TRUE, 10) #undef REGENERATION_DELAY diff --git a/modular_skyrat/modules/new_cells/code/power_cell.dm b/modular_skyrat/modules/new_cells/code/power_cell.dm index 5756dd97194..d9769c479c1 100644 --- a/modular_skyrat/modules/new_cells/code/power_cell.dm +++ b/modular_skyrat/modules/new_cells/code/power_cell.dm @@ -23,7 +23,7 @@ STOP_PROCESSING(SSobj, src) return ..() -/obj/item/stock_parts/cell/crank/process(delta_time) +/obj/item/stock_parts/cell/crank/process(seconds_per_tick) use(discharge_amount) /obj/item/stock_parts/cell/crank/attack_self(mob/user) @@ -51,5 +51,5 @@ STOP_PROCESSING(SSobj, src) return ..() -/obj/item/stock_parts/cell/self_charge/process(delta_time) +/obj/item/stock_parts/cell/self_charge/process(seconds_per_tick) give(recharge_amount) diff --git a/modular_skyrat/modules/pollution/code/pollution_emitters.dm b/modular_skyrat/modules/pollution/code/pollution_emitters.dm index 9e5edfaca4a..a632d99aea7 100644 --- a/modular_skyrat/modules/pollution/code/pollution_emitters.dm +++ b/modular_skyrat/modules/pollution/code/pollution_emitters.dm @@ -33,7 +33,7 @@ PROCESSING_SUBSYSTEM_DEF(pollution_emitters) if(!affected.len) STOP_PROCESSING(SSpollution_emitters, src) -/datum/element/pollution_emitter/process(delta_time) +/datum/element/pollution_emitter/process(seconds_per_tick) for(var/atom/affected_atom as anything in affected) var/turf/my_turf = get_turf(affected_atom) my_turf.pollute_turf(pollutant_type, pollutant_amount) diff --git a/modular_skyrat/modules/pollution/code/temporary_pollution_emission_component.dm b/modular_skyrat/modules/pollution/code/temporary_pollution_emission_component.dm index 6d62d82fbf7..aaab4ec7410 100644 --- a/modular_skyrat/modules/pollution/code/temporary_pollution_emission_component.dm +++ b/modular_skyrat/modules/pollution/code/temporary_pollution_emission_component.dm @@ -21,13 +21,13 @@ STOP_PROCESSING(SSobj, src) return ..() -/datum/component/temporary_pollution_emission/process(delta_time = SSOBJ_DT) +/datum/component/temporary_pollution_emission/process(seconds_per_tick = SSOBJ_DT) var/turf/my_turf = get_turf(parent) if(!my_turf || world.time >= expiry_time) qdel(src) return - my_turf.pollute_turf(pollutant_type, pollutant_amount * delta_time) + my_turf.pollute_turf(pollutant_type, pollutant_amount * seconds_per_tick) /datum/component/temporary_pollution_emission/proc/wash_off() SIGNAL_HANDLER diff --git a/modular_skyrat/modules/reagent_forging/code/forge.dm b/modular_skyrat/modules/reagent_forging/code/forge.dm index 361d2320c0d..06873fc6082 100644 --- a/modular_skyrat/modules/reagent_forging/code/forge.dm +++ b/modular_skyrat/modules/reagent_forging/code/forge.dm @@ -266,7 +266,7 @@ var/obj/item/stack/sheet/mineral/coal/spawn_coal = new(get_turf(src)) spawn_coal.name = "charcoal" -/obj/structure/reagent_forge/process(delta_time) +/obj/structure/reagent_forge/process(seconds_per_tick) if(!COOLDOWN_FINISHED(src, forging_cooldown)) return @@ -285,10 +285,10 @@ set_smoke_state(SMOKE_STATE_NONE) return - handle_baking_things(delta_time) + handle_baking_things(seconds_per_tick) /// Sends signals to bake and items on the used tray, setting the smoke state of the forge according to the most cooked item in it -/obj/structure/reagent_forge/proc/handle_baking_things(delta_time) +/obj/structure/reagent_forge/proc/handle_baking_things(seconds_per_tick) if(forge_temperature < MIN_FORGE_TEMP) // If we are below minimum forge temp, don't continue on to cooking return @@ -296,7 +296,7 @@ var/worst_cooked_food_state = 0 for(var/obj/item/baked_item as anything in used_tray.contents) - var/signal_result = SEND_SIGNAL(baked_item, COMSIG_ITEM_OVEN_PROCESS, src, delta_time) + var/signal_result = SEND_SIGNAL(baked_item, COMSIG_ITEM_OVEN_PROCESS, src, seconds_per_tick) if(signal_result & COMPONENT_HANDLED_BAKING) if(signal_result & COMPONENT_BAKING_GOOD_RESULT && worst_cooked_food_state < SMOKE_STATE_GOOD) @@ -308,7 +308,7 @@ worst_cooked_food_state = SMOKE_STATE_BAD baked_item.fire_act(1000) // Overcooked food really does burn, hot hot hot! - if(DT_PROB(10, delta_time)) + if(SPT_PROB(10, seconds_per_tick)) visible_message(span_danger("You smell a burnt smell coming from [src]!")) // Give indication that something is burning in the oven set_smoke_state(worst_cooked_food_state) @@ -468,7 +468,7 @@ if(!user.transferItemToLoc(tray, src, silent = FALSE)) return - + // need to send the right signal for each item in the tray for(var/obj/item/baked_item in tray.contents) SEND_SIGNAL(baked_item, COMSIG_ITEM_OVEN_PLACED_IN, src, user) diff --git a/modular_skyrat/modules/reagent_forging/code/reagent_component.dm b/modular_skyrat/modules/reagent_forging/code/reagent_component.dm index 814f9a4e5e5..4d7648398e2 100644 --- a/modular_skyrat/modules/reagent_forging/code/reagent_component.dm +++ b/modular_skyrat/modules/reagent_forging/code/reagent_component.dm @@ -56,7 +56,7 @@ SIGNAL_HANDLER cloth_wearer = null -/datum/component/reagent_clothing/process(delta_time) +/datum/component/reagent_clothing/process(seconds_per_tick) if(!parent_clothing || !cloth_wearer || !length(imbued_reagent)) return diff --git a/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm b/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm index 65b55ec337f..2f961d94659 100644 --- a/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm +++ b/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm @@ -109,7 +109,7 @@ open_machine() return -/obj/machinery/self_actualization_device/process(delta_time) +/obj/machinery/self_actualization_device/process(seconds_per_tick) if(!processing) return if(!powered() || !occupant || !iscarbon(occupant)) diff --git a/modular_skyrat/modules/synths/code/reagents/reagents.dm b/modular_skyrat/modules/synths/code/reagents/reagents.dm index 667358cd451..c6da6f3ec9f 100644 --- a/modular_skyrat/modules/synths/code/reagents/reagents.dm +++ b/modular_skyrat/modules/synths/code/reagents/reagents.dm @@ -27,9 +27,9 @@ metabolization_rate = 2 * REAGENTS_METABOLISM process_flags = REAGENT_SYNTHETIC -/datum/reagent/medicine/system_cleaner/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - affected_mob.adjustToxLoss(-2 * REM * delta_time, 0) - var/remove_amount = 1 * REM * delta_time; +/datum/reagent/medicine/system_cleaner/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjustToxLoss(-2 * REM * seconds_per_tick, 0) + var/remove_amount = 1 * REM * seconds_per_tick; for(var/thing in affected_mob.reagents.reagent_list) var/datum/reagent/reagent = thing if(reagent != src) @@ -45,8 +45,8 @@ taste_description = "metal" process_flags = REAGENT_SYNTHETIC -/datum/reagent/medicine/liquid_solder/on_mob_life(mob/living/carbon/affected_mob, delta_time) - affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, -3 * REM * delta_time) +/datum/reagent/medicine/liquid_solder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) + affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, -3 * REM * seconds_per_tick) if(prob(10)) affected_mob.cure_trauma_type(resilience = TRAUMA_RESILIENCE_BASIC) return ..() @@ -66,14 +66,14 @@ var/temperature_change = 50 -/datum/reagent/medicine/nanite_slurry/on_mob_life(mob/living/carbon/affected_mob, delta_time) - var/heal_amount = healing * REM * delta_time +/datum/reagent/medicine/nanite_slurry/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick) + var/heal_amount = healing * REM * seconds_per_tick affected_mob.heal_bodypart_damage(heal_amount, heal_amount, required_bodytype = BODYTYPE_ROBOTIC) return ..() -/datum/reagent/medicine/nanite_slurry/overdose_process(mob/living/carbon/affected_mob, delta_time, times_fired) +/datum/reagent/medicine/nanite_slurry/overdose_process(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) if(affected_mob.mob_biotypes & MOB_ROBOTIC) - affected_mob.adjust_bodytemperature(temperature_change * REM * delta_time) + affected_mob.adjust_bodytemperature(temperature_change * REM * seconds_per_tick) return ..() affected_mob.reagents.remove_reagent(type, NANITE_SLURRY_ORGANIC_PURGE_RATE) //gets removed from organics very fast if(prob(NANITE_SLURRY_ORGANIC_VOMIT_CHANCE)) diff --git a/modular_skyrat/modules/wall_fungus/code/wall_fungus_component.dm b/modular_skyrat/modules/wall_fungus/code/wall_fungus_component.dm index 3d30c97c614..05d871a637c 100644 --- a/modular_skyrat/modules/wall_fungus/code/wall_fungus_component.dm +++ b/modular_skyrat/modules/wall_fungus/code/wall_fungus_component.dm @@ -59,16 +59,16 @@ parent_wall.update_icon(UPDATE_OVERLAYS) return ..() -/datum/component/wall_fungus/process(delta_time) +/datum/component/wall_fungus/process(seconds_per_tick) var/turf/closed/wall/parent_wall = parent - if(prob(spread_chance * delta_time)) + if(prob(spread_chance * seconds_per_tick)) spread_to_nearby_wall() if(progression_stage > FUNGUS_STAGE_MAX) collapse_parent_structure() return - progression_percent += progression_step_amount * delta_time + progression_percent += progression_step_amount * seconds_per_tick if(progression_percent >= 100) progression_percent = 0 diff --git a/tools/midi2piano/MidiDependencies/midi.py b/tools/midi2piano/MidiDependencies/midi.py index c1c6df64078..9a40784cc53 100644 --- a/tools/midi2piano/MidiDependencies/midi.py +++ b/tools/midi2piano/MidiDependencies/midi.py @@ -247,9 +247,9 @@ my_opus = score2opus(my_score) abs_time = 0 for event in sorted_events: # convert abs times => delta times - delta_time = event[1] - abs_time + seconds_per_tick = event[1] - abs_time abs_time = event[1] - event[1] = delta_time + event[1] = seconds_per_tick opus_tracks.append(sorted_events) opus_tracks.insert(0,ticks) _clean_up_warnings() diff --git a/tools/midi2piano/midi2piano.py b/tools/midi2piano/midi2piano.py index ab57bcc3f18..591cd5d2a65 100644 --- a/tools/midi2piano/midi2piano.py +++ b/tools/midi2piano/midi2piano.py @@ -170,9 +170,9 @@ def sort_score_by_event_times(score): key=lambda indx: score[indx][0]) )) -def convert_into_delta_times(score): +def convert_into_seconds_per_ticks(score): """ - Transform start_time into delta_time and returns new score + Transform start_time into seconds_per_tick and returns new score """ return list(map( lambda super_event: ( @@ -300,7 +300,7 @@ def main_cycle(): score = filter_empty_tracks(score) score = merge_events(score) score = sort_score_by_event_times(score) - score = convert_into_delta_times(score) + score = convert_into_seconds_per_ticks(score) score = perform_roundation(score) most_frequent_dur = obtain_common_duration(score) score = reduce_score_to_chords(score)