From fdbfcf180b463d3f968f41fd45108f06d7fb7d76 Mon Sep 17 00:00:00 2001 From: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com> Date: Mon, 21 Sep 2020 11:07:55 +0100 Subject: [PATCH] Closets and chairs will not produce a slowdown when they do not have a mob in them (#10022) --- code/modules/mob/mob.dm | 3 ++- html/changelogs/buckled_mob_slowdown.yml | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/buckled_mob_slowdown.yml diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 61ed4698b94..38beccc6a2e 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -213,7 +213,8 @@ . = 0 if(istype(pulling, /obj/structure)) var/obj/structure/P = pulling - . += P.slowdown + if(P.buckled_mob || locate(/mob) in P.contents) + . += P.slowdown /mob/proc/Life() return diff --git a/html/changelogs/buckled_mob_slowdown.yml b/html/changelogs/buckled_mob_slowdown.yml new file mode 100644 index 00000000000..a85f9e139b1 --- /dev/null +++ b/html/changelogs/buckled_mob_slowdown.yml @@ -0,0 +1,6 @@ +author: mikomyazaki + +delete-after: True + +changes: + - tweak: "Closets, chairs, etc. without a mob inside/buckled will not cause a slowdown when being dragged." \ No newline at end of file