shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16039 from SandPoot/maptexts-(verb)-maptexts-(variable)

Browse Source 
Maptext()s the maptexts
This commit is contained in:
deathride58
2023-12-12 19:21:17 -05:00
committed by GitHub
parent a91e0990a2 e457f40328
commit e729badcd2
27 changed files with 105 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/action.dm
+2 -2
View File
@@ -727,7 +727,7 @@
/datum/action/cooldown/proc/StartCooldown()
next_use_time = world.time + cooldown_time
button.maptext = "<b>[round(cooldown_time/10, 0.1)]</b>"
button.maptext = MAPTEXT_TINY_UNICODE("[round(cooldown_time/10, 0.1)]")
UpdateButtonIcon()
START_PROCESSING(SSfastprocess, src)
@@ -741,7 +741,7 @@
UpdateButtonIcon()
STOP_PROCESSING(SSfastprocess, src)
else
button.maptext = "<b>[round(timeleft/10, 0.1)]</b>"
button.maptext = MAPTEXT_TINY_UNICODE("[round(cooldown_time/10, 0.1)]")
/datum/action/cooldown/Grant(mob/M)
..()
code/datums/chatmessage.dm
+3 -1
View File
@@ -130,7 +130,9 @@
var/tgt_color = extra_classes.Find("italics") ? target.chat_color_darkened : target.chat_color
var/complete_text = "<span class='center maptext [extra_classes.Join(" ")]' style='color: [tgt_color]'>[owner.say_emphasis(text)]</span>"
var/mheight = WXH_TO_HEIGHT(owned_by.MeasureText(complete_text, null, CHAT_MESSAGE_WIDTH))
var/mheight
WXH_TO_HEIGHT(owned_by.MeasureText(complete_text, null, CHAT_MESSAGE_WIDTH), mheight)
approx_lines = max(1, mheight / CHAT_MESSAGE_APPROX_LHEIGHT)
// Translate any existing messages upwards, apply exponential decay factors to timers
code/datums/components/storage/ui.dm
+1 -1
View File
@@ -48,7 +48,7 @@
var/datum/numbered_display/ND = numbered_contents[type]
ND.sample_object.mouse_opacity = MOUSE_OPACITY_OPAQUE
ND.sample_object.screen_loc = "[cx]:[screen_pixel_x],[cy]:[screen_pixel_y]"
ND.sample_object.maptext = "<font color='white'>[(ND.number > 1)? "[ND.number]" : ""]</font>"
ND.sample_object.maptext = MAPTEXT("<font color='white'>[(ND.number > 1)? "[ND.number]" : ""]</font>")
ND.sample_object.layer = ABOVE_HUD_LAYER
ND.sample_object.plane = ABOVE_HUD_PLANE
. += ND.sample_object
code/datums/explosion.dm
+3 -3
View File
@@ -436,13 +436,13 @@ GLOBAL_LIST_EMPTY(explosions)
if(dist < dev)
T.color = "red"
T.maptext = "Dev"
T.maptext = MAPTEXT("Dev")
else if (dist < heavy)
T.color = "yellow"
T.maptext = "Heavy"
T.maptext = MAPTEXT("Heavy")
else if (dist < light)
T.color = "blue"
T.maptext = "Light"
T.maptext = MAPTEXT("Light")
else
continue