diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 8dcfb40f467..3572f1ae51f 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -4,6 +4,12 @@ if(species.slowdown) tally = species.slowdown + if(ishuman(pulling)) + var/mob/living/carbon/human/H = pulling + if(H.species.slowdown> species.slowdown) + tally = H.species.slowdown + tally += H.ClothesSlowdown() + if (istype(loc, /turf/space) || isopenturf(loc)) if(!(locate(/obj/structure/lattice, loc) || locate(/obj/structure/stairs, loc) || locate(/obj/structure/ladder, loc))) return 0 @@ -17,8 +23,7 @@ if(can_feel_pain()) if(get_shock() >= 10) tally += (get_shock() / 10) //pain shouldn't slow you down if you can't even feel it - for(var/obj/item/I in list(wear_suit, w_uniform, back, gloves, head)) - tally += I.slowdown + tally += ClothesSlowdown() if(species) tally += species.get_species_tally(src) @@ -167,3 +172,7 @@ /mob/living/carbon/human/mob_negates_gravity() return (shoes && shoes.negates_gravity()) + +/mob/living/carbon/human/proc/ClothesSlowdown() + for(var/obj/item/I in list(wear_suit, w_uniform, back, gloves, head, wear_mask, shoes, l_ear, r_ear, glasses, belt)) + . += I.slowdown diff --git a/html/changelogs/hocka-Pullingtweak.yml b/html/changelogs/hocka-Pullingtweak.yml new file mode 100644 index 00000000000..ea8a27df19a --- /dev/null +++ b/html/changelogs/hocka-Pullingtweak.yml @@ -0,0 +1,6 @@ +author: Hocka + +delete-after: True + +changes: + - tweak: "If you pull a human mob who's slowdown is greater than yours your speed will slow down to match them."