From 06302113cf680ecb954c2c74e8336be321bd40cf Mon Sep 17 00:00:00 2001 From: ToonClyde <49804499+ToonClyde@users.noreply.github.com> Date: Sun, 11 Sep 2022 20:34:52 -0700 Subject: [PATCH 1/5] fixed missing microfans --- .../map_files/LayeniaStation/LayeniaStation.dmm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/LayeniaStation/LayeniaStation.dmm b/_maps/map_files/LayeniaStation/LayeniaStation.dmm index 1380a9a1a..e5feee0bf 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" = ( @@ -59797,6 +59798,7 @@ name = "Atmospherics External Access"; req_access_txt = "24" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/maintenance/theatre) "jnp" = ( @@ -91758,6 +91760,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{ @@ -144699,6 +144712,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel/dark{ icon_state = "darkfull_whole_alt" }, @@ -153418,6 +153432,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" = ( @@ -252149,7 +252164,7 @@ vka vka vka prt -dvT +ofu rFp vKI tGx From 361e0611f57b769b5b62fd20977afb2aa1c0efcc Mon Sep 17 00:00:00 2001 From: quotefox Date: Mon, 12 Sep 2022 19:07:04 +0100 Subject: [PATCH 2/5] smaller main menu! --- .../modules/mob/dead/new_player/new_player.dm | 26 +++++++++--------- html/browser/mainmenu.css | 4 +-- hyperstation/icons/menu/menu.dmi | Bin 1648 -> 2089 bytes 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 60925bd20..f9bf45090 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -40,12 +40,12 @@ 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

" + output += "

[icon2html('hyperstation/icons/menu/menu.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, "ready")]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, "settings")]Setup Character

" else //make menu preview var/mob/living/carbon/human/dummy/mannequin = generate_or_wait_for_human_dummy(DUMMY_HUMAN_SLOT_ROLEPLAY) @@ -58,14 +58,14 @@ 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 (SSdbcore.Connect()) @@ -80,9 +80,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 +91,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') 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 c2ab29375c2fc8f57d0bebdeccd0bccad1e2bb29..a8bf014e932404c28573c86a56bc29619ec61b09 100644 GIT binary patch literal 2089 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 T@u@w#00000NkvXXu0mjf!^p@C literal 1648 zcmV-$29NoPP)V=-0C=2@$~y|fFc3x2TC<9W-G}^IH9^L>u=gPFSQ6M$&sfNVS*b6dT^CgGAyo#BbjHKHNxU@CKEY@sQZX|Wmq)AswoF)$jqqNno| z12>=3!lFN6h~*De%gXoFzrMj1-Q?iLf!~{96D31))hqK~#90?OI(+8(A2B zW;A{!x=lA>EH+DN*wkK?3S!rbjUwcxg@Um72gKst_M#NJNGpK_x6697Ac%h;6uj7* z1wl-1LPfCPO|w~~Zf6C>RIACDi6%39VP^I?PUa(-$<&Vr!pzAzc{%Sh@7H-JR6HKX zWd`l^2Aswf0ZwngX*6n0PDZCh<##V9o>TU1r~c5i0G8drqsI@?+utXD)JQqcp!Bl9 z=-9Y8Fcgu;*L_~BB$qFYC7iK<$>@|wKIOUD87jWGAkXh+_AZnqsJg(T#}A=L!bO29 z0q@`cjbJDwlQ23qE(QX(K$5_+8}->?84WZoG7MAk(?HWzS>%~4z_J?%hC%>$tOG{J#zg?Kzptm$@?0dZn5CGXS>?VO>7_qy%TX!ADan=%`#OT<#I6N{U*8*g0u#*HW z3n0O99Nw+2!e}-yeHxsbouTGqFM*mjqpQ3GGclm5o!$4%{ zi*2A--W4WEkg7;7m#cgKz$i4k!qsAKc7~FAiDcRQCBo7epagl2sCWOsC~PI*JmAv5 z8M-3C=?yrID*~L}fYZ421XNuJg~Q>u(tRS4cwo(T>W``jC@UW&$LEy<(=MP?zKkeo z5$6e}DnW(vKLB_`TmfLh4omp;#S8Jfa2Q8CkCyg!w0b-cN~Ke4C;$|F@;nc-S!{1^ z;-3#6@Z+mjnk9HGhoLu$t1bBH$rJIL+qW?s5zuM zC$oC;O%aetBpy_70l=oG&lijQ+S*#n_k(}JH+{Xxm*AMp;*+FZz>3e!{N7D zLC}ss*x~iUbM2b$y4Taw^1Y{{0{~#81!b53LUA?ohcst335_lnMCv4ty`G*vr6_s- z?CDeaz9_iC_|1W^zG@&9KjDM~7@97|!JqV#((x&)Y1UV`m)0r|w0 z5X#r1LP1xKnHVr(@jBB`Dou`0%?T$IS^ zE3dQ73Jk%3?@PFt$KkRI92$68dLaoA0Tgq8pnj}t%X%)4ND=~WC40gNyIp+ zyjhq|gNa1q4z#Vn*#JmD6!nW?O#+k=oyY`ge;40VWD463NP3XeR-PKwplbmV38XR= zQeBj2jajBVP1B$a^j z0>?oVMSR-ahad<)>&dVA{{eRUd7kHa0N@S}(bU|GLb0e$07apY&m+%q4NWdrChzLF u0pJ%s`B$&Uo!)@cxFW#m4LFTUPr!e%9@tV7H3`uG0000 Date: Mon, 12 Sep 2022 19:54:21 +0100 Subject: [PATCH 3/5] Runetime errors with chat. --- code/datums/chatmessage.dm | 4 ++++ icons/UI_Icons/chat/chat_icons.dmi | Bin 237 -> 337 bytes 2 files changed, 4 insertions(+) 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/icons/UI_Icons/chat/chat_icons.dmi b/icons/UI_Icons/chat/chat_icons.dmi index 7040b3966f005388c571bfe40e4cfe6973185e23..8cc4b2c5598fa8818a6b80684a33cc19c4475a2f 100644 GIT binary patch literal 337 zcmV-X0j~auP)V=-0C=2r%CQQAFc1ddIrkJlx|bGQ9BwI*l0n}gkh8hL29iTx-$Cf+_6=W; z_w)%1{2XYP+O+(@7#>e@hbGHljO4QDHyaouHH#)-bTuX|9l4~nf$<`@*0{;#|B|hk z+^rtd;^F5&C*08_dM&1E;{X5vlSxEDR49?HlCcfLFbo8rf_BLOZqkLl2k`)zBLjF4 z_wO!^2kZs*w~NREdynk}vPz!=MOp)!uLh zRx`*p32LABKi9{583f&E@bh(>?Eal|F*7-#BrzeOJ0)QPS8>7#FXsdS ec@@4X> Date: Mon, 12 Sep 2022 20:30:14 +0100 Subject: [PATCH 4/5] main menu patch, bring back observe. based --- .../modules/mob/dead/new_player/new_player.dm | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index f9bf45090..864472504 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -41,11 +41,16 @@ switch(ready) if(PLAYER_NOT_READY) output += "

[icon2html('hyperstation/icons/menu/menu.dmi', world, "notready")]Not Ready

" + if(PLAYER_READY_TO_OBSERVE) + 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

" - 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.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) @@ -67,7 +72,7 @@ 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) @@ -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,10 @@ //no longer is required if(SSticker.current_state <= GAME_STATE_PREGAME) ready = tready + + if (tready == PLAYER_READY_TO_OBSERVE && ready == PLAYER_READY_TO_OBSERVE) + ready = PLAYER_NOT_READY + return //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 From b08cab9a6ccc8d38c7e6c22569d0dacb2e55d98c Mon Sep 17 00:00:00 2001 From: quotefox Date: Mon, 12 Sep 2022 20:38:07 +0100 Subject: [PATCH 5/5] bug fix, observe round fixed. --- code/modules/mob/dead/new_player/new_player.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 864472504..d34eb73fb 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -47,7 +47,7 @@ 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

" + output += "

[icon2html('hyperstation/icons/menu/menu.dmi', world, "ghost")]Observe

" else output += "

[icon2html('hyperstation/icons/menu/menu.dmi', world, "ghost")]Observe

" @@ -142,9 +142,6 @@ if(SSticker.current_state <= GAME_STATE_PREGAME) ready = tready - if (tready == PLAYER_READY_TO_OBSERVE && ready == PLAYER_READY_TO_OBSERVE) - ready = PLAYER_NOT_READY - return //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