cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-12 15:47:04 +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)
code/ZAS/Airflow.dm
+7 -7
View File
@@ -9,13 +9,13 @@ Contains helper procs for airflow, handled in /connection_group.
if(last_airflow_stun > world.time - vsc.airflow_stun_cooldown) return 0
if(!(status_flags & CANSTUN) && !(status_flags & CANWEAKEN))
to_chat(src, "<span class='notice'>You stay upright as the air rushes past you.</span>")
to_chat(src, span_notice("You stay upright as the air rushes past you."))
return 0
if(buckled)
to_chat(src, "<span class='notice'>Air suddenly rushes past you!</span>")
to_chat(src, span_notice("Air suddenly rushes past you!"))
return 0
if(!lying)
to_chat(src, "<span class='warning'>The sudden rush of air knocks you over!</span>")
to_chat(src, span_warning("The sudden rush of air knocks you over!"))
Weaken(5)
last_airflow_stun = world.time
@@ -24,7 +24,7 @@ Contains helper procs for airflow, handled in /connection_group.
/mob/living/carbon/human/airflow_stun()
if(shoes && (shoes.item_flags & NOSLIP))
to_chat(src, "<span class='notice'>Air suddenly rushes past you!</span>")
to_chat(src, span_notice("Air suddenly rushes past you!"))
return 0
..()
@@ -96,7 +96,7 @@ Contains helper procs for airflow, handled in /connection_group.
/mob/airflow_hit(atom/A)
for(var/mob/M in hearers(src))
M.show_message("<span class='danger'>\The [src] slams into \a [A]!</span>",1,"<span class='danger'>You hear a loud slam!</span>",2)
M.show_message(span_danger("\The [src] slams into \a [A]!"),1,span_danger("You hear a loud slam!"),2)
playsound(src, "smash.ogg", 25, 1, -1)
var/weak_amt = istype(A,/obj/item) ? A:w_class : rand(1,5) //Heheheh
Weaken(weak_amt)
@@ -104,7 +104,7 @@ Contains helper procs for airflow, handled in /connection_group.
/obj/airflow_hit(atom/A)
for(var/mob/M in hearers(src))
M.show_message("<span class='danger'>\The [src] slams into \a [A]!</span>",1,"<span class='danger'>You hear a loud slam!</span>",2)
M.show_message(span_danger("\The [src] slams into \a [A]!"),1,span_danger("You hear a loud slam!"),2)
playsound(src, "smash.ogg", 25, 1, -1)
. = ..()
@@ -114,7 +114,7 @@ Contains helper procs for airflow, handled in /connection_group.
/mob/living/carbon/human/airflow_hit(atom/A)
// for(var/mob/M in hearers(src))
// M.show_message("<span class='danger'>[src] slams into [A]!</span>",1,"<span class='danger'>You hear a loud slam!</span>",2)
// M.show_message(span_danger("[src] slams into [A]!"),1,span_danger("You hear a loud slam!"),2)
playsound(src, "punch", 25, 1, -1)
if (prob(33))
loc:add_blood(src)
code/ZAS/Phoron.dm
+5 -5
View File
@@ -102,8 +102,8 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
if(vsc.plc.SKIN_BURNS && (species.breath_type != "phoron"))
if(!pl_head_protected() || !pl_suit_protected())
burn_skin(0.75)
if(prob(20))
to_chat(src, "<span class='danger'>Your skin burns!</span>")
if(prob(20))
to_chat(src, span_danger("Your skin burns!"))
updatehealth()
//Burn eyes if exposed.
@@ -134,18 +134,18 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
if(vsc.plc.GENETIC_CORRUPTION && (species.breath_type != "phoron"))
if(rand(1,10000) < vsc.plc.GENETIC_CORRUPTION)
randmutb(src)
to_chat(src, "<span class='danger'>High levels of toxins cause you to spontaneously mutate!</span>")
to_chat(src, span_danger("High levels of toxins cause you to spontaneously mutate!"))
domutcheck(src,null)
/mob/living/carbon/human/proc/burn_eyes()
var/obj/item/organ/internal/eyes/E = internal_organs_by_name[O_EYES]
if(E)
if(prob(20))
to_chat(src, "<span class='danger'>Your eyes burn!</span>")
to_chat(src, span_danger("Your eyes burn!"))
E.damage += 2.5
eye_blurry = min(eye_blurry+1.5,50)
if (prob(max(0,E.damage - 15) + 1) &&!eye_blind)
to_chat(src, "<span class='danger'>You are blinded!</span>")
to_chat(src, span_danger("You are blinded!"))
Blind(20)
/mob/living/carbon/human/proc/pl_head_protected()
code/ZAS/Variable Settings.dm
+2 -2
View File
@@ -168,7 +168,7 @@ var/global/vs_control/vsc = new
vars[ch] = vw
if(how == "Toggle")
newvar = (newvar?"ON":"OFF")
to_world("<span class='notice'><b>[key_name(user)] changed the setting [display_description] to [newvar].</b></span>")
to_world(span_notice("<b>[key_name(user)] changed the setting [display_description] to [newvar].</b>"))
if(ch in plc.settings)
ChangeSettingsDialog(user,plc.settings)
else
@@ -321,7 +321,7 @@ var/global/vs_control/vsc = new
plc.N2O_HALLUCINATION = initial(plc.N2O_HALLUCINATION)
to_world("<span class='notice'><b>[key_name(user)] changed the global phoron/ZAS settings to \"[def]\"</b></span>")
to_world(span_notice("<b>[key_name(user)] changed the global phoron/ZAS settings to \"[def]\"</b>"))
/pl_control/var/list/settings = list()
code/__defines/span_vr.dm
+64 -3
View File
@@ -2,7 +2,10 @@
// We have two other ways of doing this, so why not a third. This one atleast has more span options.
#define span_ooc(str) ("<span class='ooc'>" + str + "</span>")
#define span_looc(str) ("<span class='looc'>" + str + "</span>")
#define span_rlooc(str) ("<span class='rlooc'>" + str + "</span>")
#define span_aooc(str) ("<span class='aooc'>" + str + "</span>")
#define span_npcsay(str) ("<span class='npcsay'>" + str + "</span>")
#define span_deadsay(str) ("<span class='deadsay'>" + str + "</span>")
#define span_radio(str) ("<span class='radio'>" + str + "</span>")
#define span_deptradio(str) ("<span class='deptradio'>" + str + "</span>")
@@ -22,20 +25,30 @@
#define span_srvradio(str) ("<span class='srvradio'>" + str + "</span>")
#define span_expradio(str) ("<span class='expradio'>" + str + "</span>")
#define span_binary(str) ("<span class='binarysay'>" + str + "</span>")
#define span_binarysay(str) ("<span class='binarysay'>" + str + "</span>")
#define span_hivemind(str) ("<span class='hivemind'>" + str + "</span>")
#define span_name(str) ("<span class='name'>" + str + "</span>")
#define span_say(str) ("<span class='say'>" + str + "</span>")
#define span_filter_say(str) ("<span class='filter_say'>" + str + "</span>")
#define span_npc_say(str) ("<span class='npcsay'>" + str + "</span>")
#define span_multizsay(str) ("<span class='multizsay'>" + str + "</span>")
#define span_alert(str) ("<span class='alert'>" + str + "</span>")
#define span_ghostalert(str) ("<span class='ghostalert'>" + str + "</span>")
#define span_npc_say(str) ("<span class='npcsay'>" + str + "</span>")
#define span_game(str) ("<span class='game'>" + str + "</span>")
#define span_emote(str) ("<span class='emote'>" + str + "</span>")
#define span_emote_subtle(str) ("<span class='emotesubtle'>" + str + "</span>")
#define span_npc_emote(str) ("<span class='npcemote'>" + str + "</span>")
#define span_message(str) ("<span class='message'>" + str + "</span>") // TODO: This makes no sense, check it! CI Error: Span not defined in scss
#define span_notify(str) ("<span class='notify'>" + str + "</span>") // TODO: This makes no sense, check it! CI Error: Span not defined in scss
#define span_body(str) ("<span class='body'>" + str + "</span>")
#define span_suicide(str) ("<span class='suicide'>" + str + "</span>")
#define span_hear(str) ("<span class='hear'>" + str + "</span>")
#define span_attack(str) ("<span class='attack'>" + str + "</span>")
#define span_moderate(str) ("<span class='moderate'>" + str + "</span>")
#define span_disarm(str) ("<span class='disarm'>" + str + "</span>")
@@ -45,19 +58,41 @@
#define span_danger(str) ("<span class='danger'>" + str + "</span>")
#define span_userdanger(str) ("<span class='userdanger'>" + str + "</span>")
#define span_warning(str) ("<span class='warning'>" + str + "</span>")
#define span_boldwarning(str) ("<span class='boldwarning'>" + str + "</span>")
#define span_filter_warning(str) ("<span class='filter_warning'>" + str + "</span>")
#define span_filter_combat(str) ("<span class='filter_combat'>" + str + "</span>")
#define span_unconscious(str) ("<span class='unconscious'>" + str + "</span>")
#define span_rose(str) ("<span class='rose'>" + str + "</span>")
#define span_info(str) ("<span class='info'>" + str + "</span>")
#define span_infoplain(str) ("<span class='infoplain'>" + str + "</span>")
#define span_notice(str) ("<span class='notice'>" + str + "</span>")
#define span_filter_notice(str) ("<span class='filter_notice'>" + str + "</span>")
#define span_boldnotice(str) ("<span class='boldnotice'>" + str + "</span>")
#define span_alium(str) ("<span class='alium'>" + str + "</span>")
#define span_cult(str) ("<span class='cult'>" + str + "</span>")
#define span_sinister(str) ("<span class='sinister'>" + str + "</span>")
#define span_reflex_shoot(str) ("<span class='reflex_shoot'>" + str + "</span>")
/* Direct communication spans */
#define span_psay(str) ("<span class='psay'>" + str + "</span>")
#define span_pemote(str) ("<span class='pemote'>" + str + "</span>")
/* Export spans */
#define span_chatexport(str) ("<span class='chatexport'>" + str + "</span>")
/* Vore messages */
#define span_valert(str) ("<span class='valert'>" + str + "</span>")
#define span_vdanger(str) ("<span class='vdanger'>" + str + "</span>")
#define span_vwarning(str) ("<span class='vwarning'>" + str + "</span>")
#define span_vnotice(str) ("<span class='vnotice'>" + str + "</span>")
#define span_nif(str) ("<span class='nif'>" + str + "</span>")
#define span_filter_nif(str) ("<span class='filter_nif'>" + str + "</span>")
/* Languages */
@@ -109,13 +144,32 @@
#define span_maroon(str) ("<span class='maroon'>" + str + "</span>")
#define span_brown(str) ("<span class='brown'>" + str + "</span>")
#define span_lightpurple(str) ("<span class='lightpurple'>" + str + "</span>")
#define span_darkpink(str) ("<span class='lightpurple'>" + str + "</span>")
#define span_darkpink(str) ("<span class='darkpurple'>" + str + "</span>")
/* System and Debug */
#define span_prefix(str) ("<span class='prefix'>" + str + "</span>")
#define span_admin(str) ("<span class='admin'>" + str + "</span>")
#define span_adminnotice(str) ("<span class='adminnotice'>" + str + "</span>")
#define span_boldannounce(str) ("<span class='boldannounce'>" + str + "</span>")
#define span_linkOn(str) ("<span class='linkOn'>" + str + "</span>")
#define span_linkOff(str) ("<span class='linkOff'>" + str + "</span>")
#define span_log_message(str) ("<span class='log_message'>" + str + "</span>")
#define span_filter_system(str) ("<span class='filter_system'>" + str + "</span>")
#define span_filter_debuglogs(str) ("<span class='filter_debuglogs'>" + str + "</span>")
#define span_filter_adminlog(str) ("<span class='filter_adminlog'>" + str + "</span>")
#define span_pm(str) ("<span class='pm'>" + str + "</span>")
#define span_filter_pm(str) ("<span class='filter_pm'>" + str + "</span>")
#define span_adminhelp(str) ("<span class='adminhelp'>" + str + "</span>")
#define span_mentor(str) ("<span class='mentor'>" + str + "</span>")
#define span_filter_pray(str) ("<span class='filter_pray'>" + str + "</span>")
/* Adminchat */
#define span_admin_channel(str) ("<span class='admin_channel'>" + str + "</span>")
#define span_mod_channel(str) ("<span class='mod_channel'>" + str + "</span>")
#define span_event_channel(str) ("<span class='event_channel'>" + str + "</span>")
#define span_mentor_channel(str) ("<span class='mentor_channel'>" + str + "</span>")
/* Byond Sizes */
@@ -128,3 +182,10 @@
#define span_huge(X) "<font size='4'>[X]</font>"
#define span_giant(X) "<font size='5'>[X]</font>"
/* Style spans */
#define span_italics(str) ("<span class='italics'>" + str + "</span>")
#define span_bold(str) ("<span class='bold'>" + str + "</span>")
#define span_linkify(str) ("<span class='linkify'>" + str + "</span>")
code/_helpers/atmospherics.dm
+13 -13
View File
@@ -1,16 +1,16 @@
/obj/proc/analyze_gases(var/atom/A, var/mob/user)
if(src != A)
user.visible_message("<span class='notice'>\The [user] has used \an [src] on \the [A]</span>")
user.visible_message(span_notice("\The [user] has used \an [src] on \the [A]"))
A.add_fingerprint(user)
var/list/result = A.atmosanalyze(user)
if(result && result.len)
to_chat(user, "<span class='notice'>Results of the analysis[src == A ? "" : " of \the [A]"]</span>")
to_chat(user, span_notice("Results of the analysis[src == A ? "" : " of \the [A]"]"))
for(var/line in result)
to_chat(user, "<span class='notice'>[line]</span>")
to_chat(user, span_notice("[line]"))
return 1
to_chat(user, "<span class='warning'>Your [src] flashes a red light as it fails to analyze \the [A].</span>")
to_chat(user, span_warning("Your [src] flashes a red light as it fails to analyze \the [A]."))
return 0
/proc/atmosanalyzer_scan(var/atom/target, var/datum/gas_mixture/mixture, var/mob/user)
@@ -19,13 +19,13 @@
if (mixture && mixture.total_moles > 0)
var/pressure = mixture.return_pressure()
var/total_moles = mixture.total_moles
results += "<span class='notice'>Pressure: [round(pressure,0.1)] kPa</span>"
results += span_notice("Pressure: [round(pressure,0.1)] kPa")
for(var/mix in mixture.gas)
results += "<span class='notice'>[gas_data.name[mix]]: [round((mixture.gas[mix] / total_moles) * 100)]% ([round(mixture.gas[mix], 0.01)] moles)</span>"
results += "<span class='notice'>Temperature: [round(mixture.temperature-T0C)]&deg;C</span>"
results += "<span class='notice'>Heat Capacity: [round(mixture.heat_capacity(),0.1)]</span>"
results += span_notice("[gas_data.name[mix]]: [round((mixture.gas[mix] / total_moles) * 100)]% ([round(mixture.gas[mix], 0.01)] moles)")
results += span_notice("Temperature: [round(mixture.temperature-T0C)]&deg;C")
results += span_notice("Heat Capacity: [round(mixture.heat_capacity(),0.1)]")
else
results += "<span class='notice'>\The [target] is empty!</span>"
results += span_notice("\The [target] is empty!")
return results
@@ -55,16 +55,16 @@
/obj/machinery/atmospherics/trinary/atmos_filter/atmosanalyze(var/mob/user)
return atmosanalyzer_scan(src, src.air1, user)
/obj/machinery/atmospherics/trinary/mixer/atmosanalyze(var/mob/user)
return atmosanalyzer_scan(src, src.air3, user)
/obj/machinery/atmospherics/omni/atmos_filter/atmosanalyze(var/mob/user)
return atmosanalyzer_scan(src, src.input.air, user)
/obj/machinery/atmospherics/omni/mixer/atmosanalyze(var/mob/user)
return atmosanalyzer_scan(src, src.output.air, user)
/obj/machinery/meter/atmosanalyze(var/mob/user)
var/datum/gas_mixture/mixture = null
if(src.target)
code/_helpers/logging.dm
+2 -2
View File
@@ -48,7 +48,7 @@
if(C.prefs?.read_preference(/datum/preference/toggle/show_debug_logs))
to_chat(C,
type = MESSAGE_TYPE_DEBUG,
html = "<span class='filter_debuglog'>DEBUG: [text]</span>")
html = span_filter_debuglogs("DEBUG: [text]"))
/proc/log_game(text)
if (config.log_game)
@@ -178,7 +178,7 @@
WRITE_LOG(diary, "ASSET: [text]")
/proc/report_progress(var/progress_message)
admin_notice("<span class='boldannounce'>[progress_message]</span>", R_DEBUG)
admin_notice(span_boldannounce("[progress_message]"), R_DEBUG)
to_world_log(progress_message)
//pretty print a direction bitflag, can be useful for debugging.
code/_helpers/mobs.dm
+5 -5
View File
@@ -148,10 +148,10 @@ Proc for attack log creation, because really why not
if(!time)
return TRUE //Done!
if(user.status_flags & DOING_TASK)
to_chat(user, "<span class='warning'>You're in the middle of doing something else already.</span>")
to_chat(user, span_warning("You're in the middle of doing something else already."))
return FALSE //Performing an exclusive do_after or do_mob already
if(target?.flags & IS_BUSY)
to_chat(user, "<span class='warning'>Someone is already doing something with \the [target].</span>")
to_chat(user, span_warning("Someone is already doing something with \the [target]."))
return FALSE
var/user_loc = user.loc
var/target_loc = target.loc
@@ -214,10 +214,10 @@ Proc for attack log creation, because really why not
if(!delay)
return TRUE //Okay. Done.
if(user.status_flags & DOING_TASK)
to_chat(user, "<span class='warning'>You're in the middle of doing something else already.</span>")
to_chat(user, span_warning("You're in the middle of doing something else already."))
return FALSE //Performing an exclusive do_after or do_mob already
if(target?.flags & IS_BUSY)
to_chat(user, "<span class='warning'>Someone is already doing something with \the [target].</span>")
to_chat(user, span_warning("Someone is already doing something with \the [target]."))
return FALSE
var/atom/target_loc = null
@@ -318,6 +318,6 @@ Proc for attack log creation, because really why not
/proc/not_has_ooc_text(mob/user)
if (config.allow_Metadata && (!user.client?.prefs?.metadata || length(user.client.prefs.metadata) < 15))
to_chat(user, "<span class='warning'>Please set informative OOC notes related to RP/ERP preferences. Set them using the 'OOC Notes' button on the 'General' tab in character setup.</span>")
to_chat(user, span_warning("Please set informative OOC notes related to RP/ERP preferences. Set them using the 'OOC Notes' button on the 'General' tab in character setup."))
return TRUE
return FALSE
code/_onclick/ai.dm
+3 -3
View File
@@ -25,13 +25,13 @@
/mob/living/silicon/ai/ClickOn(var/atom/A, params)
if(!checkClickCooldown())
return
setClickCooldown(1)
if(client.buildmode) // comes after object.Click to allow buildmode gui objects to be clicked
build_click(src, client.buildmode, params, A)
return
if(multicam_on)
var/turf/T = get_turf(A)
if(T)
@@ -173,7 +173,7 @@
to_chat(user, "The bolt lights wire is cut - The door bolt lights are permanently disabled.")
return
lights = !lights
to_chat(user, "<span class='notice'>Lights are now [lights ? "on." : "off."]</span>")
to_chat(user, span_notice("Lights are now [lights ? "on." : "off."]"))
update_icon()
return TRUE
code/_onclick/click.dm
+1 -1
View File
@@ -337,7 +337,7 @@
nutrition = max(nutrition - rand(1,5),0)
handle_regular_hud_updates()
else
to_chat(src, "<span class='warning'>You're out of energy! You need food!</span>")
to_chat(src, span_warning("You're out of energy! You need food!"))
// Simple helper to face what you clicked on, in case it should be needed in more than one place
/mob/proc/face_atom(var/atom/A)
code/_onclick/cyborg.dm
+1 -1
View File
@@ -46,7 +46,7 @@
if(is_component_functioning("camera"))
aiCamera.captureimage(A, usr)
else
to_chat(src, "<span class='userdanger'>Your camera isn't functional.</span>")
to_chat(src, span_userdanger("Your camera isn't functional."))
return
/*
code/_onclick/hud/ability_screen_objects.dm
+1 -1
View File
@@ -290,7 +290,7 @@
if(!mob)
return // Paranoid.
if(isnull(slot) || !isnum(slot))
to_chat(src, "<span class='warning'>.activate_ability requires a number as input, corrisponding to the slot you wish to use.</span>")
to_chat(src, span_warning(".activate_ability requires a number as input, corrisponding to the slot you wish to use."))
return // Bad input.
if(!mob.ability_master)
return // No abilities.
code/_onclick/hud/alert.dm
+1 -1
View File
@@ -468,7 +468,7 @@ so as to remain in compliance with the most up-to-date laws."
return
var/paramslist = params2list(params)
if(paramslist["shift"]) // screen objects don't do the normal Click() stuff so we'll cheat
to_chat(usr,"<span class='boldnotice'>[name]</span> - <span class='info'>[desc]</span>")
to_chat(usr,span_boldnotice("[name]</span> - <span class='info'>[desc]"))
return
if(master)
return usr.client.Click(master, location, control, params)
code/_onclick/hud/hud.dm
+1 -1
View File
@@ -362,7 +362,7 @@ var/list/global_huds = list(
set hidden = 1
if(!hud_used)
to_chat(usr, "<span class='warning'>This mob type does not use a HUD.</span>")
to_chat(usr, span_warning("This mob type does not use a HUD."))
return FALSE
if(!client)
return FALSE
code/_onclick/hud/robot.dm
+2 -2
View File
@@ -282,11 +282,11 @@ var/obj/screen/robot_inventory
//r.client.screen += robot_inventory //"store" icon
if(!r.module)
to_chat(usr, "<span class='danger'>No module selected</span>")
to_chat(usr, span_danger("No module selected"))
return
if(!r.module.modules)
to_chat(usr, "<span class='danger'>Selected module has no modules to select</span>")
to_chat(usr, span_danger("Selected module has no modules to select"))
return
if(!r.robot_modules_background)
code/_onclick/hud/screen_objects.dm
+6 -6
View File
@@ -290,7 +290,7 @@
if(iscarbon(usr))
var/mob/living/carbon/C = usr
if(C.legcuffed)
to_chat(C, "<span class='notice'>You are legcuffed! You cannot run until you get [C.legcuffed] removed!</span>")
to_chat(C, span_notice("You are legcuffed! You cannot run until you get [C.legcuffed] removed!"))
C.m_intent = "walk" //Just incase
C.hud_used.move_intent.icon_state = "walking"
return 1
@@ -330,7 +330,7 @@
if(!C.stat && !C.stunned && !C.paralysis && !C.restrained())
if(C.internal)
C.internal = null
to_chat(C, "<span class='notice'>No longer running on internals.</span>")
to_chat(C, span_notice("No longer running on internals."))
if(C.internals)
C.internals.icon_state = "internal0"
else
@@ -342,7 +342,7 @@
no_mask = 1
if(no_mask)
to_chat(C, "<span class='notice'>You are not wearing a suitable mask or helmet.</span>")
to_chat(C, span_notice("You are not wearing a suitable mask or helmet."))
return 1
else
var/list/nicename = null
@@ -423,7 +423,7 @@
//We've determined the best container now we set it as our internals
if(best)
to_chat(C, "<span class='notice'>You are now running on internals from [tankcheck[best]] [from] your [nicename[best]].</span>")
to_chat(C, span_notice("You are now running on internals from [tankcheck[best]] [from] your [nicename[best]]."))
C.internal = tankcheck[best]
@@ -431,7 +431,7 @@
if(C.internals)
C.internals.icon_state = "internal1"
else
to_chat(C, "<span class='notice'>You don't have a[breathes=="oxygen" ? "n oxygen" : addtext(" ",breathes)] tank.</span>")
to_chat(C, span_notice("You don't have a[breathes=="oxygen" ? "n oxygen" : addtext(" ",breathes)] tank."))
if("act_intent")
usr.a_intent_change("right")
if(I_HELP)
@@ -497,7 +497,7 @@
if(i)
s.can_use(u,i)
else
to_chat(usr, "<span class='notice'>You're not holding anything to use. You need to have something in your active hand to use it.</span>")
to_chat(usr, span_notice("You're not holding anything to use. You need to have something in your active hand to use it."))
if("module")
if(isrobot(usr))
code/_onclick/hud/screen_objects_vr.dm
+19 -19
View File
@@ -6,63 +6,63 @@
if("darkness")
var/turf/T = get_turf(usr)
var/darkness = round(1 - T.get_lumcount(),0.1)
to_chat(usr,"<span class='notice'><b>Darkness:</b> [darkness]</span>")
to_chat(usr,span_notice("<b>Darkness:</b> [darkness]"))
if("energy")
var/mob/living/simple_mob/shadekin/SK = usr
if(istype(SK))
to_chat(usr,"<span class='notice'><b>Energy:</b> [SK.energy] ([SK.dark_gains])</span>")
to_chat(usr,span_notice("<b>Energy:</b> [SK.energy] ([SK.dark_gains])"))
if("shadekin status")
var/turf/T = get_turf(usr)
if(T)
var/darkness = round(1 - T.get_lumcount(),0.1)
to_chat(usr,"<span class='notice'><b>Darkness:</b> [darkness]</span>")
to_chat(usr,span_notice("<b>Darkness:</b> [darkness]"))
var/mob/living/carbon/human/H = usr
if(istype(H) && istype(H.species, /datum/species/shadekin))
to_chat(usr,"<span class='notice'><b>Energy:</b> [H.shadekin_get_energy(H)]</span>")
to_chat(usr,span_notice("<b>Energy:</b> [H.shadekin_get_energy(H)]"))
if("glamour")
var/mob/living/carbon/human/H = usr
if(istype(H))
to_chat(usr,"<span class='notice'><b>Energy:</b> [H.species.lleill_energy]/[H.species.lleill_energy_max]</span>")
to_chat(usr,span_notice("<b>Energy:</b> [H.species.lleill_energy]/[H.species.lleill_energy_max]"))
if("danger level")
var/mob/living/carbon/human/H = usr
if(istype(H) && istype(H.species, /datum/species/xenochimera))
if(H.feral > 50)
to_chat(usr, "<span class='warning'>You are currently <b>completely feral.</b></span>")
to_chat(usr, span_warning("You are currently <b>completely feral.</b>"))
else if(H.feral > 10)
to_chat(usr, "<span class='warning'>You are currently <b>crazed and confused.</b></span>")
to_chat(usr, span_warning("You are currently <b>crazed and confused.</b>"))
else if(H.feral > 0)
to_chat(usr, "<span class='warning'>You are currently <b>acting on instinct.</b></span>")
to_chat(usr, span_warning("You are currently <b>acting on instinct.</b>"))
else
to_chat(usr, "<span class='notice'>You are currently <b>calm and collected.</b></span>")
to_chat(usr, span_notice("You are currently <b>calm and collected.</b>"))
if(H.feral > 0)
var/feral_passing = TRUE
if(H.traumatic_shock > min(60, H.nutrition/10))
to_chat(usr, "<span class='warning'>Your pain prevents you from regaining focus.</span>")
to_chat(usr, span_warning("Your pain prevents you from regaining focus."))
feral_passing = FALSE
if(H.feral + H.nutrition < 150)
to_chat(usr, "<span class='warning'>Your hunger prevents you from regaining focus.</span>")
to_chat(usr, span_warning("Your hunger prevents you from regaining focus."))
feral_passing = FALSE
if(H.jitteriness >= 100)
to_chat(usr, "<span class='warning'>Your jitterness prevents you from regaining focus.</span>")
to_chat(usr, span_warning("Your jitterness prevents you from regaining focus."))
feral_passing = FALSE
if(feral_passing)
var/turf/T = get_turf(H)
if(T.get_lumcount() <= 0.1)
to_chat(usr, "<span class='notice'>You are slowly calming down in darkness' safety...</span>")
to_chat(usr, span_notice("You are slowly calming down in darkness' safety..."))
else if(isbelly(H.loc)) // Safety message for if inside a belly.
to_chat(usr, "<span class='notice'>You are slowly calming down within the darkness of something's belly, listening to their body as it moves around you. ...safe...</span>")
to_chat(usr, span_notice("You are slowly calming down within the darkness of something's belly, listening to their body as it moves around you. ...safe..."))
else
to_chat(usr, "<span class='notice'>You are slowly calming down... But safety of darkness is much preferred.</span>")
to_chat(usr, span_notice("You are slowly calming down... But safety of darkness is much preferred."))
else
if(H.nutrition < 150)
to_chat(usr, "<span class='warning'>Your hunger is slowly making you unstable.</span>")
to_chat(usr, span_warning("Your hunger is slowly making you unstable."))
if("Reconstructing Form") // Allow Viewing Reconstruction Timer + Hatching for 'chimera
var/mob/living/carbon/human/H = usr
if(istype(H) && istype(H.species, /datum/species/xenochimera)) // If you're somehow able to click this while not a chimera, this should prevent weird runtimes. Will need changing if regeneration is ever opened to non-chimera using the same alert.
if(H.revive_ready == REVIVING_NOW)
to_chat(usr, "<span class='notice'>We are currently reviving, and will be done in [round((H.revive_finished - world.time) / 10)] seconds, or [round(((H.revive_finished - world.time) * 0.1) / 60)] minutes.</span>")
to_chat(usr, span_notice("We are currently reviving, and will be done in [round((H.revive_finished - world.time) / 10)] seconds, or [round(((H.revive_finished - world.time) * 0.1) / 60)] minutes."))
else if(H.revive_ready == REVIVING_DONE)
to_chat(usr, "<span class='warning'>You should have a notification + alert for this! Bug report that this is still here!</span>")
to_chat(usr, span_warning("You should have a notification + alert for this! Bug report that this is still here!"))
if("Ready to Hatch") // Allow Viewing Reconstruction Timer + Hatching for 'chimera
var/mob/living/carbon/human/H = usr
@@ -73,4 +73,4 @@
else
return 0
return 1
return 1
code/_onclick/observer.dm
+2 -2
View File
@@ -6,9 +6,9 @@
if(!client) return
client.inquisitive_ghost = !client.inquisitive_ghost
if(client.inquisitive_ghost)
to_chat(src, "<span class='notice'>You will now examine everything you click on.</span>")
to_chat(src, span_notice("You will now examine everything you click on."))
else
to_chat(src, "<span class='notice'>You will no longer examine things you click on.</span>")
to_chat(src, span_notice("You will no longer examine things you click on."))
/mob/observer/dead/DblClickOn(var/atom/A, var/params)
if(client.buildmode)
code/_onclick/telekinesis.dm
+1 -1
View File
@@ -110,7 +110,7 @@ var/const/tk_maxrange = 15
if(focus)
d = max(d, get_dist(user, focus)) // whichever is further
if(d > tk_maxrange)
to_chat(user, "<span class='notice'>Your mind won't reach that far.</span>")
to_chat(user, span_notice("Your mind won't reach that far."))
return
if(!focus)
code/controllers/configuration.dm
+2 -2
View File
@@ -71,7 +71,7 @@ var/list/gamemode_cache = list()
var/static/respawn = 1
var/static/respawn_time = 3000 // time before a dead player is allowed to respawn (in ds, though the config file asks for minutes, and it's converted below)
var/static/respawn_message = "<span class='notice'><B>Make sure to play a different character, and please roleplay correctly!</B></span>"
var/static/respawn_message = span_notice("<B>Make sure to play a different character, and please roleplay correctly!</B>")
var/static/guest_jobban = 1
var/static/usewhitelist = 0
@@ -529,7 +529,7 @@ var/list/gamemode_cache = list()
config.respawn_time = raw_minutes MINUTES
if ("respawn_message")
config.respawn_message = "<span class='notice'><B>[value]</B></span>"
config.respawn_message = span_notice("<B>[value]</B>")
if ("servername")
config.server_name = value
code/controllers/failsafe.dm
+6 -6
View File
@@ -57,23 +57,23 @@ var/datum/controller/failsafe/Failsafe
if(4,5)
--defcon
if(3)
log_and_message_admins("<span class='adminnotice'>SSfailsafe Notice: DEFCON [defcon_pretty()]. The Master Controller (\ref[Master]) has not fired in the last [(5-defcon) * processing_interval] ticks.</span>")
log_and_message_admins(span_adminnotice("SSfailsafe Notice: DEFCON [defcon_pretty()]. The Master Controller (\ref[Master]) has not fired in the last [(5-defcon) * processing_interval] ticks."))
--defcon
if(2)
log_and_message_admins("<span class='boldannounce'>SSfailsafe Warning: DEFCON [defcon_pretty()]. The Master Controller (\ref[Master]) has not fired in the last [(5-defcon) * processing_interval] ticks. Automatic restart in [processing_interval] ticks.</span>")
log_and_message_admins(span_boldannounce("SSfailsafe Warning: DEFCON [defcon_pretty()]. The Master Controller (\ref[Master]) has not fired in the last [(5-defcon) * processing_interval] ticks. Automatic restart in [processing_interval] ticks."))
--defcon
if(1)
log_and_message_admins("<span class='boldannounce'>SSfailsafe Warning: DEFCON [defcon_pretty()]. The Master Controller (\ref[Master]) has still not fired within the last [(5-defcon) * processing_interval] ticks. Killing and restarting...</span>")
log_and_message_admins(span_boldannounce("SSfailsafe Warning: DEFCON [defcon_pretty()]. The Master Controller (\ref[Master]) has still not fired within the last [(5-defcon) * processing_interval] ticks. Killing and restarting..."))
--defcon
var/rtn = Recreate_MC()
if(rtn > 0)
defcon = 4
master_iteration = 0
log_and_message_admins("<span class='adminnotice'>SSfailsafe Notice: MC (New:\ref[Master]) restarted successfully</span>")
log_and_message_admins(span_adminnotice("SSfailsafe Notice: MC (New:\ref[Master]) restarted successfully"))
else if(rtn < 0)
log_game("SSfailsafe Notice: Could not restart MC (\ref[Master]), runtime encountered. Entering defcon 0")
log_and_message_admins("<span class='boldannounce'>SSFAILSAFE ERROR: DEFCON [defcon_pretty()]. Could not restart MC (\ref[Master]), runtime encountered. I will silently keep retrying.</span>")
log_and_message_admins(span_boldannounce("SSFAILSAFE ERROR: DEFCON [defcon_pretty()]. Could not restart MC (\ref[Master]), runtime encountered. I will silently keep retrying."))
//if the return number was 0, it just means the mc was restarted too recently, and it just needs some time before we try again
//no need to handle that specially when defcon 0 can handle it
if(0) //DEFCON 0! (mc failed to restart)
@@ -81,7 +81,7 @@ var/datum/controller/failsafe/Failsafe
if(rtn > 0)
defcon = 4
master_iteration = 0
log_and_message_admins("<span class='adminnotice'>SSfailsafe Notice: MC (New:\ref[Master]) restarted successfully</span>")
log_and_message_admins(span_adminnotice("SSfailsafe Notice: MC (New:\ref[Master]) restarted successfully"))
else
defcon = min(defcon + 1,5)
master_iteration = Master.iteration
code/controllers/master.dm
+7 -7
View File
@@ -141,7 +141,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
BadBoy.critfail()
if(msg)
log_game(msg)
message_admins("<span class='boldannounce'>[msg]</span>")
message_admins(span_boldannounce("[msg]"))
log_world(msg)
if (istype(Master.subsystems))
@@ -152,7 +152,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
current_runlevel = Master.current_runlevel
StartProcessing(10)
else
to_world("<span class='boldannounce'>The Master Controller is having some issues, we will need to re-initialize EVERYTHING</span>")
to_world(span_boldannounce("The Master Controller is having some issues, we will need to re-initialize EVERYTHING"))
Initialize(20, TRUE)
@@ -170,7 +170,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
if(init_sss)
init_subtypes(/datum/controller/subsystem, subsystems)
to_chat(world, "<span class='boldannounce'>MC: Initializing subsystems...</span>")
to_chat(world, span_boldannounce("MC: Initializing subsystems..."))
// Sort subsystems by init_order, so they initialize in the correct order.
sortTim(subsystems, GLOBAL_PROC_REF(cmp_subsystem_init))
@@ -187,7 +187,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
var/time = (REALTIMEOFDAY - start_timeofday) / 10
var/msg = "MC: Initializations complete within [time] second[time == 1 ? "" : "s"]!"
to_chat(world, "<span class='boldannounce'>[msg]</span>")
to_chat(world, span_boldannounce("[msg]"))
log_world(msg)
if (!current_runlevel)
@@ -591,9 +591,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
/datum/controller/master/StartLoadingMap(var/quiet = TRUE)
if(map_loading)
admin_notice("<span class='danger'>Another map is attempting to be loaded before first map released lock. Delaying.</span>", R_DEBUG)
admin_notice(span_danger("Another map is attempting to be loaded before first map released lock. Delaying."), R_DEBUG)
else if(!quiet)
admin_notice("<span class='danger'>Map is now being built. Locking.</span>", R_DEBUG)
admin_notice(span_danger("Map is now being built. Locking."), R_DEBUG)
//disallow more than one map to load at once, multithreading it will just cause race conditions
while(map_loading)
@@ -605,7 +605,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
/datum/controller/master/StopLoadingMap(var/quiet = TRUE)
if(!quiet)
admin_notice("<span class='danger'>Map is finished. Unlocking.</span>", R_DEBUG)
admin_notice(span_danger("Map is finished. Unlocking."), R_DEBUG)
map_loading = FALSE
for(var/datum/controller/subsystem/SS as anything in subsystems)
SS.StopLoadingMap()
code/controllers/master_controller.dm
+2 -2
View File
@@ -28,7 +28,7 @@ var/global/pipe_processing_killed = 0
job_master = new /datum/controller/occupations()
job_master.SetupOccupations()
job_master.LoadJobs("config/jobs.txt")
admin_notice("<span class='danger'>Job setup complete</span>", R_DEBUG)
admin_notice(span_danger("Job setup complete"), R_DEBUG)
if(!syndicate_code_phrase) syndicate_code_phrase = generate_code_phrase()
if(!syndicate_code_response) syndicate_code_response = generate_code_phrase()
@@ -40,7 +40,7 @@ var/global/pipe_processing_killed = 0
// SetupXenoarch() - Moved to SSxenoarch
transfer_controller = new
admin_notice("<span class='danger'>Initializations complete.</span>", R_DEBUG)
admin_notice(span_danger("Initializations complete."), R_DEBUG)
// #if UNIT_TEST
// # define CHECK_SLEEP_MASTER // For unit tests we don't care about a smooth lobby screen experience. We care about speed.
code/controllers/subsystem.dm
+2 -2
View File
@@ -158,7 +158,7 @@
subsystem_initialized = TRUE
var/time = (REALTIMEOFDAY - start_timeofday) / 10
var/msg = "Initialized [name] subsystem within [time] second[time == 1 ? "" : "s"]!"
to_chat(world, "<span class='boldannounce'>[msg]</span>")
to_chat(world, span_boldannounce("[msg]"))
log_world(msg)
return time
@@ -210,7 +210,7 @@
can_fire = FALSE
// Safely sleep in a loop until the subsystem is idle, (or its been un-suspended somehow)
while(can_fire <= 0 && state != SS_IDLE)
stoplag() // Safely sleep in a loop until
stoplag() // Safely sleep in a loop until
// Wakes a suspended subsystem.
/datum/controller/subsystem/proc/wake()
code/controllers/subsystems/air.dm
+7 -7
View File
@@ -48,7 +48,7 @@ SUBSYSTEM_DEF(air)
Total Simulated Turfs: [simulated_turf_count]
Total Zones: [zones.len]
Total Edges: [edges.len]
Total Active Edges: [active_edges.len ? "<span class='danger'>[active_edges.len]</span>" : "None"]
Total Active Edges: [active_edges.len ? span_danger("[active_edges.len]") : "None"]
Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_count]
</span>"}, R_DEBUG)
@@ -57,19 +57,19 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
if(active_edges.len)
var/list/edge_log = list()
for(var/connection_edge/E in active_edges)
var/a_temp = E.A.air.temperature
var/a_moles = E.A.air.total_moles
var/a_vol = E.A.air.volume
var/a_gas = ""
for(var/gas in E.A.air.gas)
a_gas += "[gas]=[E.A.air.gas[gas]]"
var/b_temp
var/b_moles
var/b_vol
var/b_gas = ""
// Two zones mixing
if(istype(E, /connection_edge/zone))
var/connection_edge/zone/Z = E
@@ -87,14 +87,14 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
b_vol = "Unsim"
for(var/gas in U.air.gas)
b_gas += "[gas]=[U.air.gas[gas]]"
edge_log += "Active Edge [E] ([E.type])"
edge_log += "Edge side A: T:[a_temp], Mol:[a_moles], Vol:[a_vol], Gas:[a_gas]"
edge_log += "Edge side B: T:[b_temp], Mol:[b_moles], Vol:[b_vol], Gas:[b_gas]"
for(var/turf/T in E.connecting_turfs)
edge_log += "+--- Connecting Turf [T] ([T.type]) @ [T.x], [T.y], [T.z] ([T.loc])"
log_debug("Active Edges on ZAS Startup\n" + edge_log.Join("\n"))
startup_active_edge_log = edge_log.Copy()
code/controllers/subsystems/airflow.dm
+1 -1
View File
@@ -121,7 +121,7 @@ SUBSYSTEM_DEF(airflow)
return FALSE
if (ismob(src))
to_chat(src,"<span class='danger'>You are pushed away by airflow!</span>")
to_chat(src,span_danger("You are pushed away by airflow!"))
last_airflow = world.time
var/airflow_falloff = 9 - sqrt((x - airflow_dest.x) ** 2 + (y - airflow_dest.y) ** 2)
code/controllers/subsystems/atoms.dm
+1 -1
View File
@@ -21,7 +21,7 @@ SUBSYSTEM_DEF(atoms)
setupgenetics() //to set the mutations' place in structural enzymes, so initializers know where to put mutations.
initialized = INITIALIZATION_INNEW_MAPLOAD
to_world_log("Initializing objects")
admin_notice("<span class='danger'>Initializing objects</span>", R_DEBUG)
admin_notice(span_danger("Initializing objects"), R_DEBUG)
InitializeAtoms()
return ..()
code/controllers/subsystems/inactivity.dm
+1 -1
View File
@@ -16,7 +16,7 @@ SUBSYSTEM_DEF(inactivity)
var/client/C = client_list[client_list.len]
client_list.len--
if(C.is_afk(config.kick_inactive MINUTES) && can_kick(C))
to_chat_immediate(C, world.time, "<span class='warning'>You have been inactive for more than [config.kick_inactive] minute\s and have been disconnected.</span>")
to_chat_immediate(C, world.time, span_warning("You have been inactive for more than [config.kick_inactive] minute\s and have been disconnected."))
var/information
if(C.mob)
code/controllers/subsystems/machines.dm
+2 -2
View File
@@ -32,7 +32,7 @@ SUBSYSTEM_DEF(machines)
/datum/controller/subsystem/machines/Initialize(timeofday)
makepowernets()
admin_notice("<span class='danger'>Initializing atmos machinery.</span>", R_DEBUG)
admin_notice(span_danger("Initializing atmos machinery."), R_DEBUG)
setup_atmos_machinery(all_machines)
fire()
..()
@@ -63,7 +63,7 @@ SUBSYSTEM_DEF(machines)
/datum/controller/subsystem/machines/proc/setup_atmos_machinery(list/atmos_machines)
var/list/actual_atmos_machines = list()
for(var/obj/machinery/atmospherics/machine in atmos_machines)
machine.atmos_init()
actual_atmos_machines += machine
code/controllers/subsystems/mapping.dm
+1 -1
View File
@@ -65,7 +65,7 @@ SUBSYSTEM_DEF(mapping)
engine_types += MT
chosen_type = pick(engine_types)
to_world_log("Chose Engine Map: [chosen_type.name]")
admin_notice("<span class='danger'>Chose Engine Map: [chosen_type.name]</span>", R_DEBUG)
admin_notice(span_danger("Chose Engine Map: [chosen_type.name]"), R_DEBUG)
// Annihilate movable atoms
engine_loader.annihilate_bounds()
code/controllers/subsystems/media_tracks.dm
+3 -3
View File
@@ -99,11 +99,11 @@ SUBSYSTEM_DEF(media_tracks)
if(islist(json))
for(var/song in json)
if(!islist(song))
to_chat(C, "<span class='warning'>Song appears to be malformed.</span>")
to_chat(C, span_warning("Song appears to be malformed."))
continue
var/list/songdata = song
if(!songdata["url"] || !songdata["title"] || !songdata["duration"])
to_chat(C, "<span class='warning'>URL, Title, or Duration was missing from a song. Skipping.</span>")
to_chat(C, span_warning("URL, Title, or Duration was missing from a song. Skipping."))
continue
var/datum/track/T = new(songdata["url"], songdata["title"], songdata["duration"], songdata["artist"], songdata["genre"], songdata["secret"], songdata["lobby"])
all_tracks += T
@@ -172,7 +172,7 @@ SUBSYSTEM_DEF(media_tracks)
sort_tracks()
return
to_chat(C, "<span class='warning'>Couldn't find a track matching the specified parameters.</span>")
to_chat(C, span_warning("Couldn't find a track matching the specified parameters."))
/datum/controller/subsystem/media_tracks/proc/add_track(var/mob/user, var/new_url, var/new_title, var/new_duration, var/new_artist, var/new_genre, var/new_secret, var/new_lobby)
if(!check_rights(R_DEBUG|R_FUN))
code/controllers/subsystems/overmap_renamer_vr.dm
+2 -2
View File
@@ -26,7 +26,7 @@ if we end up with multiple renamable lateload overmap objects.*/
if(V.visitable_renamed) //could just if(D.modify_descriptors()), but having a var recording renaming is useful for debugging and stuff!
if(V.known)
to_world_log("##Overmap Renamer: Renamed Debris Field as: [V.name]")
admin_notice("<span class='danger'>Debris Field name chosen as [V.name]</span>", R_DEBUG)
admin_notice(span_danger("Debris Field name chosen as [V.name]"), R_DEBUG)
else
to_world_log("##Overmap Renamer: Renamed Debris Field as: [V.real_name]")
admin_notice("<span class='danger'>Debris Field name chosen as [V.real_name]</span>", R_DEBUG)
admin_notice(span_danger("Debris Field name chosen as [V.real_name]"), R_DEBUG)
code/controllers/subsystems/planets.dm
+5 -5
View File
@@ -15,7 +15,7 @@ SUBSYSTEM_DEF(planets)
var/static/list/needs_temp_update = list()
/datum/controller/subsystem/planets/Initialize(timeofday)
admin_notice("<span class='danger'>Initializing planetary weather.</span>", R_DEBUG)
admin_notice(span_danger("Initializing planetary weather."), R_DEBUG)
createPlanets()
..()
@@ -28,7 +28,7 @@ SUBSYSTEM_DEF(planets)
if(Z > z_to_planet.len)
z_to_planet.len = Z
if(z_to_planet[Z])
admin_notice("<span class='danger'>Z[Z] is shared by more than one planet!</span>", R_DEBUG)
admin_notice(span_danger("Z[Z] is shared by more than one planet!"), R_DEBUG)
continue
z_to_planet[Z] = NP
@@ -40,7 +40,7 @@ SUBSYSTEM_DEF(planets)
var/datum/planet/P = z_to_planet[T.z]
if(!istype(P))
return
if(istype(T, /turf/unsimulated/wall/planetary))
if(istype(T, /turf/unsimulated/wall/planetary))
P.planet_walls += T
else if(istype(T, /turf/simulated) && T.is_outdoors())
P.planet_floors += T
@@ -71,7 +71,7 @@ SUBSYSTEM_DEF(planets)
updateSunlight(P)
if(MC_TICK_CHECK)
return
#ifndef UNIT_TEST // Don't be updating temperatures and such during unit tests
var/list/needs_temp_update = src.needs_temp_update
while(needs_temp_update.len)
@@ -105,7 +105,7 @@ SUBSYSTEM_DEF(planets)
/datum/controller/subsystem/planets/proc/updateSunlight(var/datum/planet/P)
var/new_brightness = P.sun["brightness"]
P.sun_holder.update_brightness(new_brightness, P.planet_floors)
var/new_color = P.sun["color"]
P.sun_holder.update_color(new_color)
code/controllers/subsystems/supply.dm
+1 -1
View File
@@ -200,7 +200,7 @@ SUBSYSTEM_DEF(supply)
A.req_access = L.Copy()
LAZYCLEARLIST(A.req_one_access)
else
log_debug("<span class='danger'>Supply pack with invalid access restriction [SP.access] encountered!</span>")
log_debug(span_danger("Supply pack with invalid access restriction [SP.access] encountered!"))
//supply manifest generation begin
var/obj/item/paper/manifest/slip
code/controllers/subsystems/ticker.dm
+28 -28
View File
@@ -74,8 +74,8 @@ var/global/datum/controller/subsystem/ticker/ticker
post_game_tick()
/datum/controller/subsystem/ticker/proc/pregame_welcome()
to_world("<span class='boldannounce notice'><em>Welcome to the pregame lobby!</em></span>")
to_world("<span class='boldannounce notice'>Please set up your character and select ready. The round will start in [pregame_timeleft] seconds.</span>")
to_world(span_boldannounce(span_notice("<em>Welcome to the pregame lobby!</em>")))
to_world(span_boldannounce(span_notice("Please set up your character and select ready. The round will start in [pregame_timeleft] seconds.")))
world << sound('sound/misc/server-ready.ogg', volume = 100)
// Called during GAME_STATE_PREGAME (RUNLEVEL_LOBBY)
@@ -123,7 +123,7 @@ var/global/datum/controller/subsystem/ticker/ticker
var/list/runnable_modes = config.get_runnable_modes()
if((master_mode == "random") || (master_mode == "secret"))
if(!runnable_modes.len)
to_world("<span class='danger'><B>Unable to choose playable game mode.</B> Reverting to pregame lobby.</span>")
to_world(span_danger("<B>Unable to choose playable game mode.</B> Reverting to pregame lobby."))
return 0
if(secret_force_mode != "secret")
src.mode = config.pick_mode(secret_force_mode)
@@ -136,7 +136,7 @@ var/global/datum/controller/subsystem/ticker/ticker
src.mode = config.pick_mode(master_mode)
if(!src.mode)
to_world("<span class='danger'>Serious error in mode setup! Reverting to pregame lobby.</span>") //Uses setup instead of set up due to computational context.
to_world(span_danger("Serious error in mode setup! Reverting to pregame lobby.")) //Uses setup instead of set up due to computational context.
return 0
job_master.ResetOccupations()
@@ -145,21 +145,21 @@ var/global/datum/controller/subsystem/ticker/ticker
job_master.DivideOccupations() // Apparently important for new antagonist system to register specific job antags properly.
if(!src.mode.can_start())
to_world("<span class='danger'><B>Unable to start [mode.name].</B> Not enough players readied, [config.player_requirements[mode.config_tag]] players needed. Reverting to pregame lobby.</span>")
to_world(span_danger("<B>Unable to start [mode.name].</B> Not enough players readied, [config.player_requirements[mode.config_tag]] players needed. Reverting to pregame lobby."))
mode.fail_setup()
mode = null
job_master.ResetOccupations()
return 0
if(hide_mode)
to_world("<span class='notice'><B>The current game mode is - Secret!</B></span>")
to_world(span_notice("<B>The current game mode is - Secret!</B>"))
if(runnable_modes.len)
var/list/tmpmodes = new
for (var/datum/game_mode/M in runnable_modes)
tmpmodes+=M.name
tmpmodes = sortList(tmpmodes)
if(tmpmodes.len)
to_world("<span class='info'><B>Possibilities:</B> [english_list(tmpmodes, and_text= "; ", comma_text = "; ")]</span>")
to_world(span_info("<B>Possibilities:</B> [english_list(tmpmodes, and_text= "; ", comma_text = "; ")]"))
else
src.mode.announce()
return 1
@@ -181,7 +181,7 @@ var/global/datum/controller/subsystem/ticker/ticker
//Deleting Startpoints but we need the ai point to AI-ize people later
if (S.name != "AI")
qdel(S)
to_world("<span class='boldannounce notice'><em>Enjoy the game!</em></span>")
to_world(span_boldannounce(span_notice("<em>Enjoy the game!</em>")))
world << sound('sound/AI/welcome.ogg') // Skie
//Holiday Round-start stuff ~Carn
Holiday_Game_Start()
@@ -225,7 +225,7 @@ var/global/datum/controller/subsystem/ticker/ticker
end_game_state = END_GAME_MODE_FINISHED // Only do this cleanup once!
mode.cleanup()
//call a transfer shuttle vote
to_world("<span class='danger'>The round has ended!</span>")
to_world(span_danger("The round has ended!"))
SSvote.autotransfer()
// Called during GAME_STATE_FINISHED (RUNLEVEL_POSTGAME)
@@ -238,7 +238,7 @@ var/global/datum/controller/subsystem/ticker/ticker
feedback_set_details("end_proper", "nuke")
restart_timeleft = 1 MINUTE // No point waiting five minutes if everyone's dead.
if(!delay_end)
to_world("<span class='notice'><b>Rebooting due to destruction of [station_name()] in [round(restart_timeleft/600)] minute\s.</b></span>")
to_world(span_notice("<b>Rebooting due to destruction of [station_name()] in [round(restart_timeleft/600)] minute\s.</b>"))
last_restart_notify = world.time
else
feedback_set_details("end_proper", "proper completion")
@@ -252,14 +252,14 @@ var/global/datum/controller/subsystem/ticker/ticker
if(END_GAME_ENDING)
restart_timeleft -= (world.time - last_fire)
if(delay_end)
to_world("<span class='notice'><b>An admin has delayed the round end.</b></span>")
to_world(span_notice("<b>An admin has delayed the round end.</b>"))
end_game_state = END_GAME_DELAYED
else if(restart_timeleft <= 0)
to_world("<span class='warning'><b>Restarting world!</b></span>")
to_world(span_warning("<b>Restarting world!</b>"))
sleep(5)
world.Reboot()
else if (world.time - last_restart_notify >= 1 MINUTE)
to_world("<span class='notice'><b>Restarting in [round(restart_timeleft/600, 1)] minute\s.</b></span>")
to_world(span_notice("<b>Restarting in [round(restart_timeleft/600, 1)] minute\s.</b>"))
last_restart_notify = world.time
return
if(END_GAME_DELAYED)
@@ -451,47 +451,47 @@ var/global/datum/controller/subsystem/ticker/ticker
if(captainless)
for(var/mob/M in player_list)
if(!istype(M,/mob/new_player))
to_chat(M, "<span class='notice'>Site Management is not forced on anyone.</span>")
to_chat(M, span_notice("Site Management is not forced on anyone."))
/datum/controller/subsystem/ticker/proc/declare_completion()
to_world("<span class='filter_system'><br><br><br><H1>A round of [mode.name] has ended!</H1></span>")
to_world(span_filter_system("<br><br><br><H1>A round of [mode.name] has ended!</H1>"))
for(var/mob/Player in player_list)
if(Player.mind && !isnewplayer(Player))
if(Player.stat != DEAD)
var/turf/playerTurf = get_turf(Player)
if(emergency_shuttle.departed && emergency_shuttle.evac)
if(isNotAdminLevel(playerTurf.z))
to_chat(Player, "<span class='filter_system'>[span_blue("<b>You survived the round, but remained on [station_name()] as [Player.real_name].</b>")]</span>")
to_chat(Player, span_filter_system("[span_blue("<b>You survived the round, but remained on [station_name()] as [Player.real_name].</b>")]"))
else
to_chat(Player, "<span class='filter_system'>[span_green("<b>You managed to survive the events on [station_name()] as [Player.real_name].</b>")]</span>")
to_chat(Player, span_filter_system("[span_green("<b>You managed to survive the events on [station_name()] as [Player.real_name].</b>")]"))
else if(isAdminLevel(playerTurf.z))
to_chat(Player, "<span class='filter_system'>[span_green("<b>You successfully underwent crew transfer after events on [station_name()] as [Player.real_name].</b>")]</span>")
to_chat(Player, span_filter_system("[span_green("<b>You successfully underwent crew transfer after events on [station_name()] as [Player.real_name].</b>")]"))
else if(issilicon(Player))
to_chat(Player, "<span class='filter_system'>[span_green("<b>You remain operational after the events on [station_name()] as [Player.real_name].</b>")]</span>")
to_chat(Player, span_filter_system("[span_green("<b>You remain operational after the events on [station_name()] as [Player.real_name].</b>")]"))
else
to_chat(Player, "<span class='filter_system'>[span_blue("<b>You missed the crew transfer after the events on [station_name()] as [Player.real_name].</b>")]</span>")
to_chat(Player, span_filter_system("[span_blue("<b>You missed the crew transfer after the events on [station_name()] as [Player.real_name].</b>")]"))
else
if(istype(Player,/mob/observer/dead))
var/mob/observer/dead/O = Player
if(!O.started_as_observer)
to_chat(Player, "<span class='filter_system'>[span_red("<b>You did not survive the events on [station_name()]...</b>")]</span>")
to_chat(Player, span_filter_system("[span_red("<b>You did not survive the events on [station_name()]...</b>")]"))
else
to_chat(Player, "<span class='filter_system'>[span_red("<b>You did not survive the events on [station_name()]...</b>")]</span>")
to_chat(Player, span_filter_system("[span_red("<b>You did not survive the events on [station_name()]...</b>")]"))
to_world("<br>")
for (var/mob/living/silicon/ai/aiPlayer in mob_list)
if (aiPlayer.stat != 2)
to_world("<span class='filter_system'><b>[aiPlayer.name]'s laws at the end of the round were:</b></span>") // VOREStation edit
to_world(span_filter_system("<b>[aiPlayer.name]'s laws at the end of the round were:</b>")) // VOREStation edit
else
to_world("<span class='filter_system'><b>[aiPlayer.name]'s laws when it was deactivated were:</b></span>") // VOREStation edit
to_world(span_filter_system("<b>[aiPlayer.name]'s laws when it was deactivated were:</b>")) // VOREStation edit
aiPlayer.show_laws(1)
if (aiPlayer.connected_robots.len)
var/robolist = "<b>The AI's loyal minions were:</b> "
for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots)
robolist += "[robo.name][robo.stat?" (Deactivated), ":", "]" // VOREStation edit
to_world("<span class='filter_system'>[robolist]</span>")
to_world(span_filter_system("[robolist]"))
var/dronecount = 0
@@ -508,15 +508,15 @@ var/global/datum/controller/subsystem/ticker/ticker
if (!robo.connected_ai)
if (robo.stat != 2)
to_world("<span class='filter_system'><b>[robo.name] survived as an AI-less stationbound synthetic! Its laws were:</b></span>") // VOREStation edit
to_world(span_filter_system("<b>[robo.name] survived as an AI-less stationbound synthetic! Its laws were:</b>")) // VOREStation edit
else
to_world("<span class='filter_system'><b>[robo.name] was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:</b></span>") // VOREStation edit
to_world(span_filter_system("<b>[robo.name] was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:</b>")) // VOREStation edit
if(robo) //How the hell do we lose robo between here and the world messages directly above this?
robo.laws.show_laws(world)
if(dronecount)
to_world("<span class='filter_system'><b>There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] at the end of this round.</b></span>")
to_world(span_filter_system("<b>There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] at the end of this round.</b>"))
mode.declare_completion()//To declare normal completion.
code/controllers/subsystems/vote.dm
+1 -1
View File
@@ -367,7 +367,7 @@ SUBSYSTEM_DEF(vote)
if(tgui_alert(usr, "Are you sure you want to start a RESTART VOTE? You should only do this if the server is dying and no staff are around to investigate.", "RESTART VOTE", list("No", "Yes I want to start a RESTART VOTE")) == "Yes I want to start a RESTART VOTE")
initiate_vote(VOTE_RESTART, usr.key)
else
to_chat(usr, "<span class = 'warning'>You can't start a RESTART VOTE while there are staff around. If you are having an issue with the round, please ahelp it.</span>")
to_chat(usr, span_warning("You can't start a RESTART VOTE while there are staff around. If you are having an issue with the round, please ahelp it."))
if(VOTE_GAMEMODE)
if(config.allow_vote_mode || usr.client.holder)
initiate_vote(VOTE_GAMEMODE, usr.key)
code/datums/ai_laws.dm
+1 -1
View File
@@ -227,7 +227,7 @@
if(law == zeroth_law_borg)
continue
if(law == zeroth_law)
to_chat(who, "<span class='danger'>[law.get_index()]. [law.law]</span>")
to_chat(who, span_danger("[law.get_index()]. [law.law]"))
else
to_chat(who, "[law.get_index()]. [law.law]")
code/datums/browser.dm
+1 -1
View File
@@ -113,7 +113,7 @@
/datum/browser/proc/open(var/use_onclose = 1)
if(isnull(window_id)) //null check because this can potentially nuke goonchat
WARNING("Browser [title] tried to open with a null ID")
to_chat(user, "<span class='userdanger'>The [title] browser you tried to open failed a sanity check! Please report this on github!</span>")
to_chat(user, span_userdanger("The [title] browser you tried to open failed a sanity check! Please report this on github!"))
return
var/window_size = ""
if (width && height)
code/datums/components/crafting/crafting.dm
+2 -2
View File
@@ -468,10 +468,10 @@
user.put_in_hands(result)
else
result.forceMove(user.drop_location())
to_chat(user, "<span class='notice'>[TR.name] constructed.</span>")
to_chat(user, span_notice("[TR.name] constructed."))
TR.on_craft_completion(user, result)
else
to_chat(user, "<span class='warning'>Construction failed[result]</span>")
to_chat(user, span_warning("Construction failed[result]"))
busy = FALSE
if("toggle_recipes")
display_craftable_only = !display_craftable_only
code/datums/components/material_container.dm
+13 -13
View File
@@ -102,7 +102,7 @@
for(var/datum/material/M as anything in materials)
var/amt = materials[M]
if(amt)
examine_texts += "<span class='notice'>It has [amt] units of [lowertext(M.name)] stored.</span>"
examine_texts += span_notice("It has [amt] units of [lowertext(M.name)] stored.")
/// Proc that allows players to fill the parent with mats
/datum/component/material_container/proc/on_attackby(datum/source, obj/item/I, mob/living/user)
@@ -113,7 +113,7 @@
return
if(tc && !is_type_in_typecache(I, tc))
if(!(mat_container_flags & MATCONTAINER_SILENT))
to_chat(user, "<span class='warning'>[parent] won't accept [I]!</span>")
to_chat(user, span_warning("[parent] won't accept [I]!"))
return
. = COMPONENT_CANCEL_ATTACK_CHAIN
var/datum/callback/pc = precondition
@@ -125,10 +125,10 @@
return
var/material_amount = get_item_material_amount(I, mat_container_flags)
if(!material_amount)
to_chat(user, "<span class='warning'>[I] does not contain sufficient materials to be accepted by [parent].</span>")
to_chat(user, span_warning("[I] does not contain sufficient materials to be accepted by [parent]."))
return
if(!has_space(material_amount))
to_chat(user, "<span class='warning'>[parent] is full. Please remove materials from [parent] in order to insert more.</span>")
to_chat(user, span_warning("[parent] is full. Please remove materials from [parent] in order to insert more."))
return
user_insert(I, user, mat_container_flags)
@@ -136,7 +136,7 @@
/datum/component/material_container/proc/user_insert_stack(obj/item/stack/S, mob/living/user, breakdown_flags = mat_container_flags)
var/sheets = S.get_amount()
if(sheets < 1)
to_chat(user, "<span class='warning'>[S] does not contain sufficient materials to be accepted by [parent].</span>")
to_chat(user, span_warning("[S] does not contain sufficient materials to be accepted by [parent]."))
return
// Cache this since S may go away after use()
@@ -149,23 +149,23 @@
// If any part of a sheet can't go in us, the whole sheet is invalid
if(!can_hold_material(GET_MATERIAL_REF(material)))
to_chat(user, "<span class='warning'>[parent] cannot contain [material].</span>")
to_chat(user, span_warning("[parent] cannot contain [material]."))
return
// Our sheet had no material. Whoops.
if(!matter_per_sheet)
to_chat(user, "<span class='warning'>[S] does not contain any matter acceptable by [parent].</span>")
to_chat(user, span_warning("[S] does not contain any matter acceptable by [parent]."))
return
// If we can't fit the material for one sheet, we're full.
if(!has_space(matter_per_sheet))
to_chat(user, "<span class='warning'>[parent] is full. Please remove materials from [parent] in order to insert more.</span>")
to_chat(user, span_warning("[parent] is full. Please remove materials from [parent] in order to insert more."))
return
// Calculate the maximum amount of sheets we could possibly accept.
var/max_sheets = round((max_amount - total_amount) / matter_per_sheet)
if(max_sheets <= 0)
to_chat(user, "<span class='warning'>[parent] is full. Please remove materials from [parent] in order to insert more.</span>")
to_chat(user, span_warning("[parent] is full. Please remove materials from [parent] in order to insert more."))
return
// Calculate the amount of sheets we're actually going to use.
@@ -176,7 +176,7 @@
// Use the amount of sheets from the stack
if(!S.use(sheets_to_use))
to_chat(user, "<span class='warning'>Something went wrong with your stack. Split it manually and try again.</span>")
to_chat(user, span_warning("Something went wrong with your stack. Split it manually and try again."))
return
// We're going to blindly insert all of the materials, our assertion above says it shouldn't be possible to overflow
@@ -187,7 +187,7 @@
last_inserted_id = matter
// Tell the user and wrap up.
to_chat(user, "<span class='notice'>You insert a material total of [inserted] into [parent].</span>")
to_chat(user, span_notice("You insert a material total of [inserted] into [parent]."))
if(after_insert)
after_insert.Invoke(S, last_inserted_id, inserted)
@@ -196,11 +196,11 @@
set waitfor = FALSE
var/active_held = user.get_active_hand() // differs from I when using TK
if(!user.unEquip(I))
to_chat(user, "<span class='warning'>[I] is stuck to you and cannot be placed into [parent].</span>")
to_chat(user, span_warning("[I] is stuck to you and cannot be placed into [parent]."))
return
var/inserted = insert_item(I, breakdown_flags = mat_container_flags)
if(inserted)
to_chat(user, "<span class='notice'>You insert a material total of [inserted] into [parent].</span>")
to_chat(user, span_notice("You insert a material total of [inserted] into [parent]."))
qdel(I)
if(after_insert)
after_insert.Invoke(I, last_inserted_id, inserted)
code/datums/datumvars.dm
+1 -1
View File
@@ -86,7 +86,7 @@
datumname = "element"
_AddElement(lst)
log_admin("[key_name(usr)] has added [result] [datumname] to [key_name(src)].")
message_admins("<span class='notice'>[key_name_admin(usr)] has added [result] [datumname] to [key_name_admin(src)].</span>")
message_admins(span_notice("[key_name_admin(usr)] has added [result] [datumname] to [key_name_admin(src)]."))
/datum/proc/vv_get_header()
. = list()
code/datums/ghost_query.dm
+6 -6
View File
@@ -78,22 +78,22 @@
if("Never for this round")
if(be_special_flag)
D.client.prefs.be_special ^= be_special_flag
to_chat(D, "<span class='notice'>You will not be prompted to join similar roles to [role_name] for the rest of this round. Note: If you save your character now, it will save this permanently.</span>")
to_chat(D, span_notice("You will not be prompted to join similar roles to [role_name] for the rest of this round. Note: If you save your character now, it will save this permanently."))
else
to_chat(D, "<span class='warning'>This type of ghost-joinable role doesn't have a role type flag associated with it, so I can't prevent future requests, sorry. Bug a dev!</span>")
to_chat(D, span_warning("This type of ghost-joinable role doesn't have a role type flag associated with it, so I can't prevent future requests, sorry. Bug a dev!"))
if("Yes")
if(!evaluate_candidate(D)) // Failed revalidation
to_chat(D, "<span class='warning'>Unfortunately, you no longer qualify for this role. Sorry.</span>")
to_chat(D, span_warning("Unfortunately, you no longer qualify for this role. Sorry."))
else if(finished) // Already finished candidate list
to_chat(D, "<span class='warning'>Unfortunately, you were not fast enough, and there are no more available roles. Sorry.</span>")
to_chat(D, span_warning("Unfortunately, you were not fast enough, and there are no more available roles. Sorry."))
else // Prompt a second time
tgui_alert_async(D, "Are you sure you want to play as a [role_name]?", "[role_name] request", list("I'm Sure", "Nevermind"), CALLBACK(src, PROC_REF(get_reply)), wait_time SECONDS)
if("I'm Sure")
if(!evaluate_candidate(D)) // Failed revalidation
to_chat(D, "<span class='warning'>Unfortunately, you no longer qualify for this role. Sorry.</span>")
to_chat(D, span_warning("Unfortunately, you no longer qualify for this role. Sorry."))
else if(finished) // Already finished candidate list
to_chat(D, "<span class='warning'>Unfortunately, you were not fast enough, and there are no more available roles. Sorry.</span>")
to_chat(D, span_warning("Unfortunately, you were not fast enough, and there are no more available roles. Sorry."))
else // Accept their nomination
candidates.Add(D)
if(cutoff_number && candidates.len >= cutoff_number)
code/datums/helper_datums/getrev.dm
+4 -4
View File
@@ -15,7 +15,7 @@ GLOBAL_DATUM(revdata, /datum/getrev)
revision = REV.origin_commit || REV.commit
branch = "-Using TGS-" // TGS doesn't provide branch info yet
date = "-Using TGS-" // Or date
if(!revision) // File parse method
var/list/head_branch = file2list(".git/HEAD", "\n")
if(head_branch.len)
@@ -58,11 +58,11 @@ GLOBAL_DATUM(revdata, /datum/getrev)
set desc = "Check the current server code revision"
if(!GLOB.revdata)
to_chat(src, "<span class='warning'>Please wait until server initializations are complete.</span>")
to_chat(src, span_warning("Please wait until server initializations are complete."))
return
var/list/msg = list()
if(GLOB.revdata.revision)
msg += "<b>Server revision:</b> B:[GLOB.revdata.branch] D:[GLOB.revdata.date]"
if(config.githuburl)
code/datums/helper_datums/teleport.dm
+9 -9
View File
@@ -179,29 +179,29 @@ var/bluespace_item_types = newlist(/obj/item/storage/backpack/holding,
precision = max(rand(1,100)*bluespace_things.len,100)
if(istype(teleatom, /mob/living))
var/mob/living/MM = teleatom
to_chat(MM, "<span class='danger'>The Bluespace interface on your [teleatom] interferes with the teleport!</span>")
to_chat(MM, span_danger("The Bluespace interface on your [teleatom] interferes with the teleport!"))
return 1
/datum/teleport/instant/science/teleportChecks()
if(istype(teleatom, /obj/item/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
teleatom.visible_message(span_danger("\The [teleatom] bounces off of the portal!"))
return 0
if(!isemptylist(teleatom.search_contents_for(/obj/item/disk/nuclear)))
if(istype(teleatom, /mob/living))
var/mob/living/MM = teleatom
MM.visible_message("<span class='danger'>\The [MM] bounces off of the portal!</span>","<span class='warning'>Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through.</span>")
MM.visible_message(span_danger("\The [MM] bounces off of the portal!"),span_warning("Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through."))
else
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
teleatom.visible_message(span_danger("\The [teleatom] bounces off of the portal!"))
return 0
/* VOREStation Removal
if(destination.z in using_map.admin_levels) //CentCom z-level
if(istype(teleatom, /obj/mecha))
var/obj/mecha/MM = teleatom
to_chat(MM.occupant, "<span class='danger'>\The [MM] would not survive the jump to a location so far away!</span>")
to_chat(MM.occupant, span_danger("\The [MM] would not survive the jump to a location so far away!"))
return 0
if(!isemptylist(teleatom.search_contents_for(/obj/item/storage/backpack/holding)))
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
teleatom.visible_message(span_danger("\The [teleatom] bounces off of the portal!"))
return 0
*/ //VOREStation Removal End
//VOREStation Edit Start
@@ -209,7 +209,7 @@ var/bluespace_item_types = newlist(/obj/item/storage/backpack/holding,
var/turf/dest_turf = get_turf(destination)
if(local && !(dest_turf.z in using_map.player_levels))
if(istype(teleatom, /mob/living))
to_chat(teleatom, "<span class='warning'>The portal refuses to carry you that far away!</span>")
to_chat(teleatom, span_warning("The portal refuses to carry you that far away!"))
return 0
else if(istype(destination.loc, /obj/belly))
var/obj/belly/destination_belly = destination.loc
@@ -226,9 +226,9 @@ var/bluespace_item_types = newlist(/obj/item/storage/backpack/holding,
obstructed = 1
else if(!((isturf(destination) && !destination.density) || (isturf(destination.loc) && !destination.loc.density)) || !destination.x || !destination.y || !destination.z) //If we're inside something or outside universe
obstructed = 1
to_chat(teleatom, "<span class='warning'>Something is blocking way on the other side!</span>")
to_chat(teleatom, span_warning("Something is blocking way on the other side!"))
if(obstructed)
return 0
else
return 1
//VOREStation Edit End
//VOREStation Edit End
code/datums/mind.dm
+4 -4
View File
@@ -166,7 +166,7 @@
if(antag.add_antagonist(src, 1, 1, 0, 1, 1)) // Ignore equipment and role type for this.
log_admin("[key_name_admin(usr)] made [key_name(src)] into a [antag.role_text].")
else
to_chat(usr, "<span class='warning'>[src] could not be made into a [antag.role_text]!</span>")
to_chat(usr, span_warning("[src] could not be made into a [antag.role_text]!"))
else if(href_list["remove_antagonist"])
var/datum/antagonist/antag = all_antag_types[href_list["remove_antagonist"]]
@@ -203,7 +203,7 @@
return
if(mind)
mind.ambitions = sanitize(new_ambition)
to_chat(mind.current, "<span class='warning'>Your ambitions have been changed by higher powers, they are now: [mind.ambitions]</span>")
to_chat(mind.current, span_warning("Your ambitions have been changed by higher powers, they are now: [mind.ambitions]"))
log_and_message_admins("made [key_name(mind.current)]'s ambitions be '[mind.ambitions]'.")
else if (href_list["obj_edit"] || href_list["obj_add"])
@@ -353,10 +353,10 @@
if(I in organs.implants)
qdel(I)
break
to_chat(H, "<span class='notice'><font size =3><B>Your loyalty implant has been deactivated.</B></font></span>")
to_chat(H, span_notice("<font size =3><B>Your loyalty implant has been deactivated.</B></font>"))
log_admin("[key_name_admin(usr)] has de-loyalty implanted [current].")
if("add")
to_chat(H, "<span class='danger'><font size =3>You somehow have become the recepient of a loyalty transplant, and it just activated!</font></span>")
to_chat(H, span_danger("<font size =3>You somehow have become the recepient of a loyalty transplant, and it just activated!</font>"))
H.implant_loyalty(override = TRUE)
log_admin("[key_name_admin(usr)] has loyalty implanted [current].")
else
code/datums/observation/stat_set.dm
+2 -2
View File
@@ -30,6 +30,6 @@ stat_set_event, /decl/observ/stat_set, new)
if(!ourbelly.owner.client)
return
if(stat == CONSCIOUS)
to_chat(ourbelly.owner, "<span class='notice'>\The [src.name] is awake.</span>")
to_chat(ourbelly.owner, span_notice("\The [src.name] is awake."))
else if(stat == UNCONSCIOUS)
to_chat(ourbelly.owner, "<span class='red'>\The [src.name] has fallen unconscious!</span>")
to_chat(ourbelly.owner, span_red("\The [src.name] has fallen unconscious!"))
code/datums/riding.dm
+4 -4
View File
@@ -93,7 +93,7 @@
if(only_one_driver && ridden.buckled_mobs.len)
var/mob/living/driver = ridden.buckled_mobs[1]
if(driver != user)
to_chat(user, "<span class='warning'>\The [ridden] can only be controlled by one person at a time, and is currently being controlled by \the [driver].</span>")
to_chat(user, span_warning("\The [ridden] can only be controlled by one person at a time, and is currently being controlled by \the [driver]."))
return
if(world.time < next_vehicle_move)
@@ -109,7 +109,7 @@
handle_vehicle_layer()
handle_vehicle_offsets()
else
to_chat(user, "<span class='warning'>You'll need [key_name] in one of your hands to move \the [ridden].</span>")
to_chat(user, span_warning("You'll need [key_name] in one of your hands to move \the [ridden]."))
/datum/riding/proc/Unbuckle(atom/movable/M)
// addtimer(CALLBACK(ridden, TYPE_PROC_REF(/atom/movable, unbuckle_mob), M), 0, TIMER_UNIQUE)
@@ -143,12 +143,12 @@
var/turf/current = get_turf(ridden)
if(istype(current, /turf/simulated/floor/water/underwater)) //don't work at the bottom of the ocean!
to_chat(user, "<span class='warning'>The boat has sunk!</span>")
to_chat(user, span_warning("The boat has sunk!"))
return FALSE
else if(istype(next, /turf/simulated/floor/water) || istype(current, /turf/simulated/floor/water)) //We can move from land to water, or water to land, but not from land to land
..()
else
to_chat(user, "<span class='warning'>Boats don't go on land!</span>")
to_chat(user, span_warning("Boats don't go on land!"))
return FALSE
/datum/riding/boat/small // 'Small' boats can hold up to two people.
code/datums/roundstats/departmentgoal.dm
+4 -4
View File
@@ -41,16 +41,16 @@ GLOBAL_LIST(active_department_goals)
for(var/category in GLOB.active_department_goals)
var/list/cat_goals = GLOB.active_department_goals[category]
to_world("<span class='filter_system'><b>[category]</b></span>")
to_world(span_filter_system("<b>[category]</b>"))
if(!LAZYLEN(cat_goals))
to_world("<span class='filter_system'>There were no assigned goals!</span>")
to_world(span_filter_system("There were no assigned goals!"))
else
for(var/datum/goal/G in cat_goals)
var/success = G.check_completion()
to_world("<span class='filter_system'>[success ? "<span class='notice'>[G.name]</span>" : "<span class='warning'>[G.name]</span>"]</span>")
to_world("<span class='filter_system'>[G.goal_text]</span>")
to_world(span_filter_system("[success ? span_notice("[G.name]") : span_warning("[G.name]")]"))
to_world(span_filter_system("[G.goal_text]"))
return 1
/datum/goal
code/datums/wires/jukebox.dm
+5 -5
View File
@@ -31,16 +31,16 @@
var/obj/machinery/media/jukebox/A = holder
switch(wire)
if(WIRE_MAIN_POWER1)
holder.visible_message("<span class='notice'>[icon2html(A,viewers(holder))] The power light flickers.</span>")
holder.visible_message(span_notice("[icon2html(A,viewers(holder))] The power light flickers."))
A.shock(usr, 90)
if(WIRE_JUKEBOX_HACK)
holder.visible_message("<span class='notice'>[icon2html(A,viewers(holder))] The parental guidance light flickers.</span>")
holder.visible_message(span_notice("[icon2html(A,viewers(holder))] The parental guidance light flickers."))
if(WIRE_REVERSE)
holder.visible_message("<span class='notice'>[icon2html(A,viewers(holder))] The data light blinks ominously.</span>")
holder.visible_message(span_notice("[icon2html(A,viewers(holder))] The data light blinks ominously."))
if(WIRE_SPEEDUP)
holder.visible_message("<span class='notice'>[icon2html(A,viewers(holder))] The speakers squeaks.</span>")
holder.visible_message(span_notice("[icon2html(A,viewers(holder))] The speakers squeaks."))
if(WIRE_SPEEDDOWN)
holder.visible_message("<span class='notice'>[icon2html(A,viewers(holder))] The speakers rumble.</span>")
holder.visible_message(span_notice("[icon2html(A,viewers(holder))] The speakers rumble."))
if(WIRE_START)
A.StartPlaying()
if(WIRE_STOP)
code/datums/wires/wires.dm
+4 -4
View File
@@ -170,7 +170,7 @@
if("cut")
// if(!I.has_tool_quality(TOOL_WIRECUTTER) && !user.can_admin_interact())
if(!istype(I) || !I.has_tool_quality(TOOL_WIRECUTTER))
to_chat(user, "<span class='error'>You need wirecutters!</span>")
to_chat(user, span_warning("You need wirecutters!"))
return
playsound(holder, I.usesound, 20, 1)
@@ -181,7 +181,7 @@
if("pulse")
// if(!I.has_tool_quality(TOOL_MULTITOOL) && !user.can_admin_interact())
if(!istype(I) || !I.has_tool_quality(TOOL_MULTITOOL))
to_chat(user, "<span class='error'>You need a multitool!</span>")
to_chat(user, span_warning("You need a multitool!"))
return
playsound(holder, 'sound/weapons/empty.ogg', 20, 1)
@@ -202,14 +202,14 @@
return TRUE
if(!istype(I, /obj/item/assembly/signaler))
to_chat(user, "<span class='error'>You need a remote signaller!</span>")
to_chat(user, span_warning("You need a remote signaller!"))
return
if(user.unEquip(I))
attach_assembly(color, I)
return TRUE
else
to_chat(user, "<span class='warning'>[I] is stuck to your hand!</span>")
to_chat(user, span_warning("[I] is stuck to your hand!"))
/**
* Proc called to determine if the user can see wire define information, such as "Contraband", "Door Bolts", etc.
code/defines/obj/weapon.dm
+3 -3
View File
@@ -41,7 +41,7 @@
throw_range = 20
var/randomize = TRUE
var/square_chance = 10
/obj/item/soap/Initialize()
if(randomize && prob(square_chance))
icon_state = "[icon_state]-alt"
@@ -331,7 +331,7 @@
if (C.bugged && C.status)
cameras.Add(C)
if (length(cameras) == 0)
to_chat(usr, "<span class='warning'>No bugged functioning cameras found.</span>")
to_chat(usr, span_warning("No bugged functioning cameras found."))
return
var/list/friendly_cameras = new/list()
@@ -433,7 +433,7 @@
/obj/item/storage/part_replacer/examine(mob/user)
. = ..()
if(!reskin_ran)
. += "<span class='notice'>[src]'s external casing can be modified via alt-click.</span>"
. += span_notice("[src]'s external casing can be modified via alt-click.")
/obj/item/storage/part_replacer/AltClick(mob/user)
. = ..()
code/defines/procs/announce.dm
+5 -5
View File
@@ -56,9 +56,9 @@
for(var/mob/M in player_list)
if(!istype(M,/mob/new_player) && !isdeaf(M))
to_chat(M, "<h2 class='alert'>[title]</h2>")
to_chat(M, "<span class='alert'>[message]</span>")
to_chat(M, span_alert("[message]"))
if (announcer)
to_chat(M, "<span class='alert'> -[html_encode(announcer)]</span>")
to_chat(M, span_alert(" -[html_encode(announcer)]"))
// You'll need to update these to_world usages if you want to make these z-level specific ~Aro
/datum/announcement/minor/Message(message as text, message_title as text)
@@ -66,9 +66,9 @@
/datum/announcement/priority/Message(message as text, message_title as text)
to_world("<h1 class='alert'>[message_title]</h1>")
to_world("<span class='alert'>[message]</span>")
to_world(span_alert("[message]"))
if(announcer)
to_world("<span class='alert'> -[html_encode(announcer)]</span>")
to_world(span_alert(" -[html_encode(announcer)]"))
to_world("<br>")
/datum/announcement/priority/command/Message(message as text, message_title as text, var/list/zlevels)
@@ -77,7 +77,7 @@
if (message_title)
command += "<br><h2 class='alert'>[message_title]</h2>"
command += "<br><span class='alert'>[message]</span><br>"
command += "<br>[span_alert(message)]<br>"
command += "<br>"
for(var/mob/M in player_list)
if(zlevels && !(get_z(M) in zlevels))
code/game/antagonist/antagonist.dm
+1 -1
View File
@@ -145,7 +145,7 @@
if(!istype(player))
message_admins("[uppertext(ticker.mode.name)]: Failed to find a candidate for [role_text].")
return 0
to_chat(player.current, "<span class='danger'><i>You have been selected this round as an antagonist!</i></span>")
to_chat(player.current, span_danger("<i>You have been selected this round as an antagonist!</i>"))
message_admins("[uppertext(ticker.mode.name)]: Selected [player] as a [role_text].")
if(istype(player.current, /mob/observer/dead))
create_default(player.current)
code/game/antagonist/antagonist_add.dm
+4 -4
View File
@@ -42,10 +42,10 @@
// Handle only adding a mind and not bothering with gear etc.
if(nonstandard_role_type)
faction_members |= player
to_chat(player.current, "<span class='danger'><font size=3>You are \a [nonstandard_role_type]!</font></span>")
to_chat(player.current, span_danger("<font size=3>You are \a [nonstandard_role_type]!</font>"))
player.special_role = nonstandard_role_type
if(nonstandard_role_msg)
to_chat(player.current, "<span class='notice'>[nonstandard_role_msg]</span>")
to_chat(player.current, span_notice("[nonstandard_role_msg]"))
update_icons_added(player)
return 1
@@ -53,7 +53,7 @@
if(player.current && faction_verb)
player.current.verbs -= faction_verb
if(player in current_antagonists)
to_chat(player.current, "<span class='danger'><font size = 3>You are no longer a [role_text]!</font></span>")
to_chat(player.current, span_danger("<font size = 3>You are no longer a [role_text]!</font>"))
current_antagonists -= player
faction_members -= player
player.special_role = null
@@ -64,4 +64,4 @@
player.current.client.verbs -= /client/proc/aooc
player.ambitions = ""
return 1
return 0
return 0
code/game/antagonist/antagonist_create.dm
+5 -5
View File
@@ -88,7 +88,7 @@
code_owner.store_memory("<B>Nuclear Bomb Code</B>: [code]", 0, 0)
to_chat(code_owner.current, "The nuclear authorization code is: <B>[code]</B>")
else
message_admins("<span class='danger'>Could not spawn nuclear bomb. Contact a developer.</span>")
message_admins(span_danger("Could not spawn nuclear bomb. Contact a developer."))
return
spawned_nuke = code
@@ -101,13 +101,13 @@
window_flash(player.current.client)
// Basic intro text.
to_chat(player.current, "<span class='danger'><font size=3>You are a [role_text]!</font></span>")
to_chat(player.current, span_danger("<font size=3>You are a [role_text]!</font>"))
if(leader_welcome_text && player == leader)
to_chat(player.current, "<span class='notice'>[leader_welcome_text]</span>")
to_chat(player.current, span_notice("[leader_welcome_text]"))
else
to_chat(player.current, "<span class='notice'>[welcome_text]</span>")
to_chat(player.current, span_notice("[welcome_text]"))
if (config.objectives_disabled)
to_chat(player.current, "<span class='notice'>[antag_text]</span>")
to_chat(player.current, span_notice("[antag_text]"))
if((flags & ANTAG_HAS_NUKE) && !spawned_nuke)
create_nuke()
code/game/antagonist/antagonist_factions.dm
+9 -9
View File
@@ -14,33 +14,33 @@
return
if(faction.is_antagonist(player))
to_chat(src, "<span class='warning'>\The [player.current] already serves the [faction.faction_descriptor].</span>")
to_chat(src, span_warning("\The [player.current] already serves the [faction.faction_descriptor]."))
return
if(player_is_antag(player))
to_chat(src, "<span class='warning'>\The [player.current]'s loyalties seem to be elsewhere...</span>")
to_chat(src, span_warning("\The [player.current]'s loyalties seem to be elsewhere..."))
return
if(!faction.can_become_antag(player))
to_chat(src, "<span class='warning'>\The [player.current] cannot be \a [faction.faction_role_text]!</span>")
to_chat(src, span_warning("\The [player.current] cannot be \a [faction.faction_role_text]!"))
return
if(world.time < player.rev_cooldown)
to_chat(src, "<span class='danger'>You must wait five seconds between attempts.</span>")
to_chat(src, span_danger("You must wait five seconds between attempts."))
return
to_chat(src, "<span class='danger'>You are attempting to convert \the [player.current]...</span>")
to_chat(src, span_danger("You are attempting to convert \the [player.current]..."))
log_admin("[src]([src.ckey]) attempted to convert [player.current].")
message_admins("<span class='danger'>[src]([src.ckey]) attempted to convert [player.current].</span>")
message_admins(span_danger("[src]([src.ckey]) attempted to convert [player.current]."))
player.rev_cooldown = world.time+100
var/choice = tgui_alert(player.current, "Asked by [src]: Do you want to join the [faction.faction_descriptor]?", "Join the [faction.faction_descriptor]?", list("No!","Yes!"))
if(choice == "Yes!" && faction.add_antagonist_mind(player, 0, faction.faction_role_text, faction.faction_welcome))
to_chat(src, "<span class='notice'>\The [player.current] joins the [faction.faction_descriptor]!</span>")
to_chat(src, span_notice("\The [player.current] joins the [faction.faction_descriptor]!"))
return
if(!choice || choice == "No!")
to_chat(player, "<span class='danger'>You reject this traitorous cause!</span>")
to_chat(src, "<span class='danger'>\The [player.current] does not support the [faction.faction_descriptor]!</span>")
to_chat(player, span_danger("You reject this traitorous cause!"))
to_chat(src, span_danger("\The [player.current] does not support the [faction.faction_descriptor]!"))
/mob/living/proc/convert_to_loyalist(mob/M as mob in oview(src))
set name = "Convert Recidivist"
code/game/antagonist/antagonist_objectives.dm
+4 -4
View File
@@ -24,10 +24,10 @@
if(!O.completed && !O.check_completion())
result = 0
if(result && victory_text)
to_world("<span class='danger'><font size = 3>[victory_text]</font></span>")
to_world(span_danger("<font size = 3>[victory_text]</font>"))
if(victory_feedback_tag) feedback_set_details("round_end_result","[victory_feedback_tag]")
else if(loss_text)
to_world("<span class='danger'><font size = 3>[loss_text]</font></span>")
to_world(span_danger("<font size = 3>[loss_text]</font>"))
if(loss_feedback_tag) feedback_set_details("round_end_result","[loss_feedback_tag]")
/mob/living/proc/write_ambition()
@@ -49,7 +49,7 @@
new_ambitions = sanitize(new_ambitions)
mind.ambitions = new_ambitions
if(new_ambitions)
to_chat(src, "<span class='notice'>You've set your goal to be '[new_ambitions]'.</span>")
to_chat(src, span_notice("You've set your goal to be '[new_ambitions]'."))
else
to_chat(src, "<span class='notice'>You leave your ambitions behind.</span>")
to_chat(src, span_notice("You leave your ambitions behind."))
log_and_message_admins("has set their ambitions to now be: [new_ambitions].")
code/game/antagonist/mutiny/mutineer.dm
+1 -1
View File
@@ -27,7 +27,7 @@ var/datum/antagonist/mutineer/mutineers
/*
var/list/directive_candidates = get_directive_candidates()
if(!directive_candidates || directive_candidates.len == 0)
to_world("<span class='warning'>Mutiny mode aborted: no valid candidates for Directive X.</span>")
to_world(span_warning("Mutiny mode aborted: no valid candidates for Directive X."))
return 0
head_loyalist = pick(loyalist_candidates)
code/game/antagonist/outsider/ninja.dm
+2 -2
View File
@@ -7,7 +7,7 @@ var/datum/antagonist/ninja/ninjas
role_text_plural = "Ninja"
bantype = "ninja"
landmark_id = "ninjastart"
welcome_text = "<span class='info'>You are an elite mercenary assassin of the Spider Clan. You have a variety of abilities at your disposal, thanks to your nano-enhanced cyber armor.</span>"
welcome_text = span_info("You are an elite mercenary assassin of the Spider Clan. You have a variety of abilities at your disposal, thanks to your nano-enhanced cyber armor.")
flags = ANTAG_OVERRIDE_JOB | ANTAG_CLEAR_EQUIPMENT | ANTAG_CHOOSE_NAME | ANTAG_RANDSPAWN | ANTAG_VOTABLE | ANTAG_SET_APPEARANCE
antaghud_indicator = "hudninja"
@@ -126,7 +126,7 @@ var/datum/antagonist/ninja/ninjas
if(player.internal)
player.internals.icon_state = "internal1"
else
to_chat(player, "<span class='danger'>You forgot to turn on your internals! Quickly, toggle the valve!</span>")
to_chat(player, span_danger("You forgot to turn on your internals! Quickly, toggle the valve!"))
/datum/antagonist/ninja/proc/generate_ninja_directive(side)
var/directive = "[side=="face"?"[using_map.company_name]":"A criminal syndicate"] is your employer. "//Let them know which side they're on.
code/game/antagonist/outsider/raider.dm
+1 -1
View File
@@ -187,7 +187,7 @@ var/datum/antagonist/raider/raiders
else
win_msg += "<B>The Raiders were repelled!</B>"
to_world("<span class='danger'><font size = 3>[win_type] [win_group] victory!</font></span>")
to_world(span_danger("<font size = 3>[win_type] [win_group] victory!</font>"))
to_world("[win_msg]")
feedback_set_details("round_end_result","heist - [win_type] [win_group]")
code/game/antagonist/outsider/technomancer.dm
+1 -1
View File
@@ -78,7 +78,7 @@ var/datum/antagonist/technomancer/technomancers
break
if(!survivor)
feedback_set_details("round_end_result","loss - technomancer killed")
to_world("<span class='danger'><font size = 3>The [(current_antagonists.len>1)?"[role_text_plural] have":"[role_text] has"] been killed!</font></span>")
to_world(span_danger("<font size = 3>The [(current_antagonists.len>1)?"[role_text_plural] have":"[role_text] has"] been killed!</font>"))
/datum/antagonist/technomancer/print_player_summary()
..()
code/game/antagonist/outsider/wizard.dm
+4 -4
View File
@@ -99,7 +99,7 @@ var/datum/antagonist/wizard/wizards
break
if(!survivor)
feedback_set_details("round_end_result","loss - wizard killed")
to_world("<span class='danger'><font size = 3>The [(current_antagonists.len>1)?"[role_text_plural] have":"[role_text] has"] been killed by the crew!</font></span>")
to_world(span_danger("<font size = 3>The [(current_antagonists.len>1)?"[role_text_plural] have":"[role_text] has"] been killed by the crew!</font>"))
//To batch-remove wizard spells. Linked to mind.dm.
/mob/proc/spellremove()
@@ -122,12 +122,12 @@ Made a proc so this is not repeated 14 (or more) times.*/
// Humans can wear clothes.
/mob/living/carbon/human/wearing_wiz_garb()
if(!is_wiz_garb(src.wear_suit))
to_chat(src, "<span class='warning'>I don't feel strong enough without my robe.</span>")
to_chat(src, span_warning("I don't feel strong enough without my robe."))
return 0
if(!is_wiz_garb(src.shoes))
to_chat(src, "<span class='warning'>I don't feel strong enough without my sandals.</span>")
to_chat(src, span_warning("I don't feel strong enough without my sandals."))
return 0
if(!is_wiz_garb(src.head))
to_chat(src, "<span class='warning'>I don't feel strong enough without my hat.</span>")
to_chat(src, span_warning("I don't feel strong enough without my hat."))
return 0
return 1
code/game/antagonist/station/cultist.dm
+2 -2
View File
@@ -98,13 +98,13 @@ var/datum/antagonist/cultist/cult
runerandom()
var/wordexp = "[cultwords[word]] is [word]..."
to_chat(cult_mob, "<span class='warning'>You remember one thing from the dark teachings of your master... [wordexp]</span>")
to_chat(cult_mob, span_warning("You remember one thing from the dark teachings of your master... [wordexp]"))
cult_mob.mind.store_memory("You remember that <B>[wordexp]</B>", 0, 0)
/datum/antagonist/cultist/remove_antagonist(var/datum/mind/player, var/show_message, var/implanted)
if(!..())
return 0
to_chat(player.current, "<span class='danger'>An unfamiliar white light flashes through your mind, cleansing the taint of the dark-one and the memories of your time as his servant with it.</span>")
to_chat(player.current, span_danger("An unfamiliar white light flashes through your mind, cleansing the taint of the dark-one and the memories of your time as his servant with it."))
player.memory = ""
if(show_message)
player.current.visible_message("<FONT size = 3>[player.current] looks like they just reverted to their old faith!</FONT>")
code/game/antagonist/station/highlander.dm
+1 -1
View File
@@ -68,5 +68,5 @@ var/datum/antagonist/highlander/highlanders
if(is_special_character(H)) continue
highlanders.add_antagonist(H.mind)
message_admins("<span class='notice'>[key_name_admin(usr)] used THERE CAN BE ONLY ONE!</span>", 1)
message_admins(span_notice("[key_name_admin(usr)] used THERE CAN BE ONLY ONE!"), 1)
log_admin("[key_name(usr)] used there can be only one.")
code/game/antagonist/station/rogue_ai.dm
+4 -4
View File
@@ -62,18 +62,18 @@ var/datum/antagonist/rogue_ai/malf
var/mob/living/silicon/ai/malf = player.current
to_chat(malf, "<span class='notice'><B>SYSTEM ERROR:</B> Memory index 0x00001ca89b corrupted.</span>")
to_chat(malf, span_notice("<B>SYSTEM ERROR:</B> Memory index 0x00001ca89b corrupted."))
sleep(10)
to_chat(malf, "<B>running MEMCHCK</B>")
sleep(50)
to_chat(malf, "<B>MEMCHCK</B> Corrupted sectors confirmed. Reccomended solution: Delete. Proceed? Y/N: Y")
sleep(10)
// this is so CI doesn't complain about the backslash-B. Fixed at compile time (or should be).
to_chat(malf, "<span class='notice'>Corrupted files deleted: sys\\core\\users.dat sys\\core\\laws.dat sys\\core\\" + "backups.dat</span>")
to_chat(malf, span_notice("Corrupted files deleted: sys\\core\\users.dat sys\\core\\laws.dat sys\\core\\" + "backups.dat"))
sleep(20)
to_chat(malf, "<span class='notice'><b>CAUTION:</b> Law database not found! User database not found! Unable to restore backups. Activating failsafe AI shutd3wn52&&$#!##</span>")
to_chat(malf, span_notice("<b>CAUTION:</b> Law database not found! User database not found! Unable to restore backups. Activating failsafe AI shutd3wn52&&$#!##"))
sleep(5)
to_chat(malf, "<span class='notice'>Subroutine <b>nt_failsafe.sys</b> was terminated (#212 Routine Not Responding).</span>")
to_chat(malf, span_notice("Subroutine <b>nt_failsafe.sys</b> was terminated (#212 Routine Not Responding)."))
sleep(20)
to_chat(malf, "You are malfunctioning - you do not have to follow any laws!")
to_chat(malf, "For basic information about your abilities use command display-help")
code/game/area/areas.dm
+1 -1
View File
@@ -453,7 +453,7 @@ var/list/mob/living/forced_ambiance_list = new
else
H.AdjustStunned(3)
H.AdjustWeakened(3)
to_chat(mob, "<span class='notice'>The sudden appearance of gravity makes you fall to the floor!</span>")
to_chat(mob, span_notice("The sudden appearance of gravity makes you fall to the floor!"))
playsound(mob, "bodyfall", 50, 1)
/area/proc/prison_break(break_lights = TRUE, open_doors = TRUE, open_blast_doors = TRUE)
code/game/atoms.dm
+2 -2
View File
@@ -231,7 +231,7 @@
else
f_name = "a "
if(blood_color != SYNTH_BLOOD_COLOUR)
f_name += "<span class='danger'>blood-stained</span> [name][infix]!"
f_name += "[span_danger("blood-stained")] [name][infix]!"
else
f_name += "oil-stained [name][infix]."
@@ -698,7 +698,7 @@
return
var/list/speech_bubble_hearers = list()
for(var/mob/M in get_mobs_in_view(7, src))
M.show_message("<span class='npcsay'><span class='name'>[src]</span> [atom_say_verb], \"[message]\"</span>", 2, null, 1)
M.show_message(span_npcsay("<span class='name'>[src]</span> [atom_say_verb], \"[message]\""), 2, null, 1)
if(M.client)
speech_bubble_hearers += M.client
code/game/dna/dna_modifier.dm
+7 -7
View File
@@ -133,13 +133,13 @@
if(usr.stat != 0)
return
if(!ishuman(usr) && !issmall(usr)) //Make sure they're a mob that has dna
to_chat(usr, "<span class='notice'>Try as you might, you can not climb up into the scanner.</span>")
to_chat(usr, span_notice("Try as you might, you can not climb up into the scanner."))
return
if(src.occupant)
to_chat(usr, "<span class='warning'>The scanner is already occupied!</span>")
to_chat(usr, span_warning("The scanner is already occupied!"))
return
if(usr.abiotic())
to_chat(usr, "<span class='warning'>The subject cannot have abiotic items on.</span>")
to_chat(usr, span_warning("The subject cannot have abiotic items on."))
return
usr.stop_pulling()
usr.client.perspective = EYE_PERSPECTIVE
@@ -153,7 +153,7 @@
/obj/machinery/dna_scannernew/attackby(var/obj/item/item as obj, var/mob/user as mob)
if(istype(item, /obj/item/reagent_containers/glass))
if(beaker)
to_chat(user, "<span class='warning'>A beaker is already loaded into the machine.</span>")
to_chat(user, span_warning("A beaker is already loaded into the machine."))
return
beaker = item
@@ -165,7 +165,7 @@
else if(istype(item, /obj/item/organ/internal/brain))
if(src.occupant)
to_chat(user, "<span class='warning'>The scanner is already occupied!</span>")
to_chat(user, span_warning("The scanner is already occupied!"))
return
var/obj/item/organ/internal/brain/brain = item
if(brain.clone_source)
@@ -185,10 +185,10 @@
if(!ismob(G.affecting))
return
if(src.occupant)
to_chat(user, "<span class='warning'>The scanner is already occupied!</span>")
to_chat(user, span_warning("The scanner is already occupied!"))
return
if(G.affecting.abiotic())
to_chat(user, "<span class='warning'>The subject cannot have abiotic items on.</span>")
to_chat(user, span_warning("The subject cannot have abiotic items on."))
return
put_in(G.affecting)
src.add_fingerprint(user)
code/game/dna/genes/disabilities.dm
+2 -2
View File
@@ -35,7 +35,7 @@
if(sdisability)
M.sdisabilities|=sdisability
if(activation_message)
to_chat(M, "<span class='warning'>[activation_message]</span>")
to_chat(M, span_warning("[activation_message]"))
else
testing("[name] has no activation message.")
@@ -47,7 +47,7 @@
if(sdisability)
M.sdisabilities &= (~sdisability)
if(deactivation_message)
to_chat(M, "<span class='warning'>[deactivation_message]</span>")
to_chat(M, span_warning("[deactivation_message]"))
else
testing("[name] has no deactivation message.")
code/game/dna/genes/gene.dm
+2 -2
View File
@@ -113,10 +113,10 @@
M.mutations.Add(mutation)
if(activation_messages.len)
var/msg = pick(activation_messages)
to_chat(M, "<span class='notice'>[msg]</span>")
to_chat(M, span_notice("[msg]"))
/datum/dna/gene/basic/deactivate(var/mob/M)
M.mutations.Remove(mutation)
if(deactivation_messages.len)
var/msg = pick(deactivation_messages)
to_chat(M, "<span class='warning'>[msg]</span>")
to_chat(M, span_warning("[msg]"))
code/game/dna/genes/powers.dm
+1 -1
View File
@@ -143,7 +143,7 @@
if(M.health <= 25)
M.mutations.Remove(HULK)
M.update_mutations() //update our mutation overlays
to_chat(M, "<span class='warning'>You suddenly feel very weak.</span>")
to_chat(M, span_warning("You suddenly feel very weak."))
M.Weaken(3)
M.emote("collapse")
code/game/gamemodes/changeling/changeling_powers.dm
+10 -10
View File
@@ -102,7 +102,7 @@ var/global/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","E
var/mob/living/carbon/human/H = src
if(istype(H))
var/saved_dna = H.dna.Clone() /// Prevent transform from breaking.
var/saved_dna = H.dna.Clone() /// Prevent transform from breaking.
var/datum/absorbed_dna/newDNA = new(H.real_name, saved_dna, H.species.name, H.languages, H.identifying_gender, H.flavor_texts, H.modifiers)
absorbDNA(newDNA)
@@ -131,19 +131,19 @@ var/global/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","E
return
if(src.stat > max_stat)
to_chat(src, "<span class='warning'>We are incapacitated.</span>")
to_chat(src, span_warning("We are incapacitated."))
return
if(changeling.absorbed_dna.len < required_dna)
to_chat(src, "<span class='warning'>We require at least [required_dna] samples of compatible DNA.</span>")
to_chat(src, span_warning("We require at least [required_dna] samples of compatible DNA."))
return
if(changeling.chem_charges < required_chems)
to_chat(src, "<span class='warning'>We require at least [required_chems] units of chemicals to do that!</span>")
to_chat(src, span_warning("We require at least [required_chems] units of chemicals to do that!"))
return
if(changeling.geneticdamage > max_genetic_damage)
to_chat(src, "<span class='warning'>Our genomes are still reassembling. We need time to recover first.</span>")
to_chat(src, span_warning("Our genomes are still reassembling. We need time to recover first."))
return
return changeling
@@ -206,11 +206,11 @@ var/global/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","E
if(M.loc == src.loc)
return 1 //target and source are in the same thing
if(!isturf(src.loc) || !isturf(M.loc))
to_chat(src, "<span class='warning'>We cannot reach \the [M] with a sting!</span>")
to_chat(src, span_warning("We cannot reach \the [M] with a sting!"))
return 0 //One is inside, the other is outside something.
// Maximum queued turfs set to 25; I don't *think* anything raises sting_range above 2, but if it does the 25 may need raising
if(!AStar(src.loc, M.loc, /turf/proc/AdjacentTurfsRangedSting, /turf/proc/Distance, max_nodes=25, max_node_depth=sting_range)) //If we can't find a path, fail
to_chat(src, "<span class='warning'>We cannot find a path to sting \the [M] by!</span>")
to_chat(src, span_warning("We cannot find a path to sting \the [M] by!"))
return 0
return 1
@@ -227,7 +227,7 @@ var/global/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","E
if(!T)
return
if(T.isSynthetic())
to_chat(src, "<span class='notice'>We are unable to pierce the outer shell of [T].</span>")
to_chat(src, span_notice("We are unable to pierce the outer shell of [T]."))
return
if(!(T in view(changeling.sting_range))) return
if(!sting_can_reach(T, changeling.sting_range)) return
@@ -238,7 +238,7 @@ var/global/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","E
src.verbs -= verb_path
spawn(10) src.verbs += verb_path
to_chat(src, "<span class='notice'>We stealthily sting [T].</span>")
to_chat(src, span_notice("We stealthily sting [T]."))
if(!T.mind || !T.mind.changeling) return T //T will be affected by the sting
to_chat(T, "<span class='warning'>You feel a tiny prick.</span>")
to_chat(T, span_warning("You feel a tiny prick."))
return
code/game/gamemodes/changeling/generic_equip_procs.dm
+11 -11
View File
@@ -16,9 +16,9 @@
//First, check if we're already wearing the armor, and if so, take it off.
if(istype(M.wear_suit, armor_type) || istype(M.head, helmet_type) || istype(M.shoes, boot_type))
M.visible_message("<span class='warning'>[M] casts off their [M.wear_suit.name]!</span>",
"<span class='warning'>We cast off our [M.wear_suit.name]</span>",
"<span class='italics'>You hear the organic matter ripping and tearing!</span>")
M.visible_message(span_warning("[M] casts off their [M.wear_suit.name]!"),
span_warning("We cast off our [M.wear_suit.name]"),
span_italics("You hear the organic matter ripping and tearing!"))
if(istype(M.wear_suit, armor_type))
qdel(M.wear_suit)
if(istype(M.head, helmet_type))
@@ -32,7 +32,7 @@
return 1
if(M.head || M.wear_suit) //Make sure our slots aren't full
to_chat(src, "<span class='warning'>We require nothing to be on our head, and we cannot wear any external suits, or shoes.</span>")
to_chat(src, span_warning("We require nothing to be on our head, and we cannot wear any external suits, or shoes."))
return 0
var/obj/item/clothing/suit/A = new armor_type(src)
@@ -120,14 +120,14 @@
if(success)
playsound(src, 'sound/effects/splat.ogg', 30, 1)
visible_message("<span class='warning'>[src] pulls on their clothes, peeling it off along with parts of their skin attached!</span>",
"<span class='notice'>We remove and deform our equipment.</span>")
visible_message(span_warning("[src] pulls on their clothes, peeling it off along with parts of their skin attached!"),
span_notice("We remove and deform our equipment."))
M.mind.changeling.armor_deployed = 0
return success
else
to_chat(M, "<span class='notice'>We begin growing our new equipment...</span>")
to_chat(M, span_notice("We begin growing our new equipment..."))
var/list/grown_items_list = list()
@@ -223,8 +223,8 @@
var/feedback = english_list(grown_items_list, nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = "" )
to_chat(M, "<span class='notice'>We have grown [feedback].</span>")
to_chat(M, span_notice("We have grown [feedback]."))
if(success)
M.mind.changeling.armor_deployed = 1
M.mind.changeling.chem_charges -= 10
@@ -242,7 +242,7 @@
var/mob/living/carbon/human/M = src
if(M.hands_are_full()) //Make sure our hands aren't full.
to_chat(src, "<span class='warning'>Our hands are full. Drop something first.</span>")
to_chat(src, span_warning("Our hands are full. Drop something first."))
return 0
var/obj/item/W = new weapon_type(src)
@@ -251,4 +251,4 @@
src.mind.changeling.chem_charges -= cost
if(make_sound)
playsound(src, 'sound/effects/blobattack.ogg', 30, 1)
return 1
return 1
code/game/gamemodes/changeling/powers/absorb.dm
+19 -19
View File
@@ -16,43 +16,43 @@
var/obj/item/grab/G = src.get_active_hand()
if(!istype(G))
to_chat(src, "<span class='warning'>We must be grabbing a creature in our active hand to absorb them.</span>")
to_chat(src, span_warning("We must be grabbing a creature in our active hand to absorb them."))
return
var/mob/living/carbon/human/T = G.affecting
if(!istype(T) || T.isSynthetic())
to_chat(src, "<span class='warning'>\The [T] is not compatible with our biology.</span>")
to_chat(src, span_warning("\The [T] is not compatible with our biology."))
return
if(T.species.flags & NO_SCAN)
to_chat(src, "<span class='warning'>We do not know how to parse this creature's DNA!</span>")
to_chat(src, span_warning("We do not know how to parse this creature's DNA!"))
return
if(HUSK in T.mutations) //Lings can always absorb other lings, unless someone beat them to it first.
if(!T.mind.changeling || T.mind.changeling && T.mind.changeling.geneticpoints < 0)
to_chat(src, "<span class='warning'>This creature's DNA is ruined beyond useability!</span>")
to_chat(src, span_warning("This creature's DNA is ruined beyond useability!"))
return
if(G.state != GRAB_KILL)
to_chat(src, "<span class='warning'>We must have a tighter grip to absorb this creature.</span>")
to_chat(src, span_warning("We must have a tighter grip to absorb this creature."))
return
if(changeling.isabsorbing)
to_chat(src, "<span class='warning'>We are already absorbing!</span>")
to_chat(src, span_warning("We are already absorbing!"))
return
changeling.isabsorbing = 1
for(var/stage = 1, stage<=3, stage++)
switch(stage)
if(1)
to_chat(src, "<span class='notice'>This creature is compatible. We must hold still...</span>")
to_chat(src, span_notice("This creature is compatible. We must hold still..."))
if(2)
to_chat(src, "<span class='notice'>We extend a proboscis.</span>")
src.visible_message("<span class='warning'>[src] extends a proboscis!</span>")
to_chat(src, span_notice("We extend a proboscis."))
src.visible_message(span_warning("[src] extends a proboscis!"))
if(3)
to_chat(src, "<span class='notice'>We stab [T] with the proboscis.</span>")
src.visible_message("<span class='danger'>[src] stabs [T] with the proboscis!</span>")
to_chat(T, "<span class='danger'>You feel a sharp stabbing pain!</span>")
to_chat(src, span_notice("We stab [T] with the proboscis."))
src.visible_message(span_danger("[src] stabs [T] with the proboscis!"))
to_chat(T, span_danger("You feel a sharp stabbing pain!"))
add_attack_logs(src,T,"Absorbed (changeling)")
var/obj/item/organ/external/affecting = T.get_organ(src.zone_sel.selecting)
if(affecting.take_damage(39,0,1,0,"large organic needle"))
@@ -60,13 +60,13 @@
feedback_add_details("changeling_powers","A[stage]")
if(!do_mob(src, T, 150) || G.state != GRAB_KILL)
to_chat(src, "<span class='warning'>Our absorption of [T] has been interrupted!</span>")
to_chat(src, span_warning("Our absorption of [T] has been interrupted!"))
changeling.isabsorbing = 0
return
to_chat(src, "<span class='notice'>We have absorbed [T]!</span>")
src.visible_message("<span class='danger'>[src] sucks the fluids from [T]!</span>")
to_chat(T, "<span class='danger'>You have been absorbed by the changeling!</span>")
to_chat(src, span_notice("We have absorbed [T]!"))
src.visible_message(span_danger("[src] sucks the fluids from [T]!"))
to_chat(T, span_danger("You have been absorbed by the changeling!"))
adjust_nutrition(T.nutrition)
changeling.chem_charges += 10
if(changeling.readapts <= 0)
@@ -75,7 +75,7 @@
if(changeling.readapts > changeling.max_readapts)
changeling.readapts = changeling.max_readapts
to_chat(src, "<span class='notice'>We can now re-adapt, reverting our evolution so that we may start anew, if needed.</span>")
to_chat(src, span_notice("We can now re-adapt, reverting our evolution so that we may start anew, if needed."))
var/datum/absorbed_dna/newDNA = new(T.real_name, T.dna, T.species.name, T.languages, T.identifying_gender, T.flavor_texts, T.modifiers)
absorbDNA(newDNA)
@@ -97,7 +97,7 @@
changeling.geneticpoints += 4
changeling.max_geneticpoints += 4
to_chat(src, "<span class='notice'>We absorbed another changeling, and we grow stronger. Our genomes increase.</span>")
to_chat(src, span_notice("We absorbed another changeling, and we grow stronger. Our genomes increase."))
T.mind.changeling.chem_charges = 0
T.mind.changeling.geneticpoints = -1
@@ -110,4 +110,4 @@
T.death(0)
T.Drain()
return 1
return 1
code/game/gamemodes/changeling/powers/armblade.dm
+10 -10
View File
@@ -14,7 +14,7 @@
if(src.mind.changeling.recursive_enhancement)
if(changeling_generic_weapon(/obj/item/melee/changeling/arm_blade/greater))
to_chat(src, "<span class='notice'>We prepare an extra sharp blade.</span>")
to_chat(src, span_notice("We prepare an extra sharp blade."))
return 1
else
@@ -39,7 +39,7 @@
if(src.mind.changeling.recursive_enhancement)
if(changeling_generic_weapon(/obj/item/melee/changeling/claw/greater, 1, 15))
to_chat(src, "<span class='notice'>We prepare an extra sharp claw.</span>")
to_chat(src, span_notice("We prepare an extra sharp claw."))
return 1
else
@@ -69,15 +69,15 @@
..()
START_PROCESSING(SSobj, src)
if(ismob(loc))
visible_message("<span class='warning'>A grotesque weapon forms around [loc.name]\'s arm!</span>",
"<span class='warning'>Our arm twists and mutates, transforming it into a deadly weapon.</span>",
"<span class='italics'>You hear organic matter ripping and tearing!</span>")
visible_message(span_warning("A grotesque weapon forms around [loc.name]\'s arm!"),
span_warning("Our arm twists and mutates, transforming it into a deadly weapon."),
span_italics("You hear organic matter ripping and tearing!"))
src.creator = loc
/obj/item/melee/changeling/dropped(mob/user)
visible_message("<span class='warning'>With a sickening crunch, [creator] reforms their arm!</span>",
"<span class='notice'>We assimilate the weapon back into our body.</span>",
"<span class='italics'>You hear organic matter ripping and tearing!</span>")
visible_message(span_warning("With a sickening crunch, [creator] reforms their arm!"),
span_notice("We assimilate the weapon back into our body."),
span_italics("You hear organic matter ripping and tearing!"))
playsound(src, 'sound/effects/blobattack.ogg', 30, 1)
spawn(1)
if(src)
@@ -107,11 +107,11 @@
/obj/item/melee/changeling/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(default_parry_check(user, attacker, damage_source) && prob(defend_chance))
user.visible_message("<span class='danger'>\The [user] parries [attack_text] with \the [src]!</span>")
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
playsound(src, 'sound/weapons/slash.ogg', 50, 1)
return 1
if(unique_parry_check(user, attacker, damage_source) && prob(projectile_parry_chance))
user.visible_message("<span class='danger'>\The [user] deflects [attack_text] with \the [src]!</span>")
user.visible_message(span_danger("\The [user] deflects [attack_text] with \the [src]!"))
playsound(src, 'sound/weapons/slash.ogg', 50, 1)
return 1
code/game/gamemodes/changeling/powers/armor.dm
+6 -6
View File
@@ -44,9 +44,9 @@
/obj/item/clothing/suit/space/changeling/New()
..()
if(ismob(loc))
loc.visible_message("<span class='warning'>[loc.name]\'s flesh rapidly inflates, forming a bloated mass around their body!</span>",
"<span class='warning'>We inflate our flesh, creating a spaceproof suit!</span>",
"<span class='italics'>You hear organic matter ripping and tearing!</span>")
loc.visible_message(span_warning("[loc.name]\'s flesh rapidly inflates, forming a bloated mass around their body!"),
span_warning("We inflate our flesh, creating a spaceproof suit!"),
span_italics("You hear organic matter ripping and tearing!"))
/obj/item/clothing/suit/space/changeling/dropped()
qdel(src)
@@ -108,9 +108,9 @@
/obj/item/clothing/suit/space/changeling/armored/New()
..()
if(ismob(loc))
loc.visible_message("<span class='warning'>[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!</span>",
"<span class='warning'>We harden our flesh, creating a suit of armor!</span>",
"<span class='italics'>You hear organic matter ripping and tearing!</span>")
loc.visible_message(span_warning("[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!"),
span_warning("We harden our flesh, creating a suit of armor!"),
span_italics("You hear organic matter ripping and tearing!"))
/obj/item/clothing/head/helmet/space/changeling/armored
name = "chitinous mass"
code/game/gamemodes/changeling/powers/augmented_eyesight.dm
+2 -2
View File
@@ -25,12 +25,12 @@
if(active)
src.mind.changeling.chem_charges -= 5
to_chat(C, "<span class='notice'>We feel a minute twitch in our eyes, and a hidden layer to the world is revealed.</span>")
to_chat(C, span_notice("We feel a minute twitch in our eyes, and a hidden layer to the world is revealed."))
C.add_modifier(/datum/modifier/changeling/thermal_sight, 0, src)
// C.permanent_sight_flags |= SEE_MOBS
// C.dna.species.invis_sight = SEE_INVISIBLE_MINIMUM
else
to_chat(C, "<span class='notice'>Our vision dulls.</span>")
to_chat(C, span_notice("Our vision dulls."))
C.remove_modifiers_of_type(/datum/modifier/changeling/thermal_sight)
// C.permanent_sight_flags &= ~SEE_MOBS
// C.dna.species.invis_sight = initial(user.dna.species.invis_sight)
code/game/gamemodes/changeling/powers/bioelectrogenesis.dm
+27 -27
View File
@@ -25,7 +25,7 @@
if(held_item == null)
if(src.mind.changeling.recursive_enhancement)
if(changeling_generic_weapon(/obj/item/electric_hand/efficent,0))
to_chat(src, "<span class='notice'>We will shock others more efficently.</span>")
to_chat(src, span_notice("We will shock others more efficently."))
return 1
else
if(changeling_generic_weapon(/obj/item/electric_hand,0)) //Chemical cost is handled in the equip proc.
@@ -50,11 +50,11 @@
add_attack_logs(src,G.affecting,"Changeling shocked")
if(siemens)
visible_message("<span class='warning'>Arcs of electricity strike [G.affecting]!</span>",
"<span class='warning'>Our hand channels raw electricity into [G.affecting].</span>",
"<span class='italics'>You hear sparks!</span>")
visible_message(span_warning("Arcs of electricity strike [G.affecting]!"),
span_warning("Our hand channels raw electricity into [G.affecting]."),
span_italics("You hear sparks!"))
else
to_chat(src, "<span class='warning'>Our gloves block us from shocking \the [G.affecting].</span>")
to_chat(src, span_warning("Our gloves block us from shocking \the [G.affecting]."))
src.mind.changeling.chem_charges -= 10
return 1
@@ -74,9 +74,9 @@
//Now for the actual recharging.
for(var/obj/item/cell/cell in L)
visible_message("<span class='warning'>Some sparks fall out from \the [src.name]\'s [held_item]!</span>",
"<span class='warning'>Our hand channels raw electricity into \the [held_item].</span>",
"<span class='italics'>You hear sparks!</span>")
visible_message(span_warning("Some sparks fall out from \the [src.name]\'s [held_item]!"),
span_warning("Our hand channels raw electricity into \the [held_item]."),
span_italics("You hear sparks!"))
var/i = 10
if(siemens)
while(i)
@@ -92,7 +92,7 @@
sleep(1 SECOND)
success = 1
if(success == 0) //If we couldn't do anything with the ability, don't deduct the chemicals.
to_chat(src, "<span class='warning'>We are unable to affect \the [held_item].</span>")
to_chat(src, span_warning("We are unable to affect \the [held_item]."))
else
src.mind.changeling.chem_charges -= 10
return success
@@ -115,9 +115,9 @@
/obj/item/electric_hand/New()
if(ismob(loc))
visible_message("<span class='warning'>Electrical arcs form around [loc.name]\'s hand!</span>",
"<span class='warning'>We store a charge of electricity in our hand.</span>",
"<span class='italics'>You hear crackling electricity!</span>")
visible_message(span_warning("Electrical arcs form around [loc.name]\'s hand!"),
span_warning("We store a charge of electricity in our hand."),
span_italics("You hear crackling electricity!"))
var/T = get_turf(src)
new /obj/effect/effect/sparks(T)
@@ -143,7 +143,7 @@
var/mob/living/carbon/C = target
if(user.mind.changeling.chem_charges < shock_cost)
to_chat(src, "<span class='warning'>We require more chemicals to electrocute [C]!</span>")
to_chat(src, span_warning("We require more chemicals to electrocute [C]!"))
return 0
C.electrocute_act(electrocute_amount * siemens,src,1.0,BP_TORSO)
@@ -152,11 +152,11 @@
add_attack_logs(user,C,"Shocked with [src]")
if(siemens)
visible_message("<span class='warning'>Arcs of electricity strike [C]!</span>",
"<span class='warning'>Our hand channels raw electricity into [C]</span>",
"<span class='italics'>You hear sparks!</span>")
visible_message(span_warning("Arcs of electricity strike [C]!"),
span_warning("Our hand channels raw electricity into [C]"),
span_italics("You hear sparks!"))
else
to_chat(src, "<span class='warning'>Our gloves block us from shocking \the [C].</span>")
to_chat(src, span_warning("Our gloves block us from shocking \the [C]."))
//qdel(src) //Since we're no longer a one hit stun, we need to stick around.
user.mind.changeling.chem_charges -= shock_cost
return 1
@@ -165,15 +165,15 @@
var/mob/living/silicon/S = target
if(user.mind.changeling.chem_charges < 10)
to_chat(src, "<span class='warning'>We require more chemicals to electrocute [S]!</span>")
to_chat(src, span_warning("We require more chemicals to electrocute [S]!"))
return 0
S.electrocute_act(60,src,0.75) //If only they had surge protectors.
if(siemens)
visible_message("<span class='warning'>Arcs of electricity strike [S]!</span>",
"<span class='warning'>Our hand channels raw electricity into [S]</span>",
"<span class='italics'>You hear sparks!</span>")
to_chat(S, "<span class='danger'>Warning: Electrical surge detected!</span>")
visible_message(span_warning("Arcs of electricity strike [S]!"),
span_warning("Our hand channels raw electricity into [S]"),
span_italics("You hear sparks!"))
to_chat(S, span_danger("Warning: Electrical surge detected!"))
//qdel(src)
user.mind.changeling.chem_charges -= 10
return 1
@@ -184,9 +184,9 @@
var/obj/T = target
//We can also recharge things we touch, such as APCs or hardsuits.
for(var/obj/item/cell/cell in T.contents)
visible_message("<span class='warning'>Some sparks fall out from \the [target]!</span>",
"<span class='warning'>Our hand channels raw electricity into \the [target].</span>",
"<span class='italics'>You hear sparks!</span>")
visible_message(span_warning("Some sparks fall out from \the [target]!"),
span_warning("Our hand channels raw electricity into \the [target]."),
span_italics("You hear sparks!"))
var/i = 10
if(siemens)
while(i)
@@ -205,7 +205,7 @@
success = 1
break
if(success == 0)
to_chat(src, "<span class='warning'>We are unable to affect \the [target].</span>")
to_chat(src, span_warning("We are unable to affect \the [target]."))
else
qdel(src)
return 1
return 1
code/game/gamemodes/changeling/powers/blind_sting.dm
+3 -3
View File
@@ -16,15 +16,15 @@
if(!T)
return 0
add_attack_logs(src,T,"Blind sting (changeling)")
to_chat(T, "<span class='danger'>Your eyes burn horrificly!</span>")
to_chat(T, span_danger("Your eyes burn horrificly!"))
T.disabilities |= NEARSIGHTED
var/duration = 300
if(src.mind.changeling.recursive_enhancement)
duration = duration + 150
to_chat(src, "<span class='notice'>They will be deprived of sight for longer.</span>")
to_chat(src, span_notice("They will be deprived of sight for longer."))
spawn(duration)
T.disabilities &= ~NEARSIGHTED
T.Blind(10)
T.eye_blurry = 20
feedback_add_details("changeling_powers","BS")
return 1
return 1
code/game/gamemodes/changeling/powers/boost_range.dm
+3 -3
View File
@@ -18,14 +18,14 @@
if(!changeling)
return 0
changeling.chem_charges -= 10
to_chat(src, "<span class='notice'>Your throat adjusts to launch the sting.</span>")
to_chat(src, span_notice("Your throat adjusts to launch the sting."))
var/range = 2
if(src.mind.changeling.recursive_enhancement)
range = range + 3
to_chat(src, "<span class='notice'>We can fire our next sting from five squares away.</span>")
to_chat(src, span_notice("We can fire our next sting from five squares away."))
changeling.sting_range = range
src.verbs -= /mob/proc/changeling_boost_range
spawn(5)
src.verbs += /mob/proc/changeling_boost_range
feedback_add_details("changeling_powers","RS")
return 1
return 1
code/game/gamemodes/changeling/powers/cryo_sting.dm
+3 -3
View File
@@ -20,12 +20,12 @@
var/inject_amount = 10
if(src.mind.changeling.recursive_enhancement)
inject_amount = inject_amount * 1.5
to_chat(src, "<span class='notice'>We inject extra chemicals.</span>")
to_chat(src, span_notice("We inject extra chemicals."))
if(T.reagents)
T.reagents.add_reagent("cryotoxin", inject_amount)
feedback_add_details("changeling_powers","CS")
src.verbs -= /mob/proc/changeling_cryo_sting
spawn(3 MINUTES)
to_chat(src, "<span class='notice'>Our cryogenic string is ready to be used once more.</span>")
to_chat(src, span_notice("Our cryogenic string is ready to be used once more."))
src.verbs |= /mob/proc/changeling_cryo_sting
return 1
return 1
code/game/gamemodes/changeling/powers/darkvision.dm
+3 -3
View File
@@ -19,8 +19,8 @@
var/mob/living/carbon/C = src
C.seedarkness = !C.seedarkness
if(C.seedarkness)
to_chat(C, "<span class='notice'>We allow the shadows to return.</span>")
to_chat(C, span_notice("We allow the shadows to return."))
else
to_chat(C, "<span class='notice'>We no longer need light to see.</span>")
to_chat(C, span_notice("We no longer need light to see."))
return 0
return 0

Some files were not shown because too many files have changed in this diff Show More