diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm
index 3cfc773cfa7..42ce42434db 100644
--- a/code/datums/components/mood.dm
+++ b/code/datums/components/mood.dm
@@ -208,27 +208,27 @@
switch(sanity)
if(SANITY_INSANE to SANITY_CRAZY)
setInsanityEffect(MAJOR_INSANITY_PEN)
- master._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/sanity/insane, override = TRUE)
+ master.add_movespeed_modifier(/datum/movespeed_modifier/sanity/insane, override = TRUE)
sanity_level = 6
if(SANITY_CRAZY to SANITY_UNSTABLE)
setInsanityEffect(MINOR_INSANITY_PEN)
- master._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/sanity/crazy, override = TRUE)
+ master.add_movespeed_modifier(/datum/movespeed_modifier/sanity/crazy, override = TRUE)
sanity_level = 5
if(SANITY_UNSTABLE to SANITY_DISTURBED)
setInsanityEffect(0)
- master._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/sanity/disturbed, override = TRUE)
+ master.add_movespeed_modifier(/datum/movespeed_modifier/sanity/disturbed, override = TRUE)
sanity_level = 4
if(SANITY_DISTURBED to SANITY_NEUTRAL)
setInsanityEffect(0)
- master._REFACTORING_remove_movespeed_modifier(MOVESPEED_ID_SANITY)
+ master.remove_movespeed_modifier(MOVESPEED_ID_SANITY)
sanity_level = 3
if(SANITY_NEUTRAL+1 to SANITY_GREAT+1) //shitty hack but +1 to prevent it from responding to super small differences
setInsanityEffect(0)
- master._REFACTORING_remove_movespeed_modifier(MOVESPEED_ID_SANITY)
+ master.remove_movespeed_modifier(MOVESPEED_ID_SANITY)
sanity_level = 2
if(SANITY_GREAT+1 to INFINITY)
setInsanityEffect(0)
- master._REFACTORING_remove_movespeed_modifier(MOVESPEED_ID_SANITY)
+ master.remove_movespeed_modifier(MOVESPEED_ID_SANITY)
sanity_level = 1
update_mood_icon()
diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index b4248189d23..05629e8ae54 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -212,13 +212,13 @@
/datum/component/riding/human/vehicle_mob_unbuckle(datum/source, mob/living/M, force = FALSE)
var/mob/living/carbon/human/H = parent
- H._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/human_carry)
+ H.remove_movespeed_modifier(/datum/movespeed_modifier/human_carry)
. = ..()
/datum/component/riding/human/vehicle_mob_buckle(datum/source, mob/living/M, force = FALSE)
. = ..()
var/mob/living/carbon/human/H = parent
- H._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/human_carry)
+ H.add_movespeed_modifier(/datum/movespeed_modifier/human_carry)
/datum/component/riding/human/proc/on_host_unarmed_melee(atom/target)
var/mob/living/carbon/human/H = parent
diff --git a/code/datums/components/shrink.dm b/code/datums/components/shrink.dm
index 155c27a9035..157eb36c373 100644
--- a/code/datums/components/shrink.dm
+++ b/code/datums/components/shrink.dm
@@ -14,7 +14,7 @@
parent_atom.opacity = 0
if(isliving(parent_atom))
var/mob/living/L = parent_atom
- L._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/shrink_ray)
+ L.add_movespeed_modifier(/datum/movespeed_modifier/shrink_ray)
if(iscarbon(L))
var/mob/living/carbon/C = L
C.unequip_everything()
@@ -34,7 +34,7 @@
parent_atom.opacity = oldopac
if(isliving(parent_atom))
var/mob/living/L = parent_atom
- L._REFACTORING_remove_movespeed_modifier(MOVESPEED_ID_SHRINK_RAY)
+ L.remove_movespeed_modifier(MOVESPEED_ID_SHRINK_RAY)
if(ishuman(L))
var/mob/living/carbon/human/H = L
H.physiology.damage_resistance += 100
diff --git a/code/datums/elements/snail_crawl.dm b/code/datums/elements/snail_crawl.dm
index d8e6341e975..b726c55e425 100644
--- a/code/datums/elements/snail_crawl.dm
+++ b/code/datums/elements/snail_crawl.dm
@@ -16,13 +16,13 @@
. = ..()
UnregisterSignal(target, COMSIG_MOVABLE_MOVED)
if(istype(target))
- target._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/snail_crawl)
+ target.remove_movespeed_modifier(/datum/movespeed_modifier/snail_crawl)
/datum/element/snailcrawl/proc/snail_crawl(mob/living/carbon/snail)
if(snail.resting && !snail.buckled && lubricate(snail))
- snail._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/snail_crawl)
+ snail.add_movespeed_modifier(/datum/movespeed_modifier/snail_crawl)
else
- snail._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/snail_crawl)
+ snail.remove_movespeed_modifier(/datum/movespeed_modifier/snail_crawl)
/datum/element/snailcrawl/proc/lubricate(atom/movable/snail)
var/turf/open/OT = get_turf(snail)
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 4b98939b353..f31e849b67b 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -172,9 +172,9 @@
if(!victim.client || !istype(victim))
return
to_chat(victim, "You feel fast!")
- victim._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/yellow_orb)
+ victim.add_movespeed_modifier(/datum/movespeed_modifier/yellow_orb)
sleep(duration)
- victim._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/yellow_orb)
+ victim.remove_movespeed_modifier(/datum/movespeed_modifier/yellow_orb)
to_chat(victim, "You slow down.")
/datum/movespeed_modifier/yellow_orb
diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm
index 198fd4329a6..a5660c6ca2a 100644
--- a/code/game/objects/items/tanks/jetpack.dm
+++ b/code/game/objects/items/tanks/jetpack.dm
@@ -56,7 +56,7 @@
ion_trail.start()
RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/move_react)
if(full_speed)
- user._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
+ user.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
/obj/item/tank/jetpack/proc/turn_off(mob/user)
on = FALSE
@@ -64,7 +64,7 @@
icon_state = initial(icon_state)
ion_trail.stop()
UnregisterSignal(user, COMSIG_MOVABLE_MOVED)
- user._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
+ user.remove_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
/obj/item/tank/jetpack/proc/move_react(mob/user)
allow_thrust(0.01, user)
diff --git a/code/modules/antagonists/changeling/powers/strained_muscles.dm b/code/modules/antagonists/changeling/powers/strained_muscles.dm
index cf2c73aa1a0..8844c5844c3 100644
--- a/code/modules/antagonists/changeling/powers/strained_muscles.dm
+++ b/code/modules/antagonists/changeling/powers/strained_muscles.dm
@@ -18,7 +18,7 @@
if(active)
to_chat(user, "Our muscles tense and strengthen.")
else
- user._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/strained_muscles)
+ user.remove_movespeed_modifier(/datum/movespeed_modifier/strained_muscles)
to_chat(user, "Our muscles relax.")
if(stacks >= 10)
to_chat(user, "We collapse in exhaustion.")
@@ -31,12 +31,12 @@
/datum/action/changeling/strained_muscles/proc/muscle_loop(mob/living/carbon/user)
while(active)
- user._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/strained_muscles)
+ user.add_movespeed_modifier(/datum/movespeed_modifier/strained_muscles)
if(user.stat != CONSCIOUS || user.staminaloss >= 90)
active = !active
to_chat(user, "Our muscles relax without the energy to strengthen them.")
user.Paralyze(40)
- user._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/strained_muscles)
+ user.remove_movespeed_modifier(/datum/movespeed_modifier/strained_muscles)
break
stacks++
diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm
index 127a5bb15a2..61072f6cf9b 100644
--- a/code/modules/antagonists/slaughter/slaughter.dm
+++ b/code/modules/antagonists/slaughter/slaughter.dm
@@ -67,8 +67,8 @@
/mob/living/simple_animal/slaughter/phasein()
. = ..()
- _REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/slaughter)
- addtimer(CALLBACK(src, .proc/_REFACTORING_remove_movespeed_modifier, /datum/movespeed_modifier/slaughter), 6 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
+ add_movespeed_modifier(/datum/movespeed_modifier/slaughter)
+ addtimer(CALLBACK(src, .proc/remove_movespeed_modifier, /datum/movespeed_modifier/slaughter), 6 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
//The loot from killing a slaughter demon - can be consumed to allow the user to blood crawl
/obj/item/organ/heart/demon
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
index 833776486e2..a3be1020169 100644
--- a/code/modules/awaymissions/mission_code/Academy.dm
+++ b/code/modules/awaymissions/mission_code/Academy.dm
@@ -252,7 +252,7 @@
if(6)
//Cut speed
T.visible_message("[user] starts moving slower!")
- user._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/die_of_fate)
+ user.add_movespeed_modifier(/datum/movespeed_modifier/die_of_fate)
if(7)
//Throw
T.visible_message("Unseen forces throw [user]!")
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index a6e3fb7ec39..d4e7509d97c 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -497,9 +497,9 @@
/mob/living/carbon/update_mobility()
. = ..()
if(!(mobility_flags & MOBILITY_STAND))
- _REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/carbon_crawling)
+ add_movespeed_modifier(/datum/movespeed_modifier/carbon_crawling)
else
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/carbon_crawling)
+ remove_movespeed_modifier(/datum/movespeed_modifier/carbon_crawling)
/datum/movespeed_modifier/carbon_crawling
id = MOVESPEED_ID_CARBON_CRAWLING
@@ -526,9 +526,9 @@
med_hud_set_health()
if(stat == SOFT_CRIT)
- _REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/carbon_softcrit)
+ add_movespeed_modifier(/datum/movespeed_modifier/carbon_softcrit)
else
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/carbon_softcrit)
+ remove_movespeed_modifier(/datum/movespeed_modifier/carbon_softcrit)
/mob/living/carbon/update_stamina()
var/stam = getStaminaLoss()
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index f53689f1f04..1665829f3c5 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1018,7 +1018,7 @@
return FALSE
/mob/living/carbon/human/proc/clear_shove_slowdown()
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/shove)
+ remove_movespeed_modifier(/datum/movespeed_modifier/shove)
var/active_item = get_active_held_item()
if(is_type_in_typecache(active_item, GLOB.shove_disarming_types))
visible_message("[src.name] regains their grip on \the [active_item]!", "You regain your grip on \the [active_item]", null, COMBAT_MESSAGE_RANGE)
@@ -1031,16 +1031,16 @@
. = ..()
dna?.species.spec_updatehealth(src)
if(HAS_TRAIT(src, TRAIT_IGNOREDAMAGESLOWDOWN))
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown)
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown_flying)
+ remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown)
+ remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown_flying)
return
var/health_deficiency = max((maxHealth - health), staminaloss)
if(health_deficiency >= 40)
add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown)
add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown_flying)
else
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown)
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown_flying)
+ remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown)
+ remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown_flying)
/mob/living/carbon/human/adjust_nutrition(change) //Honestly FUCK the oldcoders for putting nutrition on /mob someone else can move it up because holy hell I'd have to fix SO many typechecks
if(HAS_TRAIT(src, TRAIT_NOHUNGER))
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 7841c02e0e9..5b3fe0ec903 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -353,7 +353,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
C.dna.features["wings"] = "None"
C.update_body()
- C._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/species)
+ C.remove_movespeed_modifier(/datum/movespeed_modifier/species)
SEND_SIGNAL(C, COMSIG_SPECIES_LOSS, src)
@@ -1026,14 +1026,14 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(H.overeatduration < 100)
to_chat(H, "You feel fit again!")
REMOVE_TRAIT(H, TRAIT_FAT, OBESITY)
- H._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/obesity)
+ H.remove_movespeed_modifier(/datum/movespeed_modifier/obesity)
H.update_inv_w_uniform()
H.update_inv_wear_suit()
else
if(H.overeatduration >= 100)
to_chat(H, "You suddenly feel blubbery!")
ADD_TRAIT(H, TRAIT_FAT, OBESITY)
- H._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/obesity)
+ H.add_movespeed_modifier(/datum/movespeed_modifier/obesity)
H.update_inv_w_uniform()
H.update_inv_wear_suit()
@@ -1094,7 +1094,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(E.get_charge(H) <= ETHEREAL_CHARGE_NORMAL)
H.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/hunger, multiplicative_slowdown = (1.5 * (1 - E.get_charge(H) / 100)))
else
- H._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/hunger)
+ H.remove_movespeed_modifier(/datum/movespeed_modifier/hunger)
switch(H.nutrition)
if(NUTRITION_LEVEL_FULL to INFINITY)
@@ -1377,8 +1377,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/knocked_item = FALSE
if(!is_type_in_typecache(target_held_item, GLOB.shove_disarming_types))
target_held_item = null
- if(!target._REFACTORING_has_movespeed_modifier(/datum/movespeed_modifier/shove))
- target._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/shove)
+ if(!target.has_movespeed_modifier(/datum/movespeed_modifier/shove))
+ target.add_movespeed_modifier(/datum/movespeed_modifier/shove)
if(target_held_item)
target.visible_message("[target.name]'s grip on \the [target_held_item] loosens!",
"Your grip on \the [target_held_item] loosens!", null, COMBAT_MESSAGE_RANGE)
@@ -1643,7 +1643,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "cold")
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "hot", /datum/mood_event/hot)
- H._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/cold)
+ H.remove_movespeed_modifier(/datum/movespeed_modifier/cold)
var/burn_damage
var/firemodifier = H.fire_stacks / 50
@@ -1683,7 +1683,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
else
H.clear_alert("temp")
- H._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/cold)
+ H.remove_movespeed_modifier(/datum/movespeed_modifier/cold)
SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "cold")
SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "hot")
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index b5e3dbc5634..49419e62646 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1210,7 +1210,7 @@
if(limbless_slowdown)
add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/limbless, multiplicative_slowdown = limbless_slowdown)
else
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/limbless)
+ remove_movespeed_modifier(/datum/movespeed_modifier/limbless)
/mob/living/proc/fall(forced)
if(!(mobility_flags & MOBILITY_USE))
diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index 8dde0fdcebb..2fb42d1e96c 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -26,31 +26,31 @@
return ..()
/mob/living/proc/update_move_intent_slowdown()
- _REFACTORING_add_movespeed_modifier((m_intent == MOVE_INTENT_WALK)? /datum/movespeed_modifier/config_walk_run/walk : /datum/movespeed_modifier/config_walk_run/run, override = TRUE)
+ add_movespeed_modifier((m_intent == MOVE_INTENT_WALK)? /datum/movespeed_modifier/config_walk_run/walk : /datum/movespeed_modifier/config_walk_run/run, override = TRUE)
/mob/living/proc/update_turf_movespeed(turf/open/T)
if(istype(T))
add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/turf_slowdown, multiplicative_slowdown = T.slowdown)
else
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/turf_slowdown)
+ remove_movespeed_modifier(/datum/movespeed_modifier/turf_slowdown)
/mob/living/proc/update_pull_movespeed()
if(pulling)
if(isliving(pulling))
var/mob/living/L = pulling
if(!slowed_by_drag || (L.mobility_flags & MOBILITY_STAND) || L.buckled || grab_state >= GRAB_AGGRESSIVE)
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/bulky_drag)
+ remove_movespeed_modifier(/datum/movespeed_modifier/bulky_drag)
return
add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/bulky_drag, multiplicative_slowdown = PULL_PRONE_SLOWDOWN)
return
if(isobj(pulling))
var/obj/structure/S = pulling
if(!slowed_by_drag || !S.drag_slowdown)
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/bulky_drag)
+ remove_movespeed_modifier(/datum/movespeed_modifier/bulky_drag)
return
add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/bulky_drag, multiplicative_slowdown = S.drag_slowdown)
return
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/bulky_drag)
+ remove_movespeed_modifier(/datum/movespeed_modifier/bulky_drag)
/mob/living/can_zFall(turf/T, levels)
return ..()
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index bd2f9e085fd..897ec8ad578 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -254,9 +254,9 @@
/mob/living/silicon/pai/Process_Spacemove(movement_dir = 0)
. = ..()
if(!.)
- _REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/pai_spacewalk)
+ add_movespeed_modifier(/datum/movespeed_modifier/pai_spacewalk)
return TRUE
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/pai_spacewalk)
+ remove_movespeed_modifier(/datum/movespeed_modifier/pai_spacewalk)
return TRUE
/mob/living/silicon/pai/examine(mob/user)
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 27ce3a64a89..3413865db47 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -367,7 +367,7 @@
/mob/living/simple_animal/proc/update_simplemob_varspeed()
if(speed == 0)
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/simplemob_varspeed)
+ remove_movespeed_modifier(/datum/movespeed_modifier/simplemob_varspeed)
add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/simplemob_varspeed, multiplicative_slowdown = speed)
/mob/living/simple_animal/Stat()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 413177f8e0b..b1aab6af4e3 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1232,20 +1232,20 @@
/mob/setGrabState(newstate)
. = ..()
if(grab_state == GRAB_PASSIVE)
- _REFACTORING_remove_movespeed_modifier(MOVESPEED_ID_MOB_GRAB_STATE)
+ remove_movespeed_modifier(MOVESPEED_ID_MOB_GRAB_STATE)
else
switch(grab_state)
if(GRAB_AGGRESSIVE)
- _REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/grab_slowdown/aggressive)
+ add_movespeed_modifier(/datum/movespeed_modifier/grab_slowdown/aggressive)
if(GRAB_NECK)
- _REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/grab_slowdown/neck)
+ add_movespeed_modifier(/datum/movespeed_modifier/grab_slowdown/neck)
if(GRAB_KILL)
- _REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/grab_slowdown/kill)
+ add_movespeed_modifier(/datum/movespeed_modifier/grab_slowdown/kill)
/mob/proc/update_equipment_speed_mods()
var/speedies = equipped_speed_mods()
if(!speedies)
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/equipment_speedmod)
+ remove_movespeed_modifier(/datum/movespeed_modifier/equipment_speedmod)
else
add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/equipment_speedmod, multiplicative_slowdown = speedies)
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 9330926db99..45a3e8d88e0 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -330,7 +330,7 @@
/mob/proc/update_gravity(has_gravity, override=FALSE)
var/speed_change = max(0, has_gravity - STANDARD_GRAVITY)
if(!speed_change)
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/gravity)
+ remove_movespeed_modifier(/datum/movespeed_modifier/gravity)
else
add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/gravity, multiplicative_slowdown=speed_change)
diff --git a/code/modules/movespeed/_movespeed_modifier.dm b/code/modules/movespeed/_movespeed_modifier.dm
index 7725260c628..3e68ab7bfa0 100644
--- a/code/modules/movespeed/_movespeed_modifier.dm
+++ b/code/modules/movespeed/_movespeed_modifier.dm
@@ -73,7 +73,7 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache)
return GLOB.movespeed_modification_cache[modtype] || ((GLOB.movespeed_modification_cache[modtype] = new modtype))
///Add a move speed modifier to a mob. If a variable subtype is passed in as the first argument, it will make a new datum.
-/mob/proc/_REFACTORING_add_movespeed_modifier(datum/movespeed_modifier/type_or_datum, update = TRUE)
+/mob/proc/add_movespeed_modifier(datum/movespeed_modifier/type_or_datum, update = TRUE)
if(ispath(type_or_datum))
if(!initial(type_or_datum.variable))
type_or_datum = get_cached_movespeed_modifier(type_or_datum)
@@ -95,7 +95,7 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache)
return TRUE
///Remove a move speed modifier from a mob, whether static or variable.
-/mob/proc/_REFACTORING_remove_movespeed_modifier(datum/movespeed_modifier/type_id_datum, update = TRUE)
+/mob/proc/remove_movespeed_modifier(datum/movespeed_modifier/type_id_datum, update = TRUE)
if(ispath(type_id_datum))
if(!initial(type_id_datum.variable))
type_id_datum = get_cached_movespeed_modifier(type_id_datum)
@@ -152,7 +152,7 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache)
final.multiplicative_slowdown = multiplicative_slowdown
modified = TRUE
if(inject)
- _REFACTORING_add_movespeed_modifier(final, FALSE, TRUE)
+ add_movespeed_modifier(final, FALSE, TRUE)
if(update && modified)
update_movespeed(TRUE)
return final
@@ -162,14 +162,14 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache)
var/slowdown_edit = (var_name == NAMEOF(src, cached_multiplicative_slowdown))
var/diff
if(slowdown_edit && isnum(cached_multiplicative_slowdown) && isnum(var_value))
- _REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/admin_varedit)
+ remove_movespeed_modifier(/datum/movespeed_modifier/admin_varedit)
diff = var_value - cached_multiplicative_slowdown
. = ..()
if(. && slowdown_edit && isnum(diff))
add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/admin_varedit, multiplicative_slowdown = diff)
///Is there a movespeed modifier for this mob
-/mob/proc/_REFACTORING_has_movespeed_modifier(datum/movespeed_modifier/datum_type_id)
+/mob/proc/has_movespeed_modifier(datum/movespeed_modifier/datum_type_id)
if(ispath(datum_type_id))
datum_type_id = get_cached_movespeed_modifier(datum_type_id)
if(istype(datum_type_id))
diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
index 67e57ddf168..82d538429e9 100644
--- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
@@ -106,11 +106,11 @@
return TRUE
/datum/reagent/medicine/C2/lenturi/on_mob_metabolize(mob/living/carbon/M)
- M._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/reagent/lenturi)
+ M.add_movespeed_modifier(/datum/movespeed_modifier/reagent/lenturi)
return ..()
/datum/reagent/medicine/C2/lenturi/on_mob_end_metabolize(mob/living/carbon/M)
- M._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/reagent/lenturi)
+ M.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/lenturi)
return ..()
/datum/reagent/medicine/C2/aiuri
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 1df4e807393..938770294a5 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -376,10 +376,10 @@
/datum/reagent/consumable/nuka_cola/on_mob_metabolize(mob/living/L)
..()
- L._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/reagent/nuka_cola)
+ L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/nuka_cola)
/datum/reagent/consumable/nuka_cola/on_mob_end_metabolize(mob/living/L)
- L._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/reagent/nuka_cola)
+ L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/nuka_cola)
..()
/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/carbon/M)
@@ -556,10 +556,10 @@
/datum/reagent/consumable/monkey_energy/on_mob_metabolize(mob/living/L)
..()
if(ismonkey(L))
- L._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/reagent/monkey_energy)
+ L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/monkey_energy)
/datum/reagent/consumable/monkey_energy/on_mob_end_metabolize(mob/living/L)
- L._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/reagent/monkey_energy)
+ L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/monkey_energy)
..()
/datum/reagent/consumable/monkey_energy/overdose_process(mob/living/M)
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index 9af53eff1da..a3136823542 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -174,10 +174,10 @@
/datum/reagent/drug/methamphetamine/on_mob_metabolize(mob/living/L)
..()
- L._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/reagent/methamphetamine)
+ L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/methamphetamine)
/datum/reagent/drug/methamphetamine/on_mob_end_metabolize(mob/living/L)
- L._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/reagent/methamphetamine)
+ L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/methamphetamine)
..()
/datum/reagent/drug/methamphetamine/on_mob_life(mob/living/carbon/M)
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index bd9d3286014..3755e541308 100755
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -293,8 +293,8 @@
victim.blind_eyes(3) // 6 seconds
victim.confused = max(M.confused, 5) // 10 seconds
victim.Knockdown(3 SECONDS)
- victim._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/reagent/pepperspray)
- addtimer(CALLBACK(victim, /mob.proc/_REFACTORING_remove_movespeed_modifier, /datum/movespeed_modifier/reagent/pepperspray), 10 SECONDS)
+ victim.add_movespeed_modifier(/datum/movespeed_modifier/reagent/pepperspray)
+ addtimer(CALLBACK(victim, /mob.proc/remove_movespeed_modifier, /datum/movespeed_modifier/reagent/pepperspray), 10 SECONDS)
victim.update_damage_hud()
if(method == INGEST)
if(!holder.has_reagent(/datum/reagent/consumable/milk))
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 23cad61cc2e..0b5e2493413 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -422,11 +422,11 @@
/datum/reagent/medicine/ephedrine/on_mob_metabolize(mob/living/L)
..()
- L._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/reagent/ephedrine)
+ L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/ephedrine)
ADD_TRAIT(L, TRAIT_STUNRESISTANCE, type)
/datum/reagent/medicine/ephedrine/on_mob_end_metabolize(mob/living/L)
- L._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/reagent/ephedrine)
+ L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/ephedrine)
REMOVE_TRAIT(L, TRAIT_STUNRESISTANCE, type)
..()
@@ -806,11 +806,11 @@
/datum/reagent/medicine/stimulants/on_mob_metabolize(mob/living/L)
..()
- L._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/reagent/stimulants)
+ L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/stimulants)
ADD_TRAIT(L, TRAIT_STUNRESISTANCE, type)
/datum/reagent/medicine/stimulants/on_mob_end_metabolize(mob/living/L)
- L._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/reagent/stimulants)
+ L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/stimulants)
REMOVE_TRAIT(L, TRAIT_STUNRESISTANCE, type)
..()
@@ -1038,10 +1038,10 @@
/datum/reagent/medicine/changelinghaste/on_mob_metabolize(mob/living/L)
..()
- L._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/reagent/changelinghaste)
+ L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/changelinghaste)
/datum/reagent/medicine/changelinghaste/on_mob_end_metabolize(mob/living/L)
- L._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/reagent/changelinghaste)
+ L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/changelinghaste)
..()
/datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/carbon/M)
@@ -1348,14 +1348,14 @@
..()
ADD_TRAIT(L, TRAIT_SLEEPIMMUNE, type)
ADD_TRAIT(L, TRAIT_STUNRESISTANCE, type)
- L._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/reagent/badstims)
+ L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/badstims)
L.ignore_slowdown(type)
/datum/reagent/medicine/badstims/on_mob_end_metabolize(mob/living/L)
..()
REMOVE_TRAIT(L, TRAIT_SLEEPIMMUNE, type)
REMOVE_TRAIT(L, TRAIT_STUNRESISTANCE, type)
- L._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/reagent/badstims)
+ L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/badstims)
L.unignore_slowdown(type)
L.Dizzy(0)
L.Jitter(0)
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 828ea4779d1..185a273f23f 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -1230,10 +1230,10 @@
/datum/reagent/nitryl/on_mob_metabolize(mob/living/L)
..()
- L._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/reagent/nitryl)
+ L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/nitryl)
/datum/reagent/nitryl/on_mob_end_metabolize(mob/living/L)
- L._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/reagent/nitryl)
+ L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/nitryl)
..()
/////////////////////////Colorful Powder////////////////////////////
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
index 785a93f9e0f..8857bca4bd5 100644
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
@@ -185,7 +185,7 @@
alert_type = /obj/screen/alert/status_effect/bloodchill
/datum/status_effect/bloodchill/on_apply()
- owner._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/status_effect/bloodchill)
+ owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/bloodchill)
return ..()
/datum/status_effect/bloodchill/tick()
@@ -193,7 +193,7 @@
owner.adjustFireLoss(2)
/datum/status_effect/bloodchill/on_remove()
- owner._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/bloodchill)
+ owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/bloodchill)
/datum/status_effect/bonechill
id = "bonechill"
@@ -201,7 +201,7 @@
alert_type = /obj/screen/alert/status_effect/bonechill
/datum/status_effect/bonechill/on_apply()
- owner._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/status_effect/bonechill)
+ owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/bonechill)
return ..()
/datum/status_effect/bonechill/tick()
@@ -211,7 +211,7 @@
owner.adjust_bodytemperature(-10)
/datum/status_effect/bonechill/on_remove()
- owner._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/bonechill)
+ owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/bonechill)
/obj/screen/alert/status_effect/bonechill
name = "Bonechilled"
desc = "You feel a shiver down your spine after hearing the haunting noise of bone rattling. You'll move slower and get frostbite for a while!"
@@ -365,11 +365,11 @@ datum/status_effect/rebreathing/tick()
duration = 30
/datum/status_effect/tarfoot/on_apply()
- owner._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/status_effect/tarfoot)
+ owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/tarfoot)
return ..()
/datum/status_effect/tarfoot/on_remove()
- owner._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/tarfoot)
+ owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/tarfoot)
/datum/status_effect/spookcookie
id = "spookcookie"
@@ -691,7 +691,7 @@ datum/status_effect/stabilized/blue/on_remove()
return ..()
/datum/status_effect/stabilized/sepia/on_remove()
- owner._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/sepia)
+ owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/sepia)
/datum/status_effect/stabilized/cerulean
id = "stabilizedcerulean"
@@ -899,7 +899,7 @@ datum/status_effect/stabilized/blue/on_remove()
colour = "light pink"
/datum/status_effect/stabilized/lightpink/on_apply()
- owner._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/status_effect/lightpink)
+ owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/lightpink)
return ..()
/datum/status_effect/stabilized/lightpink/tick()
@@ -910,7 +910,7 @@ datum/status_effect/stabilized/blue/on_remove()
return ..()
/datum/status_effect/stabilized/lightpink/on_remove()
- owner._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/lightpink)
+ owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/lightpink)
/datum/status_effect/stabilized/adamantine
id = "stabilizedadamantine"
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index 71708bc91cd..a66b07ec039 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -277,7 +277,7 @@
ADD_TRAIT(H, TRAIT_PIERCEIMMUNE, "dna_vault")
if(VAULT_SPEED)
to_chat(H, "Your legs feel faster.")
- H._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/dna_vault_speedup)
+ H.add_movespeed_modifier(/datum/movespeed_modifier/dna_vault_speedup)
if(VAULT_QUICK)
to_chat(H, "Your arms move as fast as lightning.")
H.next_move_modifier = 0.5
diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm
index eb51bc15417..500785f1418 100644
--- a/code/modules/surgery/organs/augments_chest.dm
+++ b/code/modules/surgery/organs/augments_chest.dm
@@ -152,13 +152,13 @@
if(allow_thrust(0.01))
ion_trail.start()
RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/move_react)
- owner._REFACTORING_add_movespeed_modifier(/datum/movespeed_modifier/jetpack/cybernetic)
+ owner.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/cybernetic)
if(!silent)
to_chat(owner, "You turn your thrusters set on.")
else
ion_trail.stop()
UnregisterSignal(owner, COMSIG_MOVABLE_MOVED)
- owner._REFACTORING_remove_movespeed_modifier(/datum/movespeed_modifier/jetpack/cybernetic)
+ owner.remove_movespeed_modifier(/datum/movespeed_modifier/jetpack/cybernetic)
if(!silent)
to_chat(owner, "You turn your thrusters set off.")
on = FALSE