From 1b9e5554b58814a3bde4fff4ed588eab7ff0c597 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 9 Aug 2021 00:01:33 -0400 Subject: [PATCH 1/2] Force skybox rebuild when ship eaten --- code/modules/overmap/ships/ship_vr.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/overmap/ships/ship_vr.dm b/code/modules/overmap/ships/ship_vr.dm index 24655e952a1..aeb4f79a797 100644 --- a/code/modules/overmap/ships/ship_vr.dm +++ b/code/modules/overmap/ships/ship_vr.dm @@ -17,6 +17,7 @@ L.visible_message("[L] is trying to stuff \the [src] into [L.gender == MALE ? "his" : L.gender == FEMALE ? "her" : "their"] [bellychoice]!","You begin putting \the [src] into your [bellychoice]!") if(do_after(L, 5 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE)) forceMove(bellychoice) + SSskybox.rebuild_skyboxes(map_z) L.visible_message("[L] eats a spaceship! This is totally normal.","You eat the the spaceship! Yum, metal.") /obj/effect/overmap/visitable/ship/hear_talk(mob/talker, list/message_pieces, verb) From f74693cd674528f6815adbc775b0622002905393 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 9 Aug 2021 00:56:35 -0400 Subject: [PATCH 2/2] Custom emotes work too --- code/modules/overmap/ships/ship_vr.dm | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/code/modules/overmap/ships/ship_vr.dm b/code/modules/overmap/ships/ship_vr.dm index aeb4f79a797..97afe44e724 100644 --- a/code/modules/overmap/ships/ship_vr.dm +++ b/code/modules/overmap/ships/ship_vr.dm @@ -20,13 +20,29 @@ SSskybox.rebuild_skyboxes(map_z) L.visible_message("[L] eats a spaceship! This is totally normal.","You eat the the spaceship! Yum, metal.") +/obj/effect/overmap/visitable/ship/proc/get_people_in_ship() + . = list() + for(var/mapz in map_z) + var/list/thatz = GLOB.players_by_zlevel[mapz] + . += thatz + /obj/effect/overmap/visitable/ship/hear_talk(mob/talker, list/message_pieces, verb) . = ..() - var/list/listeners = list() - for(var/mapz in map_z) - var/list/thatz = GLOB.players_by_zlevel[mapz] - listeners += thatz - + var/list/listeners = get_people_in_ship() for(var/mob/M as anything in listeners) M.hear_say(message_pieces, verb, FALSE, talker) + +/obj/effect/overmap/visitable/ship/show_message(msg, type, alt, alt_type) + . = ..() + + var/list/listeners = get_people_in_ship() + for(var/mob/M as anything in listeners) + M.show_message(msg, type, alt, alt_type) + +/obj/effect/overmap/visitable/ship/see_emote(source, message, m_type) + . = ..() + + var/list/listeners = get_people_in_ship() + for(var/mob/M as anything in listeners) + M.show_message(message, m_type)