cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 14:00:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

The Great Spanning (#9320)

Browse Source 
This PR get rid of all (most of) the span("thing", spans and replaces them with the SPAN_THING( variant, which has gained more popularity recently.
This commit is contained in:
Geeves
2020-07-12 15:53:28 +03:00
committed by GitHub
parent 29cfd74770
commit 33ad8096fb
260 changed files with 1527 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/unary/vent_pump.dm
+12 -12
View File
@@ -349,22 +349,22 @@
if(W.iswelder())
var/obj/item/weldingtool/WT = W
if (!WT.welding)
to_chat(user, span("danger", "\The [WT] must be turned on!"))
to_chat(user, SPAN_DANGER("\The [WT] must be turned on!"))
else if (WT.remove_fuel(0,user))
to_chat(user, span("notice", "Now welding the vent."))
to_chat(user, SPAN_NOTICE("Now welding the vent."))
if(do_after(user, 30/W.toolspeed))
if(!src || !WT.isOn())
return
welded = !welded
update_icon()
playsound(src, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message(span("notice", "\The [user] [welded ? "welds \the [src] shut" : "unwelds \the [src]"]."), \
span("notice", "You [welded ? "weld \the [src] shut" : "unweld \the [src]"]."), \
user.visible_message(SPAN_NOTICE("\The [user] [welded ? "welds \the [src] shut" : "unwelds \the [src]"]."), \
SPAN_NOTICE("You [welded ? "weld \the [src] shut" : "unweld \the [src]"]."), \
"You hear welding.")
else
to_chat(user, span("notice", "You fail to complete the welding."))
to_chat(user, SPAN_NOTICE("You fail to complete the welding."))
else
to_chat(user, span("warning", "You need more welding fuel to complete this task."))
to_chat(user, SPAN_WARNING("You need more welding fuel to complete this task."))
return 1
else
..()
@@ -387,24 +387,24 @@
if (!W.iswrench())
return ..()
if (!(stat & NOPOWER) && use_power)
to_chat(user, span("warning", "You cannot unwrench \the [src], turn it off first."))
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("warning", "You must remove the plating first."))
to_chat(user, SPAN_WARNING("You must remove the plating first."))
return 1
var/datum/gas_mixture/int_air = return_air()
var/datum/gas_mixture/env_air = loc.return_air()
if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
to_chat(user, span("warning", "You cannot unwrench \the [src], it is too exerted due to internal pressure."))
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.loc, W.usesound, 50, 1)
to_chat(user, span("notice", "You begin to unfasten \the [src]..."))
to_chat(user, SPAN_NOTICE("You begin to unfasten \the [src]..."))
if (do_after(user, 40/W.toolspeed))
user.visible_message( \
span("notice", "\The [user] unfastens \the [src]."), \
span("notice", "You have unfastened \the [src]."), \
SPAN_NOTICE("\The [user] unfastens \the [src]."), \
SPAN_NOTICE("You have unfastened \the [src]."), \
"You hear a ratchet.")
new /obj/item/pipe(loc, make_from=src)
qdel(src)
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+12 -12
View File
@@ -261,24 +261,24 @@
/obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/W as obj, var/mob/user as mob)
if (W.iswrench())
if (!(stat & NOPOWER) && use_power)
to_chat(user, span("warning", "You cannot unwrench \the [src], turn it off first."))
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("warning", "You must remove the plating first."))
to_chat(user, SPAN_WARNING("You must remove the plating first."))
return 1
var/datum/gas_mixture/int_air = return_air()
var/datum/gas_mixture/env_air = loc.return_air()
if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
to_chat(user, span("warning", "You cannot unwrench \the [src], it is too exerted due to internal pressure."))
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.loc, W.usesound, 50, 1)
to_chat(user, span("notice", "You begin to unfasten \the [src]..."))
to_chat(user, SPAN_NOTICE("You begin to unfasten \the [src]..."))
if (do_after(user, 40/W.toolspeed, act_target = src))
user.visible_message( \
span("notice", "\The [user] unfastens \the [src]."), \
span("notice", "You have unfastened \the [src]."), \
SPAN_NOTICE("\The [user] unfastens \the [src]."), \
SPAN_NOTICE("You have unfastened \the [src]."), \
"You hear a ratchet.")
new /obj/item/pipe(loc, make_from=src)
qdel(src)
@@ -287,9 +287,9 @@
if(W.iswelder())
var/obj/item/weldingtool/WT = W
if (!WT.welding)
to_chat(user, span("danger", "\The [WT] must be turned on!"))
to_chat(user, SPAN_DANGER("\The [WT] must be turned on!"))
else if (WT.remove_fuel(0,user))
to_chat(user, span("notice", "Now welding \the [src]."))
to_chat(user, SPAN_NOTICE("Now welding \the [src]."))
playsound(src, 'sound/items/Welder.ogg', 50, 1)
if(do_after(user, 20/W.toolspeed, act_target = src))
if(!src || !WT.isOn())
@@ -297,13 +297,13 @@
welded = !welded
update_icon()
playsound(src, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message(span("notice", "\The [user] [welded ? "welds \the [src] shut" : "unwelds \the [src]"]."), \
span("notice", "You [welded ? "weld \the [src] shut" : "unweld \the [src]"]."), \
user.visible_message(SPAN_NOTICE("\The [user] [welded ? "welds \the [src] shut" : "unwelds \the [src]"]."), \
SPAN_NOTICE("You [welded ? "weld \the [src] shut" : "unweld \the [src]"]."), \
"You hear welding.")
else
to_chat(user, span("notice", "You fail to complete the welding."))
to_chat(user, SPAN_NOTICE("You fail to complete the welding."))
else
to_chat(user, span("warning", "You need more welding fuel to complete this task."))
to_chat(user, SPAN_WARNING("You need more welding fuel to complete this task."))
return 1
return ..()