diff --git a/code/modules/shuttles/shuttle_arrival.dm b/code/modules/shuttles/shuttle_arrival.dm index 101d244652f..b3f994e02ff 100644 --- a/code/modules/shuttles/shuttle_arrival.dm +++ b/code/modules/shuttles/shuttle_arrival.dm @@ -19,7 +19,7 @@ var/list/mobstoyellat = list() for(var/area/subarea in shuttle_area) mobs_in_area(subarea) - if (!mobstoyellat || !mobstoyellat.len) + if (!mobstoyellat || !length(mobstoyellat)) return FALSE for(var/mob/living/A in mobstoyellat) to_chat(A, "You feel as if you shouldn't be on the shuttle.") // give them an angry text @@ -34,6 +34,8 @@ qdel(A) else if(issilicon(A.loc) && isMMI(A)) mobstoyellat -= A + else if(A.stat == DEAD) + mobstoyellat -= A if (mobstoyellat) global_announcer.autosay("Current life-forms on shuttle: [english_list(mobstoyellat)].", "Arrivals Shuttle Oversight") // tell on them return FALSE diff --git a/html/changelogs/mattatlas-carpociety.yml b/html/changelogs/mattatlas-carpociety.yml new file mode 100644 index 00000000000..b76034a1e20 --- /dev/null +++ b/html/changelogs/mattatlas-carpociety.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: MattAtlas + +# 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: + - bugfix: "Fixes dead mobs holding up the arrivals shuttle."