Merge pull request #16039 from SandPoot/maptexts-(verb)-maptexts-(variable)
Maptext()s the maptexts
This commit is contained in:
@@ -51,7 +51,7 @@
|
||||
displayed_text = new_val
|
||||
|
||||
if(displayed_text)
|
||||
maptext = "<font size = [text_size]>[displayed_text]</font>"
|
||||
maptext = MAPTEXT("[displayed_text]")
|
||||
else
|
||||
maptext = null
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
/obj/item/electroadaptive_pseudocircuit/Initialize(mapload)
|
||||
. = ..()
|
||||
maptext = "[circuits]"
|
||||
maptext = MAPTEXT("[circuits]")
|
||||
|
||||
/obj/item/electroadaptive_pseudocircuit/examine(mob/user)
|
||||
. = ..()
|
||||
@@ -40,7 +40,7 @@
|
||||
playsound(R, 'sound/items/rped.ogg', 50, TRUE)
|
||||
recharging = TRUE
|
||||
circuits--
|
||||
maptext = "[circuits]"
|
||||
maptext = MAPTEXT("[circuits]")
|
||||
icon_state = "[initial(icon_state)]_recharging"
|
||||
var/recharge_time = min(600, circuit_cost * 5) //40W of cost for one fabrication = 20 seconds of recharge time; this is to prevent spamming
|
||||
addtimer(CALLBACK(src, .proc/recharge), recharge_time)
|
||||
@@ -53,7 +53,7 @@
|
||||
if(!is_type_in_typecache(target, recycleable_circuits))
|
||||
return
|
||||
circuits++
|
||||
maptext = "[circuits]"
|
||||
maptext = MAPTEXT("[circuits]")
|
||||
user.visible_message("<span class='notice'>User breaks down [target] with [src].</span>", \
|
||||
"<span class='notice'>You recycle [target] into [src]. It now has material for <b>[circuits]</b> circuits.</span>")
|
||||
playsound(user, 'sound/items/deconstruct.ogg', 50, TRUE)
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
// I assume it's faster to color,tag and OR the turf in, rather
|
||||
// then checking if its there
|
||||
T.color = RANDOM_COLOUR
|
||||
T.maptext = "[T.x],[T.y],[T.z]"
|
||||
T.maptext = MAPTEXT("[T.x],[T.y],[T.z]")
|
||||
tagged |= T
|
||||
|
||||
/obj/item/gps/visible_debug/proc/clear()
|
||||
|
||||
@@ -480,7 +480,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
|
||||
A = i
|
||||
if(!QDELETED(A) && A.level >= affecting_level)
|
||||
. = A.wave_explode(., explosion, dir)
|
||||
maptext = "[.]"
|
||||
maptext = MAPTEXT("[.]")
|
||||
|
||||
/turf/narsie_act(force, ignore_mobs, probability = 20)
|
||||
. = (prob(probability) || force)
|
||||
|
||||
Reference in New Issue
Block a user