cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-13 16:13:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactors most spans

Browse Source
This commit is contained in:
Kashargul
2024-10-02 21:10:31 +02:00
parent 5417c7772c
commit a2c673ab7a
1517 changed files with 12436 additions and 12347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm
+4 -4
View File
@@ -134,7 +134,7 @@
if(try_load_materials(user, W))
return
else
to_chat(user, "<span class='notice'>You cannot insert this item into \the [src]!</span>")
to_chat(user, span_notice("You cannot insert this item into \the [src]!"))
return
/obj/machinery/atmospherics/binary/algae_farm/attack_hand(mob/user)
@@ -249,7 +249,7 @@
if(!istype(S))
return 0
if(!(S.material.name in stored_material))
to_chat(user, "<span class='warning'>\The [src] doesn't accept [material_display_name(S.material)]!</span>")
to_chat(user, span_warning("\The [src] doesn't accept [material_display_name(S.material)]!"))
return 1
var/max_res_amount = storage_capacity[S.material.name]
if(stored_material[S.material.name] + S.perunit <= max_res_amount)
@@ -258,10 +258,10 @@
stored_material[S.material.name] += S.perunit
S.use(1)
count++
user.visible_message("\The [user] inserts [S.name] into \the [src].", "<span class='notice'>You insert [count] [S.name] into \the [src].</span>")
user.visible_message("\The [user] inserts [S.name] into \the [src].", span_notice("You insert [count] [S.name] into \the [src]."))
updateUsrDialog()
else
to_chat(user, "<span class='warning'>\The [src] cannot hold more [S.name].</span>")
to_chat(user, span_warning("\The [src] cannot hold more [S.name]."))
return 1
/datum/material/algae
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+5 -5
View File
@@ -208,7 +208,7 @@
return
add_fingerprint(usr)
if(!allowed(user))
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, span_warning("Access denied."))
return
tgui_interact(user)
@@ -282,18 +282,18 @@
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
if (unlocked)
to_chat(user, "<span class='warning'>You cannot unwrench \the [src], turn it off first.</span>")
to_chat(user, span_warning("You cannot unwrench \the [src], turn it off first."))
return 1
if(!can_unwrench())
to_chat(user, "<span class='warning'>You cannot unwrench \the [src], it too exerted due to internal pressure.</span>")
to_chat(user, span_warning("You cannot unwrench \the [src], it too exerted due to internal pressure."))
add_fingerprint(user)
return 1
playsound(src, W.usesound, 50, 1)
to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
to_chat(user, span_notice("You begin to unfasten \the [src]..."))
if (do_after(user, 40 * W.toolspeed))
user.visible_message( \
"<b>\The [user]</b> unfastens \the [src].", \
"<span class='notice'>You have unfastened \the [src].</span>", \
span_notice("You have unfastened \the [src]."), \
"You hear ratchet.")
deconstruct()
code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm
+3 -3
View File
@@ -85,7 +85,7 @@
if(W.has_tool_quality(TOOL_WRENCH))
anchored = !anchored
playsound(src, W.usesound, 50, 1)
to_chat(user, "<span class='notice'>You [anchored ? "secure" : "unsecure"] the bolts holding \the [src] to the floor.</span>")
to_chat(user, span_notice("You [anchored ? "secure" : "unsecure"] the bolts holding \the [src] to the floor."))
if(anchored)
if(dir & (NORTH|SOUTH))
@@ -260,7 +260,7 @@
anchored = !anchored
playsound(src, W.usesound, 50, 1)
turbine = null
to_chat(user, "<span class='notice'>You [anchored ? "secure" : "unsecure"] the bolts holding \the [src] to the floor.</span>")
to_chat(user, span_notice("You [anchored ? "secure" : "unsecure"] the bolts holding \the [src] to the floor."))
updateConnection()
else
..()
@@ -283,4 +283,4 @@
if (usr.stat || usr.restrained() || anchored)
return
src.set_dir(turn(src.dir, 90))
src.set_dir(turn(src.dir, 90))
code/ATMOSPHERICS/components/binary_devices/pump.dm
+5 -5
View File
@@ -205,7 +205,7 @@ Thus, the two variables affect pump operation are set in New():
return
add_fingerprint(usr)
if(!allowed(user))
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, span_warning("Access denied."))
return
tgui_interact(user)
@@ -242,17 +242,17 @@ Thus, the two variables affect pump operation are set in New():
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
if (!(stat & NOPOWER) && use_power)
to_chat(user, "<span class='warning'>You cannot unwrench this [src], turn it off first.</span>")
to_chat(user, span_warning("You cannot unwrench this [src], turn it off first."))
return 1
if(!can_unwrench())
to_chat(user, "<span class='warning'>You cannot unwrench this [src], it too exerted due to internal pressure.</span>")
to_chat(user, span_warning("You cannot unwrench this [src], it too exerted due to internal pressure."))
add_fingerprint(user)
return 1
playsound(src, W.usesound, 50, 1)
to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
to_chat(user, span_notice("You begin to unfasten \the [src]..."))
if (do_after(user, 40 * W.toolspeed))
user.visible_message( \
"<b>\The [user]</b> unfastens \the [src].", \
"<span class='notice'>You have unfastened \the [src].</span>", \
span_notice("You have unfastened \the [src]."), \
"You hear ratchet.")
deconstruct()
code/ATMOSPHERICS/components/omni_devices/omni_base.dm
+3 -3
View File
@@ -84,15 +84,15 @@
return ..()
if(!can_unwrench())
to_chat(user, "<span class='warning'>You cannot unwrench \the [src], it is too exerted due to internal pressure.</span>")
to_chat(user, span_warning("You cannot unwrench \the [src], it is too exerted due to internal pressure."))
add_fingerprint(user)
return 1
to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
to_chat(user, span_notice("You begin to unfasten \the [src]..."))
playsound(src, W.usesound, 50, 1)
if(do_after(user, 40 * W.toolspeed))
user.visible_message( \
"<b>\The [user]</b> unfastens \the [src].", \
"<span class='notice'>You have unfastened \the [src].</span>", \
span_notice("You have unfastened \the [src]."), \
"You hear a ratchet.")
deconstruct()
code/ATMOSPHERICS/components/portables_connector.dm
+4 -4
View File
@@ -150,19 +150,19 @@
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
if (connected_device)
to_chat(user, "<span class='warning'>You cannot unwrench \the [src], dettach \the [connected_device] first.</span>")
to_chat(user, span_warning("You cannot unwrench \the [src], dettach \the [connected_device] first."))
return 1
if (locate(/obj/machinery/portable_atmospherics, src.loc))
return 1
if(!can_unwrench())
to_chat(user, "<span class='warning'>You cannot unwrench \the [src], it too exerted due to internal pressure.</span>")
to_chat(user, span_warning("You cannot unwrench \the [src], it too exerted due to internal pressure."))
add_fingerprint(user)
return 1
playsound(src, W.usesound, 50, 1)
to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
to_chat(user, span_notice("You begin to unfasten \the [src]..."))
if (do_after(user, 40 * W.toolspeed))
user.visible_message( \
"<b>\The [user]</b> unfastens \the [src].", \
"<span class='notice'>You have unfastened \the [src].</span>", \
span_notice("You have unfastened \the [src]."), \
"You hear a ratchet.")
deconstruct()
code/ATMOSPHERICS/components/trinary_devices/filter.dm
+2 -2
View File
@@ -116,7 +116,7 @@
return
if(!src.allowed(user))
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, span_warning("Access denied."))
return
tgui_interact(user)
@@ -157,7 +157,7 @@
// user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmos_filter")
// onclose(user, "atmos_filter")
/obj/machinery/atmospherics/trinary/atmos_filter/tgui_interact(mob/user, datum/tgui/ui)
code/ATMOSPHERICS/components/trinary_devices/mixer.dm
+1 -1
View File
@@ -101,7 +101,7 @@
tgui_interact(user)
// src.add_fingerprint(usr)
// if(!src.allowed(user))
// to_chat(user, "<span class='warning'>Access denied.</span>")
// to_chat(user, span_warning("Access denied."))
// return
// usr.set_machine(src)
// var/list/node_connects = get_node_connect_dirs()
code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
+3 -3
View File
@@ -55,15 +55,15 @@
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
if(!can_unwrench())
to_chat(user, "<span class='warning'>You cannot unwrench \the [src], it too exerted due to internal pressure.</span>")
to_chat(user, span_warning("You cannot unwrench \the [src], it too exerted due to internal pressure."))
add_fingerprint(user)
return 1
playsound(src, W.usesound, 50, 1)
to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
to_chat(user, span_notice("You begin to unfasten \the [src]..."))
if (do_after(user, 40 * W.toolspeed))
user.visible_message( \
"<b>\The [user]</b> unfastens \the [src].", \
"<span class='notice'>You have unfastened \the [src].</span>", \
span_notice("You have unfastened \the [src]."), \
"You hear a ratchet.")
deconstruct()
code/ATMOSPHERICS/components/tvalve.dm
+4 -4
View File
@@ -288,7 +288,7 @@
if(!powered())
return
if(!src.allowed(user))
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, span_warning("Access denied."))
return
..()
@@ -330,15 +330,15 @@
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
if(!can_unwrench())
to_chat(user, "<span class='warnng'>You cannot unwrench \the [src], it too exerted due to internal pressure.</span>")
to_chat(user, span_warning("You cannot unwrench \the [src], it too exerted due to internal pressure."))
add_fingerprint(user)
return 1
playsound(src, W.usesound, 50, 1)
to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
to_chat(user, span_notice("You begin to unfasten \the [src]..."))
if (do_after(user, 40 * W.toolspeed))
user.visible_message( \
"<b>\The [user]</b> unfastens \the [src].", \
"<span class='notice'>You have unfastened \the [src].</span>", \
span_notice("You have unfastened \the [src]."), \
"You hear a ratchet.")
deconstruct()
code/ATMOSPHERICS/components/unary/heat_exchanger.dm
+4 -4
View File
@@ -71,17 +71,17 @@
return ..()
var/turf/T = src.loc
if (level==1 && isturf(T) && !T.is_plating())
to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
to_chat(user, span_warning("You must remove the plating first."))
return 1
if (!can_unwrench())
to_chat(user, "<span class='warning'>You cannot unwrench \the [src], it is too exerted due to internal pressure.</span>")
to_chat(user, span_warning("You cannot unwrench \the [src], it is too exerted due to internal pressure."))
add_fingerprint(user)
return 1
playsound(src, W.usesound, 50, 1)
to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
to_chat(user, span_notice("You begin to unfasten \the [src]..."))
if (do_after(user, 40 * W.toolspeed))
user.visible_message( \
"<b>\The [user]</b> unfastens \the [src].", \
"<span class='notice'>You have unfastened \the [src].</span>", \
span_notice("You have unfastened \the [src]."), \
"You hear a ratchet.")
deconstruct()
code/ATMOSPHERICS/components/unary/outlet_injector.dm
+3 -3
View File
@@ -158,7 +158,7 @@
update_underlays()
/obj/machinery/atmospherics/unary/outlet_injector/attack_hand(mob/user as mob)
to_chat(user, "<span class='notice'>You toggle \the [src].</span>")
to_chat(user, span_notice("You toggle \the [src]."))
injecting = !injecting
update_use_power(injecting ? USE_POWER_IDLE : USE_POWER_OFF)
update_icon()
@@ -168,10 +168,10 @@
return ..()
playsound(src, W.usesound, 50, 1)
to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
to_chat(user, span_notice("You begin to unfasten \the [src]..."))
if (do_after(user, 40 * W.toolspeed))
user.visible_message( \
"<b>\The [user]</b> unfastens \the [src].", \
"<span class='notice'>You have unfastened \the [src].</span>", \
span_notice("You have unfastened \the [src]."), \
"You hear a ratchet.")
deconstruct()
code/ATMOSPHERICS/components/unary/unary_base.dm
+2 -2
View File
@@ -106,11 +106,11 @@
for(var/obj/machinery/atmospherics/M in loc)
if(M == src) continue
if((M.pipe_flags & pipe_flags & PIPING_ONE_PER_TURF)) //Only one dense/requires density object per tile, eg connectors/cryo/heater/coolers.
visible_message("<span class='warning'>\The [src]'s cannot be connected, something is hogging the tile!</span>")
visible_message(span_warning("\The [src]'s cannot be connected, something is hogging the tile!"))
return TRUE
if((M.piping_layer != piping_layer) && !((M.pipe_flags | flags) & PIPING_ALL_LAYER)) // Pipes on different layers can't block each other unless they are ALL_LAYER
continue
if(M.get_init_dirs() & get_init_dirs()) // matches at least one direction on either type of pipe
visible_message("<span class='warning'>\The [src]'s connector can't be connected, there is already a pipe at that location!</span>")
visible_message(span_warning("\The [src]'s connector can't be connected, there is already a pipe at that location!"))
return TRUE
return FALSE
code/ATMOSPHERICS/components/unary/vent_pump.dm
+10 -10
View File
@@ -393,22 +393,22 @@
if(W.has_tool_quality(TOOL_WELDER))
var/obj/item/weldingtool/WT = W.get_welder()
if (WT.remove_fuel(0,user))
to_chat(user, "<span class='notice'>Now welding the vent.</span>")
to_chat(user, span_notice("Now welding the vent."))
if(do_after(user, 20 * WT.toolspeed))
if(!src || !WT.isOn()) return
playsound(src, WT.usesound, 50, 1)
if(!welded)
user.visible_message("<b>\The [user]</b> welds the vent shut.", "<span class='notice'>You weld the vent shut.</span>", "You hear welding.")
user.visible_message("<b>\The [user]</b> welds the vent shut.", span_notice("You weld the vent shut."), "You hear welding.")
welded = 1
update_icon()
else
user.visible_message("<span class='notice'>[user] unwelds the vent.</span>", "<span class='notice'>You unweld the vent.</span>", "You hear welding.")
user.visible_message(span_notice("[user] unwelds the vent."), span_notice("You unweld the vent."), "You hear welding.")
welded = 0
update_icon()
else
to_chat(user, "<span class='notice'>The welding tool needs to be on to start this task.</span>")
to_chat(user, span_notice("The welding tool needs to be on to start this task."))
else
to_chat(user, "<span class='warning'>You need more welding fuel to complete this task.</span>")
to_chat(user, span_warning("You need more welding fuel to complete this task."))
return 1
else
..()
@@ -432,22 +432,22 @@
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
if (!(stat & NOPOWER) && use_power)
to_chat(user, "<span class='warning'>You cannot unwrench \the [src], turn it off first.</span>")
to_chat(user, span_warning("You cannot unwrench \the [src], turn it off first."))
return 1
var/turf/T = src.loc
if (node && node.level==1 && isturf(T) && !T.is_plating())
to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
to_chat(user, span_warning("You must remove the plating first."))
return 1
if(!can_unwrench())
to_chat(user, "<span class='warning'>You cannot unwrench \the [src], it is too exerted due to internal pressure.</span>")
to_chat(user, span_warning("You cannot unwrench \the [src], it is too exerted due to internal pressure."))
add_fingerprint(user)
return 1
playsound(src, W.usesound, 50, 1)
to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
to_chat(user, span_notice("You begin to unfasten \the [src]..."))
if (do_after(user, 40 * W.toolspeed))
user.visible_message( \
"<b>\The [user]</b> unfastens \the [src].", \
"<span class='notice'>You have unfastened \the [src].</span>", \
span_notice("You have unfastened \the [src]."), \
"You hear a ratchet.")
deconstruct()
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+5 -5
View File
@@ -273,22 +273,22 @@
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
if (!(stat & NOPOWER) && use_power)
to_chat(user, "<span class='warning'>You cannot unwrench \the [src], turn it off first.</span>")
to_chat(user, span_warning("You cannot unwrench \the [src], turn it off first."))
return 1
var/turf/T = src.loc
if (node && node.level==1 && isturf(T) && !T.is_plating())
to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
to_chat(user, span_warning("You must remove the plating first."))
return 1
if(!can_unwrench())
to_chat(user, "<span class='warning'>You cannot unwrench \the [src], it is too exerted due to internal pressure.</span>")
to_chat(user, span_warning("You cannot unwrench \the [src], it is too exerted due to internal pressure."))
add_fingerprint(user)
return 1
playsound(src, W.usesound, 50, 1)
to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
to_chat(user, span_notice("You begin to unfasten \the [src]..."))
if (do_after(user, 40 * W.toolspeed))
user.visible_message( \
"<b>\The [user]</b> unfastens \the [src].", \
"<span class='notice'>You have unfastened \the [src].</span>", \
span_notice("You have unfastened \the [src]."), \
"You hear a ratchet.")
deconstruct()
code/ATMOSPHERICS/components/valve.dm
+5 -5
View File
@@ -238,7 +238,7 @@
if(!powered())
return
if(!src.allowed(user))
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, span_warning("Access denied."))
return
..()
@@ -291,18 +291,18 @@
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
if (istype(src, /obj/machinery/atmospherics/valve/digital) && !src.allowed(user))
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, span_warning("Access denied."))
return 1
if(!can_unwrench())
to_chat(user, "<span class='warning'>You cannot unwrench \the [src], it is too exerted due to internal pressure.</span>")
to_chat(user, span_warning("You cannot unwrench \the [src], it is too exerted due to internal pressure."))
add_fingerprint(user)
return 1
playsound(src, W.usesound, 50, 1)
to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
to_chat(user, span_notice("You begin to unfasten \the [src]..."))
if (do_after(user, 40 * W.toolspeed))
user.visible_message( \
"<b>\The [user]</b> unfastens \the [src].", \
"<span class='notice'>You have unfastened \the [src].</span>", \
span_notice("You have unfastened \the [src]."), \
"You hear a ratchet.")
deconstruct()
code/ATMOSPHERICS/mainspipe.dm
+1 -1
View File
@@ -650,7 +650,7 @@ obj/machinery/atmospherics/mains_pipe/valve
attack_hand(mob/user as mob)
if(!src.allowed(user))
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, span_warning("Access denied."))
return
..()
code/ATMOSPHERICS/pipes/pipe_base.dm
+4 -4
View File
@@ -120,18 +120,18 @@
return ..()
var/turf/T = src.loc
if (level==1 && isturf(T) && !T.is_plating())
to_chat(user, "<span class='warning'>You must remove the plating first.</span>")
to_chat(user, span_warning("You must remove the plating first."))
return 1
if(!can_unwrench())
to_chat(user, "<span class='warning'>You cannot unwrench \the [src], it is too exerted due to internal pressure.</span>")
to_chat(user, span_warning("You cannot unwrench \the [src], it is too exerted due to internal pressure."))
add_fingerprint(user)
return 1
playsound(src, W.usesound, 50, 1)
to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
to_chat(user, span_notice("You begin to unfasten \the [src]..."))
if (do_after(user, 10 * W.toolspeed))
user.visible_message( \
"<b>\The [user]</b> unfastens \the [src].", \
"<span class='notice'>You have unfastened \the [src].</span>", \
span_notice("You have unfastened \the [src]."), \
"You hear a ratchet.")
deconstruct()
code/ATMOSPHERICS/pipes/simple.dm
+1 -1
View File
@@ -77,7 +77,7 @@
initialize_directions = SOUTH|WEST
/obj/machinery/atmospherics/pipe/simple/proc/burst()
src.visible_message("<span class='danger'>\The [src] bursts!</span>");
src.visible_message(span_danger("\The [src] bursts!"));
playsound(src, 'sound/effects/bang.ogg', 25, 1)
var/datum/effect/effect/system/smoke_spread/smoke = new
smoke.set_up(1,0, src.loc, 0)