cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 06:58:30 +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/game/objects/items/weapons/tanks/jetpack.dm
+1 -1
View File
@@ -31,7 +31,7 @@
/obj/item/tank/jetpack/examine(mob/user)
. = ..()
if(air_contents.total_moles < 5)
. += "<span class='danger'>The meter on \the [src] indicates you are almost out of gas!</span>"
. += span_danger("The meter on \the [src] indicates you are almost out of gas!")
playsound(src, 'sound/effects/alert.ogg', 50, 1)
/obj/item/tank/jetpack/verb/toggle_rockets()
code/game/objects/items/weapons/tanks/tank_types.dm
+4 -4
View File
@@ -23,7 +23,7 @@
/obj/item/tank/oxygen/examine(mob/user)
. = ..()
if(loc == user && (air_contents.gas["oxygen"] < 10))
. += "<span class='warning'>The meter on \the [src] indicates you are almost out of oxygen!</span>"
. += span_warning("The meter on \the [src] indicates you are almost out of oxygen!")
/obj/item/tank/oxygen/yellow
desc = "A tank of oxygen, this one is yellow."
@@ -59,7 +59,7 @@
/obj/item/tank/air/examine(mob/user)
. = ..()
if(loc == user && (air_contents.gas["oxygen"] < 1))
. += "<span class='warning'>The meter on \the [src] indicates you are almost out of air!</span>"
. += span_warning("The meter on \the [src] indicates you are almost out of air!")
user << sound('sound/effects/alert.ogg')
/obj/item/tank/air/Initialize()
@@ -142,7 +142,7 @@
/obj/item/tank/emergency/oxygen/examine(mob/user)
. = ..()
if(loc == user && (air_contents.gas["oxygen"] < 0.2))
. += "<span class='danger'>The meter on the [src.name] indicates you are almost out of air!</span>"
. += span_danger("The meter on the [src.name] indicates you are almost out of air!")
user << sound('sound/effects/alert.ogg')
/obj/item/tank/emergency/oxygen/engi
@@ -215,7 +215,7 @@
/obj/item/tank/nitrogen/examine(mob/user)
. = ..()
if(loc == user && (air_contents.gas["nitrogen"] < 10))
. += "<span class='danger'>The meter on \the [src] indicates you are almost out of nitrogen!</span>"
. += span_danger("The meter on \the [src] indicates you are almost out of nitrogen!")
//playsound(user, 'sound/effects/alert.ogg', 50, 1)
/obj/item/tank/stasis/nitro_cryo // Synthmorph bags need to have initial pressure within safe bounds for human atmospheric pressure, but low temperature to stop unwanted degredation.
code/game/objects/items/weapons/tanks/tanks.dm
+23 -23
View File
@@ -105,12 +105,12 @@ var/list/global/tank_gauge_cache = list()
descriptive = "cold"
else
descriptive = "bitterly cold"
. += "<span class='notice'>\The [src] feels [descriptive].</span>"
. += span_notice("\The [src] feels [descriptive].")
if(src.proxyassembly.assembly || wired)
. += "<span class='warning'>It seems to have [wired? "some wires ": ""][wired && src.proxyassembly.assembly? "and ":""][src.proxyassembly.assembly ? "some sort of assembly ":""]attached to it.</span>"
. += span_warning("It seems to have [wired? "some wires ": ""][wired && src.proxyassembly.assembly? "and ":""][src.proxyassembly.assembly ? "some sort of assembly ":""]attached to it.")
if(src.valve_welded)
. += "<span class='warning'>\The [src] emergency relief valve has been welded shut!</span>"
. += span_warning("\The [src] emergency relief valve has been welded shut!")
/obj/item/tank/attackby(obj/item/W as obj, mob/user as mob)
@@ -127,17 +127,17 @@ var/list/global/tank_gauge_cache = list()
var/obj/item/stack/cable_coil/C = W
if(C.use(1))
wired = 1
to_chat(user, "<span class='notice'>You attach the wires to the tank.</span>")
to_chat(user, span_notice("You attach the wires to the tank."))
src.add_bomb_overlay()
if(W.has_tool_quality(TOOL_WIRECUTTER))
if(wired && src.proxyassembly.assembly)
to_chat(user, "<span class='notice'>You carefully begin clipping the wires that attach to the tank.</span>")
to_chat(user, span_notice("You carefully begin clipping the wires that attach to the tank."))
if(do_after(user, 100,src))
wired = 0
cut_overlay("bomb_assembly")
to_chat(user, "<span class='notice'>You cut the wire and remove the device.</span>")
to_chat(user, span_notice("You cut the wire and remove the device."))
var/obj/item/assembly_holder/assy = src.proxyassembly.assembly
if(assy.a_left && assy.a_right)
@@ -156,55 +156,55 @@ var/list/global/tank_gauge_cache = list()
update_gauge()
else
to_chat(user, "<span class='danger'>You slip and bump the igniter!</span>")
to_chat(user, span_danger("You slip and bump the igniter!"))
if(prob(85))
src.proxyassembly.receive_signal()
else if(wired)
if(do_after(user, 10, src))
to_chat(user, "<span class='notice'>You quickly clip the wire from the tank.</span>")
to_chat(user, span_notice("You quickly clip the wire from the tank."))
wired = 0
cut_overlay("bomb_assembly")
else
to_chat(user, "<span class='notice'>There are no wires to cut!</span>")
to_chat(user, span_notice("There are no wires to cut!"))
if(istype(W, /obj/item/assembly_holder))
if(wired)
to_chat(user, "<span class='notice'>You begin attaching the assembly to \the [src].</span>")
to_chat(user, span_notice("You begin attaching the assembly to \the [src]."))
if(do_after(user, 50, src))
to_chat(user, "<span class='notice'>You finish attaching the assembly to \the [src].</span>")
to_chat(user, span_notice("You finish attaching the assembly to \the [src]."))
bombers += "[key_name(user)] attached an assembly to a wired [src]. Temp: [src.air_contents.temperature-T0C]"
message_admins("[key_name_admin(user)] attached an assembly to a wired [src]. Temp: [src.air_contents.temperature-T0C]")
assemble_bomb(W,user)
else
to_chat(user, "<span class='notice'>You stop attaching the assembly.</span>")
to_chat(user, span_notice("You stop attaching the assembly."))
else
to_chat(user, "<span class='notice'>You need to wire the device up first.</span>")
to_chat(user, span_notice("You need to wire the device up first."))
if(istype(W, /obj/item/weldingtool))
var/obj/item/weldingtool/WT = W
if(WT.remove_fuel(1,user))
if(!valve_welded)
to_chat(user, "<span class='notice'>You begin welding the \the [src] emergency pressure relief valve.</span>")
to_chat(user, span_notice("You begin welding the \the [src] emergency pressure relief valve."))
if(do_after(user, 40,src))
to_chat(user, "<span class='notice'>You carefully weld \the [src] emergency pressure relief valve shut.</span><span class='warning'> \The [src] may now rupture under pressure!</span>")
to_chat(user, span_notice("You carefully weld \the [src] emergency pressure relief valve shut.</span><span class='warning'> \The [src] may now rupture under pressure!"))
src.valve_welded = 1
src.leaking = 0
else
bombers += "[key_name(user)] attempted to weld a [src]. [src.air_contents.temperature-T0C]"
message_admins("[key_name_admin(user)] attempted to weld a [src]. [src.air_contents.temperature-T0C]")
if(WT.welding)
to_chat(user, "<span class='danger'>You accidentally rake \the [W] across \the [src]!</span>")
to_chat(user, span_danger("You accidentally rake \the [W] across \the [src]!"))
maxintegrity -= rand(2,6)
integrity = min(integrity,maxintegrity)
src.air_contents.add_thermal_energy(rand(2000,50000))
WT.eyecheck(user)
else
to_chat(user, "<span class='notice'>The emergency pressure relief valve has already been welded.</span>")
to_chat(user, span_notice("The emergency pressure relief valve has already been welded."))
add_fingerprint(user)
@@ -289,7 +289,7 @@ var/list/global/tank_gauge_cache = list()
if(location.internal == src)
location.internal = null
location.internals.icon_state = "internal0"
to_chat(user, "<span class='notice'>You close the tank release valve.</span>")
to_chat(user, span_notice("You close the tank release valve."))
if (location.internals)
location.internals.icon_state = "internal0"
else
@@ -303,11 +303,11 @@ var/list/global/tank_gauge_cache = list()
if(can_open_valve)
location.internal = src
to_chat(user, "<span class='notice'>You open \the [src] valve.</span>")
to_chat(user, span_notice("You open \the [src] valve."))
if (location.internals)
location.internals.icon_state = "internal1"
else
to_chat(user, "<span class='warning'>You need something to connect to \the [src].</span>")
to_chat(user, span_warning("You need something to connect to \the [src]."))
@@ -444,7 +444,7 @@ var/list/global/tank_gauge_cache = list()
else if(pressure > TANK_RUPTURE_PRESSURE)
#ifdef FIREDBG
log_debug("<span class='warning'>[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]</span>")
log_debug(span_warning("[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]"))
#endif
air_contents.react()
@@ -455,7 +455,7 @@ var/list/global/tank_gauge_cache = list()
return
T.assume_air(air_contents)
playsound(src, 'sound/weapons/Gunshot_shotgun.ogg', 20, 1)
visible_message("[icon2html(src,viewers(src))] <span class='danger'>\The [src] flies apart!</span>", "<span class='warning'>You hear a bang!</span>")
visible_message("[icon2html(src,viewers(src))] <span class='danger'>\The [src] flies apart!</span>", span_warning("You hear a bang!"))
T.hotspot_expose(air_contents.temperature, 70, 1)
@@ -504,7 +504,7 @@ var/list/global/tank_gauge_cache = list()
playsound(src, 'sound/effects/spray.ogg', 10, 1, -3)
leaking = 1
#ifdef FIREDBG
log_debug("<span class='warning'>[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]</span>")
log_debug(span_warning("[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]"))
#endif