From 7d62f6a79a6b704d328f2f40c731dfdee025db6d Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Sun, 18 Sep 2022 01:53:45 +0200 Subject: [PATCH] Fixes the follow menu having 100 ghost mobs. (#14828) --- code/modules/mob/abstract/virtual/base.dm | 2 ++ code/modules/mob/mob.dm | 12 ++++--- html/changelogs/matt-aaaa.yml | 41 +++++++++++++++++++++++ 3 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/matt-aaaa.yml diff --git a/code/modules/mob/abstract/virtual/base.dm b/code/modules/mob/abstract/virtual/base.dm index 03f5d3ef518..9b51551ca49 100644 --- a/code/modules/mob/abstract/virtual/base.dm +++ b/code/modules/mob/abstract/virtual/base.dm @@ -14,6 +14,8 @@ var/global/list/all_virtual_listeners = list() virtual_mob = null no_z_overlay = TRUE + should_add_to_mob_list = FALSE + var/atom/movable/host var/host_type = /atom/movable var/abilities = VIRTUAL_ABILITY_HEAR|VIRTUAL_ABILITY_SEE diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 4b0151b3dad..c8d4fa4ee39 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -66,13 +66,15 @@ spell_masters = null zone_sel = null +/mob/var/should_add_to_mob_list = TRUE /mob/Initialize() . = ..() - mob_list += src - if(stat == DEAD) - dead_mob_list += src - else - living_mob_list += src + if(should_add_to_mob_list) + mob_list += src + if(stat == DEAD) + dead_mob_list += src + else + living_mob_list += src if (!ckey && mob_thinks) MOB_START_THINKING(src) diff --git a/html/changelogs/matt-aaaa.yml b/html/changelogs/matt-aaaa.yml new file mode 100644 index 00000000000..83d35b9ef7d --- /dev/null +++ b/html/changelogs/matt-aaaa.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: "The ghost follow menu should no longer be spammed with 100s of ghost mobs."