From 22b1ac855ff36bcd1aa11b1b32a00ecb2e292468 Mon Sep 17 00:00:00 2001 From: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com> Date: Mon, 23 Nov 2020 08:19:57 +0000 Subject: [PATCH] Bodybags containing no living mobs can now be dragged significantly faster (#10606) --- code/game/objects/items/bodybag.dm | 10 +++++++ html/changelogs/bodybag_slowdown.yml | 41 ++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 html/changelogs/bodybag_slowdown.yml diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 316bec686ef..ce277181977 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -82,6 +82,12 @@ /obj/structure/closet/body_bag/store_mobs(var/stored_units) contains_body = ..() + slowdown = 0 + if(contains_body) + for(var/mob/living/M in contents) + if(M.stat != DEAD || M.status_flags & FAKEDEATH) + slowdown = initial(slowdown) + break return contains_body /obj/structure/closet/body_bag/close() @@ -90,6 +96,10 @@ return TRUE return FALSE +/obj/structure/closet/body_bag/dump_contents(var/stored_units) + ..() + slowdown = initial(slowdown) + /obj/structure/closet/body_bag/MouseDrop(over_object, src_location, over_location) ..() if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src)))) diff --git a/html/changelogs/bodybag_slowdown.yml b/html/changelogs/bodybag_slowdown.yml new file mode 100644 index 00000000000..769551840f0 --- /dev/null +++ b/html/changelogs/bodybag_slowdown.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: mikomyazaki + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Bodybags containing no living mobs can now be dragged significantly faster." \ No newline at end of file