diff --git a/_maps/map_files/LayeniaStation/LayeniaStation.dmm b/_maps/map_files/LayeniaStation/LayeniaStation.dmm
index 2bac9f2fa..bc5414030 100644
--- a/_maps/map_files/LayeniaStation/LayeniaStation.dmm
+++ b/_maps/map_files/LayeniaStation/LayeniaStation.dmm
@@ -2941,6 +2941,7 @@
icon_state = "1-2"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/maintenance/solars/starboard/fore)
"aiI" = (
@@ -59816,6 +59817,7 @@
name = "Atmospherics External Access";
req_access_txt = "24"
},
+/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/maintenance/theatre)
"jnp" = (
@@ -91778,6 +91780,17 @@
"ofn" = (
/turf/closed/wall,
/area/storage/D)
+"ofu" = (
+/obj/machinery/door/airlock/external{
+ name = "Port Docking Bay 1"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/turf_decal/delivery,
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel/dark{
+ icon_state = "darkfull_whole_alt"
+ },
+/area/hallway/secondary/entry/upper)
"ofE" = (
/obj/structure/closet/l3closet/scientist,
/obj/effect/turf_decal/stripes/line{
@@ -144733,6 +144746,7 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
+/obj/structure/fans/tiny,
/turf/open/floor/plasteel/dark{
icon_state = "darkfull_whole_alt"
},
@@ -153452,6 +153466,7 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
+/obj/structure/fans/tiny,
/turf/open/floor/plating/layenia,
/area/maintenance/department/engine/upper)
"wAM" = (
@@ -252183,7 +252198,7 @@ vka
vka
vka
prt
-dvT
+ofu
rFp
vKI
tGx
diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm
index 02f43a12a..8cac8b435 100644
--- a/code/datums/chatmessage.dm
+++ b/code/datums/chatmessage.dm
@@ -59,6 +59,7 @@
* Calls qdel on the chatmessage when its parent is deleted, used to register qdel signal
*/
/datum/chatmessage/proc/on_parent_qdel()
+ UnregisterSignal(src, COMSIG_PARENT_QDELETING)
qdel(src)
@@ -107,6 +108,9 @@
if (extra_classes.Find("virtual-speaker"))
var/image/r_icon = image('icons/UI_Icons/chat/chat_icons.dmi', icon_state = "radio")
text = "\icon[r_icon] " + text
+ else if (extra_classes.Find("emote"))
+ var/image/r_icon = image('icons/ui_icons/chat/chat_icons.dmi', icon_state = "emote")
+ text = "\icon[r_icon] " + text
// We dim italicized text to make it more distinguishable from regular text
var/tgt_color = extra_classes.Find("italics") ? target.chat_color_darkened : target.chat_color
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 60925bd20..d34eb73fb 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -40,12 +40,17 @@
if(SSticker.current_state <= GAME_STATE_PREGAME)
switch(ready)
if(PLAYER_NOT_READY)
- output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "notready")]Not Ready
"
- if(PLAYER_READY_TO_PLAY)
- output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "ready")]Ready
"
+ output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "notready")]Not Ready
"
if(PLAYER_READY_TO_OBSERVE)
- output += "\[ [LINKIFY_READY("Ready", PLAYER_READY_TO_PLAY)] | [LINKIFY_READY("Not Ready", PLAYER_NOT_READY)] | Observe \]
"
- output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "settings")]Setup Character
"
+ output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "notready")]Not Ready
"
+ if(PLAYER_READY_TO_PLAY)
+ output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "ready")]Ready
"
+ output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "settings")]Setup Character
"
+ if(ready == PLAYER_READY_TO_OBSERVE)
+ output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "ghost")]Observe
"
+ else
+ output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "ghost")]Observe
"
+
else
//make menu preview
var/mob/living/carbon/human/dummy/mannequin = generate_or_wait_for_human_dummy(DUMMY_HUMAN_SLOT_ROLEPLAY)
@@ -58,16 +63,16 @@
CHECK_TICK
preview_icon.Blend(stamp, ICON_OVERLAY, 0, 0)
CHECK_TICK
- preview_icon.Scale(preview_icon.Width() * 2, preview_icon.Height() * 2)
+ preview_icon.Scale(preview_icon.Width(), preview_icon.Height())
CHECK_TICK
unset_busy_human_dummy(DUMMY_HUMAN_SLOT_ROLEPLAY)
- output += "[icon2html(preview_icon, world, "preview")]Join Game >>
"
- output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "roleplay")]Roleplay Roles
"
- output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "settings")]Setup Character
"
- output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "manifest")]View the Crew Manifest
"
- output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "ghost")]Observe
"
+ output += "[icon2html(preview_icon, world, "preview")]Join Game!
"
+ output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "roleplay")]Roleplay Roles!
"
+ output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "settings")]Setup Character
"
+ output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "manifest")]View the Crew Manifest
"
+ output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "ghost")]Observe
"
- if(!IsGuestKey(src.key))
+ if(!IsGuestKey(src.key) && SSticker.current_state >= GAME_STATE_PREGAME)
if (SSdbcore.Connect())
var/isadmin = 0
if(src.client && src.client.holder)
@@ -80,9 +85,9 @@
newpoll = 1
if(newpoll)
- output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "manifest")]Show Player Polls (NEW!)
"
+ output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "manifest")]Show Player Polls (NEW!)
"
else
- output += "[icon2html('hyperstation/icons/menu/menu_large.dmi', world, "manifest")]Show Player Polls
"
+ output += "[icon2html('hyperstation/icons/menu/menu.dmi', world, "manifest")]Show Player Polls
"
qdel(query_get_new_polls)
if(QDELETED(src))
return
@@ -91,9 +96,9 @@
var/datum/browser/popup
if(SSticker.current_state <= GAME_STATE_PREGAME)
- popup = new(src, "playersetup", "New Player Options
", 268, 302)
+ popup = new(src, "playersetup", "New Player Options
", 268, 202)
else
- popup = new(src, "playersetup", "New Player Options
", 268, 542)
+ popup = new(src, "playersetup", "New Player Options
", 268, 342)
popup.set_window_options("can_close=0")
popup.add_stylesheet("playersetup", 'html/browser/mainmenu.css')
@@ -120,6 +125,15 @@
client.prefs.ShowChoices(src)
return 1
+ if(href_list["observe"])
+ if(!SSticker.current_state > GAME_STATE_PREGAME)
+ make_me_an_observer()
+ return
+ else
+ to_chat(usr, "The game is still loading...")
+ return
+
+
if(href_list["ready"])
var/tready = text2num(href_list["ready"])
//Avoid updating ready if we're after PREGAME (they should use latejoin instead)
@@ -127,6 +141,7 @@
//no longer is required
if(SSticker.current_state <= GAME_STATE_PREGAME)
ready = tready
+
//if it's post initialisation and they're trying to observe we do the needful
if(!SSticker.current_state < GAME_STATE_PREGAME && tready == PLAYER_READY_TO_OBSERVE)
ready = tready
diff --git a/html/browser/mainmenu.css b/html/browser/mainmenu.css
index ed5399c50..8c8f14dd3 100644
--- a/html/browser/mainmenu.css
+++ b/html/browser/mainmenu.css
@@ -11,8 +11,8 @@ border: 2px solid #161616;
.icon
{
- width: 64px;
- height: 64px;
+ width: 32px;
+ height: 32px;
vertical-align: middle;
}
diff --git a/hyperstation/icons/menu/menu.dmi b/hyperstation/icons/menu/menu.dmi
index c2ab29375..a8bf014e9 100644
Binary files a/hyperstation/icons/menu/menu.dmi and b/hyperstation/icons/menu/menu.dmi differ
diff --git a/icons/UI_Icons/chat/chat_icons.dmi b/icons/UI_Icons/chat/chat_icons.dmi
index 7040b3966..8cc4b2c55 100644
Binary files a/icons/UI_Icons/chat/chat_icons.dmi and b/icons/UI_Icons/chat/chat_icons.dmi differ