cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 23:49:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11375 from VOREStation/Arokha/shipnom3

Browse Source 
Ship eating skybox and emotes tweak
This commit is contained in:
Aronai Sieyes
2021-08-09 01:06:24 -04:00
committed by GitHub
parent 77def9ca61 f74693cd67
commit 1664cd1a58
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/overmap/ships/ship_vr.dm
+22 -5
View File
@@ -17,15 +17,32 @@
L.visible_message("<span class='warning'>[L] is trying to stuff \the [src] into [L.gender == MALE ? "his" : L.gender == FEMALE ? "her" : "their"] [bellychoice]!</span>","<span class='notice'>You begin putting \the [src] into your [bellychoice]!</span>")
if(do_after(L, 5 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE))
forceMove(bellychoice)
SSskybox.rebuild_skyboxes(map_z)
L.visible_message("<span class='warning'>[L] eats a spaceship! This is totally normal.</span>","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)