From f1a4956afc9e524134379042777bd252a22cf295 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 10 Jan 2020 13:26:34 -0800 Subject: [PATCH] easier for me to type --- code/_onclick/cyborg.dm | 2 +- code/game/objects/items/robot/robot_items.dm | 2 +- code/modules/clothing/head/misc_special.dm | 2 +- .../carbon/alien/humanoid/update_icons.dm | 2 +- .../mob/living/carbon/alien/larva/life.dm | 2 +- .../living/carbon/alien/larva/update_icons.dm | 4 +- code/modules/mob/living/carbon/carbon.dm | 2 +- .../living/carbon/monkey/monkey_defense.dm | 2 +- code/modules/mob/living/living_mobility.dm | 12 ++-- .../mob/living/silicon/pai/pai_shell.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 6 +- .../mob/living/simple_animal/bot/firebot.dm | 4 +- .../mob/living/simple_animal/simple_animal.dm | 2 +- code/modules/mob/living/status_procs.dm | 72 +++++++++---------- code/modules/mob/mob_defines.dm | 2 +- .../code/modules/mob/living/carbon/carbon.dm | 2 +- 16 files changed, 60 insertions(+), 60 deletions(-) diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 7691bb47c8..f3e6456332 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -14,7 +14,7 @@ if(check_click_intercept(params,A)) return - if(stat || locked_down || IsParalyzed() || _MOBILITYFLAGTEMPORARY_IsStun() || _MOBILITYFLAGTEMPORARY_IsUnconscious()) + if(stat || locked_down || IsParalyzed() || _REFACTORING_IsStun() || _REFACTORING_IsUnconscious()) return var/list/modifiers = params2list(params) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 43812ce2f0..178476ead4 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -80,7 +80,7 @@ else user.visible_message("[user] hugs [M] to make [M.p_them()] feel better!", \ "You hug [M] to make [M.p_them()] feel better!") - if(M._MOBILITYFLAGTEMPORARY_resting && !M.recoveringstam) + if(M._REFACTORING_resting && !M.recoveringstam) M.set_resting(FALSE, TRUE) else user.visible_message("[user] pets [M]!", \ diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index b24af9769a..25498b6d92 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -282,7 +282,7 @@ if(target.get_item_by_slot(SLOT_HEAD) != src) return QDEL_NULL(paranoia) - if(!target._MOBILITYFLAGTEMPORARY_IsUnconscious()) + if(!target._REFACTORING_IsUnconscious()) to_chat(target, "Your zealous conspirationism rapidly dissipates as the donned hat warps up into a ruined mess. All those theories starting to sound like nothing but a ridicolous fanfare.") /obj/item/clothing/head/foilhat/attack_hand(mob/user) diff --git a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm index 8772013d66..ae2ee87ae6 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm @@ -4,7 +4,7 @@ for(var/I in overlays_standing) add_overlay(I) - var/asleep = _MOBILITYFLAGTEMPORARY_IsSleeping() + var/asleep = _REFACTORING_IsSleeping() if(stat == DEAD) //If we mostly took damage from fire if(fireloss > 125) diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index 64b40f63e3..c0216543bb 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -18,7 +18,7 @@ if(health<= -maxHealth || !getorgan(/obj/item/organ/brain)) death() return - if(_MOBILITYFLAGTEMPORARY_IsUnconscious() || _MOBILITYFLAGTEMPORARY_IsSleeping() || getOxyLoss() > 50 || (HAS_TRAIT(src, TRAIT_DEATHCOMA)) || health <= crit_threshold) + if(_REFACTORING_IsUnconscious() || _REFACTORING_IsSleeping() || getOxyLoss() > 50 || (HAS_TRAIT(src, TRAIT_DEATHCOMA)) || health <= crit_threshold) if(stat == CONSCIOUS) stat = UNCONSCIOUS blind_eyes(1) diff --git a/code/modules/mob/living/carbon/alien/larva/update_icons.dm b/code/modules/mob/living/carbon/alien/larva/update_icons.dm index 5ce429f558..4272c763a9 100644 --- a/code/modules/mob/living/carbon/alien/larva/update_icons.dm +++ b/code/modules/mob/living/carbon/alien/larva/update_icons.dm @@ -14,9 +14,9 @@ icon_state = "larva[state]_dead" else if(handcuffed || legcuffed) //This should be an overlay. Who made this an icon_state? icon_state = "larva[state]_cuff" - else if(stat == UNCONSCIOUS || lying || _MOBILITYFLAGTEMPORARY_resting) + else if(stat == UNCONSCIOUS || lying || _REFACTORING_resting) icon_state = "larva[state]_sleep" - else if(_MOBILITYFLAGTEMPORARY_IsStun() || IsParalyzed()) + else if(_REFACTORING_IsStun() || IsParalyzed()) icon_state = "larva[state]_stun" else icon_state = "larva[state]" diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index d04b259b03..0bd004a08a 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -803,7 +803,7 @@ if(health <= HEALTH_THRESHOLD_DEAD && !HAS_TRAIT(src, TRAIT_NODEATH)) death() return - if(_MOBILITYFLAGTEMPORARY_IsUnconscious() || _MOBILITYFLAGTEMPORARY_IsSleeping() || getOxyLoss() > 50 || (HAS_TRAIT(src, TRAIT_DEATHCOMA)) || (health <= HEALTH_THRESHOLD_FULLCRIT && !HAS_TRAIT(src, TRAIT_NOHARDCRIT))) + if(_REFACTORING_IsUnconscious() || _REFACTORING_IsSleeping() || getOxyLoss() > 50 || (HAS_TRAIT(src, TRAIT_DEATHCOMA)) || (health <= HEALTH_THRESHOLD_FULLCRIT && !HAS_TRAIT(src, TRAIT_NOHARDCRIT))) stat = UNCONSCIOUS blind_eyes(1) if(combatmode) diff --git a/code/modules/mob/living/carbon/monkey/monkey_defense.dm b/code/modules/mob/living/carbon/monkey/monkey_defense.dm index 0f72907613..b2a923cc49 100644 --- a/code/modules/mob/living/carbon/monkey/monkey_defense.dm +++ b/code/modules/mob/living/carbon/monkey/monkey_defense.dm @@ -79,7 +79,7 @@ visible_message("[M] has attempted to punch [name]!", \ "[M] has attempted to punch [name]!", null, COMBAT_MESSAGE_RANGE) if(INTENT_DISARM) - if(!_MOBILITYFLAGTEMPORARY_IsUnconscious()) + if(!_REFACTORING_IsUnconscious()) M.do_attack_animation(src, ATTACK_EFFECT_DISARM) if (prob(25)) DefaultCombatKnockdown(40) diff --git a/code/modules/mob/living/living_mobility.dm b/code/modules/mob/living/living_mobility.dm index 111fa2de9b..533065a96f 100644 --- a/code/modules/mob/living/living_mobility.dm +++ b/code/modules/mob/living/living_mobility.dm @@ -25,20 +25,20 @@ set category = "IC" if(client?.prefs?.autostand) intentionalresting = !intentionalresting - to_chat(src, "You are now attempting to [intentionalresting ? "[!_MOBILITYFLAGTEMPORARY_resting ? "lay down and ": ""]stay down" : "[_MOBILITYFLAGTEMPORARY_resting ? "get up and ": ""]stay up"].") + to_chat(src, "You are now attempting to [intentionalresting ? "[!_REFACTORING_resting ? "lay down and ": ""]stay down" : "[_REFACTORING_resting ? "get up and ": ""]stay up"].") if(intentionalresting && !resting) set_resting(TRUE, FALSE) else resist_a_rest() else - if(!_MOBILITYFLAGTEMPORARY_resting) + if(!_REFACTORING_resting) set_resting(TRUE, FALSE) to_chat(src, "You are now laying down.") else resist_a_rest() /mob/living/proc/resist_a_rest(automatic = FALSE, ignoretimer = FALSE) //Lets mobs resist out of resting. Major QOL change with combat reworks. - if(!_MOBILITYFLAGTEMPORARY_resting || stat || attemptingstandup) + if(!_REFACTORING_resting || stat || attemptingstandup) return FALSE if(ignoretimer) set_resting(FALSE, FALSE) @@ -84,14 +84,14 @@ var/stat_softcrit = stat == SOFT_CRIT var/stat_conscious = (stat == CONSCIOUS) || stat_softcrit - var/conscious = !_MOBILITYFLAGTEMPORARY_IsUnconscious() && stat_conscious && !HAS_TRAIT(src, TRAIT_DEATHCOMA) + var/conscious = !_REFACTORING_IsUnconscious() && stat_conscious && !HAS_TRAIT(src, TRAIT_DEATHCOMA) var/has_arms = get_num_arms() var/has_legs = get_num_legs() var/ignore_legs = get_leg_ignore() - var/stun = _MOBILITYFLAGTEMPORARY_IsStun() + var/stun = _REFACTORING_IsStun() var/paralyze = IsParalyzed() - var/knockdown = _MOBILITYFLAGTEMPORARY_IsKnockdown() + var/knockdown = _REFACTORING_IsKnockdown() var/daze = IsDazed() var/immobilize = IsImmobilized() diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm index 8e0375fae1..33aeca8521 100644 --- a/code/modules/mob/living/silicon/pai/pai_shell.dm +++ b/code/modules/mob/living/silicon/pai/pai_shell.dm @@ -100,7 +100,7 @@ /mob/living/silicon/pai/lay_down() . = ..() if(loc != card) - visible_message("[src] [_MOBILITYFLAGTEMPORARY_resting? "lays down for a moment..." : "perks up from the ground"]") + visible_message("[src] [_REFACTORING_resting? "lays down for a moment..." : "perks up from the ground"]") update_icon() /mob/living/silicon/pai/start_pulling(atom/movable/AM, gs) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 3ace38f4e2..a5fa2a3c25 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -675,7 +675,7 @@ if(module.cyborg_base_icon == "robot") icon = 'icons/mob/robots.dmi' pixel_x = initial(pixel_x) - if(stat != DEAD && !(_MOBILITYFLAGTEMPORARY_IsUnconscious() ||_MOBILITYFLAGTEMPORARY_IsStun() || _MOBILITYFLAGTEMPORARY_IsKnockdown() || IsParalyzed() || low_power_mode)) //Not dead, not stunned. + if(stat != DEAD && !(_REFACTORING_IsUnconscious() ||_REFACTORING_IsStun() || _REFACTORING_IsKnockdown() || IsParalyzed() || low_power_mode)) //Not dead, not stunned. if(!eye_lights) eye_lights = new() if(lamp_intensity > 2) @@ -699,7 +699,7 @@ update_fire() if(client && stat != DEAD && module.dogborg == TRUE) - if(_MOBILITYFLAGTEMPORARY_resting) + if(_REFACTORING_resting) if(sitting) icon_state = "[module.cyborg_base_icon]-sit" if(bellyup) @@ -1020,7 +1020,7 @@ if(health <= -maxHealth) //die only once death() return - if(_MOBILITYFLAGTEMPORARY_IsUnconscious() || _MOBILITYFLAGTEMPORARY_IsStun() || IsParalyzed() || getOxyLoss() > maxHealth*0.5) + if(_REFACTORING_IsUnconscious() || _REFACTORING_IsStun() || IsParalyzed() || getOxyLoss() > maxHealth*0.5) if(stat == CONSCIOUS) stat = UNCONSCIOUS blind_eyes(1) diff --git a/code/modules/mob/living/simple_animal/bot/firebot.dm b/code/modules/mob/living/simple_animal/bot/firebot.dm index 06fba520d8..e4fa3236b1 100644 --- a/code/modules/mob/living/simple_animal/bot/firebot.dm +++ b/code/modules/mob/living/simple_animal/bot/firebot.dm @@ -170,7 +170,7 @@ if(!..()) return - if(_MOBILITYFLAGTEMPORARY_IsStun() || IsParalyzed()) + if(_REFACTORING_IsStun() || IsParalyzed()) old_target_fire = target_fire target_fire = null mode = BOT_IDLE @@ -287,7 +287,7 @@ if(!on) icon_state = "firebot0" return - if(_MOBILITYFLAGTEMPORARY_IsStun() || IsParalyzed()) + if(_REFACTORING_IsStun() || IsParalyzed()) icon_state = "firebots1" else if(stationary_mode) //Bot has yellow light to indicate stationary mode. icon_state = "firebots1" diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index db0ebc12fe..4df324d5a8 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -418,7 +418,7 @@ ..() /mob/living/simple_animal/update_mobility(value_otherwise = MOBILITY_FLAGS_DEFAULT) - if(_MOBILITYFLAGTEMPORARY_IsUnconscious() || _MOBILITYFLAGTEMPORARY_IsStun() || IsParalyzed() || stat || _MOBILITYFLAGTEMPORARY_resting) + if(_REFACTORING_IsUnconscious() || _REFACTORING_IsStun() || IsParalyzed() || stat || _REFACTORING_resting) drop_all_held_items() mobility_flags = NONE else if(buckled) diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index f960ffcdf1..b63e766418 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -22,11 +22,11 @@ ////////////////////////////// STUN //////////////////////////////////// -/mob/living/proc/_MOBILITYFLAGTEMPORARY_IsStun() //If we're stunned +/mob/living/proc/_REFACTORING_IsStun() //If we're stunned return has_status_effect(STATUS_EFFECT_STUN) -/mob/living/proc/_MOBILITYFLAGTEMPORARY_AmountStun() //How many deciseconds remain in our stun - var/datum/status_effect/incapacitating/stun/S = _MOBILITYFLAGTEMPORARY_IsStun() +/mob/living/proc/_REFACTORING_AmountStun() //How many deciseconds remain in our stun + var/datum/status_effect/incapacitating/stun/S = _REFACTORING_IsStun() if(S) return S.duration - world.time return 0 @@ -37,18 +37,18 @@ if(((status_flags & CANSTUN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun) if(absorb_stun(amount, ignore_canstun)) return - var/datum/status_effect/incapacitating/stun/S = _MOBILITYFLAGTEMPORARY_IsStun() + var/datum/status_effect/incapacitating/stun/S = _REFACTORING_IsStun() if(S) S.duration = max(world.time + amount, S.duration) else if(amount > 0) S = apply_status_effect(STATUS_EFFECT_STUN, amount, updating) return S -/mob/living/proc/_MOBILITYFLAGTEMPORARY_SetStun(amount, updating = TRUE, ignore_canstun = FALSE) //Sets remaining duration +/mob/living/proc/_REFACTORING_SetStun(amount, updating = TRUE, ignore_canstun = FALSE) //Sets remaining duration if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_STUN, amount, updating, ignore_canstun) & COMPONENT_NO_STUN) return if(((status_flags & CANSTUN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun) - var/datum/status_effect/incapacitating/stun/S = _MOBILITYFLAGTEMPORARY_IsStun() + var/datum/status_effect/incapacitating/stun/S = _REFACTORING_IsStun() if(amount <= 0) if(S) qdel(S) @@ -61,13 +61,13 @@ S = apply_status_effect(STATUS_EFFECT_STUN, amount, updating) return S -/mob/living/proc/_MOBILITYFLAGTEMPORARY_AdjustStun(amount, updating = TRUE, ignore_canstun = FALSE) //Adds to remaining duration +/mob/living/proc/_REFACTORING_AdjustStun(amount, updating = TRUE, ignore_canstun = FALSE) //Adds to remaining duration if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_STUN, amount, updating, ignore_canstun) & COMPONENT_NO_STUN) return if(((status_flags & CANSTUN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun) if(absorb_stun(amount, ignore_canstun)) return - var/datum/status_effect/incapacitating/stun/S = _MOBILITYFLAGTEMPORARY_IsStun() + var/datum/status_effect/incapacitating/stun/S = _REFACTORING_IsStun() if(S) S.duration += amount else if(amount > 0) @@ -76,33 +76,33 @@ ///////////////////////////////// KNOCKDOWN ///////////////////////////////////// -/mob/living/proc/_MOBILITYFLAGTEMPORARY_IsKnockdown() //If we're knocked down +/mob/living/proc/_REFACTORING_IsKnockdown() //If we're knocked down return has_status_effect(STATUS_EFFECT_KNOCKDOWN) -/mob/living/proc/_MOBILITYFLAGTEMPORARY_AmountKnockdown() //How many deciseconds remain in our knockdown - var/datum/status_effect/incapacitating/knockdown/K = _MOBILITYFLAGTEMPORARY_IsKnockdown() +/mob/living/proc/_REFACTORING_AmountKnockdown() //How many deciseconds remain in our knockdown + var/datum/status_effect/incapacitating/knockdown/K = _REFACTORING_IsKnockdown() if(K) return K.duration - world.time return 0 -/mob/living/proc/_MOBILITYFLAGTEMPORARY_Knockdown(amount, updating = TRUE, ignore_canstun = FALSE) //Can't go below remaining duration +/mob/living/proc/_REFACTORING_Knockdown(amount, updating = TRUE, ignore_canstun = FALSE) //Can't go below remaining duration if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_KNOCKDOWN, amount, updating, ignore_canstun) & COMPONENT_NO_STUN) return if(((status_flags & CANKNOCKDOWN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun) if(absorb_stun(amount, ignore_canstun)) return - var/datum/status_effect/incapacitating/knockdown/K = _MOBILITYFLAGTEMPORARY_IsKnockdown() + var/datum/status_effect/incapacitating/knockdown/K = _REFACTORING_IsKnockdown() if(K) K.duration = max(world.time + amount, K.duration) else if(amount > 0) K = apply_status_effect(STATUS_EFFECT_KNOCKDOWN, amount, updating) return K -/mob/living/proc/_MOBILITYFLAGTEMPORARY_SetKnockdown(amount, updating = TRUE, ignore_canstun = FALSE) //Sets remaining duration +/mob/living/proc/_REFACTORING_SetKnockdown(amount, updating = TRUE, ignore_canstun = FALSE) //Sets remaining duration if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_KNOCKDOWN, amount, updating, ignore_canstun) & COMPONENT_NO_STUN) return if(((status_flags & CANKNOCKDOWN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun) - var/datum/status_effect/incapacitating/knockdown/K = _MOBILITYFLAGTEMPORARY_IsKnockdown() + var/datum/status_effect/incapacitating/knockdown/K = _REFACTORING_IsKnockdown() if(amount <= 0) if(K) qdel(K) @@ -115,13 +115,13 @@ K = apply_status_effect(STATUS_EFFECT_KNOCKDOWN, amount, updating) return K -/mob/living/proc/_MOBILITYFLAGTEMPORARY_AdjustKnockdown(amount, updating = TRUE, ignore_canstun = FALSE) //Adds to remaining duration +/mob/living/proc/_REFACTORING_AdjustKnockdown(amount, updating = TRUE, ignore_canstun = FALSE) //Adds to remaining duration if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_KNOCKDOWN, amount, updating, ignore_canstun) & COMPONENT_NO_STUN) return if(((status_flags & CANKNOCKDOWN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun) if(absorb_stun(amount, ignore_canstun)) return - var/datum/status_effect/incapacitating/knockdown/K = _MOBILITYFLAGTEMPORARY_IsKnockdown() + var/datum/status_effect/incapacitating/knockdown/K = _REFACTORING_IsKnockdown() if(K) K.duration += amount else if(amount > 0) @@ -290,7 +290,7 @@ //Blanket /mob/living/proc/AllImmobility(amount, updating, ignore_canstun = FALSE) Paralyze(amount, FALSE, ignore_canstun) - _MOBILITYFLAGTEMPORARY_Knockdown(amount, FALSE, ignore_canstun) + _REFACTORING_Knockdown(amount, FALSE, ignore_canstun) Stun(amount, FALSE, ignore_canstun) Immobilize(amount, FALSE, ignore_canstun) Daze(amount, FALSE, ignore_canstun) @@ -299,8 +299,8 @@ /mob/living/proc/SetAllImmobility(amount, updating, ignore_canstun = FALSE) SetParalyzed(amount, FALSE, ignore_canstun) - _MOBILITYFLAGTEMPORARY_SetKnockdown(amount, FALSE, ignore_canstun) - _MOBILITYFLAGTEMPORARY_SetStun(amount, FALSE, ignore_canstun) + _REFACTORING_SetKnockdown(amount, FALSE, ignore_canstun) + _REFACTORING_SetStun(amount, FALSE, ignore_canstun) SetImmobilized(amount, FALSE, ignore_canstun) SetDazed(amount, FALSE, ignore_canstun) if(updating) @@ -308,8 +308,8 @@ /mob/living/proc/AdjustAllImmobility(amount, updating, ignore_canstun = FALSE) AdjustParalyzed(amount, FALSE, ignore_canstun) - _MOBILITYFLAGTEMPORARY_AdjustKnockdown(amount, FALSE, ignore_canstun) - _MOBILITYFLAGTEMPORARY_AdjustStun(amount, FALSE, ignore_canstun) + _REFACTORING_AdjustKnockdown(amount, FALSE, ignore_canstun) + _REFACTORING_AdjustStun(amount, FALSE, ignore_canstun) AdjustImmobilized(amount, FALSE, ignore_canstun) AdjustDazed(amount, FALSE, ignore_canstun) if(updating) @@ -317,10 +317,10 @@ /// Makes sure all 5 of the non-knockout immobilizing status effects are lower or equal to amount. /mob/living/proc/HealAllImmobilityUpTo(amount, updating, ignore_canstun = FALSE) - if(_MOBILITYFLAGTEMPORARY_AmountStun() > amount) - _MOBILITYFLAGTEMPORARY_SetStun(amount, FALSE, ignore_canstun) - if(_MOBILITYFLAGTEMPORARY_AmountKnockdown() > amount) - _MOBILITYFLAGTEMPORARY_SetKnockdown(amount, FALSE, ignore_canstun) + if(_REFACTORING_AmountStun() > amount) + _REFACTORING_SetStun(amount, FALSE, ignore_canstun) + if(_REFACTORING_AmountKnockdown() > amount) + _REFACTORING_SetKnockdown(amount, FALSE, ignore_canstun) if(AmountParalyzed() > amount) SetParalyzed(amount, FALSE, ignore_canstun) if(AmountImmobilized() > amount) @@ -331,11 +331,11 @@ update_mobility() //////////////////UNCONSCIOUS -/mob/living/proc/_MOBILITYFLAGTEMPORARY_IsUnconscious() //If we're unconscious +/mob/living/proc/_REFACTORING_IsUnconscious() //If we're unconscious return has_status_effect(STATUS_EFFECT_UNCONSCIOUS) /mob/living/proc/AmountUnconscious() //How many deciseconds remain in our unconsciousness - var/datum/status_effect/incapacitating/unconscious/U = _MOBILITYFLAGTEMPORARY_IsUnconscious() + var/datum/status_effect/incapacitating/unconscious/U = _REFACTORING_IsUnconscious() if(U) return U.duration - world.time return 0 @@ -344,7 +344,7 @@ if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_UNCONSCIOUS, amount, updating, ignore_canstun) & COMPONENT_NO_STUN) return if(((status_flags & CANUNCONSCIOUS) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun) - var/datum/status_effect/incapacitating/unconscious/U = _MOBILITYFLAGTEMPORARY_IsUnconscious() + var/datum/status_effect/incapacitating/unconscious/U = _REFACTORING_IsUnconscious() if(U) U.duration = max(world.time + amount, U.duration) else if(amount > 0) @@ -355,7 +355,7 @@ if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_UNCONSCIOUS, amount, updating, ignore_canstun) & COMPONENT_NO_STUN) return if(((status_flags & CANUNCONSCIOUS) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun) - var/datum/status_effect/incapacitating/unconscious/U = _MOBILITYFLAGTEMPORARY_IsUnconscious() + var/datum/status_effect/incapacitating/unconscious/U = _REFACTORING_IsUnconscious() if(amount <= 0) if(U) qdel(U) @@ -369,7 +369,7 @@ if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_UNCONSCIOUS, amount, updating, ignore_canstun) & COMPONENT_NO_STUN) return if(((status_flags & CANUNCONSCIOUS) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun) - var/datum/status_effect/incapacitating/unconscious/U = _MOBILITYFLAGTEMPORARY_IsUnconscious() + var/datum/status_effect/incapacitating/unconscious/U = _REFACTORING_IsUnconscious() if(U) U.duration += amount else if(amount > 0) @@ -378,11 +378,11 @@ /////////////////////////////////// SLEEPING //////////////////////////////////// -/mob/living/proc/_MOBILITYFLAGTEMPORARY_IsSleeping() //If we're asleep +/mob/living/proc/_REFACTORING_IsSleeping() //If we're asleep return has_status_effect(STATUS_EFFECT_SLEEPING) /mob/living/proc/AmountSleeping() //How many deciseconds remain in our sleep - var/datum/status_effect/incapacitating/sleeping/S = _MOBILITYFLAGTEMPORARY_IsSleeping() + var/datum/status_effect/incapacitating/sleeping/S = _REFACTORING_IsSleeping() if(S) return S.duration - world.time return 0 @@ -391,7 +391,7 @@ if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_SLEEP, amount, updating, ignore_canstun) & COMPONENT_NO_STUN) return if((!HAS_TRAIT(src, TRAIT_SLEEPIMMUNE)) || ignore_canstun) - var/datum/status_effect/incapacitating/sleeping/S = _MOBILITYFLAGTEMPORARY_IsSleeping() + var/datum/status_effect/incapacitating/sleeping/S = _REFACTORING_IsSleeping() if(S) S.duration = max(world.time + amount, S.duration) else if(amount > 0) @@ -402,7 +402,7 @@ if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_SLEEP, amount, updating, ignore_canstun) & COMPONENT_NO_STUN) return if((!HAS_TRAIT(src, TRAIT_SLEEPIMMUNE)) || ignore_canstun) - var/datum/status_effect/incapacitating/sleeping/S = _MOBILITYFLAGTEMPORARY_IsSleeping() + var/datum/status_effect/incapacitating/sleeping/S = _REFACTORING_IsSleeping() if(amount <= 0) if(S) qdel(S) @@ -416,7 +416,7 @@ if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_SLEEP, amount, updating, ignore_canstun) & COMPONENT_NO_STUN) return if((!HAS_TRAIT(src, TRAIT_SLEEPIMMUNE)) || ignore_canstun) - var/datum/status_effect/incapacitating/sleeping/S = _MOBILITYFLAGTEMPORARY_IsSleeping() + var/datum/status_effect/incapacitating/sleeping/S = _REFACTORING_IsSleeping() if(S) S.duration += amount else if(amount > 0) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 3dd6e9dd71..df9681489b 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -34,7 +34,7 @@ var/eye_blurry = 0 //Carbon var/real_name = null var/spacewalk = FALSE - var/_MOBILITYFLAGTEMPORARY_resting = 0 //Carbon + var/_REFACTORING_resting = 0 //Carbon var/lying = 0 var/lying_prev = 0 diff --git a/modular_citadel/code/modules/mob/living/carbon/carbon.dm b/modular_citadel/code/modules/mob/living/carbon/carbon.dm index f0d633ba45..b78f97cc7f 100644 --- a/modular_citadel/code/modules/mob/living/carbon/carbon.dm +++ b/modular_citadel/code/modules/mob/living/carbon/carbon.dm @@ -33,7 +33,7 @@ if(combatmode) if(world.time >= combatmessagecooldown) if(a_intent != INTENT_HELP) - visible_message("[src] [_MOBILITYFLAGTEMPORARY_resting ? "tenses up" : (prob(95)? "drops into a combative stance" : (prob(95)? "poses aggressively" : "asserts dominance with their pose"))].") + visible_message("[src] [_REFACTORING_resting ? "tenses up" : (prob(95)? "drops into a combative stance" : (prob(95)? "poses aggressively" : "asserts dominance with their pose"))].") else visible_message("[src] [pick("looks","seems","goes")] [pick("alert","attentive","vigilant")].") playsound_local(src, 'sound/misc/ui_toggle.ogg', 50, FALSE, pressure_affected = FALSE) //Sound from interbay!