Skip to content

Commit

Permalink
No Equip Slowdown Trait (#19964)
Browse files Browse the repository at this point in the history
- rscadd: "Adds a new species trait, NO_EQUIP_SLOWDOWN. Ignores slowdown
effects from equipment and dragging things. G2s, Vaurca Bulwarks, and
Tajara Teslas."

Note that ignoring slowdown effects also ignores negative slowdown
(speed up), but it's so rare that it's probably negligible.

May or may not horrendously break balance.

Reasonably, these species are huge, slow, and strong to compensate.
They *reasonably* shouldn't be slowed down by pushing lockers and
carrying dufflebags.
Vaurca Bulwarks especially are gated from wearing a lot of clothing from
the get-go so the only change will be being able to not slowed down to
all hell trying to push a locker somewhere.

---------

Signed-off-by: Matt Atlas <[email protected]>
Co-authored-by: Matt Atlas <[email protected]>
Co-authored-by: Fluffy <[email protected]>
  • Loading branch information
3 people authored Oct 13, 2024
1 parent ae9a3a0 commit 3bfd1e6
Show file tree
Hide file tree
Showing 7 changed files with 78 additions and 4 deletions.
5 changes: 3 additions & 2 deletions code/__DEFINES/species_languages.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
#define IS_PLANT BITFLAG(7) // Is a treeperson.
#define NO_EMBED BITFLAG(8) // Can not have shrapnel or any object embedded into its body
#define IS_MECHANICAL BITFLAG(9) // Is a robot.
#define ACCEPTS_COOLER BITFLAG(10) // Can wear suit coolers and have them work without a suit.
#define ACCEPTS_COOLER BITFLAG(10) // Can wear suit coolers and have them work without a suit.
#define NO_CHUBBY BITFLAG(11) // Cannot be visibly fat from nutrition type.
#define NO_ARTERIES BITFLAG(12) // This species does not have arteries.
#define PHORON_IMMUNE BITFLAG(13) // species doesn't suffer the negative effects of phoron contamination
#define CAN_SWEAT BITFLAG(14) // Forgive me.
#define NO_COLD_SLOWDOWN BITFLAG(15) //Doesn't slow down in the cold.
#define NO_COLD_SLOWDOWN BITFLAG(15) //Doesn't slow down in the cold.
#define NO_EQUIP_SPEEDMODS BITFLAG(16) //Doesn't get affected by carrying certain things or equipping some clothing
// unused: 0x8000(32768) - higher than this will overflow

// Base flags for IPCs.
Expand Down
5 changes: 3 additions & 2 deletions code/modules/mob/living/carbon/human/human_movement.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
if(lying) //Crawling, it's slower
tally += (8 + ((weakened * 3) + (confused * 2)))

tally += get_pulling_movement_delay()
if (!(species.flags & NO_EQUIP_SPEEDMODS))
tally += get_pulling_movement_delay()

if (istype(loc, /turf/space) || isopenturf(loc))
if(!(locate(/obj/structure/lattice, loc) || locate(/obj/structure/stairs, loc) || locate(/obj/structure/ladder, loc)))
Expand Down Expand Up @@ -50,7 +51,7 @@
if((mutations & mRun))
tally = 0

if(isitem(pulling))
if(isitem(pulling) && !(species.flags & NO_EQUIP_SPEEDMODS))
var/obj/item/P = pulling
tally += P.slowdown

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,8 @@
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/ipc/industrial/hephaestus)
)

flags = IS_IPC | ACCEPTS_COOLER | NO_EQUIP_SPEEDMODS


/datum/species/machine/industrial/hephaestus/get_light_color(mob/living/carbon/human/H)
if (istype(H))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/tesla_body)
)

flags = NO_EQUIP_SPEEDMODS

bump_flag = HEAVY
swap_flags = ~HEAVY
push_flags = (~HEAVY) ^ ROBOT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,8 @@ Bulwarks are much larger and have significantly thicker carapaces than most Vaur
possible_external_organs_modifications = list("Normal", "Amputated") //We don't have any limb modfications for this species, yet
valid_prosthetics = null

flags = NO_SLIP | NO_CHUBBY | NO_ARTERIES | PHORON_IMMUNE | NO_COLD_SLOWDOWN | NO_EQUIP_SPEEDMODS

character_color_presets = list(
"Zo'ra: Unbound Vaur" = "#3D000F", "Zo'ra: Bound Vaur" = "#37000F",
"Zo'ra: Unbound Zoleth" = "#730015", "Zo'ra: Bound Zoleth" = "#610015",
Expand Down
8 changes: 8 additions & 0 deletions code/modules/mob/mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1531,6 +1531,14 @@
else
remove_movespeed_modifier(/datum/movespeed_modifier/equipment_speedmod)

/mob/living/carbon/human/update_equipment_speed_mods()
//Do not apply the equipment mods if the specie is not affected by them
if(species?.flags & NO_EQUIP_SPEEDMODS)
return

. = ..()


///Get all items in our possession that should affect our movespeed
/mob/proc/get_equipped_speed_mod_items()
. = list()
Expand Down
58 changes: 58 additions & 0 deletions html/changelogs/wezzy-no_equip_slowdown.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################

# Your name.
author: Wowzewow (Wezzy)

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Adds a new species trait, NO_EQUIP_SPEEDMODS. Ignores slowdown effects from equipment and dragging things. G2s, Vaurca Bulwarks, and Tajara Teslas."

0 comments on commit 3bfd1e6

Please sign in to comment.