cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] refactors most spans (#9139)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
CHOMPStation2
2024-10-04 06:00:17 -07:00
committed by GitHub
parent 43ee646816
commit ab154b48b2
1511 changed files with 12497 additions and 12357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/modules/mining/abandonedcrates.dm
View File

@@ -152,7 +152,7 @@ vorestation edit end */
if(!locked)
return
to_chat(user, "<span class='notice'>The crate is locked with a Deca-code lock.</span>")
to_chat(user, span_notice("The crate is locked with a Deca-code lock."))
var/input = tgui_input_text(usr, "Enter [codelen] digits. All digits must be unique.", "Deca-Code Lock", "")
if(!Adjacent(user))
return
@@ -166,23 +166,23 @@ vorestation edit end */
sanitycheck = null //if a digit is repeated, reject the input
if(input == null || sanitycheck == null || length(input) != codelen)
to_chat(user, "<span class='notice'>You leave the crate alone.</span>")
to_chat(user, span_notice("You leave the crate alone."))
else if(check_input(input))
to_chat(user, "<span class='notice'>The crate unlocks!</span>")
to_chat(user, span_notice("The crate unlocks!"))
playsound(src, 'sound/machines/lockreset.ogg', 50, 1)
set_locked(0)
else
visible_message("<span class='warning'>A red light on \the [src]'s control panel flashes briefly.</span>")
visible_message(span_warning("A red light on \the [src]'s control panel flashes briefly."))
attempts--
if (attempts == 0)
to_chat(user, "<span class='danger'>The crate's anti-tamper system activates!</span>")
to_chat(user, span_danger("The crate's anti-tamper system activates!"))
var/turf/T = get_turf(src.loc)
explosion(T, 0, 0, 1, 2)
qdel(src)
/obj/structure/closet/crate/secure/loot/emag_act(var/remaining_charges, var/mob/user)
if (locked)
to_chat(user, "<span class='notice'>The crate unlocks!</span>")
to_chat(user, span_notice("The crate unlocks!"))
locked = 0
/obj/structure/closet/crate/secure/loot/proc/check_input(var/input)
@@ -200,11 +200,11 @@ vorestation edit end */
/obj/structure/closet/crate/secure/loot/attackby(obj/item/W as obj, mob/user as mob)
if(locked)
if (istype(W, /obj/item/multitool)) // Greetings Urist McProfessor, how about a nice game of cows and bulls?
to_chat(user, "<span class='notice'>DECA-CODE LOCK ANALYSIS:</span>")
to_chat(user, span_notice("DECA-CODE LOCK ANALYSIS:"))
if (attempts == 1)
to_chat(user, "<span class='warning'>* Anti-Tamper system will activate on the next failed access attempt.</span>")
to_chat(user, span_warning("* Anti-Tamper system will activate on the next failed access attempt."))
else
to_chat(user, "<span class='notice'>* Anti-Tamper system will activate after [src.attempts] failed access attempts.</span>")
to_chat(user, span_notice("* Anti-Tamper system will activate after [src.attempts] failed access attempts."))
if(lastattempt.len)
var/bulls = 0
var/cows = 0
@@ -219,6 +219,6 @@ vorestation edit end */
var/previousattempt = null //convert back to string for readback
for(var/i in 1 to codelen)
previousattempt = addtext(previousattempt, lastattempt[i])
to_chat(user, "<span class='notice'>Last code attempt, [previousattempt], had [bulls] correct digits at correct positions and [cows] correct digits at incorrect positions.</span>")
to_chat(user, span_notice("Last code attempt, [previousattempt], had [bulls] correct digits at correct positions and [cows] correct digits at incorrect positions."))
return
..()
..()

16
code/modules/mining/drilling/drill.dm
View File

@@ -227,7 +227,7 @@
var/newtag = text2num(sanitizeSafe(tgui_input_text(user, "Enter new ID number or leave empty to cancel.", "Assign ID number", null, 4), 4))
if(newtag)
name = "[initial(name)] #[newtag]"
to_chat(user, "<span class='notice'>You changed the drill ID to: [newtag]</span>")
to_chat(user, span_notice("You changed the drill ID to: [newtag]"))
else
name = "[initial(name)]"
to_chat(user, span_notice("You removed the drill's ID and any extraneous labels."))
@@ -284,9 +284,9 @@
else
visible_message("<b>\The [src]</b> shudders to a grinding halt.")
else
to_chat(user, "<span class='notice'>The drill is unpowered.</span>")
to_chat(user, span_notice("The drill is unpowered."))
else
to_chat(user, "<span class='notice'>Turning on a piece of industrial machinery without sufficient bracing or wires exposed is a bad idea.</span>")
to_chat(user, span_notice("Turning on a piece of industrial machinery without sufficient bracing or wires exposed is a bad idea."))
update_icon()
@@ -409,10 +409,10 @@
B.stored_ore[ore] += ore_amount // Add the ore to the machine.
stored_ore[ore] = 0 // Set the value of the ore in the satchel to 0.
current_capacity = 0 // Set the amount of ore in the drill to 0.
// to_chat(usr, "<span class='notice'>You unload the drill's storage cache into the ore box.</span>")
// to_chat(usr, span_notice("You unload the drill's storage cache into the ore box."))
balloon_alert(usr, "You onload the drill's storage cache into the ore box.") // CHOMPEdit - Changed to balloon alert
else
// to_chat(usr, "<span class='notice'>You must move an ore box up to the drill before you can unload it.</span>")
// to_chat(usr, span_notice("You must move an ore box up to the drill before you can unload it."))
balloon_alert(usr, "Move an ore box to the droll before unloading it.") // CHOMPEdit - Changed to balloon alert
@@ -441,7 +441,7 @@
/obj/machinery/mining/brace/attackby(obj/item/W as obj, mob/user as mob)
if(connected && connected.active)
// to_chat(user, "<span class='notice'>You can't work with the brace of a running drill!</span>")
// to_chat(user, span_notice("You can't work with the brace of a running drill!"))
balloon_alert(user, "You can't work with the brace of a running drill.") // CHOMPEdit - Changed to balloon alert
return
@@ -455,12 +455,12 @@
if(W.has_tool_quality(TOOL_WRENCH))
if(istype(get_turf(src), /turf/space))
// to_chat(user, "<span class='notice'>You can't anchor something to empty space. Idiot.</span>")
// to_chat(user, span_notice("You can't anchor something to empty space. Idiot."))
balloon_alert(user, "You can't anchor something to empty space. Idiot.") // CHOMPEdit - Changed to balloon alert
return
playsound(src, W.usesound, 100, 1)
// to_chat(user, "<span class='notice'>You [anchored ? "un" : ""]anchor the brace.</span>")
// to_chat(user, span_notice("You [anchored ? "un" : ""]anchor the brace."))
balloon_alert(user, "[anchored ? "Una" : "A"]nchored the brace") // CHOMPEdit - Changed to balloon alert
anchored = !anchored

4
code/modules/mining/drilling/scanner.dm
View File

@@ -11,7 +11,7 @@
var/exact = FALSE
/obj/item/mining_scanner/attack_self(mob/user as mob)
to_chat(user, "<span class='notice'>You begin sweeping \the [src] about, scanning for metal deposits.</span>")
to_chat(user, span_notice("You begin sweeping \the [src] about, scanning for metal deposits."))
playsound(src, 'sound/items/goggles_charge.ogg', 50, 1, -6)
if(!do_after(user, scan_time))
@@ -87,4 +87,4 @@
var/custom_range = tgui_input_list(usr, "Scanner Range","Pick a range to scan. ", list(0,1,2,3,4,5,6,7))
if(custom_range)
range = custom_range
to_chat(usr, "<span class='notice'>Scanner will now look up to [range] tile(s) away.</span>")
to_chat(usr, span_notice("Scanner will now look up to [range] tile(s) away."))

4
code/modules/mining/fulton.dm
View File

@@ -57,9 +57,9 @@ var/global/list/total_extraction_beacons = list()
return
if(A.anchored)
return
to_chat(user, "<span class='notice'>You start attaching the pack to [A]...</span>")
to_chat(user, span_notice("You start attaching the pack to [A]..."))
if(do_after(user,50,target=A))
to_chat(user, "<span class='notice'>You attach the pack to [A] and activate it.</span>")
to_chat(user, span_notice("You attach the pack to [A] and activate it."))
/* No components, sorry. No convienence for you!
if(loc == user && istype(user.back, /obj/item/storage/backpack))
var/obj/item/storage/backpack/B = user.back

18
code/modules/mining/kinetic_crusher.dm
View File

@@ -105,25 +105,25 @@
/obj/item/kinetic_crusher/examine(mob/living/user)
. = ..()
. += "<span class='notice'>Mark a[emagged ? "nything": " creature"] with the destabilizing force, then hit them in melee to do <b>[force + detonation_damage]</b> damage.</span>"
. += "<span class='notice'>Does <b>[force + detonation_damage + backstab_bonus]</b> damage if the target is backstabbed, instead of <b>[force + detonation_damage]</b>.</span>"
. += span_notice("Mark a[emagged ? "nything": " creature"] with the destabilizing force, then hit them in melee to do <b>[force + detonation_damage]</b> damage.")
. += span_notice("Does <b>[force + detonation_damage + backstab_bonus]</b> damage if the target is backstabbed, instead of <b>[force + detonation_damage]</b>.")
/*
for(var/t in trophies)
var/obj/item/crusher_trophy/T = t
. += "<span class='notice'>It has \a [T] attached, which causes [T.effect_desc()].</span>"
. += span_notice("It has \a [T] attached, which causes [T.effect_desc()].")
*/
/*
/obj/item/kinetic_crusher/attackby(obj/item/I, mob/living/user)
if(I.tool_behaviour == TOOL_CROWBAR)
if(LAZYLEN(trophies))
to_chat(user, "<span class='notice'>You remove [src]'s trophies.</span>")
to_chat(user, span_notice("You remove [src]'s trophies."))
I.play_tool_sound(src)
for(var/t in trophies)
var/obj/item/crusher_trophy/T = t
T.remove_from(src, user)
else
to_chat(user, "<span class='warning'>There are no trophies on [src].</span>")
to_chat(user, span_warning("There are no trophies on [src]."))
else if(istype(I, /obj/item/crusher_trophy))
var/obj/item/crusher_trophy/T = I
T.add_to(src, user)
@@ -133,7 +133,7 @@
/obj/item/kinetic_crusher/attack(mob/living/target, mob/living/carbon/user)
if(!wielded && requires_wield)
to_chat(user, "<span class='warning'>[src] is too heavy to use with one hand.</span>")
to_chat(user, span_warning("[src] is too heavy to use with one hand."))
return
..()
@@ -355,9 +355,9 @@
src.forceMove(storing_module)
storing_module.stored_gauntlets = src
user.visible_message(
"<span class='notice'>[user] retracts [src] with a click and a hiss.</span>",
"<span class='notice'>You retract [src] with a click and a hiss.</span>",
"<span class='notice'>You hear a click and a hiss.</span>"
span_notice("[user] retracts [src] with a click and a hiss."),
span_notice("You retract [src] with a click and a hiss."),
span_notice("You hear a click and a hiss.")
)
playsound(src, 'sound/items/helmetdeploy.ogg', 40, 1)
storing_module.active = FALSE

6
code/modules/mining/machinery/machine_processing.dm
View File

@@ -35,7 +35,7 @@
if(..())
return
if(!allowed(user))
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, span_warning("Access denied."))
return
tgui_interact(user)
@@ -128,7 +128,7 @@
inserted_id.mining_points += machine.points
machine.points = 0
else
to_chat(usr, "<span class='warning'>Required access not found.</span>")
to_chat(usr, span_warning("Required access not found."))
. = TRUE
if("insert")
var/obj/item/card/id/I = usr.get_active_hand()
@@ -137,7 +137,7 @@
I.forceMove(src)
inserted_id = I
else
to_chat(usr, "<span class='warning'>No valid ID.</span>")
to_chat(usr, span_warning("No valid ID."))
. = TRUE
if("speed_toggle")
machine.toggle_speed()

7
code/modules/mining/machinery/machine_stacking.dm
View File

@@ -21,7 +21,7 @@
machine.console = src
else
//Silently failing and causing mappers to scratch their heads while runtiming isn't ideal.
to_world("<span class='danger'>Warning: Stacking machine console at [src.x], [src.y], [src.z] could not find its machine!</span>")
to_world(span_danger("Warning: Stacking machine console at [src.x], [src.y], [src.z] could not find its machine!"))
qdel(src)
/obj/machinery/mineral/stacking_unit_console/attack_hand(mob/user)
@@ -37,7 +37,7 @@
/obj/machinery/mineral/stacking_unit_console/tgui_data(mob/user)
var/list/data = ..()
var/list/stacktypes = list()
for(var/stacktype in machine.stack_storage)
if(machine.stack_storage[stacktype] > 0)
@@ -136,8 +136,7 @@
var/stacktype = stack_paths[sheet]
new stacktype (get_turf(output), stack_amt)
stack_storage[sheet] -= stack_amt
if(console)
console.updateUsrDialog()
return

12
code/modules/mining/mine_outcrops.dm
View File

@@ -90,9 +90,9 @@
/obj/structure/outcrop/attackby(obj/item/W as obj, mob/user as mob)
if (istype(W, /obj/item/pickaxe))
to_chat(user, "<span class='notice'>[user] begins to hack away at \the [src].</span>")
to_chat(user, span_notice("[user] begins to hack away at \the [src]."))
if(do_after(user,40))
to_chat(user, "<span class='notice'>You have finished digging!</span>")
to_chat(user, span_notice("You have finished digging!"))
for(var/i=0;i<(rand(mindrop,upperdrop));i++)
new outcropdrop(get_turf(src))
qdel(src)
@@ -100,13 +100,13 @@
if (istype(W, /obj/item/melee/shock_maul))
var/obj/item/melee/shock_maul/S = W
if(!S.wielded || !S.status)
to_chat(user, "<span class='warning'>\The [W] must be wielded in two hands and powered on to be used to mine this!</span>") //CHOMPEdit - fix improper name
to_chat(user, span_warning("\The [S] must be wielded in two hands and powered on to be used to mine this!")) //CHOMPEdit
return
to_chat(user, "<span class='notice'>You pulverize \the [src]!</span>")
to_chat(user, span_notice("You pulverize \the [src]!"))
for(var/i=0;i<(rand(mindrop,upperdrop));i++)
new outcropdrop(get_turf(src))
playsound(src, 'sound/weapons/resonator_blast.ogg', 100, 1, -1)
user.visible_message("<span class='warning'>\The [S] discharges with a thunderous, hair-raising crackle!</span>")
user.visible_message(span_warning("\The [S] discharges with a thunderous, hair-raising crackle!"))
S.deductcharge()
S.status = 0
S.update_held_icon()
@@ -129,4 +129,4 @@
prob(30);/obj/structure/outcrop/phoron,
prob(7);/obj/structure/outcrop/diamond,
prob(15);/obj/structure/outcrop/platinum,
prob(15);/obj/structure/outcrop/lead)
prob(15);/obj/structure/outcrop/lead)

32
code/modules/mining/mine_turfs.dm
View File

@@ -362,7 +362,7 @@ var/list/mining_overlay_cache = list()
/turf/simulated/mineral/attackby(obj/item/W as obj, mob/user as mob)
if (!user.IsAdvancedToolUser())
to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
to_chat(user, span_warning("You don't have the dexterity to do this!"))
return
if(!density)
@@ -382,19 +382,19 @@ var/list/mining_overlay_cache = list()
if(valid_tool)
if (sand_dug)
to_chat(user, "<span class='warning'>This area has already been dug.</span>")
to_chat(user, span_warning("This area has already been dug."))
return
var/turf/T = user.loc
if (!(istype(T)))
return
to_chat(user, "<span class='notice'>You start digging.</span>")
to_chat(user, span_notice("You start digging."))
playsound(user, 'sound/effects/rustle1.ogg', 50, 1)
if(!do_after(user,digspeed)) return
to_chat(user, "<span class='notice'>You dug a hole.</span>")
to_chat(user, span_notice("You dug a hole."))
GetDrilled()
else if(istype(W,/obj/item/storage/bag/ore))
@@ -435,9 +435,9 @@ var/list/mining_overlay_cache = list()
if (istype(W, /obj/item/measuring_tape))
var/obj/item/measuring_tape/P = W
user.visible_message("<b>\The [user]</b> extends \a [P] towards \the [src].","<span class='notice'>You extend \the [P] towards \the [src].</span>")
user.visible_message("<b>\The [user]</b> extends \a [P] towards \the [src].",span_notice("You extend \the [P] towards \the [src]."))
if(do_after(user, 15))
to_chat(user, "<span class='notice'>\The [src] has been excavated to a depth of [excavation_level]cm.</span>")
to_chat(user, span_notice("\The [src] has been excavated to a depth of [excavation_level]cm."))
return
if(istype(W, /obj/item/xenoarch_multi_tool))
@@ -445,9 +445,9 @@ var/list/mining_overlay_cache = list()
if(C.mode) //Mode means scanning
C.depth_scanner.scan_atom(user, src)
else
user.visible_message("<b>\The [user]</b> extends \the [C] over \the [src], a flurry of red beams scanning \the [src]'s surface!", "<span class='notice'>You extend \the [C] over \the [src], a flurry of red beams scanning \the [src]'s surface!</span>")
user.visible_message("<b>\The [user]</b> extends \the [C] over \the [src], a flurry of red beams scanning \the [src]'s surface!", span_notice("You extend \the [C] over \the [src], a flurry of red beams scanning \the [src]'s surface!"))
if(do_after(user, 15))
to_chat(user, "<span class='notice'>\The [src] has been excavated to a depth of [excavation_level]cm.</span>")
to_chat(user, span_notice("\The [src] has been excavated to a depth of [excavation_level]cm."))
return
if (istype(W, /obj/item/melee/shock_maul))
@@ -456,7 +456,7 @@ var/list/mining_overlay_cache = list()
var/obj/item/melee/shock_maul/S = W
if(!S.wielded) //CHOMPEdit - slight maul buff
to_chat(user, "<span class='warning'>\The [W] must be wielded in two hands to be used for mining!</span>") //CHOMPEdit - fixed improper name
to_chat(user, span_warning("\The [W] must be wielded in two hands to be used for mining!")) //CHOMPEdit - fixed improper name
return
var/newDepth = excavation_level + S.excavation_amount // Used commonly below
@@ -469,9 +469,9 @@ var/list/mining_overlay_cache = list()
fail_message = ". <b>[pick("There is a crunching noise","[S] collides with some different rock","Part of the rock face crumbles away","Something breaks under [S]")]</b>"
wreckfinds(S.destroy_artefacts)
to_chat(user, "<span class='notice'>You smash through \the [src][fail_message].</span>")
to_chat(user, span_notice("You smash through \the [src][fail_message]."))
//CHOMPEdit start - Moved the maul sounds up here and made it not cost energy to mine
user.visible_message("<span class='warning'>\The [src] discharges with a thunderous, hair-raising crackle!</span>")
user.visible_message(span_warning("\The [src] discharges with a thunderous, hair-raising crackle!"))
playsound(src, 'sound/weapons/resonator_blast.ogg', 100, 1, -1)
if(newDepth >= 200) // This means the rock is mined out fully
@@ -512,7 +512,7 @@ var/list/mining_overlay_cache = list()
if(newDepth > F.excavation_required) // Digging too deep can break the item. At least you won't summon a Balrog (probably)
fail_message = ". <b>[pick("There is a crunching noise","[W] collides with some different rock","Part of the rock face crumbles away","Something breaks under [W]")]</b>"
wreckfinds(P.destroy_artefacts)
to_chat(user, "<span class='notice'>You start [P.drill_verb][fail_message].</span>")
to_chat(user, span_notice("You start [P.drill_verb][fail_message]."))
if(do_after(user,P.digspeed))
@@ -523,7 +523,7 @@ var/list/mining_overlay_cache = list()
else if(newDepth > F.excavation_required - F.clearance_range) // Not quite right but you still extract your find, the closer to the bottom the better, but not above 80%
excavate_find(prob(80 * (F.excavation_required - newDepth) / F.clearance_range), F)
to_chat(user, "<span class='notice'>You finish [P.drill_verb] \the [src].</span>")
to_chat(user, span_notice("You finish [P.drill_verb] \the [src]."))
if(newDepth >= 200) // This means the rock is mined out fully
if(P.destroy_artefacts)
@@ -654,7 +654,7 @@ var/list/mining_overlay_cache = list()
if(prob(50))
pain = 1
for(var/mob/living/M in range(src, 200))
to_chat(M, "<span class='danger'>[pick("A high-pitched [pick("keening","wailing","whistle")]","A rumbling noise like [pick("thunder","heavy machinery")]")] somehow penetrates your mind before fading away!</span>")
to_chat(M, span_danger("[pick("A high-pitched [pick("keening","wailing","whistle")]","A rumbling noise like [pick("thunder","heavy machinery")]")] somehow penetrates your mind before fading away!"))
if(pain)
flick("pain",M.pain)
if(prob(50))
@@ -667,7 +667,7 @@ var/list/mining_overlay_cache = list()
if(prob(25))
excavate_find(prob(5), finds[1])
else if(rand(1,500) == 1)
visible_message("<span class='notice'>An old dusty crate was buried within!</span>")
visible_message(span_notice("An old dusty crate was buried within!"))
new /obj/structure/closet/crate/secure/loot(src)
make_floor()
@@ -699,7 +699,7 @@ var/list/mining_overlay_cache = list()
var/obj/effect/suspension_field/S = locate() in src
if(!S)
if(X)
visible_message("<span class='danger'>\The [pick("[display_name] crumbles away into dust","[display_name] breaks apart")].</span>")
visible_message(span_danger("\The [pick("[display_name] crumbles away into dust","[display_name] breaks apart")]."))
qdel(X)
finds.Remove(F)

6
code/modules/mining/ore.dm
View File

@@ -43,7 +43,7 @@
..()
var/mob/living/carbon/human/H = hit_atom
if(istype(H) && H.has_eyes() && prob(85))
to_chat(H, "<span class='danger'>Some of \the [src] gets in your eyes!</span>")
to_chat(H, span_danger("Some of \the [src] gets in your eyes!"))
H.Blind(5)
H.eye_blurry += 10
spawn(1)
@@ -95,7 +95,7 @@
..()
var/mob/living/carbon/human/H = hit_atom
if(istype(H) && H.has_eyes() && prob(85))
to_chat(H, "<span class='danger'>Some of \the [src] gets in your eyes!</span>")
to_chat(H, span_danger("Some of \the [src] gets in your eyes!"))
H.Blind(10)
H.eye_blurry += 15
spawn(1)
@@ -215,4 +215,4 @@
. += "- [stored_ore[ore]] [ore]"
has_ore = 1
if(!has_ore)
. += "Nothing. You should contact a developer."
. += "Nothing. You should contact a developer."

8
code/modules/mining/ore_box.dm
View File

@@ -46,7 +46,7 @@
stored_ore[ore] += ore_amount // Add the ore to the machine.
S.stored_ore[ore] = 0 // Set the value of the ore in the satchel to 0.
S.current_capacity = 0 // Set the amount of ore in the satchel to 0.
to_chat(user, "<span class='notice'>You empty the satchel into the box.</span>")
to_chat(user, span_notice("You empty the satchel into the box."))
return
@@ -84,7 +84,7 @@
// set src in view(1)
//
// if(!ishuman(usr) && !isrobot(usr)) //Only living, intelligent creatures with gripping aparatti can empty ore boxes.
// to_chat(usr, "<span class='warning'>You are physically incapable of emptying the ore box.</span>")
// to_chat(usr, span_warning("You are physically incapable of emptying the ore box."))
// return
// if(usr.stat || usr.restrained())
// return
@@ -96,13 +96,13 @@
// add_fingerprint(usr)
//
// if(contents.len < 1)
// to_chat(usr, "<span class='warning'>The ore box is empty.</span>")
// to_chat(usr, span_warning("The ore box is empty."))
// return
//
// for (var/obj/item/ore/O in contents)
// contents -= O
// O.loc = src.loc
// to_chat(usr, "<span class='notice'>You empty the ore box.</span>")
// to_chat(usr, span_notice("You empty the ore box."))
//
// return

4
code/modules/mining/ore_redemption_machine/equipment_vendor.dm
View File

@@ -135,7 +135,7 @@
if(old_stat != stat)
update_icon()
if(inserted_id && !powered())
visible_message("<span class='notice'>The ID slot indicator light flickers on \the [src] as it spits out a card before powering down.</span>")
visible_message(span_notice("The ID slot indicator light flickers on \the [src] as it spits out a card before powering down."))
inserted_id.forceMove(get_turf(src))
/obj/machinery/mineral/equipment_vendor/update_icon()
@@ -237,7 +237,7 @@
return
var/datum/data/mining_equipment/prize = prize_list[category][name]
if(prize.cost > get_points(inserted_id)) // shouldn't be able to access this since the button is greyed out, but..
to_chat(usr, "<span class='danger'>You have insufficient points.</span>")
to_chat(usr, span_danger("You have insufficient points."))
flick(icon_deny, src) //VOREStation Add
return

8
code/modules/mining/ore_redemption_machine/mine_point_items.dm
View File

@@ -23,17 +23,17 @@
var/obj/item/card/id/C = I
if(mine_points)
C.mining_points += mine_points
to_chat(user, "<span class='info'>You transfer [mine_points] excavation points to [C].</span>")
to_chat(user, span_info("You transfer [mine_points] excavation points to [C]."))
mine_points = 0
else
to_chat(user, "<span class='info'>There's no excavation points left on [src].</span>")
to_chat(user, span_info("There's no excavation points left on [src]."))
if(survey_points)
C.survey_points += survey_points
to_chat(user, "<span class='info'>You transfer [survey_points] survey points to [C].</span>")
to_chat(user, span_info("You transfer [survey_points] survey points to [C]."))
survey_points = 0
else
to_chat(user, "<span class='info'>There's no survey points left on [src].</span>")
to_chat(user, span_info("There's no survey points left on [src]."))
..()

6
code/modules/mining/resonator.dm
View File

@@ -36,10 +36,10 @@
/obj/item/resonator/attack_self(mob/user)
if(burst_time == 50)
burst_time = 30
to_chat(user, "<span class='info'>You set the resonator's fields to detonate after 3 seconds.</span>")
to_chat(user, span_info("You set the resonator's fields to detonate after 3 seconds."))
else
burst_time = 50
to_chat(user, "<span class='info'>You set the resonator's fields to detonate after 5 seconds.</span>")
to_chat(user, span_info("You set the resonator's fields to detonate after 5 seconds."))
/obj/item/resonator/afterattack(atom/target, mob/user, proximity_flag)
if(proximity_flag)
@@ -88,7 +88,7 @@
for(var/mob/living/L in src.loc)
if(creator)
add_attack_logs(creator, L, "used a resonator field on")
to_chat(L, "<span class='danger'>\The [src] ruptured with you in it!</span>")
to_chat(L, span_danger("\The [src] ruptured with you in it!"))
L.apply_damage(resonance_damage, BRUTE)
qdel(src)

6
code/modules/mining/resonator_vr.dm
View File

@@ -94,10 +94,10 @@
if("Resonance Time")
if(burst_time == 50)
burst_time = 30
to_chat(user, "<span class='info'>You set the resonator's fields to detonate after 3 seconds.</span>")
to_chat(user, span_info("You set the resonator's fields to detonate after 3 seconds."))
else
burst_time = 50
to_chat(user, "<span class='info'>You set the resonator's fields to detonate after 5 seconds.</span>")
to_chat(user, span_info("You set the resonator's fields to detonate after 5 seconds."))
if("Toggle Cascade")
spreadmode = !spreadmode
to_chat(user, span_info("You have [(spreadmode ? "enabled" : "disabled")] the resonance cascade mode."))
@@ -152,7 +152,7 @@
for(var/mob/living/L in src.loc)
if(creator)
add_attack_logs(creator, L, "used a resonator field on")
to_chat(L, "<span class='danger'>\The [src] ruptured with you in it!</span>")
to_chat(L, span_danger("\The [src] ruptured with you in it!"))
L.apply_damage(resonance_damage, BRUTE)
qdel(src)

20
code/modules/mining/shelter_atoms_vr.dm
View File

@@ -46,7 +46,7 @@ GLOBAL_LIST_EMPTY(unique_deployable)
//Can't grab when capsule is New() because templates aren't loaded then
get_template()
if(!used)
loc.visible_message("<span class='warning'>\The [src] begins to shake. Stand back!</span>")
loc.visible_message(span_warning("\The [src] begins to shake. Stand back!"))
used = TRUE
sleep(5 SECONDS)
@@ -58,16 +58,16 @@ GLOBAL_LIST_EMPTY(unique_deployable)
switch(status)
//Not allowed due to /area technical reasons
if(SHELTER_DEPLOY_BAD_AREA)
src.loc.visible_message("<span class='warning'>\The [src] will not function in this area.</span>")
src.loc.visible_message(span_warning("\The [src] will not function in this area."))
//Anchored objects or no space
if(SHELTER_DEPLOY_BAD_TURFS, SHELTER_DEPLOY_ANCHORED_OBJECTS)
var/width = template.width
var/height = template.height
src.loc.visible_message("<span class='warning'>\The [src] doesn't have room to deploy! You need to clear a [width]x[height] area!</span>")
src.loc.visible_message(span_warning("\The [src] doesn't have room to deploy! You need to clear a [width]x[height] area!"))
if(SHELTER_DEPLOY_SHIP_SPACE)
src.loc.visible_message("<span class='warning'>\The [src] can only be deployed in space.</span>")
src.loc.visible_message(span_warning("\The [src] can only be deployed in space."))
if(status != SHELTER_DEPLOY_ALLOWED)
used = FALSE
@@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(unique_deployable)
if(unique_id)
if(unique_id in GLOB.unique_deployable)
loc.visible_message("<span class='warning'>There can only be one [src] deployed at a time.</span>")
loc.visible_message(span_warning("There can only be one [src] deployed at a time."))
used = FALSE
return
GLOB.unique_deployable += unique_id
@@ -210,7 +210,7 @@ GLOBAL_LIST_EMPTY(unique_deployable)
..()
/obj/structure/table/survival_pod/dismantle(obj/item/tool/wrench/W, mob/user)
to_chat(user, "<span class='warning'>You cannot dismantle \the [src].</span>")
to_chat(user, span_warning("You cannot dismantle \the [src]."))
return
//Sleeper
@@ -237,8 +237,8 @@ GLOBAL_LIST_EMPTY(unique_deployable)
/obj/item/gps/computer/attackby(obj/item/I, mob/living/user)
if(I.has_tool_quality(TOOL_WRENCH))
user.visible_message("<span class='warning'>[user] disassembles [src].</span>",
"<span class='notice'>You start to disassemble [src]...</span>", "You hear clanking and banging noises.")
user.visible_message(span_warning("[user] disassembles [src]."),
span_notice("You start to disassemble [src]..."), "You hear clanking and banging noises.")
if(do_after(user,4 SECONDS,src))
new /obj/item/gps(loc)
qdel(src)
@@ -313,8 +313,8 @@ GLOBAL_LIST_EMPTY(unique_deployable)
/obj/structure/fans/attackby(obj/item/I, mob/living/user)
if(I.has_tool_quality(TOOL_WRENCH))
user.visible_message("<span class='warning'>[user] disassembles [src].</span>",
"<span class='notice'>You start to disassemble [src]...</span>", "You hear clanking and banging noises.")
user.visible_message(span_warning("[user] disassembles [src]."),
span_notice("You start to disassemble [src]..."), "You hear clanking and banging noises.")
if(do_after(user,4 SECONDS,src))
deconstruct()
return TRUE

2
code/modules/mining/shelters_vr.dm
View File

@@ -43,7 +43,7 @@
for(var/obj/structure/flora/AM in T)
++deleted_atoms
qdel(AM)
admin_notice("<span class='danger'>Annihilated [deleted_atoms] plants.</span>", R_DEBUG)
admin_notice(span_danger("Annihilated [deleted_atoms] plants."), R_DEBUG)
/datum/map_template/shelter/proc/update_lighting(turf/deploy_location)
var/affected = get_affected_turfs(deploy_location, centered=TRUE)