next set of spans (#16434)

* next set of spans

* some more

* next

* next

* next

* .

* text...

* next... rest soon

* .

* .

* ok last set for the night

* .

* .

* .

* .

* some more

* next

* next

* all for now

* .

* some more easy ones

* some more easy ones

* .

* .

* some more bolds

* oups auto complete moment

* add the remaining spans

* this as well

* this as well

* .

* .,

* resync them properly
This commit is contained in:
Kashargul
2024-10-16 23:37:27 +02:00
committed by GitHub
parent 6275972fef
commit b594520a74
604 changed files with 2801 additions and 2638 deletions
+3 -3
View File
@@ -742,7 +742,7 @@ GLOBAL_LIST_EMPTY(apcs)
if(H.species.can_shred(H))
user.setClickCooldown(user.get_attack_speed())
user.visible_message("<span call='warning'>[user.name] slashes at the [name]!</span>", span_notice("You slash at the [name]!"))
user.visible_message(span_warning("[user.name] slashes at the [name]!"), span_notice("You slash at the [name]!"))
playsound(src, 'sound/weapons/slash.ogg', 100, 1)
var/allcut = wires.is_all_cut()
@@ -750,12 +750,12 @@ GLOBAL_LIST_EMPTY(apcs)
if(beenhit >= pick(3, 4) && wiresexposed != 1)
wiresexposed = 1
update_icon()
visible_message("<span call='warning'>The [name]'s cover flies open, exposing the wires!</span>")
visible_message(span_warning("The [name]'s cover flies open, exposing the wires!"))
else if(wiresexposed == 1 && allcut == 0)
wires.cut_all()
update_icon()
visible_message("<span call='warning'>The [name]'s wires are shredded!</span>")
visible_message(span_warning("The [name]'s wires are shredded!"))
else
beenhit += 1
return
+2 -2
View File
@@ -67,7 +67,7 @@ GLOBAL_LIST_EMPTY(fusion_cores)
if(Output.get_pairing())
reagents.trans_to_holder(Output.reagents, Output.reagents.maximum_volume)
if(prob(5))
visible_message("<b>\The [src]</b> gurgles as it exports fluid.")
visible_message(span_infoplain(span_bold("\The [src]") + " gurgles as it exports fluid."))
if(owned_field)
@@ -131,7 +131,7 @@ GLOBAL_LIST_EMPTY(fusion_cores)
/obj/machinery/power/fusion_core/attack_hand(var/mob/user)
if(!Adjacent(user)) // As funny as it was for the AI to hug-kill the tokamak field from a distance...
return
visible_message("<b>\The [user]</b> hugs \the [src] to make it feel better!")
visible_message(span_infoplain(span_bold("\The [user]") + " hugs \the [src] to make it feel better!"))
if(owned_field)
Shutdown()
@@ -63,16 +63,16 @@
if(cur_viewed_device && (cur_viewed_device.id_tag != id_tag || get_dist(src, cur_viewed_device) > scan_range))
cur_viewed_device = null
var/dat = "<B>Core Control #[id_tag]</B><BR>"
var/dat = span_bold("Core Control #[id_tag]") + "<BR>"
if(cur_viewed_device)
dat += {"
<a href='?src=\ref[src];goto_scanlist=1'>Back to overview</a><hr>
Device ident '[cur_viewed_device.id_tag]' <span style='color: [cur_viewed_device.owned_field ? "green" : "red"]'>[cur_viewed_device.owned_field ? "Active" : "Inactive"].</span><br>
Device ident '[cur_viewed_device.id_tag]' [cur_viewed_device.owned_field ? span_green("Active") : span_red("Inactive")].<br>
<b>Power status:</b> [cur_viewed_device.avail()]/[cur_viewed_device.active_power_usage] W<br>
<hr>
<b>Field Status:</b> <span style='color: [cur_viewed_device.owned_field ? "red" : "green"]'><a href='?src=\ref[src];toggle_active=1'>[cur_viewed_device.owned_field ? "Online" : "Offline"].</a></span><br>
<b>Reactant Dump:</b> <a href='?src=\ref[src];syphon=1'><span style='color: [cur_viewed_device.owned_field ? "red" : "green"]'>[cur_viewed_device.reactant_dump ? "Active" : "Inactive"].</span></a><br>
<b>Field Status:</b> <a href='?src=\ref[src];toggle_active=1'>[cur_viewed_device.owned_field ? span_green("Online") : span_red("Offline")].</a><br>
<b>Reactant Dump:</b> <a href='?src=\ref[src];syphon=1'>[cur_viewed_device.reactant_dump ? span_gren("Active") : span_red("Inactive")].</a><br>
<hr>
<b>Field power density (W.m<sup>-3</sup>):</b><br>
<a href='?src=\ref[src];str=-1000'>----</a>
@@ -123,12 +123,12 @@
var/status
var/can_access = 1
if(!check_core_status(C))
status = "<span style='color: red'>Unresponsive</span>"
status = span_red("Unresponsive")
can_access = 0
else if(C.avail() < C.active_power_usage)
status = "<span style='color: orange'>Underpowered</span>"
status = span_orange("Underpowered")
else
status = "<span style='color: green'>Good</span>"
status = span_green("Good")
dat += {"
<tr>
@@ -138,7 +138,7 @@
if(!can_access)
dat += {"
<td><span style='color: red'>ERROR</span></td>
<td>" + span_red("ERROR") + "</td>
"}
else
dat += {"
@@ -149,7 +149,7 @@
"}
else
dat += "<span style='color: red'>No electromagnetic field generators connected.</span>"
dat += span_red("No electromagnetic field generators connected.")
var/datum/browser/popup = new(user, "fusion_control", name, 500, 400, src)
popup.set_content(dat)
@@ -26,14 +26,14 @@
to_chat(user, span_warning("You need at least three hundred units of material to form a fuel rod."))
return 1
var/datum/reagent/R = thing.reagents.reagent_list[1]
visible_message("<b>\The [src]</b> compresses the contents of \the [thing] into a new fuel assembly.")
visible_message(span_infoplain(span_bold("\The [src]") + " compresses the contents of \the [thing] into a new fuel assembly."))
var/obj/item/fuel_assembly/F = new(get_turf(src), R.id, R.color)
thing.reagents.remove_reagent(R.id, R.volume)
user.put_in_hands(F)
else if(istype(thing, /obj/machinery/power/supermatter))
var/obj/item/fuel_assembly/F = new(get_turf(src), "supermatter")
visible_message("<b>\The [src]</b> compresses \the [thing] into a new fuel assembly.")
visible_message(span_infoplain(span_bold("\The [src]") + " compresses \the [thing] into a new fuel assembly."))
qdel(thing)
user.put_in_hands(F)
return 1
@@ -58,7 +58,7 @@
to_chat(user, span_warning("You need at least 25 [mat.sheet_plural_name] to make a fuel rod."))
return
var/obj/item/fuel_assembly/F = new(get_turf(src), mat.name)
visible_message("<b>\The [src]</b> compresses the [mat.use_name] into a new fuel assembly.")
visible_message(span_infoplain(span_bold("\The [src]") + " compresses the [mat.use_name] into a new fuel assembly."))
M.use(FUSION_ROD_SHEET_AMT)
user.put_in_hands(F)
@@ -50,7 +50,7 @@
to_chat(user, span_warning("This console has not been assigned an ident tag. Please contact your system administrator or conduct a manual update with a standard multitool."))
return
var/dat = "<B>Reactor Core Fuel Control #[id_tag]</B><BR>"
var/dat = span_bold("Reactor Core Fuel Control #[id_tag]") + "<BR>"
dat += {"
<hr>
<table border=1 width='100%'>
@@ -67,9 +67,9 @@
dat += "<tr>"
if(I.stat & (BROKEN|NOPOWER))
dat += "<td><span class='danger'>ERROR</span></td>"
dat += "<td><span class='danger'>ERROR</span></td>"
dat += "<td><span class='danger'>ERROR</span></td>"
dat += "<td>" + span_danger("ERROR") + "</td>"
dat += "<td>" + span_danger("ERROR") + "</td>"
dat += "<td>" + span_danger("ERROR") + "</td>"
else
dat += "<td>[I.cur_assembly ? I.cur_assembly.fuel_type : "NONE"]</td>"
if(I.cur_assembly)
@@ -57,9 +57,9 @@ GLOBAL_LIST_EMPTY(fuel_injectors)
if(cur_assembly)
cur_assembly.forceMove(get_turf(src))
visible_message("<b>\The [user]</b> swaps \the [src]'s [cur_assembly] for \a [W].")
visible_message(span_infoplain(span_bold("\The [user]") + " swaps \the [src]'s [cur_assembly] for \a [W]."))
else
visible_message("<b>\The [user]</b> inserts \a [W] into \the [src].")
visible_message(span_infoplain(span_bold("\The [user]") + " inserts \a [W] into \the [src]."))
user.drop_from_inventory(W)
W.forceMove(src)
@@ -93,7 +93,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors)
if(cur_assembly)
cur_assembly.forceMove(get_turf(src))
user.put_in_hands(cur_assembly)
visible_message("<b>\The [user]</b> removes \the [cur_assembly] from \the [src].")
visible_message(span_infoplain(span_bold("\The [user]") + " removes \the [cur_assembly] from \the [src]."))
cur_assembly = null
return
else
@@ -47,12 +47,12 @@
to_chat(user, span_warning("This console has not been assigned an ident tag. Please contact your system administrator or conduct a manual update with a standard multitool."))
return
var/dat = "<td><b>Gyrotron controller #[id_tag]</b>"
var/dat = "<td>" + span_bold("Gyrotron controller #[id_tag]")
dat = "<table><tr>"
dat += "<td><b>Mode</b></td>"
dat += "<td><b>Fire Delay</b></td>"
dat += "<td><b>Power</b></td>"
dat += "<td>" + span_bold("Mode") + "</td>"
dat += "<td>" + span_bold("Fire Delay") + "</td>"
dat += "<td>" + span_bold("Power") + "</td>"
dat += "</tr>"
for(var/obj/machinery/power/emitter/gyrotron/G in gyrotrons)
@@ -61,9 +61,9 @@
dat += "<tr>"
if(G.state != 2 || (G.stat & (NOPOWER | BROKEN))) //Error data not found.
dat += "<td><span style='color: red'>ERROR</span></td>"
dat += "<td><span style='color: red'>ERROR</span></td>"
dat += "<td><span style='color: red'>ERROR</span></td>"
dat += "<td>" + span_red("ERROR") + "</td>"
dat += "<td>" + span_red("ERROR") + "</td>"
dat += "<td>" + span_red("ERROR") + "</td>"
else
dat += "<td><a href='?src=\ref[src];machine=\ref[G];toggle=1'>[G.active ? "Emitting" : "Standing By"]</a></td>"
dat += "<td><a href='?src=\ref[src];machine=\ref[G];modifyrate=1'>[G.rate]</a></td>"
+1 -1
View File
@@ -117,7 +117,7 @@
user.machine = src
var/dat = text("<b>[name]</b><br>")
var/dat = text(span_bold("[name]") + "<br>")
if (active)
dat += text("Generator: <A href='?src=\ref[src];action=disable'>On</A><br>")
else
@@ -177,7 +177,7 @@
var/list/L = find_apcs()
var/total_apc_load = 0
if(L.len <= 0) // No APCs found.
out = "<b>No APCs located in connected powernet!</b>"
out = span_bold("No APCs located in connected powernet!")
else // APCs found. Create very ugly (but working!) HTML table.
out += "<table><tr><th>Name<th>EQUIP<th>LIGHT<th>ENVIRON<th>CELL<th>LOAD"
+1 -1
View File
@@ -30,7 +30,7 @@
for(var/obj/item/hand in handlist)
if(prob(current_size*5) && hand.w_class >= ((11-current_size)/2) && unEquip(hand))
step_towards(hand, S)
to_chat(src, "<span class = 'warning'>The [S] pulls \the [hand] from your grip!</span>")
to_chat(src, span_warning("The [S] pulls \the [hand] from your grip!"))
if(!lying && (!shoes || !(shoes.item_flags & NOSLIP)) && (!species || !(species.flags & NOSLIP)) && prob(current_size*5))
to_chat(src, span_danger("A strong gravitational force slams you to the ground!"))
+3 -3
View File
@@ -39,7 +39,7 @@
if(W.has_tool_quality(TOOL_SCREWDRIVER))
panel_open = !panel_open
playsound(src, W.usesound, 50, 1)
visible_message("<b>\The [user]</b> adjusts \the [src]'s mechanisms.")
visible_message(span_infoplain(span_bold("\The [user]") + " adjusts \the [src]'s mechanisms."))
if(panel_open && do_after(user, 30))
to_chat(user, span_notice("\The [src] looks like it could be modified."))
if(panel_open && do_after(user, 80 * W.toolspeed)) // We don't have skills, so a delayed hint for engineers will have to do for now. (Panel open check for sanity)
@@ -48,10 +48,10 @@
else
to_chat(user, span_notice("\The [src]'s mechanisms look secure."))
if(istype(W, /obj/item/smes_coil/super_io) && panel_open)
visible_message("<b>\The [user]</b> begins to modify \the [src] with \the [W].")
visible_message(span_infoplain(span_bold("\The [user]") + " begins to modify \the [src] with \the [W]."))
if(do_after(user, 300))
user.drop_from_inventory(W)
visible_message("<b>\The [user]</b> installs \the [W] onto \the [src].")
visible_message(span_infoplain(span_bold("\The [user]") + " installs \the [W] onto \the [src]."))
qdel(W)
var/turf/T = get_turf(src)
var/new_machine = /obj/machinery/particle_smasher
@@ -177,7 +177,7 @@
recipes = typesof(/datum/particle_smasher_recipe)
if(!target) // You are just blasting an empty machine.
visible_message("<b>\The [src]</b> shudders.")
visible_message(span_infoplain(span_bold("\The [src]") + " shudders."))
update_icon()
return
@@ -213,7 +213,7 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
if(chained)
overlays = "chain_s9"
if(growing)
visible_message(span_danger("<font size='2'>The singularity has grown out of control!</font>"))
visible_message(span_danger(span_normal("The singularity has grown out of control!")))
else
visible_message(span_warning("The singularity miraculously reduces in size and loses its supermatter properties."))
if(STAGE_SUPER)//SUPERSINGULO
@@ -230,10 +230,10 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
event_chance = 25 //Events will fire off more often.
if(chained)
overlays = "chain_s9"
visible_message(span_sinister("<font size='3'>You witness the creation of a destructive force that cannot possibly be stopped by human hands.</font>"))
visible_message(span_sinister(span_large("You witness the creation of a destructive force that cannot possibly be stopped by human hands.")))
if (current_size == allowed_size)
investigate_log("<font color='red'>grew to size [current_size].</font>", I_SINGULO)
investigate_log(span_red("grew to size [current_size]."), I_SINGULO)
return 1
else if (current_size < (--temp_allowed_size) && current_size != STAGE_SUPER)
expand(temp_allowed_size)
@@ -427,10 +427,10 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
if (istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(istype(H.glasses,/obj/item/clothing/glasses/meson) && current_size != STAGE_SUPER)
to_chat(H, "<span class=\"notice\">You look directly into The [src.name], good thing you had your protective eyewear on!</span>")
to_chat(H, span_notice("You look directly into The [src.name], good thing you had your protective eyewear on!"))
return
else
to_chat(H, "<span class=\"warning\">You look directly into The [src.name], but your eyewear does absolutely nothing to protect you from it!</span>")
to_chat(H, span_warning("You look directly into The [src.name], but your eyewear does absolutely nothing to protect you from it!"))
to_chat(M, span_danger("You look directly into The [src.name] and feel [current_size == STAGE_SUPER ? "helpless" : "weak"]."))
M.apply_effect(3, STUN)
for(var/mob/O in viewers(M, null))
@@ -445,11 +445,11 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
/obj/singularity/proc/smwave()
for(var/mob/living/M in view(10, src.loc))
if(prob(67))
to_chat(M, "<span class=\"warning\">You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.</span>")
to_chat(M, "<span class=\"notice\">Miraculously, it fails to kill you.</span>")
to_chat(M, span_warning("You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat."))
to_chat(M, span_notice("Miraculously, it fails to kill you."))
else
to_chat(M, "<span class=\"danger\">You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.</span>")
to_chat(M, "<span class=\"danger\">You don't even have a moment to react as you are reduced to ashes by the intense radiation.</span>")
to_chat(M, span_danger("You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat."))
to_chat(M, span_danger("You don't even have a moment to react as you are reduced to ashes by the intense radiation."))
M.dust()
SSradiation.radiate(src, rand(energy))
return
+16 -16
View File
@@ -47,7 +47,7 @@
/obj/machinery/power/supermatter
name = "Supermatter"
desc = "A strangely translucent and iridescent crystal. <span class='red'>You get headaches just from looking at it.</span>"
desc = "A strangely translucent and iridescent crystal. " + span_red("You get headaches just from looking at it.")
icon = 'icons/obj/supermatter.dmi'
icon_state = "darkmatter"
plane = MOB_PLANE // So people can walk behind the top part
@@ -424,9 +424,9 @@
/obj/machinery/power/supermatter/attack_hand(mob/user as mob)
var/datum/gender/TU = gender_datums[user.get_visible_gender()]
user.visible_message("<span class=\"warning\">\The [user] reaches out and touches \the [src], inducing a resonance... [TU.his] body starts to glow and bursts into flames before flashing into ash.</span>",\
"<span class=\"danger\">You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"</span>",\
"<span class=\"warning\">You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.</span>")
user.visible_message(span_warning("\The [user] reaches out and touches \the [src], inducing a resonance... [TU.his] body starts to glow and bursts into flames before flashing into ash."),\
span_danger("You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\""),\
span_warning("You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat."))
Consume(user)
@@ -457,9 +457,9 @@
/obj/machinery/power/supermatter/attackby(obj/item/W as obj, mob/living/user as mob)
user.visible_message("<span class=\"warning\">\The [user] touches \a [W] to \the [src] as a silence fills the room...</span>",\
"<span class=\"danger\">You touch \the [W] to \the [src] when everything suddenly goes silent.\"</span>\n<span class=\"notice\">\The [W] flashes into dust as you flinch away from \the [src].</span>",\
"<span class=\"warning\">Everything suddenly goes silent.</span>")
user.visible_message(span_warning("\The [user] touches \a [W] to \the [src] as a silence fills the room..."),\
span_danger("You touch \the [W] to \the [src] when everything suddenly goes silent.\"") + "\n" + span_notice("\The [W] flashes into dust as you flinch away from \the [src]."),\
span_warning("Everything suddenly goes silent."))
user.drop_from_inventory(W)
Consume(W)
@@ -473,12 +473,12 @@
if(istype(AM, /mob/living))
var/mob/living/M = AM
var/datum/gender/T = gender_datums[M.get_visible_gender()]
AM.visible_message("<span class=\"warning\">\The [AM] slams into \the [src] inducing a resonance... [T.his] body starts to glow and catch flame before flashing into ash.</span>",\
"<span class=\"danger\">You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"</span>",\
"<span class=\"warning\">You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.</span>")
AM.visible_message(span_warning("\The [AM] slams into \the [src] inducing a resonance... [T.his] body starts to glow and catch flame before flashing into ash."),\
span_danger("You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\""),\
span_warning("You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat."))
else if(!grav_pulling) //To prevent spam, detonating supermatter does not indicate non-mobs being destroyed
AM.visible_message("<span class=\"warning\">\The [AM] smacks into \the [src] and rapidly flashes to ash.</span>",\
"<span class=\"warning\">You hear a loud crack as you are washed with a wave of heat.</span>")
AM.visible_message(span_warning("\The [AM] smacks into \the [src] and rapidly flashes to ash."),\
span_warning("You hear a loud crack as you are washed with a wave of heat."))
Consume(AM)
@@ -495,10 +495,10 @@
//Some poor sod got eaten, go ahead and irradiate people nearby.
for(var/mob/living/l in range(10))
if(l in view())
l.show_message("<span class=\"warning\">As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.</span>", 1,\
"<span class=\"warning\">The unearthly ringing subsides and you notice you have new radiation burns.</span>", 2)
l.show_message(span_warning("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns."), 1,\
span_warning("The unearthly ringing subsides and you notice you have new radiation burns."), 2)
else
l.show_message("<span class=\"warning\">You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.</span>", 2)
l.show_message(span_warning("You hear an uneartly ringing and notice your skin is covered in fresh radiation burns."), 2)
var/rads = 500
SSradiation.radiate(src, rads)
@@ -514,7 +514,7 @@
/obj/machinery/power/supermatter/shard //Small subtype, less efficient and more sensitive, but less boom.
name = "Supermatter Shard"
desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. <span class='red'>You get headaches just from looking at it.</span>"
desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. " + span_red("You get headaches just from looking at it.")
icon_state = "darkmatter_shard"
base_icon_state = "darkmatter_shard"
+1 -1
View File
@@ -291,7 +291,7 @@
var/t = "<TT><B>Gas Turbine Generator</B><HR><PRE>"
t += "Generated power : [DisplayPower(lastgen)]<BR><BR>"
t += "Turbine: [round(compressor.rpm)] RPM<BR>"
t += "Starter: [ compressor.starter ? "<A href='?src=\ref[src];str=1'>Off</A> <B>On</B>" : "<B>Off</B> <A href='?src=\ref[src];str=1'>On</A>"]"
t += "Starter: [ compressor.starter ? "<A href='?src=\ref[src];str=1'>Off</A> " + span_bold("On") : span_bold("Off") + " <A href='?src=\ref[src];str=1'>On</A>"]"
t += "</PRE><HR><A href='?src=\ref[src];close=1'>Close</A>"
t += "</TT>"
var/datum/browser/popup = new(user, "turbine", name, 700, 500, src)