cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactors most spans into span procs (#59645)

Browse Source 
Converts most spans into span procs. Mostly used regex for this and sorted out any compile time errors afterwards so there could be some bugs.
Was initially going to do defines, but ninja said to make it into a proc, and if there's any overhead, they can easily be changed to defines.

Makes it easier to control the formatting and prevents typos when creating spans as it'll runtime if you misspell instead of silently failing.
Reduces the code you need to write when writing spans, as you don't need to close the span as that's automatically handled by the proc.

(Note from Lemon: This should be converted to defines once we update the minimum version to 514. Didn't do it now because byond pain and such)
This commit is contained in:
Watermelon914
2021-06-14 13:03:53 -07:00
committed by GitHub
parent b9982f6970
commit 375a20e49b
1676 changed files with 15455 additions and 15226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/training_machine.dm
+16 -16
View File
@@ -83,7 +83,7 @@
if(.)
return
if (moving && obj_flags & EMAGGED)
visible_message("<span class='warning'>The [src]'s control panel fizzles slightly.</span>")
visible_message(span_warning("The [src]'s control panel fizzles slightly."))
return
switch(action)
if("toggle")
@@ -113,10 +113,10 @@
if (!istype(target, /obj/item/training_toolbox) && !istype(target, /obj/item/target))
return ..()
if (obj_flags & EMAGGED)
to_chat(user, "<span class='warning'>The toolbox is somehow stuck on! It won't budge!</span>")
to_chat(user, span_warning("The toolbox is somehow stuck on! It won't budge!"))
return
attach_item(target)
to_chat(user, "<span class='notice'>You attach \the [attached_item] to the training device.</span>")
to_chat(user, span_notice("You attach \the [attached_item] to the training device."))
playsound(src, "rustle", 50, TRUE)
/**
@@ -183,9 +183,9 @@
if (!attached_item)
return
if (obj_flags & EMAGGED)
to_chat(user, "<span class='warning'>The toolbox is somehow stuck on! It won't budge!</span>")
to_chat(user, span_warning("The toolbox is somehow stuck on! It won't budge!"))
return
to_chat(user, "<span class='notice'>You remove \the [attached_item] from the training device.</span>")
to_chat(user, span_notice("You remove \the [attached_item] from the training device."))
remove_attached_item(user)
playsound(src, "rustle", 50, TRUE)
@@ -320,7 +320,7 @@
obj_flags |= EMAGGED
remove_attached_item(throwing = TRUE) //Toss out the old attached item!
attach_item(new /obj/item/storage/toolbox/syndicate(src))
to_chat(user, "<span class='warning'>You override the training machine's safety protocols, and activate its realistic combat feature. A toolbox pops out of a slot on the top.</span>")
to_chat(user, span_warning("You override the training machine's safety protocols, and activate its realistic combat feature. A toolbox pops out of a slot on the top."))
playsound(src, 'sound/machines/click.ogg', 50, TRUE)
add_overlay("evil_trainer")
@@ -328,12 +328,12 @@
. = ..()
var/has_buckled_mob = has_buckled_mobs()
if(has_buckled_mob)
. += "<span class='notice'><b>Alt-Click to unbuckle \the [buckled_mobs[1]]</b></span>"
. += span_notice("<b>Alt-Click to unbuckle \the [buckled_mobs[1]]</b>")
if (obj_flags & EMAGGED)
. += "<span class='warning'>It has a dangerous-looking toolbox attached to it, and the control panel is smoking sightly...</span>"
. += span_warning("It has a dangerous-looking toolbox attached to it, and the control panel is smoking sightly...")
else if (!has_buckled_mob && attached_item) //Can't removed the syndicate toolbox!
. += "<span class='notice'><b>Alt-Click to remove \the [attached_item]</b></span>"
. += "<span class='notice'><b>Click to open control interface.</b></span>"
. += span_notice("<b>Alt-Click to remove \the [attached_item]</b>")
. += span_notice("<b>Click to open control interface.</b>")
/**
* Device that simply counts the number of times you've hit a mob or target with. Looks like a toolbox but isn't.
@@ -396,19 +396,19 @@
/obj/item/training_toolbox/AltClick(mob/user)
. = ..()
to_chat(user, "<span class='notice'>You push the 'Lap' button on the toolbox's display.</span>")
to_chat(user, span_notice("You push the 'Lap' button on the toolbox's display."))
lap_hits = initial(lap_hits)
/obj/item/training_toolbox/examine(mob/user)
. = ..()
if(!in_range(src, user) && !isobserver(user))
. += "<span class='notice'>You can see a display on the back. You'll need to get closer to read it, though.</span>"
. += span_notice("You can see a display on the back. You'll need to get closer to read it, though.")
return
. += "<span class='notice'>A display on the back reads:</span>"
. += "<span class='notice'>Total Hits: <b>[total_hits]</b></span>"
. += span_notice("A display on the back reads:")
. += span_notice("Total Hits: <b>[total_hits]</b>")
if (lap_hits != total_hits)
. += "<span class='notice'>Current Lap: <b>[lap_hits]</b></span>"
. += "<span class='notice'><b>Alt-Click to 'Lap' the hit counter.</b></span>"
. += span_notice("Current Lap: <b>[lap_hits]</b>")
. += span_notice("<b>Alt-Click to 'Lap' the hit counter.</b>")
#undef MIN_RANGE
#undef MIN_SPEED