From d313f7090618889f718f215e0925ee35b95aa750 Mon Sep 17 00:00:00 2001 From: Batrachophreno Date: Sat, 4 Apr 2026 18:25:48 -0400 Subject: [PATCH] Not THAT Slow - Update Movespeed Modifiers for Smooth Movement (#22127) The /tg/-style movespeed_modifier datums were not incorporated into the original smooth movement PR. While https://github.com/Aurorastation/Aurora.3/pull/22043 restores that functionality, the original values no longer feel good now that we're on smooth movement. This PR halves ALL movespeed_modifier/slowdown datums, with the exception of species-native, as a baseline before more individual adjustments are made. --- code/ZAS/Variable Settings.dm | 8 ++-- .../synthetic_endoskeleton.dm | 12 ++--- code/game/gamemodes/cult/items/armor.dm | 2 +- code/game/gamemodes/technomancer/core_obj.dm | 4 +- .../technomancer/devices/boots_of_speed.dm | 2 +- .../technomancer/devices/tesla_armor.dm | 2 +- .../objects/items/weapons/storage/backpack.dm | 2 +- .../objects/items/weapons/storage/bags.dm | 2 +- .../objects/items/weapons/vaurca_items.dm | 2 +- code/game/objects/structures/ECD.dm | 2 +- .../objects/structures/carts/parcelcart.dm | 4 +- .../structures/crates_lockers/closets.dm | 2 +- .../structures/stool_bed_chair_nest/bed.dm | 2 +- .../stool_bed_chair_nest/wheelchair.dm | 2 +- code/modules/cargo/delivery/backpack.dm | 2 +- code/modules/cargo/delivery/package.dm | 4 +- code/modules/clothing/factions/trinary.dm | 2 +- code/modules/clothing/shoes/miscellaneous.dm | 4 +- code/modules/clothing/shoes/sneakers.dm | 2 +- code/modules/clothing/spacesuits/rig/rig.dm | 4 +- .../clothing/spacesuits/rig/suits/alien.dm | 18 +++---- .../clothing/spacesuits/rig/suits/combat.dm | 30 ++++++------ .../clothing/spacesuits/rig/suits/light.dm | 6 +-- .../clothing/spacesuits/rig/suits/merc.dm | 4 +- .../clothing/spacesuits/rig/suits/skrell.dm | 2 +- .../clothing/spacesuits/rig/suits/station.dm | 18 +++---- .../spacesuits/rig/suits/terminator.dm | 2 +- .../clothing/spacesuits/rig/suits/xanu.dm | 4 +- .../modules/clothing/spacesuits/spacesuits.dm | 4 +- code/modules/clothing/spacesuits/syndi.dm | 2 +- .../clothing/spacesuits/void/alien/unathi.dm | 2 +- code/modules/clothing/spacesuits/void/merc.dm | 2 +- code/modules/clothing/spacesuits/void/misc.dm | 28 +++++------ .../clothing/spacesuits/void/station.dm | 2 +- code/modules/clothing/spacesuits/void/void.dm | 2 +- code/modules/clothing/suits/armor.dm | 8 ++-- code/modules/clothing/suits/modular_armor.dm | 16 +++---- code/modules/clothing/suits/utility.dm | 4 +- .../clothing/under/accessories/armor.dm | 40 ++++++++-------- .../mob/living/carbon/human/diona_gestalt.dm | 2 +- code/modules/movespeed/modifiers/mobs.dm | 4 +- code/modules/movespeed/modifiers/reagents.dm | 48 ++++++++++++++----- code/modules/movespeed/modifiers/spells.dm | 2 +- .../modules/movespeed/modifiers/synthetics.dm | 4 +- .../internal/species/machine/posibrain.dm | 4 +- .../overmap/ship_weaponry/_ship_ammunition.dm | 2 +- .../ship_weaponry/weaponry/longbow_ammo.dm | 2 +- html/changelogs/Bat-MovespeedModifiers.yml | 5 ++ 48 files changed, 182 insertions(+), 151 deletions(-) create mode 100644 html/changelogs/Bat-MovespeedModifiers.yml diff --git a/code/ZAS/Variable Settings.dm b/code/ZAS/Variable Settings.dm index 395e52b8d88..bce084400f5 100644 --- a/code/ZAS/Variable Settings.dm +++ b/code/ZAS/Variable Settings.dm @@ -62,7 +62,7 @@ GLOBAL_DATUM_INIT(vsc, /vs_control, new()) var/airflow_delay_NAME = "Airflow Retrigger Delay" var/airflow_delay_DESC = "Time in deciseconds before things can be moved by airflow again." - var/airflow_mob_slowdown = 1 + var/airflow_mob_slowdown = 0.5 var/airflow_mob_slowdown_NAME = "Airflow Slowdown" var/airflow_mob_slowdown_DESC = "Time in tenths of a second to add as a delay to each movement by a mob if they are fighting the pull of the airflow." @@ -246,7 +246,7 @@ GLOBAL_DATUM_INIT(vsc, /vs_control, new()) airflow_damage = 2 airflow_speed_decay = 1.5 airflow_delay = 30 - airflow_mob_slowdown = 1 + airflow_mob_slowdown = 0.5 if("ZAS - Forgiving") airflow_lightest_pressure = 45 @@ -274,7 +274,7 @@ GLOBAL_DATUM_INIT(vsc, /vs_control, new()) airflow_damage = 3 airflow_speed_decay = 1.2 airflow_delay = 25 - airflow_mob_slowdown = 2 + airflow_mob_slowdown = 1 if("ZAS - Hellish") airflow_lightest_pressure = 20 @@ -288,7 +288,7 @@ GLOBAL_DATUM_INIT(vsc, /vs_control, new()) airflow_damage = 4 airflow_speed_decay = 1 airflow_delay = 20 - airflow_mob_slowdown = 3 + airflow_mob_slowdown = 1.5 connection_insulation = 0 if("ZAS/Phoron - Initial") diff --git a/code/datums/components/synthetic_endoskeleton/synthetic_endoskeleton.dm b/code/datums/components/synthetic_endoskeleton/synthetic_endoskeleton.dm index 85de473100c..b7415dd7cd9 100644 --- a/code/datums/components/synthetic_endoskeleton/synthetic_endoskeleton.dm +++ b/code/datums/components/synthetic_endoskeleton/synthetic_endoskeleton.dm @@ -50,11 +50,11 @@ if(0 to 0.3) owner.remove_movespeed_modifier(/datum/movespeed_modifier/endoskeleton) if(0.3 to 0.5) - owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 1) + owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 0.5) if(0.5 to 0.75) - owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 2) + owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 1) if(0.75 to 1) - owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 3) + owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 1.5) if(!damage) STOP_PROCESSING(SSprocessing, src) @@ -75,15 +75,15 @@ switch(damage_ratio) if(0.3 to 0.5) notify_owner(owner, SPAN_WARNING("Your self-preservation warning system notifies you of moderate damage to your endoskeleton's supports!")) - owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 1) + owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 0.5) if(0.5 to 0.75) notify_owner(owner, SPAN_WARNING("Your self-preservation warning system notifies you of major damage to your endoskeleton!")) spark(owner, 2, GLOB.alldirs) - owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 2) + owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 1) if(0.75 to 0.99) notify_owner(owner, SPAN_DANGER("Your self-preservation routines are starting to kick in! Your endoskeleton is falling apart!")) spark(owner, 3, GLOB.alldirs) - owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 3) + owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/endoskeleton, multiplicative_slowdown = 1.5) if(1 to INFINITY) SEND_SIGNAL(owner, COMSIG_SYNTH_SET_SELF_PRESERVATION, TRUE) diff --git a/code/game/gamemodes/cult/items/armor.dm b/code/game/gamemodes/cult/items/armor.dm index 8243070044f..fa7f7b5909b 100644 --- a/code/game/gamemodes/cult/items/armor.dm +++ b/code/game/gamemodes/cult/items/armor.dm @@ -41,7 +41,7 @@ desc = "A bulky armored voidsuit, bristling with menacing spikes. It looks space proof." w_class = WEIGHT_CLASS_NORMAL allowed = list(/obj/item/book/tome, /obj/item/melee/cultblade, /obj/item/gun/energy/rifle/cult, /obj/item/tank, /obj/item/suit_cooling_unit) - slowdown = 1 + slowdown = 0.5 armor = list( MELEE = ARMOR_MELEE_VERY_HIGH, BULLET = ARMOR_BALLISTIC_CARBINE, diff --git a/code/game/gamemodes/technomancer/core_obj.dm b/code/game/gamemodes/technomancer/core_obj.dm index a3fac89e4bd..081c6439744 100644 --- a/code/game/gamemodes/technomancer/core_obj.dm +++ b/code/game/gamemodes/technomancer/core_obj.dm @@ -285,7 +285,7 @@ energy = 7000 max_energy = 7000 regen_rate = 70 //100 seconds to full - slowdown = -0.3 + slowdown = -0.15 instability_modifier = 0.9 cooldown_modifier = 0.9 @@ -299,7 +299,7 @@ energy = 20000 max_energy = 20000 regen_rate = 25 //800 seconds to full - slowdown = 1 + slowdown = 0.5 instability_modifier = 1.0 spell_power_modifier = 1.4 diff --git a/code/game/gamemodes/technomancer/devices/boots_of_speed.dm b/code/game/gamemodes/technomancer/devices/boots_of_speed.dm index 417c21f7712..b167176951d 100644 --- a/code/game/gamemodes/technomancer/devices/boots_of_speed.dm +++ b/code/game/gamemodes/technomancer/devices/boots_of_speed.dm @@ -10,7 +10,7 @@ desc = "The latest in sure footing technology." item_flags = ITEM_FLAG_NO_SLIP siemens_coefficient = 0.6 - slowdown = -0.3 + slowdown = -0.15 armor = null cold_protection = FEET diff --git a/code/game/gamemodes/technomancer/devices/tesla_armor.dm b/code/game/gamemodes/technomancer/devices/tesla_armor.dm index b08d16e2e03..286cffab181 100644 --- a/code/game/gamemodes/technomancer/devices/tesla_armor.dm +++ b/code/game/gamemodes/technomancer/devices/tesla_armor.dm @@ -12,7 +12,7 @@ desc = "This rather dangerous looking armor will hopefully shock your enemies, and not you in the process." icon_state = "tesla_armor_1" blood_overlay_type = "armor" - slowdown = 1 + slowdown = 0.5 armor = list( MELEE = 0, BULLET = 0, diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index d7b6dd02b58..dade5f6f31c 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -592,7 +592,7 @@ icon = 'icons/obj/storage/duffelbag.dmi' icon_state = "duffel" item_state = "duffel" - slowdown = 1 + slowdown = 0.3 max_storage_space = DEFAULT_DUFFELBAG_STORAGE straps = TRUE diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 493421cf031..b5ffe88bb7c 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -324,7 +324,7 @@ storage_slots = 100 max_storage_space = 200 w_class = WEIGHT_CLASS_BULKY - slowdown = 1 + slowdown = 0.5 can_hold = list( /obj/item/reagent_containers/pill, /obj/item/reagent_containers/glass/beaker, diff --git a/code/game/objects/items/weapons/vaurca_items.dm b/code/game/objects/items/weapons/vaurca_items.dm index a8813f4391d..e5f3f3b939d 100644 --- a/code/game/objects/items/weapons/vaurca_items.dm +++ b/code/game/objects/items/weapons/vaurca_items.dm @@ -298,7 +298,7 @@ icon_state = "scout" item_state = "scout" desc = "Armor designed for K'laxan scouts, made of lightweight sturdy material that does not restrict movement." - slowdown = -0.2 + slowdown = -0.1 species_restricted = list(BODYTYPE_VAURCA) armor = list( diff --git a/code/game/objects/structures/ECD.dm b/code/game/objects/structures/ECD.dm index a32f230bb29..dddbbd5bcb2 100644 --- a/code/game/objects/structures/ECD.dm +++ b/code/game/objects/structures/ECD.dm @@ -10,7 +10,7 @@ anchored = TRUE density = TRUE var/state = ECD_WELDED - slowdown = 10 + slowdown = 5 layer = ABOVE_HUMAN_LAYER /obj/structure/ecd/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) diff --git a/code/game/objects/structures/carts/parcelcart.dm b/code/game/objects/structures/carts/parcelcart.dm index d1c4cd000e0..618f2a6aa1d 100644 --- a/code/game/objects/structures/carts/parcelcart.dm +++ b/code/game/objects/structures/carts/parcelcart.dm @@ -85,9 +85,9 @@ if(my_parcels.len <= 4) slowdown = 0 else if(my_parcels.len > 4 && my_parcels.len < 11) - slowdown = 1 + slowdown = 0.5 else if(my_parcels.len >= 11) - slowdown = 2 + slowdown = 1 /obj/structure/cart/storage/parcelcart/attack_hand(mob/user) if(!isliving(user)) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 1179443a2aa..7c584e212a0 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -5,7 +5,7 @@ icon_state = "generic" density = TRUE build_amt = 2 - slowdown = 5 + slowdown = 2.5 pass_flags_self = PASSSTRUCTURE | LETPASSCLICKS | PASSTRACE var/icon_door = null diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 0e7c2962650..ad18f9390cc 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -38,7 +38,7 @@ gfi_layer_rotation = GFI_ROTATION_DEFDIR var/makes_rolling_sound = FALSE var/held_item = null // Set to null if you don't want people to pick this up. - slowdown = 5 + slowdown = 2.5 var/driving = FALSE // Shit for wheelchairs. Doesn't really get used here, but it's for code cleanliness. var/mob/living/pulling = null diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 76efb09eda1..f78acd89c12 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -8,7 +8,7 @@ held_item = /obj/item/material/stool/chair/wheelchair withdraw_verb = "fold" can_dismantle = FALSE - slowdown = 1 + slowdown = 0.5 var/bloodiness diff --git a/code/modules/cargo/delivery/backpack.dm b/code/modules/cargo/delivery/backpack.dm index ac8f70f87ea..5bc144e1562 100644 --- a/code/modules/cargo/delivery/backpack.dm +++ b/code/modules/cargo/delivery/backpack.dm @@ -53,7 +53,7 @@ /obj/item/cargo_backpack/proc/update_state(mob/user) if(LAZYLEN(contained_packages)) - slowdown = 1 + slowdown = 0.5 else slowdown = 0 update_icon() diff --git a/code/modules/cargo/delivery/package.dm b/code/modules/cargo/delivery/package.dm index 82db30db2b7..6b4b3717352 100644 --- a/code/modules/cargo/delivery/package.dm +++ b/code/modules/cargo/delivery/package.dm @@ -18,7 +18,7 @@ w_class = WEIGHT_CLASS_HUGE force = 15 - slowdown = 1 + slowdown = 0.5 var/delivery_point_id = "" var/datum/weakref/delivery_point_sector @@ -83,7 +83,7 @@ // larger mobs, such as industrials, can hold two pieces of cargo if(user.species.mob_size < 12) wield(user) - slowdown = 2 + slowdown = 1 else slowdown = 0 diff --git a/code/modules/clothing/factions/trinary.dm b/code/modules/clothing/factions/trinary.dm index 49d217cb07f..da18c63d6e8 100644 --- a/code/modules/clothing/factions/trinary.dm +++ b/code/modules/clothing/factions/trinary.dm @@ -70,7 +70,7 @@ BOMB = ARMOR_BOMB_PADDED, ) contained_sprite = TRUE - slowdown = 1 + slowdown = 0.5 allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) /obj/item/clothing/mask/exclusionist diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index f79e5cf7d1d..75cefd82d01 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -12,7 +12,7 @@ icon_state = "flippers" item_state = "flippers" item_flags = ITEM_FLAG_NO_SLIP - slowdown = 1 + slowdown = 0.5 /obj/item/clothing/shoes/footwraps name = "cloth footwraps" @@ -64,7 +64,7 @@ item_state = "galoshes" permeability_coefficient = 0.05 item_flags = ITEM_FLAG_NO_SLIP - slowdown = 1 + slowdown = 0.5 species_restricted = null icon_auto_adapt = TRUE icon_supported_species_tags = list("taj") diff --git a/code/modules/clothing/shoes/sneakers.dm b/code/modules/clothing/shoes/sneakers.dm index f476e1c8406..afb8f87ca94 100644 --- a/code/modules/clothing/shoes/sneakers.dm +++ b/code/modules/clothing/shoes/sneakers.dm @@ -28,7 +28,7 @@ user.drop_from_inventory(cuffs,src) src.chained = cuffs - src.slowdown = 15 + src.slowdown = 7.5 src.icon_state = "orange1" src.item_state = "orange1" if(ismob(src.loc)) diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 25300ea94f3..7aad70660ee 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -34,7 +34,7 @@ siemens_coefficient = 0.35 permeability_coefficient = 0.1 unacidable = 1 - slowdown = 1 // All rigs by default should have slowdown. + slowdown = 0.5 // All rigs by default should have slowdown. var/has_sealed_state = FALSE var/has_hidden_jumpsuit = FALSE @@ -88,7 +88,7 @@ var/seal_delay = SEAL_DELAY var/sealing // Keeps track of seal status independantly of canremove. var/offline = 1 // Should we be applying suit maluses? - var/offline_slowdown = 3 // If the suit is deployed and unpowered, it sets slowdown to this. + var/offline_slowdown = 1.5 // If the suit is deployed and unpowered, it sets slowdown to this. var/vision_restriction = TINT_NONE var/offline_vision_restriction = TINT_HEAVY var/airtight = 1 //If set, will adjust the ITEM_FLAG_AIRTIGHT flag on components. Otherwise it should leave them untouched. diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index 68c4ecbaf51..6d5a880b923 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -15,8 +15,8 @@ ) siemens_coefficient = 0.1 emp_protection = -20 - slowdown = 6 - offline_slowdown = 10 + slowdown = 3 + offline_slowdown = 5 vision_restriction = TINT_HEAVY offline_vision_restriction = TINT_BLIND boot_type = /obj/item/clothing/shoes/magboots/rig/chonk @@ -44,7 +44,7 @@ ) siemens_coefficient = 0.1 vision_restriction = TINT_NONE - slowdown = 4 + slowdown = 2 glove_type = /obj/item/clothing/gloves/powerfist allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL @@ -91,8 +91,8 @@ ) vision_restriction = TINT_NONE offline_vision_restriction = TINT_BLIND - slowdown = 4 - offline_slowdown = 3 + slowdown = 2 + offline_slowdown = 2.5 siemens_coefficient = 0.1 allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL glove_type = /obj/item/clothing/gloves/powerfist @@ -127,8 +127,8 @@ ) siemens_coefficient = 0.1 vision_restriction = 0 - slowdown = 2 - offline_slowdown = 3 + slowdown = 1 + offline_slowdown = 1.5 species_restricted = list(BODYTYPE_VAURCA) @@ -190,8 +190,8 @@ ) siemens_coefficient = 0 vision_restriction = 0 - slowdown = 2 - offline_slowdown = 3 + slowdown = 1 + offline_slowdown = 1.5 species_restricted = list(BODYTYPE_TAJARA) diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index 81aa913ffcd..2c5b3d6e9b3 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -15,7 +15,7 @@ RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 - offline_slowdown = 3 + offline_slowdown = 1.5 offline_vision_restriction = TINT_HEAVY helm_type = /obj/item/clothing/head/helmet/space/rig/combat @@ -59,7 +59,7 @@ RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 - offline_slowdown = 3 + offline_slowdown = 1.5 offline_vision_restriction = TINT_HEAVY allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) @@ -141,7 +141,7 @@ ) emp_protection = 30 slowdown = 0 - offline_slowdown = 3 + offline_slowdown = 1.5 initial_modules = list( /obj/item/rig_module/ai_container, @@ -177,8 +177,8 @@ RAD = ARMOR_RAD_RESISTANT ) siemens_coefficient = 0.35 - slowdown = 2 - offline_slowdown = 4 + slowdown = 1 + offline_slowdown = 2 offline_vision_restriction = TINT_HEAVY helm_type = /obj/item/clothing/head/helmet/space/rig/tcfl @@ -233,7 +233,7 @@ RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 - offline_slowdown = 2 + offline_slowdown = 1 offline_vision_restriction = TINT_HEAVY boot_type = /obj/item/clothing/shoes/magboots/rig/heavy @@ -287,7 +287,7 @@ RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 - offline_slowdown = 2 + offline_slowdown = 1 offline_vision_restriction = TINT_HEAVY boot_type = /obj/item/clothing/shoes/magboots/rig/heavy @@ -356,7 +356,7 @@ RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 - offline_slowdown = 2 + offline_slowdown = 1 offline_vision_restriction = TINT_HEAVY boot_type = /obj/item/clothing/shoes/magboots/rig/heavy @@ -410,8 +410,8 @@ ) offline_vision_restriction = TINT_HEAVY emp_protection = -30 - slowdown = 8 - offline_slowdown = 10 + slowdown = 4 + offline_slowdown = 5 allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) @@ -455,7 +455,7 @@ RAD = ARMOR_RAD_SMALL ) offline_vision_restriction = TINT_HEAVY - slowdown = 1 + slowdown = 0.5 allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) @@ -487,7 +487,7 @@ RAD = ARMOR_RAD_SMALL ) offline_vision_restriction = TINT_HEAVY - offline_slowdown = 10 + offline_slowdown = 5 allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) @@ -540,8 +540,8 @@ helm_type = /obj/item/clothing/head/helmet/space/rig/nanotrasen boot_type = /obj/item/clothing/shoes/magboots/rig/heavy - slowdown = 1 - offline_slowdown = 2 + slowdown = 0.5 + offline_slowdown = 1 offline_vision_restriction = TINT_HEAVY allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA @@ -594,7 +594,7 @@ RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 - offline_slowdown = 3 + offline_slowdown = 1.5 offline_vision_restriction = TINT_HEAVY helm_type = /obj/item/clothing/head/helmet/space/rig/legionnaire diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index e28de0b202b..e2ee2f0a7f0 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -15,7 +15,7 @@ BOMB = ARMOR_BOMB_PADDED ) emp_protection = 100 - slowdown = -0.3 + slowdown = -0.15 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA) item_flags = ITEM_FLAG_THICK_MATERIAL offline_slowdown = 0 @@ -329,8 +329,8 @@ species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA, BODYTYPE_IPC, BODYTYPE_TAJARA) seal_delay = 3 // Its only deploying the myomers and helmet. - offline_slowdown = 3 - slowdown = 1 + offline_slowdown = 1.5 + slowdown = 0.5 offline_vision_restriction = TINT_BLIND // Visorless helmet sprite, the helmet's face is just a camera. allowed = list(/obj/item/gun,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/melee/baton) diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm index d0e39dd9851..7270bfe399e 100644 --- a/code/modules/clothing/spacesuits/rig/suits/merc.dm +++ b/code/modules/clothing/spacesuits/rig/suits/merc.dm @@ -20,7 +20,7 @@ RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 - offline_slowdown = 3 + offline_slowdown = 1.5 offline_vision_restriction = TINT_HEAVY emp_protection = 30 @@ -89,7 +89,7 @@ RAD = ARMOR_RAD_SMALL ) siemens_coefficient = 0.1 - offline_slowdown = 3 + offline_slowdown = 1.5 offline_vision_restriction = TINT_HEAVY emp_protection = 20 diff --git a/code/modules/clothing/spacesuits/rig/suits/skrell.dm b/code/modules/clothing/spacesuits/rig/suits/skrell.dm index e90b23e00e2..5a194a44809 100644 --- a/code/modules/clothing/spacesuits/rig/suits/skrell.dm +++ b/code/modules/clothing/spacesuits/rig/suits/skrell.dm @@ -20,7 +20,7 @@ emp_protection = 30 vision_restriction = TINT_NONE slowdown = 0 - offline_slowdown = 3 + offline_slowdown = 1.5 species_restricted = list(BODYTYPE_SKRELL) helm_type = /obj/item/clothing/head/helmet/space/rig/skrell diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index 7560a49b408..e889255db47 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -85,8 +85,8 @@ RAD = ARMOR_RAD_RESISTANT ) siemens_coefficient = 0.35 - slowdown = 2 - offline_slowdown = 7 + slowdown = 1 + offline_slowdown = 3.5 offline_vision_restriction = TINT_HEAVY emp_protection = -20 max_pressure_protection = FIRESUIT_MAX_PRESSURE @@ -169,7 +169,7 @@ RAD = ARMOR_RAD_SHIELDED ) slowdown = 0 - offline_slowdown = 3 + offline_slowdown = 1.5 offline_vision_restriction = TINT_HEAVY helm_type = /obj/item/clothing/head/helmet/space/rig/eva @@ -246,7 +246,7 @@ RAD = ARMOR_RAD_SHIELDED ) slowdown = 0 - offline_slowdown = 3 + offline_slowdown = 1.5 offline_vision_restriction = 0 max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE / 1.5 // Good against fires, but not as good as a proper firesuit / atmos voidsuit max_pressure_protection = FIRESUIT_MAX_PRESSURE @@ -336,8 +336,8 @@ RAD = ARMOR_RAD_SHIELDED ) siemens_coefficient = 0.50 - slowdown = 1 - offline_slowdown = 2 + slowdown = 0.5 + offline_slowdown = 1 offline_vision_restriction = TINT_HEAVY helm_type = /obj/item/clothing/head/helmet/space/rig/medical @@ -378,7 +378,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_RESISTANT ) - offline_slowdown = 3 + offline_slowdown = 1.5 offline_vision_restriction = TINT_HEAVY helm_type = /obj/item/clothing/head/helmet/space/rig/hazard @@ -424,8 +424,8 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SHIELDED ) - slowdown = 3 - offline_slowdown = 4 + slowdown = 1.5 + offline_slowdown = 2 offline_vision_restriction = TINT_HEAVY boot_type = /obj/item/clothing/shoes/magboots/rig/chonk diff --git a/code/modules/clothing/spacesuits/rig/suits/terminator.dm b/code/modules/clothing/spacesuits/rig/suits/terminator.dm index da1fe6b1d8c..2a1d649e6e7 100644 --- a/code/modules/clothing/spacesuits/rig/suits/terminator.dm +++ b/code/modules/clothing/spacesuits/rig/suits/terminator.dm @@ -15,7 +15,7 @@ RAD = ARMOR_RAD_RESISTANT ) siemens_coefficient = 0 // Ok this is the only exception. Got it? Good. - offline_slowdown = 3 + offline_slowdown = 1.5 offline_vision_restriction = TINT_HEAVY has_sealed_state = TRUE diff --git a/code/modules/clothing/spacesuits/rig/suits/xanu.dm b/code/modules/clothing/spacesuits/rig/suits/xanu.dm index d8b4502a1c4..e689761c863 100644 --- a/code/modules/clothing/spacesuits/rig/suits/xanu.dm +++ b/code/modules/clothing/spacesuits/rig/suits/xanu.dm @@ -22,7 +22,7 @@ allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY siemens_coefficient = 0.2 - offline_slowdown = 2 + offline_slowdown = 1 offline_vision_restriction = TINT_HEAVY species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU) @@ -69,7 +69,7 @@ RAD = ARMOR_RAD_MINOR ) slowdown = 0 - offline_slowdown = 1 + offline_slowdown = 0.5 allowed_module_types = MODULE_GENERAL | MODULE_UTILITY diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index 0155c8f9a5d..a922a698c4a 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -52,7 +52,7 @@ item_flags = ITEM_FLAG_THICK_MATERIAL|ITEM_FLAG_INJECTION_PORT body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/suit_cooling_unit, /obj/item/tank) - slowdown = 1 + slowdown = 0.4 armor = list( BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL @@ -122,7 +122,7 @@ icon_state = "softsuit_emergency" item_state = "softsuit_emergency" contained_sprite = TRUE - slowdown = 2 + slowdown = 1 /obj/item/clothing/suit/space/emergency/marooning_equipment name = "marooning softsuit" diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index 9cdf8806a1f..85d84baab68 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -26,7 +26,7 @@ desc = "A crimson spacesuit sporting clean lines and durable plating. Robust, reliable, and slightly suspicious." w_class = WEIGHT_CLASS_NORMAL allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/tank/emergency_oxygen) - slowdown = 1 + slowdown = 0.5 armor = list( MELEE = ARMOR_MELEE_MAJOR, BULLET = ARMOR_BALLISTIC_MEDIUM, diff --git a/code/modules/clothing/spacesuits/void/alien/unathi.dm b/code/modules/clothing/spacesuits/void/alien/unathi.dm index bf68720dc01..212c50822d4 100644 --- a/code/modules/clothing/spacesuits/void/alien/unathi.dm +++ b/code/modules/clothing/spacesuits/void/alien/unathi.dm @@ -25,7 +25,7 @@ icon_state = "kataphract" item_state = "kataphract" contained_sprite = TRUE - slowdown = 1 + slowdown = 0.5 w_class = WEIGHT_CLASS_NORMAL armor = list( MELEE = ARMOR_MELEE_RESISTANT, diff --git a/code/modules/clothing/spacesuits/void/merc.dm b/code/modules/clothing/spacesuits/void/merc.dm index 69b5f38bb72..e0f4df9802e 100644 --- a/code/modules/clothing/spacesuits/void/merc.dm +++ b/code/modules/clothing/spacesuits/void/merc.dm @@ -32,7 +32,7 @@ item_state = "syndie" contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc") - slowdown = 1 + slowdown = 0.5 w_class = WEIGHT_CLASS_NORMAL armor = list( MELEE = ARMOR_MELEE_RESISTANT, diff --git a/code/modules/clothing/spacesuits/void/misc.dm b/code/modules/clothing/spacesuits/void/misc.dm index 3f16dda9ef9..12a4b98a387 100644 --- a/code/modules/clothing/spacesuits/void/misc.dm +++ b/code/modules/clothing/spacesuits/void/misc.dm @@ -36,7 +36,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - slowdown = 1 + slowdown = 0.5 allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) @@ -75,7 +75,7 @@ icon_state = "vulture" item_state = "vulture" contained_sprite = TRUE - slowdown = 1 + slowdown = 0.5 armor = list( MELEE = ARMOR_MELEE_RESISTANT, BULLET = ARMOR_BALLISTIC_MEDIUM, @@ -110,7 +110,7 @@ icon_state = "xanu_voidsuit" item_state = "xanu_voidsuit" contained_sprite = TRUE - slowdown = 1 + slowdown = 0.5 allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) @@ -203,7 +203,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - slowdown = 1 + slowdown = 0.5 allowed = list(/obj/item/tank,/obj/item/flashlight,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) @@ -239,7 +239,7 @@ item_state = "valkyrie" icon = 'icons/obj/clothing/voidsuit/elyra.dmi' contained_sprite = TRUE - slowdown = 1 + slowdown = 0.5 armor = list( MELEE = ARMOR_MELEE_RESISTANT, BULLET = ARMOR_BALLISTIC_MEDIUM, @@ -289,7 +289,7 @@ item_state = "lancer" icon_supported_species_tags = list("una") contained_sprite = TRUE - slowdown = 1 + slowdown = 0.65 w_class = WEIGHT_CLASS_NORMAL armor = list( MELEE = ARMOR_MELEE_RESISTANT, @@ -344,7 +344,7 @@ item_state = "banshee" contained_sprite = 1 - slowdown = 1 + slowdown = 0.1 armor = list( MELEE = ARMOR_MELEE_RESISTANT, BULLET = ARMOR_BALLISTIC_MEDIUM, @@ -396,7 +396,7 @@ item_state = "dragon" contained_sprite = 1 - slowdown = 1 + slowdown = 0.25 armor = list( MELEE = ARMOR_MELEE_RESISTANT, BULLET = ARMOR_BALLISTIC_MEDIUM, @@ -448,7 +448,7 @@ item_state = "caiman" contained_sprite = 1 - slowdown = 1 + slowdown = 0.75 armor = list( MELEE = ARMOR_MELEE_RESISTANT, BULLET = ARMOR_BALLISTIC_MEDIUM, @@ -508,7 +508,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - slowdown = 1 + slowdown = 0.3 allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN) @@ -547,7 +547,7 @@ item_state = "freelancer" contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc") - slowdown = 1 + slowdown = 0.5 w_class = WEIGHT_CLASS_NORMAL armor = list( MELEE = ARMOR_MELEE_RESISTANT, @@ -601,7 +601,7 @@ icon_state = "dvoidsuit" item_state = "dvoidsuit" contained_sprite = 1 - slowdown = 1 + slowdown = 0.5 w_class = WEIGHT_CLASS_NORMAL armor = list( @@ -657,7 +657,7 @@ icon_state = "goldsuit" item_state = "goldsuit" contained_sprite = 1 - slowdown = 1 + slowdown = 1.0 armor = list( MELEE = ARMOR_MELEE_RESISTANT, @@ -1068,7 +1068,7 @@ BIO = ARMOR_BIO_SHIELDED, RAD = ARMOR_RAD_SMALL ) - slowdown = 1 + slowdown = 0.5 allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.35 species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL) diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index f393f92148e..91a68b8c99d 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -38,7 +38,7 @@ ) contained_sprite = TRUE icon_supported_species_tags = list("skr", "taj", "una", "ipc", "vau") - slowdown = 1 + slowdown = 0.3 armor = list( MELEE = ARMOR_MELEE_RESISTANT, BULLET = ARMOR_BALLISTIC_MINOR, diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index e45eed4e3fd..268d980adca 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -43,7 +43,7 @@ icon_state = "void" item_state = "void" desc = "A high-tech dark red space suit. Used for AI satellite maintenance." - slowdown = 1 + slowdown = 0.5 armor = list( MELEE = ARMOR_MELEE_RESISTANT, BULLET = ARMOR_BALLISTIC_MINOR, diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 953462d8cf2..34ff0729ccb 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -110,7 +110,7 @@ item_flags = ITEM_FLAG_THICK_MATERIAL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency_oxygen) - slowdown = 1 + slowdown = 0.5 armor = list( MELEE = ARMOR_MELEE_RESISTANT, BULLET = ARMOR_BALLISTIC_MEDIUM, @@ -147,7 +147,7 @@ icon_state = "reactiveoff" item_state = "reactiveoff" blood_overlay_type = "armor" - slowdown = 1 + slowdown = 0.5 armor = null /obj/item/clothing/suit/armor/reactive/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") @@ -198,7 +198,7 @@ item_state = "armor" var/obj/item/gun/holstered = null body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - slowdown = 1 + slowdown = 0.5 armor = list( MELEE = ARMOR_MELEE_KNIVES, BULLET = ARMOR_BALLISTIC_MEDIUM, @@ -608,7 +608,7 @@ w_class = WEIGHT_CLASS_BULKY//bulky item gas_transfer_coefficient = 0.90 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - slowdown = 3 + slowdown = 1.5 flags_inv = HIDEWRISTS|HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT siemens_coefficient = 0.1 pocket_slots = 3 diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index 46cdc73d2f1..d6be8246b8b 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -192,7 +192,7 @@ ENERGY = ARMOR_ENERGY_MINOR, BOMB = ARMOR_BOMB_PADDED ) - slowdown = 0.4 + slowdown = 0.2 /obj/item/clothing/accessory/armor_plate/riot name = "riot armor plate" @@ -206,7 +206,7 @@ ENERGY = ARMOR_ENERGY_MINOR, BOMB = ARMOR_BOMB_PADDED ) - slowdown = 0.4 + slowdown = 0.2 /obj/item/clothing/accessory/armor_plate/ablative name = "ablative armor plate" @@ -219,7 +219,7 @@ LASER = ARMOR_LASER_MAJOR, ENERGY = ARMOR_ENERGY_RESISTANT ) - slowdown = 0.4 + slowdown = 0.2 siemens_coefficient = 0 /obj/item/clothing/accessory/armor_plate/military @@ -234,7 +234,7 @@ ENERGY = ARMOR_ENERGY_SMALL, BOMB = ARMOR_BOMB_PADDED, ) - slowdown = 0.4 + slowdown = 0.2 /obj/item/clothing/accessory/armor_plate/heavy name = "heavy armor plate" @@ -248,14 +248,14 @@ ENERGY = ARMOR_ENERGY_SMALL, BOMB = ARMOR_BOMB_PADDED, ) - slowdown = 0.4 + slowdown = 0.2 /obj/item/clothing/accessory/armor_plate/heavy/scc name = "heavy SCC armor plate" desc = "A heavy and nondescript armor plate. You really get the idea they wanted these mooks to be unfeeling." icon_state = "plate_blue" item_state = "plate_blue" - slowdown = 0.4 + slowdown = 0.2 /obj/item/clothing/accessory/armor_plate/heavy/dominia name = "imperial army steel body armor" @@ -287,7 +287,7 @@ ENERGY = ARMOR_ENERGY_SMALL, BOMB = ARMOR_BOMB_PADDED, ) - slowdown = 0.4 + slowdown = 0.2 /obj/item/clothing/accessory/armor_plate/tcaf/tcaf_light name = "\improper TCAF legionnaire light carapace" @@ -370,7 +370,7 @@ ENERGY = ARMOR_ENERGY_SMALL, BOMB = ARMOR_BOMB_PADDED ) - slowdown = 0.4 + slowdown = 0.2 /obj/item/clothing/head/helmet/security name = "corporate helmet" diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index aeea02e77ed..e588fae247a 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -100,7 +100,7 @@ w_class = WEIGHT_CLASS_HUGE //bulky item gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 - slowdown = 8 + slowdown = 4 armor = list( MELEE = ARMOR_MELEE_VERY_HIGH, BULLET = ARMOR_BALLISTIC_MINOR, @@ -233,7 +233,7 @@ permeability_coefficient = 0.50 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/storage/bag/inflatable,/obj/item/t_scanner,/obj/item/rfd/construction,/obj/item/material/twohanded/fireaxe,/obj/item/storage/backpack/cell,/obj/item/clothing/head/radiation,/obj/item/clothing/mask/gas,/obj/item/reagent_containers/hypospray/autoinjector) - slowdown = 1.5 + slowdown = 0.75 armor = list( BIO = ARMOR_BIO_RESISTANT, RAD = ARMOR_RAD_SHIELDED diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index 41487b79231..7e376295079 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -53,7 +53,7 @@ LASER = ARMOR_LASER_MAJOR, ENERGY = ARMOR_ENERGY_RESISTANT ) - slowdown = 0.3 + slowdown = 0.15 siemens_coefficient = 0 /obj/item/clothing/accessory/leg_guard/ballistic @@ -68,7 +68,7 @@ ENERGY = ARMOR_ENERGY_MINOR, BOMB = ARMOR_BOMB_PADDED ) - slowdown = 0.3 + slowdown = 0.15 /obj/item/clothing/accessory/leg_guard/riot name = "riot leg guards" @@ -82,7 +82,7 @@ ENERGY = ARMOR_ENERGY_MINOR, BOMB = ARMOR_BOMB_PADDED ) - slowdown = 0.3 + slowdown = 0.15 /obj/item/clothing/accessory/leg_guard/military name = "sol army leg guards" @@ -96,7 +96,7 @@ ENERGY = ARMOR_ENERGY_SMALL, BOMB = ARMOR_BOMB_PADDED, ) - slowdown = 0.3 + slowdown = 0.15 /obj/item/clothing/accessory/leg_guard/heavy name = "heavy leg guards" @@ -110,13 +110,13 @@ ENERGY = ARMOR_ENERGY_SMALL, BOMB = ARMOR_BOMB_PADDED, ) - slowdown = 0.3 + slowdown = 0.15 /obj/item/clothing/accessory/leg_guard/heavy/scc name = "heavy SCC leg guards" icon_state = "legguards_blue" item_state = "legguards_blue" - slowdown = 0.3 + slowdown = 0.15 /obj/item/clothing/accessory/leg_guard/heavy/sec name = "heavy corporate leg guards" @@ -129,7 +129,7 @@ ENERGY = ARMOR_ENERGY_SMALL, BOMB = ARMOR_BOMB_PADDED, ) - slowdown = 0.3 + slowdown = 0.15 /obj/item/clothing/accessory/leg_guard/tcaf name = "\improper TCAF legionnaire leg carapace" @@ -145,7 +145,7 @@ ENERGY = ARMOR_ENERGY_SMALL, BOMB = ARMOR_BOMB_PADDED, ) - slowdown = 0.3 + slowdown = 0.15 /obj/item/clothing/accessory/leg_guard/konyang_navy name = "\improper Konyang navy leg guards" @@ -158,7 +158,7 @@ ENERGY = ARMOR_ENERGY_SMALL, BOMB = ARMOR_BOMB_PADDED, ) - slowdown = 0.3 + slowdown = 0.15 /obj/item/clothing/accessory/leg_guard/hoplan name = "hoplan thigh protector" @@ -175,7 +175,7 @@ ENERGY = ARMOR_ENERGY_SMALL, BOMB = ARMOR_BOMB_PADDED, ) - slowdown = 0.3 + slowdown = 0.15 /obj/item/clothing/accessory/leg_guard/hoplan/skirt name = "hoplan ballistic skirt" @@ -184,7 +184,7 @@ icon_state = "hoplan_ballistic_skirt" item_state = "hoplan_ballistic_skirt" contained_sprite = TRUE - slowdown = 0.3 + slowdown = 0.15 //Arm guards. /obj/item/clothing/accessory/arm_guard @@ -237,7 +237,7 @@ LASER = ARMOR_LASER_MAJOR, ENERGY = ARMOR_ENERGY_RESISTANT ) - slowdown = 0.3 + slowdown = 0.15 siemens_coefficient = 0 /obj/item/clothing/accessory/arm_guard/ballistic @@ -252,7 +252,7 @@ ENERGY = ARMOR_ENERGY_MINOR, BOMB = ARMOR_BOMB_PADDED ) - slowdown = 0.3 + slowdown = 0.15 /obj/item/clothing/accessory/arm_guard/riot name = "riot arm guards" @@ -266,7 +266,7 @@ ENERGY = ARMOR_ENERGY_MINOR, BOMB = ARMOR_BOMB_PADDED ) - slowdown = 0.3 + slowdown = 0.15 body_parts_covered = ARMS|HANDS /obj/item/clothing/accessory/arm_guard/military @@ -281,7 +281,7 @@ ENERGY = ARMOR_ENERGY_SMALL, BOMB = ARMOR_BOMB_PADDED, ) - slowdown = 0.3 + slowdown = 0.15 body_parts_covered = ARMS|HANDS /obj/item/clothing/accessory/arm_guard/heavy @@ -296,14 +296,14 @@ ENERGY = ARMOR_ENERGY_SMALL, BOMB = ARMOR_BOMB_PADDED, ) - slowdown = 0.3 + slowdown = 0.15 /obj/item/clothing/accessory/arm_guard/heavy/scc name = "heavy SCC arm guards" desc = "A pair of armored arm and hand pads reinforced with heavy armor plating. Attaches to a plate carrier." icon_state = "armguards_blue" item_state = "armguards_blue" - slowdown = 0.3 + slowdown = 0.15 body_parts_covered = ARMS|HANDS /obj/item/clothing/accessory/arm_guard/heavy/sec @@ -317,7 +317,7 @@ ENERGY = ARMOR_ENERGY_SMALL, BOMB = ARMOR_BOMB_PADDED, ) - slowdown = 0.3 + slowdown = 0.15 /obj/item/clothing/accessory/arm_guard/kala name = "kala arm guards" @@ -346,7 +346,7 @@ ENERGY = ARMOR_ENERGY_SMALL, BOMB = ARMOR_BOMB_PADDED, ) - slowdown = 0.3 + slowdown = 0.15 body_parts_covered = ARMS|HANDS /obj/item/clothing/accessory/arm_guard/tcaf/tcaf_stripe @@ -369,4 +369,4 @@ ENERGY = ARMOR_ENERGY_SMALL, BOMB = ARMOR_BOMB_PADDED, ) - slowdown = 0.3 + slowdown = 0.15 diff --git a/code/modules/mob/living/carbon/human/diona_gestalt.dm b/code/modules/mob/living/carbon/human/diona_gestalt.dm index 457b9b0808b..a980c188828 100644 --- a/code/modules/mob/living/carbon/human/diona_gestalt.dm +++ b/code/modules/mob/living/carbon/human/diona_gestalt.dm @@ -399,7 +399,7 @@ Slows you down while being used, and will be automatically retracted if both fee /// Movespeed modifier used in the root_to_ground proc. This determines how much the ability slows you down by. /datum/movespeed_modifier/root_to_ground - multiplicative_slowdown = 1.5 + multiplicative_slowdown = 0.375 /// Engages Diona magboot roots. /mob/living/carbon/human/proc/root_enable() diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm index 82608ce29e5..845342a020e 100644 --- a/code/modules/movespeed/modifiers/mobs.dm +++ b/code/modules/movespeed/modifiers/mobs.dm @@ -7,7 +7,7 @@ /datum/movespeed_modifier/equipment_speedmod/immutable /datum/movespeed_modifier/config_walk_run - multiplicative_slowdown = 1 + multiplicative_slowdown = 0.5 id = MOVESPEED_ID_MOB_WALK_RUN flags = IGNORE_NOSLOW @@ -26,7 +26,7 @@ flags = IGNORE_NOSLOW /datum/movespeed_modifier/encumbered - multiplicative_slowdown = 2 + multiplicative_slowdown = 1 id = "encumbered" /datum/movespeed_modifier/zoomzoomkitty diff --git a/code/modules/movespeed/modifiers/reagents.dm b/code/modules/movespeed/modifiers/reagents.dm index 764baabe816..3afdf6f8e0a 100644 --- a/code/modules/movespeed/modifiers/reagents.dm +++ b/code/modules/movespeed/modifiers/reagents.dm @@ -1,43 +1,69 @@ ABSTRACT_TYPE(/datum/movespeed_modifier/reagent) blacklisted_movetypes = (FLYING|FLOATING) +// These movespeed_modifiers are derived from metabolizing reagents, and if stacked can cause characters to move faster than ghosts +// For all reagents which increase movespeed, we give them the id 'reagent_speedup' and a priority correlating with their mutliplicative slowdown. +// This ensures that if a player ingests multiple reagents which increase movement speed, only the greatest movespeed bonus will apply. +// While we could do some fancy shit with weighting for multiple speedup reagents, it is best to keep this behavior simple for gameplay. + //Depends on the amount of caffeine in the drink /datum/movespeed_modifier/reagent/caffeine + id = "reagent_speedup" variable = TRUE /datum/movespeed_modifier/reagent/hyperzine - multiplicative_slowdown = -1 - -/datum/movespeed_modifier/reagent/stimm - multiplicative_slowdown = -1.5 - -/datum/movespeed_modifier/reagent/skrell_nootropic + id = "reagent_speedup" + priority = 50 multiplicative_slowdown = -0.5 +/datum/movespeed_modifier/reagent/stimm + id = "reagent_speedup" + priority = 75 + multiplicative_slowdown = -0.75 + +/datum/movespeed_modifier/reagent/skrell_nootropic + id = "reagent_speedup" + priority = 25 + multiplicative_slowdown = -0.25 + /datum/movespeed_modifier/reagent/dionae_stimulant - multiplicative_slowdown = -1 + id = "reagent_speedup" + priority = 50 + multiplicative_slowdown = -0.5 /datum/movespeed_modifier/reagent/kokoreed - multiplicative_slowdown = -1 + id = "reagent_speedup" + priority = 50 + multiplicative_slowdown = -0.5 /datum/movespeed_modifier/reagent/kilosemine - multiplicative_slowdown = -1 + id = "reagent_speedup" + priority = 50 + multiplicative_slowdown = -0.5 ABSTRACT_TYPE(/datum/movespeed_modifier/reagent/zorasoda) /datum/movespeed_modifier/reagent/zorasoda/drone - multiplicative_slowdown = -1 + id = "reagent_speedup" + priority = 50 + multiplicative_slowdown = -0.5 ABSTRACT_TYPE(/datum/movespeed_modifier/alcohol) + ///This is ONLY for the intoxication management of alcohol, NOT for anything else ///if you're not using it in `code\modules\mob\living\carbon\human\intoxication.dm`, you're doing it wrong +/// As of the introduction of removing stacking reagent movespeed modifiers, both alcohol AND any non-alcohol 'slowdown' chems should use the same id +/// and priority system as used in 'speedup' chems. /datum/movespeed_modifier/alcohol/intoxication - multiplicative_slowdown = 2 + id = "reagent_slowdown" + priority = 50 + multiplicative_slowdown = 0.3 variable = TRUE //Only speed boost for unathi /datum/movespeed_modifier/alcohol/butanol + id = "reagent_slowdown" multiplicative_slowdown = 0 variable = TRUE diff --git a/code/modules/movespeed/modifiers/spells.dm b/code/modules/movespeed/modifiers/spells.dm index 8b57e35ea95..189ceb0b6d3 100644 --- a/code/modules/movespeed/modifiers/spells.dm +++ b/code/modules/movespeed/modifiers/spells.dm @@ -3,4 +3,4 @@ ABSTRACT_TYPE(/datum/movespeed_modifier/spell) ABSTRACT_TYPE(/datum/movespeed_modifier/spell/technomancer) /datum/movespeed_modifier/spell/technomancer/haste - multiplicative_slowdown = -0.8 + multiplicative_slowdown = -0.4 diff --git a/code/modules/movespeed/modifiers/synthetics.dm b/code/modules/movespeed/modifiers/synthetics.dm index 2121acf60ed..35f354b3ab4 100644 --- a/code/modules/movespeed/modifiers/synthetics.dm +++ b/code/modules/movespeed/modifiers/synthetics.dm @@ -1,9 +1,9 @@ /datum/movespeed_modifier/synth_emp id = "synthemp" variable = TRUE - multiplicative_slowdown = 1 + multiplicative_slowdown = 0.5 /datum/movespeed_modifier/endoskeleton id = "synthendoskeleton" variable = TRUE - multiplicative_slowdown = 1 + multiplicative_slowdown = 0.5 diff --git a/code/modules/organs/internal/species/machine/posibrain.dm b/code/modules/organs/internal/species/machine/posibrain.dm index 640b25ba67f..41c964adf86 100644 --- a/code/modules/organs/internal/species/machine/posibrain.dm +++ b/code/modules/organs/internal/species/machine/posibrain.dm @@ -303,13 +303,13 @@ if(2) to_chat(owner, FONT_LARGE(SPAN_DANGER("The electromagnetic current overloads your hydraulics!"))) owner.Stun(2) - owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/synth_emp, multiplicative_slowdown = 2) + owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/synth_emp, multiplicative_slowdown = 1) medium_integrity_damage(50) shake_camera(owner, 0.5 SECONDS, 3) if(3) to_chat(owner, FONT_LARGE(SPAN_MACHINE_WARNING("Your positronic circuits error and break under the electromagnetic current!"))) owner.Weaken(3) - owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/synth_emp, multiplicative_slowdown = 3) + owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/synth_emp, multiplicative_slowdown = 1.5) high_integrity_damage(25) shake_camera(owner, 1 SECONDS, 5) diff --git a/code/modules/overmap/ship_weaponry/_ship_ammunition.dm b/code/modules/overmap/ship_weaponry/_ship_ammunition.dm index ebfa987049a..85496c64a9e 100644 --- a/code/modules/overmap/ship_weaponry/_ship_ammunition.dm +++ b/code/modules/overmap/ship_weaponry/_ship_ammunition.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/projectiles.dmi' icon_state = "nuke" w_class = WEIGHT_CLASS_HUGE - slowdown = 2 + slowdown = 1 drop_sound = 'sound/items/drop/shell_drop.ogg' var/projectile_type_override //Override projectile type fired by the gun. This is because certain guns don't use ammo (the Leviathan) but with some we want the ammo to matter. var/overmap_projectile_type_override //Override projectile type on the overmap, fired by the gun. Like the Grauwolf Probe. diff --git a/code/modules/overmap/ship_weaponry/weaponry/longbow_ammo.dm b/code/modules/overmap/ship_weaponry/weaponry/longbow_ammo.dm index 4bfa18d2755..fb56c33643f 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/longbow_ammo.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/longbow_ammo.dm @@ -126,7 +126,7 @@ warhead_state = "high_ex" caliber = SHIP_CALIBER_406MM warhead_type = SHIP_AMMO_IMPACT_HE - slowdown = 2 + slowdown = 1 var/drop_counter = 0 var/cookoff_devastation = 0 var/cookoff_heavy = 3 diff --git a/html/changelogs/Bat-MovespeedModifiers.yml b/html/changelogs/Bat-MovespeedModifiers.yml new file mode 100644 index 00000000000..05395706488 --- /dev/null +++ b/html/changelogs/Bat-MovespeedModifiers.yml @@ -0,0 +1,5 @@ +author: Batrachophrenoboocosmomachia +delete-after: True +changes: + - balance: "Halves all non-species movespeed_modifier/slowdown datums, positive and negative; old values were too high for the switch to smooth movement. Some additional tweaks on top of this." + - balance: "Movespeed modifier datums derived from chems/reagents no longer stack."