diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 15f10f8f98b..9781b7b5981 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -992,7 +992,7 @@ world letter = lowertext(letter) var/image/text_image = new(loc = A) - text_image.maptext = MAPTEXT("[letter]") + text_image.maptext = MAPTEXT_TINY_UNICODE("[letter]") text_image.pixel_x = 7 text_image.pixel_y = 5 qdel(atom_icon) diff --git a/code/datums/actions/cooldown_action.dm b/code/datums/actions/cooldown_action.dm index 9d31f2b5d37..6be6e02859f 100644 --- a/code/datums/actions/cooldown_action.dm +++ b/code/datums/actions/cooldown_action.dm @@ -79,9 +79,9 @@ button.maptext = "" else if (cooldown_rounding > 0) - button.maptext = MAPTEXT("[round(time_left/10, cooldown_rounding)]") + button.maptext = MAPTEXT("[round(time_left/10, cooldown_rounding)]") else - button.maptext = MAPTEXT("[round(time_left/10)]") + button.maptext = MAPTEXT("[round(time_left/10)]") if(!IsAvailable() || !is_action_active(button)) return diff --git a/code/datums/components/admin_popup.dm b/code/datums/components/admin_popup.dm index 6edd839942d..1c821808a40 100644 --- a/code/datums/components/admin_popup.dm +++ b/code/datums/components/admin_popup.dm @@ -104,9 +104,9 @@ last_color_index = (last_color_index % colors.len) + 1 - var/message = "" - message += "HEY! An admin is trying to talk to you!
Check your chat window, and click their name to respond!" - message += "
" + var/message = "" + message += "HEY!
An admin is trying to talk to you!
Check your chat window,
and click their name to respond!" + message += "
" maptext = MAPTEXT(message) last_update_time = world.time diff --git a/code/game/atoms.dm b/code/game/atoms.dm index d04e4df3058..936d4054b47 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -2035,7 +2035,7 @@ active_hud.screentip_text.maptext = "" return - active_hud.screentip_text.maptext_y = 16 // 16px lines us up with the action buttons top left corner + active_hud.screentip_text.maptext_y = 7 // 7px lines us up with the action buttons top left corner var/lmb_rmb_line = "" var/ctrl_lmb_ctrl_rmb_line = "" var/alt_lmb_alt_rmb_line = "" @@ -2102,15 +2102,15 @@ extra_lines++ if(extra_lines) - extra_context = "
[lmb_rmb_line][ctrl_lmb_ctrl_rmb_line][alt_lmb_alt_rmb_line][shift_lmb_ctrl_shift_lmb_line]" - //first extra line pushes atom name line up 11px, subsequent lines push it up 8px, this offsets that and keeps the first line in the same place - active_hud.screentip_text.maptext_y = 5 + (extra_lines - 1) * -8 + extra_context = "
[lmb_rmb_line][ctrl_lmb_ctrl_rmb_line][alt_lmb_alt_rmb_line][shift_lmb_ctrl_shift_lmb_line]" + //first extra line pushes atom name line up 8px, subsequent lines push it up 10px, this offsets that and keeps the first line in the same place + active_hud.screentip_text.maptext_y = -1 + (extra_lines - 1) * -10 if (screentips_enabled == SCREENTIP_PREFERENCE_CONTEXT_ONLY && extra_context == "") active_hud.screentip_text.maptext = "" else //We inline a MAPTEXT() here, because there's no good way to statically add to a string like this - active_hud.screentip_text.maptext = "[name][extra_context]" + active_hud.screentip_text.maptext = "[name][extra_context]" /// Gets a merger datum representing the connected blob of objects in the allowed_types argument /atom/proc/GetMergeGroup(id, list/allowed_types) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 4859d7b422d..31c193ef066 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -229,10 +229,10 @@ /obj/machinery/status_display/proc/display_shuttle_status(obj/docking_port/mobile/shuttle) if(!shuttle) // the shuttle is missing - no processing - set_messages("shutl?","") + set_messages("shutl","not in service") return PROCESS_KILL else if(shuttle.timer) - var/line1 = "- [shuttle.getModeStr()] -" + var/line1 = "<<< [shuttle.getModeStr()]" var/line2 = shuttle.getTimerStr() set_messages(line1, line2) @@ -387,8 +387,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/status_display/evac, 32) if(!SSshuttle.supply) // Might be missing in our first update on initialize before shuttles // have loaded. Cross our fingers that it will soon return. - line1 = "CARGO" - line2 = "shutl?" + line1 = "shutl" + line2 = "not in service" else if(SSshuttle.supply.mode == SHUTTLE_IDLE) if(is_station_level(SSshuttle.supply.z)) line1 = "CARGO" @@ -397,7 +397,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/status_display/evac, 32) line1 = "" line2 = "" else - line1 = "- [SSshuttle.supply.getModeStr()] -" + line1 = "<<< [SSshuttle.supply.getModeStr()]" line2 = SSshuttle.supply.getTimerStr() set_messages(line1, line2) diff --git a/code/game/objects/effects/countdown.dm b/code/game/objects/effects/countdown.dm index cccf77b2065..5e6a46796fb 100644 --- a/code/game/objects/effects/countdown.dm +++ b/code/game/objects/effects/countdown.dm @@ -64,7 +64,7 @@ displayed_text = new_val if(displayed_text) - maptext = MAPTEXT("[displayed_text]") + maptext = MAPTEXT("[displayed_text]") else maptext = null @@ -102,7 +102,6 @@ /obj/effect/countdown/supermatter name = "supermatter damage" - text_size = 1 color = "#00ff80" /obj/effect/countdown/supermatter/get_value() diff --git a/code/modules/client/preferences/screentips.dm b/code/modules/client/preferences/screentips.dm index 5566f28b539..fe257823375 100644 --- a/code/modules/client/preferences/screentips.dm +++ b/code/modules/client/preferences/screentips.dm @@ -35,4 +35,4 @@ client.mob?.hud_used?.screentip_color = value /datum/preference/color/screentip_color/create_default_value() - return "#ffd391" + return LIGHT_COLOR_FAINT_BLUE diff --git a/code/modules/events/wizard/rpgtitles.dm b/code/modules/events/wizard/rpgtitles.dm index b2890150c93..587c11ad550 100644 --- a/code/modules/events/wizard/rpgtitles.dm +++ b/code/modules/events/wizard/rpgtitles.dm @@ -42,7 +42,7 @@ GLOBAL_DATUM(rpgtitle_controller, /datum/rpgtitle_controller) //we must prepare for the mother of all strings new_crewmember.maptext_height = max(new_crewmember.maptext_height, 32) - new_crewmember.maptext_width = max(new_crewmember.maptext_width, 80) + new_crewmember.maptext_width = max(new_crewmember.maptext_width, 112) new_crewmember.maptext_x = -24 - new_crewmember.base_pixel_x new_crewmember.maptext_y = -32 diff --git a/code/modules/mafia/controller.dm b/code/modules/mafia/controller.dm index e141c921159..629e9453d7d 100644 --- a/code/modules/mafia/controller.dm +++ b/code/modules/mafia/controller.dm @@ -1045,7 +1045,7 @@ GLOBAL_LIST_INIT(mafia_role_by_alignment, setup_mafia_role_by_alignment()) return ..() /atom/movable/screen/mafia_popup/proc/update_text(text) - maptext = MAPTEXT(" [text]") + maptext = MAPTEXT(" [text]") maptext_width = view_to_pixels(owner.body.client?.view_size.getView())[1] owner.body.client?.screen += src addtimer(CALLBACK(src, PROC_REF(null_text), owner.body.client), 10 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE)