From f496d68f2c027a3dffead0dd6f25b206c66f13fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Barou=C5=A1?= Date: Sun, 18 Oct 2020 21:26:29 +0200 Subject: [PATCH] Allow observers to follow all living things on restricted levels (#10264) --- code/modules/mob/abstract/observer/observer.dm | 5 +++-- html/changelogs/amunak-observer-follow-fix.yml | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100755 html/changelogs/amunak-observer-follow-fix.yml diff --git a/code/modules/mob/abstract/observer/observer.dm b/code/modules/mob/abstract/observer/observer.dm index 78d2f88a3c6..bed08652bb0 100644 --- a/code/modules/mob/abstract/observer/observer.dm +++ b/code/modules/mob/abstract/observer/observer.dm @@ -186,9 +186,10 @@ Works together with spawning an observer, noted above. return if(following) - if(!iscarbon(following)) //If they are following something other than a carbon mob, teleport them + if(!isliving(following) || isanimal(following)) //If they are following something other than a living non-animal mob, teleport them + var/message = "You can not follow \the [following] on this level." stop_following() - teleport_to_spawn("You can not follow \the [following] on this level.") + teleport_to_spawn(message) else return //If they are moving around freely, teleport them diff --git a/html/changelogs/amunak-observer-follow-fix.yml b/html/changelogs/amunak-observer-follow-fix.yml new file mode 100755 index 00000000000..5e24fe817a2 --- /dev/null +++ b/html/changelogs/amunak-observer-follow-fix.yml @@ -0,0 +1,4 @@ +author: Amunak +delete-after: True +changes: + - bugfix: "Allows observers (ghosts) to follow all living things on restricted levels, which should allow for following exosuits and similar equipment."