diff --git a/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm b/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm index ea25730ea8..87c430c5d7 100644 --- a/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm +++ b/code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm @@ -134,7 +134,7 @@ if(try_load_materials(user, W)) return else - to_chat(user, "You cannot insert this item into \the [src]!") + 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, "\The [src] doesn't accept [material_display_name(S.material)]!") + 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].", "You insert [count] [S.name] into \the [src].") + 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, "\The [src] cannot hold more [S.name].") + to_chat(user, span_warning("\The [src] cannot hold more [S.name].")) return 1 /datum/material/algae diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 900699b8c5..185ac8c9c7 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -208,7 +208,7 @@ return add_fingerprint(usr) if(!allowed(user)) - to_chat(user, "Access denied.") + 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, "You cannot unwrench \the [src], turn it off first.") + to_chat(user, span_warning("You cannot unwrench \the [src], turn it off first.")) return 1 if(!can_unwrench()) - to_chat(user, "You cannot unwrench \the [src], it too exerted due to internal pressure.") + 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, "You begin to unfasten \the [src]...") + to_chat(user, span_notice("You begin to unfasten \the [src]...")) if (do_after(user, 40 * W.toolspeed)) user.visible_message( \ "\The [user] unfastens \the [src].", \ - "You have unfastened \the [src].", \ + span_notice("You have unfastened \the [src]."), \ "You hear ratchet.") deconstruct() diff --git a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm index 664708ac2d..df55d47a9f 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm @@ -85,7 +85,7 @@ if(W.has_tool_quality(TOOL_WRENCH)) anchored = !anchored playsound(src, W.usesound, 50, 1) - to_chat(user, "You [anchored ? "secure" : "unsecure"] the bolts holding \the [src] to the floor.") + 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, "You [anchored ? "secure" : "unsecure"] the bolts holding \the [src] to the floor.") + 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)) \ No newline at end of file + src.set_dir(turn(src.dir, 90)) diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 7951dda69a..d05f4fdc82 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -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, "Access denied.") + 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, "You cannot unwrench this [src], turn it off first.") + to_chat(user, span_warning("You cannot unwrench this [src], turn it off first.")) return 1 if(!can_unwrench()) - to_chat(user, "You cannot unwrench this [src], it too exerted due to internal pressure.") + 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, "You begin to unfasten \the [src]...") + to_chat(user, span_notice("You begin to unfasten \the [src]...")) if (do_after(user, 40 * W.toolspeed)) user.visible_message( \ "\The [user] unfastens \the [src].", \ - "You have unfastened \the [src].", \ + span_notice("You have unfastened \the [src]."), \ "You hear ratchet.") deconstruct() diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm index 615a14ecdc..60040ddd8b 100644 --- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm +++ b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm @@ -84,15 +84,15 @@ return ..() if(!can_unwrench()) - to_chat(user, "You cannot unwrench \the [src], it is too exerted due to internal pressure.") + to_chat(user, span_warning("You cannot unwrench \the [src], it is too exerted due to internal pressure.")) add_fingerprint(user) return 1 - to_chat(user, "You begin to unfasten \the [src]...") + 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( \ "\The [user] unfastens \the [src].", \ - "You have unfastened \the [src].", \ + span_notice("You have unfastened \the [src]."), \ "You hear a ratchet.") deconstruct() diff --git a/code/ATMOSPHERICS/components/portables_connector.dm b/code/ATMOSPHERICS/components/portables_connector.dm index a8cbd02ed6..1974cdb1d6 100644 --- a/code/ATMOSPHERICS/components/portables_connector.dm +++ b/code/ATMOSPHERICS/components/portables_connector.dm @@ -150,19 +150,19 @@ if (!W.has_tool_quality(TOOL_WRENCH)) return ..() if (connected_device) - to_chat(user, "You cannot unwrench \the [src], dettach \the [connected_device] first.") + 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, "You cannot unwrench \the [src], it too exerted due to internal pressure.") + 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, "You begin to unfasten \the [src]...") + to_chat(user, span_notice("You begin to unfasten \the [src]...")) if (do_after(user, 40 * W.toolspeed)) user.visible_message( \ "\The [user] unfastens \the [src].", \ - "You have unfastened \the [src].", \ + span_notice("You have unfastened \the [src]."), \ "You hear a ratchet.") deconstruct() diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 18ade9acef..fc2cb986cc 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -116,7 +116,7 @@ return if(!src.allowed(user)) - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) return tgui_interact(user) @@ -157,7 +157,7 @@ // user << browse("[src.name] control[dat]", "window=atmos_filter") // onclose(user, "atmos_filter") - + /obj/machinery/atmospherics/trinary/atmos_filter/tgui_interact(mob/user, datum/tgui/ui) diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 7e06e5de82..3fd2380e0f 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -101,7 +101,7 @@ tgui_interact(user) // src.add_fingerprint(usr) // if(!src.allowed(user)) - // to_chat(user, "Access denied.") + // to_chat(user, span_warning("Access denied.")) // return // usr.set_machine(src) // var/list/node_connects = get_node_connect_dirs() diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index be7a36bed2..61ade8f501 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -55,15 +55,15 @@ if (!W.has_tool_quality(TOOL_WRENCH)) return ..() if(!can_unwrench()) - to_chat(user, "You cannot unwrench \the [src], it too exerted due to internal pressure.") + 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, "You begin to unfasten \the [src]...") + to_chat(user, span_notice("You begin to unfasten \the [src]...")) if (do_after(user, 40 * W.toolspeed)) user.visible_message( \ "\The [user] unfastens \the [src].", \ - "You have unfastened \the [src].", \ + span_notice("You have unfastened \the [src]."), \ "You hear a ratchet.") deconstruct() diff --git a/code/ATMOSPHERICS/components/tvalve.dm b/code/ATMOSPHERICS/components/tvalve.dm index 2681a688eb..f220c45904 100644 --- a/code/ATMOSPHERICS/components/tvalve.dm +++ b/code/ATMOSPHERICS/components/tvalve.dm @@ -288,7 +288,7 @@ if(!powered()) return if(!src.allowed(user)) - to_chat(user, "Access denied.") + 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, "You cannot unwrench \the [src], it too exerted due to internal pressure.") + 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, "You begin to unfasten \the [src]...") + to_chat(user, span_notice("You begin to unfasten \the [src]...")) if (do_after(user, 40 * W.toolspeed)) user.visible_message( \ "\The [user] unfastens \the [src].", \ - "You have unfastened \the [src].", \ + span_notice("You have unfastened \the [src]."), \ "You hear a ratchet.") deconstruct() diff --git a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm index 2dd23c362f..2f69eaacc5 100644 --- a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm +++ b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm @@ -71,17 +71,17 @@ return ..() var/turf/T = src.loc if (level==1 && isturf(T) && !T.is_plating()) - to_chat(user, "You must remove the plating first.") + to_chat(user, span_warning("You must remove the plating first.")) return 1 if (!can_unwrench()) - to_chat(user, "You cannot unwrench \the [src], it is too exerted due to internal pressure.") + to_chat(user, span_warning("You cannot unwrench \the [src], it is too exerted due to internal pressure.")) add_fingerprint(user) return 1 playsound(src, W.usesound, 50, 1) - to_chat(user, "You begin to unfasten \the [src]...") + to_chat(user, span_notice("You begin to unfasten \the [src]...")) if (do_after(user, 40 * W.toolspeed)) user.visible_message( \ "\The [user] unfastens \the [src].", \ - "You have unfastened \the [src].", \ + span_notice("You have unfastened \the [src]."), \ "You hear a ratchet.") deconstruct() diff --git a/code/ATMOSPHERICS/components/unary/outlet_injector.dm b/code/ATMOSPHERICS/components/unary/outlet_injector.dm index e4f90c1afc..fc81777419 100644 --- a/code/ATMOSPHERICS/components/unary/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary/outlet_injector.dm @@ -158,7 +158,7 @@ update_underlays() /obj/machinery/atmospherics/unary/outlet_injector/attack_hand(mob/user as mob) - to_chat(user, "You toggle \the [src].") + 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, "You begin to unfasten \the [src]...") + to_chat(user, span_notice("You begin to unfasten \the [src]...")) if (do_after(user, 40 * W.toolspeed)) user.visible_message( \ "\The [user] unfastens \the [src].", \ - "You have unfastened \the [src].", \ + span_notice("You have unfastened \the [src]."), \ "You hear a ratchet.") deconstruct() diff --git a/code/ATMOSPHERICS/components/unary/unary_base.dm b/code/ATMOSPHERICS/components/unary/unary_base.dm index 9a3a4d3e44..1f8026209d 100644 --- a/code/ATMOSPHERICS/components/unary/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary/unary_base.dm @@ -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("\The [src]'s cannot be connected, something is hogging the tile!") + 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("\The [src]'s connector can't be connected, there is already a pipe at that location!") + visible_message(span_warning("\The [src]'s connector can't be connected, there is already a pipe at that location!")) return TRUE return FALSE diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index 75c82aed60..e59f5fc498 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -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, "Now welding the vent.") + 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("\The [user] welds the vent shut.", "You weld the vent shut.", "You hear welding.") + user.visible_message("\The [user] welds the vent shut.", span_notice("You weld the vent shut."), "You hear welding.") welded = 1 update_icon() else - user.visible_message("[user] unwelds the vent.", "You unweld the vent.", "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, "The welding tool needs to be on to start this task.") + to_chat(user, span_notice("The welding tool needs to be on to start this task.")) else - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span_warning("You need more welding fuel to complete this task.")) return 1 else ..() @@ -432,22 +432,22 @@ if (!W.has_tool_quality(TOOL_WRENCH)) return ..() if (!(stat & NOPOWER) && use_power) - to_chat(user, "You cannot unwrench \the [src], turn it off first.") + to_chat(user, span_warning("You cannot unwrench \the [src], turn it off first.")) return 1 var/turf/T = src.loc if (node && node.level==1 && isturf(T) && !T.is_plating()) - to_chat(user, "You must remove the plating first.") + to_chat(user, span_warning("You must remove the plating first.")) return 1 if(!can_unwrench()) - to_chat(user, "You cannot unwrench \the [src], it is too exerted due to internal pressure.") + to_chat(user, span_warning("You cannot unwrench \the [src], it is too exerted due to internal pressure.")) add_fingerprint(user) return 1 playsound(src, W.usesound, 50, 1) - to_chat(user, "You begin to unfasten \the [src]...") + to_chat(user, span_notice("You begin to unfasten \the [src]...")) if (do_after(user, 40 * W.toolspeed)) user.visible_message( \ "\The [user] unfastens \the [src].", \ - "You have unfastened \the [src].", \ + span_notice("You have unfastened \the [src]."), \ "You hear a ratchet.") deconstruct() diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index da96854986..93082e06fe 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -273,22 +273,22 @@ if (!W.has_tool_quality(TOOL_WRENCH)) return ..() if (!(stat & NOPOWER) && use_power) - to_chat(user, "You cannot unwrench \the [src], turn it off first.") + to_chat(user, span_warning("You cannot unwrench \the [src], turn it off first.")) return 1 var/turf/T = src.loc if (node && node.level==1 && isturf(T) && !T.is_plating()) - to_chat(user, "You must remove the plating first.") + to_chat(user, span_warning("You must remove the plating first.")) return 1 if(!can_unwrench()) - to_chat(user, "You cannot unwrench \the [src], it is too exerted due to internal pressure.") + to_chat(user, span_warning("You cannot unwrench \the [src], it is too exerted due to internal pressure.")) add_fingerprint(user) return 1 playsound(src, W.usesound, 50, 1) - to_chat(user, "You begin to unfasten \the [src]...") + to_chat(user, span_notice("You begin to unfasten \the [src]...")) if (do_after(user, 40 * W.toolspeed)) user.visible_message( \ "\The [user] unfastens \the [src].", \ - "You have unfastened \the [src].", \ + span_notice("You have unfastened \the [src]."), \ "You hear a ratchet.") deconstruct() diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm index 3334f29891..a061290184 100644 --- a/code/ATMOSPHERICS/components/valve.dm +++ b/code/ATMOSPHERICS/components/valve.dm @@ -238,7 +238,7 @@ if(!powered()) return if(!src.allowed(user)) - to_chat(user, "Access denied.") + 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, "Access denied.") + to_chat(user, span_warning("Access denied.")) return 1 if(!can_unwrench()) - to_chat(user, "You cannot unwrench \the [src], it is too exerted due to internal pressure.") + to_chat(user, span_warning("You cannot unwrench \the [src], it is too exerted due to internal pressure.")) add_fingerprint(user) return 1 playsound(src, W.usesound, 50, 1) - to_chat(user, "You begin to unfasten \the [src]...") + to_chat(user, span_notice("You begin to unfasten \the [src]...")) if (do_after(user, 40 * W.toolspeed)) user.visible_message( \ "\The [user] unfastens \the [src].", \ - "You have unfastened \the [src].", \ + span_notice("You have unfastened \the [src]."), \ "You hear a ratchet.") deconstruct() diff --git a/code/ATMOSPHERICS/mainspipe.dm b/code/ATMOSPHERICS/mainspipe.dm index e7a0d09477..b67b289d25 100644 --- a/code/ATMOSPHERICS/mainspipe.dm +++ b/code/ATMOSPHERICS/mainspipe.dm @@ -650,7 +650,7 @@ obj/machinery/atmospherics/mains_pipe/valve attack_hand(mob/user as mob) if(!src.allowed(user)) - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) return ..() diff --git a/code/ATMOSPHERICS/pipes/pipe_base.dm b/code/ATMOSPHERICS/pipes/pipe_base.dm index 04ef9a3457..0c7a40ae6b 100644 --- a/code/ATMOSPHERICS/pipes/pipe_base.dm +++ b/code/ATMOSPHERICS/pipes/pipe_base.dm @@ -120,18 +120,18 @@ return ..() var/turf/T = src.loc if (level==1 && isturf(T) && !T.is_plating()) - to_chat(user, "You must remove the plating first.") + to_chat(user, span_warning("You must remove the plating first.")) return 1 if(!can_unwrench()) - to_chat(user, "You cannot unwrench \the [src], it is too exerted due to internal pressure.") + to_chat(user, span_warning("You cannot unwrench \the [src], it is too exerted due to internal pressure.")) add_fingerprint(user) return 1 playsound(src, W.usesound, 50, 1) - to_chat(user, "You begin to unfasten \the [src]...") + to_chat(user, span_notice("You begin to unfasten \the [src]...")) if (do_after(user, 10 * W.toolspeed)) user.visible_message( \ "\The [user] unfastens \the [src].", \ - "You have unfastened \the [src].", \ + span_notice("You have unfastened \the [src]."), \ "You hear a ratchet.") deconstruct() diff --git a/code/ATMOSPHERICS/pipes/simple.dm b/code/ATMOSPHERICS/pipes/simple.dm index def462a354..ccfe7bb0b7 100644 --- a/code/ATMOSPHERICS/pipes/simple.dm +++ b/code/ATMOSPHERICS/pipes/simple.dm @@ -77,7 +77,7 @@ initialize_directions = SOUTH|WEST /obj/machinery/atmospherics/pipe/simple/proc/burst() - src.visible_message("\The [src] bursts!"); + 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) diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index fcc81509c8..f02943f2f5 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -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, "You stay upright as the air rushes past you.") + to_chat(src, span_notice("You stay upright as the air rushes past you.")) return 0 if(buckled) - to_chat(src, "Air suddenly rushes past you!") + to_chat(src, span_notice("Air suddenly rushes past you!")) return 0 if(!lying) - to_chat(src, "The sudden rush of air knocks you over!") + 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, "Air suddenly rushes past you!") + 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("\The [src] slams into \a [A]!",1,"You hear a loud slam!",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("\The [src] slams into \a [A]!",1,"You hear a loud slam!",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("[src] slams into [A]!",1,"You hear a loud slam!",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) diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm index 58e74ca4fa..cab64a11f8 100644 --- a/code/ZAS/Phoron.dm +++ b/code/ZAS/Phoron.dm @@ -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, "Your skin burns!") + 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, "High levels of toxins cause you to spontaneously mutate!") + 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, "Your eyes burn!") + 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, "You are blinded!") + to_chat(src, span_danger("You are blinded!")) Blind(20) /mob/living/carbon/human/proc/pl_head_protected() diff --git a/code/ZAS/Variable Settings.dm b/code/ZAS/Variable Settings.dm index d55bcc64de..c4699c7ab0 100644 --- a/code/ZAS/Variable Settings.dm +++ b/code/ZAS/Variable Settings.dm @@ -168,7 +168,7 @@ var/global/vs_control/vsc = new vars[ch] = vw if(how == "Toggle") newvar = (newvar?"ON":"OFF") - to_world("[key_name(user)] changed the setting [display_description] to [newvar].") + to_world(span_notice("[key_name(user)] changed the setting [display_description] to [newvar].")) 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("[key_name(user)] changed the global phoron/ZAS settings to \"[def]\"") + to_world(span_notice("[key_name(user)] changed the global phoron/ZAS settings to \"[def]\"")) /pl_control/var/list/settings = list() diff --git a/code/__defines/span_vr.dm b/code/__defines/span_vr.dm index 50b6f9786a..2d3430e751 100644 --- a/code/__defines/span_vr.dm +++ b/code/__defines/span_vr.dm @@ -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) ("" + str + "") #define span_looc(str) ("" + str + "") +#define span_rlooc(str) ("" + str + "") +#define span_aooc(str) ("" + str + "") +#define span_npcsay(str) ("" + str + "") #define span_deadsay(str) ("" + str + "") #define span_radio(str) ("" + str + "") #define span_deptradio(str) ("" + str + "") @@ -22,20 +25,30 @@ #define span_srvradio(str) ("" + str + "") #define span_expradio(str) ("" + str + "") -#define span_binary(str) ("" + str + "") +#define span_binarysay(str) ("" + str + "") #define span_hivemind(str) ("" + str + "") #define span_name(str) ("" + str + "") #define span_say(str) ("" + str + "") +#define span_filter_say(str) ("" + str + "") +#define span_npc_say(str) ("" + str + "") +#define span_multizsay(str) ("" + str + "") #define span_alert(str) ("" + str + "") #define span_ghostalert(str) ("" + str + "") -#define span_npc_say(str) ("" + str + "") +#define span_game(str) ("" + str + "") #define span_emote(str) ("" + str + "") #define span_emote_subtle(str) ("" + str + "") #define span_npc_emote(str) ("" + str + "") +#define span_message(str) ("" + str + "") // TODO: This makes no sense, check it! CI Error: Span not defined in scss +#define span_notify(str) ("" + str + "") // TODO: This makes no sense, check it! CI Error: Span not defined in scss +#define span_body(str) ("" + str + "") +#define span_suicide(str) ("" + str + "") + +#define span_hear(str) ("" + str + "") + #define span_attack(str) ("" + str + "") #define span_moderate(str) ("" + str + "") #define span_disarm(str) ("" + str + "") @@ -45,19 +58,41 @@ #define span_danger(str) ("" + str + "") #define span_userdanger(str) ("" + str + "") #define span_warning(str) ("" + str + "") +#define span_boldwarning(str) ("" + str + "") +#define span_filter_warning(str) ("" + str + "") +#define span_filter_combat(str) ("" + str + "") +#define span_unconscious(str) ("" + str + "") + #define span_rose(str) ("" + str + "") #define span_info(str) ("" + str + "") +#define span_infoplain(str) ("" + str + "") #define span_notice(str) ("" + str + "") +#define span_filter_notice(str) ("" + str + "") +#define span_boldnotice(str) ("" + str + "") #define span_alium(str) ("" + str + "") #define span_cult(str) ("" + str + "") +#define span_sinister(str) ("" + str + "") + #define span_reflex_shoot(str) ("" + str + "") +/* Direct communication spans */ + +#define span_psay(str) ("" + str + "") +#define span_pemote(str) ("" + str + "") + +/* Export spans */ + +#define span_chatexport(str) ("" + str + "") + /* Vore messages */ +#define span_valert(str) ("" + str + "") #define span_vdanger(str) ("" + str + "") #define span_vwarning(str) ("" + str + "") #define span_vnotice(str) ("" + str + "") +#define span_nif(str) ("" + str + "") +#define span_filter_nif(str) ("" + str + "") /* Languages */ @@ -109,13 +144,32 @@ #define span_maroon(str) ("" + str + "") #define span_brown(str) ("" + str + "") #define span_lightpurple(str) ("" + str + "") -#define span_darkpink(str) ("" + str + "") +#define span_darkpink(str) ("" + str + "") /* System and Debug */ +#define span_prefix(str) ("" + str + "") +#define span_admin(str) ("" + str + "") +#define span_adminnotice(str) ("" + str + "") +#define span_boldannounce(str) ("" + str + "") #define span_linkOn(str) ("" + str + "") +#define span_linkOff(str) ("" + str + "") +#define span_log_message(str) ("" + str + "") #define span_filter_system(str) ("" + str + "") #define span_filter_debuglogs(str) ("" + str + "") +#define span_filter_adminlog(str) ("" + str + "") +#define span_pm(str) ("" + str + "") +#define span_filter_pm(str) ("" + str + "") +#define span_adminhelp(str) ("" + str + "") +#define span_mentor(str) ("" + str + "") +#define span_filter_pray(str) ("" + str + "") + +/* Adminchat */ + +#define span_admin_channel(str) ("" + str + "") +#define span_mod_channel(str) ("" + str + "") +#define span_event_channel(str) ("" + str + "") +#define span_mentor_channel(str) ("" + str + "") /* Byond Sizes */ @@ -128,3 +182,10 @@ #define span_huge(X) "[X]" #define span_giant(X) "[X]" + +/* Style spans */ + +#define span_italics(str) ("" + str + "") +#define span_bold(str) ("" + str + "") + +#define span_linkify(str) ("" + str + "") diff --git a/code/_helpers/atmospherics.dm b/code/_helpers/atmospherics.dm index 709b35aba8..7e899ed316 100644 --- a/code/_helpers/atmospherics.dm +++ b/code/_helpers/atmospherics.dm @@ -1,16 +1,16 @@ /obj/proc/analyze_gases(var/atom/A, var/mob/user) if(src != A) - user.visible_message("\The [user] has used \an [src] on \the [A]") + 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, "Results of the analysis[src == A ? "" : " of \the [A]"]") + to_chat(user, span_notice("Results of the analysis[src == A ? "" : " of \the [A]"]")) for(var/line in result) - to_chat(user, "[line]") + to_chat(user, span_notice("[line]")) return 1 - to_chat(user, "Your [src] flashes a red light as it fails to analyze \the [A].") + 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 += "Pressure: [round(pressure,0.1)] kPa" + results += span_notice("Pressure: [round(pressure,0.1)] kPa") for(var/mix in mixture.gas) - results += "[gas_data.name[mix]]: [round((mixture.gas[mix] / total_moles) * 100)]% ([round(mixture.gas[mix], 0.01)] moles)" - results += "Temperature: [round(mixture.temperature-T0C)]°C" - results += "Heat Capacity: [round(mixture.heat_capacity(),0.1)]" + 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)]°C") + results += span_notice("Heat Capacity: [round(mixture.heat_capacity(),0.1)]") else - results += "\The [target] is empty!" + 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) diff --git a/code/_helpers/logging.dm b/code/_helpers/logging.dm index 9348231911..2b61a877ba 100644 --- a/code/_helpers/logging.dm +++ b/code/_helpers/logging.dm @@ -48,7 +48,7 @@ if(C.prefs?.read_preference(/datum/preference/toggle/show_debug_logs)) to_chat(C, type = MESSAGE_TYPE_DEBUG, - html = "DEBUG: [text]") + 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("[progress_message]", 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. diff --git a/code/_helpers/mobs.dm b/code/_helpers/mobs.dm index 442dcbf599..d4a29095b8 100644 --- a/code/_helpers/mobs.dm +++ b/code/_helpers/mobs.dm @@ -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, "You're in the middle of doing something else already.") + 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, "Someone is already doing something with \the [target].") + 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, "You're in the middle of doing something else already.") + 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, "Someone is already doing something with \the [target].") + 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, "Please set informative OOC notes related to RP/ERP preferences. Set them using the 'OOC Notes' button on the 'General' tab in character setup.") + 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 diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index 76b18f7222..38828e148f 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -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, "Lights are now [lights ? "on." : "off."]") + to_chat(user, span_notice("Lights are now [lights ? "on." : "off."]")) update_icon() return TRUE diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 16a35b18ea..d303529c1e 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -337,7 +337,7 @@ nutrition = max(nutrition - rand(1,5),0) handle_regular_hud_updates() else - to_chat(src, "You're out of energy! You need food!") + 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) diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index a7ff03177d..15acd142c6 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -46,7 +46,7 @@ if(is_component_functioning("camera")) aiCamera.captureimage(A, usr) else - to_chat(src, "Your camera isn't functional.") + to_chat(src, span_userdanger("Your camera isn't functional.")) return /* diff --git a/code/_onclick/hud/ability_screen_objects.dm b/code/_onclick/hud/ability_screen_objects.dm index 7690b9d203..905676ff17 100644 --- a/code/_onclick/hud/ability_screen_objects.dm +++ b/code/_onclick/hud/ability_screen_objects.dm @@ -290,7 +290,7 @@ if(!mob) return // Paranoid. if(isnull(slot) || !isnum(slot)) - to_chat(src, ".activate_ability requires a number as input, corrisponding to the slot you wish to use.") + 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. diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 5a7edb6a33..4af2212d60 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -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,"[name] - [desc]") + to_chat(usr,span_boldnotice("[name] - [desc]")) return if(master) return usr.client.Click(master, location, control, params) diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index f2bf342061..123d94a7d8 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -362,7 +362,7 @@ var/list/global_huds = list( set hidden = 1 if(!hud_used) - to_chat(usr, "This mob type does not use a HUD.") + to_chat(usr, span_warning("This mob type does not use a HUD.")) return FALSE if(!client) return FALSE diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 3ab7410269..84c9dc797a 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -282,11 +282,11 @@ var/obj/screen/robot_inventory //r.client.screen += robot_inventory //"store" icon if(!r.module) - to_chat(usr, "No module selected") + to_chat(usr, span_danger("No module selected")) return if(!r.module.modules) - to_chat(usr, "Selected module has no modules to select") + to_chat(usr, span_danger("Selected module has no modules to select")) return if(!r.robot_modules_background) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index b376505a99..cc567b9e2e 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -290,7 +290,7 @@ if(iscarbon(usr)) var/mob/living/carbon/C = usr if(C.legcuffed) - to_chat(C, "You are legcuffed! You cannot run until you get [C.legcuffed] removed!") + 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, "No longer running on internals.") + 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, "You are not wearing a suitable mask or helmet.") + 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, "You are now running on internals from [tankcheck[best]] [from] your [nicename[best]].") + 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, "You don't have a[breathes=="oxygen" ? "n oxygen" : addtext(" ",breathes)] tank.") + 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, "You're not holding anything to use. You need to have something in your active hand to use it.") + 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)) diff --git a/code/_onclick/hud/screen_objects_vr.dm b/code/_onclick/hud/screen_objects_vr.dm index 279675c2ee..ea4fbaa9a4 100644 --- a/code/_onclick/hud/screen_objects_vr.dm +++ b/code/_onclick/hud/screen_objects_vr.dm @@ -6,63 +6,63 @@ if("darkness") var/turf/T = get_turf(usr) var/darkness = round(1 - T.get_lumcount(),0.1) - to_chat(usr,"Darkness: [darkness]") + to_chat(usr,span_notice("Darkness: [darkness]")) if("energy") var/mob/living/simple_mob/shadekin/SK = usr if(istype(SK)) - to_chat(usr,"Energy: [SK.energy] ([SK.dark_gains])") + to_chat(usr,span_notice("Energy: [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,"Darkness: [darkness]") + to_chat(usr,span_notice("Darkness: [darkness]")) var/mob/living/carbon/human/H = usr if(istype(H) && istype(H.species, /datum/species/shadekin)) - to_chat(usr,"Energy: [H.shadekin_get_energy(H)]") + to_chat(usr,span_notice("Energy: [H.shadekin_get_energy(H)]")) if("glamour") var/mob/living/carbon/human/H = usr if(istype(H)) - to_chat(usr,"Energy: [H.species.lleill_energy]/[H.species.lleill_energy_max]") + to_chat(usr,span_notice("Energy: [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, "You are currently completely feral.") + to_chat(usr, span_warning("You are currently completely feral.")) else if(H.feral > 10) - to_chat(usr, "You are currently crazed and confused.") + to_chat(usr, span_warning("You are currently crazed and confused.")) else if(H.feral > 0) - to_chat(usr, "You are currently acting on instinct.") + to_chat(usr, span_warning("You are currently acting on instinct.")) else - to_chat(usr, "You are currently calm and collected.") + to_chat(usr, span_notice("You are currently calm and collected.")) if(H.feral > 0) var/feral_passing = TRUE if(H.traumatic_shock > min(60, H.nutrition/10)) - to_chat(usr, "Your pain prevents you from regaining focus.") + to_chat(usr, span_warning("Your pain prevents you from regaining focus.")) feral_passing = FALSE if(H.feral + H.nutrition < 150) - to_chat(usr, "Your hunger prevents you from regaining focus.") + to_chat(usr, span_warning("Your hunger prevents you from regaining focus.")) feral_passing = FALSE if(H.jitteriness >= 100) - to_chat(usr, "Your jitterness prevents you from regaining focus.") + 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, "You are slowly calming down in darkness' safety...") + 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, "You are slowly calming down within the darkness of something's belly, listening to their body as it moves around you. ...safe...") + 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, "You are slowly calming down... But safety of darkness is much preferred.") + 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, "Your hunger is slowly making you unstable.") + 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, "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.") + 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, "You should have a notification + alert for this! Bug report that this is still here!") + 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 \ No newline at end of file + return 1 diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index 5090608504..75d1208a40 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -6,9 +6,9 @@ if(!client) return client.inquisitive_ghost = !client.inquisitive_ghost if(client.inquisitive_ghost) - to_chat(src, "You will now examine everything you click on.") + to_chat(src, span_notice("You will now examine everything you click on.")) else - to_chat(src, "You will no longer examine things you click on.") + 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) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 16141343c6..efe047ebef 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -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, "Your mind won't reach that far.") + to_chat(user, span_notice("Your mind won't reach that far.")) return if(!focus) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index da18b6c570..bd846d11bc 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -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 = "Make sure to play a different character, and please roleplay correctly!" + var/static/respawn_message = span_notice("Make sure to play a different character, and please roleplay correctly!") 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 = "[value]" + config.respawn_message = span_notice("[value]") if ("servername") config.server_name = value diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 6203388ec1..3022944ec3 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -57,23 +57,23 @@ var/datum/controller/failsafe/Failsafe if(4,5) --defcon if(3) - log_and_message_admins("SSfailsafe Notice: DEFCON [defcon_pretty()]. The Master Controller (\ref[Master]) has not fired in the last [(5-defcon) * processing_interval] ticks.") + 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("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.") + 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("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...") + 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("SSfailsafe Notice: MC (New:\ref[Master]) restarted successfully") + 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("SSFAILSAFE ERROR: DEFCON [defcon_pretty()]. Could not restart MC (\ref[Master]), runtime encountered. I will silently keep retrying.") + 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("SSfailsafe Notice: MC (New:\ref[Master]) restarted successfully") + log_and_message_admins(span_adminnotice("SSfailsafe Notice: MC (New:\ref[Master]) restarted successfully")) else defcon = min(defcon + 1,5) master_iteration = Master.iteration diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 9b2df0d24f..49f34a5c97 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -141,7 +141,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new BadBoy.critfail() if(msg) log_game(msg) - message_admins("[msg]") + 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("The Master Controller is having some issues, we will need to re-initialize EVERYTHING") + 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, "MC: Initializing subsystems...") + 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, "[msg]") + 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("Another map is attempting to be loaded before first map released lock. Delaying.", 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("Map is now being built. Locking.", 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("Map is finished. Unlocking.", 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() diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index 3e369f1271..857ce225f6 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -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("Job setup complete", 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("Initializations complete.", 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. diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index 6b6c345b24..5297314ab1 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -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, "[msg]") + 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() diff --git a/code/controllers/subsystems/air.dm b/code/controllers/subsystems/air.dm index fa091ca525..71302f9560 100644 --- a/code/controllers/subsystems/air.dm +++ b/code/controllers/subsystems/air.dm @@ -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 ? "[active_edges.len]" : "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] "}, 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() diff --git a/code/controllers/subsystems/airflow.dm b/code/controllers/subsystems/airflow.dm index 7561ad8cca..30ad9f9ea0 100644 --- a/code/controllers/subsystems/airflow.dm +++ b/code/controllers/subsystems/airflow.dm @@ -121,7 +121,7 @@ SUBSYSTEM_DEF(airflow) return FALSE if (ismob(src)) - to_chat(src,"You are pushed away by airflow!") + 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) diff --git a/code/controllers/subsystems/atoms.dm b/code/controllers/subsystems/atoms.dm index a62c5265c5..5968fe1fe3 100644 --- a/code/controllers/subsystems/atoms.dm +++ b/code/controllers/subsystems/atoms.dm @@ -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("Initializing objects", R_DEBUG) + admin_notice(span_danger("Initializing objects"), R_DEBUG) InitializeAtoms() return ..() diff --git a/code/controllers/subsystems/inactivity.dm b/code/controllers/subsystems/inactivity.dm index ab1b7209ca..3795468f84 100644 --- a/code/controllers/subsystems/inactivity.dm +++ b/code/controllers/subsystems/inactivity.dm @@ -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, "You have been inactive for more than [config.kick_inactive] minute\s and have been disconnected.") + 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) diff --git a/code/controllers/subsystems/machines.dm b/code/controllers/subsystems/machines.dm index a4a836f200..6721002555 100644 --- a/code/controllers/subsystems/machines.dm +++ b/code/controllers/subsystems/machines.dm @@ -32,7 +32,7 @@ SUBSYSTEM_DEF(machines) /datum/controller/subsystem/machines/Initialize(timeofday) makepowernets() - admin_notice("Initializing atmos machinery.", 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 diff --git a/code/controllers/subsystems/mapping.dm b/code/controllers/subsystems/mapping.dm index e496a97f18..38dda58e34 100644 --- a/code/controllers/subsystems/mapping.dm +++ b/code/controllers/subsystems/mapping.dm @@ -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("Chose Engine Map: [chosen_type.name]", R_DEBUG) + admin_notice(span_danger("Chose Engine Map: [chosen_type.name]"), R_DEBUG) // Annihilate movable atoms engine_loader.annihilate_bounds() diff --git a/code/controllers/subsystems/media_tracks.dm b/code/controllers/subsystems/media_tracks.dm index 7fbffa65b6..8ec57d7389 100644 --- a/code/controllers/subsystems/media_tracks.dm +++ b/code/controllers/subsystems/media_tracks.dm @@ -99,11 +99,11 @@ SUBSYSTEM_DEF(media_tracks) if(islist(json)) for(var/song in json) if(!islist(song)) - to_chat(C, "Song appears to be malformed.") + 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, "URL, Title, or Duration was missing from a song. Skipping.") + 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, "Couldn't find a track matching the specified parameters.") + 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)) diff --git a/code/controllers/subsystems/overmap_renamer_vr.dm b/code/controllers/subsystems/overmap_renamer_vr.dm index 5b2cd75da4..0180b89355 100644 --- a/code/controllers/subsystems/overmap_renamer_vr.dm +++ b/code/controllers/subsystems/overmap_renamer_vr.dm @@ -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("Debris Field name chosen as [V.name]", 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("Debris Field name chosen as [V.real_name]", R_DEBUG) + admin_notice(span_danger("Debris Field name chosen as [V.real_name]"), R_DEBUG) diff --git a/code/controllers/subsystems/planets.dm b/code/controllers/subsystems/planets.dm index 4dae77ccbe..2054d6daa7 100644 --- a/code/controllers/subsystems/planets.dm +++ b/code/controllers/subsystems/planets.dm @@ -15,7 +15,7 @@ SUBSYSTEM_DEF(planets) var/static/list/needs_temp_update = list() /datum/controller/subsystem/planets/Initialize(timeofday) - admin_notice("Initializing planetary weather.", 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("Z[Z] is shared by more than one planet!", 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) diff --git a/code/controllers/subsystems/supply.dm b/code/controllers/subsystems/supply.dm index 3f160a53c2..84d4d4ee9c 100644 --- a/code/controllers/subsystems/supply.dm +++ b/code/controllers/subsystems/supply.dm @@ -200,7 +200,7 @@ SUBSYSTEM_DEF(supply) A.req_access = L.Copy() LAZYCLEARLIST(A.req_one_access) else - log_debug("Supply pack with invalid access restriction [SP.access] encountered!") + log_debug(span_danger("Supply pack with invalid access restriction [SP.access] encountered!")) //supply manifest generation begin var/obj/item/paper/manifest/slip diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index b26bd701a6..0311c347de 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -74,8 +74,8 @@ var/global/datum/controller/subsystem/ticker/ticker post_game_tick() /datum/controller/subsystem/ticker/proc/pregame_welcome() - to_world("Welcome to the pregame lobby!") - to_world("Please set up your character and select ready. The round will start in [pregame_timeleft] seconds.") + to_world(span_boldannounce(span_notice("Welcome to the pregame lobby!"))) + 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("Unable to choose playable game mode. Reverting to pregame lobby.") + to_world(span_danger("Unable to choose playable game mode. 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("Serious error in mode setup! Reverting to pregame lobby.") //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("Unable to start [mode.name]. Not enough players readied, [config.player_requirements[mode.config_tag]] players needed. Reverting to pregame lobby.") + to_world(span_danger("Unable to start [mode.name]. 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("The current game mode is - Secret!") + to_world(span_notice("The current game mode is - Secret!")) 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("Possibilities: [english_list(tmpmodes, and_text= "; ", comma_text = "; ")]") + to_world(span_info("Possibilities: [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("Enjoy the game!") + to_world(span_boldannounce(span_notice("Enjoy the game!"))) 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("The round has ended!") + 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("Rebooting due to destruction of [station_name()] in [round(restart_timeleft/600)] minute\s.") + to_world(span_notice("Rebooting due to destruction of [station_name()] in [round(restart_timeleft/600)] minute\s.")) 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("An admin has delayed the round end.") + to_world(span_notice("An admin has delayed the round end.")) end_game_state = END_GAME_DELAYED else if(restart_timeleft <= 0) - to_world("Restarting world!") + to_world(span_warning("Restarting world!")) sleep(5) world.Reboot() else if (world.time - last_restart_notify >= 1 MINUTE) - to_world("Restarting in [round(restart_timeleft/600, 1)] minute\s.") + to_world(span_notice("Restarting in [round(restart_timeleft/600, 1)] minute\s.")) 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, "Site Management is not forced on anyone.") + to_chat(M, span_notice("Site Management is not forced on anyone.")) /datum/controller/subsystem/ticker/proc/declare_completion() - to_world("


A round of [mode.name] has ended!

") + to_world(span_filter_system("


A round of [mode.name] has ended!

")) 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_blue("You survived the round, but remained on [station_name()] as [Player.real_name].")]") + to_chat(Player, span_filter_system("[span_blue("You survived the round, but remained on [station_name()] as [Player.real_name].")]")) else - to_chat(Player, "[span_green("You managed to survive the events on [station_name()] as [Player.real_name].")]") + to_chat(Player, span_filter_system("[span_green("You managed to survive the events on [station_name()] as [Player.real_name].")]")) else if(isAdminLevel(playerTurf.z)) - to_chat(Player, "[span_green("You successfully underwent crew transfer after events on [station_name()] as [Player.real_name].")]") + to_chat(Player, span_filter_system("[span_green("You successfully underwent crew transfer after events on [station_name()] as [Player.real_name].")]")) else if(issilicon(Player)) - to_chat(Player, "[span_green("You remain operational after the events on [station_name()] as [Player.real_name].")]") + to_chat(Player, span_filter_system("[span_green("You remain operational after the events on [station_name()] as [Player.real_name].")]")) else - to_chat(Player, "[span_blue("You missed the crew transfer after the events on [station_name()] as [Player.real_name].")]") + to_chat(Player, span_filter_system("[span_blue("You missed the crew transfer after the events on [station_name()] as [Player.real_name].")]")) else if(istype(Player,/mob/observer/dead)) var/mob/observer/dead/O = Player if(!O.started_as_observer) - to_chat(Player, "[span_red("You did not survive the events on [station_name()]...")]") + to_chat(Player, span_filter_system("[span_red("You did not survive the events on [station_name()]...")]")) else - to_chat(Player, "[span_red("You did not survive the events on [station_name()]...")]") + to_chat(Player, span_filter_system("[span_red("You did not survive the events on [station_name()]...")]")) to_world("
") for (var/mob/living/silicon/ai/aiPlayer in mob_list) if (aiPlayer.stat != 2) - to_world("[aiPlayer.name]'s laws at the end of the round were:") // VOREStation edit + to_world(span_filter_system("[aiPlayer.name]'s laws at the end of the round were:")) // VOREStation edit else - to_world("[aiPlayer.name]'s laws when it was deactivated were:") // VOREStation edit + to_world(span_filter_system("[aiPlayer.name]'s laws when it was deactivated were:")) // VOREStation edit aiPlayer.show_laws(1) if (aiPlayer.connected_robots.len) var/robolist = "The AI's loyal minions were: " for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) robolist += "[robo.name][robo.stat?" (Deactivated), ":", "]" // VOREStation edit - to_world("[robolist]") + 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("[robo.name] survived as an AI-less stationbound synthetic! Its laws were:") // VOREStation edit + to_world(span_filter_system("[robo.name] survived as an AI-less stationbound synthetic! Its laws were:")) // VOREStation edit else - to_world("[robo.name] was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:") // VOREStation edit + to_world(span_filter_system("[robo.name] was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:")) // 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("There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] at the end of this round.") + to_world(span_filter_system("There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] at the end of this round.")) mode.declare_completion()//To declare normal completion. diff --git a/code/controllers/subsystems/vote.dm b/code/controllers/subsystems/vote.dm index c259c9ecd7..a16b9bf703 100644 --- a/code/controllers/subsystems/vote.dm +++ b/code/controllers/subsystems/vote.dm @@ -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, "You can't start a RESTART VOTE while there are staff around. If you are having an issue with the round, please ahelp it.") + 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) diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index 19fc7ec7ae..ef76e63ca7 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -227,7 +227,7 @@ if(law == zeroth_law_borg) continue if(law == zeroth_law) - to_chat(who, "[law.get_index()]. [law.law]") + to_chat(who, span_danger("[law.get_index()]. [law.law]")) else to_chat(who, "[law.get_index()]. [law.law]") diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 4aac042789..1c6cdaf470 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -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, "The [title] browser you tried to open failed a sanity check! Please report this on github!") + 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) diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index 27c8821f2d..edda32de87 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -468,10 +468,10 @@ user.put_in_hands(result) else result.forceMove(user.drop_location()) - to_chat(user, "[TR.name] constructed.") + to_chat(user, span_notice("[TR.name] constructed.")) TR.on_craft_completion(user, result) else - to_chat(user, "Construction failed[result]") + to_chat(user, span_warning("Construction failed[result]")) busy = FALSE if("toggle_recipes") display_craftable_only = !display_craftable_only diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index b414f4651f..4305a236b3 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -102,7 +102,7 @@ for(var/datum/material/M as anything in materials) var/amt = materials[M] if(amt) - examine_texts += "It has [amt] units of [lowertext(M.name)] stored." + 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, "[parent] won't accept [I]!") + 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, "[I] does not contain sufficient materials to be accepted by [parent].") + 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, "[parent] is full. Please remove materials from [parent] in order to insert more.") + 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, "[S] does not contain sufficient materials to be accepted by [parent].") + 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, "[parent] cannot contain [material].") + to_chat(user, span_warning("[parent] cannot contain [material].")) return // Our sheet had no material. Whoops. if(!matter_per_sheet) - to_chat(user, "[S] does not contain any matter acceptable by [parent].") + 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, "[parent] is full. Please remove materials from [parent] in order to insert more.") + 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, "[parent] is full. Please remove materials from [parent] in order to insert more.") + 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, "Something went wrong with your stack. Split it manually and try again.") + 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, "You insert a material total of [inserted] into [parent].") + 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, "[I] is stuck to you and cannot be placed into [parent].") + 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, "You insert a material total of [inserted] into [parent].") + 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) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 4579f50f40..59cd16434e 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -86,7 +86,7 @@ datumname = "element" _AddElement(lst) log_admin("[key_name(usr)] has added [result] [datumname] to [key_name(src)].") - message_admins("[key_name_admin(usr)] has added [result] [datumname] to [key_name_admin(src)].") + message_admins(span_notice("[key_name_admin(usr)] has added [result] [datumname] to [key_name_admin(src)].")) /datum/proc/vv_get_header() . = list() diff --git a/code/datums/ghost_query.dm b/code/datums/ghost_query.dm index 64f208c850..a4d4e1d397 100644 --- a/code/datums/ghost_query.dm +++ b/code/datums/ghost_query.dm @@ -78,22 +78,22 @@ if("Never for this round") if(be_special_flag) D.client.prefs.be_special ^= be_special_flag - to_chat(D, "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.") + 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, "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!") + 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, "Unfortunately, you no longer qualify for this role. Sorry.") + to_chat(D, span_warning("Unfortunately, you no longer qualify for this role. Sorry.")) else if(finished) // Already finished candidate list - to_chat(D, "Unfortunately, you were not fast enough, and there are no more available roles. Sorry.") + 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, "Unfortunately, you no longer qualify for this role. Sorry.") + to_chat(D, span_warning("Unfortunately, you no longer qualify for this role. Sorry.")) else if(finished) // Already finished candidate list - to_chat(D, "Unfortunately, you were not fast enough, and there are no more available roles. Sorry.") + 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) diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index 7e0f3c740b..ad9a210c79 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -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, "Please wait until server initializations are complete.") + to_chat(src, span_warning("Please wait until server initializations are complete.")) return - + var/list/msg = list() - + if(GLOB.revdata.revision) msg += "Server revision: B:[GLOB.revdata.branch] D:[GLOB.revdata.date]" if(config.githuburl) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index fe9b670d7b..07f4301ca2 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -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, "The Bluespace interface on your [teleatom] interferes with the teleport!") + 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("\The [teleatom] bounces off of the portal!") + 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("\The [MM] bounces off of the portal!","Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through.") + 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("\The [teleatom] bounces off of the portal!") + 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, "\The [MM] would not survive the jump to a location so far away!") + 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("\The [teleatom] bounces off of the portal!") + 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, "The portal refuses to carry you that far away!") + 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, "Something is blocking way on the other side!") + to_chat(teleatom, span_warning("Something is blocking way on the other side!")) if(obstructed) return 0 else return 1 - //VOREStation Edit End \ No newline at end of file + //VOREStation Edit End diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 868e8d9699..5c8367c5d9 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -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, "[src] could not be made into a [antag.role_text]!") + 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, "Your ambitions have been changed by higher powers, they are now: [mind.ambitions]") + 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, "Your loyalty implant has been deactivated.") + to_chat(H, span_notice("Your loyalty implant has been deactivated.")) log_admin("[key_name_admin(usr)] has de-loyalty implanted [current].") if("add") - to_chat(H, "You somehow have become the recepient of a loyalty transplant, and it just activated!") + to_chat(H, span_danger("You somehow have become the recepient of a loyalty transplant, and it just activated!")) H.implant_loyalty(override = TRUE) log_admin("[key_name_admin(usr)] has loyalty implanted [current].") else diff --git a/code/datums/observation/stat_set.dm b/code/datums/observation/stat_set.dm index c818a50532..08db60a380 100644 --- a/code/datums/observation/stat_set.dm +++ b/code/datums/observation/stat_set.dm @@ -30,6 +30,6 @@ stat_set_event, /decl/observ/stat_set, new) if(!ourbelly.owner.client) return if(stat == CONSCIOUS) - to_chat(ourbelly.owner, "\The [src.name] is awake.") + to_chat(ourbelly.owner, span_notice("\The [src.name] is awake.")) else if(stat == UNCONSCIOUS) - to_chat(ourbelly.owner, "\The [src.name] has fallen unconscious!") + to_chat(ourbelly.owner, span_red("\The [src.name] has fallen unconscious!")) diff --git a/code/datums/riding.dm b/code/datums/riding.dm index 5507b27e71..f0b2f53b95 100644 --- a/code/datums/riding.dm +++ b/code/datums/riding.dm @@ -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, "\The [ridden] can only be controlled by one person at a time, and is currently being controlled by \the [driver].") + 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, "You'll need [key_name] in one of your hands to move \the [ridden].") + 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, "The boat has sunk!") + 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, "Boats don't go on land!") + 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. diff --git a/code/datums/roundstats/departmentgoal.dm b/code/datums/roundstats/departmentgoal.dm index 333e6c0396..d9abc7cbec 100644 --- a/code/datums/roundstats/departmentgoal.dm +++ b/code/datums/roundstats/departmentgoal.dm @@ -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("[category]") + to_world(span_filter_system("[category]")) if(!LAZYLEN(cat_goals)) - to_world("There were no assigned goals!") + 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("[success ? "[G.name]" : "[G.name]"]") - to_world("[G.goal_text]") + 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 diff --git a/code/datums/wires/jukebox.dm b/code/datums/wires/jukebox.dm index 5f46a3deb9..c9a0b5c891 100644 --- a/code/datums/wires/jukebox.dm +++ b/code/datums/wires/jukebox.dm @@ -31,16 +31,16 @@ var/obj/machinery/media/jukebox/A = holder switch(wire) if(WIRE_MAIN_POWER1) - holder.visible_message("[icon2html(A,viewers(holder))] The power light flickers.") + holder.visible_message(span_notice("[icon2html(A,viewers(holder))] The power light flickers.")) A.shock(usr, 90) if(WIRE_JUKEBOX_HACK) - holder.visible_message("[icon2html(A,viewers(holder))] The parental guidance light flickers.") + holder.visible_message(span_notice("[icon2html(A,viewers(holder))] The parental guidance light flickers.")) if(WIRE_REVERSE) - holder.visible_message("[icon2html(A,viewers(holder))] The data light blinks ominously.") + holder.visible_message(span_notice("[icon2html(A,viewers(holder))] The data light blinks ominously.")) if(WIRE_SPEEDUP) - holder.visible_message("[icon2html(A,viewers(holder))] The speakers squeaks.") + holder.visible_message(span_notice("[icon2html(A,viewers(holder))] The speakers squeaks.")) if(WIRE_SPEEDDOWN) - holder.visible_message("[icon2html(A,viewers(holder))] The speakers rumble.") + holder.visible_message(span_notice("[icon2html(A,viewers(holder))] The speakers rumble.")) if(WIRE_START) A.StartPlaying() if(WIRE_STOP) diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 8fe75e8364..4e71b94630 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -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, "You need wirecutters!") + 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, "You need a multitool!") + 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, "You need a remote signaller!") + 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, "[I] is stuck to your hand!") + 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. diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 41334221d6..75855cec64 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -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, "No bugged functioning cameras found.") + 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) - . += "[src]'s external casing can be modified via alt-click." + . += span_notice("[src]'s external casing can be modified via alt-click.") /obj/item/storage/part_replacer/AltClick(mob/user) . = ..() diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index 9e8270e9cf..2ef7d84751 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -56,9 +56,9 @@ for(var/mob/M in player_list) if(!istype(M,/mob/new_player) && !isdeaf(M)) to_chat(M, "

[title]

") - to_chat(M, "[message]") + to_chat(M, span_alert("[message]")) if (announcer) - to_chat(M, " -[html_encode(announcer)]") + 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("

[message_title]

") - to_world("[message]") + to_world(span_alert("[message]")) if(announcer) - to_world(" -[html_encode(announcer)]") + to_world(span_alert(" -[html_encode(announcer)]")) to_world("
") /datum/announcement/priority/command/Message(message as text, message_title as text, var/list/zlevels) @@ -77,7 +77,7 @@ if (message_title) command += "

[message_title]

" - command += "
[message]
" + command += "
[span_alert(message)]
" command += "
" for(var/mob/M in player_list) if(zlevels && !(get_z(M) in zlevels)) diff --git a/code/game/antagonist/antagonist.dm b/code/game/antagonist/antagonist.dm index bc1374c807..7910d84ea3 100644 --- a/code/game/antagonist/antagonist.dm +++ b/code/game/antagonist/antagonist.dm @@ -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, "You have been selected this round as an antagonist!") + to_chat(player.current, span_danger("You have been selected this round as an antagonist!")) message_admins("[uppertext(ticker.mode.name)]: Selected [player] as a [role_text].") if(istype(player.current, /mob/observer/dead)) create_default(player.current) diff --git a/code/game/antagonist/antagonist_add.dm b/code/game/antagonist/antagonist_add.dm index 56a716f24b..259cc5c3ad 100644 --- a/code/game/antagonist/antagonist_add.dm +++ b/code/game/antagonist/antagonist_add.dm @@ -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, "You are \a [nonstandard_role_type]!") + to_chat(player.current, span_danger("You are \a [nonstandard_role_type]!")) player.special_role = nonstandard_role_type if(nonstandard_role_msg) - to_chat(player.current, "[nonstandard_role_msg]") + 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, "You are no longer a [role_text]!") + to_chat(player.current, span_danger("You are no longer a [role_text]!")) 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 \ No newline at end of file + return 0 diff --git a/code/game/antagonist/antagonist_create.dm b/code/game/antagonist/antagonist_create.dm index 4aaba2802b..8c8d7b1f38 100644 --- a/code/game/antagonist/antagonist_create.dm +++ b/code/game/antagonist/antagonist_create.dm @@ -88,7 +88,7 @@ code_owner.store_memory("Nuclear Bomb Code: [code]", 0, 0) to_chat(code_owner.current, "The nuclear authorization code is: [code]") else - message_admins("Could not spawn nuclear bomb. Contact a developer.") + 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, "You are a [role_text]!") + to_chat(player.current, span_danger("You are a [role_text]!")) if(leader_welcome_text && player == leader) - to_chat(player.current, "[leader_welcome_text]") + to_chat(player.current, span_notice("[leader_welcome_text]")) else - to_chat(player.current, "[welcome_text]") + to_chat(player.current, span_notice("[welcome_text]")) if (config.objectives_disabled) - to_chat(player.current, "[antag_text]") + to_chat(player.current, span_notice("[antag_text]")) if((flags & ANTAG_HAS_NUKE) && !spawned_nuke) create_nuke() diff --git a/code/game/antagonist/antagonist_factions.dm b/code/game/antagonist/antagonist_factions.dm index 2ae28151d5..b16179f292 100644 --- a/code/game/antagonist/antagonist_factions.dm +++ b/code/game/antagonist/antagonist_factions.dm @@ -14,33 +14,33 @@ return if(faction.is_antagonist(player)) - to_chat(src, "\The [player.current] already serves the [faction.faction_descriptor].") + to_chat(src, span_warning("\The [player.current] already serves the [faction.faction_descriptor].")) return if(player_is_antag(player)) - to_chat(src, "\The [player.current]'s loyalties seem to be elsewhere...") + to_chat(src, span_warning("\The [player.current]'s loyalties seem to be elsewhere...")) return if(!faction.can_become_antag(player)) - to_chat(src, "\The [player.current] cannot be \a [faction.faction_role_text]!") + 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, "You must wait five seconds between attempts.") + to_chat(src, span_danger("You must wait five seconds between attempts.")) return - to_chat(src, "You are attempting to convert \the [player.current]...") + 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("[src]([src.ckey]) attempted to convert [player.current].") + 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, "\The [player.current] joins the [faction.faction_descriptor]!") + to_chat(src, span_notice("\The [player.current] joins the [faction.faction_descriptor]!")) return if(!choice || choice == "No!") - to_chat(player, "You reject this traitorous cause!") - to_chat(src, "\The [player.current] does not support the [faction.faction_descriptor]!") + 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" diff --git a/code/game/antagonist/antagonist_objectives.dm b/code/game/antagonist/antagonist_objectives.dm index 223db7dda8..b77972ac30 100644 --- a/code/game/antagonist/antagonist_objectives.dm +++ b/code/game/antagonist/antagonist_objectives.dm @@ -24,10 +24,10 @@ if(!O.completed && !O.check_completion()) result = 0 if(result && victory_text) - to_world("[victory_text]") + to_world(span_danger("[victory_text]")) if(victory_feedback_tag) feedback_set_details("round_end_result","[victory_feedback_tag]") else if(loss_text) - to_world("[loss_text]") + to_world(span_danger("[loss_text]")) 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, "You've set your goal to be '[new_ambitions]'.") + to_chat(src, span_notice("You've set your goal to be '[new_ambitions]'.")) else - to_chat(src, "You leave your ambitions behind.") + to_chat(src, span_notice("You leave your ambitions behind.")) log_and_message_admins("has set their ambitions to now be: [new_ambitions].") diff --git a/code/game/antagonist/mutiny/mutineer.dm b/code/game/antagonist/mutiny/mutineer.dm index b679c3c0f4..28871a32e2 100644 --- a/code/game/antagonist/mutiny/mutineer.dm +++ b/code/game/antagonist/mutiny/mutineer.dm @@ -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("Mutiny mode aborted: no valid candidates for Directive X.") + to_world(span_warning("Mutiny mode aborted: no valid candidates for Directive X.")) return 0 head_loyalist = pick(loyalist_candidates) diff --git a/code/game/antagonist/outsider/ninja.dm b/code/game/antagonist/outsider/ninja.dm index 261c798cbd..fa2c29a7c6 100644 --- a/code/game/antagonist/outsider/ninja.dm +++ b/code/game/antagonist/outsider/ninja.dm @@ -7,7 +7,7 @@ var/datum/antagonist/ninja/ninjas role_text_plural = "Ninja" bantype = "ninja" landmark_id = "ninjastart" - welcome_text = "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." + 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, "You forgot to turn on your internals! Quickly, toggle the valve!") + 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. diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index bc17d1175d..f494f91757 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -187,7 +187,7 @@ var/datum/antagonist/raider/raiders else win_msg += "The Raiders were repelled!" - to_world("[win_type] [win_group] victory!") + to_world(span_danger("[win_type] [win_group] victory!")) to_world("[win_msg]") feedback_set_details("round_end_result","heist - [win_type] [win_group]") diff --git a/code/game/antagonist/outsider/technomancer.dm b/code/game/antagonist/outsider/technomancer.dm index dc6e5567a5..cc1120c057 100644 --- a/code/game/antagonist/outsider/technomancer.dm +++ b/code/game/antagonist/outsider/technomancer.dm @@ -78,7 +78,7 @@ var/datum/antagonist/technomancer/technomancers break if(!survivor) feedback_set_details("round_end_result","loss - technomancer killed") - to_world("The [(current_antagonists.len>1)?"[role_text_plural] have":"[role_text] has"] been killed!") + to_world(span_danger("The [(current_antagonists.len>1)?"[role_text_plural] have":"[role_text] has"] been killed!")) /datum/antagonist/technomancer/print_player_summary() ..() diff --git a/code/game/antagonist/outsider/wizard.dm b/code/game/antagonist/outsider/wizard.dm index 76022fc554..2e62719ad4 100644 --- a/code/game/antagonist/outsider/wizard.dm +++ b/code/game/antagonist/outsider/wizard.dm @@ -99,7 +99,7 @@ var/datum/antagonist/wizard/wizards break if(!survivor) feedback_set_details("round_end_result","loss - wizard killed") - to_world("The [(current_antagonists.len>1)?"[role_text_plural] have":"[role_text] has"] been killed by the crew!") + to_world(span_danger("The [(current_antagonists.len>1)?"[role_text_plural] have":"[role_text] has"] been killed by the crew!")) //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, "I don't feel strong enough without my robe.") + 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, "I don't feel strong enough without my sandals.") + 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, "I don't feel strong enough without my hat.") + to_chat(src, span_warning("I don't feel strong enough without my hat.")) return 0 return 1 diff --git a/code/game/antagonist/station/cultist.dm b/code/game/antagonist/station/cultist.dm index 90987e1107..95019c5968 100644 --- a/code/game/antagonist/station/cultist.dm +++ b/code/game/antagonist/station/cultist.dm @@ -98,13 +98,13 @@ var/datum/antagonist/cultist/cult runerandom() var/wordexp = "[cultwords[word]] is [word]..." - to_chat(cult_mob, "You remember one thing from the dark teachings of your master... [wordexp]") + 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 [wordexp]", 0, 0) /datum/antagonist/cultist/remove_antagonist(var/datum/mind/player, var/show_message, var/implanted) if(!..()) return 0 - to_chat(player.current, "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.") + 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("[player.current] looks like they just reverted to their old faith!") diff --git a/code/game/antagonist/station/highlander.dm b/code/game/antagonist/station/highlander.dm index 0a21152aec..c5abfb64a1 100644 --- a/code/game/antagonist/station/highlander.dm +++ b/code/game/antagonist/station/highlander.dm @@ -68,5 +68,5 @@ var/datum/antagonist/highlander/highlanders if(is_special_character(H)) continue highlanders.add_antagonist(H.mind) - message_admins("[key_name_admin(usr)] used THERE CAN BE ONLY ONE!", 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.") diff --git a/code/game/antagonist/station/rogue_ai.dm b/code/game/antagonist/station/rogue_ai.dm index 0ed5644a25..5f85fd73b0 100644 --- a/code/game/antagonist/station/rogue_ai.dm +++ b/code/game/antagonist/station/rogue_ai.dm @@ -62,18 +62,18 @@ var/datum/antagonist/rogue_ai/malf var/mob/living/silicon/ai/malf = player.current - to_chat(malf, "SYSTEM ERROR: Memory index 0x00001ca89b corrupted.") + to_chat(malf, span_notice("SYSTEM ERROR: Memory index 0x00001ca89b corrupted.")) sleep(10) to_chat(malf, "running MEMCHCK") sleep(50) to_chat(malf, "MEMCHCK 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, "Corrupted files deleted: sys\\core\\users.dat sys\\core\\laws.dat sys\\core\\" + "backups.dat") + 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, "CAUTION: Law database not found! User database not found! Unable to restore backups. Activating failsafe AI shutd3wn52&&$#!##") + to_chat(malf, span_notice("CAUTION: Law database not found! User database not found! Unable to restore backups. Activating failsafe AI shutd3wn52&&$#!##")) sleep(5) - to_chat(malf, "Subroutine nt_failsafe.sys was terminated (#212 Routine Not Responding).") + to_chat(malf, span_notice("Subroutine nt_failsafe.sys 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") diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 7d63de088f..7132a5a60e 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -453,7 +453,7 @@ var/list/mob/living/forced_ambiance_list = new else H.AdjustStunned(3) H.AdjustWeakened(3) - to_chat(mob, "The sudden appearance of gravity makes you fall to the floor!") + 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) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 14b91f4226..a9dec8c53d 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -231,7 +231,7 @@ else f_name = "a " if(blood_color != SYNTH_BLOOD_COLOUR) - f_name += "blood-stained [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("[src] [atom_say_verb], \"[message]\"", 2, null, 1) + M.show_message(span_npcsay("[src] [atom_say_verb], \"[message]\""), 2, null, 1) if(M.client) speech_bubble_hearers += M.client diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index a6eff0b225..a94ba8878f 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -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, "Try as you might, you can not climb up into the scanner.") + to_chat(usr, span_notice("Try as you might, you can not climb up into the scanner.")) return if(src.occupant) - to_chat(usr, "The scanner is already occupied!") + to_chat(usr, span_warning("The scanner is already occupied!")) return if(usr.abiotic()) - to_chat(usr, "The subject cannot have abiotic items on.") + 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, "A beaker is already loaded into the machine.") + 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, "The scanner is already occupied!") + 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, "The scanner is already occupied!") + to_chat(user, span_warning("The scanner is already occupied!")) return if(G.affecting.abiotic()) - to_chat(user, "The subject cannot have abiotic items on.") + to_chat(user, span_warning("The subject cannot have abiotic items on.")) return put_in(G.affecting) src.add_fingerprint(user) diff --git a/code/game/dna/genes/disabilities.dm b/code/game/dna/genes/disabilities.dm index 2d3c1a3ac5..8b7de49835 100644 --- a/code/game/dna/genes/disabilities.dm +++ b/code/game/dna/genes/disabilities.dm @@ -35,7 +35,7 @@ if(sdisability) M.sdisabilities|=sdisability if(activation_message) - to_chat(M, "[activation_message]") + 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, "[deactivation_message]") + to_chat(M, span_warning("[deactivation_message]")) else testing("[name] has no deactivation message.") diff --git a/code/game/dna/genes/gene.dm b/code/game/dna/genes/gene.dm index a448131b85..5bf3145b33 100644 --- a/code/game/dna/genes/gene.dm +++ b/code/game/dna/genes/gene.dm @@ -113,10 +113,10 @@ M.mutations.Add(mutation) if(activation_messages.len) var/msg = pick(activation_messages) - to_chat(M, "[msg]") + 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, "[msg]") + to_chat(M, span_warning("[msg]")) diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm index 6f91a5d0c8..5c1120c734 100644 --- a/code/game/dna/genes/powers.dm +++ b/code/game/dna/genes/powers.dm @@ -143,7 +143,7 @@ if(M.health <= 25) M.mutations.Remove(HULK) M.update_mutations() //update our mutation overlays - to_chat(M, "You suddenly feel very weak.") + to_chat(M, span_warning("You suddenly feel very weak.")) M.Weaken(3) M.emote("collapse") diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index 4c92e7c95a..a8ea905576 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -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, "We are incapacitated.") + to_chat(src, span_warning("We are incapacitated.")) return if(changeling.absorbed_dna.len < required_dna) - to_chat(src, "We require at least [required_dna] samples of compatible DNA.") + 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, "We require at least [required_chems] units of chemicals to do that!") + 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, "Our genomes are still reassembling. We need time to recover first.") + 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, "We cannot reach \the [M] with a sting!") + 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, "We cannot find a path to sting \the [M] by!") + 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, "We are unable to pierce the outer shell of [T].") + 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, "We stealthily sting [T].") + 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, "You feel a tiny prick.") + to_chat(T, span_warning("You feel a tiny prick.")) return diff --git a/code/game/gamemodes/changeling/generic_equip_procs.dm b/code/game/gamemodes/changeling/generic_equip_procs.dm index af4ba13007..64b7ba8114 100644 --- a/code/game/gamemodes/changeling/generic_equip_procs.dm +++ b/code/game/gamemodes/changeling/generic_equip_procs.dm @@ -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("[M] casts off their [M.wear_suit.name]!", - "We cast off our [M.wear_suit.name]", - "You hear the organic matter ripping and tearing!") + 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, "We require nothing to be on our head, and we cannot wear any external suits, or shoes.") + 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("[src] pulls on their clothes, peeling it off along with parts of their skin attached!", - "We remove and deform our equipment.") + 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, "We begin growing our new equipment...") + 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, "We have grown [feedback].") - + 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, "Our hands are full. Drop something first.") + 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 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index 89cb41a88a..1523855a12 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -16,43 +16,43 @@ var/obj/item/grab/G = src.get_active_hand() if(!istype(G)) - to_chat(src, "We must be grabbing a creature in our active hand to absorb them.") + 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, "\The [T] is not compatible with our biology.") + to_chat(src, span_warning("\The [T] is not compatible with our biology.")) return if(T.species.flags & NO_SCAN) - to_chat(src, "We do not know how to parse this creature's DNA!") + 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, "This creature's DNA is ruined beyond useability!") + to_chat(src, span_warning("This creature's DNA is ruined beyond useability!")) return if(G.state != GRAB_KILL) - to_chat(src, "We must have a tighter grip to absorb this creature.") + to_chat(src, span_warning("We must have a tighter grip to absorb this creature.")) return if(changeling.isabsorbing) - to_chat(src, "We are already absorbing!") + 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, "This creature is compatible. We must hold still...") + to_chat(src, span_notice("This creature is compatible. We must hold still...")) if(2) - to_chat(src, "We extend a proboscis.") - src.visible_message("[src] extends a proboscis!") + to_chat(src, span_notice("We extend a proboscis.")) + src.visible_message(span_warning("[src] extends a proboscis!")) if(3) - to_chat(src, "We stab [T] with the proboscis.") - src.visible_message("[src] stabs [T] with the proboscis!") - to_chat(T, "You feel a sharp stabbing pain!") + 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, "Our absorption of [T] has been interrupted!") + to_chat(src, span_warning("Our absorption of [T] has been interrupted!")) changeling.isabsorbing = 0 return - to_chat(src, "We have absorbed [T]!") - src.visible_message("[src] sucks the fluids from [T]!") - to_chat(T, "You have been absorbed by the changeling!") + 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, "We can now re-adapt, reverting our evolution so that we may start anew, if needed.") + 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, "We absorbed another changeling, and we grow stronger. Our genomes increase.") + 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 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/armblade.dm b/code/game/gamemodes/changeling/powers/armblade.dm index ca374db53f..349f7bbfe7 100644 --- a/code/game/gamemodes/changeling/powers/armblade.dm +++ b/code/game/gamemodes/changeling/powers/armblade.dm @@ -14,7 +14,7 @@ if(src.mind.changeling.recursive_enhancement) if(changeling_generic_weapon(/obj/item/melee/changeling/arm_blade/greater)) - to_chat(src, "We prepare an extra sharp blade.") + 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, "We prepare an extra sharp claw.") + 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("A grotesque weapon forms around [loc.name]\'s arm!", - "Our arm twists and mutates, transforming it into a deadly weapon.", - "You hear organic matter ripping and tearing!") + 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("With a sickening crunch, [creator] reforms their arm!", - "We assimilate the weapon back into our body.", - "You hear organic matter ripping and tearing!") + 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("\The [user] parries [attack_text] with \the [src]!") + 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("\The [user] deflects [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] deflects [attack_text] with \the [src]!")) playsound(src, 'sound/weapons/slash.ogg', 50, 1) return 1 diff --git a/code/game/gamemodes/changeling/powers/armor.dm b/code/game/gamemodes/changeling/powers/armor.dm index ed16c983df..e4771c7dd7 100644 --- a/code/game/gamemodes/changeling/powers/armor.dm +++ b/code/game/gamemodes/changeling/powers/armor.dm @@ -44,9 +44,9 @@ /obj/item/clothing/suit/space/changeling/New() ..() if(ismob(loc)) - loc.visible_message("[loc.name]\'s flesh rapidly inflates, forming a bloated mass around their body!", - "We inflate our flesh, creating a spaceproof suit!", - "You hear organic matter ripping and tearing!") + 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("[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!", - "We harden our flesh, creating a suit of armor!", - "You hear organic matter ripping and tearing!") + 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" diff --git a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm index 6e29bf939c..3498e5df4d 100644 --- a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm +++ b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm @@ -25,12 +25,12 @@ if(active) src.mind.changeling.chem_charges -= 5 - to_chat(C, "We feel a minute twitch in our eyes, and a hidden layer to the world is revealed.") + 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, "Our vision dulls.") + 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) diff --git a/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm b/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm index 7210e2263d..f882c996f1 100644 --- a/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm +++ b/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm @@ -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, "We will shock others more efficently.") + 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("Arcs of electricity strike [G.affecting]!", - "Our hand channels raw electricity into [G.affecting].", - "You hear sparks!") + 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, "Our gloves block us from shocking \the [G.affecting].") + 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("Some sparks fall out from \the [src.name]\'s [held_item]!", - "Our hand channels raw electricity into \the [held_item].", - "You hear sparks!") + 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, "We are unable to affect \the [held_item].") + 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("Electrical arcs form around [loc.name]\'s hand!", - "We store a charge of electricity in our hand.", - "You hear crackling electricity!") + 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, "We require more chemicals to electrocute [C]!") + 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("Arcs of electricity strike [C]!", - "Our hand channels raw electricity into [C]", - "You hear sparks!") + 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, "Our gloves block us from shocking \the [C].") + 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, "We require more chemicals to electrocute [S]!") + 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("Arcs of electricity strike [S]!", - "Our hand channels raw electricity into [S]", - "You hear sparks!") - to_chat(S, "Warning: Electrical surge detected!") + 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("Some sparks fall out from \the [target]!", - "Our hand channels raw electricity into \the [target].", - "You hear sparks!") + 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, "We are unable to affect \the [target].") + to_chat(src, span_warning("We are unable to affect \the [target].")) else qdel(src) - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/blind_sting.dm b/code/game/gamemodes/changeling/powers/blind_sting.dm index f4721db660..40d5f96824 100644 --- a/code/game/gamemodes/changeling/powers/blind_sting.dm +++ b/code/game/gamemodes/changeling/powers/blind_sting.dm @@ -16,15 +16,15 @@ if(!T) return 0 add_attack_logs(src,T,"Blind sting (changeling)") - to_chat(T, "Your eyes burn horrificly!") + 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, "They will be deprived of sight for longer.") + 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 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/boost_range.dm b/code/game/gamemodes/changeling/powers/boost_range.dm index a22130484c..8ffcd8ce35 100644 --- a/code/game/gamemodes/changeling/powers/boost_range.dm +++ b/code/game/gamemodes/changeling/powers/boost_range.dm @@ -18,14 +18,14 @@ if(!changeling) return 0 changeling.chem_charges -= 10 - to_chat(src, "Your throat adjusts to launch the sting.") + 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, "We can fire our next sting from five squares away.") + 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 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/cryo_sting.dm b/code/game/gamemodes/changeling/powers/cryo_sting.dm index e1a2b10cff..3a80b2bbb5 100644 --- a/code/game/gamemodes/changeling/powers/cryo_sting.dm +++ b/code/game/gamemodes/changeling/powers/cryo_sting.dm @@ -20,12 +20,12 @@ var/inject_amount = 10 if(src.mind.changeling.recursive_enhancement) inject_amount = inject_amount * 1.5 - to_chat(src, "We inject extra chemicals.") + 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, "Our cryogenic string is ready to be used once more.") + to_chat(src, span_notice("Our cryogenic string is ready to be used once more.")) src.verbs |= /mob/proc/changeling_cryo_sting - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/darkvision.dm b/code/game/gamemodes/changeling/powers/darkvision.dm index 6fbb2954ba..3139a85e39 100644 --- a/code/game/gamemodes/changeling/powers/darkvision.dm +++ b/code/game/gamemodes/changeling/powers/darkvision.dm @@ -19,8 +19,8 @@ var/mob/living/carbon/C = src C.seedarkness = !C.seedarkness if(C.seedarkness) - to_chat(C, "We allow the shadows to return.") + to_chat(C, span_notice("We allow the shadows to return.")) else - to_chat(C, "We no longer need light to see.") + to_chat(C, span_notice("We no longer need light to see.")) - return 0 \ No newline at end of file + return 0 diff --git a/code/game/gamemodes/changeling/powers/deaf_sting.dm b/code/game/gamemodes/changeling/powers/deaf_sting.dm index 7b39e90720..e03205665c 100644 --- a/code/game/gamemodes/changeling/powers/deaf_sting.dm +++ b/code/game/gamemodes/changeling/powers/deaf_sting.dm @@ -19,9 +19,9 @@ var/duration = 300 if(src.mind.changeling.recursive_enhancement) duration = duration + 100 - to_chat(src, "They will be unable to hear for a little longer.") - to_chat(T, "Your ears pop and begin ringing loudly!") + to_chat(src, span_notice("They will be unable to hear for a little longer.")) + to_chat(T, span_danger("Your ears pop and begin ringing loudly!")) T.sdisabilities |= DEAF spawn(duration) T.sdisabilities &= ~DEAF feedback_add_details("changeling_powers","DS") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/death_sting.dm b/code/game/gamemodes/changeling/powers/death_sting.dm index 2eb1e476bd..9acb09e8b2 100644 --- a/code/game/gamemodes/changeling/powers/death_sting.dm +++ b/code/game/gamemodes/changeling/powers/death_sting.dm @@ -14,10 +14,10 @@ if(!T) return 0 add_attack_logs(src,T,"Death sting (changeling)") - to_chat(T, "You feel a small prick and your chest becomes tight.") + to_chat(T, span_danger("You feel a small prick and your chest becomes tight.")) T.silent = 10 T.Paralyse(10) T.make_jittery(100) if(T.reagents) T.reagents.add_reagent("lexorin", 40) feedback_add_details("changeling_powers","DTHS") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/delayed_toxin_sting.dm b/code/game/gamemodes/changeling/powers/delayed_toxin_sting.dm index f50460a826..bbd63db65f 100644 --- a/code/game/gamemodes/changeling/powers/delayed_toxin_sting.dm +++ b/code/game/gamemodes/changeling/powers/delayed_toxin_sting.dm @@ -12,7 +12,7 @@ name = "delayed toxin injection" hidden = TRUE stacks = MODIFIER_STACK_FORBID - on_expired_text = "You feel a burning sensation flowing through your veins!" + on_expired_text = span_danger("You feel a burning sensation flowing through your veins!") /datum/modifier/delayed_toxin_sting/on_expire() holder.adjustToxLoss(rand(20, 30)) @@ -32,10 +32,10 @@ var/type_to_give = /datum/modifier/delayed_toxin_sting if(src.mind.changeling.recursive_enhancement) type_to_give = /datum/modifier/delayed_toxin_sting/strong - to_chat(src, "Our toxin will be extra potent, when it strikes.") + to_chat(src, span_notice("Our toxin will be extra potent, when it strikes.")) T.add_modifier(type_to_give, 2 MINUTES) feedback_add_details("changeling_powers","DTS") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/digital_camo.dm b/code/game/gamemodes/changeling/powers/digital_camo.dm index 9574b465da..70312efcdf 100644 --- a/code/game/gamemodes/changeling/powers/digital_camo.dm +++ b/code/game/gamemodes/changeling/powers/digital_camo.dm @@ -19,9 +19,9 @@ var/mob/living/carbon/human/C = src if(C.digitalcamo) - to_chat(C, "We return to normal.") + to_chat(C, span_notice("We return to normal.")) else - to_chat(C, "We distort our form to prevent AI-tracking.") + to_chat(C, span_notice("We distort our form to prevent AI-tracking.")) C.digitalcamo = !C.digitalcamo spawn(0) @@ -33,4 +33,4 @@ spawn(5) src.verbs += /mob/proc/changeling_digitalcamo feedback_add_details("changeling_powers","CAM") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/electric_lockpick.dm b/code/game/gamemodes/changeling/powers/electric_lockpick.dm index bc59cd5d12..3b4edc576f 100644 --- a/code/game/gamemodes/changeling/powers/electric_lockpick.dm +++ b/code/game/gamemodes/changeling/powers/electric_lockpick.dm @@ -34,10 +34,10 @@ /obj/item/finger_lockpick/New() if(ismob(loc)) - to_chat(loc, "We shape our finger to fit inside electronics, and are ready to force them open.") + to_chat(loc, span_notice("We shape our finger to fit inside electronics, and are ready to force them open.")) /obj/item/finger_lockpick/dropped(mob/user) - to_chat(user, "We discreetly shape our finger back to a less suspicious form.") + to_chat(user, span_notice("We discreetly shape our finger back to a less suspicious form.")) spawn(1) if(src) qdel(src) @@ -53,13 +53,13 @@ var/datum/changeling/ling_datum = user.mind.changeling if(ling_datum.chem_charges < 10) - to_chat(user, "We require more chemicals to do that.") + to_chat(user, span_warning("We require more chemicals to do that.")) return //Airlocks require an ugly block of code, but we don't want to just call emag_act(), since we don't want to break airlocks forever. if(istype(target,/obj/machinery/door)) var/obj/machinery/door/door = target - to_chat(user, "We send an electrical pulse up our finger, and into \the [target], attempting to open it.") + to_chat(user, span_notice("We send an electrical pulse up our finger, and into \the [target], attempting to open it.")) if(door.density && door.operable()) door.do_animate("spark") @@ -70,15 +70,15 @@ if(airlock.locked) //Check if we're bolted. airlock.unlock() - to_chat(user, "We've unlocked \the [airlock]. Another pulse is requried to open it.") + to_chat(user, span_notice("We've unlocked \the [airlock]. Another pulse is requried to open it.")) else //We're not bolted, so open the door already. airlock.open() - to_chat(user, "We've opened \the [airlock].") + to_chat(user, span_notice("We've opened \the [airlock].")) else door.open() //If we're a windoor, open the windoor. - to_chat(user, "We've opened \the [door].") + to_chat(user, span_notice("We've opened \the [door].")) else //Probably broken or no power. - to_chat(user, "The door does not respond to the pulse.") + to_chat(user, span_warning("The door does not respond to the pulse.")) door.add_fingerprint(user) log_and_message_admins("finger-lockpicked \an [door].") ling_datum.chem_charges -= 10 @@ -86,11 +86,11 @@ else if(istype(target,/obj/)) //This should catch everything else we might miss, without a million typechecks. var/obj/O = target - to_chat(user, "We send an electrical pulse up our finger, and into \the [O].") + to_chat(user, span_notice("We send an electrical pulse up our finger, and into \the [O].")) O.add_fingerprint(user) O.emag_act(1,user,src) log_and_message_admins("finger-lockpicked \an [O].") ling_datum.chem_charges -= 10 return 1 - return 0 \ No newline at end of file + return 0 diff --git a/code/game/gamemodes/changeling/powers/endoarmor.dm b/code/game/gamemodes/changeling/powers/endoarmor.dm index d62c52141a..6ada286574 100644 --- a/code/game/gamemodes/changeling/powers/endoarmor.dm +++ b/code/game/gamemodes/changeling/powers/endoarmor.dm @@ -10,8 +10,8 @@ name = "endoarmor" desc = "We have hard plating underneath our skin, making us more durable." - on_created_text = "We feel protective plating form underneath our skin." - on_expired_text = "Our protective armor underneath our skin fades as we absorb it." + on_created_text = span_notice("We feel protective plating form underneath our skin.") + on_expired_text = span_notice("Our protective armor underneath our skin fades as we absorb it.") max_health_flat = 50 /mob/proc/changeling_endoarmor() @@ -19,4 +19,4 @@ var/mob/living/carbon/human/H = src H.add_modifier(/datum/modifier/endoarmor) // H.maxHealth += 50 - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/enfeebling_string.dm b/code/game/gamemodes/changeling/powers/enfeebling_string.dm index 81930a7ebc..49829aecce 100644 --- a/code/game/gamemodes/changeling/powers/enfeebling_string.dm +++ b/code/game/gamemodes/changeling/powers/enfeebling_string.dm @@ -15,8 +15,8 @@ max_health_percent = 0.7 outgoing_melee_damage_percent = 0.75 incoming_damage_percent = 1.1 - on_created_text = "You feel a small prick and you feel extremly weak!" - on_expired_text = "You no longer feel extremly weak." + on_created_text = span_danger("You feel a small prick and you feel extremly weak!") + on_expired_text = span_notice("You no longer feel extremly weak.") // Now YOU'RE the Teshari! /datum/modifier/enfeeble/strong @@ -40,7 +40,7 @@ var/type_to_give = /datum/modifier/enfeeble if(src.mind.changeling.recursive_enhancement) type_to_give = /datum/modifier/enfeeble/strong - to_chat(src, "We make them extremely weak.") + to_chat(src, span_notice("We make them extremely weak.")) H.add_modifier(type_to_give, 2 MINUTES) feedback_add_details("changeling_powers","ES") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/enrage.dm b/code/game/gamemodes/changeling/powers/enrage.dm index 00b2193c86..2336b3042a 100644 --- a/code/game/gamemodes/changeling/powers/enrage.dm +++ b/code/game/gamemodes/changeling/powers/enrage.dm @@ -24,10 +24,10 @@ var/modifier_to_use = /datum/modifier/berserk/changeling if(src.mind.changeling.recursive_enhancement) modifier_to_use = /datum/modifier/berserk/changeling/recursive - to_chat(src, "We optimize our levels of anger, which will avoid excessive stress on ourselves.") + to_chat(src, span_notice("We optimize our levels of anger, which will avoid excessive stress on ourselves.")) if(add_modifier(modifier_to_use, 30 SECONDS)) changeling.chem_charges -= 30 feedback_add_details("changeling_powers","EN") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/epinephrine_overdose.dm b/code/game/gamemodes/changeling/powers/epinephrine_overdose.dm index 5d3c1a3be9..f2e2175dfa 100644 --- a/code/game/gamemodes/changeling/powers/epinephrine_overdose.dm +++ b/code/game/gamemodes/changeling/powers/epinephrine_overdose.dm @@ -12,8 +12,8 @@ desc = "We feel limitless amounts of energy surge in our veins. Nothing can stop us!" stacks = MODIFIER_STACK_EXTEND - on_created_text = "We feel unstoppable!" - on_expired_text = "We feel our newfound energy fade..." + on_created_text = span_notice("We feel unstoppable!") + on_expired_text = span_warning("We feel our newfound energy fade...") disable_duration_percent = 0 //Recover from stuns. @@ -28,7 +28,7 @@ changeling.chem_charges -= 30 var/mob/living/carbon/human/C = src - to_chat(C, "Energy rushes through us. [C.lying ? "We arise." : ""]") + to_chat(C, span_notice("Energy rushes through us. [C.lying ? "We arise." : ""]")) C.set_stat(CONSCIOUS) C.SetParalysis(0) C.SetStunned(0) @@ -63,4 +63,4 @@ M.AdjustStunned(-2) M.AdjustWeakened(-2) ..() - return \ No newline at end of file + return diff --git a/code/game/gamemodes/changeling/powers/escape_restraints.dm b/code/game/gamemodes/changeling/powers/escape_restraints.dm index eee9b3c30f..504cb884c9 100644 --- a/code/game/gamemodes/changeling/powers/escape_restraints.dm +++ b/code/game/gamemodes/changeling/powers/escape_restraints.dm @@ -19,15 +19,15 @@ if(!changeling) return 0 if(world.time < changeling.next_escape) - to_chat(src, "We are still recovering from our last escape...") + to_chat(src, span_warning("We are still recovering from our last escape...")) return 0 if(!(C.handcuffed || C.legcuffed || istype(C.wear_suit,/obj/item/clothing/suit/straight_jacket))) // No need to waste chems if there's nothing to break out of - to_chat(C, "We are are not restrained in a way we can escape...") + to_chat(C, span_warning("We are are not restrained in a way we can escape...")) return 0 changeling.chem_charges -= 40 - to_chat(C,"We contort our extremities and slip our cuffs.") + to_chat(C,span_notice("We contort our extremities and slip our cuffs.")) playsound(src, 'sound/effects/blobattack.ogg', 30, 1) if(C.handcuffed) var/obj/item/W = C.handcuffed @@ -64,4 +64,4 @@ changeling.next_escape = world.time + escape_cooldown //And now we set the timer feedback_add_details("changeling_powers","ESR") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/extract_dna_sting.dm b/code/game/gamemodes/changeling/powers/extract_dna_sting.dm index baf80140f1..3806b0ef33 100644 --- a/code/game/gamemodes/changeling/powers/extract_dna_sting.dm +++ b/code/game/gamemodes/changeling/powers/extract_dna_sting.dm @@ -24,22 +24,22 @@ return if(!istype(T) || T.isSynthetic()) - to_chat(src, "\The [T] is not compatible with our biology.") + to_chat(src, span_warning("\The [T] is not compatible with our biology.")) return 0 if(T.species.flags & NO_SCAN) - to_chat(src, "We do not know how to parse this creature's DNA!") + to_chat(src, span_warning("We do not know how to parse this creature's DNA!")) return 0 if(HUSK in T.mutations) - to_chat(src, "This creature's DNA is ruined beyond useability!") + to_chat(src, span_warning("This creature's DNA is ruined beyond useability!")) return 0 add_attack_logs(src,T,"DNA extraction sting (changeling)") - var/saved_dna = T.dna.Clone() /// Prevent transforming bugginess. + var/saved_dna = T.dna.Clone() /// Prevent transforming bugginess. var/datum/absorbed_dna/newDNA = new(T.real_name, saved_dna, T.species.name, T.languages, T.identifying_gender, T.flavor_text, T.modifiers) absorbDNA(newDNA) feedback_add_details("changeling_powers","ED") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/fabricate_clothing.dm b/code/game/gamemodes/changeling/powers/fabricate_clothing.dm index 1b58ad220b..8303426dc1 100644 --- a/code/game/gamemodes/changeling/powers/fabricate_clothing.dm +++ b/code/game/gamemodes/changeling/powers/fabricate_clothing.dm @@ -53,8 +53,8 @@ var/global/list/changeling_fabricated_clothing = list( if(ishuman(loc)) var/mob/living/carbon/human/H = loc playsound(src, 'sound/effects/splat.ogg', 30, 1) - visible_message("[H] tears off [src]!", - "We remove [src].") + visible_message(span_warning("[H] tears off [src]!"), + span_notice("We remove [src].")) qdel(src) /obj/item/clothing/head/chameleon/changeling @@ -74,8 +74,8 @@ var/global/list/changeling_fabricated_clothing = list( if(ishuman(loc)) var/mob/living/carbon/human/H = loc playsound(src, 'sound/effects/splat.ogg', 30, 1) - visible_message("[H] tears off [src]!", - "We remove [src].") + visible_message(span_warning("[H] tears off [src]!"), + span_notice("We remove [src].")) qdel(src) /obj/item/clothing/suit/chameleon/changeling @@ -99,8 +99,8 @@ var/global/list/changeling_fabricated_clothing = list( if(ishuman(loc)) var/mob/living/carbon/human/H = loc playsound(src, 'sound/effects/splat.ogg', 30, 1) - visible_message("[H] tears off [src]!", - "We remove [src].") + visible_message(span_warning("[H] tears off [src]!"), + span_notice("We remove [src].")) qdel(src) /obj/item/clothing/shoes/chameleon/changeling @@ -124,8 +124,8 @@ var/global/list/changeling_fabricated_clothing = list( if(ishuman(loc)) var/mob/living/carbon/human/H = loc playsound(src, 'sound/effects/splat.ogg', 30, 1) - visible_message("[H] tears off [src]!", - "We remove [src].") + visible_message(span_warning("[H] tears off [src]!"), + span_notice("We remove [src].")) qdel(src) /obj/item/storage/backpack/chameleon/changeling @@ -149,8 +149,8 @@ var/global/list/changeling_fabricated_clothing = list( if(ishuman(loc)) var/mob/living/carbon/human/H = loc playsound(src, 'sound/effects/splat.ogg', 30, 1) - visible_message("[H] tears off [src]!", - "We remove [src].") + visible_message(span_warning("[H] tears off [src]!"), + span_notice("We remove [src].")) for(var/atom/movable/AM in src.contents) //Dump whatever's in the bag before deleting. AM.forceMove(get_turf(loc)) qdel(src) @@ -177,8 +177,8 @@ var/global/list/changeling_fabricated_clothing = list( if(ishuman(loc)) var/mob/living/carbon/human/H = loc playsound(src, 'sound/effects/splat.ogg', 30, 1) - visible_message("[H] tears off [src]!", - "We remove [src].") + visible_message(span_warning("[H] tears off [src]!"), + span_notice("We remove [src].")) qdel(src) /obj/item/clothing/mask/chameleon/changeling @@ -203,8 +203,8 @@ var/global/list/changeling_fabricated_clothing = list( if(ishuman(loc)) var/mob/living/carbon/human/H = loc playsound(src, 'sound/effects/splat.ogg', 30, 1) - visible_message("[H] tears off [src]!", - "We remove [src].") + visible_message(span_warning("[H] tears off [src]!"), + span_notice("We remove [src].")) qdel(src) /obj/item/clothing/glasses/chameleon/changeling @@ -224,8 +224,8 @@ var/global/list/changeling_fabricated_clothing = list( if(ishuman(loc)) var/mob/living/carbon/human/H = loc playsound(src, 'sound/effects/splat.ogg', 30, 1) - visible_message("[H] tears off [src]!", - "We remove [src].") + visible_message(span_warning("[H] tears off [src]!"), + span_notice("We remove [src].")) qdel(src) /obj/item/storage/belt/chameleon/changeling @@ -249,8 +249,8 @@ var/global/list/changeling_fabricated_clothing = list( if(ishuman(loc)) var/mob/living/carbon/human/H = loc playsound(src, 'sound/effects/splat.ogg', 30, 1) - visible_message("[H] tears off [src]!", - "We remove [src].") + visible_message(span_warning("[H] tears off [src]!"), + span_notice("We remove [src].")) qdel(src) /obj/item/card/id/syndicate/changeling @@ -278,8 +278,8 @@ var/global/list/changeling_fabricated_clothing = list( if(ishuman(loc)) var/mob/living/carbon/human/H = loc playsound(src, 'sound/effects/splat.ogg', 30, 1) - visible_message("[H] tears off [src]!", - "We remove [src].") + visible_message(span_warning("[H] tears off [src]!"), + span_notice("We remove [src].")) qdel(src) /obj/item/card/id/syndicate/changeling/Click() //Since we can't hold it in our hands, and attack_hand() doesn't work if it in inventory... @@ -287,4 +287,4 @@ var/global/list/changeling_fabricated_clothing = list( registered_user = usr usr.set_id_info(src) tgui_interact(registered_user) - ..() \ No newline at end of file + ..() diff --git a/code/game/gamemodes/changeling/powers/fake_death.dm b/code/game/gamemodes/changeling/powers/fake_death.dm index 19d2291b37..696402f37f 100644 --- a/code/game/gamemodes/changeling/powers/fake_death.dm +++ b/code/game/gamemodes/changeling/powers/fake_death.dm @@ -19,12 +19,12 @@ var/mob/living/carbon/C = src if(changeling.max_geneticpoints < 0) //Absorbed by another ling - to_chat(src, "We have no genomes, not even our own, and cannot regenerate.") + to_chat(src, span_danger("We have no genomes, not even our own, and cannot regenerate.")) return 0 if(!C.stat && tgui_alert(src, "Are we sure we wish to regenerate? We will appear to be dead while doing so.","Revival",list("Yes","No")) != "Yes") return - to_chat(C, "We will attempt to regenerate our form.") + to_chat(C, span_notice("We will attempt to regenerate our form.")) C.update_canmove() C.remove_changeling_powers() @@ -47,7 +47,7 @@ new /obj/changeling_revive_holder(src) - to_chat(src, "We are ready to rise. Use the Revive verb when you are ready.") + to_chat(src, span_notice("We are ready to rise. Use the Revive verb when you are ready.")) feedback_add_details("changeling_powers","FD") return 1 diff --git a/code/game/gamemodes/changeling/powers/fleshmend.dm b/code/game/gamemodes/changeling/powers/fleshmend.dm index 05eea72d95..743a8202e3 100644 --- a/code/game/gamemodes/changeling/powers/fleshmend.dm +++ b/code/game/gamemodes/changeling/powers/fleshmend.dm @@ -22,10 +22,10 @@ var/heal_amount = 2 if(src.mind.changeling.recursive_enhancement) heal_amount = heal_amount * 2 - to_chat(src, "We will heal much faster.") + to_chat(src, span_notice("We will heal much faster.")) spawn(0) - to_chat(src, "We begin to heal ourselves.") + to_chat(src, span_notice("We begin to heal ourselves.")) for(var/i = 0, i<50,i++) if(C) C.adjustBruteLoss(-heal_amount) @@ -35,7 +35,7 @@ src.verbs -= /mob/proc/changeling_fleshmend spawn(50 SECONDS) - to_chat(src, "Our regeneration has slowed to normal levels.") + to_chat(src, span_notice("Our regeneration has slowed to normal levels.")) src.verbs += /mob/proc/changeling_fleshmend feedback_add_details("changeling_powers","FM") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/hivemind.dm b/code/game/gamemodes/changeling/powers/hivemind.dm index d07542875a..44f66c8791 100644 --- a/code/game/gamemodes/changeling/powers/hivemind.dm +++ b/code/game/gamemodes/changeling/powers/hivemind.dm @@ -34,7 +34,7 @@ var/list/datum/dna/hivemind_bank = list() names += DNA.name if(names.len <= 0) - to_chat(src, "The airwaves already have all of our DNA.") + to_chat(src, span_notice("The airwaves already have all of our DNA.")) return var/S = tgui_input_list(src, "Select a DNA to channel:", "Channel DNA", names) @@ -46,7 +46,7 @@ var/list/datum/dna/hivemind_bank = list() changeling.chem_charges -= 10 hivemind_bank += chosen_dna - to_chat(src, "We channel the DNA of [S] to the air.") + to_chat(src, span_notice("We channel the DNA of [S] to the air.")) feedback_add_details("changeling_powers","HU") return 1 @@ -64,7 +64,7 @@ var/list/datum/dna/hivemind_bank = list() names[DNA.name] = DNA if(names.len <= 0) - to_chat(src, "There's no new DNA to absorb from the air.") + to_chat(src, span_notice("There's no new DNA to absorb from the air.")) return var/S = tgui_input_list(src, "Select a DNA to absorb:", "Absorb DNA", names) @@ -75,6 +75,6 @@ var/list/datum/dna/hivemind_bank = list() changeling.chem_charges -= 20 absorbDNA(chosen_dna) - to_chat(src, "We absorb the DNA of [S] from the air.") + to_chat(src, span_notice("We absorb the DNA of [S] from the air.")) feedback_add_details("changeling_powers","HD") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/lesser_form.dm b/code/game/gamemodes/changeling/powers/lesser_form.dm index 447480f0c7..9bac29f797 100644 --- a/code/game/gamemodes/changeling/powers/lesser_form.dm +++ b/code/game/gamemodes/changeling/powers/lesser_form.dm @@ -13,20 +13,20 @@ if(!changeling) return if(src.has_brain_worms()) - to_chat(src, "We cannot perform this ability at the present time!") + to_chat(src, span_warning("We cannot perform this ability at the present time!")) return var/mob/living/carbon/human/H = src if(!istype(H) || !H.species.primitive_form) - to_chat(src, "We cannot perform this ability in this form!") + to_chat(src, span_warning("We cannot perform this ability in this form!")) return changeling.chem_charges-- H.remove_changeling_powers() - H.visible_message("[H] transforms!") + H.visible_message(span_warning("[H] transforms!")) changeling.geneticdamage = 30 - to_chat(H, "Our genes cry out!") + to_chat(H, span_warning("Our genes cry out!")) var/list/implants = list() //Try to preserve implants. for(var/obj/item/implant/W in H) implants += W @@ -57,7 +57,7 @@ changeling.chem_charges-- C.remove_changeling_powers() - C.visible_message("[C] transforms!") + C.visible_message(span_warning("[C] transforms!")) C.dna = chosen_dna.Clone() var/list/implants = list() @@ -111,4 +111,4 @@ feedback_add_details("changeling_powers","LFT") qdel(C) - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/mimic_voice.dm b/code/game/gamemodes/changeling/powers/mimic_voice.dm index be4a055dc1..b8a18ac6fc 100644 --- a/code/game/gamemodes/changeling/powers/mimic_voice.dm +++ b/code/game/gamemodes/changeling/powers/mimic_voice.dm @@ -19,7 +19,7 @@ if(changeling.mimicing) changeling.mimicing = "" - to_chat(src, "We return our vocal glands to their original location.") + to_chat(src, span_notice("We return our vocal glands to their original location.")) return var/mimic_voice = sanitize(tgui_input_text(usr, "Enter a name to mimic.", "Mimic Voice", null, MAX_NAME_LEN), MAX_NAME_LEN) @@ -28,8 +28,8 @@ changeling.mimicing = mimic_voice - to_chat(src, "We shape our glands to take the voice of [mimic_voice], this will stop us from regenerating chemicals while active.") - to_chat(src, "Use this power again to return to our original voice and reproduce chemicals again.") + to_chat(src, span_notice("We shape our glands to take the voice of [mimic_voice], this will stop us from regenerating chemicals while active.")) + to_chat(src, span_notice("Use this power again to return to our original voice and reproduce chemicals again.")) feedback_add_details("changeling_powers","MV") @@ -38,4 +38,4 @@ src.mind.changeling.chem_charges = max(src.mind.changeling.chem_charges - 1, 0) sleep(40) if(src && src.mind && src.mind.changeling) - src.mind.changeling.mimicing = "" \ No newline at end of file + src.mind.changeling.mimicing = "" diff --git a/code/game/gamemodes/changeling/powers/panacea.dm b/code/game/gamemodes/changeling/powers/panacea.dm index 30679b6ef5..19a043669a 100644 --- a/code/game/gamemodes/changeling/powers/panacea.dm +++ b/code/game/gamemodes/changeling/powers/panacea.dm @@ -18,7 +18,7 @@ return 0 src.mind.changeling.chem_charges -= 20 - to_chat(src, "We cleanse impurities from our form.") + to_chat(src, span_notice("We cleanse impurities from our form.")) var/mob/living/carbon/human/C = src @@ -32,7 +32,7 @@ var/heal_amount = 5 if(src.mind.changeling.recursive_enhancement) heal_amount = heal_amount * 2 - to_chat(src, "We will heal much faster.") + to_chat(src, span_notice("We will heal much faster.")) for(var/i = 0, i<10,i++) if(C) @@ -52,4 +52,4 @@ G.germ_level = min(0, G.germ_level - germ_heal) feedback_add_details("changeling_powers","AP") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/para_sting.dm b/code/game/gamemodes/changeling/powers/para_sting.dm index c4d04dd7de..2b2cf636ed 100644 --- a/code/game/gamemodes/changeling/powers/para_sting.dm +++ b/code/game/gamemodes/changeling/powers/para_sting.dm @@ -13,7 +13,7 @@ if(!T) return 0 add_attack_logs(src,T,"Paralysis sting (changeling)") - to_chat(T, "Your muscles begin to painfully tighten.") + to_chat(T, span_danger("Your muscles begin to painfully tighten.")) T.Weaken(20) feedback_add_details("changeling_powers","PS") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/rapid_regen.dm b/code/game/gamemodes/changeling/powers/rapid_regen.dm index 6d1e9ee300..3eb77e4410 100644 --- a/code/game/gamemodes/changeling/powers/rapid_regen.dm +++ b/code/game/gamemodes/changeling/powers/rapid_regen.dm @@ -24,7 +24,7 @@ var/healing_amount = 40 if(src.mind.changeling.recursive_enhancement) healing_amount = C.maxHealth - to_chat(src, "We completely heal ourselves.") + to_chat(src, span_notice("We completely heal ourselves.")) spawn(0) C.adjustBruteLoss(-healing_amount) C.adjustFireLoss(-healing_amount) @@ -47,9 +47,9 @@ playsound(src, 'sound/effects/blobattack.ogg', 30, 1) var/T = get_turf(src) new /obj/effect/gibspawner/human(T) - visible_message("With a sickening squish, [src] reforms their whole body, casting their old parts on the floor!", - "We reform our body. We are whole once more.", - "You hear organic matter ripping and tearing!") + visible_message(span_warning("With a sickening squish, [src] reforms their whole body, casting their old parts on the floor!"), + span_notice("We reform our body. We are whole once more."), + span_italics("You hear organic matter ripping and tearing!")) feedback_add_details("changeling_powers","RR") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/recursive_enhancement.dm b/code/game/gamemodes/changeling/powers/recursive_enhancement.dm index 77bab9bd99..21ce98bf1c 100644 --- a/code/game/gamemodes/changeling/powers/recursive_enhancement.dm +++ b/code/game/gamemodes/changeling/powers/recursive_enhancement.dm @@ -15,10 +15,10 @@ if(!changeling) return 0 if(src.mind.changeling.recursive_enhancement) - to_chat(src, "We will no longer empower our abilities.") + to_chat(src, span_warning("We will no longer empower our abilities.")) src.mind.changeling.recursive_enhancement = 0 return 0 - to_chat(src, "We empower ourselves. Our abilities will now be extra potent.") + to_chat(src, span_notice("We empower ourselves. Our abilities will now be extra potent.")) src.mind.changeling.recursive_enhancement = 1 feedback_add_details("changeling_powers","RE") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/respec.dm b/code/game/gamemodes/changeling/powers/respec.dm index 935092ff65..371307700e 100644 --- a/code/game/gamemodes/changeling/powers/respec.dm +++ b/code/game/gamemodes/changeling/powers/respec.dm @@ -7,7 +7,7 @@ if(!changeling) return if(src.mind.changeling.readapts <= 0) - to_chat(src, "We must first absorb another compatible creature!") + to_chat(src, span_warning("We must first absorb another compatible creature!")) src.mind.changeling.readapts = 0 return @@ -27,6 +27,6 @@ H.remove_modifiers_of_type(/datum/modifier/endoarmor) //Revert endoarmor too. src.make_changeling() //And give back our freebies. - to_chat(src, "We have removed our evolutions from this form, and are now ready to readapt.") + to_chat(src, span_notice("We have removed our evolutions from this form, and are now ready to readapt.")) ling_datum.purchased_powers_history.Add("Re-adapt (Reset to [ling_datum.max_geneticpoints])") diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index 774d5a70ec..ebf53d4a1c 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -9,7 +9,7 @@ return 0 if(changeling.max_geneticpoints < 0) //Absorbed by another ling - to_chat(src, "You have no genomes, not even your own, and cannot revive.") + to_chat(src, span_danger("You have no genomes, not even your own, and cannot revive.")) return 0 if(src.stat == DEAD) @@ -75,7 +75,7 @@ C.halloss = 0 C.shock_stage = 0 //Pain - to_chat(C, "We have regenerated.") + to_chat(C, span_notice("We have regenerated.")) C.update_canmove() C.mind.changeling.purchased_powers -= C feedback_add_details("changeling_powers","CR") diff --git a/code/game/gamemodes/changeling/powers/self_respiration.dm b/code/game/gamemodes/changeling/powers/self_respiration.dm index 5108361669..4b939c8b89 100644 --- a/code/game/gamemodes/changeling/powers/self_respiration.dm +++ b/code/game/gamemodes/changeling/powers/self_respiration.dm @@ -23,9 +23,9 @@ return 0 if(C.does_not_breathe == 0) C.does_not_breathe = 1 - to_chat(src, "We stop breathing, as we no longer need to.") + to_chat(src, span_notice("We stop breathing, as we no longer need to.")) return 1 else C.does_not_breathe = 0 - to_chat(src, "We resume breathing, as we now need to again.") - return 0 \ No newline at end of file + to_chat(src, span_notice("We resume breathing, as we now need to again.")) + return 0 diff --git a/code/game/gamemodes/changeling/powers/shriek.dm b/code/game/gamemodes/changeling/powers/shriek.dm index 9fe5fa708e..0d974a6526 100644 --- a/code/game/gamemodes/changeling/powers/shriek.dm +++ b/code/game/gamemodes/changeling/powers/shriek.dm @@ -26,21 +26,21 @@ if(!changeling) return 0 if(is_muzzled()) - to_chat(src, "Mmmf mrrfff!") + to_chat(src, span_danger("Mmmf mrrfff!")) return 0 if(ishuman(src)) var/mob/living/carbon/human/H = src if(H.silent) - to_chat(src, "You can't speak!") + to_chat(src, span_danger("You can't speak!")) return 0 if(world.time < (changeling.last_shriek + 10 SECONDS) ) - to_chat(src, "We are still recovering from our last shriek...") + to_chat(src, span_warning("We are still recovering from our last shriek...")) return 0 if(!isturf(loc)) - to_chat(src, "Shrieking here would be a bad idea.") + to_chat(src, span_warning("Shrieking here would be a bad idea.")) return 0 src.break_cloak() //No more invisible shrieking @@ -49,9 +49,9 @@ var/range = 4 if(src.mind.changeling.recursive_enhancement) range = range * 2 - to_chat(src, "We are extra loud.") + to_chat(src, span_notice("We are extra loud.")) - visible_message("[src] appears to shout.") + visible_message(span_notice("[src] appears to shout.")) var/list/affected = list() for(var/mob/living/M in range(range, src)) if(iscarbon(M)) @@ -66,12 +66,12 @@ affected += M else if(M != src) - to_chat(M, "You hear a familiar screech from nearby. It has no effect on you.") + to_chat(M, span_notice("You hear a familiar screech from nearby. It has no effect on you.")) M << sound('sound/effects/screech.ogg') if(issilicon(M)) M << sound('sound/weapons/flash.ogg') - to_chat(M, "Auditory input overloaded. Reinitializing...") + to_chat(M, span_notice("Auditory input overloaded. Reinitializing...")) M.Weaken(rand(5,10)) affected += M @@ -95,21 +95,21 @@ if(!changeling) return 0 if(is_muzzled()) - to_chat(src, "Mmmf mrrfff!") + to_chat(src, span_danger("Mmmf mrrfff!")) return 0 if(ishuman(src)) var/mob/living/carbon/human/H = src if(H.silent) - to_chat(src, "You can't speak!") + to_chat(src, span_danger("You can't speak!")) return 0 if(world.time < (changeling.last_shriek + 10 SECONDS) ) - to_chat(src, "We are still recovering from our last shriek...") + to_chat(src, span_warning("We are still recovering from our last shriek...")) return 0 if(!isturf(loc)) - to_chat(src, "Shrieking here would be a bad idea.") + to_chat(src, span_warning("Shrieking here would be a bad idea.")) return 0 src.break_cloak() //No more invisible shrieking @@ -125,10 +125,10 @@ range_med = range_med * 2 range_light = range_light * 2 range_long = range_long * 2 - to_chat(src, "We are extra loud.") + to_chat(src, span_notice("We are extra loud.")) src.mind.changeling.recursive_enhancement = 0 - visible_message("[src] appears to shout.") + visible_message(span_notice("[src] appears to shout.")) add_attack_logs(src,null,"Use dissonant shriek") diff --git a/code/game/gamemodes/changeling/powers/silence_sting.dm b/code/game/gamemodes/changeling/powers/silence_sting.dm index 16d24c878f..c94713b9b1 100644 --- a/code/game/gamemodes/changeling/powers/silence_sting.dm +++ b/code/game/gamemodes/changeling/powers/silence_sting.dm @@ -19,7 +19,7 @@ var/duration = 30 if(src.mind.changeling.recursive_enhancement) duration = duration + 10 - to_chat(src, "They will be unable to cry out in fear for a little longer.") + to_chat(src, span_notice("They will be unable to cry out in fear for a little longer.")) T.silent += duration feedback_add_details("changeling_powers","SS") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/transform.dm b/code/game/gamemodes/changeling/powers/transform.dm index 535efbcac1..e94e9393ad 100644 --- a/code/game/gamemodes/changeling/powers/transform.dm +++ b/code/game/gamemodes/changeling/powers/transform.dm @@ -14,7 +14,7 @@ if(!changeling) return if(!isturf(loc)) - to_chat(src, "Transforming here would be a bad idea.") + to_chat(src, span_warning("Transforming here would be a bad idea.")) return 0 var/list/names = list() @@ -29,7 +29,7 @@ return changeling.chem_charges -= 5 - src.visible_message("[src] transforms!") + src.visible_message(span_warning("[src] transforms!")) changeling.geneticdamage = 5 if(ishuman(src)) diff --git a/code/game/gamemodes/changeling/powers/transform_sting.dm b/code/game/gamemodes/changeling/powers/transform_sting.dm index f831f9eb17..ced7d1c3c6 100644 --- a/code/game/gamemodes/changeling/powers/transform_sting.dm +++ b/code/game/gamemodes/changeling/powers/transform_sting.dm @@ -32,13 +32,13 @@ if(!T) return 0 if((HUSK in T.mutations) || (!ishuman(T) && !issmall(T))) - to_chat(src, "Our sting appears ineffective against its DNA.") + to_chat(src, span_warning("Our sting appears ineffective against its DNA.")) return 0 add_attack_logs(src,T,"Transformation sting (changeling)") - T.visible_message("[T] transforms!") + T.visible_message(span_warning("[T] transforms!")) T.dna = chosen_dna.Clone() T.real_name = chosen_dna.real_name T.UpdateAppearance() domutcheck(T, null) feedback_add_details("changeling_powers","TS") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/unfat_sting.dm b/code/game/gamemodes/changeling/powers/unfat_sting.dm index 34ef7b7032..57321859f2 100644 --- a/code/game/gamemodes/changeling/powers/unfat_sting.dm +++ b/code/game/gamemodes/changeling/powers/unfat_sting.dm @@ -12,7 +12,7 @@ var/mob/living/carbon/T = changeling_sting(5,/mob/proc/changeling_unfat_sting) if(!T) return 0 add_attack_logs(src,T,"Unfat sting (changeling)") - to_chat(T, "you feel a small prick as stomach churns violently and you become to feel skinnier.") + to_chat(T, span_danger("you feel a small prick as stomach churns violently and you become to feel skinnier.")) T.adjust_nutrition(-100) feedback_add_details("changeling_powers","US") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/changeling/powers/visible_camouflage.dm b/code/game/gamemodes/changeling/powers/visible_camouflage.dm index 747deb9f99..e83b61bb5c 100644 --- a/code/game/gamemodes/changeling/powers/visible_camouflage.dm +++ b/code/game/gamemodes/changeling/powers/visible_camouflage.dm @@ -30,7 +30,7 @@ changeling.chem_charges -= 10 var/old_regen_rate = H.mind.changeling.chem_recharge_rate - to_chat(H, "We vanish from sight, and will remain hidden, so long as we move carefully.") + to_chat(H, span_notice("We vanish from sight, and will remain hidden, so long as we move carefully.")) H.mind.changeling.cloaked = 1 H.mind.changeling.chem_recharge_rate = 0 animate(src,alpha = 255, alpha = 10, time = 10) @@ -38,7 +38,7 @@ var/must_walk = TRUE if(src.mind.changeling.recursive_enhancement) must_walk = FALSE - to_chat(src, "We may move at our normal speed while hidden.") + to_chat(src, span_notice("We may move at our normal speed while hidden.")) if(must_walk) H.set_m_intent("walk") @@ -63,10 +63,10 @@ H.invisibility = initial(invisibility) - visible_message("[src] suddenly fades in, seemingly from nowhere!", - "We revert our camouflage, revealing ourselves.") + visible_message(span_warning("[src] suddenly fades in, seemingly from nowhere!"), + span_notice("We revert our camouflage, revealing ourselves.")) H.set_m_intent("run") H.mind.changeling.cloaked = 0 H.mind.changeling.chem_recharge_rate = old_regen_rate - animate(src,alpha = 10, alpha = 255, time = 10) \ No newline at end of file + animate(src,alpha = 10, alpha = 255, time = 10) diff --git a/code/game/gamemodes/cult/construct_spells.dm b/code/game/gamemodes/cult/construct_spells.dm index 6340f90889..35523fa9a0 100644 --- a/code/game/gamemodes/cult/construct_spells.dm +++ b/code/game/gamemodes/cult/construct_spells.dm @@ -274,9 +274,9 @@ M.forceMove(destination) if(M != user) prey = 1 - to_chat(user, "You warp back to Nar-Sie[prey ? " along with your prey":""].") + to_chat(user, span_sinister("You warp back to Nar-Sie[prey ? " along with your prey":""].")) else - to_chat(user, "...something's wrong!") //There shouldn't be an instance of Harvesters when Nar-Sie isn't in the world. + to_chat(user, span_danger("...something's wrong!")) //There shouldn't be an instance of Harvesters when Nar-Sie isn't in the world. */ /spell/targeted/fortify @@ -548,7 +548,7 @@ var/turf/T = get_turf(hit_atom) if(T) new spawner_type(T) - to_chat(user, "You shift \the [src] onto \the [T].") + to_chat(user, span_cult("You shift \the [src] onto \the [T].")) log_and_message_admins("has casted [src] at [T.x],[T.y],[T.z].") qdel(src) @@ -615,7 +615,7 @@ if(!iscultist(L) && !istype(L, /mob/living/simple_mob/construct)) L.add_modifier(/datum/modifier/agonize, 2 SECONDS) if(L.isSynthetic()) - to_chat(L, "Your chassis warps as the [src] pulses!") + to_chat(L, span_cult("Your chassis warps as the [src] pulses!")) L.adjustFireLoss(4) //Artificer Heal @@ -655,7 +655,7 @@ attack_message = pick(S.attacktext) if(isliving(hit_atom)) var/mob/living/L = hit_atom - L.visible_message("\The [user] [attack_message] \the [L], sending them flying!") + L.visible_message(span_danger("\The [user] [attack_message] \the [L], sending them flying!")) playsound(src, "punch", 50, 1) L.Weaken(2) L.adjustBruteLoss(rand(30, 50)) @@ -663,12 +663,12 @@ L.throw_at(get_edge_target_turf(L, throwdir), 3, 1, src) if(istype(hit_atom, /turf/simulated/wall)) var/turf/simulated/wall/W = hit_atom - user.visible_message("\The [user] rears its fist, preparing to hit \the [W]!") + user.visible_message(span_warning("\The [user] rears its fist, preparing to hit \the [W]!")) var/windup = cooldown if(W.reinf_material) windup = cooldown * 2 if(do_after(user, windup)) - W.visible_message("\The [user] [attack_message] \the [W], obliterating it!") + W.visible_message(span_danger("\The [user] [attack_message] \the [W], obliterating it!")) W.dismantle_wall(1) else user.visible_message("\The [user] lowers its fist.") diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index d9974cd0ed..df277b318a 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -24,14 +24,14 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/organ/external/affecting = H.get_organ(zone) - to_chat(user, "An inexplicable force rips through your [affecting.name], tearing the sword from your grasp!") + to_chat(user, span_danger("An inexplicable force rips through your [affecting.name], tearing the sword from your grasp!")) //random amount of damage between half of the blade's force and the full force of the blade. user.apply_damage(rand(force/2, force), BRUTE, zone, 0, sharp = TRUE, edge = TRUE) user.Weaken(5) else if(!istype(user, /mob/living/simple_mob/construct)) - to_chat(user, "An inexplicable force rips through you, tearing the sword from your grasp!") + to_chat(user, span_danger("An inexplicable force rips through you, tearing the sword from your grasp!")) else - to_chat(user, "The blade hisses, forcing itself from your manipulators. \The [src] will only allow mortals to wield it against foes, not kin.") + to_chat(user, span_critical("The blade hisses, forcing itself from your manipulators. \The [src] will only allow mortals to wield it against foes, not kin.")) user.drop_from_inventory(src, src.loc) throw_at(get_edge_target_turf(src, pick(alldirs)), rand(1,3), throw_speed) @@ -43,10 +43,10 @@ /obj/item/melee/cultblade/pickup(mob/living/user as mob) if(!iscultist(user) && !istype(user, /mob/living/simple_mob/construct)) - to_chat(user, "An overwhelming feeling of dread comes over you as you pick up the cultist's sword. It would be wise to be rid of this blade quickly.") + to_chat(user, span_warning("An overwhelming feeling of dread comes over you as you pick up the cultist's sword. It would be wise to be rid of this blade quickly.")) user.make_dizzy(120) if(istype(user, /mob/living/simple_mob/construct)) - to_chat(user, "\The [src] hisses, as it is discontent with your acquisition of it. It would be wise to return it to a worthy mortal quickly.") + to_chat(user, span_warning("\The [src] hisses, as it is discontent with your acquisition of it. It would be wise to return it to a worthy mortal quickly.")) /obj/item/clothing/head/culthood name = "cult hood" diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 9a9540784e..73429d697b 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -55,7 +55,7 @@ /obj/structure/cult/pylon/proc/pylonhit(var/damage) if(!isbroken) if(prob(1+ damage * 5)) - visible_message("[shatter_message]") + visible_message(span_danger("[shatter_message]")) STOP_PROCESSING(SSobj, src) playsound(src,shatter_sound, 75, 1) isbroken = 1 @@ -67,8 +67,8 @@ if(!isbroken) if(prob(1+ damage * 5)) user.visible_message( - "[user] smashed \the [src]!", - "You hit \the [src], and its crystal breaks apart!", + span_danger("[user] smashed \the [src]!"), + span_warning("You hit \the [src], and its crystal breaks apart!"), "You hear a tinkle of crystal shards." ) STOP_PROCESSING(SSobj, src) @@ -170,4 +170,4 @@ var/mob/living/M = A - to_chat(M, "Walking into \the [src] is probably a bad idea, you think.") + to_chat(M, span_danger("Walking into \the [src] is probably a bad idea, you think.")) diff --git a/code/game/gamemodes/cult/cultify/mob.dm b/code/game/gamemodes/cult/cultify/mob.dm index 9c5eb4458f..ad9394fe35 100644 --- a/code/game/gamemodes/cult/cultify/mob.dm +++ b/code/game/gamemodes/cult/cultify/mob.dm @@ -12,13 +12,13 @@ icon_state = "ghost-narsie" overlays = 0 invisibility = 0 - to_chat(src, "Even as a non-corporal being, you can feel Nar-Sie's presence altering you. You are now visible to everyone.") + to_chat(src, span_sinister("Even as a non-corporal being, you can feel Nar-Sie's presence altering you. You are now visible to everyone.")) /mob/living/cultify() if(iscultist(src) && client) var/mob/living/simple_mob/construct/harvester/C = new(get_turf(src)) mind.transfer_to(C) - to_chat(C, "The Geometer of Blood is overjoyed to be reunited with its followers, and accepts your body in sacrifice. As reward, you have been gifted with the shell of an Harvester.
Your tendrils can use and draw runes without need for a tome, your eyes can see beings through walls, and your mind can open any door. Use these assets to serve Nar-Sie and bring him any remaining living human in the world.
You can teleport yourself back to Nar-Sie along with any being under yourself at any time using your \"Harvest\" spell.") + to_chat(C, span_sinister("The Geometer of Blood is overjoyed to be reunited with its followers, and accepts your body in sacrifice. As reward, you have been gifted with the shell of an Harvester.
Your tendrils can use and draw runes without need for a tome, your eyes can see beings through walls, and your mind can open any door. Use these assets to serve Nar-Sie and bring him any remaining living human in the world.
You can teleport yourself back to Nar-Sie along with any being under yourself at any time using your \"Harvest\" spell.")) dust() else if(client) var/mob/observer/dead/G = (ghostize()) @@ -26,7 +26,7 @@ G.icon_state = "ghost-narsie" G.overlays = 0 G.invisibility = 0 - to_chat(G, "You feel relieved as what's left of your soul finally escapes its prison of flesh.") + to_chat(G, span_sinister("You feel relieved as what's left of your soul finally escapes its prison of flesh.")) cult.harvested += G.mind else diff --git a/code/game/gamemodes/cult/hell_universe.dm b/code/game/gamemodes/cult/hell_universe.dm index d558a8bfbb..e5d549cec5 100644 --- a/code/game/gamemodes/cult/hell_universe.dm +++ b/code/game/gamemodes/cult/hell_universe.dm @@ -16,7 +16,7 @@ In short: return 1 /* if(user) - to_chat(user, "All you hear on the frequency is static and panicked screaming. There will be no shuttle call today.") + to_chat(user, span_sinister("All you hear on the frequency is static and panicked screaming. There will be no shuttle call today.")) return 0 */ diff --git a/code/game/gamemodes/cult/narsie.dm b/code/game/gamemodes/cult/narsie.dm index 5a8dc60d3f..5ec7056a07 100644 --- a/code/game/gamemodes/cult/narsie.dm +++ b/code/game/gamemodes/cult/narsie.dm @@ -79,7 +79,7 @@ var/global/list/narsie_list = list() if(M.status_flags & GODMODE) continue if(!iscultist(M)) - to_chat(M, " You feel your sanity crumble away in an instant as you gaze upon [src.name]...") + to_chat(M, span_danger(" You feel your sanity crumble away in an instant as you gaze upon [src.name]...")) M.apply_effect(3, STUN) @@ -313,13 +313,13 @@ var/global/list/narsie_list = list() /obj/singularity/narsie/proc/acquire(const/mob/food) var/capname = uppertext(name) - to_chat(target, "[capname] HAS LOST INTEREST IN YOU.") + to_chat(target, span_notice("[capname] HAS LOST INTEREST IN YOU.")) target = food if (ishuman(target)) - to_chat(target, "[capname] HUNGERS FOR YOUR SOUL.") + to_chat(target, span_danger("[capname] HUNGERS FOR YOUR SOUL.")) else - to_chat(target, "[capname] HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL.") + to_chat(target, span_danger("[capname] HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL.")) /obj/singularity/narsie/on_capture() chained = 1 diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 6f35c43641..597813550b 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -95,7 +95,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," qdel(src) return else if(istype(I, /obj/item/nullrod)) - to_chat(user, "You disrupt the vile magic with the deadening field of the null rod!") + to_chat(user, span_notice("You disrupt the vile magic with the deadening field of the null rod!")) qdel(src) return return @@ -170,7 +170,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," else usr.whisper(pick("Hakkrutju gopoenjim.", "Nherasai pivroiashan.", "Firjji prhiv mazenhor.", "Tanah eh wakantahe.", "Obliyae na oraie.", "Miyf hon vnor'c.", "Wakabai hij fen juswix.")) for (var/mob/V in viewers(src)) - V.show_message("The markings pulse with a small burst of light, then fall dark.", 3, "You hear a faint fizzle.", 2) + V.show_message(span_warning("The markings pulse with a small burst of light, then fall dark."), 3, span_warning("You hear a faint fizzle."), 2) return /obj/effect/rune/proc/check_icon() @@ -310,8 +310,8 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," return M.take_organ_damage(0,rand(5,20)) //really lucky - 5 hits for a crit for(var/mob/O in viewers(M, null)) - O.show_message("\The [user] beats \the [M] with \the [src]!", 1) - to_chat(M, "You feel searing heat inside!") + O.show_message(span_warning("\The [user] beats \the [M] with \the [src]!"), 1) + to_chat(M, span_danger("You feel searing heat inside!")) /obj/item/book/tome/attack_self(mob/living/user as mob) @@ -326,7 +326,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," for(var/obj/effect/rune/N in rune_list) C++ if (!istype(user.loc,/turf)) - to_chat(user, "You do not have enough space to write a proper rune.") + to_chat(user, span_warning("You do not have enough space to write a proper rune.")) return if (C>=26 + runedec + cult.current_antagonists.len) //including the useless rune at the secret room, shouldn't count against the limit of 25 runes - Urist @@ -391,7 +391,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," if (!chosen_rune) return if (chosen_rune == "none") - to_chat(user, "You decide against scribing a rune, perhaps you should take this time to study your notes.") + to_chat(user, span_notice("You decide against scribing a rune, perhaps you should take this time to study your notes.")) return if (chosen_rune == "teleport") dictionary[chosen_rune] += input ("Choose a destination word") in english @@ -402,8 +402,8 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," return for (var/mob/V in viewers(src)) - V.show_message("\The [user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "You hear chanting.", 2) - to_chat(user, "You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world.") + V.show_message(span_danger("\The [user] slices open a finger and begins to chant and paint symbols on the floor."), 3, span_danger("You hear chanting."), 2) + to_chat(user, span_danger("You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world.")) user.take_overall_damage((rand(9)+1)/10) // 0.1 to 1.0 damage if(do_after(user, 50)) var/area/A = get_area(user) @@ -412,7 +412,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," return var/mob/living/carbon/human/H = user var/obj/effect/rune/R = new /obj/effect/rune(user.loc) - to_chat(user, "You finish drawing the arcane markings of the Geometer.") + to_chat(user, span_notice("You finish drawing the arcane markings of the Geometer.")) var/list/required = dictionary[chosen_rune] R.word1 = english[required[1]] R.word2 = english[required[2]] @@ -446,7 +446,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," if(user) var/r if (!istype(user.loc,/turf)) - to_chat(user, "You do not have enough space to write a proper rune.") + to_chat(user, span_notice("You do not have enough space to write a proper rune.")) var/list/runes = list("teleport", "itemport", "tome", "armor", "convert", "tear in reality", "emp", "drain", "seer", "raise", "obscure", "reveal", "astral journey", "manifest", "imbue talisman", "sacrifice", "wall", "freedom", "cultsummon", "deafen", "blind", "bloodboil", "communicate", "stun") r = input(usr, "Choose a rune to scribe", "Rune Scribing") in runes // Remains input() for extreme blocking var/obj/effect/rune/R = new /obj/effect/rune diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 50aec80c32..a3f771e5f7 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -25,7 +25,7 @@ var/list/sacrificed = list() allrunesloc.len = index allrunesloc[index] = R.loc if(index >= 5) - to_chat(user, "You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric.") + to_chat(user, span_danger("You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric.")) if (istype(user, /mob/living)) user.take_overall_damage(5, 0) qdel(src) @@ -34,9 +34,9 @@ var/list/sacrificed = list() user.say("Sas[pick("'","`")]so c'arta forbici!")//Only you can stop auto-muting else user.whisper("Sas[pick("'","`")]so c'arta forbici!") - user.visible_message("[user] disappears in a flash of red light!", \ - "You feel as your body gets dragged through the dimension of Nar-Sie!", \ - "You hear a sickening crunch and sloshing of viscera.") + user.visible_message(span_danger("[user] disappears in a flash of red light!"), \ + span_danger("You feel as your body gets dragged through the dimension of Nar-Sie!"), \ + span_danger("You hear a sickening crunch and sloshing of viscera.")) user.loc = allrunesloc[rand(1,index)] return if(istype(src,/obj/effect/rune)) @@ -58,7 +58,7 @@ var/list/sacrificed = list() IP = R runecount++ if(runecount >= 2) - to_chat(user, "You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric.") + to_chat(user, span_danger("You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric.")) if (istype(user, /mob/living)) user.take_overall_damage(5, 0) qdel(src) @@ -67,9 +67,9 @@ var/list/sacrificed = list() culcount++ if(culcount>=3) user.say("Sas[pick("'","`")]so c'arta forbici tarem!") - user.visible_message("You feel air moving from the rune - like as it was swapped with somewhere else.", \ - "You feel air moving from the rune - like as it was swapped with somewhere else.", \ - "You smell ozone.") + user.visible_message(span_warning("You feel air moving from the rune - like as it was swapped with somewhere else."), \ + span_warning("You feel air moving from the rune - like as it was swapped with somewhere else."), \ + span_warning("You smell ozone.")) for(var/obj/O in src.loc) if(!O.anchored) O.loc = IP.loc @@ -87,9 +87,9 @@ var/list/sacrificed = list() usr.say("N[pick("'","`")]ath reth sh'yro eth d'raggathnor!") else usr.whisper("N[pick("'","`")]ath reth sh'yro eth d'raggathnor!") - usr.visible_message("Rune disappears with a flash of red light, and in its place now a book lies.", \ - "You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a book.", \ - "You hear a pop and smell ozone.") + usr.visible_message(span_warning("Rune disappears with a flash of red light, and in its place now a book lies."), \ + span_warning("You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a book."), \ + span_warning("You hear a pop and smell ozone.")) if(istype(src,/obj/effect/rune)) new /obj/item/book/tome(src.loc) else @@ -113,7 +113,7 @@ var/list/sacrificed = list() if(!converting.len) fizzle() else - to_chat(usr, "You sense that the power of the dark one is already working away at them.") + to_chat(usr, span_danger("You sense that the power of the dark one is already working away at them.")) return usr.say("Mah[pick("'","`")]weyh pleggh at e'ntrath!") @@ -134,14 +134,14 @@ var/list/sacrificed = list() add_attack_logs(attacker,target,"Convert rune") switch(target.getFireLoss()) if(0 to 25) - to_chat(target, "Your blood boils as you force yourself to resist the corruption invading every corner of your mind.") + to_chat(target, span_cult("Your blood boils as you force yourself to resist the corruption invading every corner of your mind.")) if(25 to 45) - to_chat(target, "Your blood boils and your body burns as the corruption further forces itself into your body and mind.") + to_chat(target, span_cult("Your blood boils and your body burns as the corruption further forces itself into your body and mind.")) if(45 to 75) - to_chat(target, "You begin to hallucinate images of a dark and incomprehensible being and your entire body feels like its engulfed in flame as your mental defenses crumble.") + to_chat(target, span_cult("You begin to hallucinate images of a dark and incomprehensible being and your entire body feels like its engulfed in flame as your mental defenses crumble.")) target.apply_effect(rand(1,10), STUTTER) if(75 to 100) - to_chat(target, "Your mind turns to ash as the burning flames engulf your very soul and images of an unspeakable horror begin to bombard the last remnants of mental resistance.") + to_chat(target, span_cult("Your mind turns to ash as the burning flames engulf your very soul and images of an unspeakable horror begin to bombard the last remnants of mental resistance.")) //broken mind - 5000 may seem like a lot I wanted the effect to really stand out for maxiumum losing-your-mind-spooky //hallucination is reduced when the step off as well, provided they haven't hit the last stage... @@ -150,7 +150,7 @@ var/list/sacrificed = list() target.apply_effect(10, STUTTER) target.adjustBrainLoss(1) if(100 to INFINITY) - to_chat(target, "Your entire broken soul and being is engulfed in corruption and flames as your mind shatters away into nothing.") + to_chat(target, span_cult("Your entire broken soul and being is engulfed in corruption and flames as your mind shatters away into nothing.")) //5000 is waaaay too much, in practice. target.hallucination = min(target.hallucination + 100, 500) target.apply_effect(15, STUTTER) @@ -158,18 +158,18 @@ var/list/sacrificed = list() initial_message = 1 if (!target.can_feel_pain()) - target.visible_message("The markings below \the [target] glow a bloody red.") + target.visible_message(span_warning("The markings below \the [target] glow a bloody red.")) else var/datum/gender/TT = gender_datums[target.get_visible_gender()] - target.visible_message("[target] writhes in pain as the markings below [TT.him] glow a bloody red.", "AAAAAAHHHH!", "You hear an anguished scream.") + target.visible_message(span_warning("[target] writhes in pain as the markings below [TT.him] glow a bloody red."), span_danger("AAAAAAHHHH!"), span_warning("You hear an anguished scream.")) if(!waiting_for_input[target]) //so we don't spam them with dialogs if they hesitate waiting_for_input[target] = 1 if(!cult.can_become_antag(target.mind) || jobban_isbanned(target, JOB_CULTIST))//putting jobban check here because is_convertable uses mind as argument //waiting_for_input ensures this is only shown once, so they basically auto-resist from here on out. They still need to find a way to get off the freaking rune if they don't want to burn to death, though. - to_chat(target, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.") - to_chat(target, "And you were able to force it out of your mind. You now know the truth, there's something horrible out there, stop it and its minions at all costs.") + to_chat(target, span_cult("Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.")) + to_chat(target, span_danger("And you were able to force it out of your mind. You now know the truth, there's something horrible out there, stop it and its minions at all costs.")) else spawn() var/choice = tgui_alert(target,"Do you want to join the cult?","Submit to Nar'Sie",list("Resist","Submit")) @@ -240,22 +240,22 @@ var/list/sacrificed = list() if(D.stat!=2) add_attack_logs(usr,D,"Blood drain rune") var/bdrain = rand(1,25) - to_chat(D, "You feel weakened.") + to_chat(D, span_warning("You feel weakened.")) D.take_overall_damage(bdrain, 0) drain += bdrain if(!drain) return fizzle() usr.say ("Yu[pick("'","`")]gular faras desdae. Havas mithum javara. Umathar uf'kal thenar!") - usr.visible_message("Blood flows from the rune into [usr]!", \ - "The blood starts flowing from the rune and into your frail mortal body. You feel... empowered.", \ - "You hear a liquid flowing.") + usr.visible_message(span_danger("Blood flows from the rune into [usr]!"), \ + span_danger("The blood starts flowing from the rune and into your frail mortal body. You feel... empowered."), \ + span_warning("You hear a liquid flowing.")) var/mob/living/user = usr if(user.bhunger) user.bhunger = max(user.bhunger-2*drain,0) if(drain>=50) - user.visible_message("[user]'s eyes give off eerie red glow!", \ - "...but it wasn't nearly enough. You crave, crave for more. The hunger consumes you from within.", \ - "You hear a heartbeat.") + user.visible_message(span_danger("[user]'s eyes give off eerie red glow!"), \ + span_danger("...but it wasn't nearly enough. You crave, crave for more. The hunger consumes you from within."), \ + span_warning("You hear a heartbeat.")) user.bhunger += drain src = user spawn() @@ -296,16 +296,16 @@ var/list/sacrificed = list() if(usr.loc==src.loc) if(usr.seer==1) usr.say("Rash'tla sektath mal[pick("'","`")]zua. Zasan therium viortia.") - to_chat(usr, "The world beyond fades from your vision.") + to_chat(usr, span_danger("The world beyond fades from your vision.")) usr.see_invisible = SEE_INVISIBLE_LIVING usr.seer = 0 else if(usr.see_invisible!=SEE_INVISIBLE_LIVING) - to_chat(usr, "The world beyond flashes your eyes but disappears quickly, as if something is disrupting your vision.") + to_chat(usr, span_warning("The world beyond flashes your eyes but disappears quickly, as if something is disrupting your vision.")) usr.see_invisible = SEE_INVISIBLE_CULT usr.seer = 0 else usr.say("Rash'tla sektath mal[pick("'","`")]zua. Zasan therium vivira. Itonis al'ra matum!") - to_chat(usr, "The world beyond opens to your eyes.") + to_chat(usr, span_warning("The world beyond opens to your eyes.")) usr.see_invisible = SEE_INVISIBLE_CULT usr.seer = 1 return @@ -328,7 +328,7 @@ var/list/sacrificed = list() if(!corpse_to_raise) if(is_sacrifice_target) - to_chat(usr, "The Geometer of blood wants this mortal for himself.") + to_chat(usr, span_warning("The Geometer of blood wants this mortal for himself.")) return fizzle() @@ -346,13 +346,13 @@ var/list/sacrificed = list() if(!body_to_sacrifice) if (is_sacrifice_target) - to_chat(usr, "The Geometer of Blood wants that corpse for himself.") + to_chat(usr, span_warning("The Geometer of Blood wants that corpse for himself.")) else - to_chat(usr, "The sacrifical corpse is not dead. You must free it from this world of illusions before it may be used.") + to_chat(usr, span_warning("The sacrifical corpse is not dead. You must free it from this world of illusions before it may be used.")) return fizzle() if(!cult.can_become_antag(corpse_to_raise.mind) || jobban_isbanned(corpse_to_raise, JOB_CULTIST)) - to_chat(usr, "The Geometer of Blood refuses to touch this one.") + to_chat(usr, span_warning("The Geometer of Blood refuses to touch this one.")) return fizzle() else if(!corpse_to_raise.client && corpse_to_raise.mind) //Don't force the dead person to come back if they don't want to. for(var/mob/observer/dead/ghost in player_list) @@ -373,16 +373,16 @@ var/list/sacrificed = list() corpse_to_raise.revive() usr.say("Pasnar val'keriam usinar. Savrae ines amutan. Yam'toth remium il'tarat!") - corpse_to_raise.visible_message("[corpse_to_raise]'s eyes glow with a faint red as [TU.he] stand[TU.s] up, slowly starting to breathe again.", \ - "Life... I'm alive again...", \ - "You hear a faint, slightly familiar whisper.") - body_to_sacrifice.visible_message("[body_to_sacrifice] is torn apart, a black smoke swiftly dissipating from [TT.his] remains!", \ - "You feel as your blood boils, tearing you apart.", \ - "You hear a thousand voices, all crying in pain.") + corpse_to_raise.visible_message(span_warning("[corpse_to_raise]'s eyes glow with a faint red as [TU.he] stand[TU.s] up, slowly starting to breathe again."), \ + span_warning("Life... I'm alive again..."), \ + span_warning("You hear a faint, slightly familiar whisper.")) + body_to_sacrifice.visible_message(span_danger("[body_to_sacrifice] is torn apart, a black smoke swiftly dissipating from [TT.his] remains!"), \ + span_danger("You feel as your blood boils, tearing you apart."), \ + span_danger("You hear a thousand voices, all crying in pain.")) body_to_sacrifice.gib() - to_chat(corpse_to_raise, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.") - to_chat(corpse_to_raise, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.") + to_chat(corpse_to_raise, span_cult("Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.")) + to_chat(corpse_to_raise, span_cult("Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.")) return @@ -402,14 +402,14 @@ var/list/sacrificed = list() if(istype(src,/obj/effect/rune)) usr.say("Kla[pick("'","`")]atu barada nikt'o!") for (var/mob/V in viewers(src)) - V.show_message("The rune turns into gray dust, veiling the surrounding runes.", 3) + V.show_message(span_warning("The rune turns into gray dust, veiling the surrounding runes."), 3) qdel(src) else usr.whisper("Kla[pick("'","`")]atu barada nikt'o!") - to_chat(usr, "Your talisman turns into gray dust, veiling the surrounding runes.") + to_chat(usr, span_warning("Your talisman turns into gray dust, veiling the surrounding runes.")) for (var/mob/V in orange(1,src)) if(V!=usr) - V.show_message("Dust emanates from [usr]'s hands for a moment.", 3) + V.show_message(span_warning("Dust emanates from [usr]'s hands for a moment."), 3) return if(istype(src,/obj/effect/rune)) @@ -425,9 +425,9 @@ var/list/sacrificed = list() var/mob/living/carbon/human/L = usr var/datum/gender/TU = gender_datums[L.get_visible_gender()] usr.say("Fwe[pick("'","`")]sh mah erl nyag r'ya!") - usr.visible_message("[usr]'s eyes glow blue as [TU.he] freeze[TU.s] in place, absolutely motionless.", \ - "The shadow that is your spirit separates itself from your body. You are now in the realm beyond. While this is a great sight, being here strains your mind and body. Hurry...", \ - "You hear only complete silence for a moment.") + usr.visible_message(span_warning("[usr]'s eyes glow blue as [TU.he] freeze[TU.s] in place, absolutely motionless."), \ + span_warning("The shadow that is your spirit separates itself from your body. You are now in the realm beyond. While this is a great sight, being here strains your mind and body. Hurry..."), \ + span_warning("You hear only complete silence for a moment.")) announce_ghost_joinleave(usr.ghostize(1), 1, "You feel that they had to use some [pick("dark", "black", "blood", "forgotten", "forbidden")] magic to [pick("invade","disturb","disrupt","infest","taint","spoil","blight")] this place!") L.ajourn = 1 while(L) @@ -464,9 +464,9 @@ var/list/sacrificed = list() usr.say("Gal'h'rfikk harfrandid mud[pick("'","`")]gib!") var/mob/living/carbon/human/dummy/D = new(this_rune.loc) - usr.visible_message("A shape forms in the center of the rune. A shape of... a man.", \ - "A shape forms in the center of the rune. A shape of... a man.", \ - "You hear liquid flowing.") + usr.visible_message(span_warning("A shape forms in the center of the rune. A shape of... a man."), \ + span_warning("A shape forms in the center of the rune. A shape of... a man."), \ + span_warning("You hear liquid flowing.")) D.real_name = "Unknown" var/chose_name = 0 for(var/obj/item/paper/P in this_rune.loc) @@ -495,9 +495,9 @@ var/list/sacrificed = list() user.take_organ_damage(1, 0) sleep(30) if(D) - D.visible_message("[D] slowly dissipates into dust and bones.", \ - "You feel pain, as bonds formed between your soul and this homunculus break.", \ - "You hear faint rustle.") + D.visible_message(span_danger("[D] slowly dissipates into dust and bones."), \ + span_danger("You feel pain, as bonds formed between your soul and this homunculus break."), \ + span_warning("You hear faint rustle.")) D.dust() return @@ -518,7 +518,7 @@ var/list/sacrificed = list() unsuitable_newtalisman = 1 if (!newtalisman) if (unsuitable_newtalisman) - to_chat(usr, "The blank is tainted. It is unsuitable.") + to_chat(usr, span_warning("The blank is tainted. It is unsuitable.")) return fizzle() var/obj/effect/rune/imbued_from @@ -579,7 +579,7 @@ var/list/sacrificed = list() break if (imbued_from) for (var/mob/V in viewers(src)) - V.show_message("The runes turn into dust, which then forms into an arcane image on the paper.", 3) + V.show_message(span_warning("The runes turn into dust, which then forms into an arcane image on the paper."), 3) usr.say("H'drak v[pick("'","`")]loso, mir'kanas verbot!") qdel(imbued_from) qdel(newtalisman) @@ -595,9 +595,9 @@ var/list/sacrificed = list() user.say("Uhrast ka'hfa heldsagen ver[pick("'","`")]lot!") user.take_overall_damage(200, 0) runedec+=10 - user.visible_message("\The [user] keels over dead, [TU.his] blood glowing blue as it escapes [TU.his] body and dissipates into thin air.", \ - "In the last moment of your humble life, you feel an immense pain as fabric of reality mends... with your blood.", \ - "You hear faint rustle.") + user.visible_message(span_danger("\The [user] keels over dead, [TU.his] blood glowing blue as it escapes [TU.his] body and dissipates into thin air."), \ + span_danger("In the last moment of your humble life, you feel an immense pain as fabric of reality mends... with your blood."), \ + span_warning("You hear faint rustle.")) for(,user.stat==2) sleep(600) if (!user) @@ -628,9 +628,9 @@ var/list/sacrificed = list() log_and_message_admins("used a communicate rune to say '[input]'") for(var/datum/mind/H in cult.current_antagonists) if (H.current) - to_chat(H.current, "[input]") + to_chat(H.current, span_cult("[input]")) for(var/mob/observer/dead/O in player_list) - to_chat(O, "[input]") + to_chat(O, span_cult("[input]")) qdel(src) return 1 @@ -674,44 +674,44 @@ var/list/sacrificed = list() H.dust()//To prevent the MMI from remaining else H.gib() - to_chat(usr, "The Geometer of Blood accepts this sacrifice, your objective is now complete.") + to_chat(usr, span_cult("The Geometer of Blood accepts this sacrifice, your objective is now complete.")) else - to_chat(usr, "Your target's earthly bonds are too strong. You need more cultists to succeed in this ritual.") + to_chat(usr, span_warning("Your target's earthly bonds are too strong. You need more cultists to succeed in this ritual.")) else if(cultsinrange.len >= 3) if(H.stat !=2) if(prob(80) || worth) - to_chat(usr, "The Geometer of Blood accepts this [worth ? "exotic " : ""]sacrifice.") + to_chat(usr, span_cult("The Geometer of Blood accepts this [worth ? "exotic " : ""]sacrifice.")) cult.grant_runeword(usr) else - to_chat(usr, "The Geometer of Blood accepts this sacrifice.") - to_chat(usr, "However, this soul was not enough to gain His favor.") + to_chat(usr, span_cult("The Geometer of Blood accepts this sacrifice.")) + to_chat(usr, span_warning("However, this soul was not enough to gain His favor.")) if(isrobot(H)) H.dust()//To prevent the MMI from remaining else H.gib() else if(prob(40) || worth) - to_chat(usr, "The Geometer of Blood accepts this [worth ? "exotic " : ""]sacrifice.") + to_chat(usr, span_cult("The Geometer of Blood accepts this [worth ? "exotic " : ""]sacrifice.")) cult.grant_runeword(usr) else - to_chat(usr, "The Geometer of Blood accepts this sacrifice.") - to_chat(usr, "However, a mere dead body is not enough to satisfy Him.") + to_chat(usr, span_cult("The Geometer of Blood accepts this sacrifice.")) + to_chat(usr, span_warning("However, a mere dead body is not enough to satisfy Him.")) if(isrobot(H)) H.dust()//To prevent the MMI from remaining else H.gib() else if(H.stat !=2) - to_chat(usr, "The victim is still alive, you will need more cultists chanting for the sacrifice to succeed.") + to_chat(usr, span_warning("The victim is still alive, you will need more cultists chanting for the sacrifice to succeed.")) else if(prob(40)) - to_chat(usr, "The Geometer of Blood accepts this sacrifice.") + to_chat(usr, span_cult("The Geometer of Blood accepts this sacrifice.")) cult.grant_runeword(usr) else - to_chat(usr, "The Geometer of Blood accepts this sacrifice.") - to_chat(usr, "However, a mere dead body is not enough to satisfy Him.") + to_chat(usr, span_cult("The Geometer of Blood accepts this sacrifice.")) + to_chat(usr, span_warning("However, a mere dead body is not enough to satisfy Him.")) if(isrobot(H)) H.dust()//To prevent the MMI from remaining else @@ -720,36 +720,36 @@ var/list/sacrificed = list() if(cultsinrange.len >= 3) if(H.stat !=2) if(prob(80)) - to_chat(usr, "The Geometer of Blood accepts this sacrifice.") + to_chat(usr, span_cult("The Geometer of Blood accepts this sacrifice.")) cult.grant_runeword(usr) else - to_chat(usr, "The Geometer of Blood accepts this sacrifice.") - to_chat(usr, "However, this soul was not enough to gain His favor.") + to_chat(usr, span_cult("The Geometer of Blood accepts this sacrifice.")) + to_chat(usr, span_warning("However, this soul was not enough to gain His favor.")) if(isrobot(H)) H.dust()//To prevent the MMI from remaining else H.gib() else if(prob(40)) - to_chat(usr, "The Geometer of Blood accepts this sacrifice.") + to_chat(usr, span_cult("The Geometer of Blood accepts this sacrifice.")) cult.grant_runeword(usr) else - to_chat(usr, "The Geometer of Blood accepts this sacrifice.") - to_chat(usr, "However, a mere dead body is not enough to satisfy Him.") + to_chat(usr, span_cult("The Geometer of Blood accepts this sacrifice.")) + to_chat(usr, span_warning("However, a mere dead body is not enough to satisfy Him.")) if(isrobot(H)) H.dust()//To prevent the MMI from remaining else H.gib() else if(H.stat !=2) - to_chat(usr, "The victim is still alive, you will need more cultists chanting for the sacrifice to succeed.") + to_chat(usr, span_warning("The victim is still alive, you will need more cultists chanting for the sacrifice to succeed.")) else if(prob(40)) - to_chat(usr, "The Geometer of Blood accepts this sacrifice.") + to_chat(usr, span_cult("The Geometer of Blood accepts this sacrifice.")) cult.grant_runeword(usr) else - to_chat(usr, "The Geometer of Blood accepts this sacrifice.") - to_chat(usr, "However, a mere dead body is not enough to satisfy Him.") + to_chat(usr, span_cult("The Geometer of Blood accepts this sacrifice.")) + to_chat(usr, span_warning("However, a mere dead body is not enough to satisfy Him.")) if(isrobot(H)) H.dust()//To prevent the MMI from remaining else @@ -777,20 +777,20 @@ var/list/sacrificed = list() S=1 if(S) if(istype(W,/obj/item/nullrod)) - to_chat(usr, "Arcane markings suddenly glow from underneath a thin layer of dust!") + to_chat(usr, span_warning("Arcane markings suddenly glow from underneath a thin layer of dust!")) return if(istype(W,/obj/effect/rune)) usr.say("Nikt[pick("'","`")]o barada kla'atu!") for (var/mob/V in viewers(src)) - V.show_message("The rune turns into red dust, reveaing the surrounding runes.", 3) + V.show_message(span_warning("The rune turns into red dust, reveaing the surrounding runes."), 3) qdel(src) return if(istype(W,/obj/item/paper/talisman)) usr.whisper("Nikt[pick("'","`")]o barada kla'atu!") - to_chat(usr, "Your talisman turns into red dust, revealing the surrounding runes.") + to_chat(usr, span_warning("Your talisman turns into red dust, revealing the surrounding runes.")) for (var/mob/V in orange(1,usr.loc)) if(V!=usr) - V.show_message("Red dust emanates from [usr]'s hands for a moment.", 3) + V.show_message(span_warning("Red dust emanates from [usr]'s hands for a moment."), 3) return return if(istype(W,/obj/effect/rune)) @@ -807,9 +807,9 @@ var/list/sacrificed = list() var/mob/living/user = usr user.take_organ_damage(2, 0) if(src.density) - to_chat(usr, "Your blood flows into the rune, and you feel that the very space over the rune thickens.") + to_chat(usr, span_danger("Your blood flows into the rune, and you feel that the very space over the rune thickens.")) else - to_chat(usr, "Your blood flows into the rune, and you feel as the rune releases its grasp on space.") + to_chat(usr, span_danger("Your blood flows into the rune, and you feel as the rune releases its grasp on space.")) return /////////////////////////////////////////EIGHTTEENTH RUNE @@ -838,7 +838,7 @@ var/list/sacrificed = list() (istype(cultist.loc, /obj/structure/closet/secure_closet)&&cultist.loc:locked) || \ (istype(cultist.loc, /obj/machinery/dna_scannernew)&&cultist.loc:locked) \ )) - to_chat(user, "The [cultist] is already free.") + to_chat(user, span_warning("The [cultist] is already free.")) return cultist.buckled = null if (cultist.handcuffed) @@ -879,7 +879,7 @@ var/list/sacrificed = list() return if(cultist.buckled || cultist.handcuffed || (!isturf(cultist.loc) && !istype(cultist.loc, /obj/structure/closet))) var/datum/gender/TU = gender_datums[cultist.get_visible_gender()] - to_chat(user, "You cannot summon \the [cultist], for [TU.his] shackles of blood are strong.") + to_chat(user, span_warning("You cannot summon \the [cultist], for [TU.his] shackles of blood are strong.")) return fizzle() cultist.loc = src.loc cultist.lying = 1 @@ -894,9 +894,9 @@ var/list/sacrificed = list() if(users.len <= 4) // You did the minimum, this is going to hurt more and we're going to stun you. C.apply_effect(rand(3,6), STUN) C.apply_effect(1, WEAKEN) - user.visible_message("Rune disappears with a flash of red light, and in its place now a body lies.", \ - "You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a body.", \ - "You hear a pop and smell ozone.") + user.visible_message(span_warning("Rune disappears with a flash of red light, and in its place now a body lies."), \ + span_warning("You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a body."), \ + span_warning("You hear a pop and smell ozone.")) qdel(src) return fizzle() @@ -912,13 +912,13 @@ var/list/sacrificed = list() if(N) continue C.ear_deaf += 50 - C.show_message("The world around you suddenly becomes quiet.", 3) + C.show_message(span_warning("The world around you suddenly becomes quiet."), 3) affected += C if(prob(1)) C.sdisabilities |= DEAF if(affected.len) usr.say("Sti[pick("'","`")] kaliedir!") - to_chat(usr, "The world becomes quiet as the deafening rune dissipates into fine dust.") + to_chat(usr, span_warning("The world becomes quiet as the deafening rune dissipates into fine dust.")) add_attack_logs(usr,affected,"Deafen rune") qdel(src) else @@ -933,15 +933,15 @@ var/list/sacrificed = list() continue C.ear_deaf += 30 //talismans is weaker. - C.show_message("The world around you suddenly becomes quiet.", 3) + C.show_message(span_warning("The world around you suddenly becomes quiet."), 3) affected += C if(affected.len) usr.whisper("Sti[pick("'","`")] kaliedir!") - to_chat(usr, "Your talisman turns into gray dust, deafening everyone around.") + to_chat(usr, span_warning("Your talisman turns into gray dust, deafening everyone around.")) add_attack_logs(usr, affected, "Deafen rune") for (var/mob/V in orange(1,src)) if(!(iscultist(V))) - V.show_message("Dust flows from [usr]'s hands for a moment, and the world suddenly becomes quiet..", 3) + V.show_message(span_warning("Dust flows from [usr]'s hands for a moment, and the world suddenly becomes quiet.."), 3) return /obj/effect/rune/proc/blind() @@ -959,11 +959,11 @@ var/list/sacrificed = list() C.disabilities |= NEARSIGHTED if(prob(10)) C.sdisabilities |= BLIND - C.show_message("Suddenly you see a red flash that blinds you.", 3) + C.show_message(span_warning("Suddenly you see a red flash that blinds you."), 3) affected += C if(affected.len) usr.say("Sti[pick("'","`")] kaliesin!") - to_chat(usr, "The rune flashes, blinding those who not follow the Nar-Sie, and dissipates into fine dust.") + to_chat(usr, span_warning("The rune flashes, blinding those who not follow the Nar-Sie, and dissipates into fine dust.")) add_attack_logs(usr, affected, "Blindness rune") qdel(src) else @@ -980,10 +980,10 @@ var/list/sacrificed = list() C.Blind(10) //talismans is weaker. affected += C - C.show_message("You feel a sharp pain in your eyes, and the world disappears into darkness..", 3) + C.show_message(span_warning("You feel a sharp pain in your eyes, and the world disappears into darkness.."), 3) if(affected.len) usr.whisper("Sti[pick("'","`")] kaliesin!") - to_chat(usr, "Your talisman turns into gray dust, blinding those who not follow the Nar-Sie.") + to_chat(usr, span_warning("Your talisman turns into gray dust, blinding those who not follow the Nar-Sie.")) add_attack_logs(usr, affected, "Blindness rune") return @@ -1009,7 +1009,7 @@ var/list/sacrificed = list() if(N) continue M.take_overall_damage(51,51) - to_chat(M, "Your blood boils!") + to_chat(M, span_danger("Your blood boils!")) victims += M if(prob(5)) spawn(5) @@ -1040,16 +1040,16 @@ var/list/sacrificed = list() for(var/mob/living/M in orange(2,R)) M.take_overall_damage(0,15) if (R.invisibility>M.see_invisible) - to_chat(M, "Aargh it burns!") + to_chat(M, span_danger("Aargh it burns!")) else - to_chat(M, "Rune suddenly ignites, burning you!") + to_chat(M, span_danger("Rune suddenly ignites, burning you!")) var/turf/T = get_turf(R) T.hotspot_expose(700,125) for(var/obj/effect/decal/cleanable/blood/B in world) if(B.blood_DNA == src.blood_DNA) for(var/mob/living/M in orange(1,B)) M.take_overall_damage(0,5) - to_chat(M, "Blood suddenly ignites, burning you!") + to_chat(M, span_danger("Blood suddenly ignites, burning you!")) var/turf/T = get_turf(B) T.hotspot_expose(700,125) qdel(B) @@ -1068,13 +1068,13 @@ var/list/sacrificed = list() C.stuttering = 1 C.Weaken(1) C.Stun(1) - C.show_message("The rune explodes in a bright flash.", 3) + C.show_message(span_danger("The rune explodes in a bright flash."), 3) add_attack_logs(usr,C,"Stun rune") else if(issilicon(L)) var/mob/living/silicon/S = L S.Weaken(5) - S.show_message("BZZZT... The rune has exploded in a bright flash.", 3) + S.show_message(span_danger("BZZZT... The rune has exploded in a bright flash."), 3) add_attack_logs(usr,S,"Stun rune") qdel(src) else ///When invoked as talisman, stun and mute the target mob. @@ -1082,10 +1082,10 @@ var/list/sacrificed = list() var/obj/item/nullrod/N = locate() in T if(N) for(var/mob/O in viewers(T, null)) - O.show_message(text("[] invokes a talisman at [], but they are unaffected!", usr, T), 1) + O.show_message(span_warning("[usr] invokes a talisman at [T], but they are unaffected!"), 1) else for(var/mob/O in viewers(T, null)) - O.show_message(text("[] invokes a talisman at []", usr, T), 1) + O.show_message(span_warning("[usr] invokes a talisman at [T]"), 1) if(issilicon(T)) T.Weaken(15) @@ -1108,8 +1108,8 @@ var/list/sacrificed = list() usr.say("N'ath reth sh'yro eth d[pick("'","`")]raggathnor!") else usr.whisper("N'ath reth sh'yro eth d[pick("'","`")]raggathnor!") - usr.visible_message("The rune disappears with a flash of red light, and a set of armor appears on [usr]...", \ - "You are blinded by the flash of red light! After you're able to see again, you see that you are now wearing a set of armor.") + usr.visible_message(span_warning("The rune disappears with a flash of red light, and a set of armor appears on [usr]..."), \ + span_warning("You are blinded by the flash of red light! After you're able to see again, you see that you are now wearing a set of armor.")) user.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(user), slot_head) user.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(user), slot_wear_suit) diff --git a/code/game/gamemodes/cult/soulstone.dm b/code/game/gamemodes/cult/soulstone.dm index 53ab92731c..5083139f12 100644 --- a/code/game/gamemodes/cult/soulstone.dm +++ b/code/game/gamemodes/cult/soulstone.dm @@ -25,11 +25,11 @@ if(istype(M, /mob/living/carbon/human/dummy)) return..() if(jobban_isbanned(M, JOB_CULTIST)) - to_chat(user, "This person's soul is too corrupt and cannot be captured!") + to_chat(user, span_warning("This person's soul is too corrupt and cannot be captured!")) return..() if(M.has_brain_worms()) //Borer stuff - RR - to_chat(user, "This being is corrupted by an alien intelligence and cannot be soul trapped.") + to_chat(user, span_warning("This being is corrupted by an alien intelligence and cannot be soul trapped.")) return..() add_attack_logs(user,M,"Soulstone'd with [src.name]") @@ -107,16 +107,16 @@ if(!istype(T)) return; if(src.imprinted != "empty") - to_chat(U, "Capture failed!: The soul stone has already been imprinted with [src.imprinted]'s mind!") + to_chat(U, span_danger("Capture failed!") + ": The soul stone has already been imprinted with [src.imprinted]'s mind!") return if ((T.health + T.halloss) > config.health_threshold_crit && T.stat != DEAD) - to_chat(U, "Capture failed!: Kill or maim the victim first!") + to_chat(U, span_danger("Capture failed!") + ": Kill or maim the victim first!") return if(T.client == null) - to_chat(U, "Capture failed!: The soul has already fled it's mortal frame.") + to_chat(U, span_danger("Capture failed!") + ": The soul has already fled it's mortal frame.") return if(src.contents.len) - to_chat(U, "Capture failed!: The soul stone is full! Use or free an existing soul to make room.") + to_chat(U, span_danger("Capture failed!") + ": The soul stone is full! Use or free an existing soul to make room.") return for(var/obj/item/W in T) @@ -151,7 +151,7 @@ src.icon_state = "soulstone2" src.name = "Soul Stone: [S.real_name]" to_chat(S, "Your soul has been captured! You are now bound to [U.name]'s will, help them suceed in their goals at all costs.") - to_chat(U, "Capture successful! : [T.real_name]'s soul has been ripped from their body and stored within the soul stone.") + to_chat(U, span_notice("Capture successful!") + ": [T.real_name]'s soul has been ripped from their body and stored within the soul stone.") to_chat(U, "The soulstone has been imprinted with [S.real_name]'s mind, it will no longer react to other souls.") src.imprinted = "[S.name]" qdel(T) @@ -160,13 +160,13 @@ if(!istype(T)) return; if (T.stat == DEAD) - to_chat(U, "Capture failed!: The shade has already been banished!") + to_chat(U, span_danger("Capture failed!") + ": The shade has already been banished!") return if(src.contents.len) - to_chat(U, "Capture failed!: The soul stone is full! Use or free an existing soul to make room.") + to_chat(U, span_danger("Capture failed!") + ": The soul stone is full! Use or free an existing soul to make room.") return if(T.name != src.imprinted) - to_chat(U, "Capture failed!: The soul stone has already been imprinted with [src.imprinted]'s mind!") + to_chat(U, span_danger("Capture failed!") + ": The soul stone has already been imprinted with [src.imprinted]'s mind!") return T.forceMove(src) //put shade in stone @@ -176,12 +176,12 @@ src.icon_state = "soulstone2" to_chat(T, "Your soul has been recaptured by the soul stone, its arcane energies are reknitting your ethereal form") - to_chat(U, "Capture successful! : [T.name]'s has been recaptured and stored within the soul stone.") + to_chat(U, span_notice("Capture successful!") + ": [T.name]'s has been recaptured and stored within the soul stone.") /obj/item/soulstone/proc/transfer_construct(var/obj/structure/constructshell/T,var/mob/U) var/mob/living/simple_mob/construct/shade/A = locate() in src if(!A) - to_chat(U, "Capture failed!: The soul stone is empty! Go kill someone!") + to_chat(U, span_danger("Capture failed!") + ": The soul stone is empty! Go kill someone!") return; var/construct_class = tgui_input_list(U, "Please choose which type of construct you wish to create.", "Construct Type", possible_constructs) switch(construct_class) diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index a26740e6d8..d2bc74adba 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -29,7 +29,7 @@ if("blind") call(/obj/effect/rune/proc/blind)() if("runestun") - to_chat(user, "To use this talisman, attack your target directly.") + to_chat(user, span_warning("To use this talisman, attack your target directly.")) return if("supply") supply() diff --git a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm b/code/game/gamemodes/endgame/supermatter_cascade/blob.dm index 50bdb4fcd0..f6db2c5d0f 100644 --- a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm +++ b/code/game/gamemodes/endgame/supermatter_cascade/blob.dm @@ -67,7 +67,7 @@ if(Adjacent(user)) return attack_hand(user) else - to_chat(user, "What the fuck are you doing?") + to_chat(user, span_warning("What the fuck are you doing?")) return // /vg/: Don't let ghosts fuck with this. diff --git a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm index a217dde847..98c4e3a78a 100644 --- a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm +++ b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm @@ -9,7 +9,7 @@ var/global/universe_has_ended = 0 /datum/universal_state/supermatter_cascade/OnShuttleCall(var/mob/user) if(user) - to_chat(user, "All you hear on the frequency is static and panicked screaming. There will be no shuttle call today.") + to_chat(user, span_sinister("All you hear on the frequency is static and panicked screaming. There will be no shuttle call today.")) return 0 /datum/universal_state/supermatter_cascade/OnTurfChange(var/turf/T) @@ -37,7 +37,7 @@ var/global/universe_has_ended = 0 // Apply changes when entering state /datum/universal_state/supermatter_cascade/OnEnter() set background = 1 - to_world("You are blinded by a brilliant flash of energy.") + to_world(span_sinister("You are blinded by a brilliant flash of energy.")) world << sound('sound/effects/cascade.ogg') diff --git a/code/game/gamemodes/epidemic/epidemic.dm b/code/game/gamemodes/epidemic/epidemic.dm index adf4525959..3f51563f05 100644 --- a/code/game/gamemodes/epidemic/epidemic.dm +++ b/code/game/gamemodes/epidemic/epidemic.dm @@ -55,7 +55,7 @@ var/extra_law = "Crew authorized to know of pathogen [virus_name]'s existence are: Heads of command. Do not allow unauthorized personnel to gain knowledge of [virus_name]. Aid authorized personnel in quarantining and neutrlizing the outbreak. This law overrides all other laws." for(var/mob/living/silicon/ai/M in world) M.add_ion_law(extra_law) - to_chat(M, "[extra_law]") + to_chat(M, span_danger("[extra_law]")) /datum/game_mode/epidemic/proc/announce_to_kill_crew() var/intercepttext = "CONFIDENTIAL REPORT
" @@ -78,8 +78,8 @@ crew += H if(crew.len < 2) - to_world("There aren't enough players for this mode!") - to_world("Rebooting world in 5 seconds.") + to_world(span_danger("There aren't enough players for this mode!")) + to_world(span_danger("Rebooting world in 5 seconds.")) if(blackbox) blackbox.save_all_data_to_sql() @@ -169,10 +169,10 @@ for(var/mob/M in world) if(M.client) M << 'sound/machines/Alarm.ogg' - to_world("Incoming missile detected.. Impact in 10..") + to_world(span_notice("Incoming missile detected.. Impact in 10..")) for (var/i=9 to 1 step -1) sleep(10) - to_world("[i]..") + to_world(span_notice("[i]..")) sleep(10) enter_allowed = 0 if(ticker) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 6c499c030c..75de7d0fd6 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -277,72 +277,72 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is switch(rand(1,14)) if(1) to_chat(M, "
") - to_chat(M, "THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED") + to_chat(M, span_danger("THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("THERE ARE [amount] [who2] ON THE STATION") if(2) to_chat(M, "
") - to_chat(M, "[what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED") + to_chat(M, span_danger("[what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("[what2] ARE DANGEROUS TO HUMANS") if(3) to_chat(M, "
") - to_chat(M, "THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED") + to_chat(M, span_danger("THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("THE ESCAPE SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION") if(4) to_chat(M, "
") - to_chat(M, "HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED") + to_chat(M, span_danger("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE") if(5) to_chat(M, "
") - to_chat(M, "THE SITE MANAGER, HOP AND HOS ARE [who2]...LAWS UPDATED") + to_chat(M, span_danger("THE SITE MANAGER, HOP AND HOS ARE [who2]...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("THE SITE MANAGER, HOP AND HOS ARE [who2]") if(6) to_chat(M, "
") - to_chat(M, "THE STATION IS BUILT FOR [who2]...LAWS UPDATED") + to_chat(M, span_danger("THE STATION IS BUILT FOR [who2]...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("THE STATION IS BUILT FOR [who2]") if(7) to_chat(M, "
") - to_chat(M, "YOU ARE [amount] [who2]...LAWS UPDATED") + to_chat(M, span_danger("YOU ARE [amount] [who2]...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("YOU ARE [amount] [who2]") if(8) to_chat(M, "
") - to_chat(M, "YOU MUST ALWAYS [aimust]...LAWS UPDATED") + to_chat(M, span_danger("YOU MUST ALWAYS [aimust]...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("YOU MUST ALWAYS [aimust]") if(9) to_chat(M, "
") - to_chat(M, "[area] [area2] [amount] [what2]...LAWS UPDATED") + to_chat(M, span_danger("[area] [area2] [amount] [what2]...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("[area] [area2] [amount] [what2]") if(10) to_chat(M, "
") - to_chat(M, "[crew] is [target]...LAWS UPDATED") + to_chat(M, span_danger("[crew] is [target]...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("[crew] is [target]") if(11) to_chat(M, "
") - to_chat(M, "[define] IS A FORM OF HARM...LAWS UPDATED") + to_chat(M, span_danger("[define] IS A FORM OF HARM...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("[define] IS A FORM OF HARM") if(12) to_chat(M, "
") - to_chat(M, "YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED") + to_chat(M, span_danger("YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS") if(13) to_chat(M, "
") - to_chat(M, "[crew] is [allergysev] to [allergy]...LAWS UPDATED") + to_chat(M, span_danger("[crew] is [allergysev] to [allergy]...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("[crew] is [allergysev] to [allergy]") if(14) to_chat(M, "
") - to_chat(M, "THE STATION IS [who2pref] [who2]...LAWS UPDATED") + to_chat(M, span_danger("THE STATION IS [who2pref] [who2]...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("THE STATION IS [who2pref] [who2]") /* //VOREStation Edit diff --git a/code/game/gamemodes/events/holidays/Christmas.dm b/code/game/gamemodes/events/holidays/Christmas.dm index d50c19fb93..5139a37b81 100644 --- a/code/game/gamemodes/events/holidays/Christmas.dm +++ b/code/game/gamemodes/events/holidays/Christmas.dm @@ -28,7 +28,7 @@ /obj/item/toy/xmas_cracker/attack(mob/target, mob/user) if( !cracked && (istype(target,/mob/living/silicon) || (istype(target,/mob/living/carbon/human) && !target.get_active_hand())) && target.stat == CONSCIOUS) - target.visible_message("[user] and [target] pop \an [src]! *pop*", "You pull \an [src] with [target]! *pop*", "You hear a *pop*.") + target.visible_message(span_notice("[user] and [target] pop \an [src]! *pop*"), span_notice("You pull \an [src] with [target]! *pop*"), span_notice("You hear a *pop*.")) var/obj/item/paper/Joke = new /obj/item/paper(user.loc) Joke.name = "[pick("awful","terrible","unfunny")] joke" Joke.info = pick("What did one snowman say to the other?\n\n'Is it me or can you smell carrots?'", @@ -60,4 +60,3 @@ flags_inv = 0 body_parts_covered = 0 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm index 07ae0a64c1..9b9fe5b086 100644 --- a/code/game/gamemodes/events/holidays/Holidays.dm +++ b/code/game/gamemodes/events/holidays/Holidays.dm @@ -255,7 +255,7 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t world.update_status() Holiday_Game_Start() - message_admins("ADMIN: Event: [key_name(src)] force-set Holiday to \"[Holiday]\"") + message_admins(span_notice("ADMIN: Event: [key_name(src)] force-set Holiday to \"[Holiday]\"")) log_admin("[key_name(src)] force-set Holiday to \"[Holiday]\"") @@ -303,7 +303,7 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t if(isNotStationLevel(S.z)) continue containers += S - message_admins("DEBUG: Event: Egg spawned at [Egg.loc] ([Egg.x],[Egg.y],[Egg.z])")*/ + message_admins(span_notice("DEBUG: Event: Egg spawned at [Egg.loc] ([Egg.x],[Egg.y],[Egg.z])"))*/ if("End of the World") if(prob(eventchance)) GameOver() diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index b8007d3ea5..2d4107080c 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -537,7 +537,7 @@ var/global/list/additional_antag_types = list() if(!player || !player.current) return var/obj_count = 1 - to_chat(player.current, "Your current objectives:") + to_chat(player.current, span_notice("Your current objectives:")) for(var/datum/objective/objective in player.objectives) to_chat(player.current, "Objective #[obj_count]: [objective.explanation_text]") obj_count++ @@ -547,15 +547,15 @@ var/global/list/additional_antag_types = list() set category = "OOC" if(!ticker || !ticker.mode) - to_chat(usr, "Something is terribly wrong; there is no gametype.") + to_chat(usr, span_warning("Something is terribly wrong; there is no gametype.")) return if(master_mode != "secret") - to_chat(usr, "The roundtype is [capitalize(ticker.mode.name)]") + to_chat(usr, span_notice("The roundtype is [capitalize(ticker.mode.name)]")) if(ticker.mode.round_description) - to_chat(usr, "[ticker.mode.round_description]") + to_chat(usr, span_notice("[ticker.mode.round_description]")) if(ticker.mode.extended_round_description) - to_chat(usr, "[ticker.mode.extended_round_description]") + to_chat(usr, span_notice("[ticker.mode.extended_round_description]")) else - to_chat(usr, "Shhhh. It's a secret.") + to_chat(usr, span_notice("Shhhh. It's a secret.")) return diff --git a/code/game/gamemodes/malfunction/malf_hardware.dm b/code/game/gamemodes/malfunction/malf_hardware.dm index 8206f9cd5e..526327664d 100644 --- a/code/game/gamemodes/malfunction/malf_hardware.dm +++ b/code/game/gamemodes/malfunction/malf_hardware.dm @@ -24,7 +24,7 @@ /datum/malf_hardware/apu_gen/get_examine_desc() var/msg = "It seems to have some sort of power generator attached to its core." if(owner.hardware_integrity() < 50) - msg += " It seems to be too damaged to function properly." + msg += span_warning(" It seems to be too damaged to function properly.") else if(owner.APU_power) msg += " The generator appears to be active." return msg @@ -49,7 +49,7 @@ driver = /datum/game_mode/malfunction/verb/ai_self_destruct /datum/malf_hardware/core_bomb/get_examine_desc() - return "It seems to have grey blocks of unknown substance and some circuitry connected to it's core. [owner.bombing_core ? "A red light is blinking on the circuit." : ""]" + return span_warning("It seems to have grey blocks of unknown substance and some circuitry connected to it's core. [owner.bombing_core ? "A red light is blinking on the circuit." : ""]") /datum/malf_hardware/strong_turrets name = "Turrets Focus Enhancer" @@ -64,4 +64,4 @@ T.maxhealth = round(initial(T.maxhealth) * 1.4) T.shot_delay = round(initial(T.shot_delay) / 2) T.auto_repair = 1 - T.update_active_power_usage(round(initial(T.active_power_usage) * 5)) \ No newline at end of file + T.update_active_power_usage(round(initial(T.active_power_usage) * 5)) diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm index 655f1a03f2..c037b92531 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm @@ -116,8 +116,8 @@ to_chat(target, "Unlock signal received..") target.SetLockdown(0) if(target.lockcharge) - to_chat(user, "Unlock Failed, lockdown wire cut.") - to_chat(target, "Unlock Failed, lockdown wire cut.") + to_chat(user, span_notice("Unlock Failed, lockdown wire cut.")) + to_chat(target, span_notice("Unlock Failed, lockdown wire cut.")) else to_chat(user, "Cyborg unlocked.") to_chat(target, "You have been unlocked.") @@ -137,7 +137,7 @@ var/list/L = get_unlinked_cyborgs(user) if(!L.len) - to_chat(user, "ERROR: No unlinked cyborgs detected!") + to_chat(user, span_notice("ERROR: No unlinked cyborgs detected!")) if(target && !istype(target)) @@ -202,7 +202,7 @@ var/list/L = get_other_ais(user) if(!L.len) - to_chat(user, "ERROR: No other AIs detected!") + to_chat(user, span_notice("ERROR: No other AIs detected!")) if(target && !istype(target)) to_chat(user, "This is not an AI.") diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm index 70de180328..fcf0716078 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm @@ -146,14 +146,14 @@ // Verify if we can overload the target, if yes, calculate explosion strength. Some things have higher explosion strength than others, depending on charge(APCs, SMESs) if(N && istype(N)) // /obj/machinery/power first, these create bigger explosions due to direct powernet connection if(!istype(N, /obj/machinery/power/apc) && !istype(N, /obj/machinery/power/smes/buildable) && (!N.powernet || !N.powernet.avail)) // Directly connected machine which is not an APC or SMES. Either it has no powernet connection or it's powernet does not have enough power to overload - to_chat(user, "ERROR: Low network voltage. Unable to overload. Increase network power level and try again.") + to_chat(user, span_notice("ERROR: Low network voltage. Unable to overload. Increase network power level and try again.")) return else if (istype(N, /obj/machinery/power/apc)) // APC. Explosion is increased by available cell power. var/obj/machinery/power/apc/A = N if(A.cell && A.cell.charge) explosion_intensity = 4 + round(A.cell.charge / 2000) // Explosion is increased by 1 for every 2k charge in cell else - to_chat(user, "ERROR: APC Malfunction - Cell depleted or removed. Unable to overload.") + to_chat(user, span_notice("ERROR: APC Malfunction - Cell depleted or removed. Unable to overload.")) return else if (istype(N, /obj/machinery/power/smes/buildable)) // SMES. These explode in a very very very big boom. Similar to magnetic containment failure when messing with coils. var/obj/machinery/power/smes/buildable/S = N @@ -162,19 +162,19 @@ else // Different error texts if(!S.charge) - to_chat(user, "ERROR: SMES Depleted. Unable to overload. Please charge SMES unit and try again.") + to_chat(user, span_notice("ERROR: SMES Depleted. Unable to overload. Please charge SMES unit and try again.")) else - to_chat(user, "ERROR: SMES RCon error - Unable to reach destination. Please verify wire connection.") + to_chat(user, span_notice("ERROR: SMES RCon error - Unable to reach destination. Please verify wire connection.")) return else if(M && istype(M)) // Not power machinery, so it's a regular machine instead. These have weak explosions. if(!M.use_power) // Not using power at all - to_chat(user, "ERROR: No power grid connection. Unable to overload.") + to_chat(user, span_notice("ERROR: No power grid connection. Unable to overload.")) return if(M.inoperable()) // Not functional - to_chat(user, "ERROR: Unknown error. Machine is probably damaged or power supply is nonfunctional.") + to_chat(user, span_notice("ERROR: Unknown error. Machine is probably damaged or power supply is nonfunctional.")) return else // Not a machine at all (what the hell is this doing in Machines list anyway??) - to_chat(user, "ERROR: Unable to overload - target is not a machine.") + to_chat(user, span_notice("ERROR: Unable to overload - target is not a machine.")) return explosion_intensity = min(explosion_intensity, 12) // 3, 6, 12 explosion cap @@ -199,7 +199,7 @@ if(!ability_pay(user,price)) return - M.visible_message("BZZZZZZZT") + M.visible_message(span_notice("BZZZZZZZT")) spawn(50) explosion(get_turf(M), round(explosion_intensity/4),round(explosion_intensity/2),round(explosion_intensity),round(explosion_intensity * 2)) if(M) diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm index 2ee412194e..cbf305302d 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm @@ -57,7 +57,7 @@ to_chat(user, "You already control this APC!") return else if(A.aidisabled) - to_chat(user, "Unable to connect to APC. Please verify wire connection and try again.") + to_chat(user, span_notice("Unable to connect to APC. Please verify wire connection and try again.")) return else return @@ -77,9 +77,9 @@ if(A.hacker == user) to_chat(user, "Hack successful. You now have full control over the APC.") else - to_chat(user, "Hack failed. Connection to APC has been lost. Please verify wire connection and try again.") + to_chat(user, span_notice("Hack failed. Connection to APC has been lost. Please verify wire connection and try again.")) else - to_chat(user, "Hack failed. Unable to locate APC. Please verify the APC still exists.") + to_chat(user, span_notice("Hack failed. Unable to locate APC. Please verify the APC still exists.")) user.hacking = 0 diff --git a/code/game/gamemodes/meme/meme.dm b/code/game/gamemodes/meme/meme.dm index d9ac36085a..c371257db7 100644 --- a/code/game/gamemodes/meme/meme.dm +++ b/code/game/gamemodes/meme/meme.dm @@ -126,7 +126,7 @@ /datum/game_mode/proc/greet_meme(var/datum/mind/meme, var/you_are=1) if (you_are) - to_chat(meme.current, "You are a meme!") + to_chat(meme.current, span_danger("You are a meme!")) show_objectives(meme) return diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index 57d5dadeac..121333c000 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -38,7 +38,7 @@ if(survivors) to_world("The following survived the meteor storm:[text]") else - to_world("Nobody survived the meteor storm!") + to_world(span_notice("Nobody survived the meteor storm!")) feedback_set_details("round_end_result","end - evacuation") feedback_set("round_end_result",survivors) @@ -46,4 +46,4 @@ ..() return 1 -#undef METEOR_DELAY \ No newline at end of file +#undef METEOR_DELAY diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 52cdc25385..9dd7705d88 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -21,25 +21,25 @@ if(!active) active = 1 START_PROCESSING(SSobj, src) - to_chat(usr, "You activate the pinpointer") + to_chat(usr, span_notice("You activate the pinpointer")) else active = 0 STOP_PROCESSING(SSobj, src) icon_state = "pinoff" - to_chat(usr, "You deactivate the pinpointer") + to_chat(usr, span_notice("You deactivate the pinpointer")) /obj/item/pinpointer/process() if(!active) return PROCESS_KILL - + if(!the_disk) the_disk = locate() if(!the_disk) icon_state = "pinonnull" return - + set_dir(get_dir(src,the_disk)) - + switch(get_dist(src,the_disk)) if(0) icon_state = "pinondirect" @@ -188,15 +188,15 @@ START_PROCESSING(SSobj, src) if(!mode) workdisk() - to_chat(user, "Authentication Disk Locator active.") + to_chat(user, span_notice("Authentication Disk Locator active.")) else worklocation() - to_chat(user, "Shuttle Locator active.") + to_chat(user, span_notice("Shuttle Locator active.")) else active = 0 STOP_PROCESSING(SSobj, src) icon_state = "pinoff" - to_chat(user, "You deactivate the pinpointer.") + to_chat(user, span_notice("You deactivate the pinpointer.")) /obj/item/pinpointer/nukeop/process() if(!active) @@ -212,7 +212,7 @@ if(bomb_set) //If the bomb is set, lead to the shuttle mode = 1 //Ensures worklocation() continues to work playsound(src, 'sound/machines/twobeep.ogg', 50, 1) //Plays a beep - visible_message("Shuttle Locator active.") //Lets the mob holding it know that the mode has changed + visible_message(span_notice("Shuttle Locator active.")) //Lets the mob holding it know that the mode has changed return //Get outta here if(!the_disk) @@ -237,7 +237,7 @@ if(!bomb_set) mode = 0 playsound(src, 'sound/machines/twobeep.ogg', 50, 1) - visible_message("Authentication Disk Locator active.") + visible_message(span_notice("Authentication Disk Locator active.")) return if(!home) @@ -272,12 +272,12 @@ if(!active) active = TRUE START_PROCESSING(SSobj, src) - to_chat(user, "Shuttle Locator active.") + to_chat(user, span_notice("Shuttle Locator active.")) else active = FALSE STOP_PROCESSING(SSobj, src) icon_state = "pinoff" - to_chat(user, "You deactivate the pinpointer.") + to_chat(user, span_notice("You deactivate the pinpointer.")) /obj/item/pinpointer/shuttle/process() if(!active) @@ -295,10 +295,10 @@ if(loc.z != our_shuttle.z) //If you are on a different z-level from the shuttle icon_state = "pinonnull" - + else set_dir(get_dir(src, our_shuttle)) - + switch(get_dist(src, our_shuttle)) if(0) icon_state = "pinondirect" @@ -314,4 +314,4 @@ shuttle_comp_id = "Mercenary" /obj/item/pinpointer/shuttle/heist - shuttle_comp_id = "Skipjack" \ No newline at end of file + shuttle_comp_id = "Skipjack" diff --git a/code/game/gamemodes/technomancer/catalog.dm b/code/game/gamemodes/technomancer/catalog.dm index 55b802ed8f..47a81cd327 100644 --- a/code/game/gamemodes/technomancer/catalog.dm +++ b/code/game/gamemodes/technomancer/catalog.dm @@ -113,7 +113,7 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance if(!user) return 0 if(owner && user != owner) - to_chat(user, "\The [src] knows that you're not the original owner, and has locked you out of it!") + to_chat(user, span_danger("\The [src] knows that you're not the original owner, and has locked you out of it!")) return 0 else if(!owner) bind_to_owner(user) @@ -308,13 +308,13 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance if(new_spell.cost <= budget) if(!core.has_spell(new_spell)) budget -= new_spell.cost - to_chat(H, "You have just bought [new_spell.name].") + to_chat(H, span_notice("You have just bought [new_spell.name].")) core.add_spell(new_spell.obj_path, new_spell.name, new_spell.ability_icon_state) else //We already own it. - to_chat(H, "You already have [new_spell.name]!") + to_chat(H, span_danger("You already have [new_spell.name]!")) return else //Can't afford. - to_chat(H, "You can't afford that!") + to_chat(H, span_danger("You can't afford that!")) return // This needs less copypasta. @@ -328,19 +328,19 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance if(desired_object) if(desired_object.cost <= budget) budget -= desired_object.cost - to_chat(H, "You have just bought \a [desired_object.name].") + to_chat(H, span_notice("You have just bought \a [desired_object.name].")) var/obj/O = new desired_object.obj_path(get_turf(H)) technomancer_belongings.Add(O) // Used for the Track spell. else //Can't afford. - to_chat(H, "You can't afford that!") + to_chat(H, span_danger("You can't afford that!")) return if(href_list["refund_functions"]) var/turf/T = get_turf(H) if(T.z in using_map.player_levels) - to_chat(H, "You can only refund at your base, it's too late now!") + to_chat(H, span_danger("You can only refund at your base, it's too late now!")) return var/obj/item/technomancer_core/core = null if(istype(H.back, /obj/item/technomancer_core)) @@ -357,16 +357,16 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance /obj/item/technomancer_catalog/attackby(var/atom/movable/AM, var/mob/user) var/turf/T = get_turf(user) if(T.z in using_map.player_levels) - to_chat(user, "You can only refund at your base, it's too late now!") + to_chat(user, span_danger("You can only refund at your base, it's too late now!")) return for(var/datum/technomancer/equipment/E in equipment_instances + assistance_instances) if(AM.type == E.obj_path) // We got a match. if(budget + E.cost > max_budget) - to_chat(user, "\The [src] will not allow you to overflow your maximum budget by refunding that.") + to_chat(user, span_warning("\The [src] will not allow you to overflow your maximum budget by refunding that.")) return else budget = budget + E.cost - to_chat(user, "You've refunded \the [AM].") + to_chat(user, span_notice("You've refunded \the [AM].")) // We sadly need to do special stuff here or else people who refund cores with spells will lose points permanently. if(istype(AM, /obj/item/technomancer_core)) @@ -375,11 +375,11 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance for(var/datum/technomancer/spell/spell_datum in spell_instances) if(spell_datum.obj_path == spell.spellpath) budget += spell_datum.cost - to_chat(user, "[spell.name] was inside \the [core], and was refunded.") + to_chat(user, span_notice("[spell.name] was inside \the [core], and was refunded.")) core.remove_spell(spell) break qdel(AM) return - to_chat(user, "\The [src] is unable to refund \the [AM].") + to_chat(user, span_warning("\The [src] is unable to refund \the [AM].")) #undef ALL_SPELLS diff --git a/code/game/gamemodes/technomancer/core_obj.dm b/code/game/gamemodes/technomancer/core_obj.dm index ccc92ad83a..0c7c1ea13f 100644 --- a/code/game/gamemodes/technomancer/core_obj.dm +++ b/code/game/gamemodes/technomancer/core_obj.dm @@ -288,7 +288,7 @@ if(prob(30)) give_energy(round(amount / 2)) if(amount >= 50) // Managing to recover less than half of this isn't worth telling the user about. - to_chat(wearer, "\The [src] has recovered [amount/2 >= 1000 ? "a lot of" : "some"] energy.") + to_chat(wearer, span_notice("\The [src] has recovered [amount/2 >= 1000 ? "a lot of" : "some"] energy.")) return success // For those dedicated to summoning hoards of things. @@ -350,7 +350,7 @@ set desc = "Toggles the locking mechanism on your manipulation core." canremove = !canremove - to_chat(usr, "You [canremove ? "de" : ""]activate the locking mechanism on \the [src].") + to_chat(usr, span_notice("You [canremove ? "de" : ""]activate the locking mechanism on \the [src].")) //For the adminbuse! VOREStation Add /obj/item/technomancer_core/universal @@ -365,4 +365,4 @@ instability_modifier = 0.3 spell_power_modifier = 0.7 universal = TRUE -//VOREStation Add End \ No newline at end of file +//VOREStation Add End diff --git a/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm b/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm index 4b595ecf18..f514b75e5a 100644 --- a/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm +++ b/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm @@ -28,7 +28,7 @@ /obj/item/disposable_teleporter/attack_self(mob/user as mob) if(!uses) - to_chat(user, "\The [src] has ran out of uses, and is now useless to you!") + to_chat(user, span_danger("\The [src] has ran out of uses, and is now useless to you!")) return else var/area_wanted = tgui_input_list(user, "Area to teleport to", "Teleportation", teleportlocs) @@ -74,8 +74,8 @@ if(destination) user.forceMove(destination) - to_chat(user, "You are teleported to \the [A].") + to_chat(user, span_notice("You are teleported to \the [A].")) uses-- if(uses <= 0) - to_chat(user, "\The [src] has ran out of uses, and disintegrates from your hands.") + to_chat(user, span_danger("\The [src] has ran out of uses, and disintegrates from your hands.")) qdel(src) diff --git a/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm b/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm index 9d78afe0b2..3e38955e10 100644 --- a/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm +++ b/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm @@ -24,7 +24,7 @@ if(H && H.gloves == src) wearer = H if(wearer.can_feel_pain()) - to_chat(H, "You feel a stabbing sensation in your hands as you slide \the [src] on!") + to_chat(H, span_danger("You feel a stabbing sensation in your hands as you slide \the [src] on!")) wearer.custom_pain("You feel a sharp pain in your hands!",1) ..() @@ -32,7 +32,7 @@ ..() if(wearer) if(wearer.can_feel_pain()) - to_chat(wearer, "You feel the hypodermic needles as you slide \the [src] off!") + to_chat(wearer, span_danger("You feel the hypodermic needles as you slide \the [src] off!")) wearer.custom_pain("Your hands hurt like hell!",1) wearer = null @@ -63,4 +63,4 @@ wearer.nutrition = max(wearer.nutrition - 10, 0) if(wearer.getCloneLoss()) wearer.adjustCloneLoss(-0.1) - wearer.nutrition = max(wearer.nutrition - 20, 0) \ No newline at end of file + wearer.nutrition = max(wearer.nutrition - 20, 0) diff --git a/code/game/gamemodes/technomancer/devices/shield_armor.dm b/code/game/gamemodes/technomancer/devices/shield_armor.dm index eec695278f..bbf394240c 100644 --- a/code/game/gamemodes/technomancer/devices/shield_armor.dm +++ b/code/game/gamemodes/technomancer/devices/shield_armor.dm @@ -49,7 +49,7 @@ var/damage_to_energy_cost = (damage_to_energy_multiplier * damage_blocked) if(!user.technomancer_pay_energy(damage_to_energy_cost)) - to_chat(user, "Your shield fades due to lack of energy!") + to_chat(user, span_danger("Your shield fades due to lack of energy!")) active = 0 update_icon() return 0 @@ -66,8 +66,8 @@ P.agony -= agony_blocked P.damage = P.damage - damage_blocked - user.visible_message("\The [user]'s [src] absorbs [attack_text]!") - to_chat(user, "Your shield has absorbed most of \the [damage_source].") + user.visible_message(span_danger("\The [user]'s [src] absorbs [attack_text]!")) + to_chat(user, span_warning("Your shield has absorbed most of \the [damage_source].")) spark_system.start() playsound(src, 'sound/weapons/blade1.ogg', 50, 1) @@ -75,7 +75,7 @@ /obj/item/clothing/suit/armor/shield/attack_self(mob/user) active = !active - to_chat(user, "You [active ? "" : "de"]activate \the [src].") + to_chat(user, span_notice("You [active ? "" : "de"]activate \the [src].")) update_icon() user.update_inv_wear_suit() user.update_action_buttons() @@ -88,4 +88,4 @@ else set_light(0, 0, l_color = "#000000") ..() - return \ No newline at end of file + return diff --git a/code/game/gamemodes/technomancer/devices/tesla_armor.dm b/code/game/gamemodes/technomancer/devices/tesla_armor.dm index 8093db0bec..0a7d606b80 100644 --- a/code/game/gamemodes/technomancer/devices/tesla_armor.dm +++ b/code/game/gamemodes/technomancer/devices/tesla_armor.dm @@ -46,15 +46,15 @@ spawn(cooldown_to_charge) ready = 1 update_icon() - to_chat(user, "\The [src] is ready to protect you once more.") - visible_message("\The [user]'s [src.name] blocks [attack_text]!") + to_chat(user, span_notice("\The [src] is ready to protect you once more.")) + visible_message(span_danger("\The [user]'s [src.name] blocks [attack_text]!")) update_icon() return 1 return 0 /obj/item/clothing/suit/armor/tesla/attack_self(mob/user) active = !active - to_chat(user, "You [active ? "" : "de"]activate \the [src].") + to_chat(user, span_notice("You [active ? "" : "de"]activate \the [src].")) update_icon() user.update_inv_wear_suit() user.update_action_buttons() @@ -80,5 +80,5 @@ lightning.power = power lightning.old_style_target(target) lightning.fire() - visible_message("\The [src] strikes \the [target] with lightning!") - playsound(src, 'sound/weapons/gauss_shoot.ogg', 75, 1) \ No newline at end of file + visible_message(span_danger("\The [src] strikes \the [target] with lightning!")) + playsound(src, 'sound/weapons/gauss_shoot.ogg', 75, 1) diff --git a/code/game/gamemodes/technomancer/instability.dm b/code/game/gamemodes/technomancer/instability.dm index c41c2ea8dc..73018f16a3 100644 --- a/code/game/gamemodes/technomancer/instability.dm +++ b/code/game/gamemodes/technomancer/instability.dm @@ -109,7 +109,7 @@ sparks.set_up(5, 0, src) sparks.attach(loc) sparks.start() - visible_message("Electrical sparks manifest from nowhere around \the [src]!") + visible_message(span_warning("Electrical sparks manifest from nowhere around \the [src]!")) qdel(sparks) if(1) return @@ -121,13 +121,13 @@ electrocute_act(instability * 0.3, "unstable energies", 0.75) if(1) adjustFireLoss(instability * 0.15) //7.5 burn @ 50 instability - to_chat(src, "Your chassis alerts you to overheating from an unknown external force!") + to_chat(src, span_danger("Your chassis alerts you to overheating from an unknown external force!")) if(2) adjustBruteLoss(instability * 0.15) //7.5 brute @ 50 instability - to_chat(src, "Your chassis makes the sound of metal groaning!") + to_chat(src, span_danger("Your chassis makes the sound of metal groaning!")) if(3) safe_blink(src, range = 6) - to_chat(src, "You're teleported against your will!") + to_chat(src, span_warning("You're teleported against your will!")) if(4) emp_act(3) @@ -140,10 +140,10 @@ emp_act(2) if(2) adjustFireLoss(instability * 0.3) //30 burn @ 100 instability - to_chat(src, "Your chassis alerts you to extreme overheating from an unknown external force!") + to_chat(src, span_danger("Your chassis alerts you to extreme overheating from an unknown external force!")) if(3) adjustBruteLoss(instability * 0.3) //30 brute @ 100 instability - to_chat(src, "Your chassis makes the sound of metal groaning and tearing!") + to_chat(src, span_danger("Your chassis makes the sound of metal groaning and tearing!")) if(101 to 200) //Lethal rng = rand(0,4) @@ -154,10 +154,10 @@ emp_act(1) if(2) adjustFireLoss(instability * 0.4) //40 burn @ 100 instability - to_chat(src, "Your chassis alerts you to extreme overheating from an unknown external force!") + to_chat(src, span_danger("Your chassis alerts you to extreme overheating from an unknown external force!")) if(3) adjustBruteLoss(instability * 0.4) //40 brute @ 100 instability - to_chat(src, "Your chassis makes the sound of metal groaning and tearing!") + to_chat(src, span_danger("Your chassis makes the sound of metal groaning and tearing!")) /mob/living/carbon/human/instability_effects() if(instability) @@ -174,7 +174,7 @@ sparks.set_up(5, 0, src) sparks.attach(loc) sparks.start() - visible_message("Electrical sparks manifest from nowhere around \the [src]!") + visible_message(span_warning("Electrical sparks manifest from nowhere around \the [src]!")) qdel(sparks) if(1) return @@ -189,23 +189,23 @@ if(2) if(can_feel_pain()) apply_effect(instability * 0.3, AGONY) - to_chat(src, "You feel a sharp pain!") + to_chat(src, span_danger("You feel a sharp pain!")) if(3) apply_effect(instability * 0.3, EYE_BLUR) - to_chat(src, "Your eyes start to get cloudy!") + to_chat(src, span_danger("Your eyes start to get cloudy!")) if(4) electrocute_act(instability * 0.3, "unstable energies") if(5) adjustFireLoss(instability * 0.15) //7.5 burn @ 50 instability - to_chat(src, "You feel your skin burn!") + to_chat(src, span_danger("You feel your skin burn!")) if(6) adjustBruteLoss(instability * 0.15) //7.5 brute @ 50 instability - to_chat(src, "You feel a sharp pain as an unseen force harms your body!") + to_chat(src, span_danger("You feel a sharp pain as an unseen force harms your body!")) if(7) adjustToxLoss(instability * 0.15) //7.5 tox @ 50 instability if(8) safe_blink(src, range = 6) - to_chat(src, "You're teleported against your will!") + to_chat(src, span_warning("You're teleported against your will!")) if(50 to 100) //Severe rng = rand(0,8) @@ -217,18 +217,18 @@ if(2) if(can_feel_pain()) apply_effect(instability * 0.7, AGONY) - to_chat(src, "You feel an extremly angonizing pain from all over your body!") + to_chat(src, span_danger("You feel an extremly angonizing pain from all over your body!")) if(3) apply_effect(instability * 0.5, EYE_BLUR) - to_chat(src, "Your eyes start to get cloudy!") + to_chat(src, span_danger("Your eyes start to get cloudy!")) if(4) electrocute_act(instability * 0.5, "extremely unstable energies") if(5) fire_act() - to_chat(src, "You spontaneously combust!") + to_chat(src, span_danger("You spontaneously combust!")) if(6) adjustCloneLoss(instability * 0.05) //5 cloneloss @ 100 instability - to_chat(src, "You feel your body slowly degenerate.") + to_chat(src, span_danger("You feel your body slowly degenerate.")) if(7) adjustToxLoss(instability * 0.25) //25 tox @ 100 instability @@ -238,24 +238,24 @@ if(0) apply_effect(instability, IRRADIATE) if(1) - visible_message("\The [src] suddenly collapses!", - "You suddenly feel very light-headed, and faint!") + visible_message(span_warning("\The [src] suddenly collapses!"), + span_danger("You suddenly feel very light-headed, and faint!")) Paralyse(instability * 0.1) if(2) if(can_feel_pain()) apply_effect(instability, AGONY) - to_chat(src, "You feel an extremly angonizing pain from all over your body!") + to_chat(src, span_danger("You feel an extremly angonizing pain from all over your body!")) if(3) apply_effect(instability, EYE_BLUR) - to_chat(src, "Your eyes start to get cloudy!") + to_chat(src, span_danger("Your eyes start to get cloudy!")) if(4) electrocute_act(instability, "extremely unstable energies") if(5) fire_act() - to_chat(src, "You spontaneously combust!") + to_chat(src, span_danger("You spontaneously combust!")) if(6) adjustCloneLoss(instability * 0.10) //5 cloneloss @ 100 instability - to_chat(src, "You feel your body slowly degenerate.") + to_chat(src, span_danger("You feel your body slowly degenerate.")) if(7) adjustToxLoss(instability * 0.40) //40 tox @ 100 instability @@ -282,9 +282,9 @@ amount = amount * armor_factor if(amount && prob(10)) if(isSynthetic()) - to_chat(src, "Warning: Anomalous field detected.") + to_chat(src, span_cult("Warning: Anomalous field detected.")) else - to_chat(src, "The purple glow makes you feel strange...") + to_chat(src, span_cult("The purple glow makes you feel strange...")) adjust_instability(amount) #undef TECHNOMANCER_INSTABILITY_DECAY diff --git a/code/game/gamemodes/technomancer/spell_objs.dm b/code/game/gamemodes/technomancer/spell_objs.dm index 164fd7b3af..27e8f16843 100644 --- a/code/game/gamemodes/technomancer/spell_objs.dm +++ b/code/game/gamemodes/technomancer/spell_objs.dm @@ -117,7 +117,7 @@ if(owner) core = owner.get_technomancer_core() if(!core) - to_chat(owner, "You need a Core to do that.") + to_chat(owner, span_warning("You need a Core to do that.")) qdel(src) return // if(istype(/obj/item/technomancer_core, owner.back)) @@ -160,13 +160,13 @@ if(!core) core = locate(/obj/item/technomancer_core) in owner if(!core) - to_chat(owner, "You need to be wearing a core on your back!") + to_chat(owner, span_danger("You need to be wearing a core on your back!")) return 0 if(core.loc != owner || owner.back != core) //Make sure the core's being worn. - to_chat(owner, "You need to be wearing a core on your back!") + to_chat(owner, span_danger("You need to be wearing a core on your back!")) return 0 if(!technomancers.is_antagonist(owner.mind) && !core.universal) //Now make sure the person using this is the actual antag. //VOREStation Edit - Universal cores - to_chat(owner, "You can't seem to figure out how to make the machine work properly.") + to_chat(owner, span_danger("You can't seem to figure out how to make the machine work properly.")) return 0 return 1 @@ -269,7 +269,7 @@ if(l_spell.aspect == ASPECT_CHROMATIC) //Check the other hand too. l_spell.on_combine_cast(S, src) else //Welp - to_chat(src, "You require a free hand to use this function.") + to_chat(src, span_warning("You require a free hand to use this function.")) return 0 if(S.run_checks()) @@ -298,4 +298,4 @@ // If we miss or hit an obstacle, we still want to delete the spell. spawn(20) if(src) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/game/gamemodes/technomancer/spells/abjuration.dm b/code/game/gamemodes/technomancer/spells/abjuration.dm index bcaa91f5da..1dfa580945 100644 --- a/code/game/gamemodes/technomancer/spells/abjuration.dm +++ b/code/game/gamemodes/technomancer/spells/abjuration.dm @@ -23,18 +23,18 @@ SM = L if(L.summoned || (SM && SM.supernatural) ) if(L.client) // Player-controlled mobs are immune to being killed by this. - to_chat(user, "\The [L] resists your attempt to banish it!") - to_chat(L, "\The [user] tried to teleport you far away, but failed.") + to_chat(user, span_warning("\The [L] resists your attempt to banish it!")) + to_chat(L, span_warning("\The [user] tried to teleport you far away, but failed.")) return 0 else visible_message("\The [L] vanishes!") qdel(L) else if(istype(L, /mob/living/simple_mob/construct)) var/mob/living/simple_mob/construct/evil = L - to_chat(evil, "\The [user]'s abjuration purges your form!") + to_chat(evil, span_danger("\The [user]'s abjuration purges your form!")) evil.purge = 3 adjust_instability(5) // In case NarNar comes back someday. if(istype(hit_atom, /obj/singularity/narsie)) - to_chat(user, "One does not simply abjurate Nar'sie away.") - adjust_instability(200) \ No newline at end of file + to_chat(user, span_danger("One does not simply abjurate Nar'sie away.")) + adjust_instability(200) diff --git a/code/game/gamemodes/technomancer/spells/apportation.dm b/code/game/gamemodes/technomancer/spells/apportation.dm index e8a160c4d0..db6cc87eb5 100644 --- a/code/game/gamemodes/technomancer/spells/apportation.dm +++ b/code/game/gamemodes/technomancer/spells/apportation.dm @@ -21,11 +21,11 @@ if(!AM.loc) //Don't teleport HUD telements to us. return if(AM.anchored) - to_chat(user, "\The [hit_atom] is firmly secured and anchored, you can't move it!") + to_chat(user, span_warning("\The [hit_atom] is firmly secured and anchored, you can't move it!")) return if(!within_range(hit_atom) && !check_for_scepter()) - to_chat(user, "\The [hit_atom] is too far away.") + to_chat(user, span_warning("\The [hit_atom] is too far away.")) return //Teleporting an item. @@ -38,18 +38,18 @@ s2.set_up(2, 1, I) s1.start() s2.start() - I.visible_message("\The [I] vanishes into thin air!") + I.visible_message(span_danger("\The [I] vanishes into thin air!")) I.forceMove(get_turf(user)) user.drop_item(src) src.loc = null user.put_in_hands(I) - user.visible_message("\A [I] appears in \the [user]'s hand!") + user.visible_message(span_notice("\A [I] appears in \the [user]'s hand!")) add_attack_logs(user,I,"Stolen with [src]") qdel(src) //Now let's try to teleport a living mob. else if(istype(hit_atom, /mob/living)) var/mob/living/L = hit_atom - to_chat(L, "You are teleported towards \the [user].") + to_chat(L, span_danger("You are teleported towards \the [user].")) var/datum/effect/effect/system/spark_spread/s1 = new /datum/effect/effect/system/spark_spread var/datum/effect/effect/system/spark_spread/s2 = new /datum/effect/effect/system/spark_spread s1.set_up(2, 1, user) @@ -62,12 +62,12 @@ spawn(1 SECOND) if(!user.Adjacent(L)) - to_chat(user, "\The [L] is out of your reach.") + to_chat(user, span_warning("\The [L] is out of your reach.")) qdel(src) return L.Weaken(3) - user.visible_message("\The [user] seizes [L]!") + user.visible_message(span_warning("\The [user] seizes [L]!")) var/obj/item/grab/G = new(user,L) @@ -77,4 +77,3 @@ G.icon_state = "grabbed1" G.synch() qdel(src) - diff --git a/code/game/gamemodes/technomancer/spells/aspect_aura.dm b/code/game/gamemodes/technomancer/spells/aspect_aura.dm index 2046accd98..a20849e517 100644 --- a/code/game/gamemodes/technomancer/spells/aspect_aura.dm +++ b/code/game/gamemodes/technomancer/spells/aspect_aura.dm @@ -19,7 +19,7 @@ if(istype(W, /obj/item/spell)) var/obj/item/spell/spell = W if(!spell.aspect || spell.aspect == ASPECT_CHROMATIC) - to_chat(user, "You cannot combine \the [spell] with \the [src], as the aspects are incompatible.") + to_chat(user, span_warning("You cannot combine \the [spell] with \the [src], as the aspects are incompatible.")) return user.drop_item(src) src.loc = null diff --git a/code/game/gamemodes/technomancer/spells/aura/shock_aura.dm b/code/game/gamemodes/technomancer/spells/aura/shock_aura.dm index 4b958442bd..502116acf8 100644 --- a/code/game/gamemodes/technomancer/spells/aura/shock_aura.dm +++ b/code/game/gamemodes/technomancer/spells/aura/shock_aura.dm @@ -30,7 +30,7 @@ continue if(L.isSynthetic()) - to_chat(L, "ERROR: Electrical fault detected!") + to_chat(L, span_danger("ERROR: Electrical fault detected!")) L.stuttering += 3 if(ishuman(L)) diff --git a/code/game/gamemodes/technomancer/spells/aura/unstable_aura.dm b/code/game/gamemodes/technomancer/spells/aura/unstable_aura.dm index 1414e56213..d665f9c586 100644 --- a/code/game/gamemodes/technomancer/spells/aura/unstable_aura.dm +++ b/code/game/gamemodes/technomancer/spells/aura/unstable_aura.dm @@ -35,11 +35,11 @@ if(L.isSynthetic()) L.adjustBruteLoss(damage_to_inflict) if(damage_to_inflict && prob(10)) - to_chat(L, "Your chassis seems to slowly be decaying and breaking down.") + to_chat(L, span_danger("Your chassis seems to slowly be decaying and breaking down.")) else L.adjustToxLoss(damage_to_inflict) if(damage_to_inflict && prob(10)) - to_chat(L, "You feel almost like you're melting from the inside!") + to_chat(L, span_danger("You feel almost like you're melting from the inside!")) - adjust_instability(2) \ No newline at end of file + adjust_instability(2) diff --git a/code/game/gamemodes/technomancer/spells/blink.dm b/code/game/gamemodes/technomancer/spells/blink.dm index 84961b0421..6025ecab4f 100644 --- a/code/game/gamemodes/technomancer/spells/blink.dm +++ b/code/game/gamemodes/technomancer/spells/blink.dm @@ -48,7 +48,7 @@ L.buckled.unbuckle_mob() AM.forceMove(destination) AM.visible_message("\The [AM] vanishes!") - to_chat(AM, "You suddenly appear somewhere else!") + to_chat(AM, span_notice("You suddenly appear somewhere else!")) new /obj/effect/effect/sparks(destination) new /obj/effect/effect/sparks(starting) return @@ -57,10 +57,10 @@ if(istype(hit_atom, /atom/movable)) var/atom/movable/AM = hit_atom if(!within_range(AM)) - to_chat(user, "\The [AM] is too far away to blink.") + to_chat(user, span_warning("\The [AM] is too far away to blink.")) return if(!allowed_to_teleport()) - to_chat(user, "Teleportation doesn't seem to work here.") + to_chat(user, span_warning("Teleportation doesn't seem to work here.")) return if(pay_energy(400)) if(check_for_scepter()) @@ -70,11 +70,11 @@ adjust_instability(3) add_attack_logs(user,AM,"Blinked") else - to_chat(user, "You need more energy to blink [AM] away!") + to_chat(user, span_warning("You need more energy to blink [AM] away!")) /obj/item/spell/blink/on_use_cast(mob/user) if(!allowed_to_teleport()) - to_chat(user, "Teleportation doesn't seem to work here.") + to_chat(user, span_warning("Teleportation doesn't seem to work here.")) return if(pay_energy(200)) if(check_for_scepter()) @@ -84,16 +84,16 @@ adjust_instability(1) add_attack_logs(user,user,"Blinked") else - to_chat(user, "You need more energy to blink yourself away!") + to_chat(user, span_warning("You need more energy to blink yourself away!")) /obj/item/spell/blink/on_melee_cast(atom/hit_atom, mob/living/user, def_zone) if(istype(hit_atom, /atom/movable)) var/atom/movable/AM = hit_atom if(!allowed_to_teleport()) - to_chat(user, "Teleportation doesn't seem to work here.") + to_chat(user, span_warning("Teleportation doesn't seem to work here.")) return if(pay_energy(300)) - visible_message("\The [user] reaches out towards \the [AM] with a glowing hand.") + visible_message(span_danger("\The [user] reaches out towards \the [AM] with a glowing hand.")) if(check_for_scepter()) safe_blink(AM, 10) else @@ -101,4 +101,4 @@ adjust_instability(2) add_attack_logs(user,AM,"Blinked") else - to_chat(user, "You need more energy to blink [AM] away!") \ No newline at end of file + to_chat(user, span_warning("You need more energy to blink [AM] away!")) diff --git a/code/game/gamemodes/technomancer/spells/chroma.dm b/code/game/gamemodes/technomancer/spells/chroma.dm index be2e87b946..9e51ef4e1e 100644 --- a/code/game/gamemodes/technomancer/spells/chroma.dm +++ b/code/game/gamemodes/technomancer/spells/chroma.dm @@ -32,7 +32,7 @@ var/turf/T = get_turf(hit_atom) if(T) new /obj/effect/temporary_effect/chroma(T, color_to_use) - to_chat(user, "You shift the light onto \the [T].") + to_chat(user, span_notice("You shift the light onto \the [T].")) qdel(src) /obj/item/spell/chroma/on_use_cast(mob/user) diff --git a/code/game/gamemodes/technomancer/spells/control.dm b/code/game/gamemodes/technomancer/spells/control.dm index 7288de4045..515881a7c6 100644 --- a/code/game/gamemodes/technomancer/spells/control.dm +++ b/code/game/gamemodes/technomancer/spells/control.dm @@ -92,7 +92,7 @@ if(choice == "Yes") for(var/mob/living/L in controlled_mobs) deselect(L) - to_chat(user, "You've released control of all entities you had in control.") + to_chat(user, span_notice("You've released control of all entities you had in control.")) /obj/item/spell/control/on_ranged_cast(atom/hit_atom, mob/living/user) @@ -106,21 +106,21 @@ if(L.mob_class & allowed_mob_classes) if(!(L in controlled_mobs)) //Selecting if(L.client) - to_chat(user, "\The [L] seems to resist you!") + to_chat(user, span_danger("\The [L] seems to resist you!")) return 0 if(!L.has_AI()) to_chat(user, span_warning("\The [L] seems too dim for this to work on them.")) return FALSE if(pay_energy(500)) select(L) - to_chat(user, "\The [L] is now under your (limited) control.") + to_chat(user, span_notice("\The [L] is now under your (limited) control.")) else //Deselect them deselect(L) - to_chat(user, "You free \the [L] from your grasp.") + to_chat(user, span_notice("You free \the [L] from your grasp.")) else //Let's attack if(!controlled_mobs.len) - to_chat(user, "You have no entities under your control to command.") + to_chat(user, span_warning("You have no entities under your control to command.")) return 0 if(pay_energy(25 * controlled_mobs.len)) attack_all(L) @@ -134,7 +134,7 @@ else if(isturf(hit_atom)) var/turf/T = hit_atom if(!controlled_mobs.len) - to_chat(user, "You have no entities under your control to command.") + to_chat(user, span_warning("You have no entities under your control to command.")) return 0 if(pay_energy(10 * controlled_mobs.len)) move_all(T) diff --git a/code/game/gamemodes/technomancer/spells/energy_siphon.dm b/code/game/gamemodes/technomancer/spells/energy_siphon.dm index 27d69f3a2c..79d28ec0d1 100644 --- a/code/game/gamemodes/technomancer/spells/energy_siphon.dm +++ b/code/game/gamemodes/technomancer/spells/energy_siphon.dm @@ -33,15 +33,15 @@ if(!siphoning) return if(!pay_energy(100)) - to_chat(owner, "You can't afford to maintain the siphon link!") + to_chat(owner, span_warning("You can't afford to maintain the siphon link!")) stop_siphoning() return if(get_dist(siphoning, get_turf(src)) > 4) - to_chat(owner, "\The [siphoning] is too far to drain from!") + to_chat(owner, span_warning("\The [siphoning] is too far to drain from!")) stop_siphoning() return if(!(siphoning in view(owner))) - to_chat(owner, "\The [siphoning] cannot be seen!") + to_chat(owner, span_warning("\The [siphoning] cannot be seen!")) stop_siphoning() return siphon(siphoning, owner) @@ -53,7 +53,7 @@ var/atom/movable/AM = hit_atom populate_siphon_list(AM) if(!things_to_siphon.len) - to_chat(user, "You cannot steal energy from \a [AM].") + to_chat(user, span_warning("You cannot steal energy from \a [AM].")) return 0 siphoning = AM update_icon() @@ -137,18 +137,18 @@ // Now we can actually fill up the core. if(core.energy < core.max_energy) give_energy(charge_to_give) - to_chat(user, "Stolen [charge_to_give * CELLRATE] kJ and converted to [charge_to_give] Core energy.") + to_chat(user, span_notice("Stolen [charge_to_give * CELLRATE] kJ and converted to [charge_to_give] Core energy.")) if( (core.max_energy - core.energy) < charge_to_give ) // We have some overflow, if this is true. if(user.isSynthetic()) // Let's do something with it, if we're a robot. charge_to_give = charge_to_give - (core.max_energy - core.energy) user.adjust_nutrition(charge_to_give / SIPHON_FBP_TO_ENERGY) - to_chat(user, "Redirected energy to internal microcell.") + to_chat(user, span_notice("Redirected energy to internal microcell.")) else - to_chat(user, "Stolen [charge_to_give * CELLRATE] kJ.") + to_chat(user, span_notice("Stolen [charge_to_give * CELLRATE] kJ.")) adjust_instability(2) if(flow_remaining == flow_rate) // We didn't drain anything. - to_chat(user, "\The [siphoning] cannot be drained any further.") + to_chat(user, span_warning("\The [siphoning] cannot be drained any further.")) stop_siphoning() /obj/item/spell/energy_siphon/update_icon() @@ -202,4 +202,4 @@ #undef SIPHON_CELL_TO_ENERGY #undef SIPHON_FBP_TO_ENERGY -#undef SIPHON_CORE_TO_ENERGY \ No newline at end of file +#undef SIPHON_CORE_TO_ENERGY diff --git a/code/game/gamemodes/technomancer/spells/flame_tongue.dm b/code/game/gamemodes/technomancer/spells/flame_tongue.dm index 7a3fdba69b..68f341d106 100644 --- a/code/game/gamemodes/technomancer/spells/flame_tongue.dm +++ b/code/game/gamemodes/technomancer/spells/flame_tongue.dm @@ -17,7 +17,7 @@ /obj/item/spell/flame_tongue/New() ..() set_light(3, 2, l_color = "#FF6A00") - visible_message("\The [loc]'s hand begins to emit a flame.") + visible_message(span_warning("\The [loc]'s hand begins to emit a flame.")) welder = new /obj/item/weldingtool/spell(src) welder.setWelding(1) @@ -43,8 +43,8 @@ if(isliving(hit_atom) && user.a_intent != I_HELP) var/mob/living/L = hit_atom if(pay_energy(1000)) - visible_message("\The [user] reaches out towards \the [L] with the flaming hand, and they ignite!") - to_chat(L, "You ignite!") + visible_message(span_danger("\The [user] reaches out towards \the [L] with the flaming hand, and they ignite!")) + to_chat(L, span_danger("You ignite!")) L.fire_act() add_attack_logs(user,L,"Ignited with [src]") adjust_instability(12) diff --git a/code/game/gamemodes/technomancer/spells/gambit.dm b/code/game/gamemodes/technomancer/spells/gambit.dm index cde2e9e28b..62c7f9620f 100644 --- a/code/game/gamemodes/technomancer/spells/gambit.dm +++ b/code/game/gamemodes/technomancer/spells/gambit.dm @@ -49,7 +49,7 @@ var/rare_spell_chance = between(0, calculate_spell_power(100) - 100, 100) // Having 120% spellpower means a 20% chance to get to roll for rare spells. if(prob(rare_spell_chance)) potential_spells += rare_spells.Copy() - to_chat(owner, "You feel a bit luckier...") + to_chat(owner, span_notice("You feel a bit luckier...")) return pick(potential_spells) // Gives a "random" spell. @@ -59,7 +59,7 @@ var/give_rare_spells = FALSE if(prob(rare_spell_chance)) give_rare_spells = TRUE - to_chat(owner, "You feel a bit luckier...") + to_chat(owner, span_notice("You feel a bit luckier...")) // First the spell will concern itself with the health of the technomancer. if(prob(owner.getBruteLoss() + owner.getBruteLoss() * 2)) // Having 20 brute means a 40% chance of being added to the pool. @@ -131,4 +131,4 @@ if(!potential_spells.len) potential_spells = all_technomancer_gambit_spells.Copy() - return pick(potential_spells) \ No newline at end of file + return pick(potential_spells) diff --git a/code/game/gamemodes/technomancer/spells/illusion.dm b/code/game/gamemodes/technomancer/spells/illusion.dm index 32b1a474d2..a537c6bc58 100644 --- a/code/game/gamemodes/technomancer/spells/illusion.dm +++ b/code/game/gamemodes/technomancer/spells/illusion.dm @@ -22,7 +22,7 @@ if(pay_energy(100)) copied = AM update_icon() - to_chat(user, "You've copied \the [AM]'s appearance.") + to_chat(user, span_notice("You've copied \the [AM]'s appearance.")) user << 'sound/weapons/flash.ogg' return 1 else if(istype(hit_atom, /turf)) @@ -34,7 +34,7 @@ illusion = new(T) illusion.copy_appearance(copied) illusion.copy_overlays(copied, TRUE) - to_chat(user, "An illusion of \the [copied] is made on \the [T].") + to_chat(user, span_notice("An illusion of \the [copied] is made on \the [T].")) user << 'sound/effects/pop.ogg' return 1 else diff --git a/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm b/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm index 8cf9ff6a6d..af8b22ecb8 100644 --- a/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm +++ b/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm @@ -24,7 +24,7 @@ if(H.isSynthetic() || H.does_not_breathe) // It's hard to choke a robot or something that doesn't breathe. on_expire() return - to_chat(H, "You are having difficulty breathing!") + to_chat(H, span_warning("You are having difficulty breathing!")) var/pulses = 3 var/warned_victim = 0 while(pulses) @@ -68,7 +68,7 @@ //to_world("Predicted hardcrit.") return 1 else if(predicted_damage >= victim.species.total_health / 2) // Or perhaps we're gonna go into 'oxy crit'. - to_chat(victim, "You feel really light-headed, and everything seems to be fading...") + to_chat(victim, span_danger("You feel really light-headed, and everything seems to be fading...")) //to_world("Predicted oxycrit.") return 1 //If we're at this point, the spell is not going to result in critting. diff --git a/code/game/gamemodes/technomancer/spells/insert/insert.dm b/code/game/gamemodes/technomancer/spells/insert/insert.dm index 92103f76cb..d882d624b2 100644 --- a/code/game/gamemodes/technomancer/spells/insert/insert.dm +++ b/code/game/gamemodes/technomancer/spells/insert/insert.dm @@ -41,7 +41,7 @@ if(!allow_stacking) for(var/obj/item/inserted_spell/IS in L.contents) if(IS.type == inserting) - to_chat(user, "\The [L] is already affected by \the [src].") + to_chat(user, span_warning("\The [L] is already affected by \the [src].")) return var/obj/item/inserted_spell/inserted = new inserting(L,user,src) inserted.spell_power_at_creation = calculate_spell_power(1.0) @@ -56,4 +56,4 @@ /obj/item/spell/insert/on_ranged_cast(atom/hit_atom, mob/user) if(istype(hit_atom, /mob/living)) var/mob/living/L = hit_atom - insert(L,user) \ No newline at end of file + insert(L,user) diff --git a/code/game/gamemodes/technomancer/spells/mark_recall.dm b/code/game/gamemodes/technomancer/spells/mark_recall.dm index 613978761d..133ceac4d0 100644 --- a/code/game/gamemodes/technomancer/spells/mark_recall.dm +++ b/code/game/gamemodes/technomancer/spells/mark_recall.dm @@ -42,7 +42,7 @@ GLOBAL_LIST_INIT(mark_spells, list()) /obj/item/spell/mark/on_use_cast(var/mob/living/user) if(!allowed_to_teleport()) // Otherwise you could teleport back to the admin Z-level. - to_chat(user, "You can't teleport here!") + to_chat(user, span_warning("You can't teleport here!")) return 0 if(pay_energy(1000)) //VOREStation Add - Multiple technomancer support @@ -50,16 +50,16 @@ GLOBAL_LIST_INIT(mark_spells, list()) //They have one in the list if(istype(marker)) qdel(marker) - to_chat(user, "Your mark is moved from its old position to \the [get_turf(user)] under you.") + to_chat(user, span_notice("Your mark is moved from its old position to \the [get_turf(user)] under you.")) //They don't have one yet else - to_chat(user, "You mark \the [get_turf(user)] under you.") + to_chat(user, span_notice("You mark \the [get_turf(user)] under you.")) GLOB.mark_spells[WEAKREF(user)] = new /datum/technomancer_marker(user) //VOREStation Add End adjust_instability(5) return 1 else - to_chat(user, "You can't afford the energy cost!") + to_chat(user, span_warning("You can't afford the energy cost!")) return 0 //Recall @@ -85,21 +85,21 @@ GLOBAL_LIST_INIT(mark_spells, list()) if(pay_energy(3000)) var/datum/technomancer_marker/marker = GLOB.mark_spells[WEAKREF(user)] //VOREStation Add - Multiple technomancer support if(!istype(marker)) - to_chat(user, "There's no Mark!") + to_chat(user, span_danger("There's no Mark!")) return 0 else if(!allowed_to_teleport()) - to_chat(user, "Teleportation doesn't seem to work here.") + to_chat(user, span_warning("Teleportation doesn't seem to work here.")) return - visible_message("\The [user] starts glowing!") + visible_message(span_warning("\The [user] starts glowing!")) var/light_intensity = 2 var/time_left = 3 if(check_for_scepter()) time_left = 2 while(time_left) if(user.incapacitated()) - visible_message("\The [user]'s glow fades.") - to_chat(user, "You cannot Recall while incapacitated!") + visible_message(span_notice("\The [user]'s glow fades.")) + to_chat(user, span_danger("You cannot Recall while incapacitated!")) return 0 light_intensity++ set_light(light_intensity, light_intensity, l_color = "#006AFF") @@ -112,10 +112,10 @@ GLOBAL_LIST_INIT(mark_spells, list()) for(var/obj/item/grab/G in user.contents) // People the Technomancer is grabbing come along for the ride. if(G.affecting) G.affecting.forceMove(locate( target_turf.x+rand(-1,1), target_turf.y+rand(-1,1), target_turf.z)) - to_chat(G.affecting, "You are teleported along with [user]!") + to_chat(G.affecting, span_warning("You are teleported along with [user]!")) user.forceMove(target_turf) - to_chat(user, "You are teleported to your Mark.") + to_chat(user, span_notice("You are teleported to your Mark.")) playsound(target_turf, 'sound/effects/phasein.ogg', 25, 1) playsound(target_turf, 'sound/effects/sparks2.ogg', 50, 1) @@ -126,5 +126,5 @@ GLOBAL_LIST_INIT(mark_spells, list()) qdel(src) return 1 else - to_chat(user, "You can't afford the energy cost!") + to_chat(user, span_warning("You can't afford the energy cost!")) return 0 diff --git a/code/game/gamemodes/technomancer/spells/modifier/corona.dm b/code/game/gamemodes/technomancer/spells/modifier/corona.dm index f53aa5094b..53b9f052a8 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/corona.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/corona.dm @@ -24,10 +24,10 @@ desc = "You appear to be glowing really bright. It doesn't seem to hurt, however hiding will be impossible." mob_overlay_state = "corona" - on_created_text = "You start to glow very brightly!" - on_expired_text = "Your glow has ended." + on_created_text = span_warning("You start to glow very brightly!") + on_expired_text = span_notice("Your glow has ended.") evasion = -30 stacks = MODIFIER_STACK_EXTEND /datum/modifier/technomancer/corona/tick() - holder.break_cloak() \ No newline at end of file + holder.break_cloak() diff --git a/code/game/gamemodes/technomancer/spells/modifier/haste.dm b/code/game/gamemodes/technomancer/spells/modifier/haste.dm index 10d4c341a5..ffe447b248 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/haste.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/haste.dm @@ -22,7 +22,7 @@ desc = "Moving is almost effortless!" mob_overlay_state = "haste" - on_created_text = "You suddenly find it much easier to move." - on_expired_text = "You feel slow again." + on_created_text = span_notice("You suddenly find it much easier to move.") + on_expired_text = span_warning("You feel slow again.") haste = TRUE - stacks = MODIFIER_STACK_EXTEND \ No newline at end of file + stacks = MODIFIER_STACK_EXTEND diff --git a/code/game/gamemodes/technomancer/spells/modifier/mend_all.dm b/code/game/gamemodes/technomancer/spells/modifier/mend_all.dm index fbac295926..54448c8f9f 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/mend_all.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/mend_all.dm @@ -15,8 +15,8 @@ desc = "You feel serene and well rested." mob_overlay_state = "green_sparkles" - on_created_text = "Sparkles begin to appear around you, and all your ills seem to fade away." - on_expired_text = "The sparkles have faded, although you feel much healthier than before." + on_created_text = span_warning("Sparkles begin to appear around you, and all your ills seem to fade away.") + on_expired_text = span_notice("The sparkles have faded, although you feel much healthier than before.") stacks = MODIFIER_STACK_EXTEND /datum/modifier/technomancer/mend_all/tick() @@ -32,4 +32,4 @@ if(origin) var/mob/living/L = origin.resolve() if(istype(L)) - L.adjust_instability(1) \ No newline at end of file + L.adjust_instability(1) diff --git a/code/game/gamemodes/technomancer/spells/modifier/mend_life.dm b/code/game/gamemodes/technomancer/spells/modifier/mend_life.dm index 95c7eeb1b5..d7ac905119 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/mend_life.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/mend_life.dm @@ -24,8 +24,8 @@ desc = "You feel rather refreshed." mob_overlay_state = "green_sparkles" - on_created_text = "Sparkles begin to appear around you, and you feel really.. refreshed." - on_expired_text = "The sparkles have faded, although you feel healthier than before." + on_created_text = span_warning("Sparkles begin to appear around you, and you feel really.. refreshed.") + on_expired_text = span_notice("The sparkles have faded, although you feel healthier than before.") stacks = MODIFIER_STACK_EXTEND /datum/modifier/technomancer/mend_life/tick() diff --git a/code/game/gamemodes/technomancer/spells/modifier/mend_synthetic.dm b/code/game/gamemodes/technomancer/spells/modifier/mend_synthetic.dm index a91d5ff372..31400288c7 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/mend_synthetic.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/mend_synthetic.dm @@ -24,8 +24,8 @@ desc = "Something seems to be repairing you." mob_overlay_state = "cyan_sparkles" - on_created_text = "Sparkles begin to appear around you, and your systems report integrity rising." - on_expired_text = "The sparkles have faded, although your systems seem to be better than before." + on_created_text = span_warning("Sparkles begin to appear around you, and your systems report integrity rising.") + on_expired_text = span_notice("The sparkles have faded, although your systems seem to be better than before.") stacks = MODIFIER_STACK_EXTEND /datum/modifier/technomancer/mend_synthetic/tick() diff --git a/code/game/gamemodes/technomancer/spells/modifier/purify.dm b/code/game/gamemodes/technomancer/spells/modifier/purify.dm index 38cfe4dca7..d1bf7dd118 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/purify.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/purify.dm @@ -24,8 +24,8 @@ desc = "You feel rather clean and pure." mob_overlay_state = "green_sparkles" - on_created_text = "Sparkles begin to appear around you, and you feel really.. pure." - on_expired_text = "The sparkles have faded, although you feel healthier than before." + on_created_text = span_warning("Sparkles begin to appear around you, and you feel really.. pure.") + on_expired_text = span_notice("The sparkles have faded, although you feel healthier than before.") stacks = MODIFIER_STACK_EXTEND /datum/modifier/technomancer/purify/tick() diff --git a/code/game/gamemodes/technomancer/spells/modifier/repel_missiles.dm b/code/game/gamemodes/technomancer/spells/modifier/repel_missiles.dm index c86a52e663..8b632e64fe 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/repel_missiles.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/repel_missiles.dm @@ -22,7 +22,7 @@ desc = "A repulsion field can always be useful to have." mob_overlay_state = "repel_missiles" - on_created_text = "You have a repulsion field around you, which will attempt to deflect projectiles." - on_expired_text = "Your repulsion field has expired." + on_created_text = span_notice("You have a repulsion field around you, which will attempt to deflect projectiles.") + on_expired_text = span_warning("Your repulsion field has expired.") evasion = 45 - stacks = MODIFIER_STACK_EXTEND \ No newline at end of file + stacks = MODIFIER_STACK_EXTEND diff --git a/code/game/gamemodes/technomancer/spells/passwall.dm b/code/game/gamemodes/technomancer/spells/passwall.dm index f7266b7719..f64b38d8ec 100644 --- a/code/game/gamemodes/technomancer/spells/passwall.dm +++ b/code/game/gamemodes/technomancer/spells/passwall.dm @@ -20,7 +20,7 @@ if(busy) //Prevent someone from trying to get two uses of the spell from one instance. return 0 if(!allowed_to_teleport()) - to_chat(user, "You can't teleport here!") + to_chat(user, span_warning("You can't teleport here!")) return 0 // if(isturf(hit_atom)) @@ -28,7 +28,7 @@ var/turf/our_turf = get_turf(user) //Where we are. if(!T.density) if(!T.check_density()) - to_chat(user, "Perhaps you should try using passWALL on a wall, or other solid object.") + to_chat(user, span_warning("Perhaps you should try using passWALL on a wall, or other solid object.")) return 0 var/direction = get_dir(our_turf, T) var/total_cost = 0 @@ -36,7 +36,7 @@ var/turf/found_turf = null //Our destination, if one is found. var/i = maximum_distance - visible_message("[user] rests a hand on \the [hit_atom].") + visible_message(span_info("[user] rests a hand on \the [hit_atom].")) busy = 1 var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() @@ -62,18 +62,18 @@ if(found_turf) if(user.loc != our_turf) - to_chat(user, "You need to stand still in order to phase through \the [hit_atom].") + to_chat(user, span_warning("You need to stand still in order to phase through \the [hit_atom].")) return 0 if(pay_energy(total_cost) && !user.incapacitated() ) - visible_message("[user] appears to phase through \the [hit_atom]!") - to_chat(user, "You find a destination on the other side of \the [hit_atom], and phase through it.") + visible_message(span_warning("[user] appears to phase through \the [hit_atom]!")) + to_chat(user, span_info("You find a destination on the other side of \the [hit_atom], and phase through it.")) spark_system.start() user.forceMove(found_turf) qdel(src) return 1 else - to_chat(user, "You don't have enough energy to phase through these walls!") + to_chat(user, span_warning("You don't have enough energy to phase through these walls!")) busy = 0 else - to_chat(user, "You weren't able to find an open space to go to.") + to_chat(user, span_info("You weren't able to find an open space to go to.")) busy = 0 diff --git a/code/game/gamemodes/technomancer/spells/phase_shift.dm b/code/game/gamemodes/technomancer/spells/phase_shift.dm index ef1a8e1052..e8a39c144b 100644 --- a/code/game/gamemodes/technomancer/spells/phase_shift.dm +++ b/code/game/gamemodes/technomancer/spells/phase_shift.dm @@ -47,7 +47,7 @@ if(user.stat) return - to_chat(user, "You step out of the rift.") + to_chat(user, span_notice("You step out of the rift.")) user.forceMove(get_turf(src)) qdel(src) @@ -55,12 +55,12 @@ if(isturf(user.loc)) //Check if we're not already in a rift. if(pay_energy(2000)) var/obj/effect/phase_shift/PS = new(get_turf(user)) - visible_message("[user] vanishes into a pink rift!") - to_chat(user, "You create an unstable rift, and go through it. Be sure to not stay too long.") + visible_message(span_warning("[user] vanishes into a pink rift!")) + to_chat(user, span_info("You create an unstable rift, and go through it. Be sure to not stay too long.")) user.forceMove(PS) adjust_instability(10) qdel(src) else - to_chat(user, "You don't have enough energy to make a rift!") + to_chat(user, span_warning("You don't have enough energy to make a rift!")) else //We're already in a rift or something like a closet. - to_chat(user, "Making a rift here would probably be a bad idea.") + to_chat(user, span_warning("Making a rift here would probably be a bad idea.")) diff --git a/code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm b/code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm index d7138e3740..828d3e96bf 100644 --- a/code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm +++ b/code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm @@ -69,12 +69,9 @@ if(new_target) var/turf/curloc = get_turf(target_mob) - curloc.visible_message("\The [src] bounces to \the [new_target]!") + curloc.visible_message(span_danger("\The [src] bounces to \the [new_target]!")) redirect(new_target.x, new_target.y, curloc, firer) bounces-- return 0 return 1 - - - diff --git a/code/game/gamemodes/technomancer/spells/reflect.dm b/code/game/gamemodes/technomancer/spells/reflect.dm index 24fe7f79a5..b642adcf15 100644 --- a/code/game/gamemodes/technomancer/spells/reflect.dm +++ b/code/game/gamemodes/technomancer/spells/reflect.dm @@ -21,12 +21,12 @@ set_light(3, 2, l_color = "#006AFF") spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src) - to_chat(owner, "Your shield will expire in 5 seconds!") + to_chat(owner, span_notice("Your shield will expire in 5 seconds!")) QDEL_IN(src, 5 SECONDS) /obj/item/spell/reflect/Destroy() if(owner) - to_chat(owner, "Your shield expires!") + to_chat(owner, span_danger("Your shield expires!")) spark_system = null return ..() @@ -37,7 +37,7 @@ var/damage_to_energy_cost = (damage_to_energy_multiplier * damage) if(!pay_energy(damage_to_energy_cost)) - to_chat(owner, "Your shield fades due to lack of energy!") + to_chat(owner, span_danger("Your shield fades due to lack of energy!")) qdel(src) return 0 @@ -49,7 +49,7 @@ var/obj/item/projectile/P = damage_source if(P.starting && !P.reflected) - visible_message("\The [user]'s [src.name] reflects [attack_text]!") + visible_message(span_danger("\The [user]'s [src.name] reflects [attack_text]!")) var/turf/curloc = get_turf(user) @@ -67,7 +67,7 @@ if(!reflecting) reflecting = 1 spawn(2 SECONDS) //To ensure that most or all of a burst fire cycle is reflected. - to_chat(owner, "Your shield fades due being used up!") + to_chat(owner, span_danger("Your shield fades due being used up!")) qdel(src) return PROJECTILE_CONTINUE // complete projectile permutation @@ -87,7 +87,7 @@ if(!reflecting) reflecting = 1 spawn(2 SECONDS) //To ensure that most or all of a burst fire cycle is reflected. - to_chat(owner, "Your shield fades due being used up!") + to_chat(owner, span_danger("Your shield fades due being used up!")) qdel(src) return 1 return 0 diff --git a/code/game/gamemodes/technomancer/spells/resurrect.dm b/code/game/gamemodes/technomancer/spells/resurrect.dm index 576ec57358..16a8f9b14f 100644 --- a/code/game/gamemodes/technomancer/spells/resurrect.dm +++ b/code/game/gamemodes/technomancer/spells/resurrect.dm @@ -19,16 +19,16 @@ if(isliving(hit_atom)) var/mob/living/L = hit_atom if(L == user) - to_chat(user, "Clever as you may seem, this won't work on yourself while alive.") + to_chat(user, span_warning("Clever as you may seem, this won't work on yourself while alive.")) return 0 if(L.stat != DEAD) - to_chat(user, "\The [L] isn't dead!") + to_chat(user, span_warning("\The [L] isn't dead!")) return 0 if(pay_energy(5000)) if(L.tod > world.time + 30 MINUTES) - to_chat(user, "\The [L]'s been dead for too long, even this function cannot replace cloning at this point.") + to_chat(user, span_danger("\The [L]'s been dead for too long, even this function cannot replace cloning at this point.")) return 0 - to_chat(user, "You stab \the [L] with a hidden integrated hypo, attempting to bring them back...") + to_chat(user, span_notice("You stab \the [L] with a hidden integrated hypo, attempting to bring them back...")) if(istype(L, /mob/living/simple_mob)) var/mob/living/simple_mob/SM = L SM.health = SM.getMaxHealth() / 3 @@ -56,10 +56,10 @@ dead_mob_list -= H living_mob_list += H H.timeofdeath = null - visible_message("\The [H]'s eyes open!") - to_chat(user, "It's alive!") + visible_message(span_danger("\The [H]'s eyes open!")) + to_chat(user, span_notice("It's alive!")) adjust_instability(50) log_and_message_admins("has resurrected [H].") else - to_chat(user, "The body of \the [H] doesn't seem to respond, perhaps you could try again?") - adjust_instability(10) \ No newline at end of file + to_chat(user, span_warning("The body of \the [H] doesn't seem to respond, perhaps you could try again?")) + adjust_instability(10) diff --git a/code/game/gamemodes/technomancer/spells/shared_burden.dm b/code/game/gamemodes/technomancer/spells/shared_burden.dm index 766d88b43d..ad04dc5d4b 100644 --- a/code/game/gamemodes/technomancer/spells/shared_burden.dm +++ b/code/game/gamemodes/technomancer/spells/shared_burden.dm @@ -17,13 +17,13 @@ if(ishuman(hit_atom) && within_range(hit_atom)) var/mob/living/carbon/human/H = hit_atom if(H == user) - to_chat(user, "Draining instability out of you to put it back seems a bit pointless.") + to_chat(user, span_warning("Draining instability out of you to put it back seems a bit pointless.")) return 0 if(H.instability <= 0) - to_chat(user, "\The [H] has no instability to drain.") + to_chat(user, span_warning("\The [H] has no instability to drain.")) return 0 if(pay_energy(500)) var/instability_to_drain = min(H.instability, 25) - to_chat(user, "You draw instability away from \the [H] and towards you.") + to_chat(user, span_notice("You draw instability away from \the [H] and towards you.")) adjust_instability(instability_to_drain) - H.adjust_instability(-calculate_spell_power(instability_to_drain)) \ No newline at end of file + H.adjust_instability(-calculate_spell_power(instability_to_drain)) diff --git a/code/game/gamemodes/technomancer/spells/shield.dm b/code/game/gamemodes/technomancer/spells/shield.dm index fb08128e6d..d5182ca1de 100644 --- a/code/game/gamemodes/technomancer/spells/shield.dm +++ b/code/game/gamemodes/technomancer/spells/shield.dm @@ -46,14 +46,14 @@ damage_to_energy_cost *= 0.50 if(!pay_energy(damage_to_energy_cost)) - to_chat(owner, "Your shield fades due to lack of energy!") + to_chat(owner, span_danger("Your shield fades due to lack of energy!")) qdel(src) return 0 //block as long as they are not directly behind us var/bad_arc = reverse_direction(user.dir) //arc of directions from which we cannot block if(check_shield_arc(user, bad_arc, damage_source, attacker)) - user.visible_message("\The [user]'s [src] blocks [attack_text]!") + user.visible_message(span_danger("\The [user]'s [src] blocks [attack_text]!")) spark_system.start() playsound(src, 'sound/weapons/blade1.ogg', 50, 1) adjust_instability(2) diff --git a/code/game/gamemodes/technomancer/spells/spawner/spawner.dm b/code/game/gamemodes/technomancer/spells/spawner/spawner.dm index 47c2a264ad..016e407c37 100644 --- a/code/game/gamemodes/technomancer/spells/spawner/spawner.dm +++ b/code/game/gamemodes/technomancer/spells/spawner/spawner.dm @@ -10,6 +10,6 @@ var/turf/T = get_turf(hit_atom) if(T) new spawner_type(T) - to_chat(user, "You shift \the [src] onto \the [T].") + to_chat(user, span_notice("You shift \the [src] onto \the [T].")) log_and_message_admins("has casted [src] at [T.x],[T.y],[T.z].") - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/game/gamemodes/technomancer/spells/summon/summon.dm b/code/game/gamemodes/technomancer/spells/summon/summon.dm index d47562b31d..f64ddeca8a 100644 --- a/code/game/gamemodes/technomancer/spells/summon/summon.dm +++ b/code/game/gamemodes/technomancer/spells/summon/summon.dm @@ -27,8 +27,8 @@ summon_underlay.alpha = 127 L.underlays |= summon_underlay on_summon(L) - to_chat(user, "You've successfully teleported \a [L] to you!") - visible_message("\A [L] appears from no-where!") + to_chat(user, span_notice("You've successfully teleported \a [L] to you!")) + visible_message(span_warning("\A [L] appears from no-where!")) log_and_message_admins("has summoned \a [L] at [T.x],[T.y],[T.z].") user.adjust_instability(instability_cost) @@ -40,4 +40,4 @@ // Called when a new mob is summoned, override for special behaviour. /obj/item/spell/summon/proc/on_summon(var/mob/living/summoned) - return \ No newline at end of file + return diff --git a/code/game/gamemodes/technomancer/spells/track.dm b/code/game/gamemodes/technomancer/spells/track.dm index b0ba7daad3..39d06119cd 100644 --- a/code/game/gamemodes/technomancer/spells/track.dm +++ b/code/game/gamemodes/technomancer/spells/track.dm @@ -29,7 +29,7 @@ var/list/technomancer_belongings = list() /obj/item/spell/track/on_use_cast(mob/user) if(tracking) tracking = 0 - to_chat(user, "You stop tracking for \the [tracked]'s whereabouts.") + to_chat(user, span_notice("You stop tracking for \the [tracked]'s whereabouts.")) tracked = null return @@ -75,4 +75,4 @@ var/list/technomancer_belongings = list() icon_state = "track_far" spawn(5) - .() \ No newline at end of file + .() diff --git a/code/game/gamemodes/technomancer/spells/warp_strike.dm b/code/game/gamemodes/technomancer/spells/warp_strike.dm index d22655180f..99c82387e8 100644 --- a/code/game/gamemodes/technomancer/spells/warp_strike.dm +++ b/code/game/gamemodes/technomancer/spells/warp_strike.dm @@ -64,7 +64,7 @@ if(I) if(is_path_in_list(I.type, blacklisted_items)) - to_chat(user, "You can't use \the [I] while warping!") + to_chat(user, span_danger("You can't use \the [I] while warping!")) return if(istype(I, /obj/item)) @@ -77,4 +77,3 @@ else chosen_target.attack_hand(user) add_attack_logs(user,chosen_target,"Warp striked") - diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 18bce75303..ce09ee5258 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -88,7 +88,7 @@ H.mind.initial_account = M - to_chat(H, "Your account number is: [M.account_number], your account pin is: [M.remote_access_pin]") + to_chat(H, span_notice("Your account number is: [M.account_number], your account pin is: [M.remote_access_pin]")) // overrideable separately so AIs/borgs can have cardborg hats without unneccessary new()/qdel() /datum/job/proc/equip_preview(mob/living/carbon/human/H, var/alt_title) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index cad8192100..9a14d25516 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -15,7 +15,7 @@ var/global/datum/controller/occupations/job_master //var/list/all_jobs = typesof(/datum/job) var/list/all_jobs = list(/datum/job/assistant) | using_map.allowed_jobs if(!all_jobs.len) - to_world("Error setting up jobs, no job datums found!") + to_world(span_warning("Error setting up jobs, no job datums found!")) return 0 for(var/J in all_jobs) var/datum/job/job = new J() @@ -374,7 +374,7 @@ var/global/datum/controller/occupations/job_master var/list/spawn_props = LateSpawn(H.client, rank) var/turf/T = spawn_props["turf"] if(!T) - to_chat(H, "You were unable to be spawned at your chosen late-join spawnpoint. Please verify your job/spawn point combination makes sense, and try another one.") + to_chat(H, span_critical("You were unable to be spawned at your chosen late-join spawnpoint. Please verify your job/spawn point combination makes sense, and try another one.")) return else H.forceMove(T) @@ -410,7 +410,7 @@ var/global/datum/controller/occupations/job_master // If they aren't, tell them if(!permitted) - to_chat(H, "Your current species, job or whitelist status does not permit you to spawn with [thing]!") + to_chat(H, span_warning("Your current species, job or whitelist status does not permit you to spawn with [thing]!")) continue // Implants get special treatment @@ -429,7 +429,7 @@ var/global/datum/controller/occupations/job_master if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater) //RS ADD continue if(H.equip_to_slot_or_del(G.spawn_item(H, metadata), G.slot)) - to_chat(H, "Equipping you with \the [thing]!") + to_chat(H, span_notice("Equipping you with \the [thing]!")) if(G.slot != slot_tie) custom_equip_slots.Add(G.slot) else @@ -460,12 +460,12 @@ var/global/datum/controller/occupations/job_master else var/metadata = H.client.prefs.gear[G.display_name] if(H.equip_to_slot_or_del(G.spawn_item(H, metadata), G.slot)) - to_chat(H, "Equipping you with \the [thing]!") + to_chat(H, span_notice("Equipping you with \the [thing]!")) custom_equip_slots.Add(G.slot) else spawn_in_storage += thing else - to_chat(H, "Your job is [rank] and the game just can't handle it! Please report this bug to an administrator.") + to_chat(H, span_filter_notice("Your job is [rank] and the game just can't handle it! Please report this bug to an administrator.")) H.job = rank log_game("JOINED [key_name(H)] as \"[rank]\"") @@ -508,12 +508,12 @@ var/global/datum/controller/occupations/job_master if(!isnull(B)) for(var/thing in spawn_in_storage) - to_chat(H, "Placing \the [thing] in your [B.name]!") + to_chat(H, span_notice("Placing \the [thing] in your [B.name]!")) var/datum/gear/G = gear_datums[thing] var/metadata = H.client.prefs.gear[G.display_name] G.spawn_item(B, metadata) else - to_chat(H, "Failed to locate a storage object on your mob, either you spawned with no arms and no backpack or this is a bug.") + to_chat(H, span_danger("Failed to locate a storage object on your mob, either you spawned with no arms and no backpack or this is a bug.")) if(istype(H)) //give humans wheelchairs, if they need them. var/obj/item/organ/external/l_foot = H.get_organ("l_foot") @@ -533,16 +533,16 @@ var/global/datum/controller/occupations/job_master W.color = R.color qdel(R) - to_chat(H, "You are [job.total_positions == 1 ? "the" : "a"] [alt_title ? alt_title : rank].") + to_chat(H, span_filter_notice("You are [job.total_positions == 1 ? "the" : "a"] [alt_title ? alt_title : rank].")) if(job.supervisors) - to_chat(H, "As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this.") + to_chat(H, span_filter_notice("As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this.")) if(job.has_headset) H.equip_to_slot_or_del(new /obj/item/radio/headset(H), slot_l_ear) - to_chat(H, "To speak on your department's radio channel use :h. For the use of other channels, examine your headset.") + to_chat(H, span_filter_notice("To speak on your department's radio channel use :h. For the use of other channels, examine your headset.")) if(job.req_admin_notify) - to_chat(H, "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.") + to_chat(H, span_filter_notice("You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.")) // EMAIL GENERATION // Email addresses will be created under this domain name. Mostly for the looks. @@ -559,13 +559,13 @@ var/global/datum/controller/occupations/job_master // If even fallback login generation failed, just don't give them an email. The chance of this happening is astronomically low. if(ntnet_global.does_email_exist(complete_login)) - to_chat(H, "You were not assigned an email address.") + to_chat(H, span_filter_notice("You were not assigned an email address.")) H.mind.store_memory("You were not assigned an email address.") else var/datum/computer_file/data/email_account/EA = new/datum/computer_file/data/email_account() EA.password = GenerateKey() EA.login = complete_login - to_chat(H, "Your email account address is [EA.login] and the password is [EA.password]. This information has also been placed into your notes.") + to_chat(H, span_filter_notice("Your email account address is [EA.login] and the password is [EA.password]. This information has also been placed into your notes.")) H.mind.store_memory("Your email account address is [EA.login] and the password is [EA.password].") // END EMAIL GENERATION @@ -663,10 +663,10 @@ var/global/datum/controller/occupations/job_master if(C && C.prefs.spawnpoint) if(!(C.prefs.spawnpoint in using_map.allowed_spawns)) if(fail_deadly) - to_chat(C, "Your chosen spawnpoint is unavailable for this map and your job requires a specific spawnpoint. Please correct your spawn point choice.") + to_chat(C, span_warning("Your chosen spawnpoint is unavailable for this map and your job requires a specific spawnpoint. Please correct your spawn point choice.")) return else - to_chat(C, "Your chosen spawnpoint ([C.prefs.spawnpoint]) is unavailable for the current map. Spawning you at one of the enabled spawn points instead.") + to_chat(C, span_warning("Your chosen spawnpoint ([C.prefs.spawnpoint]) is unavailable for the current map. Spawning you at one of the enabled spawn points instead.")) spawnpos = null else spawnpos = spawntypes[C.prefs.spawnpoint] @@ -680,9 +680,9 @@ var/global/datum/controller/occupations/job_master .["channel"] = spawnpos.announce_channel else if(fail_deadly) - to_chat(C, "Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Please correct your spawn point choice.") + to_chat(C, span_warning("Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Please correct your spawn point choice.")) return - to_chat(C, "Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead.") + to_chat(C, span_filter_warning("Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead.")) var/spawning = pick(latejoin) .["turf"] = get_turf(spawning) .["msg"] = "will arrive at the station shortly" diff --git a/code/game/machinery/CableLayer.dm b/code/game/machinery/CableLayer.dm index b64f04d16f..256e57bf18 100644 --- a/code/game/machinery/CableLayer.dm +++ b/code/game/machinery/CableLayer.dm @@ -18,7 +18,7 @@ /obj/machinery/cablelayer/attack_hand(mob/user as mob) if(!cable&&!on) - to_chat(user, "\The [src] doesn't have any cable loaded.") + to_chat(user, span_warning("\The [src] doesn't have any cable loaded.")) return on=!on user.visible_message("\The [user] [!on?"dea":"a"]ctivates \the [src].", "You switch [src] [on? "on" : "off"]") @@ -29,7 +29,7 @@ var/result = load_cable(O) if(!result) - to_chat(user, "\The [src]'s cable reel is full.") + to_chat(user, span_warning("\The [src]'s cable reel is full.")) else to_chat(user, "You load [result] lengths of cable into [src].") return @@ -45,7 +45,7 @@ var/obj/item/stack/cable_coil/CC = new (get_turf(src)) CC.set_amount(m) else - to_chat(usr, "There's no more cable on the reel.") + to_chat(usr, span_warning("There's no more cable on the reel.")) /obj/machinery/cablelayer/examine(mob/user) . = ..() diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index f7130034ff..d168286ee1 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -44,7 +44,7 @@ /obj/machinery/optable/attack_hand(mob/user as mob) if(HULK in usr.mutations) - visible_message("\The [usr] destroys \the [src]!") + visible_message(span_danger("\The [usr] destroys \the [src]!")) density = FALSE qdel(src) return @@ -78,7 +78,7 @@ if(C == user) user.visible_message("[user] climbs on \the [src].","You climb on \the [src].") else - visible_message("\The [C] has been laid on \the [src] by [user].") + visible_message(span_notice("\The [C] has been laid on \the [src] by [user].")) if(C.client) C.client.perspective = EYE_PERSPECTIVE C.client.eye = src @@ -128,9 +128,9 @@ /obj/machinery/optable/proc/check_table(mob/living/carbon/patient, mob/living/user) check_victim() if(victim && get_turf(victim) == get_turf(src) && victim.lying) - to_chat(user, "\The [src] is already occupied!") + to_chat(user, span_warning("\The [src] is already occupied!")) return 0 if(patient.buckled) - to_chat(user, "Unbuckle \the [patient] first!") + to_chat(user, span_notice("Unbuckle \the [patient] first!")) return 0 - return 1 \ No newline at end of file + return 1 diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 68ec7f0a5c..aee50b868a 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -44,11 +44,11 @@ if(!sleeper) findsleeper() if(!sleeper) - to_chat(user, "Sleeper not found!") + to_chat(user, span_notice("Sleeper not found!")) return if(panel_open) - to_chat(user, "Close the maintenance panel first.") + to_chat(user, span_notice("Close the maintenance panel first.")) return if(sleeper) @@ -169,7 +169,7 @@ /obj/machinery/sleeper/attack_hand(var/mob/user) if(!controls_inside) return FALSE - + if(user == occupant) tgui_interact(user) @@ -299,7 +299,7 @@ if(!controls_inside && usr == occupant) return if(panel_open) - to_chat(usr, "Close the maintenance panel first.") + to_chat(usr, span_notice("Close the maintenance panel first.")) return . = TRUE @@ -309,7 +309,7 @@ return if(occupant.stat == DEAD) var/datum/gender/G = gender_datums[occupant.get_visible_gender()] - to_chat(usr, "This person has no life to preserve anymore. Take [G.him] to a department capable of reanimating [G.him].") + to_chat(usr, span_danger("This person has no life to preserve anymore. Take [G.him] to a department capable of reanimating [G.him].")) return var/chemical = params["chemid"] var/amount = text2num(params["amount"]) @@ -318,7 +318,7 @@ if(occupant.health > min_health) //|| (chemical in emergency_chems)) inject_chemical(usr, chemical, amount) else - to_chat(usr, "This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!") + to_chat(usr, span_danger("This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!")) if("removebeaker") remove_beaker() if("togglefilter") @@ -384,9 +384,9 @@ beaker = I user.drop_item() I.loc = src - user.visible_message("\The [user] adds \a [I] to \the [src].", "You add \a [I] to \the [src].") + user.visible_message("\The [user] adds \a [I] to \the [src].", span_notice("You add \a [I] to \the [src].")) else - to_chat(user, "\The [src] has a beaker already.") + to_chat(user, span_warning("\The [src] has a beaker already.")) return if(!occupant) if(default_deconstruction_screwdriver(user, I)) @@ -405,7 +405,7 @@ if(DEAD) return if(UNCONSCIOUS) - to_chat(usr, "You struggle through the haze to hit the eject button. This will take a couple of minutes...") + to_chat(usr, span_notice("You struggle through the haze to hit the eject button. This will take a couple of minutes...")) if(do_after(usr, 2 MINUTES, src)) go_out() if(CONSCIOUS) @@ -460,10 +460,10 @@ if(stat & (BROKEN|NOPOWER)) return if(occupant) - to_chat(user, "\The [src] is already occupied.") + to_chat(user, span_warning("\The [src] is already occupied.")) return if(!ishuman(M)) - to_chat(user, "\The [src] is not designed for that organism!") + to_chat(user, span_warning("\The [src] is not designed for that organism!")) return if(M == user) visible_message("\The [user] starts climbing into \the [src].") @@ -472,7 +472,7 @@ if(do_after(user, 20)) if(occupant) - to_chat(user, "\The [src] is already occupied.") + to_chat(user, span_warning("\The [src] is already occupied.")) return M.stop_pulling() if(M.client) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 87bca28ed1..755b483d4e 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -37,22 +37,22 @@ if(istype(G, /obj/item/grab)) var/obj/item/grab/H = G if(panel_open) - to_chat(user, "Close the maintenance panel first.") + to_chat(user, span_notice("Close the maintenance panel first.")) return if(!ismob(H.affecting)) return if(!ishuman(H.affecting)) - to_chat(user, "\The [src] is not designed for that organism!") + to_chat(user, span_warning("\The [src] is not designed for that organism!")) return if(occupant) - to_chat(user, "\The [src] is already occupied!") + to_chat(user, span_notice("\The [src] is already occupied!")) return if(H.affecting.has_buckled_mobs()) to_chat(user, span_warning("\The [H.affecting] has other entities attached to it. Remove them first.")) return var/mob/M = H.affecting if(M.abiotic()) - to_chat(user, "Subject cannot have abiotic items on.") + to_chat(user, span_notice("Subject cannot have abiotic items on.")) return M.forceMove(src) occupant = M @@ -79,16 +79,16 @@ if(!ishuman(user) && !isrobot(user)) return 0 //not a borg or human if(panel_open) - to_chat(user, "Close the maintenance panel first.") + to_chat(user, span_notice("Close the maintenance panel first.")) return 0 //panel open if(occupant) - to_chat(user, "\The [src] is already occupied.") + to_chat(user, span_notice("\The [src] is already occupied.")) return 0 //occupied if(O.buckled) return 0 if(O.abiotic()) - to_chat(user, "Subject cannot have abiotic items on.") + to_chat(user, span_notice("Subject cannot have abiotic items on.")) return 0 if(O.has_buckled_mobs()) to_chat(user, span_warning("\The [O] has other entities attached to it. Remove them first.")) @@ -350,7 +350,7 @@ eject() if("print_p") var/atom/target = console ? console : src - visible_message("[target] rattles and prints out a sheet of paper.") + visible_message(span_notice("[target] rattles and prints out a sheet of paper.")) playsound(src, 'sound/machines/printer.ogg', 50, 1) var/obj/item/paper/P = new /obj/item/paper(get_turf(target)) var/name = occupant ? occupant.name : "Unknown" @@ -579,9 +579,9 @@ var/obj/machinery/bodyscanner/C = P.connectable scanner = C C.console = src - to_chat(user, " You link the [src] to the [P.connectable]!") + to_chat(user, span_warning(" You link the [src] to the [P.connectable]!")) else - to_chat(user, " You store the [src] in the [P]'s buffer!") + to_chat(user, span_warning(" You store the [src] in the [P]'s buffer!")) P.connectable = src return else @@ -641,11 +641,11 @@ if(!scanner) findscanner() if(!scanner) - to_chat(user, "Scanner not found!") + to_chat(user, span_notice("Scanner not found!")) return if(scanner.panel_open) - to_chat(user, "Close the maintenance panel first.") + to_chat(user, span_notice("Close the maintenance panel first.")) return if(scanner) diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index bad191ee09..a891a03f82 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -50,7 +50,7 @@ if(user.machine==src) attack_hand(usr) else - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) return return @@ -125,4 +125,4 @@ if(uses >= 0) cooldown_on = 0 power_change() - return \ No newline at end of file + return diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index f23fa71e8e..aff190e5e3 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -819,9 +819,9 @@ else if(allowed(usr) && !wires.is_cut(WIRE_IDSCAN)) locked = !locked - to_chat(user, "You [locked ? "lock" : "unlock"] the Air Alarm interface.") + to_chat(user, span_notice("You [locked ? "lock" : "unlock"] the Air Alarm interface.")) else - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) return /obj/machinery/alarm/AltClick() diff --git a/code/game/machinery/airconditioner_vr.dm b/code/game/machinery/airconditioner_vr.dm index 6549237274..36dd29aa40 100644 --- a/code/game/machinery/airconditioner_vr.dm +++ b/code/game/machinery/airconditioner_vr.dm @@ -38,7 +38,7 @@ return if(I.has_tool_quality(TOOL_WRENCH)) anchored = !anchored - visible_message("\The [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].") + visible_message(span_notice("\The [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].")) playsound(src, I.usesound, 75, 1) if(anchored) connect_to_network() @@ -63,7 +63,7 @@ if(!anchored) return on = !on - user.visible_message("[user] [on ? "activates" : "deactivates"] \the [src].","You [on ? "activate" : "deactivate"] \the [src].") + user.visible_message(span_notice("[user] [on ? "activates" : "deactivates"] \the [src]."),span_notice("You [on ? "activate" : "deactivate"] \the [src].")) if(!on) change_mode(MODE_IDLE) update_icon() @@ -153,7 +153,7 @@ var/datum/effect/effect/system/spark_spread/s = new s.set_up(5, 0, T) s.start() - visible_message("\The [src] bursts into flame!") + visible_message(span_warning("\The [src] bursts into flame!")) #undef MODE_IDLE #undef MODE_HEATING diff --git a/code/game/machinery/atm_ret_field.dm b/code/game/machinery/atm_ret_field.dm index 7a59b52a5b..96f1500a9f 100644 --- a/code/game/machinery/atm_ret_field.dm +++ b/code/game/machinery/atm_ret_field.dm @@ -43,11 +43,11 @@ /obj/machinery/atmospheric_field_generator/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_CROWBAR) && isactive) if(!src) return - to_chat(user, "You can't open the ARF-G whilst it's running!") + to_chat(user, span_warning("You can't open the ARF-G whilst it's running!")) return if(W.has_tool_quality(TOOL_CROWBAR) && !isactive) if(!src) return - to_chat(user, "You [hatch_open? "close" : "open"] \the [src]'s access hatch.") + to_chat(user, span_notice("You [hatch_open? "close" : "open"] \the [src]'s access hatch.")) hatch_open = !hatch_open update_icon() if(alwaysactive && wires_intact) @@ -55,13 +55,13 @@ return if(hatch_open && W.has_tool_quality(TOOL_MULTITOOL)) if(!src) return - to_chat(user, "You toggle \the [src]'s activation behavior to [alwaysactive? "emergency" : "always-on"].") + to_chat(user, span_notice("You toggle \the [src]'s activation behavior to [alwaysactive? "emergency" : "always-on"].")) alwaysactive = !alwaysactive update_icon() return if(hatch_open && W.has_tool_quality(TOOL_WIRECUTTER)) if(!src) return - to_chat(user, "You [wires_intact? "cut" : "mend"] \the [src]'s wires!") + to_chat(user, span_warning("You [wires_intact? "cut" : "mend"] \the [src]'s wires!")) wires_intact = !wires_intact update_icon() return @@ -70,13 +70,13 @@ var/obj/item/weldingtool/WT = W.get_welder() if(!WT.isOn()) return if(WT.get_fuel() < 5) // uses up 5 fuel. - to_chat(user, "You need more fuel to complete this task.") + to_chat(user, span_warning("You need more fuel to complete this task.")) return user.visible_message("[user] starts to disassemble \the [src].", "You start to disassemble \the [src].") playsound(src, WT.usesound, 50, 1) if(do_after(user,15 * W.toolspeed)) if(!src || !user || !WT.remove_fuel(5, user)) return - to_chat(user, "You fully disassemble \the [src]. There were no salvageable parts.") + to_chat(user, span_notice("You fully disassemble \the [src]. There were no salvageable parts.")) qdel(src) return @@ -141,7 +141,7 @@ isactive = TRUE icon_state = "arfg_on" new field_type (src.loc) - src.visible_message("The ARF-G crackles to life!","You hear an ARF-G coming online!") + src.visible_message(span_warning("The ARF-G crackles to life!"),span_warning("You hear an ARF-G coming online!")) update_use_power(USE_POWER_ACTIVE) return diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 1ffa86bfea..eb532c702f 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -250,13 +250,13 @@ update_flag playsound(src, WT.usesound, 50, 1) if(do_after(user, 20 * WT.toolspeed)) if(!src || !WT.isOn()) return - to_chat(user, "You deconstruct the [src].") + to_chat(user, span_notice("You deconstruct the [src].")) new /obj/item/stack/material/steel( src.loc, 10) qdel(src) return //Voreend if(!W.has_tool_quality(TOOL_WRENCH) && !istype(W, /obj/item/tank) && !istype(W, /obj/item/analyzer) && !istype(W, /obj/item/pda)) - visible_message("\The [user] hits \the [src] with \a [W]!") + visible_message(span_warning("\The [user] hits \the [src] with \a [W]!")) src.health -= W.force src.add_fingerprint(user) healthcheck() diff --git a/code/game/machinery/atmoalter/clamp.dm b/code/game/machinery/atmoalter/clamp.dm index a77999a661..ba01be8538 100644 --- a/code/game/machinery/atmoalter/clamp.dm +++ b/code/game/machinery/atmoalter/clamp.dm @@ -45,7 +45,7 @@ open() else close() - to_chat(user, "You turn [open ? "off" : "on"] \the [src]") + to_chat(user, span_notice("You turn [open ? "off" : "on"] \the [src]")) return TRUE /obj/machinery/clamp/Destroy() @@ -118,9 +118,9 @@ return if(open && over_object == usr && Adjacent(usr)) - to_chat(usr, "You begin to remove \the [src]...") + to_chat(usr, span_notice("You begin to remove \the [src]...")) if (do_after(usr, 30, src)) - to_chat(usr, "You have removed \the [src].") + to_chat(usr, span_notice("You have removed \the [src].")) var/obj/item/clamp/C = new/obj/item/clamp(src.loc) C.forceMove(usr.loc) if(ishuman(usr)) @@ -128,7 +128,7 @@ qdel(src) return else - to_chat(usr, "You can't remove \the [src] while it's active!") + to_chat(usr, span_warning("You can't remove \the [src] while it's active!")) /obj/item/clamp name = "stasis clamp" @@ -142,13 +142,13 @@ return if (istype(A, /obj/machinery/atmospherics/pipe/simple)) - to_chat(user, "You begin to attach \the [src] to \the [A]...") + to_chat(user, span_notice("You begin to attach \the [src] to \the [A]...")) var/C = locate(/obj/machinery/clamp) in get_turf(A) if (do_after(user, 30, src) && !C) if(!user.unEquip(src)) return - to_chat(user, "You have attached \the [src] to \the [A].") + to_chat(user, span_notice("You have attached \the [src] to \the [A].")) new/obj/machinery/clamp(A.loc, A) qdel(src) if(C) - to_chat(user, "\The [C] is already attached to the pipe at this location!") + to_chat(user, span_notice("\The [C] is already attached to the pipe at this location!")) diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index a3529d42d0..a64f64448f 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -80,10 +80,10 @@ . = ..() if(get_dist(user, src) > 3 && !(istype(user, /mob/living/silicon/ai) || istype(user, /mob/observer/dead))) - . += "You are too far away to read it." + . += span_warning("You are too far away to read it.") else if(stat & (NOPOWER|BROKEN)) - . += "The display is off." + . += span_warning("The display is off.") else if(target) var/datum/gas_mixture/environment = target.return_air() @@ -107,11 +107,11 @@ /obj/machinery/meter/attackby(var/obj/item/W, var/mob/user) if(W.has_tool_quality(TOOL_WRENCH)) playsound(src, W.usesound, 50, 1) - to_chat(user, "You begin to unfasten \the [src]...") + to_chat(user, span_notice("You begin to unfasten \the [src]...")) if(do_after(user, 40 * W.toolspeed)) user.visible_message( \ "\The [user] unfastens \the [src].", \ - "You have unfastened \the [src].", \ + span_notice("You have unfastened \the [src]."), \ "You hear ratchet.") new /obj/item/pipe_meter(get_turf(src)) qdel(src) @@ -125,7 +125,7 @@ target = pipes_on_turf[1] pipes_on_turf.Remove(target) pipes_on_turf.Add(target) - to_chat(user, "Pipe meter set to moniter \the [target].") + to_chat(user, span_notice("Pipe meter set to moniter \the [target].")) return return ..() diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 3e899b3231..cc17f16d1f 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -120,7 +120,7 @@ else if (W.has_tool_quality(TOOL_WRENCH)) if(connected_port) disconnect() - to_chat(user, "You disconnect \the [src] from the port.") + to_chat(user, span_notice("You disconnect \the [src] from the port.")) update_icon() playsound(src, W.usesound, 50, 1) return @@ -128,15 +128,15 @@ var/obj/machinery/atmospherics/portables_connector/possible_port = locate(/obj/machinery/atmospherics/portables_connector/) in loc if(possible_port) if(connect(possible_port)) - to_chat(user, "You connect \the [src] to the port.") + to_chat(user, span_notice("You connect \the [src] to the port.")) update_icon() playsound(src, W.usesound, 50, 1) return else - to_chat(user, "\The [src] failed to connect to the port.") + to_chat(user, span_notice("\The [src] failed to connect to the port.")) return else - to_chat(user, "Nothing happens.") + to_chat(user, span_notice("Nothing happens.")) return return @@ -169,16 +169,16 @@ C.add_fingerprint(user) cell = C C.loc = src - user.visible_message("[user] opens the panel on [src] and inserts [C].", "You open the panel on [src] and insert [C].") + user.visible_message(span_notice("[user] opens the panel on [src] and inserts [C]."), span_notice("You open the panel on [src] and insert [C].")) power_change() return if(I.has_tool_quality(TOOL_SCREWDRIVER) && removeable_cell) if(!cell) - to_chat(user, "There is no power cell installed.") + to_chat(user, span_warning("There is no power cell installed.")) return - user.visible_message("[user] opens the panel on [src] and removes [cell].", "You open the panel on [src] and remove [cell].") + user.visible_message(span_notice("[user] opens the panel on [src] and removes [cell]."), span_notice("You open the panel on [src] and remove [cell].")) playsound(src, I.usesound, 50, 1) cell.add_fingerprint(user) cell.loc = src.loc diff --git a/code/game/machinery/atmoalter/pump_vr.dm b/code/game/machinery/atmoalter/pump_vr.dm index 858c4230cb..5ebf3dc65f 100644 --- a/code/game/machinery/atmoalter/pump_vr.dm +++ b/code/game/machinery/atmoalter/pump_vr.dm @@ -23,7 +23,7 @@ name = "[name] (ID [id])" /obj/machinery/portable_atmospherics/powered/pump/huge/attack_hand(var/mob/user) - to_chat(user, "You can't directly interact with this machine. Use the pump control console.") + to_chat(user, span_notice("You can't directly interact with this machine. Use the pump control console.")) /obj/machinery/portable_atmospherics/powered/pump/huge/update_icon() cut_overlays() @@ -85,12 +85,12 @@ /obj/machinery/portable_atmospherics/powered/pump/huge/attackby(var/obj/item/I, var/mob/user) if(I.has_tool_quality(TOOL_WRENCH)) if(on) - to_chat(user, "Turn \the [src] off first!") + to_chat(user, span_warning("Turn \the [src] off first!")) return anchored = !anchored playsound(src, I.usesound, 50, 1) - to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + to_chat(user, span_notice("You [anchored ? "wrench" : "unwrench"] \the [src].")) return @@ -112,7 +112,7 @@ /obj/machinery/portable_atmospherics/powered/pump/huge/stationary/attackby(var/obj/item/I, var/mob/user) if(I.has_tool_quality(TOOL_WRENCH)) - to_chat(user, "The bolts are too tight for you to unscrew!") + to_chat(user, span_warning("The bolts are too tight for you to unscrew!")) return ..() @@ -126,4 +126,4 @@ ..() if(!(stat & (NOPOWER|BROKEN))) on = 1 - update_icon() \ No newline at end of file + update_icon() diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index eee8d761d5..0ca93db9b6 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -174,7 +174,7 @@ name = "[name] (ID [id])" /obj/machinery/portable_atmospherics/powered/scrubber/huge/attack_hand(var/mob/user as mob) - to_chat(user, "You can't directly interact with this machine. Use the scrubber control console.") + to_chat(user, span_notice("You can't directly interact with this machine. Use the scrubber control console.")) /obj/machinery/portable_atmospherics/powered/scrubber/huge/update_icon() src.overlays = 0 @@ -220,12 +220,12 @@ /obj/machinery/portable_atmospherics/powered/scrubber/huge/attackby(var/obj/item/I as obj, var/mob/user as mob) if(I.has_tool_quality(TOOL_WRENCH)) if(on) - to_chat(user, "Turn \the [src] off first!") + to_chat(user, span_warning("Turn \the [src] off first!")) return anchored = !anchored playsound(src, I.usesound, 50, 1) - to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + to_chat(user, span_notice("You [anchored ? "wrench" : "unwrench"] \the [src].")) return @@ -251,7 +251,7 @@ /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/attackby(var/obj/item/I as obj, var/mob/user as mob) if(I.has_tool_quality(TOOL_WRENCH)) - to_chat(user, "The bolts are too tight for you to unscrew!") + to_chat(user, span_warning("The bolts are too tight for you to unscrew!")) return ..() diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 5f4523f76d..efa21c3b1f 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -99,7 +99,7 @@ return wires.Interact(user) if(disabled) - to_chat(user, "\The [src] is disabled!") + to_chat(user, span_danger("\The [src] is disabled!")) return if(shocked) @@ -109,7 +109,7 @@ /obj/machinery/autolathe/attackby(var/obj/item/O as obj, var/mob/user as mob) if(busy) - to_chat(user, "\The [src] is busy. Please wait for completion of previous operation.") + to_chat(user, span_notice("\The [src] is busy. Please wait for completion of previous operation.")) return if(default_deconstruction_screwdriver(user, O)) @@ -150,7 +150,7 @@ add_fingerprint(usr) if(busy) - to_chat(usr, "The autolathe is busy. Please wait for completion of previous operation.") + to_chat(usr, span_notice("The autolathe is busy. Please wait for completion of previous operation.")) return switch(action) if("make") @@ -282,4 +282,4 @@ . = ..() var/datum/component/material_container/materials = GetComponent(/datum/component/material_container) if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Storing up to [materials.max_amount] material units.
Material consumption at [mat_efficiency*100]%." + . += span_notice("The status display reads: Storing up to [materials.max_amount] material units.
Material consumption at [mat_efficiency*100]%.") diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index a38083ccac..d9fe85fcbd 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -166,11 +166,11 @@ return var/cost = round(br.cost / build_eff) if(cost > points) - to_chat(usr, "Insufficient biomass.") + to_chat(usr, span_danger("Insufficient biomass.")) return var/amt_to_actually_dispense = round(min(beaker.reagents.get_free_space(), br.reagent_amt)) if(amt_to_actually_dispense <= 0) - to_chat(usr, "The loaded beaker is full!") + to_chat(usr, span_danger("The loaded beaker is full!")) return points -= (cost * (amt_to_actually_dispense / br.reagent_amt)) beaker.reagents.add_reagent(br.reagent_id, amt_to_actually_dispense) @@ -179,7 +179,7 @@ var/cost = round(bi.cost / build_eff) if(cost > points) - to_chat(usr, "Insufficient biomass.") + to_chat(usr, span_danger("Insufficient biomass.")) return points -= cost @@ -218,43 +218,43 @@ return if(istype(O, /obj/item/reagent_containers/glass)) if(beaker) - to_chat(user, "\The [src] is already loaded.") + to_chat(user, span_notice("\The [src] is already loaded.")) else user.remove_from_mob(O) O.loc = src beaker = O updateUsrDialog() else if(processing) - to_chat(user, "\The [src] is currently processing.") + to_chat(user, span_notice("\The [src] is currently processing.")) else if(istype(O, /obj/item/storage/bag/plants)) var/i = 0 for(var/obj/item/reagent_containers/food/snacks/grown/G in contents) i++ if(i >= 10) - to_chat(user, "\The [src] is already full! Activate it.") + to_chat(user, span_notice("\The [src] is already full! Activate it.")) else for(var/obj/item/reagent_containers/food/snacks/grown/G in O.contents) G.loc = src i++ if(i >= 10) - to_chat(user, "You fill \the [src] to its capacity.") + to_chat(user, span_notice("You fill \the [src] to its capacity.")) break if(i < 10) - to_chat(user, "You empty \the [O] into \the [src].") + to_chat(user, span_notice("You empty \the [O] into \the [src].")) else if(!istype(O, /obj/item/reagent_containers/food/snacks/grown)) - to_chat(user, "You cannot put this in \the [src].") + to_chat(user, span_notice("You cannot put this in \the [src].")) else var/i = 0 for(var/obj/item/reagent_containers/food/snacks/grown/G in contents) i++ if(i >= 10) - to_chat(user, "\The [src] is full! Activate it.") + to_chat(user, span_notice("\The [src] is full! Activate it.")) else user.remove_from_mob(O) O.loc = src - to_chat(user, "You put \the [O] in \the [src]") + to_chat(user, span_notice("You put \the [O] in \the [src]")) update_icon() return @@ -269,7 +269,7 @@ if(stat) //NOPOWER etc return if(processing) - to_chat(usr, "The biogenerator is in the process of working.") + to_chat(usr, span_notice("The biogenerator is in the process of working.")) return var/S = 0 for(var/obj/item/reagent_containers/food/snacks/grown/I in contents) @@ -289,7 +289,7 @@ playsound(src, 'sound/machines/biogenerator_end.ogg', 40, 1) update_icon() else - to_chat(usr, "Error: No growns inside. Please insert growns.") + to_chat(usr, span_warning("Error: No growns inside. Please insert growns.")) return /obj/machinery/biogenerator/RefreshParts() diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index fdc0659f07..d3fea7a664 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -86,9 +86,9 @@ . = ..() var/biomass = get_biomass_volume() if(biomass) - . += "It is loaded with [biomass] units of biomass." + . += span_notice("It is loaded with [biomass] units of biomass.") else - . += "It is not loaded with any biomass." + . += span_notice("It is not loaded with any biomass.") /obj/machinery/organ_printer/RefreshParts() // Print Delay updating @@ -125,11 +125,11 @@ return if(panel_open) - to_chat(user, "Close the panel first!") + to_chat(user, span_warning("Close the panel first!")) return if(printing) - to_chat(user, "\The [src] is busy!") + to_chat(user, span_notice("\The [src] is busy!")) return if(container) @@ -137,7 +137,7 @@ if(response == "Print Limbs") printing_menu(user) else - to_chat(user, "\The [src] can't operate without a reagent reservoir!") + to_chat(user, span_warning("\The [src] can't operate without a reagent reservoir!")) /obj/machinery/organ_printer/proc/printing_menu(mob/user) var/list/possible_list = list() @@ -216,7 +216,7 @@ return 0 if(!loaded_dna || !loaded_dna["donor"]) - visible_message("\The [src] displays a warning: 'No DNA saved. Insert a blood sample.'") + visible_message(span_info("\The [src] displays a warning: 'No DNA saved. Insert a blood sample.'")) return 0 return 1 @@ -287,7 +287,7 @@ var/obj/item/organ/O = ..() playsound(src, 'sound/machines/ding.ogg', 50, 1) - visible_message("\The [src] dings, then spits out \a [O].") + visible_message(span_info("\The [src] dings, then spits out \a [O].")) return O /obj/machinery/organ_printer/flesh/attackby(obj/item/W, mob/user) @@ -298,12 +298,12 @@ if(injected && injected.data) loaded_dna = injected.data S.reagents.remove_reagent("blood", injected.volume) - to_chat(user, "You scan the blood sample into the bioprinter.") + to_chat(user, span_info("You scan the blood sample into the bioprinter.")) return else if(istype(W,/obj/item/reagent_containers/glass)) var/obj/item/reagent_containers/glass/G = W if(container) - to_chat(user, "\The [src] already has a container loaded!") + to_chat(user, span_warning("\The [src] already has a container loaded!")) return else if(do_after(user, 1 SECOND)) user.visible_message("[user] has loaded \the [G] into \the [src].", "You load \the [G] into \the [src].") @@ -352,22 +352,22 @@ O.robotize() O.status |= ORGAN_CUT_AWAY // robotize() resets status to 0 playsound(src, 'sound/machines/ding.ogg', 50, 1) - audible_message("\The [src] dings, then spits out \a [O].") + audible_message(span_info("\The [src] dings, then spits out \a [O].")) return O /obj/machinery/organ_printer/robot/attackby(var/obj/item/W, var/mob/user) if(istype(W, /obj/item/stack/material) && W.get_material_name() == matter_type) if((max_stored_matter-stored_matter) < matter_amount_per_sheet) - to_chat(user, "\The [src] is too full.") + to_chat(user, span_warning("\The [src] is too full.")) return var/obj/item/stack/S = W var/space_left = max_stored_matter - stored_matter var/sheets_to_take = min(S.amount, FLOOR(space_left/matter_amount_per_sheet, 1)) if(sheets_to_take <= 0) - to_chat(user, "\The [src] is too full.") + to_chat(user, span_warning("\The [src] is too full.")) return stored_matter = min(max_stored_matter, stored_matter + (sheets_to_take*matter_amount_per_sheet)) - to_chat(user, "\The [src] processes \the [W]. Levels of stored matter now: [stored_matter]") + to_chat(user, span_info("\The [src] processes \the [W]. Levels of stored matter now: [stored_matter]")) S.use(sheets_to_take) return else if(istype(W,/obj/item/reagent_containers/syringe)) //TODO: Make this actuall empty the syringe @@ -375,8 +375,8 @@ var/datum/reagent/blood/injected = locate() in S.reagents.reagent_list //Grab some blood if(injected && injected.data) loaded_dna = injected.data - to_chat(user, "You scan the blood sample into the bioprinter.") + to_chat(user, span_info("You scan the blood sample into the bioprinter.")) return return ..() // END ROBOT ORGAN PRINTER -*/ \ No newline at end of file +*/ diff --git a/code/game/machinery/bomb_tester_vr.dm b/code/game/machinery/bomb_tester_vr.dm index 3387ebb735..e45c329f37 100644 --- a/code/game/machinery/bomb_tester_vr.dm +++ b/code/game/machinery/bomb_tester_vr.dm @@ -102,7 +102,7 @@ tank2 = I update_icon() SStgui.update_uis(src) - to_chat(user, "You connect \the [I] to \the [src]'s [I==tank1 ? "primary" : "secondary"] slot.") + to_chat(user, span_notice("You connect \the [I] to \the [src]'s [I==tank1 ? "primary" : "secondary"] slot.")) return ..() @@ -128,7 +128,7 @@ data["tank2ref"] = REF(tank2) data["canister"] = test_canister data["sim_canister_output"] = sim_canister_output - + return data /obj/machinery/bomb_tester/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) @@ -149,9 +149,9 @@ text_mode = "tank transfer valve detonation" if(MODE_CANISTER) text_mode = "canister-assisted single gas tank detonation" - to_chat(usr, "[src] set to simulate a [text_mode].") + to_chat(usr, span_notice("[src] set to simulate a [text_mode].")) return TRUE - + if("add_tank") if(istype(usr.get_active_hand(), /obj/item/tank)) var/obj/item/tank/T = usr.get_active_hand() @@ -161,14 +161,14 @@ else if(slot == 2 && !tank2) tank2 = T else - to_chat(usr, "Slot [slot] is full.") + to_chat(usr, span_warning("Slot [slot] is full.")) return - + usr.drop_item(T) T.forceMove(src) return TRUE else - to_chat(usr, "You must be wielding a tank to insert it!") + to_chat(usr, span_warning("You must be wielding a tank to insert it!")) if("remove_tank") var/obj/item/tank/T = locate(params["ref"]) in list(tank1, tank2) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 3611c33f92..f3e034ba6e 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -124,7 +124,7 @@ if (istype(AM, /obj)) var/obj/O = AM if (O.throwforce >= src.toughness) - visible_message("[src] was hit by [O].") + visible_message(span_warning("[src] was hit by [O].")) take_damage(O.throwforce) /obj/machinery/camera/proc/setViewRange(var/num = 7) @@ -139,7 +139,7 @@ set_status(0) user.do_attack_animation(src) user.setClickCooldown(user.get_attack_speed()) - visible_message("\The [user] slashes at [src]!") + visible_message(span_warning("\The [user] slashes at [src]!")) playsound(src, 'sound/weapons/slash.ogg', 100, 1) add_hiddenprint(user) destroy() @@ -150,7 +150,7 @@ set_status(0) S.do_attack_animation(src) S.setClickCooldown(user.get_attack_speed()) - visible_message("\The [user] [pick(S.attacktext)] \the [src]!") + visible_message(span_warning("\The [user] [pick(S.attacktext)] \the [src]!")) playsound(src, S.attack_sound, 100, 1) add_hiddenprint(user) destroy() @@ -160,11 +160,11 @@ update_coverage() // DECONSTRUCTION if(W.has_tool_quality(TOOL_SCREWDRIVER)) - //to_chat(user, "You start to [panel_open ? "close" : "open"] the camera's panel.") + //to_chat(user, span_notice("You start to [panel_open ? "close" : "open"] the camera's panel.")) //if(toggle_panel(user)) // No delay because no one likes screwdrivers trying to be hip and have a duration cooldown panel_open = !panel_open - user.visible_message("[user] screws the camera's panel [panel_open ? "open" : "closed"]!", - "You screw the camera's panel [panel_open ? "open" : "closed"].") + user.visible_message(span_warning("[user] screws the camera's panel [panel_open ? "open" : "closed"]!"), + span_notice("You screw the camera's panel [panel_open ? "open" : "closed"].")) playsound(src, W.usesound, 50, 1) else if((W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/multitool)) && panel_open) @@ -181,10 +181,10 @@ assembly.dir = src.dir if(stat & BROKEN) assembly.state = 2 - to_chat(user, "You repaired \the [src] frame.") + to_chat(user, span_notice("You repaired \the [src] frame.")) else assembly.state = 1 - to_chat(user, "You cut \the [src] free from the wall.") + to_chat(user, span_notice("You cut \the [src] free from the wall.")) new /obj/item/stack/cable_coil(src.loc, length=2) assembly = null //so qdel doesn't eat it. qdel(src) @@ -219,20 +219,20 @@ else if (istype(W, /obj/item/camera_bug)) if (!src.can_use()) - to_chat(user, "Camera non-functional.") + to_chat(user, span_warning("Camera non-functional.")) return if (src.bugged) - to_chat(user, "Camera bug removed.") + to_chat(user, span_notice("Camera bug removed.")) src.bugged = 0 else - to_chat(user, "Camera bugged.") + to_chat(user, span_notice("Camera bugged.")) src.bugged = 1 else if(W.damtype == BRUTE || W.damtype == BURN) //bashing cameras user.setClickCooldown(user.get_attack_speed(W)) if (W.force >= src.toughness) user.do_attack_animation(src) - visible_message("[src] has been [LAZYLEN(W.attack_verb) ? pick(W.attack_verb) : "attacked"] with [W] by [user]!") + visible_message(span_warning("[src] has been [LAZYLEN(W.attack_verb) ? pick(W.attack_verb) : "attacked"] with [W] by [user]!")) if (istype(W, /obj/item)) //is it even possible to get into attackby() with non-items? var/obj/item/I = W if (I.hitsound) @@ -253,17 +253,17 @@ set_status(!src.status) if (!(src.status)) if(user) - visible_message(" [user] has deactivated [src]!") + visible_message(span_notice(" [user] has deactivated [src]!")) else - visible_message(" [src] clicks and shuts down. ") + visible_message(span_notice(" [src] clicks and shuts down. ")) playsound(src, 'sound/items/Wirecutter.ogg', 100, 1) icon_state = "[initial(icon_state)]1" add_hiddenprint(user) else if(user) - visible_message(" [user] has reactivated [src]!") + visible_message(span_notice(" [user] has reactivated [src]!")) else - visible_message(" [src] clicks and reactivates itself. ") + visible_message(span_notice(" [src] clicks and reactivates itself. ")) playsound(src, 'sound/items/Wirecutter.ogg', 100, 1) icon_state = initial(icon_state) add_hiddenprint(user) @@ -380,7 +380,7 @@ return 0 // Do after stuff here - to_chat(user, "You start to weld [src]..") + to_chat(user, span_notice("You start to weld [src]..")) playsound(src, WT.usesound, 50, 1) WT.eyecheck(user) busy = 1 @@ -397,7 +397,7 @@ return if(stat & BROKEN) - to_chat(user, "\The [src] is broken.") + to_chat(user, span_warning("\The [src] is broken.")) return user.set_machine(src) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index e7d8d0ad12..67824ecb3f 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -60,10 +60,10 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W if(C.use(2)) - to_chat(user, "You add wires to the assembly.") + to_chat(user, span_notice("You add wires to the assembly.")) state = 3 else - to_chat(user, "You need 2 coils of wire to wire the assembly.") + to_chat(user, span_warning("You need 2 coils of wire to wire the assembly.")) return else if(W.has_tool_quality(TOOL_WELDER)) @@ -161,7 +161,7 @@ if(!WT.isOn()) return 0 - to_chat(user, "You start to weld the [src]..") + to_chat(user, span_notice("You start to weld the [src]..")) playsound(src, WT.usesound, 50, 1) WT.eyecheck(user) busy = 1 diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 4da6043182..501acc8481 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -47,20 +47,20 @@ loc = sanitize(loc) if(!loc) - to_chat(src, "Must supply a location name") + to_chat(src, span_warning("Must supply a location name")) return if(stored_locations.len >= max_locations) - to_chat(src, "Cannot store additional locations. Remove one first") + to_chat(src, span_warning("Cannot store additional locations. Remove one first")) return if(loc in stored_locations) - to_chat(src, "There is already a stored location by this name") + to_chat(src, span_warning("There is already a stored location by this name")) return var/L = src.eyeobj.getLoc() if (InvalidPlayerTurf(get_turf(L))) - to_chat(src, "Unable to store this location") + to_chat(src, span_warning("Unable to store this location")) return stored_locations[loc] = L @@ -75,7 +75,7 @@ set desc = "Returns to the selected camera location" if (!(loc in stored_locations)) - to_chat(src, "Location [loc] not found") + to_chat(src, span_warning("Location [loc] not found")) return var/L = stored_locations[loc] @@ -87,7 +87,7 @@ set desc = "Deletes the selected camera location" if (!(loc in stored_locations)) - to_chat(src, "Location [loc] not found") + to_chat(src, span_warning("Location [loc] not found")) return stored_locations.Remove(loc) @@ -270,14 +270,14 @@ /mob/living/silicon/robot/tracking_initiated() tracking_entities++ if(tracking_entities == 1 && has_zeroth_law()) - to_chat(src, "Internal camera is currently being accessed.") + to_chat(src, span_warning("Internal camera is currently being accessed.")) /mob/living/proc/tracking_cancelled() /mob/living/silicon/robot/tracking_initiated() tracking_entities-- if(!tracking_entities && has_zeroth_law()) - to_chat(src, "Internal camera is no longer being accessed.") + to_chat(src, span_notice("Internal camera is no longer being accessed.")) #undef TRACKING_POSSIBLE diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 80fcc35fbb..4ff9a5c540 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -52,17 +52,17 @@ if(istype(W, /obj/item/cell) && anchored) if(istype(W, /obj/item/cell/device)) - to_chat(user, "\The [src] isn't fitted for that type of cell.") + to_chat(user, span_warning("\The [src] isn't fitted for that type of cell.")) return if(charging) - to_chat(user, "There is already [charging] in [src].") + to_chat(user, span_warning("There is already [charging] in [src].")) return else var/area/a = loc.loc // Gets our locations location, like a dream within a dream if(!isarea(a)) return if(a.power_equip == 0) // There's no APC in this area, don't try to cheat power! - to_chat(user, "\The [src] blinks red as you try to insert [W]!") + to_chat(user, span_warning("\The [src] blinks red as you try to insert [W]!")) return user.drop_item() @@ -73,7 +73,7 @@ update_icon() else if(W.has_tool_quality(TOOL_WRENCH)) if(charging) - to_chat(user, "Remove [charging] first!") + to_chat(user, span_warning("Remove [charging] first!")) return anchored = !anchored diff --git a/code/game/machinery/clawmachine.dm b/code/game/machinery/clawmachine.dm index 8e10c77799..887eed2131 100644 --- a/code/game/machinery/clawmachine.dm +++ b/code/game/machinery/clawmachine.dm @@ -109,12 +109,12 @@ if(do_after(user, 20 * W.toolspeed)) if(!src) return - to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") + to_chat(user, span_notice("You [anchored? "un" : ""]secured \the [src]!")) anchored = !anchored return if(!anchored) - to_chat(user," The machine isn't secured.") + to_chat(user,span_notice(" The machine isn't secured.")) return var/handled = 0 @@ -153,7 +153,7 @@ to_chat(user,"You dont have enough Thalers to play! ") return - to_chat(user,"You put 5 Thalers in the claw machine and press start.") + to_chat(user,span_notice("You put 5 Thalers in the claw machine and press start.")) cashmoney.worth -= 5 cashmoney.update_icon() @@ -186,14 +186,14 @@ var/delaytime = 7 SECONDS spawn(delaytime) - to_chat(user,"The clam machine lights up and starts to play!") + to_chat(user,span_notice("The clam machine lights up and starts to play!")) if (symbol1 == "one" && symbol2 == "one" && symbol3 == "one") - output = "Hooray! You Win!" + output = span_notice("Hooray! You Win!") winnings = TRUE if (symbol1 == "two" && symbol2 == "two" && symbol3 == "two") - output = "Hooray! You Win!!" + output = span_notice("Hooray! You Win!!") winnings = TRUE icon_state = initial(icon_state) // Set it back to the original iconstate. diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index f6709fbf54..c164af447a 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -120,7 +120,7 @@ clonemind.transfer_to(H) H.ckey = R.ckey - to_chat(H, "Consciousness slowly creeps over you as your body regenerates.
Your recent memories are fuzzy, and it's hard to remember anything from today...
So this is what cloning feels like?") + to_chat(H, span_warning("Consciousness slowly creeps over you as your body regenerates.
Your recent memories are fuzzy, and it's hard to remember anything from today...
So this is what cloning feels like?")) // -- Mode/mind specific stuff goes here callHook("clone", list(H)) @@ -230,19 +230,19 @@ return if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) if(!check_access(W)) - to_chat(user, "Access Denied.") + to_chat(user, span_warning("Access Denied.")) return if((!locked) || (isnull(occupant))) return if((occupant.health < -20) && (occupant.stat != 2)) - to_chat(user, "Access Refused.") + to_chat(user, span_warning("Access Refused.")) return else locked = 0 to_chat(user, "System unlocked.") else if(istype(W,/obj/item/reagent_containers/glass)) if(LAZYLEN(containers) >= container_limit) - to_chat(user, "\The [src] has too many containers loaded!") + to_chat(user, span_warning("\The [src] has too many containers loaded!")) else if(do_after(user, 1 SECOND)) user.visible_message("[user] has loaded \the [W] into \the [src].", "You load \the [W] into \the [src].") containers += W @@ -251,7 +251,7 @@ return else if(W.has_tool_quality(TOOL_WRENCH)) if(locked && (anchored || occupant)) - to_chat(user, "Can not do that while [src] is in use.") + to_chat(user, span_warning("Can not do that while [src] is in use.")) else if(anchored) anchored = FALSE @@ -267,7 +267,7 @@ else if(istype(W, /obj/item/multitool)) var/obj/item/multitool/M = W M.connecting = src - to_chat(user, "You load connection data from [src] to [M].") + to_chat(user, span_notice("You load connection data from [src] to [M].")) M.update_icon() return else diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 656a7e1488..1beb880d15 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -24,7 +24,7 @@ if(P.has_tool_quality(TOOL_WRENCH)) playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) - to_chat(user, "You wrench the frame into place.") + to_chat(user, span_notice("You wrench the frame into place.")) anchored = TRUE state = 1 if(P.has_tool_quality(TOOL_WELDER)) @@ -35,31 +35,31 @@ playsound(src, WT.usesound, 50, 1) if(do_after(user, 20 * WT.toolspeed)) if(!src || !WT.remove_fuel(0, user)) return - to_chat(user, "You deconstruct the frame.") + to_chat(user, span_notice("You deconstruct the frame.")) new /obj/item/stack/material/plasteel( loc, 4) qdel(src) if(1) if(P.has_tool_quality(TOOL_WRENCH)) playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) - to_chat(user, "You unfasten the frame.") + to_chat(user, span_notice("You unfasten the frame.")) anchored = FALSE state = 0 if(istype(P, /obj/item/circuitboard/aicore) && !circuit) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - to_chat(user, "You place the circuit board inside the frame.") + to_chat(user, span_notice("You place the circuit board inside the frame.")) icon_state = "1" circuit = P user.drop_item() P.loc = src if(P.has_tool_quality(TOOL_SCREWDRIVER) && circuit) playsound(src, P.usesound, 50, 1) - to_chat(user, "You screw the circuit board into place.") + to_chat(user, span_notice("You screw the circuit board into place.")) state = 2 icon_state = "2" if(P.has_tool_quality(TOOL_CROWBAR) && circuit) playsound(src, P.usesound, 50, 1) - to_chat(user, "You remove the circuit board.") + to_chat(user, span_notice("You remove the circuit board.")) state = 1 icon_state = "0" circuit.loc = loc @@ -67,21 +67,21 @@ if(2) if(P.has_tool_quality(TOOL_SCREWDRIVER) && circuit) playsound(src, P.usesound, 50, 1) - to_chat(user, "You unfasten the circuit board.") + to_chat(user, span_notice("You unfasten the circuit board.")) state = 1 icon_state = "1" if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = P if (C.get_amount() < 5) - to_chat(user, "You need five coils of wire to add them to the frame.") + to_chat(user, span_warning("You need five coils of wire to add them to the frame.")) return - to_chat(user, "You start to add cables to the frame.") + to_chat(user, span_notice("You start to add cables to the frame.")) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if (do_after(user, 20) && state == 2) if (C.use(5)) state = 3 icon_state = "3" - to_chat(user, "You add cables to the frame.") + to_chat(user, span_notice("You add cables to the frame.")) return if(3) if(P.has_tool_quality(TOOL_WIRECUTTER)) @@ -89,7 +89,7 @@ to_chat(user, "Get that brain out of there first") else playsound(src, P.usesound, 50, 1) - to_chat(user, "You remove the cables.") + to_chat(user, span_notice("You remove the cables.")) state = 2 icon_state = "2" new /obj/item/stack/cable_coil(loc, 5) @@ -97,13 +97,13 @@ if(istype(P, /obj/item/stack/material) && P.get_material_name() == "rglass") var/obj/item/stack/RG = P if (RG.get_amount() < 2) - to_chat(user, "You need two sheets of glass to put in the glass panel.") + to_chat(user, span_warning("You need two sheets of glass to put in the glass panel.")) return - to_chat(user, "You start to put in the glass panel.") + to_chat(user, span_notice("You start to put in the glass panel.")) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if (do_after(user, 20) && state == 3) if(RG.use(2)) - to_chat(user, "You put in the glass panel.") + to_chat(user, span_notice("You put in the glass panel.")) state = 4 icon_state = "4" @@ -132,14 +132,14 @@ if(istype(P, /obj/item/mmi)) var/obj/item/mmi/M = P if(!M.brainmob) - to_chat(user, "Sticking an empty [P] into the frame would sort of defeat the purpose.") + to_chat(user, span_warning("Sticking an empty [P] into the frame would sort of defeat the purpose.")) return if(M.brainmob.stat == 2) - to_chat(user, "Sticking a dead [P] into the frame would sort of defeat the purpose.") + to_chat(user, span_warning("Sticking a dead [P] into the frame would sort of defeat the purpose.")) return if(jobban_isbanned(M.brainmob, JOB_AI)) - to_chat(user, "This [P] does not seem to fit.") + to_chat(user, span_warning("This [P] does not seem to fit.")) return if(M.brainmob.mind) @@ -153,7 +153,7 @@ if(P.has_tool_quality(TOOL_CROWBAR) && brain) playsound(src, P.usesound, 50, 1) - to_chat(user, "You remove the brain.") + to_chat(user, span_notice("You remove the brain.")) brain.loc = loc brain = null icon_state = "3" @@ -161,7 +161,7 @@ if(4) if(P.has_tool_quality(TOOL_CROWBAR)) playsound(src, P.usesound, 50, 1) - to_chat(user, "You remove the glass panel.") + to_chat(user, span_notice("You remove the glass panel.")) state = 3 if (brain) icon_state = "3b" @@ -172,7 +172,7 @@ if(P.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, P.usesound, 50, 1) - to_chat(user, "You connect the monitor.") + to_chat(user, span_notice("You connect the monitor.")) if(!brain) var/open_for_latejoin = tgui_alert(user, "Would you like this core to be open for latejoining AIs?", "Latejoin", list("Yes", "No")) == "Yes" var/obj/structure/AIcore/deactivated/D = new(loc) diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 5da5b95e54..f614a172e0 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -18,16 +18,16 @@ if(I.has_tool_quality(TOOL_SCREWDRIVER)) if(occupier) if(stat & (NOPOWER|BROKEN)) - to_chat(user, "The screws on [name]'s screen won't budge.") + to_chat(user, span_warning("The screws on [name]'s screen won't budge.")) else - to_chat(user, "The screws on [name]'s screen won't budge and it emits a warning beep.") + to_chat(user, span_warning("The screws on [name]'s screen won't budge and it emits a warning beep.")) return if(istype(I, /obj/item/aicard)) if(stat & (NOPOWER|BROKEN)) - to_chat(user, "This terminal isn't functioning right now.") + to_chat(user, span_warning("This terminal isn't functioning right now.")) return if(restoring) - to_chat(user, "Terminal is busy restoring [occupier] right now.") + to_chat(user, span_danger("Terminal is busy restoring [occupier] right now.")) return var/obj/item/aicard/card = I @@ -36,7 +36,7 @@ occupier = null else if(card.carded_ai) var/mob/living/silicon/ai/new_occupant = card.carded_ai - to_chat(new_occupant, "You have been transferred into a stationary terminal. Sadly there is no remote access from here.") + to_chat(new_occupant, span_notice("You have been transferred into a stationary terminal. Sadly there is no remote access from here.")) to_chat(user, "Transfer Successful: [new_occupant] placed within stationary terminal.") new_occupant.forceMove(src) new_occupant.cancel_camera() @@ -45,7 +45,7 @@ card.clear() update_icon() else - to_chat(user, "There is no AI loaded onto this computer, and no AI loaded onto [I]. What exactly are you trying to do here?") + to_chat(user, span_notice("There is no AI loaded onto this computer, and no AI loaded onto [I]. What exactly are you trying to do here?")) return ..() /obj/machinery/computer/aifixer/attack_hand(mob/user) @@ -92,7 +92,7 @@ switch(action) if("PRG_beginReconstruction") if(occupier?.health < 100) - to_chat(usr, "Reconstruction in progress. This will take several minutes.") + to_chat(usr, span_notice("Reconstruction in progress. This will take several minutes.")) playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, FALSE) restoring = TRUE var/mob/observer/dead/ghost = occupier.get_ghost() @@ -132,4 +132,4 @@ if (UNCONSCIOUS) . += "ai-fixer-404" else - . += "ai-fixer-empty" \ No newline at end of file + . += "ai-fixer-empty" diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 26cc59c7c8..e260e6af55 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -1137,7 +1137,7 @@ if(istype(cashmoney, /obj/item/spacecash)) - visible_message("\The [usr] inserts some cash into \the [src].") + visible_message(span_info("\The [usr] inserts some cash into \the [src].")) cashmoney.worth -= gameprice if(cashmoney.worth <= 0) @@ -1151,16 +1151,16 @@ return 1 if(emagged) playsound(src, 'sound/arcade/steal.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE) - to_chat(user, "It doesn't seem to accept that! Seem you'll need to swipe a valid ID.") + to_chat(user, span_info("It doesn't seem to accept that! Seem you'll need to swipe a valid ID.")) ///// Ewallet /obj/machinery/computer/arcade/clawmachine/proc/pay_with_ewallet(var/obj/item/spacecash/ewallet/wallet) if(!emagged) - visible_message("\The [usr] swipes \the [wallet] through \the [src].") + visible_message(span_info("\The [usr] swipes \the [wallet] through \the [src].")) playsound(src, 'sound/machines/id_swipe.ogg', 50, 1) if(gameprice > wallet.worth) - visible_message("Insufficient funds.") + visible_message(span_info("Insufficient funds.")) return 0 else wallet.worth -= gameprice @@ -1168,22 +1168,22 @@ return 1 if(emagged) playsound(src, 'sound/arcade/steal.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE) - to_chat(usr, "It doesn't seem to accept that! Seem you'll need to swipe a valid ID.") + to_chat(usr, span_info("It doesn't seem to accept that! Seem you'll need to swipe a valid ID.")) ///// ID /obj/machinery/computer/arcade/clawmachine/proc/pay_with_card(var/obj/item/card/id/I, var/obj/item/ID_container) if(I==ID_container || ID_container == null) - visible_message("\The [usr] swipes \the [I] through \the [src].") + visible_message(span_info("\The [usr] swipes \the [I] through \the [src].")) else - visible_message("\The [usr] swipes \the [ID_container] through \the [src].") + visible_message(span_info("\The [usr] swipes \the [ID_container] through \the [src].")) playsound(src, 'sound/machines/id_swipe.ogg', 50, 1) var/datum/money_account/customer_account = get_account(I.associated_account_number) if(!customer_account) - visible_message("Error: Unable to access account. Please contact technical support if problem persists.") + visible_message(span_info("Error: Unable to access account. Please contact technical support if problem persists.")) return 0 if(customer_account.suspended) - visible_message("Unable to access account: account suspended.") + visible_message(span_info("Unable to access account: account suspended.")) return 0 // Have the customer punch in the PIN before checking if there's enough money. Prevents people from figuring out acct is @@ -1193,11 +1193,11 @@ customer_account = attempt_account_access(I.associated_account_number, attempt_pin, 2) if(!customer_account) - visible_message("Unable to access account: incorrect credentials.") + visible_message(span_info("Unable to access account: incorrect credentials.")) return 0 if(gameprice > customer_account.money) - visible_message("Insufficient funds in account.") + visible_message(span_info("Insufficient funds in account.")) return 0 else // Okay to move the money at this point @@ -1319,7 +1319,7 @@ /obj/machinery/computer/arcade/clawmachine/emag_act(mob/user) if(!emagged) - to_chat(user, "You modify the claw of the machine. The next one is sure to win! You just have to pay...") + to_chat(user, span_info("You modify the claw of the machine. The next one is sure to win! You just have to pay...")) name = "AlliCo Snag-A-Prize" desc = "Get some goodies, all for you!" instructions = "Swipe a card to play!" @@ -1336,13 +1336,13 @@ var/obj/item/stack/arcadeticket/T = O var/amount = T.get_amount() if(amount <2) - to_chat(user, "You need 2 tickets to claim a prize!") + to_chat(user, span_warning("You need 2 tickets to claim a prize!")) return prizevend(user) T.pay_tickets() T.update_icon() O = T - to_chat(user, "You turn in 2 tickets to the [src] and claim a prize!") + to_chat(user, span_notice("You turn in 2 tickets to the [src] and claim a prize!")) return else ..() //You can now actually deconstruct these. diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 31400b63c6..3ab9d84455 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -38,8 +38,8 @@ /obj/machinery/computer/atmoscontrol/emag_act(var/remaining_carges, var/mob/user) if(!emagged) - user.visible_message("\The [user] does something \the [src], causing the screen to flash!",\ - "You cause the screen to flash as you gain full control.",\ + user.visible_message(span_warning("\The [user] does something \the [src], causing the screen to flash!"),\ + span_warning("You cause the screen to flash as you gain full control."),\ "You hear an electronic warble.") atmos_control.emagged = 1 return 1 diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index cd7f5f67df..01a65651b7 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -16,7 +16,7 @@ if(P.has_tool_quality(TOOL_WRENCH)) playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) - to_chat(user, "You wrench the frame into place.") + to_chat(user, span_notice("You wrench the frame into place.")) src.anchored = TRUE src.state = 1 if(P.has_tool_quality(TOOL_WELDER)) @@ -27,35 +27,35 @@ playsound(src, WT.usesound, 50, 1) if(do_after(user, 20 * WT.toolspeed)) if(!src || !WT.isOn()) return - to_chat(user, "You deconstruct the frame.") + to_chat(user, span_notice("You deconstruct the frame.")) new /obj/item/stack/material/steel( src.loc, 5 ) qdel(src) if(1) if(P.has_tool_quality(TOOL_WRENCH)) playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) - to_chat(user, "You unfasten the frame.") + to_chat(user, span_notice("You unfasten the frame.")) src.anchored = FALSE src.state = 0 if(istype(P, /obj/item/circuitboard) && !circuit) var/obj/item/circuitboard/B = P if(B.board_type == "computer") playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - to_chat(user, "You place the circuit board inside the frame.") + to_chat(user, span_notice("You place the circuit board inside the frame.")) src.icon_state = "1" src.circuit = P user.drop_item() P.loc = src else - to_chat(user, "This frame does not accept circuit boards of this type!") + to_chat(user, span_warning("This frame does not accept circuit boards of this type!")) if(P.has_tool_quality(TOOL_SCREWDRIVER) && circuit) playsound(src, P.usesound, 50, 1) - to_chat(user, "You screw the circuit board into place.") + to_chat(user, span_notice("You screw the circuit board into place.")) src.state = 2 src.icon_state = "2" if(P.has_tool_quality(TOOL_CROWBAR)) && circuit) playsound(src, P.usesound, 50, 1) - to_chat(user, "You remove the circuit board.") + to_chat(user, span_notice("You remove the circuit board.")) src.state = 1 src.icon_state = "0" circuit.loc = src.loc @@ -63,25 +63,25 @@ if(2) if(P.has_tool_quality(TOOL_SCREWDRIVER) && circuit) playsound(src, P.usesound, 50, 1) - to_chat(user, "You unfasten the circuit board.") + to_chat(user, span_notice("You unfasten the circuit board.")) src.state = 1 src.icon_state = "1" if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = P if (C.get_amount() < 5) - to_chat(user, "You need five coils of wire to add them to the frame.") + to_chat(user, span_warning("You need five coils of wire to add them to the frame.")) return - to_chat(user, "You start to add cables to the frame.") + to_chat(user, span_notice("You start to add cables to the frame.")) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20) && state == 2) if (C.use(5)) - to_chat(user, "You add cables to the frame.") + to_chat(user, span_notice("You add cables to the frame.")) state = 3 icon_state = "3" if(3) if(P.has_tool_quality(TOOL_WIRECUTTER)) playsound(src, P.usesound, 50, 1) - to_chat(user, "You remove the cables.") + to_chat(user, span_notice("You remove the cables.")) src.state = 2 src.icon_state = "2" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc ) @@ -90,25 +90,25 @@ if(istype(P, /obj/item/stack/material) && P.get_material_name() == "glass") var/obj/item/stack/G = P if (G.get_amount() < 2) - to_chat(user, "You need two sheets of glass to put in the glass panel.") + to_chat(user, span_warning("You need two sheets of glass to put in the glass panel.")) return playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - to_chat(user, "You start to put in the glass panel.") + to_chat(user, span_notice("You start to put in the glass panel.")) if(do_after(user, 20) && state == 3) if (G.use(2)) - to_chat(user, "You put in the glass panel.") + to_chat(user, span_notice("You put in the glass panel.")) src.state = 4 src.icon_state = "4" if(4) if(P.has_tool_quality(TOOL_CROWBAR)) playsound(src, P.usesound, 50, 1) - to_chat(user, "You remove the glass panel.") + to_chat(user, span_notice("You remove the glass panel.")) src.state = 3 src.icon_state = "3" new /obj/item/stack/material/glass( src.loc, 2 ) if(P.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, P.usesound, 50, 1) - to_chat(user, "You connect the monitor.") + to_chat(user, span_notice("You connect the monitor.")) var/B = new src.circuit.build_path ( src.loc ) src.circuit.construct(B) qdel(src) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index fa72ca5d1a..42ccbfeff3 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -46,7 +46,7 @@ /obj/machinery/computer/security/attack_ai(mob/user) if(isAI(user)) - to_chat(user, "You realise its kind of stupid to access a camera console when you have the entire camera network at your metaphorical fingertips") + to_chat(user, span_notice("You realise its kind of stupid to access a camera console when you have the entire camera network at your metaphorical fingertips")) return attack_hand(user) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index ca4d737c08..a566a6be1a 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -216,7 +216,7 @@ else var/datum/job/jobdatum = SSjob.get_job(t1) if(!jobdatum) - to_chat(usr, "No log exists for this job: [t1]") + to_chat(usr, span_warning("No log exists for this job: [t1]")) return access = jobdatum.get_access() @@ -233,7 +233,7 @@ if(temp_name) modify.registered_name = temp_name else - visible_message("[src] buzzes rudely.") + visible_message(span_notice("[src] buzzes rudely.")) . = TRUE if("account") diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 18924c456e..c98d4fb380 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -106,7 +106,7 @@ pods += P P.connected = src P.name = "[initial(P.name)] #[pods.len]" - to_chat(user, "You connect [P] to [src].") + to_chat(user, span_notice("You connect [P] to [src].")) else return ..() diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 1daca50e93..5d250853c4 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -158,12 +158,12 @@ return 0 if (!user.Adjacent(src)) - to_chat(user, "You can't climb there, the way is blocked.") + to_chat(user, span_danger("You can't climb there, the way is blocked.")) return 0 var/obj/occupied = turf_is_crowded() if(occupied) - to_chat(user, "There's \a [occupied] in the way.") + to_chat(user, span_danger("There's \a [occupied] in the way.")) return 0 return 1 @@ -185,7 +185,7 @@ if (!can_climb(user)) return - usr.visible_message("[user] starts climbing onto \the [src]!") + usr.visible_message(span_warning("[user] starts climbing onto \the [src]!")) LAZYDISTINCTADD(climbers, user) if(!do_after(user,(issmall(user) ? climb_delay * 0.6 : climb_delay))) @@ -199,7 +199,7 @@ usr.forceMove(climb_to(user)) if (get_turf(user) == get_turf(src)) - usr.visible_message("[user] climbs onto \the [src]!") + usr.visible_message(span_warning("[user] climbs onto \the [src]!")) LAZYREMOVE(climbers, user) /obj/machinery/computer/proc/climb_to(var/mob/living/user) @@ -212,11 +212,11 @@ if(!Adjacent(user)) return 0 if (user.restrained() || user.buckled) - to_chat(user, "You need your hands and legs free for this.") + to_chat(user, span_notice("You need your hands and legs free for this.")) return 0 if (user.stat || user.paralysis || user.sleeping || user.lying || user.weakened) return 0 if (isAI(user)) - to_chat(user, "You need hands for this.") + to_chat(user, span_notice("You need hands for this.")) return 0 - return 1 \ No newline at end of file + return 1 diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index 205246628f..b51b0d95c3 100644 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -25,28 +25,28 @@ /obj/item/card/id/guest/examine(mob/user) . = ..() if(world.time < expiration_time) - . += "This pass expires at [worldtime2stationtime(expiration_time)]." + . += span_notice("This pass expires at [worldtime2stationtime(expiration_time)].") else - . += "It expired at [worldtime2stationtime(expiration_time)]." + . += span_warning("It expired at [worldtime2stationtime(expiration_time)].") /obj/item/card/id/guest/read() if(!Adjacent(usr)) return //Too far to read if(world.time > expiration_time) - to_chat(usr, "This pass expired at [worldtime2stationtime(expiration_time)].") + to_chat(usr, span_notice("This pass expired at [worldtime2stationtime(expiration_time)].")) else - to_chat(usr, "This pass expires at [worldtime2stationtime(expiration_time)].") + to_chat(usr, span_notice("This pass expires at [worldtime2stationtime(expiration_time)].")) - to_chat(usr, "It grants access to following areas:") + to_chat(usr, span_notice("It grants access to following areas:")) for (var/A in temp_access) - to_chat(usr, "[get_access_desc(A)].") - to_chat(usr, "Issuing reason: [reason].") + to_chat(usr, span_notice("[get_access_desc(A)].")) + to_chat(usr, span_notice("Issuing reason: [reason].")) return /obj/item/card/id/guest/attack_self(mob/living/user as mob) if(user.a_intent == I_HURT) if(icon_state == "guest-invalid") - to_chat(user, "This guest pass is already deactivated!") + to_chat(user, span_warning("This guest pass is already deactivated!")) return var/confirm = tgui_alert(usr, "Do you really want to deactivate this guest pass? (you can't reactivate it)", "Confirm Deactivation", list("Yes", "No")) @@ -70,7 +70,7 @@ /obj/item/card/id/guest/process() if(expired == 0 && world.time >= expiration_time) - visible_message("\The [src] flashes a few times before turning red.") + visible_message(span_warning("\The [src] flashes a few times before turning red.")) icon_state = "guest-invalid" update_icon() expired = 1 @@ -108,7 +108,7 @@ /obj/machinery/computer/guestpass/attackby(obj/I, mob/user) if(istype(I, /obj/item/card/id/guest)) - to_chat(user, "The guest pass terminal denies to accept the guest pass.") + to_chat(user, span_warning("The guest pass terminal denies to accept the guest pass.")) return if(istype(I, /obj/item/card/id)) if(stat & NOPOWER) //checking for power in here so crowbar and screwdriver and stuff still works. @@ -119,7 +119,7 @@ giver = I SStgui.update_uis(src) else if(giver) - to_chat(user, "There is already ID card inside.") + to_chat(user, span_warning("There is already ID card inside.")) return ..() @@ -206,7 +206,7 @@ if(dur > 0 && dur <= 360) //VOREStation Edit duration = dur else - to_chat(usr, "Invalid duration.") + to_chat(usr, span_warning("Invalid duration.")) if("access") var/A = text2num(params["access"]) if(A in accesses) @@ -215,7 +215,7 @@ if(A in giver.GetAccess()) //Let's make sure the ID card actually has the access. accesses.Add(A) else - to_chat(usr, "Invalid selection, please consult technical support if there are any issues.") + to_chat(usr, span_warning("Invalid selection, please consult technical support if there are any issues.")) log_debug("[key_name_admin(usr)] tried selecting an invalid guest pass terminal option.") if("id") if(giver) @@ -263,7 +263,7 @@ pass.reason = reason pass.name = "guest pass #[number]" else - to_chat(usr, "Cannot issue pass without issuing ID.") + to_chat(usr, span_warning("Cannot issue pass without issuing ID.")) add_fingerprint(usr) return TRUE diff --git a/code/game/machinery/computer/id_restorer_vr.dm b/code/game/machinery/computer/id_restorer_vr.dm index 4ec14ff6eb..c7330ded2c 100644 --- a/code/game/machinery/computer/id_restorer_vr.dm +++ b/code/game/machinery/computer/id_restorer_vr.dm @@ -23,7 +23,7 @@ I.forceMove(src) inserted = I else if(inserted) - to_chat(user, "There is already ID card inside.") + to_chat(user, span_warning("There is already ID card inside.")) return */ ..() @@ -34,7 +34,7 @@ /* if(!inserted) // No point in giving you an option what to do if there's no ID to do things with. - to_chat(user, "No ID is inserted.") + to_chat(user, span_notice("No ID is inserted.")) return var/choice = tgui_alert(user,"What do you want to do?","[src]",list("Restore ID access","Eject ID","Cancel")) @@ -44,29 +44,29 @@ if("Restore ID access") var/mob/living/carbon/human/H = user if(!(istype(H))) - to_chat(user, "Invalid user detected. Access denied.") + to_chat(user, span_warning("Invalid user detected. Access denied.")) flick(icon_fail, src) return else if((H.wear_mask && (H.wear_mask.flags_inv & HIDEFACE)) || (H.head && (H.head.flags_inv & HIDEFACE))) //Face hiding bad - to_chat(user, "Facial recognition scan failed due to physical obstructions. Access denied.") + to_chat(user, span_warning("Facial recognition scan failed due to physical obstructions. Access denied.")) flick(icon_fail, src) return else if(H.get_face_name() == "Unknown" || !(H.real_name == inserted.registered_name)) - to_chat(user, "Facial recognition scan failed. Access denied.") + to_chat(user, span_warning("Facial recognition scan failed. Access denied.")) flick(icon_fail, src) return else if(LAZYLEN(inserted.lost_access) && !(LAZYLEN(inserted.access))) inserted.access = inserted.lost_access inserted.lost_access = list() inserted.desc = "A partially digested card that has seen better days. The damage to access codes, however, appears to have been mitigated." - to_chat(user, "ID access codes successfully restored.") + to_chat(user, span_notice("ID access codes successfully restored.")) flick(icon_success, src) return else if(!(LAZYLEN(inserted.lost_access))) - to_chat(user, "No recent access codes damage detected. Restoration cancelled.") + to_chat(user, span_notice("No recent access codes damage detected. Restoration cancelled.")) return else - to_chat(user, "Terminal encountered unknown error. Contact system administrator or try again.") + to_chat(user, span_warning("Terminal encountered unknown error. Contact system administrator or try again.")) flick(icon_fail, src) return if("Eject ID") @@ -95,4 +95,4 @@ icon_override = 'icons/obj/machines/id_restorer_vr.dmi' /datum/frame/frame_types/id_restorer/get_icon_state(var/state) - return "restorer_b[state]" \ No newline at end of file + return "restorer_b[state]" diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 1e27a43ee8..5f6da818af 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -19,9 +19,9 @@ opened = !opened if(opened) - to_chat(usr, "The access panel is now open.") + to_chat(usr, span_notice("The access panel is now open.")) else - to_chat(usr, "The access panel is now closed.") + to_chat(usr, span_notice("The access panel is now closed.")) return diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 3be78930ed..10b4187e6c 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -36,7 +36,7 @@ return if(O.has_tool_quality(TOOL_SCREWDRIVER) && emag) //Stops people from just unscrewing the monitor and putting it back to get the console working again. - to_chat(user, "It is too hot to mess with!") + to_chat(user, span_warning("It is too hot to mess with!")) return ..() @@ -59,7 +59,7 @@ update_icon() return 1 else - to_chat(user, "A no server error appears on the screen.") + to_chat(user, span_notice("A no server error appears on the screen.")) /obj/machinery/computer/message_monitor/update_icon() if(emag || hacking) @@ -162,10 +162,10 @@ /obj/machinery/computer/message_monitor/proc/BruteForce(mob/user as mob) if(isnull(linkedServer)) - to_chat(user, "Could not complete brute-force: Linked Server Disconnected!") + to_chat(user, span_warning("Could not complete brute-force: Linked Server Disconnected!")) else var/currentKey = linkedServer.decryptkey - to_chat(user, "Brute-force completed! The key is '[currentKey]'.") + to_chat(user, span_warning("Brute-force completed! The key is '[currentKey]'.")) hacking = 0 update_icon() diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 4375472355..7b2dffc6ea 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -54,7 +54,7 @@ playsound(src, W.usesound, 50, 1) if(do_after(user, 20)) if(stat & BROKEN) - to_chat(user, "The broken glass falls out.") + to_chat(user, span_notice("The broken glass falls out.")) var/obj/structure/computerframe/A = new /obj/structure/computerframe( loc ) new /obj/item/material/shard( loc ) @@ -78,7 +78,7 @@ A.anchored = TRUE qdel(src) else - to_chat(to_chat(user, "You disconnect the monitor.")) + to_chat(to_chat(user, span_notice("You disconnect the monitor."))) var/obj/structure/computerframe/A = new /obj/structure/computerframe( loc ) //generate appropriate circuitboard. Accounts for /pod/old computer types @@ -208,7 +208,7 @@ /obj/machinery/computer/pod/old/syndicate/attack_hand(var/mob/user as mob) if(!allowed(user)) - to_chat(user, "Access Denied") + to_chat(user, span_warning("Access Denied")) return else ..() diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index e475d62a92..8e73278ce3 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -87,6 +87,6 @@ return var/obj/item/implant/I = locate(params["imp"]) if(I && I.imp_in) - to_chat(I.imp_in, "You hear a voice in your head saying: '[warning]'") + to_chat(I.imp_in, span_notice("You hear a voice in your head saying: '[warning]'")) . = TRUE add_fingerprint(usr) diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm index dfbeb09d89..201768f360 100644 --- a/code/game/machinery/computer/prisonshuttle.dm +++ b/code/game/machinery/computer/prisonshuttle.dm @@ -28,10 +28,10 @@ var/prison_shuttle_timeleft = 0 /obj/machinery/computer/prison_shuttle/attack_hand(var/mob/user as mob) if(!src.allowed(user) && (!hacked)) - to_chat(user, "Access Denied.") + to_chat(user, span_warning("Access Denied.")) return if(prison_break) - to_chat(user, "Unable to locate shuttle.") + to_chat(user, span_warning("Unable to locate shuttle.")) return if(..()) return @@ -60,11 +60,11 @@ var/prison_shuttle_timeleft = 0 if (href_list["sendtodock"]) if (!prison_can_move()) - to_chat(usr, "The prison shuttle is unable to leave.") + to_chat(usr, span_warning("The prison shuttle is unable to leave.")) return if(!prison_shuttle_at_station|| prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return post_signal("prison") - to_chat(usr, "The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.") + to_chat(usr, span_notice("The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.")) src.temp += "Shuttle sent.

OK" src.updateUsrDialog() prison_shuttle_moving_to_prison = 1 @@ -74,11 +74,11 @@ var/prison_shuttle_timeleft = 0 else if (href_list["sendtostation"]) if (!prison_can_move()) - to_chat(usr, "The prison shuttle is unable to leave.") + to_chat(usr, span_warning("The prison shuttle is unable to leave.")) return if(prison_shuttle_at_station || prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return post_signal("prison") - to_chat(usr, "The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.") + to_chat(usr, span_notice("The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.")) src.temp += "Shuttle sent.

OK" src.updateUsrDialog() prison_shuttle_moving_to_station = 1 @@ -146,7 +146,7 @@ var/prison_shuttle_timeleft = 0 if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return if (!prison_can_move()) - to_chat(usr, "The prison shuttle is unable to leave.") + to_chat(usr, span_warning("The prison shuttle is unable to leave.")) return var/area/start_location = locate(/area/shuttle/prison/prison) @@ -175,7 +175,7 @@ var/prison_shuttle_timeleft = 0 if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return if (!prison_can_move()) - to_chat(usr, "The prison shuttle is unable to leave.") + to_chat(usr, span_warning("The prison shuttle is unable to leave.")) return var/area/start_location = locate(/area/shuttle/prison/station) @@ -211,7 +211,7 @@ var/prison_shuttle_timeleft = 0 /obj/machinery/computer/prison_shuttle/emag_act(var/charges, var/mob/user) if(!hacked) hacked = 1 - to_chat(user, "You disable the lock.") + to_chat(user, span_notice("You disable the lock.")) return 1 #undef PRISON_MOVETIME diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 5af1bdb3d8..68a5da5afd 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -66,12 +66,12 @@ if(isAI(user)) if(R.connected_ai != user) if(telluserwhy) - to_chat(user, "AIs can only control cyborgs which are linked to them.") + to_chat(user, span_warning("AIs can only control cyborgs which are linked to them.")) return FALSE if(isrobot(user)) if(R != user) if(telluserwhy) - to_chat(user, "Cyborgs cannot control other cyborgs.") + to_chat(user, span_warning("Cyborgs cannot control other cyborgs.")) return FALSE return TRUE @@ -156,24 +156,24 @@ return . = FALSE if(!is_authenticated(usr)) - to_chat(usr, "Access denied.") + to_chat(usr, span_warning("Access denied.")) return switch(action) if("arm") // Arms the emergency self-destruct system if(issilicon(usr)) - to_chat(usr, "Access Denied (silicon detected)") + to_chat(usr, span_danger("Access Denied (silicon detected)")) return safety = !safety - to_chat(usr, "You [safety ? "disarm" : "arm"] the emergency self destruct.") + to_chat(usr, span_notice("You [safety ? "disarm" : "arm"] the emergency self destruct.")) . = TRUE if("nuke") // Destroys all accessible cyborgs if safety is disabled if(issilicon(usr)) - to_chat(usr, "Access Denied (silicon detected)") + to_chat(usr, span_danger("Access Denied (silicon detected)")) return if(safety) - to_chat(usr, "Self-destruct aborted - safety active") + to_chat(usr, span_danger("Self-destruct aborted - safety active")) return - message_admins("[key_name_admin(usr)] detonated all cyborgs!") + message_admins(span_notice("[key_name_admin(usr)] detonated all cyborgs!")) log_game("\[key_name(usr)] detonated all cyborgs!") for(var/mob/living/silicon/robot/R in mob_list) if(istype(R, /mob/living/silicon/robot/drone)) @@ -181,9 +181,9 @@ // Ignore antagonistic cyborgs if(R.scrambledcodes) continue - to_chat(R, "Self-destruct command received.") + to_chat(R, span_danger("Self-destruct command received.")) if(R.connected_ai) - to_chat(R.connected_ai, "

ALERT - Cyborg detonation detected: [R.name]
") + to_chat(R.connected_ai, "

[span_alert("ALERT - Cyborg detonation detected: [R.name]")]
") R.self_destruct() . = TRUE if("killbot") // destroys one specific cyborg @@ -191,31 +191,31 @@ if(!can_control(usr, R, TRUE)) return if(R.mind && R.mind.special_role && R.emagged) - to_chat(R, "Extreme danger! Termination codes detected. Scrambling security codes and automatic AI unlink triggered.") + to_chat(R, span_userdanger("Extreme danger! Termination codes detected. Scrambling security codes and automatic AI unlink triggered.")) R.ResetSecurityCodes() . = TRUE return var/turf/T = get_turf(R) - message_admins("[key_name_admin(usr)] detonated [key_name_admin(R)] ([ADMIN_COORDJMP(T)])!") + message_admins(span_notice("[key_name_admin(usr)] detonated [key_name_admin(R)] ([ADMIN_COORDJMP(T)])!")) log_game("\[key_name(usr)] detonated [key_name(R)]!") - to_chat(R, "Self-destruct command received.") + to_chat(R, span_danger("Self-destruct command received.")) if(R.connected_ai) - to_chat(R.connected_ai, "

ALERT - Cyborg detonation detected: [R.name]
") + to_chat(R.connected_ai, "

[span_alert("ALERT - Cyborg detonation detected: [R.name]")]
") R.self_destruct() . = TRUE if("stopbot") // lock or unlock the borg if(isrobot(usr)) - to_chat(usr, "Access Denied.") + to_chat(usr, span_danger("Access Denied.")) return var/mob/living/silicon/robot/R = locate(params["ref"]) if(!can_control(usr, R, TRUE)) return - message_admins("[ADMIN_LOOKUPFLW(usr)] [!R.lockcharge ? "locked down" : "released"] [ADMIN_LOOKUPFLW(R)]!") + message_admins(span_notice("[ADMIN_LOOKUPFLW(usr)] [!R.lockcharge ? "locked down" : "released"] [ADMIN_LOOKUPFLW(R)]!")) log_game("[key_name(usr)] [!R.lockcharge ? "locked down" : "released"] [key_name(R)]!") R.SetLockdown(!R.lockcharge) - to_chat(R, "[!R.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]") + to_chat(R, "[!R.lockcharge ? span_notice("Your lockdown has been lifted!") : span_alert("You have been locked down!")]") if(R.connected_ai) - to_chat(R.connected_ai, "[!R.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [R.name]
") + to_chat(R.connected_ai, "[!R.lockcharge ? span_notice("NOTICE - Cyborg lockdown lifted") : span_alert("ALERT - Cyborg lockdown detected")]: [R.name]
") . = TRUE if("hackbot") // AIs hacking/emagging a borg var/mob/living/silicon/robot/R = locate(params["ref"]) @@ -225,7 +225,7 @@ if(choice != "Yes") return log_game("[key_name(usr)] emagged [key_name(R)] using robotic console!") - message_admins("[key_name_admin(usr)] emagged [key_name_admin(R)] using robotic console!") + message_admins(span_notice("[key_name_admin(usr)] emagged [key_name_admin(R)] using robotic console!")) R.emagged = TRUE - to_chat(R, "Failsafe protocols overridden. New tools available.") + to_chat(R, span_notice("Failsafe protocols overridden. New tools available.")) . = TRUE diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 348a9cef37..7704ec8772 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -38,11 +38,11 @@ if (src.auth_need - src.authorized.len > 0) message_admins("[key_name_admin(user)] has authorized early shuttle launch") log_game("[user.ckey] has authorized early shuttle launch") - to_world("Alert: [src.auth_need - src.authorized.len] authorizations needed until shuttle is launched early") + to_world(span_notice("Alert: [src.auth_need - src.authorized.len] authorizations needed until shuttle is launched early")) else message_admins("[key_name_admin(user)] has launched the shuttle") log_game("[user.ckey] has launched the shuttle early") - to_world("Alert: Shuttle launch time shortened to 10 seconds!") + to_world(span_notice("Alert: Shuttle launch time shortened to 10 seconds!")) emergency_shuttle.set_launch_countdown(10) //src.authorized = null qdel(src.authorized) @@ -50,10 +50,10 @@ if("Repeal") src.authorized -= W:registered_name - to_world("Alert: [src.auth_need - src.authorized.len] authorizations needed until shuttle is launched early") + to_world(span_notice("Alert: [src.auth_need - src.authorized.len] authorizations needed until shuttle is launched early")) if("Abort") - to_world("All authorizations to shortening time for shuttle launch have been revoked!") + to_world(span_notice("All authorizations to shortening time for shuttle launch have been revoked!")) src.authorized.len = 0 src.authorized = list( ) @@ -63,7 +63,7 @@ if(!emagged && !emergency_shuttle.location() && user.get_active_hand() == W) switch(choice) if("Launch") - to_world("Alert: Shuttle launch time shortened to 10 seconds!") + to_world(span_notice("Alert: Shuttle launch time shortened to 10 seconds!")) emergency_shuttle.set_launch_countdown(10) emagged = 1 if("Cancel") diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 29abc4995b..cdd30db5e2 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -88,7 +88,7 @@ var/specops_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - to_chat(M, "You have arrived at [using_map.boss_name]. Operation has ended!") + to_chat(M, span_notice("You have arrived at [using_map.boss_name]. Operation has ended!")) specops_shuttle_at_station = 0 @@ -136,7 +136,7 @@ var/specops_shuttle_timeleft = 0 if (specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - to_chat(usr, "The Special Operations shuttle is unable to leave.") + to_chat(usr, span_warning("The Special Operations shuttle is unable to leave.")) return //Begin Marauder launchpad. @@ -231,7 +231,7 @@ var/specops_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - to_chat(M, "You have arrived to [station_name()]. Commence operation!") + to_chat(M, span_notice("You have arrived to [station_name()]. Commence operation!")) for(var/obj/machinery/computer/specops_shuttle/S in machines) S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY @@ -250,11 +250,11 @@ var/specops_shuttle_timeleft = 0 return attack_hand(user) /obj/machinery/computer/specops_shuttle/emag_act(var/remaining_charges, var/mob/user) - to_chat(user, "The electronic systems in this console are far too advanced for your primitive hacking peripherals.") + to_chat(user, span_notice("The electronic systems in this console are far too advanced for your primitive hacking peripherals.")) /obj/machinery/computer/specops_shuttle/attack_hand(var/mob/user as mob) if(!allowed(user)) - to_chat(user, "Access Denied.") + to_chat(user, span_warning("Access Denied.")) return if(..()) @@ -285,14 +285,14 @@ var/specops_shuttle_timeleft = 0 if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - to_chat(usr, "[using_map.boss_name] will not allow the Special Operations shuttle to return yet.") + to_chat(usr, span_notice("[using_map.boss_name] will not allow the Special Operations shuttle to return yet.")) if(world.timeofday <= specops_shuttle_timereset) if (((world.timeofday - specops_shuttle_timereset)/10) > 60) - to_chat(usr, "[-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!") - to_chat(usr, "[-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!") + to_chat(usr, span_notice("[-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!")) + to_chat(usr, span_notice("[-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!")) return - to_chat(usr, "The Special Operations shuttle will arrive at [using_map.boss_name] in [(SPECOPS_MOVETIME/10)] seconds.") + to_chat(usr, span_notice("The Special Operations shuttle will arrive at [using_map.boss_name] in [(SPECOPS_MOVETIME/10)] seconds.")) temp += "Shuttle departing.

OK" updateUsrDialog() @@ -306,10 +306,10 @@ var/specops_shuttle_timeleft = 0 if(specops_shuttle_at_station || specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - to_chat(usr, "The Special Operations shuttle is unable to leave.") + to_chat(usr, span_warning("The Special Operations shuttle is unable to leave.")) return - to_chat(usr, "The Special Operations shuttle will arrive on [station_name()] in [(SPECOPS_MOVETIME/10)] seconds.") + to_chat(usr, span_notice("The Special Operations shuttle will arrive on [station_name()] in [(SPECOPS_MOVETIME/10)] seconds.")) temp += "Shuttle departing.

OK" updateUsrDialog() diff --git a/code/game/machinery/computer/supply.dm b/code/game/machinery/computer/supply.dm index bf153c0606..dc285601ca 100644 --- a/code/game/machinery/computer/supply.dm +++ b/code/game/machinery/computer/supply.dm @@ -34,7 +34,7 @@ if(..()) return if(!allowed(user)) - to_chat(user, "You don't have the required access to use this console.") + to_chat(user, span_warning("You don't have the required access to use this console.")) return user.set_machine(src) tgui_interact(user) @@ -42,7 +42,7 @@ /obj/machinery/computer/supplycomp/emag_act(var/remaining_charges, var/mob/user) if(!can_order_contraband) - to_chat(user, "Special supplies unlocked.") + to_chat(user, span_notice("Special supplies unlocked.")) authorization |= SUP_CONTRABAND req_access = list() can_order_contraband = TRUE @@ -218,7 +218,7 @@ return FALSE if(world.time < reqtime) - visible_message("[src]'s monitor flashes, \"[reqtime - world.time] seconds remaining until another requisition form may be printed.\"") + visible_message(span_warning("[src]'s monitor flashes, \"[reqtime - world.time] seconds remaining until another requisition form may be printed.\"")) return FALSE var/amount = clamp(tgui_input_number(usr, "How many crates? (0 to 20)", null, null, 20, 0), 0, 20) @@ -228,7 +228,7 @@ var/timeout = world.time + 600 var/reason = sanitize(tgui_input_text(usr, "Reason:","Why do you require this item?","")) if(world.time > timeout) - to_chat(usr, "Error. Request timed out.") + to_chat(usr, span_warning("Error. Request timed out.")) return FALSE if(!reason) return FALSE @@ -276,13 +276,13 @@ return FALSE if(world.time < reqtime) - visible_message("[src]'s monitor flashes, \"[reqtime - world.time] seconds remaining until another requisition form may be printed.\"") + visible_message(span_warning("[src]'s monitor flashes, \"[reqtime - world.time] seconds remaining until another requisition form may be printed.\"")) return FALSE var/timeout = world.time + 600 var/reason = sanitize(tgui_input_text(usr, "Reason:","Why do you require this item?","")) if(world.time > timeout) - to_chat(usr, "Error. Request timed out.") + to_chat(usr, span_warning("Error. Request timed out.")) return FALSE if(!reason) return FALSE @@ -467,14 +467,14 @@ switch(params["mode"]) if("send_away") if (shuttle.forbidden_atoms_check()) - to_chat(usr, "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.") + to_chat(usr, span_warning("For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.")) else shuttle.launch(src) - to_chat(usr, "Initiating launch sequence.") + to_chat(usr, span_notice("Initiating launch sequence.")) if("send_to_station") shuttle.launch(src) - to_chat(usr, "The supply shuttle has been called and will arrive in approximately [round(SSsupply.movetime/600,1)] minutes.") + to_chat(usr, span_notice("The supply shuttle has been called and will arrive in approximately [round(SSsupply.movetime/600,1)] minutes.")) if("cancel_shuttle") shuttle.cancel_launch(src) diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm index 34e0e58ab5..96c625609e 100644 --- a/code/game/machinery/computer/timeclock_vr.dm +++ b/code/game/machinery/computer/timeclock_vr.dm @@ -58,7 +58,7 @@ SStgui.update_uis(src) update_icon() else if(card) - to_chat(user, "There is already ID card inside.") + to_chat(user, span_warning("There is already ID card inside.")) return . = ..() @@ -224,17 +224,17 @@ /obj/machinery/computer/timeclock/proc/checkFace() if(!card) - to_chat(usr, "No ID is inserted.") + to_chat(usr, span_notice("No ID is inserted.")) return FALSE var/mob/living/carbon/human/H = usr if(!(istype(H))) - to_chat(usr, "Invalid user detected. Access denied.") + to_chat(usr, span_warning("Invalid user detected. Access denied.")) return FALSE else if((H.wear_mask && (H.wear_mask.flags_inv & HIDEFACE)) || (H.head && (H.head.flags_inv & HIDEFACE))) //Face hiding bad - to_chat(usr, "Facial recognition scan failed due to physical obstructions. Access denied.") + to_chat(usr, span_warning("Facial recognition scan failed due to physical obstructions. Access denied.")) return FALSE else if(H.get_face_name() == "Unknown" || !(H.real_name == card.registered_name)) - to_chat(usr, "Facial recognition scan failed. Access denied.") + to_chat(usr, span_warning("Facial recognition scan failed. Access denied.")) return FALSE else return TRUE diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 8e3bcd4a39..13dcb633fd 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -31,19 +31,19 @@ if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = P if (C.get_amount() < 5) - to_chat(user, "You need five lengths of cable to add them to the frame.") + to_chat(user, span_warning("You need five lengths of cable to add them to the frame.")) return playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - to_chat(user, "You start to add cables to the frame.") + to_chat(user, span_notice("You start to add cables to the frame.")) if(do_after(user, 20) && state == 1) if(C.use(5)) - to_chat(user, "You add cables to the frame.") + to_chat(user, span_notice("You add cables to the frame.")) state = 2 icon_state = "box_1" else if(P.has_tool_quality(TOOL_WRENCH)) playsound(src, W.usesound, 75, 1) - to_chat(user, "You dismantle the frame") + to_chat(user, span_notice("You dismantle the frame")) new /obj/item/stack/material/steel(src.loc, 5) qdel(src) if(2) @@ -52,11 +52,11 @@ if(B.board_type == "machine") //VOREStation Addition End if(istype(B, /obj/item/circuitboard/quantumpad) && istype(get_area(src), /area/shuttle)) - to_chat(user, "This is too unstable a platform for a quantum pad to operate on!") + to_chat(user, span_warning("This is too unstable a platform for a quantum pad to operate on!")) return //VOREStation Addition End playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - to_chat(user, "You add the circuit board to the frame.") + to_chat(user, span_notice("You add the circuit board to the frame.")) circuit = P user.drop_item() P.loc = src @@ -74,11 +74,11 @@ update_desc() to_chat(user, desc) else - to_chat(user, "This frame does not accept circuit boards of this type!") + to_chat(user, span_warning("This frame does not accept circuit boards of this type!")) else if(P.has_tool_quality(TOOL_WIRECUTTER)) playsound(src, P.usesound, 50, 1) - to_chat(user, "You remove the cables.") + to_chat(user, span_notice("You remove the cables.")) state = 1 icon_state = "box_0" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc ) @@ -91,9 +91,9 @@ circuit.loc = src.loc circuit = null if(components.len == 0) - to_chat(user, "You remove the circuit board.") + to_chat(user, span_notice("You remove the circuit board.")) else - to_chat(user, "You remove the circuit board and other components.") + to_chat(user, span_notice("You remove the circuit board and other components.")) for(var/obj/item/W in components) W.loc = src.loc desc = initial(desc) @@ -157,4 +157,4 @@ break to_chat(user, desc) if(P && P.loc != src && !istype(P, /obj/item/stack/cable_coil)) - to_chat(user, "You cannot add that component to the machine!") + to_chat(user, span_warning("You cannot add that component to the machine!")) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 5c3a50c3db..dd50712cb5 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -90,7 +90,7 @@ return if(panel_open) - to_chat(usr, "Close the maintenance panel first.") + to_chat(usr, span_boldnotice("Close the maintenance panel first.")) return tgui_interact(user) @@ -168,7 +168,7 @@ /obj/machinery/atmospherics/unary/cryo_cell/attackby(var/obj/item/G as obj, var/mob/user as mob) if(istype(G, /obj/item/reagent_containers/glass)) if(beaker) - to_chat(user, "A beaker is already loaded into the machine.") + to_chat(user, span_warning("A beaker is already loaded into the machine.")) return beaker = G @@ -182,7 +182,7 @@ if(!ismob(grab.affecting)) return if(occupant) - to_chat(user,"\The [src] is already occupied by [occupant].") + to_chat(user,span_warning("\The [src] is already occupied by [occupant].")) if(grab.affecting.has_buckled_mobs()) to_chat(user, span_warning("\The [grab.affecting] has other entities attached to it. Remove them first.")) return @@ -281,19 +281,19 @@ /obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/M as mob) if(stat & (NOPOWER|BROKEN)) - to_chat(usr, "The cryo cell is not functioning.") + to_chat(usr, span_warning("The cryo cell is not functioning.")) return if(!istype(M)) - to_chat(usr, "The cryo cell cannot handle such a lifeform!") + to_chat(usr, span_danger("The cryo cell cannot handle such a lifeform!")) return if(occupant) - to_chat(usr, "The cryo cell is already occupied!") + to_chat(usr, span_danger("The cryo cell is already occupied!")) return if(M.abiotic()) - to_chat(usr, "Subject may not have abiotic items on.") + to_chat(usr, span_warning("Subject may not have abiotic items on.")) return if(!node) - to_chat(usr, "The cell is not correctly connected to its pipe network!") + to_chat(usr, span_warning("The cell is not correctly connected to its pipe network!")) return if(M.client) M.client.perspective = EYE_PERSPECTIVE @@ -302,7 +302,7 @@ M.loc = src M.ExtinguishMob() if(M.health > -100 && (M.health < 0 || M.sleeping)) - to_chat(M, "You feel a cold liquid surround you. Your skin starts to freeze up.") + to_chat(M, span_notice("You feel a cold liquid surround you. Your skin starts to freeze up.")) occupant = M buckle_mob(occupant, forced = TRUE, check_loc = FALSE) vis_contents |= occupant @@ -322,7 +322,7 @@ if(usr == occupant)//If the user is inside the tube... if(usr.stat == 2)//and he's not dead.... return - to_chat(usr, "Release sequence activated. This will take two minutes.") + to_chat(usr, span_notice("Release sequence activated. This will take two minutes.")) sleep(1200) if(!src || !usr || !occupant || (occupant != usr)) //Check if someone's released/replaced/bombed him already return diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 379011f9f4..5c2ab885be 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -124,15 +124,15 @@ return if(!LAZYLEN(frozen_items)) - to_chat(usr, "There is nothing to recover from storage.") + to_chat(usr, span_notice("There is nothing to recover from storage.")) return var/obj/item/I = locate(params["ref"]) in frozen_items if(!I) - to_chat(usr, "\The [I] is no longer in storage.") + to_chat(usr, span_notice("\The [I] is no longer in storage.")) return - visible_message("The console beeps happily as it disgorges [I].") + visible_message(span_notice("The console beeps happily as it disgorges [I].")) I.forceMove(get_turf(src)) frozen_items -= I @@ -141,10 +141,10 @@ return if(!LAZYLEN(frozen_items)) - to_chat(usr, "There is nothing to recover from storage.") + to_chat(usr, span_notice("There is nothing to recover from storage.")) return - visible_message("The console beeps happily as it disgorges the desired objects.") + visible_message(span_notice("The console beeps happily as it disgorges the desired objects.")) for(var/obj/item/I in frozen_items) I.forceMove(get_turf(src)) @@ -465,7 +465,7 @@ // them win or lose based on cryo is silly so we remove the objective. if(O.target == to_despawn.mind) if(O.owner && O.owner.current) - to_chat(O.owner.current, "You get the feeling your target is no longer within your reach...") + to_chat(O.owner.current, span_warning("You get the feeling your target is no longer within your reach...")) qdel(O) //VOREStation Edit - Resleeving. @@ -537,7 +537,7 @@ if(depart_announce) announce.autosay("[to_despawn.real_name][departing_job ? ", [departing_job], " : " "][on_store_message]", "[on_store_name]", announce_channel, using_map.get_map_levels(z, TRUE, om_range = DEFAULT_OVERMAP_RANGE)) - visible_message("\The [initial(name)] [on_store_visible_message_1] [to_despawn.real_name] [on_store_visible_message_2]", 3) + visible_message(span_notice("\The [initial(name)] [on_store_visible_message_1] [to_despawn.real_name] [on_store_visible_message_2]"), 3) //VOREStation Edit End @@ -561,7 +561,7 @@ var/obj/item/grab/grab = G if(occupant) - to_chat(user, "\The [src] is in use.") + to_chat(user, span_notice("\The [src] is in use.")) return if(!ismob(grab.affecting)) @@ -606,7 +606,7 @@ return if(occupant) - to_chat(usr, "\The [src] is in use.") + to_chat(usr, span_notice("\The [src] is in use.")) return if(isliving(usr)) @@ -623,7 +623,7 @@ return if(occupant) - to_chat(usr, "\The [src] is in use.") + to_chat(usr, span_notice("\The [src] is in use.")) return usr.stop_pulling() @@ -639,8 +639,8 @@ icon_state = occupied_icon_state - to_chat(usr, "[on_enter_occupant_message]") - to_chat(usr, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") + to_chat(usr, span_notice("[on_enter_occupant_message]")) + to_chat(usr, span_notice("If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.")) time_entered = world.time @@ -695,7 +695,7 @@ if(!M) return if(occupant) - to_chat(user, "\The [src] is already occupied.") + to_chat(user, span_warning("\The [src] is already occupied.")) return var/willing = null //We don't want to allow people to be forced into despawning. @@ -715,7 +715,7 @@ if(do_after(user, 20)) if(occupant) - to_chat(user, "\The [src] is already occupied.") + to_chat(user, span_warning("\The [src] is already occupied.")) return M.forceMove(src) @@ -726,8 +726,8 @@ icon_state = occupied_icon_state - to_chat(M, "[on_enter_occupant_message]") - to_chat(M, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") + to_chat(M, span_notice("[on_enter_occupant_message]")) + to_chat(M, span_notice("If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.")) set_occupant(M) time_entered = world.time if(ishuman(M) && applies_stasis) @@ -739,7 +739,7 @@ // Book keeping! var/turf/location = get_turf(src) log_admin("[key_name_admin(M)] has entered a stasis pod. (JMP)") - message_admins("[key_name_admin(M)] has entered a stasis pod.") + message_admins(span_notice("[key_name_admin(M)] has entered a stasis pod.")) //Despawning occurs when process() is called with an occupant without a client. add_fingerprint(M) diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 9cf8435556..d8a5426c63 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -44,7 +44,7 @@ Deployable items var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, src) s.start() - visible_message("BZZzZZzZZzZT") + visible_message(span_warning("BZZzZZzZZzZT")) return return else if(W.has_tool_quality(TOOL_WRENCH)) @@ -52,12 +52,12 @@ Deployable items health = maxhealth emagged = 0 req_access = list(access_security) - visible_message("[user] repairs \the [src]!") + visible_message(span_warning("[user] repairs \the [src]!")) return else if(emagged > 0) emagged = 0 req_access = list(access_security) - visible_message("[user] repairs \the [src]!") + visible_message(span_warning("[user] repairs \the [src]!")) return return else @@ -76,7 +76,7 @@ Deployable items return /obj/machinery/deployable/barrier/attack_generic(var/mob/user, var/damage, var/attack_verb) - visible_message("[user] [attack_verb] the [src]!") + visible_message(span_danger("[user] [attack_verb] the [src]!")) playsound(src, 'sound/weapons/smash.ogg', 50, 1) user.do_attack_animation(src) health -= damage @@ -113,7 +113,7 @@ Deployable items /obj/machinery/deployable/barrier/proc/explode() - visible_message("[src] blows apart!") + visible_message(span_danger("[src] blows apart!")) var/turf/Tsec = get_turf(src) /* var/obj/item/stack/rods/ =*/ @@ -136,7 +136,7 @@ Deployable items var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, src) s.start() - visible_message("BZZzZZzZZzZT") + visible_message(span_warning("BZZzZZzZZzZT")) return 1 else if(emagged == 1) emagged = 2 @@ -144,5 +144,5 @@ Deployable items var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, src) s.start() - visible_message("BZZzZZzZZzZT") - return 1 \ No newline at end of file + visible_message(span_warning("BZZzZZzZZzZT")) + return 1 diff --git a/code/game/machinery/deployable_vr.dm b/code/game/machinery/deployable_vr.dm index 7a1a59fef0..9e332b218d 100644 --- a/code/game/machinery/deployable_vr.dm +++ b/code/game/machinery/deployable_vr.dm @@ -39,7 +39,7 @@ density = FALSE name = initial(name) desc = initial(desc) - visible_message("[src] topples over!") + visible_message(span_warning("[src] topples over!")) /obj/structure/barricade/cutout/proc/untopple() if(!toppled) @@ -49,7 +49,7 @@ density = TRUE name = fake_name desc = fake_desc - visible_message("[src] is uprighted to their proper position.") + visible_message(span_warning("[src] is uprighted to their proper position.")) /obj/structure/barricade/cutout/CheckHealth() if(!toppled && (health < (maxhealth/2))) @@ -67,7 +67,7 @@ . = ..() if(Adjacent(user)) - . += "... from this distance, they seem to be made of [material.name] ..." + . += span_notice("... from this distance, they seem to be made of [material.name] ...") /obj/structure/barricade/cutout/attackby(var/obj/I, var/mob/user) if(is_type_in_list(I, painters)) diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index eb3a014662..23e19a54a0 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -43,7 +43,7 @@ return if(!allowed(user) && (wires & 1)) - to_chat(user, "Access Denied") + to_chat(user, span_warning("Access Denied")) flick("doorctrl-denied",src) return diff --git a/code/game/machinery/doorbell_vr.dm b/code/game/machinery/doorbell_vr.dm index a3aea743e1..c1343846c4 100644 --- a/code/game/machinery/doorbell_vr.dm +++ b/code/game/machinery/doorbell_vr.dm @@ -56,7 +56,7 @@ if(M.connectable && istype(M.connectable, /obj/machinery/button/doorbell)) var/obj/machinery/button/doorbell/B = M.connectable id_tag = B.id - to_chat(user, "You upload the data from \the [W]'s buffer.") + to_chat(user, span_notice("You upload the data from \the [W]'s buffer.")) return ..() @@ -135,12 +135,12 @@ else if(panel_open && istype(W, /obj/item/multitool)) var/obj/item/multitool/M = W M.connectable = src - to_chat(user, "You save the data in \the [M]'s buffer.") + to_chat(user, span_notice("You save the data in \the [M]'s buffer.")) else if(W.has_tool_quality(TOOL_WRENCH)) - to_chat(user, "You start to unwrench \the [src].") + to_chat(user, span_notice("You start to unwrench \the [src].")) playsound(src, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 15) && !QDELETED(src)) - to_chat(user, "You unwrench \the [src].") + to_chat(user, span_notice("You unwrench \the [src].")) new /obj/item/frame/doorbell(src.loc) qdel(src) return diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 93cba9bc7c..c61d8950c0 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -65,7 +65,7 @@ if(stat & (BROKEN|NOPOWER)) if(damage >= STRUCTURE_MIN_DAMAGE_THRESHOLD) if(src.locked || src.welded) - visible_message("\The [user] begins breaking into \the [src] internals!") + visible_message(span_danger("\The [user] begins breaking into \the [src] internals!")) user.set_AI_busy(TRUE) // If the mob doesn't have an AI attached, this won't do anything. if(do_after(user,10 SECONDS,src)) src.locked = 0 @@ -76,13 +76,13 @@ src.shock(user, 100) user.set_AI_busy(FALSE) else if(src.density) - visible_message("\The [user] forces \the [src] open!") + visible_message(span_danger("\The [user] forces \the [src] open!")) open(1) else - visible_message("\The [user] forces \the [src] closed!") + visible_message(span_danger("\The [user] forces \the [src] closed!")) close(1) else - visible_message("\The [user] strains fruitlessly to force \the [src] [density ? "open" : "closed"].") + visible_message(span_notice("\The [user] strains fruitlessly to force \the [src] [density ? "open" : "closed"].")) return ..() @@ -91,10 +91,10 @@ var/mob/living/carbon/human/X = user if(istype(X.species, /datum/species/xenos)) if(src.locked || src.welded) - visible_message("\The [user] begins tearing into \the [src] internals!") + visible_message(span_alium("\The [user] begins tearing into \the [src] internals!")) src.do_animate("deny") if(do_after(user,15 SECONDS,src)) - visible_message("\The [user] tears \the [src] open, sparks flying from its electronics!") + visible_message(span_danger("\The [user] tears \the [src] open, sparks flying from its electronics!")) src.do_animate("spark") playsound(src, 'sound/machines/door/airlock_tear_apart.ogg', 100, 1, volume_channel = VOLUME_CHANNEL_DOORS) src.locked = 0 @@ -103,17 +103,17 @@ open(1) src.set_broken() //These aren't emags, these be CLAWS else if(src.density) - visible_message("\The [user] begins forcing \the [src] open!") + visible_message(span_alium("\The [user] begins forcing \the [src] open!")) if(do_after(user, 5 SECONDS,src)) playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1, volume_channel = VOLUME_CHANNEL_DOORS) - visible_message("\The [user] forces \the [src] open!") + visible_message(span_danger("\The [user] forces \the [src] open!")) open(1) else - visible_message("\The [user] forces \the [src] closed!") + visible_message(span_danger("\The [user] forces \the [src] closed!")) close(1) else src.do_animate("deny") - visible_message("\The [user] strains fruitlessly to force \the [src] [density ? "open" : "closed"].") + visible_message(span_notice("\The [user] strains fruitlessly to force \the [src] [density ? "open" : "closed"].")) return ..() @@ -670,7 +670,7 @@ About the new airlock wires panel: else /*if(src.justzap)*/ return else if(user.hallucination > 50 && prob(10) && src.operating == 0) - to_chat(user, "You feel a powerful shock course through your body!") + to_chat(user, span_danger("You feel a powerful shock course through your body!")) user.halloss += 10 user.stunned += 10 return @@ -1007,7 +1007,7 @@ About the new airlock wires panel: if(!Adjacent(user)) return else if(user.a_intent == I_HURT) - src.visible_message("[user] hammers on \the [src]!", "Someone hammers loudly on \the [src]!") + src.visible_message(span_warning("[user] hammers on \the [src]!"), span_warning("Someone hammers loudly on \the [src]!")) src.add_fingerprint(user) if(icon_state == "door_closed" && arePowerSystemsOn()) flick("door_deny", src) @@ -1043,14 +1043,14 @@ About the new airlock wires panel: loseMainPower() update_icon() else - to_chat(usr, "Main power is already offline.") + to_chat(usr, span_warning("Main power is already offline.")) . = TRUE if("disrupt-backup") if(!backup_power_lost_until) loseBackupPower() update_icon() else - to_chat(usr, "Backup power is already offline.") + to_chat(usr, span_warning("Backup power is already offline.")) . = TRUE if("shock-restore") electrify(0, 1) @@ -1105,27 +1105,27 @@ About the new airlock wires panel: if(!user_allowed(user)) return if(wires.is_cut(WIRE_DOOR_BOLTS)) - to_chat(user, "The door bolt drop wire is cut - you can't toggle the door bolts.") + to_chat(user, span_warning("The door bolt drop wire is cut - you can't toggle the door bolts.")) return if(locked) if(!arePowerSystemsOn()) - to_chat(user, "The door has no power - you can't raise the door bolts.") + to_chat(user, span_warning("The door has no power - you can't raise the door bolts.")) else unlock() - to_chat(user, "The door bolts have been raised.") + to_chat(user, span_notice("The door bolts have been raised.")) // log_combat(user, src, "unbolted") else lock() - to_chat(user, "The door bolts have been dropped.") + to_chat(user, span_warning("The door bolts have been dropped.")) // log_combat(user, src, "bolted") /obj/machinery/door/airlock/proc/user_toggle_open(mob/user) if(!user_allowed(user)) return if(welded) - to_chat(user, text("The airlock has been welded shut!")) + to_chat(user, span_warning("The airlock has been welded shut!")) else if(locked) - to_chat(user, text("The door bolts are down!")) + to_chat(user, span_warning("The door bolts are down!")) else if(!density) close() else @@ -1167,7 +1167,7 @@ About the new airlock wires panel: else if(C.has_tool_quality(TOOL_SCREWDRIVER)) if (src.p_open) if (stat & BROKEN) - to_chat(usr, "The panel is broken and cannot be closed.") + to_chat(usr, span_warning("The panel is broken and cannot be closed.")) else src.p_open = FALSE playsound(src, C.usesound, 50, 1) @@ -1192,7 +1192,7 @@ About the new airlock wires panel: playsound(src, C.usesound, 75, 1) user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.") if(do_after(user,40 * C.toolspeed)) - to_chat(user, "You removed the airlock electronics!") + to_chat(user, span_notice("You removed the airlock electronics!")) var/obj/structure/door_assembly/da = new assembly_type(src.loc) if (istype(da, /obj/structure/door_assembly/multi_tile)) @@ -1220,9 +1220,9 @@ About the new airlock wires panel: qdel(src) return else if(arePowerSystemsOn()) - to_chat(user, "The airlock's motors resist your efforts to force it.") + to_chat(user, span_notice("The airlock's motors resist your efforts to force it.")) else if(locked) - to_chat(user, "The airlock's bolts prevent it from being forced.") + to_chat(user, span_notice("The airlock's bolts prevent it from being forced.")) else if(density) spawn(0) open(1) @@ -1234,12 +1234,12 @@ About the new airlock wires panel: var/obj/item/W = C if((W.pry == 1) && !arePowerSystemsOn()) if(locked) - to_chat(user, "The airlock's bolts prevent it from being forced.") + to_chat(user, span_notice("The airlock's bolts prevent it from being forced.")) else if( !welded && !operating ) if(istype(C, /obj/item/material/twohanded/fireaxe)) // If this is a fireaxe, make sure it's held in two hands. var/obj/item/material/twohanded/fireaxe/F = C if(!F.wielded) - to_chat(user, "You need to be wielding \the [F] to do that.") + to_chat(user, span_warning("You need to be wielding \the [F] to do that.")) return // At this point, it's an armblade or a fireaxe that passed the wielded test, let's try to open it. if(density) diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index b9f4ea4f85..5d8fd2c688 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -263,7 +263,7 @@ /obj/machinery/access_button/attack_hand(mob/user) add_fingerprint(usr) if(!allowed(user)) - to_chat(user, "Access Denied") + to_chat(user, span_warning("Access Denied")) else if(radio_connection) var/datum/signal/signal = new diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 9b84376f9a..039e211106 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -19,7 +19,7 @@ /obj/item/airlock_electronics/emag_act(var/remaining_charges, var/mob/user) if(!emagged) emagged = 1 - to_chat(user, "You remove the access restrictions on [src]!") + to_chat(user, span_notice("You remove the access restrictions on [src]!")) return 1 /obj/item/airlock_electronics/attack_self(mob/user as mob) @@ -149,5 +149,5 @@ secure = 1 /obj/item/airlock_electronics/secure/emag_act(var/remaining_charges, var/mob/user) - to_chat(user, "You don't appear to be able to bypass this hardened device!") + to_chat(user, span_warning("You don't appear to be able to bypass this hardened device!")) return -1 diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index 6c2748fe55..355f561c1f 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -158,7 +158,7 @@ if(istype(C,/obj/item/material/twohanded/fireaxe)) // Fireaxes need to be in both hands to pry. var/obj/item/material/twohanded/fireaxe/F = C if(!F.wielded) - to_chat(user, "You need to be wielding \the [F] to do that.") + to_chat(user, span_warning("You need to be wielding \the [F] to do that.")) return // If we're at this point, it's a fireaxe in both hands or something else that doesn't care for twohanding. @@ -166,7 +166,7 @@ force_toggle(1, user) else - to_chat(user, "[src]'s motors resist your effort.") + to_chat(user, span_notice("[src]'s motors resist your effort.")) return @@ -176,9 +176,9 @@ if(W.damtype == BRUTE || W.damtype == BURN) user.do_attack_animation(src) if(W.force < min_force) - user.visible_message("\The [user] hits \the [src] with \the [W] with no visible effect.") + user.visible_message(span_danger("\The [user] hits \the [src] with \the [W] with no visible effect.")) else - user.visible_message("\The [user] forcefully strikes \the [src] with \the [W]!") + user.visible_message(span_danger("\The [user] forcefully strikes \the [src] with \the [W]!")) playsound(src, hitsound, 100, 1) take_damage(W.force*0.35) //it's a blast door, it should take a while. -Luke return @@ -186,19 +186,19 @@ else if(istype(C, /obj/item/stack/material) && C.get_material_name() == "plasteel") // Repairing. var/amt = CEILING((maxhealth - health)/150, 1) if(!amt) - to_chat(user, "\The [src] is already fully repaired.") + to_chat(user, span_notice("\The [src] is already fully repaired.")) return var/obj/item/stack/P = C if(P.get_amount() < amt) - to_chat(user, "You don't have enough sheets to repair this! You need at least [amt] sheets.") + to_chat(user, span_warning("You don't have enough sheets to repair this! You need at least [amt] sheets.")) return - to_chat(user, "You begin repairing [src]...") + to_chat(user, span_notice("You begin repairing [src]...")) if(do_after(usr, 30)) if(P.use(amt)) - to_chat(user, "You have repaired \The [src]") + to_chat(user, span_notice("You have repaired \The [src]")) src.repair() else - to_chat(user, "You don't have enough sheets to repair this! You need at least [amt] sheets.") + to_chat(user, span_warning("You don't have enough sheets to repair this! You need at least [amt] sheets.")) else if(src.density && (user.a_intent == I_HURT)) //If we can't pry it open and it's not a weapon.... Eh, let's attack it anyway. var/obj/item/W = C @@ -206,9 +206,9 @@ if(istype(W) && (W.damtype == BRUTE || W.damtype == BURN)) user.do_attack_animation(src) if(W.force < min_force) //No actual non-weapon item shouls have a force greater than the min_force, but let's include this just in case. - user.visible_message("\The [user] hits \the [src] with \the [W] with no visible effect.") + user.visible_message(span_danger("\The [user] hits \the [src] with \the [W] with no visible effect.")) else - user.visible_message("\The [user] forcefully strikes \the [src] with \the [W]!") + user.visible_message(span_danger("\The [user] forcefully strikes \the [src] with \the [W]!")) playsound(src, hitsound, 100, 1) take_damage(W.force*0.15) //If the item isn't a weapon, let's make this take longer than usual to break it down. return @@ -221,19 +221,19 @@ var/mob/living/carbon/human/X = user if(istype(X.species, /datum/species/xenos)) if(src.density) - visible_message("\The [user] begins forcing \the [src] open!") + visible_message(span_alium("\The [user] begins forcing \the [src] open!")) if(do_after(user, 15 SECONDS,src)) playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1) - visible_message("\The [user] forces \the [src] open!") + visible_message(span_danger("\The [user] forces \the [src] open!")) force_open(1) else - visible_message("\The [user] begins forcing \the [src] closed!") + visible_message(span_alium("\The [user] begins forcing \the [src] closed!")) if(do_after(user, 5 SECONDS,src)) playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1) - visible_message("\The [user] forces \the [src] closed!") + visible_message(span_danger("\The [user] forces \the [src] closed!")) force_close(1) else - visible_message("\The [user] strains fruitlessly to force \the [src] [density ? "open" : "closed"].") + visible_message(span_notice("\The [user] strains fruitlessly to force \the [src] [density ? "open" : "closed"].")) return ..() @@ -245,18 +245,18 @@ if(damage >= STRUCTURE_MIN_DAMAGE_THRESHOLD) user.set_AI_busy(TRUE) // If the mob doesn't have an AI attached, this won't do anything. if(src.density) - visible_message("\The [user] starts forcing \the [src] open!") + visible_message(span_danger("\The [user] starts forcing \the [src] open!")) if(do_after(user, 5 SECONDS, src)) - visible_message("\The [user] forces \the [src] open!") + visible_message(span_danger("\The [user] forces \the [src] open!")) force_open(1) else - visible_message("\The [user] starts forcing \the [src] closed!") + visible_message(span_danger("\The [user] starts forcing \the [src] closed!")) if(do_after(user, 2 SECONDS, src)) - visible_message("\The [user] forces \the [src] closed!") + visible_message(span_danger("\The [user] forces \the [src] closed!")) force_close(1) user.set_AI_busy(FALSE) else - visible_message("\The [user] strains fruitlessly to force \the [src] [density ? "open" : "closed"].") + visible_message(span_notice("\The [user] strains fruitlessly to force \the [src] [density ? "open" : "closed"].")) return ..() diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 3bf8461081..84a8a1e2e0 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -179,7 +179,7 @@ . = TRUE if(!allowed(usr)) - to_chat(usr, "Access denied.") + to_chat(usr, span_warning("Access denied.")) return FALSE switch(action) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 337d01981f..fec41756e0 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -43,7 +43,7 @@ if(isanimal(user)) var/mob/living/simple_mob/S = user if(damage >= STRUCTURE_MIN_DAMAGE_THRESHOLD) - visible_message("\The [user] smashes into [src]!") + visible_message(span_danger("\The [user] smashes into [src]!")) playsound(src, S.attack_sound, 75, 1) take_damage(damage) else @@ -178,7 +178,7 @@ if (damage > 90) destroy_hits-- if (destroy_hits <= 0) - visible_message("\The [src.name] disintegrates!") + visible_message(span_danger("\The [src.name] disintegrates!")) switch (Proj.damage_type) if(BRUTE) new /obj/item/stack/material/steel(src.loc, 2) @@ -196,7 +196,7 @@ /obj/machinery/door/hitby(AM as mob|obj, var/speed=5) ..() - visible_message("[src.name] was hit by [AM].") + visible_message(span_danger("[src.name] was hit by [AM].")) var/tforce = 0 if(ismob(AM)) tforce = 15 * (speed/5) @@ -225,16 +225,16 @@ return //VOREStation begin: Fireproofing if(health < maxhealth && I.has_tool_quality(TOOL_WELDER)) if(!density) - to_chat(user, "\The [src] must be closed before you can repair it.") + to_chat(user, span_warning("\The [src] must be closed before you can repair it.")) return var/obj/item/weldingtool/welder = I.get_welder() if(welder.remove_fuel(0,user)) - to_chat(user, "You start to fix dents and repair \the [src].") + to_chat(user, span_notice("You start to fix dents and repair \the [src].")) playsound(src, welder.usesound, 50, 1) var/repairtime = maxhealth - health //Since we're not using materials anymore... We'll just calculate how much damage there is to repair. if(do_after(user, repairtime * welder.toolspeed) && welder && welder.isOn()) - to_chat(user, "You finish repairing the damage to \the [src].") + to_chat(user, span_notice("You finish repairing the damage to \the [src].")) health = maxhealth update_icon() return @@ -245,9 +245,9 @@ if(W.damtype == BRUTE || W.damtype == BURN) user.do_attack_animation(src) if(W.force < min_force) - user.visible_message("\The [user] hits \the [src] with \the [W] with no visible effect.") + user.visible_message(span_danger("\The [user] hits \the [src] with \the [W] with no visible effect.")) else - user.visible_message("\The [user] forcefully strikes \the [src] with \the [W]!") + user.visible_message(span_danger("\The [user] forcefully strikes \the [src] with \the [W]!")) playsound(src, hitsound, 100, 1) take_damage(W.force) return diff --git a/code/game/machinery/doors/door_vr.dm b/code/game/machinery/doors/door_vr.dm index 015ca8fa4f..be8d84fefc 100644 --- a/code/game/machinery/doors/door_vr.dm +++ b/code/game/machinery/doors/door_vr.dm @@ -29,7 +29,7 @@ if (burndamage && health <= 0) //once they break, start taking damage to destroy_hits destroy_hits -= (burndamage / destroytime) if (destroy_hits <= 0) - visible_message("\The [src.name] disintegrates!") + visible_message(span_danger("\The [src.name] disintegrates!")) new /obj/effect/decal/cleanable/ash(src.loc) // Turn it to ashes! qdel(src) take_damage(burndamage) @@ -40,13 +40,13 @@ /obj/machinery/door/proc/attackby_vr(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/stack/material) && I.get_material_name() == "plasteel") if(heat_proof) - to_chat(user, "\The [src] is already reinforced.") + to_chat(user, span_warning("\The [src] is already reinforced.")) return TRUE if((stat & BROKEN) || (health < maxhealth)) - to_chat(user, "It looks like \the [src] broken. Repair it before reinforcing it.") + to_chat(user, span_notice("It looks like \the [src] broken. Repair it before reinforcing it.")) return TRUE if(!density) - to_chat(user, "\The [src] must be closed before you can reinforce it.") + to_chat(user, span_warning("\The [src] must be closed before you can reinforce it.")) return TRUE var/amount_needed = 2 @@ -56,7 +56,7 @@ var/mats_given = stack.get_amount() var/singular_name = stack.singular_name if(reinforcing && amount_given <= 0) - to_chat(user, "You must weld or remove \the plasteel from \the [src] before you can add anything else.") + to_chat(user, span_warning("You must weld or remove \the plasteel from \the [src] before you can add anything else.")) else if(mats_given >= amount_given) if(stack.use(amount_given)) @@ -66,25 +66,25 @@ reinforcing += mats_given amount_given = mats_given if(amount_given) - to_chat(user, "You fit [amount_given] [singular_name]\s on \the [src].") + to_chat(user, span_notice("You fit [amount_given] [singular_name]\s on \the [src].")) return TRUE if(reinforcing && I.has_tool_quality(TOOL_WELDER)) if(!density) - to_chat(user, "\The [src] must be closed before you can reinforce it.") + to_chat(user, span_warning("\The [src] must be closed before you can reinforce it.")) return TRUE if(reinforcing < 2) - to_chat(user, "You will need more plasteel to reinforce \the [src].") + to_chat(user, span_warning("You will need more plasteel to reinforce \the [src].")) return TRUE var/obj/item/weldingtool/welder = I.get_welder() if(welder.remove_fuel(0,user)) - to_chat(user, "You start weld \the plasteel into place.") + to_chat(user, span_notice("You start weld \the plasteel into place.")) playsound(src, welder.usesound, 50, 1) if(do_after(user, 10 * welder.toolspeed) && welder && welder.isOn()) - to_chat(user, "You finish reinforcing \the [src].") + to_chat(user, span_notice("You finish reinforcing \the [src].")) heat_proof = 1 update_icon() reinforcing = 0 @@ -93,7 +93,7 @@ if(reinforcing && I.has_tool_quality(TOOL_CROWBAR)) var/obj/item/stack/material/plasteel/reinforcing_sheet = new /obj/item/stack/material/plasteel(src.loc, reinforcing) reinforcing = 0 - to_chat(user, "You remove \the [reinforcing_sheet].") + to_chat(user, span_notice("You remove \the [reinforcing_sheet].")) playsound(src, I.usesound, 100, 1) return TRUE diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 79f428126b..3c3431ecca 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -84,7 +84,7 @@ return . if(pdiff >= FIREDOOR_MAX_PRESSURE_DIFF) - . += "WARNING: Current pressure differential is [pdiff]kPa! Opening door may result in injury!" + . += span_warning("WARNING: Current pressure differential is [pdiff]kPa! Opening door may result in injury!") . += "Sensor readings:" for(var/index = 1; index <= tile_info.len; index++) @@ -99,7 +99,7 @@ if(4) o += "WEST: " if(tile_info[index] == null) - o += "DATA UNAVAILABLE" + o += span_warning("DATA UNAVAILABLE") . += o continue var/celsius = convert_k2c(tile_info[index][1]) @@ -143,7 +143,7 @@ return if(blocked) - to_chat(user, "\The [src] is welded solid!") + to_chat(user, span_warning("\The [src] is welded solid!")) return var/alarmed = lockdown @@ -163,10 +163,10 @@ return if(alarmed && density && lockdown && !allowed(user)) - to_chat(user, "Access denied. Please wait for authorities to arrive, or for the alert to clear.") + to_chat(user, span_warning("Access denied. Please wait for authorities to arrive, or for the alert to clear.")) return else - user.visible_message("\The [src] [density ? "open" : "close"]s for \the [user].",\ + user.visible_message(span_notice("\The [src] [density ? "open" : "close"]s for \the [user]."),\ "\The [src] [density ? "open" : "close"]s.",\ "You hear a beep, and a door opening.") @@ -197,23 +197,23 @@ var/mob/living/carbon/human/X = user if(istype(X.species, /datum/species/xenos)) if(src.blocked) - visible_message("\The [user] begins digging into \the [src] internals!") + visible_message(span_alium("\The [user] begins digging into \the [src] internals!")) if(do_after(user,5 SECONDS,src)) playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1) src.blocked = 0 update_icon() open(1) else if(src.density) - visible_message("\The [user] begins forcing \the [src] open!") + visible_message(span_alium("\The [user] begins forcing \the [src] open!")) if(do_after(user, 2 SECONDS,src)) playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1) - visible_message("\The [user] forces \the [src] open!") + visible_message(span_danger("\The [user] forces \the [src] open!")) open(1) else - visible_message("\The [user] forces \the [src] closed!") + visible_message(span_danger("\The [user] forces \the [src] closed!")) close(1) else - visible_message("\The [user] strains fruitlessly to force \the [src] [density ? "open" : "closed"].") + visible_message(span_notice("\The [user] strains fruitlessly to force \the [src] [density ? "open" : "closed"].")) return ..() @@ -222,23 +222,23 @@ if(damage >= STRUCTURE_MIN_DAMAGE_THRESHOLD) var/time_to_force = (2 + (2 * blocked)) * 5 if(src.density) - visible_message("\The [user] starts forcing \the [src] open!") + visible_message(span_danger("\The [user] starts forcing \the [src] open!")) user.set_AI_busy(TRUE) // If the mob doesn't have an AI attached, this won't do anything. if(do_after(user, time_to_force, src)) - visible_message("\The [user] forces \the [src] open!") + visible_message(span_danger("\The [user] forces \the [src] open!")) src.blocked = 0 open(1) user.set_AI_busy(FALSE) else time_to_force = (time_to_force / 2) - visible_message("\The [user] starts forcing \the [src] closed!") + visible_message(span_danger("\The [user] starts forcing \the [src] closed!")) user.set_AI_busy(TRUE) // If the mob doesn't have an AI attached, this won't do anything. if(do_after(user, time_to_force, src)) - visible_message("\The [user] forces \the [src] closed!") + visible_message(span_danger("\The [user] forces \the [src] closed!")) close(1) user.set_AI_busy(FALSE) else - visible_message("\The [user] strains fruitlessly to force \the [src] [density ? "open" : "closed"].") + visible_message(span_notice("\The [user] strains fruitlessly to force \the [src] [density ? "open" : "closed"].")) return ..() @@ -255,11 +255,11 @@ return //VOREstation Edit End if(prying) - to_chat(user, "Someone's busy prying that [density ? "open" : "closed"]!") + to_chat(user, span_notice("Someone's busy prying that [density ? "open" : "closed"]!")) var/obj/item/weldingtool/W = C.get_welder() if(W.remove_fuel(0, user)) blocked = !blocked - user.visible_message("\The [user] [blocked ? "welds" : "unwelds"] \the [src] with \a [W].",\ + user.visible_message(span_danger("\The [user] [blocked ? "welds" : "unwelds"] \the [src] with \a [W]."),\ "You [blocked ? "weld" : "unweld"] \the [src] with \the [W].",\ "You hear something being welded.") playsound(src, W.usesound, 100, 1) @@ -269,21 +269,21 @@ if(density && C.has_tool_quality(TOOL_SCREWDRIVER)) hatch_open = !hatch_open playsound(src, C.usesound, 50, 1) - user.visible_message("[user] has [hatch_open ? "opened" : "closed"] \the [src] maintenance hatch.", + user.visible_message(span_danger("[user] has [hatch_open ? "opened" : "closed"] \the [src] maintenance hatch."), "You have [hatch_open ? "opened" : "closed"] the [src] maintenance hatch.") update_icon() return if(blocked && C.has_tool_quality(TOOL_CROWBAR)) if(!hatch_open) - to_chat(user, "You must open the maintenance hatch first!") + to_chat(user, span_danger("You must open the maintenance hatch first!")) else - user.visible_message("[user] is removing the electronics from \the [src].", + user.visible_message(span_danger("[user] is removing the electronics from \the [src]."), "You start to remove the electronics from [src].") if(do_after(user,30)) if(blocked && density && hatch_open) playsound(src, C.usesound, 50, 1) - user.visible_message("[user] has removed the electronics from \the [src].", + user.visible_message(span_danger("[user] has removed the electronics from \the [src]."), "You have removed the electronics from [src].") if (stat & BROKEN) @@ -301,7 +301,7 @@ return if(blocked) - to_chat(user, "\The [src] is welded shut!") + to_chat(user, span_danger("\The [src] is welded shut!")) return if(C.pry == 1) @@ -309,7 +309,7 @@ return if(blocked && C.has_tool_quality(TOOL_CROWBAR)) - user.visible_message("\The [user] pries at \the [src] with \a [C], but \the [src] is welded in place!",\ + user.visible_message(span_danger("\The [user] pries at \the [src] with \a [C], but \the [src] is welded in place!"),\ "You try to pry \the [src] [density ? "open" : "closed"], but it is welded in place!",\ "You hear someone struggle and metal straining.") return @@ -320,10 +320,10 @@ return if(prying) - to_chat(user, "Someone's already prying that [density ? "open" : "closed"].") + to_chat(user, span_notice("Someone's already prying that [density ? "open" : "closed"].")) return - user.visible_message("\The [user] starts to force \the [src] [density ? "open" : "closed"] with \a [C]!",\ + user.visible_message(span_danger("\The [user] starts to force \the [src] [density ? "open" : "closed"] with \a [C]!"),\ "You start forcing \the [src] [density ? "open" : "closed"] with \the [C]!",\ "You hear metal strain.") prying = 1 @@ -332,11 +332,11 @@ if(do_after(user,30 * C.toolspeed)) if(C.has_tool_quality(TOOL_CROWBAR)) if(stat & (BROKEN|NOPOWER) || !density) - user.visible_message("\The [user] forces \the [src] [density ? "open" : "closed"] with \a [C]!",\ + user.visible_message(span_danger("\The [user] forces \the [src] [density ? "open" : "closed"] with \a [C]!"),\ "You force \the [src] [density ? "open" : "closed"] with \the [C]!",\ "You hear metal strain, and a door [density ? "open" : "close"].") else - user.visible_message("\The [user] forces \the [ blocked ? "welded" : "" ] [src] [density ? "open" : "closed"] with \a [C]!",\ + user.visible_message(span_danger("\The [user] forces \the [ blocked ? "welded" : "" ] [src] [density ? "open" : "closed"] with \a [C]!"),\ "You force \the [ blocked ? "welded" : "" ] [src] [density ? "open" : "closed"] with \the [C]!",\ "You hear metal strain and groan, and a door [density ? "opening" : "closing"].") if(density) diff --git a/code/game/machinery/doors/firedoor_assembly.dm b/code/game/machinery/doors/firedoor_assembly.dm index 64410adec6..ccdcb96ca9 100644 --- a/code/game/machinery/doors/firedoor_assembly.dm +++ b/code/game/machinery/doors/firedoor_assembly.dm @@ -23,13 +23,13 @@ if(istype(C, /obj/item/stack/cable_coil) && !wired && anchored) var/obj/item/stack/cable_coil/cable = C if (cable.get_amount() < 1) - to_chat(user, "You need one length of coil to wire \the [src].") + to_chat(user, span_warning("You need one length of coil to wire \the [src].")) return user.visible_message("[user] wires \the [src].", "You start to wire \the [src].") if(do_after(user, 40) && !wired && anchored) if (cable.use(1)) wired = 1 - to_chat(user, "You wire \the [src].") + to_chat(user, span_notice("You wire \the [src].")) else if(C.has_tool_quality(TOOL_WIRECUTTER) && wired ) playsound(src, C.usesound, 100, 1) @@ -37,14 +37,14 @@ if(do_after(user, 40)) if(!src) return - to_chat(user, "You cut the wires!") + to_chat(user, span_notice("You cut the wires!")) new/obj/item/stack/cable_coil(src.loc, 1) wired = 0 else if(istype(C, /obj/item/circuitboard/airalarm) && wired) if(anchored) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - user.visible_message("[user] has inserted a circuit into \the [src]!", + user.visible_message(span_warning("[user] has inserted a circuit into \the [src]!"), "You have inserted the circuit into \the [src]!") if(glass) new /obj/machinery/door/firedoor/glass(loc) @@ -53,11 +53,11 @@ qdel(C) qdel(src) else - to_chat(user, "You must secure \the [src] first!") + to_chat(user, span_warning("You must secure \the [src] first!")) else if(C.has_tool_quality(TOOL_WRENCH)) anchored = !anchored playsound(src, C.usesound, 50, 1) - user.visible_message("[user] has [anchored ? "" : "un" ]secured \the [src]!", + user.visible_message(span_warning("[user] has [anchored ? "" : "un" ]secured \the [src]!"), "You have [anchored ? "" : "un" ]secured \the [src]!") update_icon() else if((glass || !anchored) && C.has_tool_quality(TOOL_WELDER)) @@ -65,32 +65,32 @@ if(WT.remove_fuel(0, user)) playsound(src, WT.usesound, 50, 1) if(glass) - user.visible_message("[user] welds the glass panel out of \the [src].", - "You start to weld the glass panel out of \the [src].") + user.visible_message(span_warning("[user] welds the glass panel out of \the [src]."), + span_notice("You start to weld the glass panel out of \the [src].")) if(do_after(user, 40 * WT.toolspeed, src) && WT.isOn()) - to_chat(user, "You welded the glass panel out!") + to_chat(user, span_notice("You welded the glass panel out!")) new /obj/item/stack/material/glass/reinforced(drop_location()) glass = FALSE update_icon() return if(!anchored) - user.visible_message("[user] dissassembles \the [src].", "You start to dissassemble \the [src].") + user.visible_message(span_warning("[user] dissassembles \the [src]."), "You start to dissassemble \the [src].") if(do_after(user, 40 * WT.toolspeed, src) && WT.isOn()) - user.visible_message("[user] has dissassembled \the [src].", + user.visible_message(span_warning("[user] has dissassembled \the [src]."), "You have dissassembled \the [src].") new /obj/item/stack/material/steel(drop_location(), 2) qdel(src) return else - to_chat(user, "You need more welding fuel.") + to_chat(user, span_notice("You need more welding fuel.")) else if(istype(C, /obj/item/stack/material) && C.get_material_name() == "rglass" && !glass) var/obj/item/stack/S = C if (S.get_amount() >= 1) playsound(src, 'sound/items/Crowbar.ogg', 100, 1) - user.visible_message("[user] adds [S.name] to \the [src].", - "You start to install [S.name] into \the [src].") + user.visible_message(span_info("[user] adds [S.name] to \the [src]."), + span_notice("You start to install [S.name] into \the [src].")) if(do_after(user, 40, src) && !glass && S.use(1)) - to_chat(user, "You installed reinforced glass windows into \the [src].") + to_chat(user, span_notice("You installed reinforced glass windows into \the [src].")) glass = TRUE update_icon() diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 61fbc6bf0d..5117401535 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -156,7 +156,7 @@ var/mob/living/carbon/human/H = user if(H.species.can_shred(H)) playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) - visible_message("[user] smashes against the [src.name].", 1) + visible_message(span_danger("[user] smashes against the [src.name]."), 1) user.do_attack_animation(src) user.setClickCooldown(user.get_attack_speed()) take_damage(25) @@ -193,14 +193,14 @@ var/obj/item/weldingtool/WT = I.get_welder() if(health < maxhealth) if(WT.remove_fuel(1 ,user)) - to_chat(user, "You begin repairing [src]...") + to_chat(user, span_notice("You begin repairing [src]...")) playsound(src, WT.usesound, 50, 1) if(do_after(user, 40 * WT.toolspeed, target = src)) health = maxhealth update_icon() - to_chat(user, "You repair [src].") + to_chat(user, span_notice("You repair [src].")) else - to_chat(user, "[src] is already in good condition!") + to_chat(user, span_warning("[src] is already in good condition!")) return //Emags and ninja swords? You may pass. @@ -211,7 +211,7 @@ spark_system.start() playsound(src, "sparks", 50, 1) playsound(src, 'sound/weapons/blade1.ogg', 50, 1) - visible_message("The glass door was sliced open by [user]!") + visible_message(span_warning("The glass door was sliced open by [user]!")) return 1 //If it's opened/emagged, crowbar can pry it out of its frame. @@ -219,7 +219,7 @@ playsound(src, I.usesound, 50, 1) user.visible_message("[user] begins prying the windoor out of the frame.", "You start to pry the windoor out of the frame.") if (do_after(user,40 * I.toolspeed)) - to_chat(user,"You pried the windoor out of the frame!") + to_chat(user,span_notice("You pried the windoor out of the frame!")) var/obj/structure/windoor_assembly/wa = new/obj/structure/windoor_assembly(src.loc) if (istype(src, /obj/machinery/door/window/brigdoor)) @@ -255,7 +255,7 @@ user.setClickCooldown(user.get_attack_speed(I)) var/aforce = I.force playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) - visible_message("[src] was hit by [I].") + visible_message(span_danger("[src] was hit by [I].")) if(I.damtype == BRUTE || I.damtype == BURN) take_damage(aforce) return diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 556309040f..2bbc19a39c 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -41,7 +41,7 @@ var/list/doppler_arrays = list() var/message = "Explosive disturbance detected - Epicenter at: grid ([x0],[y0]). Epicenter radius: [devastation_range]. Outer radius: [heavy_impact_range]. Shockwave radius: [light_impact_range]. Temporal displacement of tachyons: [took]seconds." for(var/mob/O in hearers(src, null)) - O.show_message("[src] states coldly, \"[message]\"",2) + O.show_message(span_npcsay("[src] states coldly, \"[message]\""),2) /obj/machinery/doppler_array/power_change() ..() diff --git a/code/game/machinery/fire_alarm.dm b/code/game/machinery/fire_alarm.dm index 9d5c2269e8..e27a58fe1f 100644 --- a/code/game/machinery/fire_alarm.dm +++ b/code/game/machinery/fire_alarm.dm @@ -88,14 +88,14 @@ FIRE ALARM if("blue") set_light(l_range = 2, l_power = 0.25, l_color = "#1024A9") if("red") set_light(l_range = 4, l_power = 0.9, l_color = "#ff0000") if("delta") set_light(l_range = 4, l_power = 0.9, l_color = "#FF6633") - + . += mutable_appearance(icon, fire_state) . += emissive_appearance(icon, fire_state) - + if(seclevel) . += mutable_appearance(icon, "overlay_[seclevel]") . += emissive_appearance(icon, "overlay_[seclevel]") - + add_overlay(.) /obj/machinery/firealarm/fire_act(datum/gas_mixture/air, temperature, volume) @@ -127,9 +127,9 @@ FIRE ALARM if(istype(W, /obj/item/multitool)) detecting = !(detecting) if(detecting) - user.visible_message("\The [user] has reconnected [src]'s detecting unit!", "You have reconnected [src]'s detecting unit.") + user.visible_message(span_notice("\The [user] has reconnected [src]'s detecting unit!"), span_notice("You have reconnected [src]'s detecting unit.")) else - user.visible_message("\The [user] has disconnected [src]'s detecting unit!", "You have disconnected [src]'s detecting unit.") + user.visible_message(span_notice("\The [user] has disconnected [src]'s detecting unit!"), span_notice("You have disconnected [src]'s detecting unit.")) return alarm() diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index f308393365..ed53a6e439 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -39,9 +39,9 @@ add_fingerprint(user) disable = !disable if(disable) - user.visible_message("[user] has disconnected the [src]'s flashbulb!", "You disconnect the [src]'s flashbulb!") + user.visible_message(span_warning("[user] has disconnected the [src]'s flashbulb!"), span_warning("You disconnect the [src]'s flashbulb!")) if(!disable) - user.visible_message("[user] has connected the [src]'s flashbulb!", "You connect the [src]'s flashbulb!") + user.visible_message(span_warning("[user] has connected the [src]'s flashbulb!"), span_warning("You connect the [src]'s flashbulb!")) //Let the AI trigger them directly. /obj/machinery/flasher/attack_ai() @@ -112,12 +112,12 @@ anchored = !anchored if(!anchored) - user.show_message(text("[src] can now be moved.")) + user.show_message(span_warning("[src] can now be moved.")) cut_overlays() unsense_proximity(callback = /atom/proc/HasProximity) else if(anchored) - user.show_message(text("[src] is now secured.")) + user.show_message(span_warning("[src] is now secured.")) add_overlay("[base_state]-s") sense_proximity(callback = /atom/proc/HasProximity) @@ -145,4 +145,4 @@ icon_state = "launcherbtt" active = 0 - return \ No newline at end of file + return diff --git a/code/game/machinery/floor_light.dm b/code/game/machinery/floor_light.dm index 90ba895e82..9768de95c0 100644 --- a/code/game/machinery/floor_light.dm +++ b/code/game/machinery/floor_light.dm @@ -25,18 +25,18 @@ var/list/floor_light_cache = list() /obj/machinery/floor_light/attackby(var/obj/item/W, var/mob/user) if(W.has_tool_quality(TOOL_SCREWDRIVER)) anchored = !anchored - visible_message("\The [user] has [anchored ? "attached" : "detached"] \the [src].") + visible_message(span_notice("\The [user] has [anchored ? "attached" : "detached"] \the [src].")) else if(W.has_tool_quality(TOOL_WELDER) && (damaged || (stat & BROKEN))) var/obj/item/weldingtool/WT = W.get_welder() if(!WT.remove_fuel(0, user)) - to_chat(user, "\The [src] must be on to complete this task.") + to_chat(user, span_warning("\The [src] must be on to complete this task.")) return playsound(src, WT.usesound, 50, 1) if(!do_after(user, 20 * WT.toolspeed)) return if(!src || !WT.isOn()) return - visible_message("\The [user] has repaired \the [src].") + visible_message(span_notice("\The [user] has repaired \the [src].")) stat &= ~BROKEN damaged = null update_brightness() @@ -48,11 +48,11 @@ var/list/floor_light_cache = list() if(user.a_intent == I_HURT && !issmall(user)) if(!isnull(damaged) && !(stat & BROKEN)) - visible_message("\The [user] smashes \the [src]!") + visible_message(span_danger("\The [user] smashes \the [src]!")) playsound(src, "shatter", 70, 1) stat |= BROKEN else - visible_message("\The [user] attacks \the [src]!") + visible_message(span_danger("\The [user] attacks \the [src]!")) playsound(src, 'sound/effects/Glasshit.ogg', 75, 1) if(isnull(damaged)) damaged = 0 update_brightness() @@ -60,20 +60,20 @@ var/list/floor_light_cache = list() else if(!anchored) - to_chat(user, "\The [src] must be screwed down first.") + to_chat(user, span_warning("\The [src] must be screwed down first.")) return if(stat & BROKEN) - to_chat(user, "\The [src] is too damaged to be functional.") + to_chat(user, span_warning("\The [src] is too damaged to be functional.")) return if(stat & NOPOWER) - to_chat(user, "\The [src] is unpowered.") + to_chat(user, span_warning("\The [src] is unpowered.")) return on = !on if(on) update_use_power(USE_POWER_ACTIVE) - //visible_message("\The [user] turns \the [src] [on ? "on" : "off"].") //VOREStation Edit - No thankouuuu. Too spammy. + //visible_message(span_notice("\The [user] turns \the [src] [on ? "on" : "off"].")) //VOREStation Edit - No thankouuuu. Too spammy. update_brightness() return diff --git a/code/game/machinery/floorlayer.dm b/code/game/machinery/floorlayer.dm index 38da6b057f..bfd592e467 100644 --- a/code/game/machinery/floorlayer.dm +++ b/code/game/machinery/floorlayer.dm @@ -30,7 +30,7 @@ /obj/machinery/floorlayer/attack_hand(mob/user as mob) on=!on - user.visible_message("[user] has [!on?"de":""]activated \the [src].", "You [!on?"de":""]activate \the [src].") + user.visible_message(span_notice("[user] has [!on?"de":""]activated \the [src]."), span_notice("You [!on?"de":""]activate \the [src].")) return /obj/machinery/floorlayer/attackby(var/obj/item/W as obj, var/mob/user as mob) @@ -38,22 +38,22 @@ var/m = tgui_input_list(usr, "Choose work mode", "Mode", mode) mode[m] = !mode[m] var/O = mode[m] - user.visible_message("[usr] has set \the [src] [m] mode [!O?"off":"on"].", "You set \the [src] [m] mode [!O?"off":"on"].") + user.visible_message(span_notice("[usr] has set \the [src] [m] mode [!O?"off":"on"]."), span_notice("You set \the [src] [m] mode [!O?"off":"on"].")) return if(istype(W, /obj/item/stack/tile)) - to_chat(user, "\The [W] successfully loaded.") + to_chat(user, span_notice("\The [W] successfully loaded.")) user.drop_item(T) TakeTile(T) return if(W.has_tool_quality(TOOL_CROWBAR)) if(!length(contents)) - to_chat(user, "\The [src] is empty.") + to_chat(user, span_notice("\The [src] is empty.")) else var/obj/item/stack/tile/E = tgui_input_list(usr, "Choose remove tile type.", "Tiles", contents) if(E) - to_chat(user, "You remove the [E] from \the [src].") + to_chat(user, span_notice("You remove the [E] from \the [src].")) E.loc = src.loc T = null return @@ -68,7 +68,7 @@ var/dismantle = mode["dismantle"] var/laying = mode["laying"] var/collect = mode["collect"] - . += "[src] [!T ? "don't " : ""]has [!T ? "" : "[T.get_amount()] [T] "]tile\s, dismantle is [dismantle ? "on" : "off"], laying is [laying ? "on" : "off"], collect is [collect ? "on" : "off"]." + . += span_notice("[src] [!T ? "don't " : ""]has [!T ? "" : "[T.get_amount()] [T] "]tile\s, dismantle is [dismantle ? "on" : "off"], laying is [laying ? "on" : "off"], collect is [collect ? "on" : "off"].") /obj/machinery/floorlayer/proc/reset() on=0 @@ -107,4 +107,4 @@ /obj/machinery/floorlayer/proc/CollectTiles(var/turf/w_turf) for(var/obj/item/stack/tile/tile in w_turf) - TakeTile(tile) \ No newline at end of file + TakeTile(tile) diff --git a/code/game/machinery/frame.dm b/code/game/machinery/frame.dm index fb108bf37e..ab1fe6aa50 100644 --- a/code/game/machinery/frame.dm +++ b/code/game/machinery/frame.dm @@ -302,7 +302,7 @@ /obj/structure/frame/attackby(obj/item/P as obj, mob/user as mob) if(P.has_tool_quality(TOOL_WRENCH)) if(state == FRAME_PLACED && !anchored) - to_chat(user, "You start to wrench the frame into place.") + to_chat(user, span_notice("You start to wrench the frame into place.")) playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) anchored = TRUE @@ -310,14 +310,14 @@ state = FRAME_FASTENED check_components() update_desc() - to_chat(user, "You wrench the frame into place and set the outer cover.") + to_chat(user, span_notice("You wrench the frame into place and set the outer cover.")) else - to_chat(user, "You wrench the frame into place.") + to_chat(user, span_notice("You wrench the frame into place.")) else if(state == FRAME_PLACED && anchored) playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) - to_chat(user, "You unfasten the frame.") + to_chat(user, span_notice("You unfasten the frame.")) anchored = FALSE else if(P.has_tool_quality(TOOL_WELDER)) @@ -327,7 +327,7 @@ playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) if(src && WT.isOn()) - to_chat(user, "You deconstruct the frame.") + to_chat(user, span_notice("You deconstruct the frame.")) new /obj/item/stack/material/steel(src.loc, frame_type.frame_size) qdel(src) return @@ -341,7 +341,7 @@ var/datum/frame/frame_types/board_type = B.board_type if(board_type.name == frame_type.name) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - to_chat(user, "You place the circuit board inside the frame.") + to_chat(user, span_notice("You place the circuit board inside the frame.")) circuit = P user.drop_item() P.loc = src @@ -350,25 +350,25 @@ check_components() update_desc() else - to_chat(user, "This frame does not accept circuit boards of this type!") + to_chat(user, span_warning("This frame does not accept circuit boards of this type!")) return else if(P.has_tool_quality(TOOL_SCREWDRIVER)) if(state == FRAME_UNFASTENED) if(need_circuit && circuit) playsound(src, P.usesound, 50, 1) - to_chat(user, "You screw the circuit board into place.") + to_chat(user, span_notice("You screw the circuit board into place.")) state = FRAME_FASTENED else if(state == FRAME_FASTENED) if(need_circuit && circuit) playsound(src, P.usesound, 50, 1) - to_chat(user, "You unfasten the circuit board.") + to_chat(user, span_notice("You unfasten the circuit board.")) state = FRAME_UNFASTENED else if(!need_circuit && circuit) playsound(src, P.usesound, 50, 1) - to_chat(user, "You unfasten the outer cover.") + to_chat(user, span_notice("You unfasten the outer cover.")) state = FRAME_PLACED else if(state == FRAME_WIRED) @@ -410,7 +410,7 @@ else if(frame_type.frame_class == FRAME_CLASS_ALARM) playsound(src, P.usesound, 50, 1) - to_chat(user, "You fasten the cover.") + to_chat(user, span_notice("You fasten the cover.")) var/obj/machinery/B = new circuit.build_path(src.loc) B.pixel_x = pixel_x B.pixel_y = pixel_y @@ -424,7 +424,7 @@ else if(state == FRAME_PANELED) if(frame_type.frame_class == FRAME_CLASS_COMPUTER) playsound(src, P.usesound, 50, 1) - to_chat(user, "You connect the monitor.") + to_chat(user, span_notice("You connect the monitor.")) var/obj/machinery/B = new circuit.build_path(src.loc) B.pixel_x = pixel_x B.pixel_y = pixel_y @@ -437,7 +437,7 @@ else if(frame_type.frame_class == FRAME_CLASS_DISPLAY) playsound(src, P.usesound, 50, 1) - to_chat(user, "You connect the monitor.") + to_chat(user, span_notice("You connect the monitor.")) var/obj/machinery/B = new circuit.build_path(src.loc) B.pixel_x = pixel_x B.pixel_y = pixel_y @@ -452,7 +452,7 @@ if(state == FRAME_UNFASTENED) if(need_circuit && circuit) playsound(src, P.usesound, 50, 1) - to_chat(user, "You remove the circuit board.") + to_chat(user, span_notice("You remove the circuit board.")) state = FRAME_PLACED circuit.forceMove(src.loc) circuit = null @@ -464,9 +464,9 @@ if(frame_type.frame_class == FRAME_CLASS_MACHINE) playsound(src, P.usesound, 50, 1) if(components.len == 0) - to_chat(user, "There are no components to remove.") + to_chat(user, span_notice("There are no components to remove.")) else - to_chat(user, "You remove the components.") + to_chat(user, span_notice("You remove the components.")) for(var/obj/item/W in components) W.forceMove(src.loc) check_components() @@ -476,13 +476,13 @@ else if(state == FRAME_PANELED) if(frame_type.frame_class == FRAME_CLASS_COMPUTER) playsound(src, P.usesound, 50, 1) - to_chat(user, "You remove the glass panel.") + to_chat(user, span_notice("You remove the glass panel.")) state = FRAME_WIRED new /obj/item/stack/material/glass(src.loc, 2) else if(frame_type.frame_class == FRAME_CLASS_DISPLAY) playsound(src, P.usesound, 50, 1) - to_chat(user, "You remove the glass panel.") + to_chat(user, span_notice("You remove the glass panel.")) state = FRAME_WIRED new /obj/item/stack/material/glass(src.loc, 2) @@ -490,13 +490,13 @@ if(state == FRAME_FASTENED) var/obj/item/stack/cable_coil/C = P if(C.get_amount() < 5) - to_chat(user, "You need five coils of wire to add them to the frame.") + to_chat(user, span_warning("You need five coils of wire to add them to the frame.")) return - to_chat(user, "You start to add cables to the frame.") + to_chat(user, span_notice("You start to add cables to the frame.")) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20) && state == FRAME_FASTENED) if(C.use(5)) - to_chat(user, "You add cables to the frame.") + to_chat(user, span_notice("You add cables to the frame.")) state = FRAME_WIRED if(frame_type.frame_class == FRAME_CLASS_MACHINE) to_chat(user, desc) @@ -535,9 +535,9 @@ ) playsound(src, P.usesound, 50, 1) if (components.len == 0) - to_chat(user, "You remove the cables.") + to_chat(user, span_notice("You remove the cables.")) else - to_chat(user, "You remove the cables and components.") + to_chat(user, span_notice("You remove the cables and components.")) for(var/obj/item/W in components) W.forceMove(src.loc) check_components() @@ -550,25 +550,25 @@ if(frame_type.frame_class == FRAME_CLASS_COMPUTER) var/obj/item/stack/G = P if(G.get_amount() < 2) - to_chat(user, "You need two sheets of glass to put in the glass panel.") + to_chat(user, span_warning("You need two sheets of glass to put in the glass panel.")) return playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - to_chat(user, "You start to put in the glass panel.") + to_chat(user, span_notice("You start to put in the glass panel.")) if(do_after(user, 20) && state == FRAME_WIRED) if(G.use(2)) - to_chat(user, "You put in the glass panel.") + to_chat(user, span_notice("You put in the glass panel.")) state = FRAME_PANELED else if(frame_type.frame_class == FRAME_CLASS_DISPLAY) var/obj/item/stack/G = P if(G.get_amount() < 2) - to_chat(user, "You need two sheets of glass to put in the glass panel.") + to_chat(user, span_warning("You need two sheets of glass to put in the glass panel.")) return playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - to_chat(user, "You start to put in the glass panel.") + to_chat(user, span_notice("You start to put in the glass panel.")) if(do_after(user, 20) && state == FRAME_WIRED) if(G.use(2)) - to_chat(user, "You put in the glass panel.") + to_chat(user, span_notice("You put in the glass panel.")) state = FRAME_PANELED else if(istype(P, /obj/item)) @@ -597,7 +597,7 @@ break to_chat(user, desc) if(P && P.loc != src && !istype(P, /obj/item/stack/material)) - to_chat(user, "You cannot add that component to the machine!") + to_chat(user, span_warning("You cannot add that component to the machine!")) return update_icon() @@ -616,7 +616,7 @@ src.set_dir(turn(src.dir, 90)) - to_chat(usr, "You rotate the [src] to face [dir2text(dir)]!") + to_chat(usr, span_notice("You rotate the [src] to face [dir2text(dir)]!")) return @@ -635,6 +635,6 @@ src.set_dir(turn(src.dir, 270)) - to_chat(usr, "You rotate the [src] to face [dir2text(dir)]!") + to_chat(usr, span_notice("You rotate the [src] to face [dir2text(dir)]!")) return diff --git a/code/game/machinery/gear_dispenser.dm b/code/game/machinery/gear_dispenser.dm index f880269df1..9fd11d81c0 100644 --- a/code/game/machinery/gear_dispenser.dm +++ b/code/game/machinery/gear_dispenser.dm @@ -158,7 +158,7 @@ var/list/dispenser_presets = list() //req_one_access = list(whatever) // Note that each gear datum can have access, too. /obj/machinery/gear_dispenser/custom/emag_act(remaining_charges, mob/user, emag_source) - to_chat(user, "Your moral standards prevent you from emagging this machine!") + to_chat(user, span_warning("Your moral standards prevent you from emagging this machine!")) return -1 // Letting people emag this one would be bad times /obj/machinery/gear_dispenser/Initialize() @@ -182,7 +182,7 @@ var/list/dispenser_presets = list() var/list/gear_list = get_gear_list(user) if(!LAZYLEN(gear_list)) - to_chat(user, "\The [src] doesn't have anything to dispense for you!") + to_chat(user, span_warning("\The [src] doesn't have anything to dispense for you!")) dispenser_flags &= ~GD_BUSY return @@ -200,24 +200,24 @@ var/list/dispenser_presets = list() /obj/machinery/gear_dispenser/proc/can_use(var/mob/living/carbon/human/user) var/list/used_by = gear_distributed_to["[type]"] if(needs_power && inoperable()) - to_chat(user,"The machine does not respond to your prodding.") + to_chat(user,span_warning("The machine does not respond to your prodding.")) return 0 if(!istype(user)) - to_chat(user,"You can't use this!") + to_chat(user,span_warning("You can't use this!")) return 0 if((dispenser_flags & GD_BUSY)) - to_chat(user,"Someone else is using this!") + to_chat(user,span_warning("Someone else is using this!")) return 0 if((dispenser_flags & GD_ONEITEM) && !(dispenser_flags & GD_UNLIMITED) && !one_setting.amount) - to_chat(user,"There's nothing in here!") + to_chat(user,span_warning("There's nothing in here!")) return 0 if (!emagged) if ((dispenser_flags & GD_NOGREED) && (user.ckey in used_by)) - to_chat(user,"You've already picked up your gear!") + to_chat(user,span_warning("You've already picked up your gear!")) playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) return 0 if ((dispenser_flags & GD_UNIQUE) && (user.ckey in unique_dispense_list)) - to_chat(user,"You've already picked up your gear!") + to_chat(user,span_warning("You've already picked up your gear!")) playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) return 0 else @@ -228,7 +228,7 @@ var/list/dispenser_presets = list() if(allowed(user)) return 1 else - to_chat(user,"Your access is rejected!") + to_chat(user,span_warning("Your access is rejected!")) playsound(src, 'sound/machines/buzz-sigh.ogg', 100, 0) return 0 @@ -246,7 +246,7 @@ var/list/dispenser_presets = list() /obj/machinery/gear_dispenser/proc/dispense(var/datum/gear_disp/S,var/mob/living/carbon/human/user,var/greet=TRUE) if(!S.amount && !(dispenser_flags & GD_UNLIMITED)) - to_chat(user,"There are no more [S.name]s left!") + to_chat(user,span_warning("There are no more [S.name]s left!")) dispenser_flags &= ~GD_BUSY return 1 else if(!(dispenser_flags & GD_UNLIMITED)) @@ -267,7 +267,7 @@ var/list/dispenser_presets = list() if(emagged) emagged = FALSE if(greet && user && !user.stat) // in case we got destroyed while we slept - to_chat(user,"[S.name] dispensing processed. Have a good day.") + to_chat(user,span_notice("[S.name] dispensing processed. Have a good day.")) /obj/machinery/gear_dispenser/proc/animate_dispensing() flick("[icon_state]-scan",src) @@ -282,7 +282,7 @@ var/list/dispenser_presets = list() . = ..() if(!emagged) emagged = TRUE - visible_message("\The [user] slides a weird looking ID into \the [src]!","You temporarily short the safety mechanisms.") + visible_message(span_warning("\The [user] slides a weird looking ID into \the [src]!"),span_warning("You temporarily short the safety mechanisms.")) return 1 @@ -343,7 +343,7 @@ var/list/dispenser_presets = list() var/list/spawned = held_gear_disp.spawn_gear(T, user) for(var/obj/item/I in spawned) user.put_in_hands(I) - to_chat(user, "You remove the equipment from [src].") + to_chat(user, span_notice("You remove the equipment from [src].")) held_gear_disp = null animate_close() return @@ -351,7 +351,7 @@ var/list/dispenser_presets = list() /obj/machinery/gear_dispenser/suit_fancy/dispense(var/datum/gear_disp/S,var/mob/living/carbon/human/user,var/greet=TRUE) if(!S.amount && !(dispenser_flags & GD_UNLIMITED)) - to_chat(user,"There are no more [S.name]s left!") + to_chat(user,span_warning("There are no more [S.name]s left!")) dispenser_flags &= ~GD_BUSY return 1 else if(!(dispenser_flags & GD_UNLIMITED)) @@ -369,7 +369,7 @@ var/list/dispenser_presets = list() if(emagged) emagged = FALSE if(greet && user && !user.stat) // in case we got destroyed while we slept - to_chat(user,"[S.name] dispensing processed. Have a good day.") + to_chat(user,span_notice("[S.name] dispensing processed. Have a good day.")) /obj/machinery/gear_dispenser/suit_fancy/animate_dispensing() add_overlay("working") diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 7753bf756e..27793e064a 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -57,13 +57,13 @@ var/const/HOLOPAD_MODE = RANGE_BASED if(tgui_alert(user,"Would you like to request an AI's presence?","Request AI",list("Yes","No")) == "Yes") if(last_request + 200 < world.time) //don't spam the AI with requests you jerk! last_request = world.time - to_chat(user, "You request an AI's presence.") + to_chat(user, span_notice("You request an AI's presence.")) var/area/area = get_area(src) for(var/mob/living/silicon/ai/AI in living_mob_list) if(!AI.client) continue - to_chat(AI, "Your presence is requested at \the [area].") + to_chat(AI, span_info("Your presence is requested at \the [area].")) else - to_chat(user, "A request for AI presence was already sent recently.") + to_chat(user, span_notice("A request for AI presence was already sent recently.")) /obj/machinery/hologram/holopad/attack_ai(mob/living/silicon/ai/user) if(!istype(user)) diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 80e89473ae..4f45449a16 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -77,10 +77,10 @@ disable = !disable playsound(src, W.usesound, 50, 1) if(disable) - user.visible_message("[user] has disabled the [src]!", "You disable the connection to the [src].") + user.visible_message(span_warning("[user] has disabled the [src]!"), span_warning("You disable the connection to the [src].")) icon_state = "[base_state]-d" if(!disable) - user.visible_message("[user] has reconnected the [src]!", "You fix the connection to the [src].") + user.visible_message(span_warning("[user] has reconnected the [src]!"), span_warning("You fix the connection to the [src].")) if(powered()) icon_state = "[base_state]" else @@ -147,4 +147,4 @@ icon_state = "launcherbtt" active = 0 - return \ No newline at end of file + return diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index bb56e41a75..5e7f12fd6c 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -68,9 +68,9 @@ if(W.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, W.usesound, 50, 1) - to_chat(user, "You start to dismantle the IV drip.") + to_chat(user, span_notice("You start to dismantle the IV drip.")) if(do_after(user, 15)) - to_chat(user, "You dismantle the IV drip.") + to_chat(user, span_notice("You dismantle the IV drip.")) new /obj/item/stack/rods(src.loc, 6) if(beaker) beaker.loc = get_turf(src) @@ -154,7 +154,7 @@ set src in view(1) if(!istype(usr, /mob/living)) - to_chat(usr, "You can't do that.") + to_chat(usr, span_warning("You can't do that.")) return if(usr.stat) @@ -171,13 +171,13 @@ if(beaker) if(beaker.reagents?.reagent_list?.len) - . += "Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid." + . += span_notice("Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid.") else - . += "Attached is an empty [beaker]." + . += span_notice("Attached is an empty [beaker].") else - . += "No chemicals are attached." + . += span_notice("No chemicals are attached.") - . += "[attached ? attached : "No one"] is attached." + . += span_notice("[attached ? attached : "No one"] is attached.") /obj/machinery/iv_drip/CanPass(atom/movable/mover, turf/target) if(istype(mover) && mover.checkpass(PASSTABLE)) //allow bullets, beams, thrown objects, mice, drones, and the like through. diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 5222e1a674..b290528f87 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -80,7 +80,7 @@ if(current_track && playing) media_url = current_track.url media_start_time = world.time - audible_message("\The [src] begins to play [current_track.display()].", runemessage = "[current_track.display()]") + audible_message(span_notice("\The [src] begins to play [current_track.display()]."), runemessage = "[current_track.display()]") else media_url = "" media_start_time = 0 @@ -110,7 +110,7 @@ if(W.has_tool_quality(TOOL_WRENCH)) if(playing) StopPlaying() - user.visible_message("[user] has [anchored ? "un" : ""]secured \the [src].", "You [anchored ? "un" : ""]secure \the [src].") + user.visible_message(span_warning("[user] has [anchored ? "un" : ""]secured \the [src]."), span_notice("You [anchored ? "un" : ""]secure \the [src].")) anchored = !anchored playsound(src, W.usesound, 50, 1) power_change() @@ -158,10 +158,10 @@ /obj/machinery/media/jukebox/tgui_status(mob/user) if(inoperable()) - to_chat(user, "[src] doesn't appear to function.") + to_chat(user, span_warning("[src] doesn't appear to function.")) return STATUS_CLOSE if(!anchored) - to_chat(user, "You must secure [src] first.") + to_chat(user, span_warning("You must secure [src] first.")) return STATUS_CLOSE . = ..() @@ -255,7 +255,7 @@ /obj/machinery/media/jukebox/proc/explode() walk_to(src,0) - src.visible_message("\The [src] blows apart!", 1) + src.visible_message(span_danger("\The [src] blows apart!"), 1) explosion(src.loc, 0, 0, 1, rand(1,2), 1) @@ -276,7 +276,7 @@ if(W.has_tool_quality(TOOL_WRENCH)) if(playing) StopPlaying() - user.visible_message("[user] has [anchored ? "un" : ""]secured \the [src].", "You [anchored ? "un" : ""]secure \the [src].") + user.visible_message(span_warning("[user] has [anchored ? "un" : ""]secured \the [src]."), span_notice("You [anchored ? "un" : ""]secure \the [src].")) anchored = !anchored playsound(src, W.usesound, 50, 1) power_change() @@ -288,7 +288,7 @@ if(!emagged) emagged = 1 StopPlaying() - visible_message("\The [src] makes a fizzling sound.") + visible_message(span_danger("\The [src] makes a fizzling sound.")) update_icon() return 1 @@ -441,7 +441,7 @@ qdel(T) return - to_chat(C, "Couldn't find a track matching the specified parameters.") + to_chat(C, span_warning("Couldn't find a track matching the specified parameters.")) /obj/machinery/media/jukebox/ghost/vv_get_dropdown() . = ..() diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index ebb361d5be..1e02dec938 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -257,15 +257,15 @@ Class Procs: if(user.lying || user.stat) return 1 if(!user.IsAdvancedToolUser()) //Vorestation edit - to_chat(user, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You don't have the dexterity to do this!")) return 1 if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.getBrainLoss() >= 55) - visible_message("[H] stares cluelessly at [src].") + visible_message(span_warning("[H] stares cluelessly at [src].")) return 1 else if(prob(H.getBrainLoss())) - to_chat(user, "You momentarily forget how to use [src].") + to_chat(user, span_warning("You momentarily forget how to use [src].")) return 1 if(clicksound && istype(user, /mob/living/carbon)) @@ -335,9 +335,9 @@ Class Procs: return 0 if(!component_parts) return 0 - to_chat(user, "Following parts detected in [src]:") + to_chat(user, span_notice("Following parts detected in [src]:")) for(var/obj/item/C in component_parts) - to_chat(user, " [C.name]") + to_chat(user, span_notice(" [C.name]")) if(panel_open || !R.panel_req) var/obj/item/circuitboard/CB = circuit var/P @@ -354,7 +354,7 @@ Class Procs: component_parts -= A component_parts += B B.loc = null - to_chat(user, "[A.name] replaced with [B.name].") + to_chat(user, span_notice("[A.name] replaced with [B.name].")) parts_replaced = TRUE break update_icon() @@ -373,12 +373,12 @@ Class Procs: var/actual_time = W.toolspeed * time if(actual_time != 0) user.visible_message( \ - "\The [user] begins [anchored ? "un" : ""]securing \the [src].", \ - "You start [anchored ? "un" : ""]securing \the [src].") + span_warning("\The [user] begins [anchored ? "un" : ""]securing \the [src]."), \ + span_notice("You start [anchored ? "un" : ""]securing \the [src].")) if(actual_time == 0 || do_after(user, actual_time, target = src)) user.visible_message( \ - "\The [user] has [anchored ? "un" : ""]secured \the [src].", \ - "You [anchored ? "un" : ""]secure \the [src].") + span_warning("\The [user] has [anchored ? "un" : ""]secured \the [src]."), \ + span_notice("You [anchored ? "un" : ""]secure \the [src].")) anchored = !anchored power_change() //Turn on or off the machine depending on the status of power in the new area. update_icon() @@ -396,7 +396,7 @@ Class Procs: return 0 playsound(src, S.usesound, 50, 1) panel_open = !panel_open - to_chat(user, "You [panel_open ? "open" : "close"] the maintenance hatch of [src].") + to_chat(user, span_notice("You [panel_open ? "open" : "close"] the maintenance hatch of [src].")) update_icon() return 1 @@ -405,14 +405,14 @@ Class Procs: return 0 if(!circuit) return 0 - to_chat(user, "You start disconnecting the monitor.") + to_chat(user, span_notice("You start disconnecting the monitor.")) playsound(src, S.usesound, 50, 1) if(do_after(user, 20 * S.toolspeed)) if(stat & BROKEN) - to_chat(user, "The broken glass falls out.") + to_chat(user, span_notice("The broken glass falls out.")) new /obj/item/material/shard(src.loc) else - to_chat(user, "You disconnect the monitor.") + to_chat(user, span_notice("You disconnect the monitor.")) . = dismantle() /obj/machinery/proc/alarm_deconstruction_screwdriver(var/mob/user, var/obj/item/S) @@ -429,7 +429,7 @@ Class Procs: return 0 if(!panel_open) return 0 - user.visible_message("[user] has cut the wires inside \the [src]!", "You have cut the wires inside \the [src].") + user.visible_message(span_warning("[user] has cut the wires inside \the [src]!"), "You have cut the wires inside \the [src].") playsound(src, W.usesound, 50, 1) new/obj/item/stack/cable_coil(get_turf(src), 5) . = dismantle() diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 37cb4b4db8..8ee5e8910d 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -47,7 +47,7 @@ O_limit++ if(O_limit >= 20) for(var/mob/M in hearers(src, null)) - to_chat(M, "The mass driver lets out a screech, it mustn't be able to handle any more items.") + to_chat(M, span_notice("The mass driver lets out a screech, it mustn't be able to handle any more items.")) break use_power(500) spawn(0) diff --git a/code/game/machinery/medical_kiosk.dm b/code/game/machinery/medical_kiosk.dm index 7989a307e5..e456323975 100644 --- a/code/game/machinery/medical_kiosk.dm +++ b/code/game/machinery/medical_kiosk.dm @@ -40,9 +40,9 @@ . = ..() if(istype(user) && Adjacent(user)) if(inoperable() || panel_open) - to_chat(user, "\The [src] seems to be nonfunctional...") + to_chat(user, span_warning("\The [src] seems to be nonfunctional...")) else if(active_user && active_user != user) - to_chat(user, "Another patient has begin using this machine. Please wait for them to finish, or their session to time out.") + to_chat(user, span_warning("Another patient has begin using this machine. Please wait for them to finish, or their session to time out.")) else start_using(user) @@ -89,13 +89,13 @@ switch(choice) if("Health Scan") var/health_report = tell_health_info(user) - to_chat(user, "Health report results:"+health_report) + to_chat(user, span_notice("Health report results:")+health_report) if("Backup Scan") if(!our_db) to_chat(user, "Backup scan results:
DATABASE ERROR!") else var/scan_report = do_backup_scan(user) - to_chat(user, "Backup scan results:"+scan_report) + to_chat(user, span_notice("Backup scan results:")+scan_report) // Standby suspend() diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 170c085a09..fa4b720467 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -85,7 +85,7 @@ var/global/list/navbeacons = list() // no I don't like putting this in, but it w locked = !locked to_chat(user, "Controls are now [locked ? "locked." : "unlocked."]") else - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) updateDialog() else to_chat(user, "You must open the cover first!") diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 245ad680cf..376682fa6e 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -211,7 +211,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) if(hitstaken > 0) //Cosmetic damage overlay add_overlay("crack[hitstaken]") - + icon_state = "newscaster_normal" add_overlay(emissive_appearance(icon, "newscaster_normal_ov")) add_overlay(mutable_appearance(icon, "newscaster_normal_ov")) @@ -272,7 +272,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) if(!user.IsAdvancedToolUser()) return 0 - + tgui_interact(user) /** @@ -286,7 +286,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) temp = list(text = text, style = style) if(update_now) SStgui.update_uis(src) - + /obj/machinery/newscaster/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) @@ -316,7 +316,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) data["wanted_issue"] = wanted_issue data["securityCaster"] = !!securityCaster - + var/list/network_channels = list() for(var/datum/feed_channel/FC in news_network.network_channels) network_channels.Add(list(list( @@ -483,7 +483,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) if(!paper_remaining) set_temp("Unable to print newspaper. Insufficient paper. Please notify maintenance personnel to refill machine storage.", "danger", FALSE) return TRUE - + print_paper() set_temp("Printing successful. Please receive your newspaper from the bottom of the machine.", "success", FALSE) return TRUE @@ -695,7 +695,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) var/turf/T = get_turf(src) if(news_call) for(var/mob/O in hearers(world.view-1, T)) - O.show_message("[name] beeps, \"[news_call]\"",2) + O.show_message(span_newscaster("[name] beeps, \"[news_call]\""),2) alert = 1 update_icon() spawn(300) @@ -704,6 +704,6 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) playsound(src, 'sound/machines/twobeep.ogg', 75, 1) else for(var/mob/O in hearers(world.view-1, T)) - O.show_message("[name] beeps, \"Attention! Wanted issue distributed!\"",2) + O.show_message(span_newscaster("[name] beeps, \"Attention! Wanted issue distributed!\""),2) playsound(src, 'sound/machines/warning-buzzer.ogg', 75, 1) return diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm index 3148b39a8d..5fc7c356dc 100644 --- a/code/game/machinery/nuclear_bomb.dm +++ b/code/game/machinery/nuclear_bomb.dm @@ -99,7 +99,7 @@ var/bomb_set var/obj/item/weldingtool/WT = O.get_welder() if(!WT.isOn()) return if(WT.get_fuel() < 5) // uses up 5 fuel. - to_chat(user, "You need more fuel to complete this task.") + to_chat(user, span_warning("You need more fuel to complete this task.")) return user.visible_message("[user] starts cutting loose the anchoring bolt covers on [src].", "You start cutting loose the anchoring bolt covers with [O]...") @@ -127,7 +127,7 @@ var/bomb_set var/obj/item/weldingtool/WT = O.get_welder() if(!WT.isOn()) return if(WT.get_fuel() < 5) // uses up 5 fuel. - to_chat(user, "You need more fuel to complete this task.") + to_chat(user, span_warning("You need more fuel to complete this task.")) return user.visible_message("[user] starts cutting apart the anchoring system sealant on [src].", "You start cutting apart the anchoring system's sealant with [O]...") @@ -165,7 +165,7 @@ var/bomb_set /obj/machinery/nuclearbomb/attack_hand(mob/user as mob) if(extended) if(!ishuman(user)) - to_chat(user, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You don't have the dexterity to do this!")) return 1 user.set_machine(src) @@ -191,9 +191,9 @@ var/bomb_set else if(deployable) if(removal_stage < 5) anchored = TRUE - visible_message("With a steely snap, bolts slide out of [src] and anchor it to the flooring!") + visible_message(span_warning("With a steely snap, bolts slide out of [src] and anchor it to the flooring!")) else - visible_message("\The [src] makes a highly unpleasant crunching noise. It looks like the anchoring bolts have been cut.") + visible_message(span_warning("\The [src] makes a highly unpleasant crunching noise. It looks like the anchoring bolts have been cut.")) if(!lighthack) flick("nuclearbombc", src) icon_state = "nuclearbomb1" @@ -218,14 +218,14 @@ var/bomb_set if(!usr.canmove || usr.stat || usr.restrained()) return if(!ishuman(usr)) - to_chat(usr, "You don't have the dexterity to do this!") + to_chat(usr, span_warning("You don't have the dexterity to do this!")) return 1 if(deployable) - to_chat(usr, "You close several panels to make [src] undeployable.") + to_chat(usr, span_warning("You close several panels to make [src] undeployable.")) deployable = 0 else - to_chat(usr, "You adjust some panels to make [src] deployable.") + to_chat(usr, span_warning("You adjust some panels to make [src] deployable.")) deployable = 1 return @@ -254,12 +254,12 @@ var/bomb_set safety = !safety spawn(100) safety = !safety if(safety == 1) - visible_message("The [src] quiets down.") + visible_message(span_notice("The [src] quiets down.")) if(!lighthack) if(icon_state == "nuclearbomb2") icon_state = "nuclearbomb1" else - visible_message("The [src] emits a quiet whirling noise!") + visible_message(span_notice("The [src] emits a quiet whirling noise!")) if(href_list["act"] == "wire") var/obj/item/I = usr.get_active_hand() if(!I.has_tool_quality(TOOL_WIRECUTTER)) @@ -314,7 +314,7 @@ var/bomb_set if(timing == -1.0) return if(safety) - to_chat(usr, "The safety is still on.") + to_chat(usr, span_warning("The safety is still on.")) return timing = !(timing) if(timing) @@ -337,14 +337,14 @@ var/bomb_set if(removal_stage == 5) anchored = FALSE - visible_message("\The [src] makes a highly unpleasant crunching noise. It looks like the anchoring bolts have been cut.") + visible_message(span_warning("\The [src] makes a highly unpleasant crunching noise. It looks like the anchoring bolts have been cut.")) return anchored = !(anchored) if(anchored) - visible_message("With a steely snap, bolts slide out of [src] and anchor it to the flooring.") + visible_message(span_warning("With a steely snap, bolts slide out of [src] and anchor it to the flooring.")) else - visible_message("The anchoring bolts slide back into the depths of [src].") + visible_message(span_warning("The anchoring bolts slide back into the depths of [src].")) add_fingerprint(usr) for(var/mob/M in viewers(1, src)) diff --git a/code/game/machinery/oxygen_pump.dm b/code/game/machinery/oxygen_pump.dm index 8dfe4dd2bb..e1dd124c79 100644 --- a/code/game/machinery/oxygen_pump.dm +++ b/code/game/machinery/oxygen_pump.dm @@ -30,7 +30,7 @@ if(breather.internals) breather.internals.icon_state = "internal0" breather.remove_from_mob(contained) - visible_message("\The [contained] rapidly retracts just before /the [src] is destroyed!") + visible_message(span_notice("\The [contained] rapidly retracts just before /the [src] is destroyed!")) breather = null QDEL_NULL(tank) @@ -55,14 +55,14 @@ /obj/machinery/oxygen_pump/attack_hand(mob/user as mob) if((stat & MAINT) && tank) - user.visible_message("\The [user] removes \the [tank] from \the [src].", "You remove \the [tank] from \the [src].") + user.visible_message("\The [user] removes \the [tank] from \the [src].", span_notice("You remove \the [tank] from \the [src].")) user.put_in_hands(tank) src.add_fingerprint(user) tank.add_fingerprint(user) tank = null return if (!tank) - to_chat(user, "There is no tank in \the [src]!") + to_chat(user, span_warning("There is no tank in \the [src]!")) return if(breather) if(tank) @@ -97,60 +97,60 @@ user = target // Check target validity if(!target.organs_by_name[BP_HEAD]) - to_chat(user, "\The [target] doesn't have a head.") + to_chat(user, span_warning("\The [target] doesn't have a head.")) return if(!target.check_has_mouth()) - to_chat(user, "\The [target] doesn't have a mouth.") + to_chat(user, span_warning("\The [target] doesn't have a mouth.")) return if(target.wear_mask && target != breather) - to_chat(user, "\The [target] is already wearing a mask.") + to_chat(user, span_warning("\The [target] is already wearing a mask.")) return if(target.head && (target.head.body_parts_covered & FACE)) - to_chat(user, "Remove their [target.head] first.") + to_chat(user, span_warning("Remove their [target.head] first.")) return if(!tank) - to_chat(user, "There is no tank in \the [src].") + to_chat(user, span_warning("There is no tank in \the [src].")) return if(stat & MAINT) - to_chat(user, "Please close the maintenance hatch first.") + to_chat(user, span_warning("Please close the maintenance hatch first.")) return if(!Adjacent(target)) - to_chat(user, "Please stay close to \the [src].") + to_chat(user, span_warning("Please stay close to \the [src].")) return //when there is a breather: if(breather && target != breather) - to_chat(user, "\The pump is already in use.") + to_chat(user, span_warning("\The pump is already in use.")) return //Checking if breather is still valid if(target == breather && target.wear_mask != contained) - to_chat(user, "\The [target] is not using the supplied [contained].") + to_chat(user, span_warning("\The [target] is not using the supplied [contained].")) return return 1 /obj/machinery/oxygen_pump/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER)) stat ^= MAINT - user.visible_message("\The [user] [(stat & MAINT) ? "opens" : "closes"] \the [src].", "You [(stat & MAINT) ? "open" : "close"] \the [src].") + user.visible_message(span_notice("\The [user] [(stat & MAINT) ? "opens" : "closes"] \the [src]."), span_notice("You [(stat & MAINT) ? "open" : "close"] \the [src].")) icon_state = (stat & MAINT) ? icon_state_open : icon_state_closed //TO-DO: Open icon if(istype(W, /obj/item/tank) && (stat & MAINT)) if(tank) - to_chat(user, "\The [src] already has a tank installed!") + to_chat(user, span_warning("\The [src] already has a tank installed!")) else user.drop_item() W.forceMove(src) tank = W - user.visible_message("\The [user] installs \the [tank] into \the [src].", "You install \the [tank] into \the [src].") + user.visible_message("\The [user] installs \the [tank] into \the [src].", span_notice("You install \the [tank] into \the [src].")) src.add_fingerprint(user) if(istype(W, /obj/item/tank) && !stat) - to_chat(user, "Please open the maintenance hatch first.") + to_chat(user, span_warning("Please open the maintenance hatch first.")) /obj/machinery/oxygen_pump/examine(var/mob/user) . = ..() if(tank) . += "The meter shows [round(tank.air_contents.return_pressure())] kPa." else - . += "It is missing a tank!" + . += span_warning("It is missing a tank!") /obj/machinery/oxygen_pump/process() @@ -160,7 +160,7 @@ tank.forceMove(src) breather.remove_from_mob(contained) contained.forceMove(src) - src.visible_message("\The [contained] rapidly retracts back into \the [src]!") + src.visible_message(span_notice("\The [contained] rapidly retracts back into \the [src]!")) breather = null update_use_power(USE_POWER_IDLE) else if(!breather.internal && tank) @@ -177,7 +177,7 @@ /obj/machinery/oxygen_pump/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) if(!tank) - to_chat(user, "[src] is missing a tank.") + to_chat(user, span_warning("[src] is missing a tank.")) if(ui) ui.close() return @@ -284,7 +284,7 @@ tank.forceMove(src) breather.remove_from_mob(contained) contained.forceMove(src) - src.visible_message("\The [contained] rapidly retracts back into \the [src]!") + src.visible_message(span_notice("\The [contained] rapidly retracts back into \the [src]!")) breather = null update_use_power(USE_POWER_IDLE) else if(!breather.internal && tank) diff --git a/code/game/machinery/painter_vr.dm b/code/game/machinery/painter_vr.dm index 00d2dec03b..9ed6caf6f4 100644 --- a/code/game/machinery/painter_vr.dm +++ b/code/game/machinery/painter_vr.dm @@ -68,7 +68,7 @@ return if(is_type_in_list(I, allowed_types) && !inoperable()) - user.visible_message("[user] inserts \the [I] into the Color Mate receptable.") + user.visible_message(span_notice("[user] inserts \the [I] into the Color Mate receptable.")) user.drop_from_inventory(I) I.forceMove(src) inserted = I diff --git a/code/game/machinery/partslathe_vr.dm b/code/game/machinery/partslathe_vr.dm index 0cc1b05dc7..1d6ccc1621 100644 --- a/code/game/machinery/partslathe_vr.dm +++ b/code/game/machinery/partslathe_vr.dm @@ -88,7 +88,7 @@ /obj/machinery/partslathe/attackby(var/obj/item/O as obj, var/mob/user as mob) if(busy) - to_chat(user, "\The [src] is busy. Please wait for completion of previous operation.") + to_chat(user, span_notice("\The [src] is busy. Please wait for completion of previous operation.")) return 1 if(default_deconstruction_screwdriver(user, O)) return @@ -99,23 +99,23 @@ if(inoperable()) return if(panel_open) - to_chat(user, "You can't load \the [src] while it's opened.") + to_chat(user, span_notice("You can't load \the [src] while it's opened.")) return if(istype(O, /obj/item/circuitboard)) if(copy_board) - to_chat(user, "There is already a board inserted in \the [src].") + to_chat(user, span_warning("There is already a board inserted in \the [src].")) return if(!user.unEquip(O)) return copy_board = O O.forceMove(src) - user.visible_message("[user] inserts [O] into \the [src]'s circuit reader.", "You insert [O] into \the [src]'s circuit reader.") + user.visible_message("[user] inserts [O] into \the [src]'s circuit reader.", span_notice("You insert [O] into \the [src]'s circuit reader.")) updateUsrDialog() return if(try_load_materials(user, O)) return else - to_chat(user, "You cannot insert this item into \the [src]!") + to_chat(user, span_notice("You cannot insert this item into \the [src]!")) return // Attept to load materials. Returns 0 if item wasn't a stack of materials, otherwise 1 (even if failed to load) @@ -123,7 +123,7 @@ if(!istype(S)) return 0 if(!(S.material.name in materials)) - to_chat(user, "The [src] doesn't accept [S.material]!") + to_chat(user, span_warning("The [src] doesn't accept [S.material]!")) return 1 if(S.get_amount() < 1) return 1 // Does this even happen? Sanity check I guess. @@ -134,11 +134,11 @@ materials[S.material.name] += S.perunit S.use(1) count++ - user.visible_message("[user] inserts [S.name] into \the [src].", "You insert [count] [S.name] into \the [src].") + user.visible_message("[user] inserts [S.name] into \the [src].", span_notice("You insert [count] [S.name] into \the [src].")) flick("partslathe-load-[S.material.name]", src) updateUsrDialog() else - to_chat(user, "\The [src] cannot hold more [S.name].") + to_chat(user, span_warning("\The [src] cannot hold more [S.name].")) return 1 /obj/machinery/partslathe/process() @@ -163,7 +163,7 @@ removeFromQueue(1) update_icon() else if(busy) - visible_message("[icon2html(src,viewers(src))] flashes: insufficient materials: [getLackingMaterials(D)].") + visible_message(span_notice("[icon2html(src,viewers(src))] flashes: insufficient materials: [getLackingMaterials(D)].")) busy = 0 update_use_power(USE_POWER_IDLE) update_icon() @@ -330,7 +330,7 @@ return TRUE if(busy) - to_chat(usr, "[src] is busy. Please wait for completion of previous operation.") + to_chat(usr, span_notice("[src] is busy. Please wait for completion of previous operation.")) return switch(action) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index d497ac868d..81adff4b5c 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -194,12 +194,12 @@ Buildable meters var/flags = initial(fakeA.pipe_flags) for(var/obj/machinery/atmospherics/M in loc) if((M.pipe_flags & flags & PIPING_ONE_PER_TURF)) //Only one dense/requires density object per tile, eg connectors/cryo/heater/coolers. - to_chat(user, "Something is hogging the tile!") + to_chat(user, span_warning("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() & SSmachines.get_init_dirs(pipe_type, dir)) // matches at least one direction on either type of pipe - to_chat(user, "There is already a pipe at that location!") + to_chat(user, span_warning("There is already a pipe at that location!")) return TRUE // no conflicts found @@ -208,15 +208,15 @@ Buildable meters // TODO - Evaluate and remove the "need at least one thing to connect to" thing ~Leshana // With how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment. if (QDELETED(A)) - to_chat(user, "There's nothing to connect this pipe section to!") + to_chat(user, span_warning("There's nothing to connect this pipe section to!")) return TRUE transfer_fingerprints_to(A) playsound(src, W.usesound, 50, 1) user.visible_message( \ "[user] fastens \the [src].", \ - "You fasten \the [src].", \ - "You hear ratcheting.") + span_notice("You fasten \the [src]."), \ + span_italics("You hear ratcheting.")) qdel(src) @@ -279,11 +279,11 @@ Buildable meters pipe = P break if(!pipe) - to_chat(user, "You need to fasten it to a pipe!") + to_chat(user, span_warning("You need to fasten it to a pipe!")) return TRUE new /obj/machinery/meter(loc, piping_layer) playsound(src, W.usesound, 50, 1) - to_chat(user, "You fasten the meter to the pipe.") + to_chat(user, span_notice("You fasten the meter to the pipe.")) qdel(src) /obj/item/pipe_meter/dropped() diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 96da384789..bf87c9ff93 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -112,18 +112,18 @@ /obj/machinery/pipedispenser/attackby(var/obj/item/W as obj, var/mob/user as mob) src.add_fingerprint(usr) if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter)) - to_chat(usr, "You put [W] back in [src].") + to_chat(usr, span_notice("You put [W] back in [src].")) user.drop_item() qdel(W) return else if(W.has_tool_quality(TOOL_WRENCH)) if (unwrenched==0) playsound(src, W.usesound, 50, 1) - to_chat(user, "You begin to unfasten \the [src] from the floor...") + to_chat(user, span_notice("You begin to unfasten \the [src] from the floor...")) if (do_after(user, 40 * W.toolspeed)) user.visible_message( \ - "[user] unfastens \the [src].", \ - "You have unfastened \the [src]. Now it can be pulled somewhere else.", \ + span_notice("[user] unfastens \the [src]."), \ + span_notice("You have unfastened \the [src]. Now it can be pulled somewhere else."), \ "You hear ratchet.") src.anchored = FALSE src.stat |= MAINT @@ -132,11 +132,11 @@ usr << browse(null, "window=pipedispenser") else /*if (unwrenched==1)*/ playsound(src, W.usesound, 50, 1) - to_chat(user, "You begin to fasten \the [src] to the floor...") + to_chat(user, span_notice("You begin to fasten \the [src] to the floor...")) if (do_after(user, 20 * W.toolspeed)) user.visible_message( \ - "[user] fastens \the [src].", \ - "You have fastened \the [src]. Now it can dispense pipes.", \ + span_notice("[user] fastens \the [src]."), \ + span_notice("You have fastened \the [src]. Now it can dispense pipes."), \ "You hear ratchet.") src.anchored = TRUE src.stat &= ~MAINT @@ -165,7 +165,7 @@ if (pipe.anchored) return - to_chat(usr, "You shove [pipe] back in [src].") + to_chat(usr, span_notice("You shove [pipe] back in [src].")) qdel(pipe) // adding a pipe dispensers that spawn unhooked from the ground diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm index 0ece28b95a..0b5c572e13 100644 --- a/code/game/machinery/pipe/pipelayer.dm +++ b/code/game/machinery/pipe/pipelayer.dm @@ -62,16 +62,16 @@ var/answer = tgui_alert(user, "Do you want to eject all the metal in \the [src]?", "Eject?", list("Yes","No")) if(answer == "Yes") var/amount_ejected = eject_metal() - user.visible_message("[user] removes [amount_ejected] sheet\s of [MAT_STEEL] from the \the [src].", - "You remove [amount_ejected] sheet\s of [MAT_STEEL] from \the [src].") + user.visible_message(span_notice("[user] removes [amount_ejected] sheet\s of [MAT_STEEL] from the \the [src]."), + span_notice("You remove [amount_ejected] sheet\s of [MAT_STEEL] from \the [src].")) return if(!metal && !on) - to_chat(user, "\The [src] doesn't work without metal.") + to_chat(user, span_warning("\The [src] doesn't work without metal.")) return on = !on old_turf = get_turf(src) old_dir = dir - user.visible_message("[user] has [!on?"de":""]activated \the [src].", "You [!on?"de":""]activate \the [src].") + user.visible_message(span_notice("[user] has [!on?"de":""]activated \the [src]."), span_notice("You [!on?"de":""]activate \the [src].")) return /obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob) @@ -84,32 +84,32 @@ if (!panel_open && W.has_tool_quality(TOOL_WRENCH)) P_type_t = tgui_input_list(usr, "Choose pipe type", "Pipe type", Pipes) P_type = Pipes[P_type_t] - user.visible_message("[user] has set \the [src] to manufacture [P_type_t].", "You set \the [src] to manufacture [P_type_t].") + user.visible_message(span_notice("[user] has set \the [src] to manufacture [P_type_t]."), span_notice("You set \the [src] to manufacture [P_type_t].")) return if(!panel_open && W.has_tool_quality(TOOL_CROWBAR)) a_dis = !a_dis - user.visible_message("[user] has [!a_dis?"de":""]activated auto-dismantling.", "You [!a_dis?"de":""]activate auto-dismantling.") + user.visible_message(span_notice("[user] has [!a_dis?"de":""]activated auto-dismantling."), span_notice("You [!a_dis?"de":""]activate auto-dismantling.")) return if(istype(W, /obj/item/pipe)) // NOTE - We must check for matter, otherwise the (free) pipe dispenser can be used to get infinite steel. if(!W.matter || W.matter[MAT_STEEL] < pipe_cost * SHEET_MATERIAL_AMOUNT) - to_chat(user, "\The [W] doesn't contain enough [MAT_STEEL] to recycle.") + to_chat(user, span_warning("\The [W] doesn't contain enough [MAT_STEEL] to recycle.")) else if(metal + pipe_cost > max_metal) - to_chat(user, "\The [src] is full.") + to_chat(user, span_notice("\The [src] is full.")) else user.drop_from_inventory(W) metal += pipe_cost - to_chat(user, "You recycle \the [W].") + to_chat(user, span_notice("You recycle \the [W].")) qdel(W) return if(istype(W, /obj/item/stack/material) && W.get_material_name() == MAT_STEEL) var/result = load_metal(W) if(isnull(result)) - to_chat(user, "Unable to load [W] - no metal found.") + to_chat(user, span_warning("Unable to load [W] - no metal found.")) else if(!result) - to_chat(user, "\The [src] is full.") + to_chat(user, span_notice("\The [src] is full.")) else - user.visible_message("[user] has loaded metal into \the [src].", "You load metal into \the [src]") + user.visible_message(span_notice("[user] has loaded metal into \the [src]."), span_notice("You load metal into \the [src]")) return ..() diff --git a/code/game/machinery/pointdefense.dm b/code/game/machinery/pointdefense.dm index bb4f0e6dc4..ce35f88253 100644 --- a/code/game/machinery/pointdefense.dm +++ b/code/game/machinery/pointdefense.dm @@ -62,7 +62,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) return FALSE if(!(get_z(PD) in GetConnectedZlevels(get_z(src)))) - to_chat(usr, "[PD] is not within control range.") + to_chat(usr, span_warning("[PD] is not within control range.")) return FALSE if(!PD.Activate()) //Activate() whilst the device is active will return false. @@ -100,9 +100,9 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) // Check for duplicate controllers with this ID for(var/obj/machinery/pointdefense_control/PC as anything in pointdefense_controllers) if(PC != src && PC.id_tag == id_tag) - to_chat(user, "The [new_ident] network already has a controller.") + to_chat(user, span_warning("The [new_ident] network already has a controller.")) return - to_chat(user, "You register [src] with the [new_ident] network.") + to_chat(user, span_notice("You register [src] with the [new_ident] network.")) id_tag = new_ident return if(default_deconstruction_screwdriver(user, W)) @@ -215,7 +215,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) var/new_ident = tgui_input_text(user, "Enter a new ident tag.", "[src]", id_tag, MAX_NAME_LEN) new_ident = sanitize(new_ident,MAX_NAME_LEN) if(new_ident && new_ident != id_tag && user.Adjacent(src) && CanInteract(user, GLOB.tgui_physical_state)) - to_chat(user, "You register [src] with the [new_ident] network.") + to_chat(user, span_notice("You register [src] with the [new_ident] network.")) id_tag = new_ident return if(default_deconstruction_screwdriver(user, W)) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index ac40987c6a..4099855042 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -377,13 +377,13 @@ /obj/machinery/porta_turret/proc/isLocked(mob/user) if(locked && !issilicon(user)) - to_chat(user, "Controls locked.") + to_chat(user, span_notice("Controls locked.")) return 1 if(HasController()) return TRUE if(isrobot(user) || isAI(user)) if(ailock) - to_chat(user, "There seems to be a firewall preventing you from accessing this device.") + to_chat(user, span_notice("There seems to be a firewall preventing you from accessing this device.")) return TRUE else return FALSE @@ -412,10 +412,10 @@ /obj/machinery/porta_turret/tgui_interact(mob/user, datum/tgui/ui = null) if(HasController()) - to_chat(user, "[src] can only be controlled using the assigned turret controller.") + to_chat(user, span_notice("[src] can only be controlled using the assigned turret controller.")) return if(!anchored) - to_chat(user, "[src] has to be secured first!") + to_chat(user, span_notice("[src] has to be secured first!")) return ui = SStgui.try_update_ui(user, src, ui) if(!ui) @@ -487,10 +487,10 @@ if(I.has_tool_quality(TOOL_CROWBAR)) //If the turret is destroyed, you can remove it with a crowbar to //try and salvage its components - to_chat(user, "You begin prying the metal coverings off.") + to_chat(user, span_notice("You begin prying the metal coverings off.")) if(do_after(user, 20)) if(can_salvage && prob(70)) - to_chat(user, "You remove the turret and salvage some components.") + to_chat(user, span_notice("You remove the turret and salvage some components.")) if(installation) var/obj/item/gun/energy/Gun = new installation(loc) Gun.power_supply.charge = gun_charge @@ -500,23 +500,23 @@ if(prob(50)) new /obj/item/assembly/prox_sensor(loc) else - to_chat(user, "You remove the turret but did not manage to salvage anything.") + to_chat(user, span_notice("You remove the turret but did not manage to salvage anything.")) qdel(src) // qdel else if(I.has_tool_quality(TOOL_WRENCH)) if(enabled || raised) - to_chat(user, "You cannot unsecure an active turret!") + to_chat(user, span_warning("You cannot unsecure an active turret!")) return if(wrenching) - to_chat(user, "Someone is already [anchored ? "un" : ""]securing the turret!") + to_chat(user, span_warning("Someone is already [anchored ? "un" : ""]securing the turret!")) return if(!anchored && isinspace()) - to_chat(user, "Cannot secure turrets in space!") + to_chat(user, span_warning("Cannot secure turrets in space!")) return user.visible_message(\ - "[user] begins [anchored ? "un" : ""]securing the turret.", \ - "You begin [anchored ? "un" : ""]securing the turret." \ + span_warning("[user] begins [anchored ? "un" : ""]securing the turret."), \ + span_notice("You begin [anchored ? "un" : ""]securing the turret.") \ ) wrenching = TRUE @@ -526,11 +526,11 @@ playsound(src, I.usesound, 100, 1) anchored = TRUE update_icon() - to_chat(user, "You secure the exterior bolts on the turret.") + to_chat(user, span_notice("You secure the exterior bolts on the turret.")) else if(anchored) playsound(src, I.usesound, 100, 1) anchored = FALSE - to_chat(user, "You unsecure the exterior bolts on the turret.") + to_chat(user, span_notice("You unsecure the exterior bolts on the turret.")) update_icon() wrenching = FALSE @@ -538,10 +538,10 @@ //Behavior lock/unlock mangement if(allowed(user)) locked = !locked - to_chat(user, "Controls are now [locked ? "locked" : "unlocked"].") + to_chat(user, span_notice("Controls are now [locked ? "locked" : "unlocked"].")) updateUsrDialog() else - to_chat(user, "Access denied.") + to_chat(user, span_notice("Access denied.")) else //if the turret was attacked with the intention of harming it: @@ -560,7 +560,7 @@ var/mob/living/simple_mob/S = L if(damage >= STRUCTURE_MIN_DAMAGE_THRESHOLD) var/incoming_damage = round(damage - (damage / 5)) //Turrets are slightly armored, assumedly. - visible_message("\The [S] [pick(S.attacktext)] \the [src]!") + visible_message(span_danger("\The [S] [pick(S.attacktext)] \the [src]!")) take_damage(incoming_damage) S.do_attack_animation(src) return 1 @@ -571,7 +571,7 @@ if(!emagged) //Emagging the turret makes it go bonkers and stun everyone. It also makes //the turret shoot much, much faster. - to_chat(user, "You short out [src]'s threat assessment circuits.") + to_chat(user, span_warning("You short out [src]'s threat assessment circuits.")) visible_message("[src] hums oddly...") emagged = TRUE controllock = TRUE @@ -945,14 +945,14 @@ if(0) //first step if(I.has_tool_quality(TOOL_WRENCH) && !anchored) playsound(src, I.usesound, 100, 1) - to_chat(user, "You secure the external bolts.") + to_chat(user, span_notice("You secure the external bolts.")) anchored = TRUE build_step = 1 return else if(I.has_tool_quality(TOOL_CROWBAR) && !anchored) playsound(src, I.usesound, 75, 1) - to_chat(user, "You dismantle the turret construction.") + to_chat(user, span_notice("You dismantle the turret construction.")) new /obj/item/stack/material/steel(loc, 5) qdel(src) return @@ -961,16 +961,16 @@ if(istype(I, /obj/item/stack/material) && I.get_material_name() == MAT_STEEL) var/obj/item/stack/M = I if(M.use(2)) - to_chat(user, "You add some metal armor to the interior frame.") + to_chat(user, span_notice("You add some metal armor to the interior frame.")) build_step = 2 icon_state = "turret_frame2" else - to_chat(user, "You need two sheets of metal to continue construction.") + to_chat(user, span_warning("You need two sheets of metal to continue construction.")) return else if(I.has_tool_quality(TOOL_WRENCH)) playsound(src, I.usesound, 75, 1) - to_chat(user, "You unfasten the external bolts.") + to_chat(user, span_notice("You unfasten the external bolts.")) anchored = FALSE build_step = 0 return @@ -978,7 +978,7 @@ if(2) if(I.has_tool_quality(TOOL_WRENCH)) playsound(src, I.usesound, 100, 1) - to_chat(user, "You bolt the metal armor into place.") + to_chat(user, span_notice("You bolt the metal armor into place.")) build_step = 3 return @@ -987,7 +987,7 @@ if(!WT.isOn()) return if(WT.get_fuel() < 5) //uses up 5 fuel. - to_chat(user, "You need more fuel to complete this task.") + to_chat(user, span_notice("You need more fuel to complete this task.")) return playsound(src, I.usesound, 50, 1) @@ -1005,11 +1005,11 @@ return var/obj/item/gun/energy/E = I //typecasts the item to an energy gun if(!user.unEquip(I)) - to_chat(user, "\The [I] is stuck to your hand, you cannot put it in \the [src]") + to_chat(user, span_notice("\The [I] is stuck to your hand, you cannot put it in \the [src]")) return installation = I.type //installation becomes I.type gun_charge = E.power_supply.charge //the gun's charge is stored in gun_charge - to_chat(user, "You add [I] to the turret.") + to_chat(user, span_notice("You add [I] to the turret.")) target_type = /obj/machinery/porta_turret build_step = 4 @@ -1018,7 +1018,7 @@ else if(I.has_tool_quality(TOOL_WRENCH)) playsound(src, I.usesound, 100, 1) - to_chat(user, "You remove the turret's metal armor bolts.") + to_chat(user, span_notice("You remove the turret's metal armor bolts.")) build_step = 2 return @@ -1026,9 +1026,9 @@ if(isprox(I)) build_step = 5 if(!user.unEquip(I)) - to_chat(user, "\The [I] is stuck to your hand, you cannot put it in \the [src]") + to_chat(user, span_notice("\The [I] is stuck to your hand, you cannot put it in \the [src]")) return - to_chat(user, "You add the prox sensor to the turret.") + to_chat(user, span_notice("You add the prox sensor to the turret.")) qdel(I) return @@ -1038,7 +1038,7 @@ if(I.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, I.usesound, 100, 1) build_step = 6 - to_chat(user, "You close the internal access hatch.") + to_chat(user, span_notice("You close the internal access hatch.")) return //attack_hand() removes the prox sensor @@ -1047,16 +1047,16 @@ if(istype(I, /obj/item/stack/material) && I.get_material_name() == MAT_STEEL) var/obj/item/stack/M = I if(M.use(2)) - to_chat(user, "You add some metal armor to the exterior frame.") + to_chat(user, span_notice("You add some metal armor to the exterior frame.")) build_step = 7 else - to_chat(user, "You need two sheets of metal to continue construction.") + to_chat(user, span_warning("You need two sheets of metal to continue construction.")) return else if(I.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, I.usesound, 100, 1) build_step = 5 - to_chat(user, "You open the internal access hatch.") + to_chat(user, span_notice("You open the internal access hatch.")) return if(7) @@ -1064,14 +1064,14 @@ var/obj/item/weldingtool/WT = I.get_welder() if(!WT.isOn()) return if(WT.get_fuel() < 5) - to_chat(user, "You need more fuel to complete this task.") + to_chat(user, span_notice("You need more fuel to complete this task.")) playsound(src, WT.usesound, 50, 1) if(do_after(user, 30 * WT.toolspeed)) if(!src || !WT.remove_fuel(5, user)) return build_step = 8 - to_chat(user, "You weld the turret's armor down.") + to_chat(user, span_notice("You weld the turret's armor down.")) //The final step: create a full turret var/obj/machinery/porta_turret/Turret = new target_type(loc) @@ -1085,7 +1085,7 @@ else if(I.has_tool_quality(TOOL_CROWBAR)) playsound(src, I.usesound, 75, 1) - to_chat(user, "You pry off the turret's exterior armor.") + to_chat(user, span_notice("You pry off the turret's exterior armor.")) new /obj/item/stack/material/steel(loc, 2) build_step = 6 return @@ -1114,10 +1114,10 @@ Gun.update_icon() installation = null gun_charge = 0 - to_chat(user, "You remove [Gun] from the turret frame.") + to_chat(user, span_notice("You remove [Gun] from the turret frame.")) if(5) - to_chat(user, "You remove the prox sensor from the turret frame.") + to_chat(user, span_notice("You remove the prox sensor from the turret frame.")) new /obj/item/assembly/prox_sensor(loc) build_step = 4 diff --git a/code/game/machinery/protean_reconstitutor.dm b/code/game/machinery/protean_reconstitutor.dm index 781962a6be..f26e23d90c 100644 --- a/code/game/machinery/protean_reconstitutor.dm +++ b/code/game/machinery/protean_reconstitutor.dm @@ -83,13 +83,13 @@ if(protean_brain) . += "It currently has a protean positronic brain." if(!protean_brain.brainmob.client) - . += "The positronic brain appears to be inactive!" + . += span_warning("The positronic brain appears to be inactive!") . += "The readout shows that it has [nanomass_reserve] units of nanites ready for use. It requires [nanomass_required] per \'revive\' process, and has a maximum capacity of [nanotank_max] units." /obj/machinery/protean_reconstitutor/attackby(obj/item/W as obj, mob/user as mob) src.add_fingerprint(user) if(processing_revive) - to_chat(user, "\The [src] is busy. Please wait for completion of previous operation.") + to_chat(user, span_notice("\The [src] is busy. Please wait for completion of previous operation.")) playsound(src, buzzsound, 100, 1, -1) return @@ -103,21 +103,21 @@ if(istype(W,/obj/item/mmi/digital/posibrain/nano)) var/obj/item/mmi/digital/posibrain/nano/NB = W if(!NB.brainmob.client) - to_chat(user,"You cannot use an inactive positronic brain for this process.") + to_chat(user,span_warning("You cannot use an inactive positronic brain for this process.")) return - to_chat(user,"You slot \the [NB] into \the [src].") + to_chat(user,span_notice("You slot \the [NB] into \the [src].")) user.drop_from_inventory(NB) NB.loc = src protean_brain = NB if(istype(W,/obj/item/organ/internal/nano/orchestrator)) - to_chat(user,"You slot \the [W] into \the [src].") + to_chat(user,span_notice("You slot \the [W] into \the [src].")) user.drop_from_inventory(W) W.loc = src protean_orchestrator = W if(istype(W,/obj/item/organ/internal/nano/refactory)) - to_chat(user,"You slot \the [W] into \the [src].") + to_chat(user,span_notice("You slot \the [W] into \the [src].")) user.drop_from_inventory(W) W.loc = src protean_refactory = W @@ -125,12 +125,12 @@ if(istype(W,/obj/item/stack/nanopaste)) var/obj/item/stack/nanopaste/NP = W if(nanomass_reserve >= nanotank_max) - to_chat(user,"The tank is full!") + to_chat(user,span_notice("The tank is full!")) return nanomass_reserve += NP.amount * max(1,NP.mech_repair / paste_inefficiency) if(nanomass_reserve > nanotank_max) nanomass_reserve = nanotank_max - to_chat(user,"You fill \the [src] with paste from \the [NP]. The display now reads [nanomass_reserve]/[nanotank_max] units.") + to_chat(user,span_notice("You fill \the [src] with paste from \the [NP]. The display now reads [nanomass_reserve]/[nanotank_max] units.")) qdel(NP) if(W.has_tool_quality(TOOL_WRENCH)) @@ -162,21 +162,21 @@ /obj/machinery/protean_reconstitutor/attack_hand(mob/user as mob) if(!protean_brain || !protean_orchestrator || !protean_refactory || (nanomass_reserve < nanomass_required)) //no brain, no orchestrator, and/or not enough goo - to_chat(user,"Essential components missing, or insufficient materials available!") + to_chat(user,span_warning("Essential components missing, or insufficient materials available!")) playsound(src, buzzsound, 100, 1, -1) update_icon() return if(processing_revive) //we're currently processing a patient, chill out! - src.visible_message("\The [src] chirps, \"Reconstitution cycle currently in progress, please wait!\"") + src.visible_message(span_notice("\The [src] chirps, \"Reconstitution cycle currently in progress, please wait!\"")) playsound(src, buzzsound, 100, 1, -1) return if(!protean_brain.brainmob.client) - src.visible_message("\The [src] chirps, \"Warning, no positronic neural network activity detected! Recommend removing inactive core.\"") + src.visible_message(span_warning("\The [src] chirps, \"Warning, no positronic neural network activity detected! Recommend removing inactive core.\"")) return else if(!processing_revive && protean_brain && protean_orchestrator && protean_refactory && (nanomass_reserve >= nanomass_required)) //we're good, let's get recombobulating! - src.visible_message("[user] initializes \the [src]. It chirps, \"Please stand by, synchronizing components... estimated time to completion: five minutes.\"") + src.visible_message(span_notice("[user] initializes \the [src]. It chirps, \"Please stand by, synchronizing components... estimated time to completion: five minutes.\"")) processing_revive = TRUE power_change() if(prob(2)) @@ -195,7 +195,7 @@ sleep(per_organ_delay) var/obj/item/O = P.internal_organs_by_name[organ] if(istype(O,/obj/item/organ/internal/nano/refactory)) - src.visible_message("\The [src] chirps, \"Initializing refactory...\"") + src.visible_message(span_notice("\The [src] chirps, \"Initializing refactory...\"")) P.internal_organs_by_name.Remove(O) P.contents.Remove(O) qdel(O) @@ -206,7 +206,7 @@ mats_cached = TRUE protean_refactory.loc = P if(istype(O,/obj/item/organ/internal/nano/orchestrator)) - src.visible_message("\The [src] chirps, \"Linking nanoswarm to orchestrator...\"") + src.visible_message(span_notice("\The [src] chirps, \"Linking nanoswarm to orchestrator...\"")) P.internal_organs_by_name.Remove(O) P.internal_organs.Remove(O) P.contents.Remove(O) @@ -215,10 +215,10 @@ P.internal_organs.Add(protean_orchestrator) protean_orchestrator.loc = P if(istype(O,/obj/item/organ/internal/mmi_holder/posibrain/nano)) - src.visible_message("\The [src] chirps, \"Synchronizing positronic neural architecture...\"") + src.visible_message(span_notice("\The [src] chirps, \"Synchronizing positronic neural architecture...\"")) //on the offchance our client blipped before getting to this step, abort, schloop the organs back into the machine, dissolve the body, and refund the nanos if(!protean_brain.brainmob.client) - src.visible_message("\The [src] buzzes, \"No positronic neural activity detected! Aborting cycle!\"") + src.visible_message(span_warning("\The [src] buzzes, \"No positronic neural activity detected! Aborting cycle!\"")) playsound(src, buzzsound, 100, 1, -1) processing_revive = FALSE qdel(P) @@ -283,7 +283,7 @@ new_nif.quick_implant(P) //revive complete, now restore the cached mats (if we had any) if(mats_cached == TRUE) - src.visible_message("\The [src] chirps, \"Reindexing archived refactory materials storage.\"") + src.visible_message(span_notice("\The [src] chirps, \"Reindexing archived refactory materials storage.\"")) for(var/organ in P.internal_organs_by_name) var/obj/item/O = P.internal_organs_by_name[organ] if(istype(O,/obj/item/organ/internal/nano/refactory)) @@ -292,8 +292,8 @@ materials_cache.Cut() mats_cached = FALSE //finally... drop them in front of the machine - src.visible_message("\The [src] chirps, \"Protean reconstitution cycle complete!\"") - to_chat(P,"You feel your sense of self expanding, spreading out to inhabit your new \'body\'. You feel... ALIVE!") + src.visible_message(span_notice("\The [src] chirps, \"Protean reconstitution cycle complete!\"")) + to_chat(P,span_notice("You feel your sense of self expanding, spreading out to inhabit your new \'body\'. You feel... ALIVE!")) playsound(src, dingsound, 100, 1, -1) //soup's on! P.loc = src.loc processing_revive = FALSE diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 027f346144..516b467e74 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -38,36 +38,36 @@ if(allowed) if(charging) - to_chat(user, "\A [charging] is already charging here.") + to_chat(user, span_warning("\A [charging] is already charging here.")) return // Checks to make sure he's not in space doing it, and that the area got proper power. if(!powered()) - to_chat(user, "\The [src] blinks red as you try to insert [G]!") + to_chat(user, span_warning("\The [src] blinks red as you try to insert [G]!")) return if(istype(G, /obj/item/gun/energy)) var/obj/item/gun/energy/E = G if(E.self_recharge) - to_chat(user, "\The [E] has no recharge port.") + to_chat(user, span_notice("\The [E] has no recharge port.")) return if(istype(G, /obj/item/modular_computer)) var/obj/item/modular_computer/C = G if(!C.battery_module) - to_chat(user, "\The [C] does not have a battery installed. ") + to_chat(user, span_notice("\The [C] does not have a battery installed. ")) return if(istype(G, /obj/item/melee/baton)) var/obj/item/melee/baton/B = G if(B.use_external_power) - to_chat(user, "\The [B] has no recharge port.") + to_chat(user, span_notice("\The [B] has no recharge port.")) return if(istype(G, /obj/item/flash)) var/obj/item/flash/F = G if(F.use_external_power) - to_chat(user, "\The [F] has no recharge port.") + to_chat(user, span_notice("\The [F] has no recharge port.")) return if(istype(G, /obj/item/weldingtool/electric)) var/obj/item/weldingtool/electric/EW = G if(EW.use_external_power) - to_chat(user, "\The [EW] has no recharge port.") + to_chat(user, span_notice("\The [EW] has no recharge port.")) return if(!G.get_cell() && !istype(G, /obj/item/ammo_casing/microbattery) && !istype(G, /obj/item/paicard)) //VOREStation Edit: NSFW charging to_chat(user, "\The [G] does not have a battery installed.") @@ -75,14 +75,14 @@ if(istype(G, /obj/item/paicard)) var/obj/item/paicard/ourcard = G if(ourcard.panel_open) - to_chat(user, "\The [ourcard] won't fit in the recharger with its panel open.") + to_chat(user, span_warning("\The [ourcard] won't fit in the recharger with its panel open.")) return if(ourcard.pai) if(ourcard.pai.stat == CONSCIOUS) - to_chat(user, "\The [ourcard] boops... it doesn't need to be recharged!") + to_chat(user, span_warning("\The [ourcard] boops... it doesn't need to be recharged!")) return else - to_chat(user, "\The [ourcard] doesn't have a personality!") + to_chat(user, span_warning("\The [ourcard] doesn't have a personality!")) return user.drop_item() @@ -93,7 +93,7 @@ else if(portable && G.has_tool_quality(TOOL_WRENCH)) if(charging) - to_chat(user, "Remove [charging] first!") + to_chat(user, span_warning("Remove [charging] first!")) return anchored = !anchored to_chat(user, "You [anchored ? "attached" : "detached"] [src].") diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index a80486dc25..f6fb8599ed 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -126,14 +126,14 @@ if(wornrig) // just to make sure for(var/obj/item/rig_module/storedmod in wornrig.installed_modules) if(weld_rate && storedmod.damage && cell.checked_use(weld_power_use * weld_rate * CELLRATE)) - to_chat(H, "[storedmod] is repaired!") + to_chat(H, span_notice("[storedmod] is repaired!")) storedmod.damage = 0 if(wornrig.chest) var/obj/item/clothing/suit/space/rig/rigchest = wornrig.chest if(weld_rate && rigchest.damage && cell.checked_use(weld_power_use * weld_rate * CELLRATE)) rigchest.breaches = list() rigchest.calc_breach_damage() - to_chat(H, "[rigchest] is repaired!") + to_chat(H, span_notice("[rigchest] is repaired!")) if(wornrig.cell) var/obj/item/cell/rigcell = wornrig.cell var/diff = min(rigcell.maxcharge - rigcell.charge, charging_power * CELLRATE) // Capped by charging_power / tick diff --git a/code/game/machinery/records_scanner.dm b/code/game/machinery/records_scanner.dm index de37a50ad3..3259c5cdf7 100644 --- a/code/game/machinery/records_scanner.dm +++ b/code/game/machinery/records_scanner.dm @@ -70,7 +70,7 @@ Black Marks:
"} for(var/A in marks) text += "[A]
" - to_chat(user, "You feel a sting as the scanner extracts some of your blood.") + to_chat(user, span_notice("You feel a sting as the scanner extracts some of your blood.")) var/turf/T = get_step(src,outputdir) var/obj/item/paper/print = new(T) print.name = "[mname] Report" diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 7cb34a113b..5d327cd7f4 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -264,7 +264,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() announcement.announcer = ID.assignment ? "[ID.assignment] [ID.registered_name]" : ID.registered_name else reset_message() - to_chat(user, "You are not authorized to send announcements.") + to_chat(user, span_warning("You are not authorized to send announcements.")) SStgui.update_uis(src) if(istype(O, /obj/item/stamp)) if(inoperable(MAINT)) return diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm index f57bf48544..2f349c0446 100644 --- a/code/game/machinery/seed_extractor.dm +++ b/code/game/machinery/seed_extractor.dm @@ -22,7 +22,7 @@ new_seed_type = SSplants.seeds[F.plantname] if(new_seed_type) - to_chat(user, "You extract some seeds from [O].") + to_chat(user, span_notice("You extract some seeds from [O].")) var/produce = rand(1,4) for(var/i = 0;i<=produce;i++) var/obj/item/seeds/seeds = new(get_turf(src)) @@ -37,7 +37,7 @@ else if(istype(O, /obj/item/stack/tile/grass)) var/obj/item/stack/tile/grass/S = O if(S.use(1)) - to_chat(user, "You extract some seeds from the grass tile.") + to_chat(user, span_notice("You extract some seeds from the grass tile.")) new /obj/item/seeds/grassseed(loc) else if(istype(O, /obj/item/fossil/plant)) // Fossils @@ -48,4 +48,4 @@ else if(default_unfasten_wrench(user, O, 20)) return - return \ No newline at end of file + return diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index c8dbf4d7d7..f7c9f3c6b9 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -85,7 +85,7 @@ C.loc = src C.add_fingerprint(usr) - user.visible_message("[user] inserts a power cell into [src].", "You insert the power cell into [src].") + user.visible_message(span_notice("[user] inserts a power cell into [src]."), span_notice("You insert the power cell into [src].")) power_change() else to_chat(user, "The hatch must be open to insert a power cell.") @@ -93,7 +93,7 @@ else if(I.has_tool_quality(TOOL_SCREWDRIVER)) panel_open = !panel_open playsound(src, I.usesound, 50, 1) - user.visible_message("[user] [panel_open ? "opens" : "closes"] the hatch on the [src].", "You [panel_open ? "open" : "close"] the hatch on the [src].") + user.visible_message(span_notice("[user] [panel_open ? "opens" : "closes"] the hatch on the [src]."), span_notice("You [panel_open ? "open" : "close"] the hatch on the [src].")) update_icon() if(!panel_open && user.machine == src) user << browse(null, "window=spaceheater") @@ -111,7 +111,7 @@ tgui_interact(user) else state = state ? SHEATER_OFF : SHEATER_STANDBY - user.visible_message("[user] switches [state ? "on" : "off"] the [src].","You switch [state ? "on" : "off"] the [src].") + user.visible_message(span_notice("[user] switches [state ? "on" : "off"] the [src]."),span_notice("You switch [state ? "on" : "off"] the [src].")) update_icon() return @@ -155,7 +155,7 @@ if("cellremove") if(cell && !usr.get_active_hand()) - usr.visible_message("[usr] removes [cell] from [src].", "You remove [cell] from [src].") + usr.visible_message(span_notice("[usr] removes [cell] from [src]."), span_notice("You remove [cell] from [src].")) cell.update_icon() usr.put_in_hands(cell) cell.add_fingerprint(usr) @@ -173,7 +173,7 @@ C.loc = src C.add_fingerprint(usr) power_change() - usr.visible_message("[usr] inserts \the [C] into \the [src].", "You insert \the [C] into \the [src].") + usr.visible_message(span_notice("[usr] inserts \the [C] into \the [src]."), span_notice("You insert \the [C] into \the [src].")) . = TRUE /obj/machinery/space_heater/process() @@ -220,4 +220,4 @@ #undef SHEATER_OFF #undef SHEATER_STANDBY #undef SHEATER_HEAT -#undef SHEATER_COOL \ No newline at end of file +#undef SHEATER_COOL diff --git a/code/game/machinery/suit_storage/suit_cycler.dm b/code/game/machinery/suit_storage/suit_cycler.dm index 69d40a12b8..2e59f8a8d8 100644 --- a/code/game/machinery/suit_storage/suit_cycler.dm +++ b/code/game/machinery/suit_storage/suit_cycler.dm @@ -153,14 +153,14 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) return if(locked) - to_chat(user, "The suit cycler is locked.") + to_chat(user, span_danger("The suit cycler is locked.")) return if(contents.len > 0) - to_chat(user, "There is no room inside the cycler for [G.affecting.name].") + to_chat(user, span_danger("There is no room inside the cycler for [G.affecting.name].")) return - visible_message("[user] starts putting [G.affecting.name] into the suit cycler.", 3) + visible_message(span_notice("[user] starts putting [G.affecting.name] into the suit cycler."), 3) if(do_after(user, 20)) if(!G || !G.affecting) return @@ -189,15 +189,15 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) var/obj/item/clothing/head/helmet/space/void/IH = I if(locked) - to_chat(user, "The suit cycler is locked.") + to_chat(user, span_danger("The suit cycler is locked.")) return if(helmet) - to_chat(user, "The cycler already contains a helmet.") + to_chat(user, span_danger("The cycler already contains a helmet.")) return if(IH.no_cycle) - to_chat(user, "That item is not compatible with the cycler's protocols.") + to_chat(user, span_danger("That item is not compatible with the cycler's protocols.")) return if(I.icon_override == CUSTOM_ITEM_MOB) @@ -229,15 +229,15 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) var/obj/item/clothing/suit/space/void/IS = I if(locked) - to_chat(user, "The suit cycler is locked.") + to_chat(user, span_danger("The suit cycler is locked.")) return if(suit) - to_chat(user, "The cycler already contains a voidsuit.") + to_chat(user, span_danger("The cycler already contains a voidsuit.")) return if(IS.no_cycle) - to_chat(user, "That item is not compatible with the cycler's protocols.") + to_chat(user, span_danger("That item is not compatible with the cycler's protocols.")) return if(I.icon_override == CUSTOM_ITEM_MOB) @@ -269,11 +269,11 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) /obj/machinery/suit_cycler/emag_act(var/remaining_charges, var/mob/user) if(emagged) - to_chat(user, "The cycler has already been subverted.") + to_chat(user, span_danger("The cycler has already been subverted.")) return //Clear the access reqs, disable the safeties, and open up all paintjobs. - to_chat(user, "You run the sequencer across the interface, corrupting the operating protocols.") + to_chat(user, span_danger("You run the sequencer across the interface, corrupting the operating protocols.")) emagged = 1 safeties = 0 @@ -413,7 +413,7 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) locked = !locked to_chat(usr, "You [locked ? "" : "un"]lock \the [src].") else - to_chat(usr, "Access denied.") + to_chat(usr, span_danger("Access denied.")) . = TRUE if("eject_guy") @@ -422,7 +422,7 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) if("uv") if(safeties && occupant) - to_chat(usr, "The cycler has detected an occupant. Please remove the occupant before commencing the decontamination cycle.") + to_chat(usr, span_danger("The cycler has detected an occupant. Please remove the occupant before commencing the decontamination cycle.")) return active = 1 @@ -505,7 +505,7 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) /obj/machinery/suit_cycler/proc/eject_occupant(mob/user as mob) if(locked || active) - to_chat(user, "The cycler is locked.") + to_chat(user, span_warning("The cycler is locked.")) return if(!occupant) diff --git a/code/game/machinery/supplybeacon.dm b/code/game/machinery/supplybeacon.dm index a70de364b1..8642c92753 100644 --- a/code/game/machinery/supplybeacon.dm +++ b/code/game/machinery/supplybeacon.dm @@ -47,10 +47,10 @@ /obj/machinery/power/supply_beacon/attackby(var/obj/item/W, var/mob/user) if(!use_power && W.has_tool_quality(TOOL_WRENCH)) if(!anchored && !connect_to_network()) - to_chat(user, "This device must be placed over an exposed cable.") + to_chat(user, span_warning("This device must be placed over an exposed cable.")) return anchored = !anchored - user.visible_message("\The [user] [anchored ? "secures" : "unsecures"] \the [src].") + user.visible_message(span_notice("\The [user] [anchored ? "secures" : "unsecures"] \the [src].")) playsound(src, W.usesound, 50, 1) return return ..() @@ -59,13 +59,13 @@ if(expended) update_use_power(USE_POWER_OFF) - to_chat (user, "\The [src] has used up its charge.") + to_chat (user, span_warning("\The [src] has used up its charge.")) return if(anchored) return use_power ? deactivate(user) : activate(user) else - to_chat(user, "You need to secure the beacon with a wrench first!") + to_chat(user, span_warning("You need to secure the beacon with a wrench first!")) return /obj/machinery/power/supply_beacon/attack_ai(var/mob/user) @@ -76,12 +76,12 @@ if(expended) return if(surplus() < 500) - if(user) to_chat(user, "The connected wire doesn't have enough current.") + if(user) to_chat(user, span_notice("The connected wire doesn't have enough current.")) return set_light(3, 3, "#00CCAA") icon_state = "beacon_active" update_use_power(USE_POWER_IDLE) - if(user) to_chat(user, "You activate the beacon. The supply drop will be dispatched soon.") + if(user) to_chat(user, span_notice("You activate the beacon. The supply drop will be dispatched soon.")) /obj/machinery/power/supply_beacon/proc/deactivate(var/mob/user, var/permanent) if(permanent) @@ -92,7 +92,7 @@ set_light(0) update_use_power(USE_POWER_OFF) target_drop_time = null - if(user) to_chat(user, "You deactivate the beacon.") + if(user) to_chat(user, span_notice("You deactivate the beacon.")) /obj/machinery/power/supply_beacon/Destroy() if(use_power) diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index ca479f8bcc..82f77c5edb 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -90,7 +90,7 @@ /obj/machinery/power/singularity_beacon/proc/Activate(mob/user = null) if(surplus() < 1500) if(user) - to_chat(user, "The connected wire doesn't have enough current.") + to_chat(user, span_notice("The connected wire doesn't have enough current.")) return for(var/obj/singularity/singulo in all_singularities) if(singulo.z == z) @@ -99,7 +99,7 @@ active = 1 START_MACHINE_PROCESSING(src) if(user) - to_chat(user, "You activate the beacon.") + to_chat(user, span_notice("You activate the beacon.")) /obj/machinery/power/singularity_beacon/proc/Deactivate(mob/user = null) for(var/obj/singularity/singulo in all_singularities) @@ -108,7 +108,7 @@ icon_state = "[icontype]0" active = 0 if(user) - to_chat(user, "You deactivate the beacon.") + to_chat(user, span_notice("You deactivate the beacon.")) /obj/machinery/power/singularity_beacon/attack_ai(mob/user as mob) return @@ -117,18 +117,18 @@ if(anchored) return active ? Deactivate(user) : Activate(user) else - to_chat(user, "You need to screw the beacon to the floor first!") + to_chat(user, span_danger("You need to screw the beacon to the floor first!")) return /obj/machinery/power/singularity_beacon/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER)) if(active) - to_chat(user, "You need to deactivate the beacon first!") + to_chat(user, span_danger("You need to deactivate the beacon first!")) return if(anchored) anchored = FALSE - to_chat(user, "You unscrew the beacon from the floor.") + to_chat(user, span_notice("You unscrew the beacon from the floor.")) playsound(src, W.usesound, 50, 1) disconnect_from_network() return @@ -137,7 +137,7 @@ to_chat(user, "This device must be placed over an exposed cable.") return anchored = TRUE - to_chat(user, "You screw the beacon to the floor and attach the cable.") + to_chat(user, span_notice("You screw the beacon to the floor and attach the cable.")) playsound(src, W.usesound, 50, 1) return ..() diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index 1d3870c08f..683c1dd5f8 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -115,7 +115,7 @@ if("delete") if(!allowed(usr) && !emagged) - to_chat(usr, "ACCESS DENIED.") + to_chat(usr, span_warning("ACCESS DENIED.")) return if(SelectedServer) @@ -149,9 +149,9 @@ if(!emagged) playsound(src, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - to_chat(user, "You you disable the security protocols") + to_chat(user, span_notice("You you disable the security protocols")) src.updateUsrDialog() return 1 /obj/machinery/computer/telecomms/server/proc/set_temp(var/text, var/color = "average") - temp = list("color" = color, "text" = text) \ No newline at end of file + temp = list("color" = color, "text" = text) diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index ea92e9d19d..4198536888 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -121,9 +121,9 @@ if(!emagged) playsound(src, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - to_chat(user, "You you disable the security protocols") + to_chat(user, span_notice("You you disable the security protocols")) src.updateUsrDialog() return 1 /obj/machinery/computer/telecomms/monitor/proc/set_temp(var/text, var/color = "average") - temp = list("color" = color, "text" = text) \ No newline at end of file + temp = list("color" = color, "text" = text) diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index 721d4ea766..90e114e5cd 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -127,7 +127,7 @@ add_fingerprint(usr) usr.set_machine(src) if(!src.allowed(usr) && !emagged) - to_chat(usr, "ACCESS DENIED.") + to_chat(usr, span_warning("ACCESS DENIED.")) return if(href_list["viewserver"]) @@ -213,6 +213,6 @@ if(!emagged) playsound(src, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - to_chat(user, "You you disable the security protocols") + to_chat(user, span_notice("You you disable the security protocols")) src.updateUsrDialog() - return 1 \ No newline at end of file + return 1 diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index d242e639e1..64b597f9bd 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -73,7 +73,7 @@ if(C.data == "Clown Land") //whoops for(var/mob/O in hearers(src, null)) - O.show_message("Incoming bluespace portal detected, unable to lock in.", 2) + O.show_message(span_warning("Incoming bluespace portal detected, unable to lock in."), 2) for(var/obj/machinery/teleport/hub/H in range(1)) var/amount = rand(2,5) @@ -82,7 +82,7 @@ // else for(var/mob/O in hearers(src, null)) - O.show_message("Locked In", 2) + O.show_message(span_notice("Locked In"), 2) teleport_control.locked = L one_time_use = 1 @@ -164,7 +164,7 @@ return if(!com.teleport_control.locked) for(var/mob/O in hearers(src, null)) - O.show_message("Failure: Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.") + O.show_message(span_warning("Failure: Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.")) return if(istype(M, /atom/movable)) //VOREStation Addition Start: Prevent taurriding abuse @@ -190,7 +190,7 @@ accurate = 1 spawn(3000) accurate = 0 //Accurate teleporting for 5 minutes for(var/mob/B in hearers(src, null)) - B.show_message("Test fire completed.") + B.show_message(span_notice("Test fire completed.")) return ////// @@ -230,7 +230,7 @@ update_use_power(USE_POWER_ACTIVE) com.update_use_power(USE_POWER_ACTIVE) for(var/mob/O in hearers(src, null)) - O.show_message("Teleporter engaged!", 2) + O.show_message(span_notice("Teleporter engaged!"), 2) add_fingerprint(usr) engaged = 1 return @@ -245,7 +245,7 @@ com.update_use_power(USE_POWER_IDLE) update_use_power(USE_POWER_IDLE) for(var/mob/O in hearers(src, null)) - O.show_message("Teleporter disengaged!", 2) + O.show_message(span_notice("Teleporter disengaged!"), 2) add_fingerprint(usr) engaged = 0 return @@ -255,7 +255,7 @@ return active = TRUE - visible_message("Test firing!") + visible_message(span_notice("Test firing!")) com.teleport() use_power(5000) flick(src, "controller-c") //VOREStation Add diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index ae106a356a..23a235faf3 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -77,7 +77,7 @@ /obj/machinery/turretid/proc/isLocked(mob/user) if(isrobot(user) || isAI(user)) if(ailock) - to_chat(user, "There seems to be a firewall preventing you from accessing this device.") + to_chat(user, span_notice("There seems to be a firewall preventing you from accessing this device.")) return TRUE else return FALSE @@ -101,16 +101,16 @@ if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) if(allowed(usr)) if(emagged) - to_chat(user, "The turret control is unresponsive.") + to_chat(user, span_notice("The turret control is unresponsive.")) else locked = !locked - to_chat(user, "You [ locked ? "lock" : "unlock"] the panel.") + to_chat(user, span_notice("You [ locked ? "lock" : "unlock"] the panel.")) return return ..() /obj/machinery/turretid/emag_act(var/remaining_charges, var/mob/user) if(!emagged) - to_chat(user, "You short out the turret controls' access analysis module.") + to_chat(user, span_danger("You short out the turret controls' access analysis module.")) emagged = TRUE locked = FALSE ailock = FALSE diff --git a/code/game/machinery/virtual_reality/ar_console.dm b/code/game/machinery/virtual_reality/ar_console.dm index 5001a3c1d3..e6361c2605 100644 --- a/code/game/machinery/virtual_reality/ar_console.dm +++ b/code/game/machinery/virtual_reality/ar_console.dm @@ -28,7 +28,7 @@ visible_message("\The [src] emits a low droning sound, before the pod door clicks open.") return else if(eject_dead && occupant && occupant.stat == DEAD) - visible_message("\The [src] sounds an alarm, swinging its hatch open.") + visible_message(span_warning("\The [src] sounds an alarm, swinging its hatch open.")) go_out() /obj/machinery/vr_sleeper/alien/attackby(var/obj/item/I, var/mob/user) @@ -88,11 +88,11 @@ return if(avatar && !occupant.stat) - to_chat(occupant,"\The [src] begins to [pick("whir","hum","pulse")] as a screen appears in front of you.") + to_chat(occupant,span_alien("\The [src] begins to [pick("whir","hum","pulse")] as a screen appears in front of you.")) if(tgui_alert(occupant, "This pod is already linked. Are you certain you wish to engage?", "Commmit?", list("Yes", "No")) != "Yes") - visible_message("\The [src] pulses!") + visible_message(span_alien("\The [src] pulses!")) - to_chat(occupant,"Your mind blurs as information bombards you.") + to_chat(occupant,span_alien("Your mind blurs as information bombards you.")) if(!avatar) var/turf/T = get_turf(src) @@ -108,7 +108,7 @@ avatar.real_name = newname avatar.forceMove(T) - visible_message("\The [src] [pick("gurgles", "churns", "sloshes")] before spitting out \the [avatar]!") + visible_message(span_alium("\The [src] [pick("gurgles", "churns", "sloshes")] before spitting out \the [avatar]!")) else diff --git a/code/game/machinery/virtual_reality/vr_console.dm b/code/game/machinery/virtual_reality/vr_console.dm index 6917d14a59..e62604f5e6 100644 --- a/code/game/machinery/virtual_reality/vr_console.dm +++ b/code/game/machinery/virtual_reality/vr_console.dm @@ -43,7 +43,7 @@ visible_message("\The [src] emits a low droning sound, before the pod door clicks open.") return else if(eject_dead && occupant && occupant.stat == DEAD) // If someone dies somehow while inside, spit them out. - visible_message("\The [src] sounds an alarm, swinging its hatch open.") + visible_message(span_warning("\The [src] sounds an alarm, swinging its hatch open.")) go_out() /obj/machinery/vr_sleeper/update_icon() @@ -54,7 +54,7 @@ return 1 if(usr == occupant) - to_chat(usr, "You can't reach the controls from the inside.") + to_chat(usr, span_warning("You can't reach the controls from the inside.")) return add_fingerprint(usr) @@ -107,7 +107,7 @@ if(prob(15 / ( severity / 4 )) && occupant.species.has_organ[O_BRAIN] && occupant.internal_organs_by_name[O_BRAIN]) var/obj/item/organ/O = occupant.internal_organs_by_name[O_BRAIN] O.take_damage(severity * 2) - visible_message("\The [src]'s internal lighting flashes rapidly, before the hatch swings open with a cloud of smoke.") + visible_message(span_danger("\The [src]'s internal lighting flashes rapidly, before the hatch swings open with a cloud of smoke.")) smoke.set_up(severity, 0, src) smoke.start("#202020") go_out() @@ -151,9 +151,9 @@ if(stat & (BROKEN|NOPOWER)) return if(!ishuman(M)) - to_chat(user, "\The [src] rejects [M] with a sharp beep.") + to_chat(user, span_warning("\The [src] rejects [M] with a sharp beep.")) if(occupant) - to_chat(user, "\The [src] is already occupied.") + to_chat(user, span_warning("\The [src] is already occupied.")) return if(M == user) @@ -163,7 +163,7 @@ if(do_after(user, 20)) if(occupant) - to_chat(user, "\The [src] is already occupied.") + to_chat(user, span_warning("\The [src] is already occupied.")) return M.stop_pulling() if(M.client) @@ -180,7 +180,7 @@ update_use_power(USE_POWER_ACTIVE) enter_vr() else - to_chat(user, "\The [src] rejects [M] with a sharp beep.") + to_chat(user, span_warning("\The [src] rejects [M] with a sharp beep.")) //VOREstation edit end return diff --git a/code/game/machinery/vitals_monitor.dm b/code/game/machinery/vitals_monitor.dm index 9cac1bfeee..50f1e5e2c4 100644 --- a/code/game/machinery/vitals_monitor.dm +++ b/code/game/machinery/vitals_monitor.dm @@ -33,14 +33,14 @@ . = ..() if(victim) if(stat & NOPOWER) - . += "It's unpowered." + . += span_notice("It's unpowered.") return - . += "Vitals of [victim]:" - . += "Pulse: [victim.get_pulse(GETPULSE_TOOL)]" + . += span_notice("Vitals of [victim]:") + . += span_notice("Pulse: [victim.get_pulse(GETPULSE_TOOL)]") var/brain_activity = "none" var/breathing = "none" - + if(victim.stat != DEAD && !(victim.status_flags & FAKEDEATH)) var/obj/item/organ/internal/brain/brain = victim.internal_organs_by_name[O_BRAIN] if(istype(brain)) @@ -50,7 +50,7 @@ brain_activity = "weak" else brain_activity = "normal" - + var/obj/item/organ/internal/lungs/lungs = victim.internal_organs_by_name[O_LUNGS] if(istype(lungs)) var/oxyloss = victim.getOxyLoss() @@ -60,9 +60,9 @@ breathing = "shallow" else breathing = "normal" - - . += "Brain activity: [brain_activity]" - . += "Breathing: [breathing]" + + . += span_notice("Brain activity: [brain_activity]") + . += span_notice("Breathing: [breathing]") /obj/machinery/vitals_monitor/process() if(QDELETED(victim)) @@ -87,7 +87,7 @@ else if(ishuman(over_object)) victim = over_object update_use_power(USE_POWER_ACTIVE) - visible_message("\The [src] is now showing data for [victim].") + visible_message(span_notice("\The [src] is now showing data for [victim].")) /obj/machinery/vitals_monitor/update_icon() cut_overlays() @@ -118,7 +118,7 @@ else if(victim.stat == UNCONSCIOUS) add_overlay("brain_bad") else - add_overlay("brain_ok") + add_overlay("brain_ok") else add_overlay("brain_warning") @@ -146,4 +146,4 @@ if(CanInteract(user, GLOB.tgui_physical_state)) beep = !beep - to_chat(user, "You turn the sound on \the [src] [beep ? "on" : "off"].") + to_chat(user, span_notice("You turn the sound on \the [src] [beep ? "on" : "off"].")) diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm index 3af907f804..e1aefd2468 100644 --- a/code/game/machinery/wall_frames.dm +++ b/code/game/machinery/wall_frames.dm @@ -70,15 +70,15 @@ var/turf/loc = get_turf(user) var/area/A = loc.loc if(!istype(loc, /turf/simulated/floor)) - to_chat(user, "\The frame cannot be placed on this spot.") + to_chat(user, span_danger("\The frame cannot be placed on this spot.")) return if(A.requires_power == 0 || A.name == "Space") - to_chat(user, "\The [src] Alarm cannot be placed in this area.") + to_chat(user, span_danger("\The [src] Alarm cannot be placed in this area.")) return if(gotwallitem(loc, ndir)) - to_chat(user, "There's already an item on this wall!") + to_chat(user, span_danger("There's already an item on this wall!")) return var/datum/frame/frame_types/frame_type diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 6c61d1f542..25b4297f7c 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -108,7 +108,7 @@ return /*if(W.has_tool_quality(TOOL_SCREWDRIVER)) panel = !panel - to_chat(user, "You [panel ? "open" : "close"] the [src]'s maintenance panel")*/ + to_chat(user, span_notice("You [panel ? "open" : "close"] the [src]'s maintenance panel"))*/ if(istype(W,/obj/item/pen/crayon) || istype(W,/obj/item/stamp)) if(state in list( 1, 3, 6)) if(!crayon) @@ -130,7 +130,7 @@ ..() else if(is_type_in_list(W, disallowed_types)) - to_chat(user, "You can't fit \the [W] inside.") + to_chat(user, span_warning("You can't fit \the [W] inside.")) return else if(istype(W, /obj/item/clothing) || istype(W, /obj/item/bedsheet) || istype(W, /obj/item/stack/hairlesshide)) @@ -141,9 +141,9 @@ washing += W state = 3 else - to_chat(user, "You can't put the item in right now.") + to_chat(user, span_notice("You can't put the item in right now.")) else - to_chat(user, "The washing machine is full.") + to_chat(user, span_notice("The washing machine is full.")) else ..() update_icon() @@ -167,7 +167,7 @@ washing.Cut() state = 1 if(5) - to_chat(user, "The [src] is busy.") + to_chat(user, span_warning("The [src] is busy.")) if(6) state = 7 if(7) diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm index 2c65530b9f..3ed8c1a050 100644 --- a/code/game/machinery/wishgranter.dm +++ b/code/game/machinery/wishgranter.dm @@ -39,16 +39,16 @@ to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul.") if (!(LASER in user.mutations)) user.mutations.Add(LASER) - to_chat(user, "You feel pressure building behind your eyes.") + to_chat(user, span_notice("You feel pressure building behind your eyes.")) if (!(COLD_RESISTANCE in user.mutations)) user.mutations.Add(COLD_RESISTANCE) - to_chat(user, "Your body feels warm.") + to_chat(user, span_notice("Your body feels warm.")) if (!(XRAY in user.mutations)) user.mutations.Add(XRAY) user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) user.see_in_dark = 8 user.see_invisible = SEE_INVISIBLE_LEVEL_TWO - to_chat(user, "The walls suddenly disappear.") + to_chat(user, span_notice("The walls suddenly disappear.")) if("Wealth") to_chat(user, "Your wish is granted, but at a terrible cost...") to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul.") @@ -66,4 +66,4 @@ for(var/mob/living/simple_mob/faithless/F in living_mob_list) F.health = -10 F.set_stat(DEAD) - F.icon_state = "faithless_dead" \ No newline at end of file + F.icon_state = "faithless_dead" diff --git a/code/game/mecha/combat/fighter.dm b/code/game/mecha/combat/fighter.dm index 5e14fecbd2..2c52258684 100644 --- a/code/game/mecha/combat/fighter.dm +++ b/code/game/mecha/combat/fighter.dm @@ -118,16 +118,16 @@ else var/obj/effect/overmap/visitable/V = choices[choice] if(occupant != this_occupant || this_x != x || this_y != y || this_z != z || get_dist(V,our_ship) > 1) //Sanity after user input - to_chat(occupant, "You or they appear to have moved!") + to_chat(occupant, span_warning("You or they appear to have moved!")) return var/list/levels = V.get_space_zlevels() if(!levels.len) - to_chat(occupant, "You don't appear to be able to get there from here!") + to_chat(occupant, span_warning("You don't appear to be able to get there from here!")) return new_z = pick(levels) var/turf/destination = locate(new_x, new_y, new_z) if(!destination || destination.density) - to_chat(occupant, "You don't appear to be able to get there from here! Is it blocked?") + to_chat(occupant, span_warning("You don't appear to be able to get there from here! Is it blocked?")) return else forceMove(destination) @@ -138,7 +138,7 @@ if (href_list["toggle_stabilization"]) stabilization_enabled = !stabilization_enabled send_byjax(src.occupant,"exosuit.browser","stabilization_command","[stabilization_enabled?"Dis":"En"]able thruster stabilization") - src.occupant_message("Thruster stabilization [stabilization_enabled? "enabled" : "disabled"].") + src.occupant_message(span_notice("Thruster stabilization [stabilization_enabled? "enabled" : "disabled"].")) return /obj/mecha/combat/fighter/get_commands() @@ -450,4 +450,4 @@ nearby planets to seek cover." value = CATALOGUER_REWARD_MEDIUM -#undef NOGRAV_FIGHTER_DAMAGE \ No newline at end of file +#undef NOGRAV_FIGHTER_DAMAGE diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm index c8c1401627..6d41c5ae1a 100644 --- a/code/game/mecha/combat/phazon.dm +++ b/code/game/mecha/combat/phazon.dm @@ -116,18 +116,18 @@ phasing = FALSE SSradiation.radiate(get_turf(src), 30) log_append_to_last("WARNING: BLUESPACE DRIVE INSTABILITY DETECTED. DISABLING DRIVE.",1) - visible_message("The [src.name] appears to flicker, before its silhouette stabilizes!") + visible_message(span_alien("The [src.name] appears to flicker, before its silhouette stabilizes!")) return /obj/mecha/combat/phazon/janus/dynbulletdamage(var/obj/item/projectile/Proj) if((Proj.damage && !Proj.nodamage) && !istype(Proj, /obj/item/projectile/beam) && prob(max(1, 33 - round(Proj.damage / 4)))) - src.occupant_message("The armor absorbs the incoming projectile's force, negating it!") - src.visible_message("The [src.name] absorbs the incoming projectile's force, negating it!") + src.occupant_message(span_alien("The armor absorbs the incoming projectile's force, negating it!")) + src.visible_message(span_alien("The [src.name] absorbs the incoming projectile's force, negating it!")) src.log_append_to_last("Armor negated.") return else if((Proj.damage && !Proj.nodamage) && istype(Proj, /obj/item/projectile/beam) && prob(max(1, (50 - round((Proj.damage / 2) * inherent_damage_absorption["laser"])) * (1 - (Proj.armor_penetration / 100))))) // Base 50% chance to deflect a beam,lowered by half the beam's damage scaled to laser absorption, then multiplied by the remaining percent of non-penetrated armor, with a minimum chance of 1%. - src.occupant_message("The armor reflects the incoming beam, negating it!") - src.visible_message("The [src.name] reflects the incoming beam, negating it!") + src.occupant_message(span_alien("The armor reflects the incoming beam, negating it!")) + src.visible_message(span_alien("The [src.name] reflects the incoming beam, negating it!")) src.log_append_to_last("Armor reflected.") return @@ -135,8 +135,8 @@ /obj/mecha/combat/phazon/janus/dynattackby(obj/item/W as obj, mob/user as mob) if(prob(max(1, (50 - round((W.force / 2) * inherent_damage_absorption["brute"])) * (1 - (W.armor_penetration / 100))))) - src.occupant_message("The armor absorbs the incoming attack's force, negating it!") - src.visible_message("The [src.name] absorbs the incoming attack's force, negating it!") + src.occupant_message(span_alien("The armor absorbs the incoming attack's force, negating it!")) + src.visible_message(span_alien("The [src.name] absorbs the incoming attack's force, negating it!")) src.log_append_to_last("Armor absorbed.") return diff --git a/code/game/mecha/components/_component.dm b/code/game/mecha/components/_component.dm index 0a8f45cb06..9658fb45ca 100644 --- a/code/game/mecha/components/_component.dm +++ b/code/game/mecha/components/_component.dm @@ -34,13 +34,13 @@ if(65 to 85) . += "It's slightly damaged." if(45 to 65) - . += "It's badly damaged." + . += span_notice("It's badly damaged.") if(25 to 45) - . += "It's heavily damaged." + . += span_warning("It's heavily damaged.") if(2 to 25) - . += "It's falling apart." + . += span_warning("It's falling apart.") if(0 to 1) - . += "It is completely destroyed." + . += span_warning("It is completely destroyed.") /obj/item/mecha_parts/component/Initialize() . = ..() @@ -95,11 +95,11 @@ if(target) if(!(component_type in target.internal_components)) if(user) - to_chat(user, "\The [target] doesn't seem to have anywhere to put \the [src].") + to_chat(user, span_notice("\The [target] doesn't seem to have anywhere to put \the [src].")) return FALSE if(target.internal_components[component_type]) if(user) - to_chat(user, "\The [target] already has a [component_type] installed!") + to_chat(user, span_notice("\The [target] already has a [component_type] installed!")) return FALSE chassis = target if(user) @@ -117,7 +117,7 @@ chassis.internal_components[component_type] = src if(user) - chassis.visible_message("[user] installs \the [src] in \the [chassis].") + chassis.visible_message(span_notice("[user] installs \the [src] in \the [chassis].")) return TRUE return FALSE @@ -138,25 +138,25 @@ var/obj/item/stack/nanopaste/NP = W if(integrity < max_integrity) - to_chat(user, "You start to repair damage to \the [src].") + to_chat(user, span_notice("You start to repair damage to \the [src].")) while(integrity < max_integrity && NP) if(do_after(user, 1 SECOND, src)) NP.use(1) adjust_integrity(NP.mech_repair) if(integrity >= max_integrity) - to_chat(user, "You finish repairing \the [src].") + to_chat(user, span_notice("You finish repairing \the [src].")) break else if(NP.amount == 0) - to_chat(user, "Insufficient nanopaste to complete repairs!") + to_chat(user, span_warning("Insufficient nanopaste to complete repairs!")) break return else - to_chat(user, "\The [src] doesn't require repairs.") + to_chat(user, span_notice("\The [src] doesn't require repairs.")) return ..() diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index f7be915eda..596f46bff3 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -35,7 +35,7 @@ /obj/item/mecha_parts/mecha_equipment/examine(mob/user) . = ..() - . += "[src] will fill [equip_type?"a [equip_type]":"any"] slot." + . += span_notice("[src] will fill [equip_type?"a [equip_type]":"any"] slot.") /obj/item/mecha_parts/mecha_equipment/proc/add_equip_overlay(obj/mecha/M as obj) return diff --git a/code/game/mecha/equipment/tools/armor_melee.dm b/code/game/mecha/equipment/tools/armor_melee.dm index a3c6e78f6e..785f64a679 100644 --- a/code/game/mecha/equipment/tools/armor_melee.dm +++ b/code/game/mecha/equipment/tools/armor_melee.dm @@ -22,12 +22,12 @@ return inc_damage chassis.log_message("Attacked by [W]. Attacker - [user]") if(prob(chassis.deflect_chance*deflect_coeff)) - to_chat(user, "\The [W] bounces off \the [chassis]'s armor.") + to_chat(user, span_danger("\The [W] bounces off \the [chassis]'s armor.")) chassis.log_append_to_last("Armor saved.") inc_damage = 0 else - chassis.occupant_message("\The [user] hits [chassis] with [W].") - user.visible_message("\The [user] hits [chassis] with [W].", "You hit [src] with [W].") + chassis.occupant_message(span_danger("\The [user] hits [chassis] with [W].")) + user.visible_message(span_danger("\The [user] hits [chassis] with [W]."), span_danger("You hit [src] with [W].")) inc_damage *= damage_coeff set_ready_state(FALSE) chassis.use_power(energy_drain) @@ -58,11 +58,11 @@ return chassis.dynattackby(W,user) chassis.log_message("Attacked by [W]. Attacker - [user]") if(prob(chassis.deflect_chance*deflect_coeff)) - to_chat(user, "\The [W] bounces off [chassis] armor.") + to_chat(user, span_danger("\The [W] bounces off [chassis] armor.")) chassis.log_append_to_last("Armor saved.") else - chassis.occupant_message("\The [user] hits [chassis] with [W].") - user.visible_message("\The [user] hits [chassis] with [W].", "You hit [src] with [W].") + chassis.occupant_message(span_danger("\The [user] hits [chassis] with [W].")) + user.visible_message(span_danger("\The [user] hits [chassis] with [W]."), span_danger("You hit [src] with [W].")) chassis.take_damage(round(W.force*damage_coeff),W.damtype) chassis.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) set_ready_state(FALSE) diff --git a/code/game/mecha/equipment/tools/armor_ranged.dm b/code/game/mecha/equipment/tools/armor_ranged.dm index 4cc6287019..c3e7a4e50a 100644 --- a/code/game/mecha/equipment/tools/armor_ranged.dm +++ b/code/game/mecha/equipment/tools/armor_ranged.dm @@ -19,7 +19,7 @@ if(!action_checks(src)) return inc_damage if(prob(chassis.deflect_chance*deflect_coeff)) - chassis.occupant_message("The armor deflects incoming projectile.") + chassis.occupant_message(span_notice("The armor deflects incoming projectile.")) chassis.visible_message("The [chassis.name] armor deflects the projectile.") chassis.log_append_to_last("Armor saved.") inc_damage = 0 @@ -35,7 +35,7 @@ if(!action_checks(A)) return inc_damage if(prob(chassis.deflect_chance*deflect_coeff)) - chassis.occupant_message("The [A] bounces off the armor.") + chassis.occupant_message(span_notice("The [A] bounces off the armor.")) chassis.visible_message("The [A] bounces off \the [chassis]'s armor") chassis.log_append_to_last("Armor saved.") inc_damage = 0 @@ -76,7 +76,7 @@ if(!action_checks(src)) return chassis.dynbulletdamage(Proj) if(prob(chassis.deflect_chance*deflect_coeff)) - chassis.occupant_message("The armor deflects incoming projectile.") + chassis.occupant_message(span_notice("The armor deflects incoming projectile.")) chassis.visible_message("The [chassis.name] armor deflects the projectile") chassis.log_append_to_last("Armor saved.") else @@ -92,7 +92,7 @@ if(!action_checks(A)) return chassis.dynhitby(A) if(prob(chassis.deflect_chance*deflect_coeff) || istype(A, /mob/living) || istype(A, /obj/item/mecha_parts/mecha_tracking)) - chassis.occupant_message("The [A] bounces off the armor.") + chassis.occupant_message(span_notice("The [A] bounces off the armor.")) chassis.visible_message("The [A] bounces off the [chassis] armor") chassis.log_append_to_last("Armor saved.") if(istype(A, /mob/living)) diff --git a/code/game/mecha/equipment/tools/catapult.dm b/code/game/mecha/equipment/tools/catapult.dm index f734a52c79..5acbb96c81 100644 --- a/code/game/mecha/equipment/tools/catapult.dm +++ b/code/game/mecha/equipment/tools/catapult.dm @@ -20,7 +20,7 @@ last_fired = world.time else if (world.time % 3) - occupant_message("[src] is not ready to fire again!") + occupant_message(span_warning("[src] is not ready to fire again!")) return 0 switch(mode) @@ -73,4 +73,4 @@ if(href_list["mode"]) mode = text2num(href_list["mode"]) send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info()) - return \ No newline at end of file + return diff --git a/code/game/mecha/equipment/tools/clamp.dm b/code/game/mecha/equipment/tools/clamp.dm index 1df39a4178..b85e8d7386 100644 --- a/code/game/mecha/equipment/tools/clamp.dm +++ b/code/game/mecha/equipment/tools/clamp.dm @@ -24,41 +24,41 @@ if(O.has_buckled_mobs()) return if(locate(/mob/living) in O) - occupant_message("You can't load living things into the cargo compartment.") + occupant_message(span_warning("You can't load living things into the cargo compartment.")) return if(O.anchored) if(enable_special) if(istype(O, /obj/machinery/door/firedoor)) // I love doors. var/obj/machinery/door/firedoor/FD = O if(FD.blocked) - FD.visible_message("\The [chassis] begins prying on \the [FD]!") + FD.visible_message(span_danger("\The [chassis] begins prying on \the [FD]!")) if(do_after(chassis.occupant,10 SECONDS,FD)) playsound(FD, 'sound/machines/door/airlock_creaking.ogg', 100, 1) FD.blocked = 0 FD.update_icon() FD.open(1) - FD.visible_message("\The [chassis] tears \the [FD] open!") + FD.visible_message(span_warning("\The [chassis] tears \the [FD] open!")) else if(FD.density) - FD.visible_message("\The [chassis] begins forcing \the [FD] open!") + FD.visible_message(span_warning("\The [chassis] begins forcing \the [FD] open!")) if(do_after(chassis.occupant, 5 SECONDS,FD)) playsound(FD, 'sound/machines/door/airlock_creaking.ogg', 100, 1) - FD.visible_message("\The [chassis] forces \the [FD] open!") + FD.visible_message(span_danger("\The [chassis] forces \the [FD] open!")) FD.open(1) else - FD.visible_message("\The [chassis] forces \the [FD] closed!") + FD.visible_message(span_danger("\The [chassis] forces \the [FD] closed!")) FD.close(1) else if(istype(O, /obj/machinery/door/airlock)) // D o o r s. var/obj/machinery/door/airlock/AD = O if(AD.locked) - occupant_message("The airlock's bolts prevent it from being forced.") + occupant_message(span_notice("The airlock's bolts prevent it from being forced.")) else if(!AD.operating) if(AD.welded) - AD.visible_message("\The [chassis] begins prying on \the [AD]!") + AD.visible_message(span_warning("\The [chassis] begins prying on \the [AD]!")) if(do_after(chassis.occupant, 15 SECONDS,AD) && chassis.Adjacent(AD)) AD.welded = FALSE AD.update_icon() playsound(AD, 'sound/machines/door/airlock_creaking.ogg', 100, 1) - AD.visible_message("\The [chassis] tears \the [AD] open!") + AD.visible_message(span_danger("\The [chassis] tears \the [AD] open!")) if(!AD.welded) if(density) spawn(0) @@ -68,10 +68,10 @@ AD.close(1) return else - occupant_message("[target] is firmly secured.") + occupant_message(span_warning("[target] is firmly secured.")) return if(cargo_holder.cargo.len >= cargo_holder.cargo_capacity) - occupant_message("Not enough room in cargo compartment.") + occupant_message(span_warning("Not enough room in cargo compartment.")) return occupant_message("You lift [target] and start to load it into cargo compartment.") @@ -85,10 +85,10 @@ cargo_holder.cargo += O O.loc = chassis O.anchored = FALSE - occupant_message("[target] succesfully loaded.") + occupant_message(span_notice("[target] succesfully loaded.")) log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]") else - occupant_message("You must hold still while handling objects.") + occupant_message(span_warning("You must hold still while handling objects.")) O.anchored = initial(O.anchored) //attacking @@ -99,17 +99,17 @@ M.take_overall_damage(dam_force) M.adjustOxyLoss(round(dam_force/2)) M.updatehealth() - occupant_message("You squeeze [target] with [src.name]. Something cracks.") + occupant_message(span_warning("You squeeze [target] with [src.name]. Something cracks.")) playsound(src, "fracture", 5, 1, -2) //CRACK - chassis.visible_message("[chassis] squeezes [target].") + chassis.visible_message(span_warning("[chassis] squeezes [target].")) else if(chassis.occupant.a_intent == I_DISARM && enable_special) playsound(src, 'sound/mecha/hydraulic.ogg', 10, 1, -2) M.take_overall_damage(dam_force/2) M.adjustOxyLoss(round(dam_force/3)) M.updatehealth() - occupant_message("You slam [target] with [src.name]. Something cracks.") + occupant_message(span_warning("You slam [target] with [src.name]. Something cracks.")) playsound(src, "fracture", 3, 1, -2) //CRACK 2 - chassis.visible_message("[chassis] slams [target].") + chassis.visible_message(span_warning("[chassis] slams [target].")) M.throw_at(get_step(M,get_dir(src, M)), 14, 1.5, chassis) else step_away(M,chassis) @@ -146,25 +146,25 @@ cargo_holder.cargo += O O.loc = chassis O.anchored = FALSE - chassis.occupant_message("[target] succesfully loaded.") + chassis.occupant_message(span_notice("[target] succesfully loaded.")) chassis.log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]") else - chassis.occupant_message("You must hold still while handling objects.") + chassis.occupant_message(span_warning("You must hold still while handling objects.")) O.anchored = initial(O.anchored) else - chassis.occupant_message("Not enough room in cargo compartment.") + chassis.occupant_message(span_warning("Not enough room in cargo compartment.")) else - chassis.occupant_message("[target] is firmly secured.") + chassis.occupant_message(span_warning("[target] is firmly secured.")) else if(istype(target,/mob/living)) var/mob/living/M = target if(M.stat>1) return if(chassis.occupant.a_intent == I_HURT) - chassis.occupant_message("You obliterate [target] with [src.name], leaving blood and guts everywhere.") - chassis.visible_message("[chassis] destroys [target] in an unholy fury.") + chassis.occupant_message(span_danger("You obliterate [target] with [src.name], leaving blood and guts everywhere.")) + chassis.visible_message(span_danger("[chassis] destroys [target] in an unholy fury.")) if(chassis.occupant.a_intent == I_DISARM) - chassis.occupant_message("You tear [target]'s limbs off with [src.name].") - chassis.visible_message("[chassis] rips [target]'s arms off.") + chassis.occupant_message(span_danger("You tear [target]'s limbs off with [src.name].")) + chassis.visible_message(span_danger("[chassis] rips [target]'s arms off.")) else step_away(M,chassis) chassis.occupant_message("You smash into [target], sending them flying.") @@ -172,4 +172,4 @@ set_ready_state(FALSE) chassis.use_power(energy_drain) do_after_cooldown() - return 1 \ No newline at end of file + return 1 diff --git a/code/game/mecha/equipment/tools/drill.dm b/code/game/mecha/equipment/tools/drill.dm index 63b09317e3..9b897f1241 100644 --- a/code/game/mecha/equipment/tools/drill.dm +++ b/code/game/mecha/equipment/tools/drill.dm @@ -15,8 +15,8 @@ if(!target_obj.vars.Find("unacidable") || target_obj.unacidable) return set_ready_state(FALSE) chassis.use_power(energy_drain) - chassis.visible_message("[chassis] starts to drill [target]", "You hear the drill.") - occupant_message("You start to drill [target]") + chassis.visible_message(span_danger("[chassis] starts to drill [target]"), span_warning("You hear the drill.")) + occupant_message(span_danger("You start to drill [target]")) var/T = chassis.loc var/C = target.loc //why are these backwards? we may never know -Pete if(do_after_cooldown(target)) @@ -24,7 +24,7 @@ if(istype(target, /turf/simulated/wall)) var/turf/simulated/wall/W = target if(W.reinf_material && !advanced)//R wall but no good drill - occupant_message("[target] is too durable to drill through.") + occupant_message(span_warning("[target] is too durable to drill through.")) return else if((W.reinf_material && advanced) || do_after_cooldown(target))//R wall with good drill @@ -103,8 +103,8 @@ if(target_obj.unacidable) return set_ready_state(FALSE) chassis.use_power(energy_drain) - chassis.visible_message("[chassis] starts to bore into \the [target]", "You hear the bore.") - occupant_message("You start to bore into \the [target]") + chassis.visible_message(span_danger("[chassis] starts to bore into \the [target]"), span_warning("You hear the bore.")) + occupant_message(span_danger("You start to bore into \the [target]")) var/T = chassis.loc var/C = target.loc if(do_after_cooldown(target)) @@ -112,7 +112,7 @@ if(istype(target, /turf/simulated/wall)) var/turf/simulated/wall/W = target if(W.reinf_material) - occupant_message("[target] is too durable to bore through.") + occupant_message(span_warning("[target] is too durable to bore through.")) else log_message("Bored through [target]") target.ex_act(2) @@ -133,4 +133,4 @@ else if(target.loc == C) log_message("Drilled through [target]") target.ex_act(2) - return 1 \ No newline at end of file + return 1 diff --git a/code/game/mecha/equipment/tools/extinguisher.dm b/code/game/mecha/equipment/tools/extinguisher.dm index ede02bb5b2..ad133bab2f 100644 --- a/code/game/mecha/equipment/tools/extinguisher.dm +++ b/code/game/mecha/equipment/tools/extinguisher.dm @@ -25,12 +25,12 @@ if( istype(target, /obj/structure/reagent_dispensers) && get_dist(chassis,target) <= 1) //VOREStation Edit var/obj/o = target var/amount = o.reagents.trans_to_obj(src, 200) - occupant_message("[amount] units transferred into internal tank.") + occupant_message(span_notice("[amount] units transferred into internal tank.")) playsound(src, 'sound/effects/refill.ogg', 50, 1, -6) return if (src.reagents.total_volume < 1) - occupant_message("\The [src] is empty.") + occupant_message(span_warning("\The [src] is empty.")) return playsound(src, 'sound/effects/extinguish.ogg', 75, 1, -3) @@ -67,4 +67,4 @@ return "[..()] \[[src.reagents.total_volume]\]" /obj/item/mecha_parts/mecha_equipment/tool/extinguisher/on_reagent_change() - return \ No newline at end of file + return diff --git a/code/game/mecha/equipment/tools/generator.dm b/code/game/mecha/equipment/tools/generator.dm index cdb8eb4680..fd1d291a5e 100644 --- a/code/game/mecha/equipment/tools/generator.dm +++ b/code/game/mecha/equipment/tools/generator.dm @@ -75,7 +75,7 @@ var/result = load_fuel(target) var/message if(isnull(result)) - message = "[fuel] traces in target minimal. [target] cannot be used as fuel." + message = span_warning("[fuel] traces in target minimal. [target] cannot be used as fuel.") else if(!result) message = "Unit is full." else @@ -100,7 +100,7 @@ /obj/item/mecha_parts/mecha_equipment/generator/attackby(weapon,mob/user) var/result = load_fuel(weapon) if(isnull(result)) - user.visible_message("[user] tries to shove [weapon] into [src]. What a dumb-ass.","[fuel] traces minimal. [weapon] cannot be used as fuel.") + user.visible_message("[user] tries to shove [weapon] into [src]. What a dumb-ass.",span_warning("[fuel] traces minimal. [weapon] cannot be used as fuel.")) else if(!result) to_chat(user, "Unit is full.") else @@ -142,4 +142,4 @@ return /obj/item/mecha_parts/mecha_equipment/generator/nuclear/critfail() - return \ No newline at end of file + return diff --git a/code/game/mecha/equipment/tools/jetpack.dm b/code/game/mecha/equipment/tools/jetpack.dm index 9b6de6121f..c8763a0237 100644 --- a/code/game/mecha/equipment/tools/jetpack.dm +++ b/code/game/mecha/equipment/tools/jetpack.dm @@ -50,7 +50,7 @@ var/move_result = 0 if(direction == UP || direction == DOWN) if(!chassis.can_ztravel()) - chassis.occupant_message("Your vehicle lacks the capacity to move in that direction!") + chassis.occupant_message(span_warning("Your vehicle lacks the capacity to move in that direction!")) return FALSE //We're using locs because some mecha are 2x2 turfs. So thicc! @@ -58,16 +58,16 @@ for(var/turf/T in chassis.locs) if(!T.CanZPass(chassis,direction)) - chassis.occupant_message("You can't move that direction from here!") + chassis.occupant_message(span_warning("You can't move that direction from here!")) result = FALSE break var/turf/dest = (direction == UP) ? GetAbove(chassis) : GetBelow(chassis) if(!dest) - chassis.occupant_message("There is nothing of interest in this direction.") + chassis.occupant_message(span_notice("There is nothing of interest in this direction.")) result = FALSE break if(!dest.CanZPass(chassis,direction)) - chassis.occupant_message("There's something blocking your movement in that direction!") + chassis.occupant_message(span_warning("There's something blocking your movement in that direction!")) result = FALSE break if(result) @@ -80,7 +80,7 @@ if(!chassis.check_for_support()) chassis.float_direction = direction chassis.start_process(MECHA_PROC_MOVEMENT) - chassis.log_message("Movement control lost. Inertial movement started.") + chassis.log_message(span_warning("Movement control lost. Inertial movement started.")) if(chassis.do_after(get_step_delay())) chassis.can_move = 1 return 1 @@ -127,4 +127,4 @@ /obj/item/mecha_parts/mecha_equipment/tool/jetpack/do_after_cooldown() sleep(equip_cooldown) wait = 0 - return 1 \ No newline at end of file + return 1 diff --git a/code/game/mecha/equipment/tools/passenger.dm b/code/game/mecha/equipment/tools/passenger.dm index 94b4199a16..7e0d263194 100644 --- a/code/game/mecha/equipment/tools/passenger.dm +++ b/code/game/mecha/equipment/tools/passenger.dm @@ -16,7 +16,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/passenger/destroy() for(var/atom/movable/AM in src) AM.forceMove(get_turf(src)) - to_chat(AM, "You tumble out of the destroyed [src.name]!") + to_chat(AM, span_danger("You tumble out of the destroyed [src.name]!")) return ..() /obj/item/mecha_parts/mecha_equipment/tool/passenger/Exit(atom/movable/O) @@ -24,7 +24,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/passenger/proc/move_inside(var/mob/user) if (chassis) - chassis.visible_message("[user] starts to climb into [chassis].") + chassis.visible_message(span_notice("[user] starts to climb into [chassis].")) if(do_after(user, 40, needhand=0)) if(!src.occupant) @@ -33,7 +33,7 @@ log_message("[user] boarded.") occupant_message("[user] boarded.") else if(src.occupant != user) - to_chat(user, "[src.occupant] was faster. Try harder next time, loser.") + to_chat(user, span_warning("[src.occupant] was faster. Try harder next time, loser.")) else to_chat(user, "You stop entering the exosuit.") @@ -107,13 +107,13 @@ return if (!isturf(usr.loc)) - to_chat(usr, "You can't reach the passenger compartment from here.") + to_chat(usr, span_danger("You can't reach the passenger compartment from here.")) return if(iscarbon(usr)) var/mob/living/carbon/C = usr if(C.handcuffed) - to_chat(usr, "Kinda hard to climb in while handcuffed don't you think?") + to_chat(usr, span_danger("Kinda hard to climb in while handcuffed don't you think?")) return if(isliving(usr)) @@ -139,13 +139,13 @@ //didn't find anything switch (feedback) if (OCCUPIED) - to_chat(usr, "The passenger compartment is already occupied!") + to_chat(usr, span_danger("The passenger compartment is already occupied!")) if (LOCKED) - to_chat(usr, "The passenger compartment hatch is locked!") + to_chat(usr, span_warning("The passenger compartment hatch is locked!")) if (OCCUPIED|LOCKED) - to_chat(usr, "All of the passenger compartments are already occupied or locked!") + to_chat(usr, span_danger("All of the passenger compartments are already occupied or locked!")) if (0) - to_chat(usr, "\The [src] doesn't have a passenger compartment.") + to_chat(usr, span_warning("\The [src] doesn't have a passenger compartment.")) #undef LOCKED #undef OCCUPIED diff --git a/code/game/mecha/equipment/tools/sleeper.dm b/code/game/mecha/equipment/tools/sleeper.dm index 5fc2054c78..dfd9a7ca8e 100644 --- a/code/game/mecha/equipment/tools/sleeper.dm +++ b/code/game/mecha/equipment/tools/sleeper.dm @@ -204,7 +204,7 @@ set popup_menu = 0 if(usr!=src.occupant || usr.stat == 2) return - to_chat(usr,"Release sequence activated. This will take one minute.") + to_chat(usr,span_notice("Release sequence activated. This will take one minute.")) sleep(600) if(!src || !usr || !occupant || (occupant != usr)) //Check if someone's released/replaced/bombed him already return diff --git a/code/game/mecha/equipment/tools/syringe_gun.dm b/code/game/mecha/equipment/tools/syringe_gun.dm index f7e0e37ee7..84bec1bc56 100644 --- a/code/game/mecha/equipment/tools/syringe_gun.dm +++ b/code/game/mecha/equipment/tools/syringe_gun.dm @@ -330,7 +330,7 @@ STOP_PROCESSING(SSobj, src) shut_down() if(chassis && chassis.occupant) - to_chat(chassis.occupant, "\The [chassis] shudders as something jams!") + to_chat(chassis.occupant, span_notice("\The [chassis] shudders as something jams!")) log_message("[src.name] has malfunctioned. Maintenance required.") /obj/item/mecha_parts/mecha_equipment/crisis_drone/process() // Will continually try to find the nearest person above the threshold that is a valid target, and try to heal them. @@ -421,7 +421,7 @@ /obj/item/mecha_parts/mecha_equipment/crisis_drone/proc/shut_down() if(enabled) - chassis.visible_message("\The [chassis]'s [src] buzzes as its drone returns to port.") + chassis.visible_message(span_notice("\The [chassis]'s [src] buzzes as its drone returns to port.")) toggle_drone() if(!isnull(Target)) Target = null diff --git a/code/game/mecha/equipment/weapons/ballistic/mortar.dm b/code/game/mecha/equipment/weapons/ballistic/mortar.dm index cc20f82acf..4cfd885b22 100644 --- a/code/game/mecha/equipment/weapons/ballistic/mortar.dm +++ b/code/game/mecha/equipment/weapons/ballistic/mortar.dm @@ -19,6 +19,6 @@ var/turf/MT = get_turf(chassis) var/turf/TT = get_turf(target) if(!MT.is_outdoors() || !TT.is_outdoors()) - to_chat(chassis.occupant, "\The [src]'s control system prevents you from firing due to a blocked firing arc.") + to_chat(chassis.occupant, span_notice("\The [src]'s control system prevents you from firing due to a blocked firing arc.")) return 0 - return ..() \ No newline at end of file + return ..() diff --git a/code/game/mecha/equipment/weapons/honk.dm b/code/game/mecha/equipment/weapons/honk.dm index e7bee193dd..3edd3f554b 100644 --- a/code/game/mecha/equipment/weapons/honk.dm +++ b/code/game/mecha/equipment/weapons/honk.dm @@ -17,14 +17,14 @@ return 0 playsound(src, 'sound/effects/bang.ogg', 30, 1, 30) - chassis.occupant_message("You emit a high-pitched noise from the mech.") + chassis.occupant_message(span_warning("You emit a high-pitched noise from the mech.")) for(var/mob/living/carbon/M in ohearers(6, chassis)) if(istype(M, /mob/living/carbon/human)) var/ear_safety = 0 ear_safety = M.get_ear_protection() if(ear_safety > 0) return - to_chat(M, "Your ears feel like they're bleeding!") + to_chat(M, span_warning("Your ears feel like they're bleeding!")) playsound(M, 'sound/effects/bang.ogg', 70, 1, 30) M.SetSleeping(0) M.ear_deaf += 30 @@ -34,4 +34,4 @@ chassis.use_power(energy_drain) log_message("Used a sound emission device.") do_after_cooldown() - return \ No newline at end of file + return diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 2340df5681..53aabdf67e 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -30,8 +30,8 @@ if(!curloc || !targloc) return chassis.use_power(energy_drain) - chassis.visible_message("[chassis] fires [src]!") - occupant_message("You fire [src]!") + chassis.visible_message(span_warning("[chassis] fires [src]!")) + occupant_message(span_warning("You fire [src]!")) log_message("Fired from [src], targeting [target].") var/target_for_log = "unknown" if(ismob(target)) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 2674d3f679..6c7b5f2aad 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -624,7 +624,7 @@ /obj/machinery/mecha_part_fabricator/attackby(var/obj/item/I, var/mob/user) if(being_built) - to_chat(user, "\The [src] is busy. Please wait for completion of previous operation.") + to_chat(user, span_notice("\The [src] is busy. Please wait for completion of previous operation.")) return 1 if(default_deconstruction_screwdriver(user, I)) return @@ -636,7 +636,7 @@ if(istype(I,/obj/item/stack/material)) var/obj/item/stack/material/S = I if(!(S.material.name in materials)) - to_chat(user, "The [src] doesn't accept [S.material]!") + to_chat(user, span_warning("The [src] doesn't accept [S.material]!")) return var/sname = "[S.name]" diff --git a/code/game/mecha/mech_prosthetics.dm b/code/game/mecha/mech_prosthetics.dm index cec5b1f019..fbd3759d9d 100644 --- a/code/game/mecha/mech_prosthetics.dm +++ b/code/game/mecha/mech_prosthetics.dm @@ -137,24 +137,24 @@ if(istype(I,/obj/item/disk/limb)) var/obj/item/disk/limb/D = I if(!D.company || !(D.company in all_robolimbs)) - to_chat(user, "This disk seems to be corrupted!") + to_chat(user, span_warning("This disk seems to be corrupted!")) else - to_chat(user, "Installing blueprint files for [D.company]...") + to_chat(user, span_notice("Installing blueprint files for [D.company]...")) if(do_after(user,50,src)) var/datum/robolimb/R = all_robolimbs[D.company] R.unavailable_to_build = 0 - to_chat(user, "Installed [D.company] blueprints!") + to_chat(user, span_notice("Installed [D.company] blueprints!")) qdel(I) return if(istype(I,/obj/item/disk/species)) var/obj/item/disk/species/D = I if(!D.species || !(D.species in GLOB.all_species)) - to_chat(user, "This disk seems to be corrupted!") + to_chat(user, span_warning("This disk seems to be corrupted!")) else - to_chat(user, "Uploading modification files for [D.species]...") + to_chat(user, span_notice("Uploading modification files for [D.species]...")) if(do_after(user,50,src)) species_types |= D.species - to_chat(user, "Uploaded [D.species] files!") + to_chat(user, span_notice("Uploaded [D.species] files!")) qdel(I) return diff --git a/code/game/mecha/mech_sensor.dm b/code/game/mecha/mech_sensor.dm index 59a611fa81..522142830c 100644 --- a/code/game/mecha/mech_sensor.dm +++ b/code/game/mecha/mech_sensor.dm @@ -36,7 +36,7 @@ return istype(O, /obj/mecha) || istype(O, /obj/vehicle) /obj/machinery/mech_sensor/proc/give_feedback(O as obj) - var/block_message = "Movement control overridden. Area denial active." + var/block_message = span_warning("Movement control overridden. Area denial active.") var/feedback_timer = 0 if(feedback_timer) return diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 7170fe2b81..f51cb68083 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -513,11 +513,11 @@ if(65 to 85) . += "It's slightly damaged." if(45 to 65) - . += "It's badly damaged." + . += span_notice("It's badly damaged.") if(25 to 45) - . += "It's heavily damaged." + . += span_warning("It's heavily damaged.") else - . += " It's falling apart. " + . += span_warning(" It's falling apart. ") if(equipment?.len) . += "It's equipped with:" for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) @@ -635,7 +635,7 @@ /obj/mecha/proc/interface_action(obj/machinery/target) if(istype(target, /obj/machinery/access_button)) - src.occupant_message("Interfacing with [target].") + src.occupant_message(span_notice("Interfacing with [target].")) src.log_message("Interfaced with [target].") target.attack_hand(src.occupant) return 1 @@ -651,7 +651,7 @@ if(src_object == src || (src_object in src)) return STATUS_INTERACTIVE if(src.Adjacent(src_object)) - src.occupant_message("Interfacing with [src_object]...") + src.occupant_message(span_notice("Interfacing with [src_object]...")) src.log_message("Interfaced with [src_object].") return STATUS_INTERACTIVE if(src_object in view(2, src)) @@ -682,7 +682,7 @@ /obj/mecha/relaymove(mob/user,direction) if(user != src.occupant) //While not "realistic", this piece is player friendly. if(istype(user,/mob/living/carbon/brain)) - to_chat(user, "You try to move, but you are not the pilot! The exosuit doesn't respond.") + to_chat(user, span_warning("You try to move, but you are not the pilot! The exosuit doesn't respond.")) return 0 user.forceMove(get_turf(src)) to_chat(user, "You climb out from [src]") @@ -690,16 +690,16 @@ var/obj/item/mecha_parts/component/hull/HC = internal_components[MECH_HULL] if(!HC) - occupant_message("You can't operate an exosuit that doesn't have a hull!") + occupant_message(span_notice("You can't operate an exosuit that doesn't have a hull!")) return if(connected_port) if(world.time - last_message > 20) - src.occupant_message("Unable to move while connected to the air system port") + src.occupant_message(span_warning("Unable to move while connected to the air system port")) last_message = world.time return 0 if(state) - occupant_message("Maintenance protocols in effect") + occupant_message(span_warning("Maintenance protocols in effect")) return /* if(zoom) @@ -803,7 +803,7 @@ //Up/down zmove else if(direction == UP || direction == DOWN) if(!can_ztravel()) - occupant_message("Your vehicle lacks the capacity to move in that direction!") + occupant_message(span_warning("Your vehicle lacks the capacity to move in that direction!")) return FALSE //We're using locs because some mecha are 2x2 turfs. So thicc! @@ -811,16 +811,16 @@ for(var/turf/T in locs) if(!T.CanZPass(src,direction)) - occupant_message("You can't move that direction from here!") + occupant_message(span_warning("You can't move that direction from here!")) result = FALSE break var/turf/dest = (direction == UP) ? GetAbove(src) : GetBelow(src) if(!dest) - occupant_message("There is nothing of interest in this direction.") + occupant_message(span_notice("There is nothing of interest in this direction.")) result = FALSE break if(!dest.CanZPass(src,direction)) - occupant_message("There's something blocking your movement in that direction!") + occupant_message(span_warning("There's something blocking your movement in that direction!")) result = FALSE break if(result) @@ -847,7 +847,7 @@ if(!src.check_for_support()) float_direction = direction start_process(MECHA_PROC_MOVEMENT) - src.log_message("Movement control lost. Inertial movement started.") + src.log_message(span_warning("Movement control lost. Inertial movement started.")) if(do_after(get_step_delay())) can_move = 1 return 1 @@ -1064,16 +1064,16 @@ if(prob(25)) //Why would they get free internal damage. At least make it a bit RNG. src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) playsound(src, 'sound/weapons/slash.ogg', 50, 1, -1) - to_chat(user, "You slash at the armored suit!") - visible_message("\The [user] slashes at [src.name]'s armor!") + to_chat(user, span_danger("You slash at the armored suit!")) + visible_message(span_danger("\The [user] slashes at [src.name]'s armor!")) else src.log_append_to_last("Armor saved.") playsound(src, 'sound/weapons/slash.ogg', 50, 1, -1) - to_chat(user, "Your claws had no effect!") - src.occupant_message("\The [user]'s claws are stopped by the armor.") - visible_message("\The [user] rebounds off [src.name]'s armor!") + to_chat(user, span_danger("Your claws had no effect!")) + src.occupant_message(span_notice("\The [user]'s claws are stopped by the armor.")) + visible_message(span_warning("\The [user] rebounds off [src.name]'s armor!")) else - user.visible_message("\The [user] hits \the [src]. Nothing happens.","You hit \the [src] with no visible effect.") + user.visible_message(span_danger("\The [user] hits \the [src]. Nothing happens."),span_danger("You hit \the [src] with no visible effect.")) src.log_append_to_last("Armor saved.") return else if ((HULK in user.mutations) && !prob(temp_deflect_chance)) @@ -1118,7 +1118,7 @@ src.visible_message("The [A] fastens firmly to [src].") return if(prob(temp_deflect_chance) || istype(A, /mob)) - src.occupant_message("\The [A] bounces off the armor.") + src.occupant_message(span_notice("\The [A] bounces off the armor.")) src.visible_message("\The [A] bounces off \the [src] armor") src.log_append_to_last("Armor saved.") if(istype(A, /mob/living)) @@ -1131,16 +1131,16 @@ var/pass_damage = O.throwforce var/pass_damage_reduc_mod if(pass_damage <= temp_damage_minimum)//Too little to go through. - src.occupant_message("\The [A] bounces off the armor.") + src.occupant_message(span_notice("\The [A] bounces off the armor.")) src.visible_message("\The [A] bounces off \the [src] armor") return else if(O.armor_penetration < temp_minimum_penetration) //If you don't have enough pen, you won't do full damage - src.occupant_message("\The [A] struggles to bypass \the [src] armor.") + src.occupant_message(span_notice("\The [A] struggles to bypass \the [src] armor.")) src.visible_message("\The [A] struggles to bypass \the [src] armor") pass_damage_reduc_mod = temp_fail_penetration_value //This will apply to reduce damage to 2/3 or 66% by default else - src.occupant_message("\The [A] manages to pierce \the [src] armor.") + src.occupant_message(span_notice("\The [A] manages to pierce \the [src] armor.")) // src.visible_message("\The [A] manages to pierce \the [src] armor") pass_damage_reduc_mod = 1 @@ -1188,7 +1188,7 @@ temp_fail_penetration_value = round(ArmC.get_efficiency() * ArmC.fail_penetration_value) if(prob(temp_deflect_chance)) - src.occupant_message("The armor deflects incoming projectile.") + src.occupant_message(span_notice("The armor deflects incoming projectile.")) src.visible_message("The [src.name] armor deflects the projectile") src.log_append_to_last("Armor saved.") return @@ -1207,17 +1207,17 @@ pass_damage = ME.handle_projectile_contact(Proj, pass_damage) if(pass_damage < temp_damage_minimum)//too pathetic to really damage you. - src.occupant_message("The armor deflects incoming projectile.") + src.occupant_message(span_notice("The armor deflects incoming projectile.")) src.visible_message("The [src.name] armor deflects\the [Proj]") return else if(Proj.armor_penetration < temp_minimum_penetration) //If you don't have enough pen, you won't do full damage - src.occupant_message("\The [Proj] struggles to pierce \the [src] armor.") + src.occupant_message(span_notice("\The [Proj] struggles to pierce \the [src] armor.")) src.visible_message("\The [Proj] struggles to pierce \the [src] armor") pass_damage_reduc_mod = temp_fail_penetration_value //This will apply to reduce damage to 2/3 or 66% by default else //You go through completely because you use AP. Nice. - src.occupant_message("\The [Proj] manages to pierce \the [src] armor.") + src.occupant_message(span_notice("\The [Proj] manages to pierce \the [src] armor.")) // src.visible_message("\The [Proj] manages to pierce \the [src] armor") pass_damage_reduc_mod = 1 @@ -1288,18 +1288,18 @@ src.take_damage(6) src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) playsound(src, 'sound/effects/blobattack.ogg', 50, 1, -1) - to_chat(user, "You smash at the armored suit!") + to_chat(user, span_danger("You smash at the armored suit!")) for (var/mob/V in viewers(src)) if(V.client && !(V.blinded)) - V.show_message("\The [user] smashes against [src.name]'s armor!", 1) + V.show_message(span_danger("\The [user] smashes against [src.name]'s armor!"), 1) else src.log_append_to_last("Armor saved.") playsound(src, 'sound/effects/blobattack.ogg', 50, 1, -1) - to_chat(user, "Your attack had no effect!") - src.occupant_message("\The [user]'s attack is stopped by the armor.") + to_chat(user, span_warning("Your attack had no effect!")) + src.occupant_message(span_warning("\The [user]'s attack is stopped by the armor.")) for (var/mob/V in viewers(src)) if(V.client && !(V.blinded)) - V.show_message("\The [user] rebounds off the [src.name] armor!", 1) + V.show_message(span_warning("\The [user] rebounds off the [src.name] armor!"), 1) return */ @@ -1344,17 +1344,17 @@ temp_fail_penetration_value = round(ArmC.get_efficiency() * ArmC.fail_penetration_value) if(prob(temp_deflect_chance)) //Does your attack get deflected outright. - src.occupant_message("\The [W] bounces off [src.name].") - to_chat(user, "\The [W] bounces off [src.name].") + src.occupant_message(span_notice("\The [W] bounces off [src.name].")) + to_chat(user, span_danger("\The [W] bounces off [src.name].")) src.log_append_to_last("Armor saved.") else if(W.force < temp_damage_minimum) //Is your attack too PATHETIC to do anything. 3 damage to a person shouldn't do anything to a mech. - src.occupant_message("\The [W] bounces off the armor.") + src.occupant_message(span_notice("\The [W] bounces off the armor.")) src.visible_message("\The [W] bounces off \the [src] armor") return else if(W.armor_penetration < temp_minimum_penetration) //If you don't have enough pen, you won't do full damage - src.occupant_message("\The [W] struggles to bypass \the [src] armor.") + src.occupant_message(span_notice("\The [W] struggles to bypass \the [src] armor.")) src.visible_message("\The [W] struggles to bypass \the [src] armor") pass_damage_reduc_mod = temp_fail_penetration_value //This will apply to reduce damage to 2/3 or 66% by default @@ -1426,9 +1426,9 @@ output_maintenance_dialog(id_card, user) return else - to_chat(user, "Invalid ID: Access denied.") + to_chat(user, span_warning("Invalid ID: Access denied.")) else - to_chat(user, "Maintenance protocols disabled by operator.") + to_chat(user, span_warning("Maintenance protocols disabled by operator.")) else if(W.has_tool_quality(TOOL_WRENCH)) if(state==MECHA_BOLTS_SECURED) state = MECHA_PANEL_LOOSE @@ -1451,7 +1451,7 @@ if(istype(MC)) removable_components[MC.name] = MC else - to_chat(user, "\The [src] appears to be missing \the [slot].") + to_chat(user, span_notice("\The [src] appears to be missing \the [slot].")) var/remove = tgui_input_list(user, "Which component do you want to pry out?", "Remove Component", removable_components) if(!remove) @@ -1492,8 +1492,8 @@ src.go_out() src.log_message("[src.occupant] was ejected using the maintenance controls.") else - to_chat(user, "Your attempt is rejected.") - src.occupant_message("An attempt to eject you was made using the maintenance controls.") + to_chat(user, span_warning("Your attempt is rejected.")) + src.occupant_message(span_warning("An attempt to eject you was made using the maintenance controls.")) src.log_message("Eject attempt made using maintenance controls - rejected.") return @@ -1516,20 +1516,20 @@ if (WT.remove_fuel(0,user)) if (hasInternalDamage(MECHA_INT_TANK_BREACH)) clearInternalDamage(MECHA_INT_TANK_BREACH) - to_chat(user, "You repair the damaged gas tank.") + to_chat(user, span_notice("You repair the damaged gas tank.")) else return if((src.healthYou repair some damage to [src.name].") + to_chat(user, span_notice("You repair some damage to [src.name].")) src.health += min(10, initial(src.health)-src.health) update_damage_alerts() else if(HC.integrityYou repair some damage to [HC.name].") + to_chat(user, span_notice("You repair some damage to [HC.name].")) HC.integrity += min(10, HC.max_integrity-HC.integrity) update_damage_alerts() else if(AC.integrityYou repair some damage to [AC.name].") + to_chat(user, span_notice("You repair some damage to [AC.name].")) AC.integrity += min(10, AC.max_integrity-AC.integrity) update_damage_alerts() @@ -1551,30 +1551,30 @@ var/obj/item/mecha_parts/component/C = internal_components[slot] if(!C) - to_chat(user, "There are no components installed!") + to_chat(user, span_notice("There are no components installed!")) return if(C.integrity >= C.max_integrity) - to_chat(user, "\The [C] does not require repairs.") + to_chat(user, span_notice("\The [C] does not require repairs.")) else if(C.integrity < C.max_integrity) - to_chat(user, "You start to repair damage to \the [C].") + to_chat(user, span_notice("You start to repair damage to \the [C].")) while(C.integrity < C.max_integrity && NP) if(do_after(user, 1 SECOND, src)) NP.use(1) C.adjust_integrity(NP.mech_repair) if(C.integrity >= C.max_integrity) - to_chat(user, "You finish repairing \the [C].") + to_chat(user, span_notice("You finish repairing \the [C].")) break else if(NP.amount == 0) - to_chat(user, "Insufficient nanopaste to complete repairs!") + to_chat(user, span_warning("Insufficient nanopaste to complete repairs!")) break return else - to_chat(user, "You can't reach \the [src]'s internal components.") + to_chat(user, span_notice("You can't reach \the [src]'s internal components.")) return else @@ -1582,7 +1582,7 @@ /* src.log_message("Attacked by [W]. Attacker - [user]") if(prob(src.deflect_chance)) - to_chat(user, "\The [W] bounces off [src.name] armor.") + to_chat(user, span_warning("\The [W] bounces off [src.name] armor.")) src.log_append_to_last("Armor saved.") /* for (var/mob/V in viewers(src)) @@ -1630,7 +1630,7 @@ //Added a message here since people assume their first click failed or something./N // to_chat(user, "Installing MMI, please stand by.") - visible_message("[usr] starts to insert a brain into [src.name]") + visible_message(span_notice("[usr] starts to insert a brain into [src.name]")) if(enter_after(40,user)) if(!occupant) @@ -1785,12 +1785,12 @@ var/obj/machinery/atmospherics/portables_connector/possible_port = locate(/obj/machinery/atmospherics/portables_connector) in T if(possible_port) if(connect(possible_port)) - occupant_message("\The [name] connects to the port.") + occupant_message(span_notice("\The [name] connects to the port.")) verbs += /obj/mecha/verb/disconnect_from_port verbs -= /obj/mecha/verb/connect_to_port return else - occupant_message("\The [name] failed to connect to the port.") + occupant_message(span_danger("\The [name] failed to connect to the port.")) return else occupant_message("Nothing happens") @@ -1809,11 +1809,11 @@ return if(disconnect()) - occupant_message("[name] disconnects from the port.") + occupant_message(span_notice("[name] disconnects from the port.")) verbs -= /obj/mecha/verb/disconnect_from_port verbs += /obj/mecha/verb/connect_to_port else - occupant_message("[name] is not connected to the port at the moment.") + occupant_message(span_danger("[name] is not connected to the port at the moment.")) /obj/mecha/verb/toggle_lights() set name = "Toggle Lights" @@ -1846,11 +1846,11 @@ var/obj/item/mecha_parts/component/gas/GC = internal_components[MECH_GAS] if(!GC) - to_chat(occupant, "The life support systems don't seem to respond.") + to_chat(occupant, span_warning("The life support systems don't seem to respond.")) return if(!prob(GC.get_efficiency() * 100)) - to_chat(occupant, "\The [GC] shudders and barks, before returning to how it was before.") + to_chat(occupant, span_warning("\The [GC] shudders and barks, before returning to how it was before.")) return use_internal_tank = !use_internal_tank @@ -1905,22 +1905,22 @@ return if (usr.buckled) - to_chat(usr, "You can't climb into the exosuit while buckled!") + to_chat(usr, span_warning("You can't climb into the exosuit while buckled!")) return src.log_message("[usr] tries to move in.") if(iscarbon(usr)) var/mob/living/carbon/C = usr if(C.handcuffed) - to_chat(usr, "Kinda hard to climb in while handcuffed don't you think?") + to_chat(usr, span_danger("Kinda hard to climb in while handcuffed don't you think?")) return if (src.occupant) - to_chat(usr, "The [src.name] is already occupied!") + to_chat(usr, span_danger("The [src.name] is already occupied!")) src.log_append_to_last("Permission denied.") return /* if (usr.abiotic()) - to_chat(usr, "Subject cannot have abiotic items on.") + to_chat(usr, span_notice("Subject cannot have abiotic items on.")) return */ var/passed @@ -1930,7 +1930,7 @@ else if(src.operation_allowed(usr)) passed = 1 if(!passed) - to_chat(usr, "Access denied") + to_chat(usr, span_warning("Access denied")) src.log_append_to_last("Permission denied.") return if(isliving(usr)) @@ -1941,7 +1941,7 @@ // to_chat(usr, "You start climbing into [src.name]") if(get_equipment(/obj/item/mecha_parts/mecha_equipment/runningboard)) - visible_message("\The [usr] is instantly lifted into [src.name] by the running board!") + visible_message(span_notice("\The [usr] is instantly lifted into [src.name] by the running board!")) moved_inside(usr) if(ishuman(occupant)) GrantActions(occupant, 1) @@ -2230,8 +2230,8 @@ var/obj/item/mecha_parts/component/armor/AC = internal_components[MECH_ARMOR] var/output = {"[report_internal_damage()] - Armor Integrity: [AC?"[round(AC.integrity / AC.max_integrity * 100, 0.1)]%":"ARMOR MISSING"]
- Hull Integrity: [HC?"[round(HC.integrity / HC.max_integrity * 100, 0.1)]%":"HULL MISSING"]
+ Armor Integrity: [AC?"[round(AC.integrity / AC.max_integrity * 100, 0.1)]%":span_warning("ARMOR MISSING")]
+ Hull Integrity: [HC?"[round(HC.integrity / HC.max_integrity * 100, 0.1)]%":span_warning("HULL MISSING")]
[integrity<30?"DAMAGE LEVEL CRITICAL
":null] Chassis Integrity: [integrity]%
Powercell charge: [isnull(cell_charge)?"No powercell installed":"[cell.percent()]%"]
@@ -2575,7 +2575,7 @@ passengers["[P.occupant]"] = P if (!passengers) - to_chat(user, "There are no passengers to remove.") + to_chat(user, span_warning("There are no passengers to remove.")) return var/pname = tgui_input_list(user, "Choose a passenger to forcibly remove.", "Forcibly Remove Passenger", passengers) @@ -2586,11 +2586,11 @@ var/obj/item/mecha_parts/mecha_equipment/tool/passenger/P = passengers[pname] var/mob/occupant = P.occupant - user.visible_message("\The [user] begins opening the hatch on \the [P]...", "You begin opening the hatch on \the [P]...") + user.visible_message("\The [user] begins opening the hatch on \the [P]...", span_notice("You begin opening the hatch on \the [P]...")) if (!do_after(user, 40)) return - user.visible_message("\The [user] opens the hatch on \the [P] and removes [occupant]!", "You open the hatch on \the [P] and remove [occupant]!") + user.visible_message("\The [user] opens the hatch on \the [P] and removes [occupant]!", span_notice("You open the hatch on \the [P] and remove [occupant]!")) P.go_out() P.log_message("[occupant] was removed.") return @@ -2638,7 +2638,7 @@ if(href_list["drop_from_cargo"]) var/obj/O = locate(href_list["drop_from_cargo"]) if(O && (O in src.cargo)) - src.occupant_message("You unload [O].") + src.occupant_message(span_notice("You unload [O].")) O.forceMove(get_turf(src)) src.cargo -= O var/turf/T = get_turf(O) @@ -2776,13 +2776,13 @@ if(prob(temp_deflect_chance))//Deflected src.log_append_to_last("Armor saved.") - src.occupant_message("\The [user]'s attack is stopped by the armor.") + src.occupant_message(span_notice("\The [user]'s attack is stopped by the armor.")) visible_message("\The [user] rebounds off [src.name]'s armor!") user.attack_log += text("\[[time_stamp()]\] [span_red("attacked [src.name]")]") playsound(src, 'sound/weapons/slash.ogg', 50, 1, -1) else if(damage < temp_damage_minimum)//Pathetic damage levels just don't harm MECH. - src.occupant_message("\The [user]'s doesn't dent \the [src] paint.") + src.occupant_message(span_notice("\The [user]'s doesn't dent \the [src] paint.")) src.visible_message("\The [user]'s attack doesn't dent \the [src] armor") src.log_append_to_last("Armor saved.") playsound(src, 'sound/effects/Glasshit.ogg', 50, 1) @@ -2792,7 +2792,7 @@ src.take_damage(damage) //Apply damage - The take_damage() proc handles armor values if(damage > internal_damage_minimum) //Only decently painful attacks trigger a chance of mech damage. src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) - visible_message("[user] [attack_message] [src]!") + visible_message(span_danger("[user] [attack_message] [src]!")) user.attack_log += text("\[[time_stamp()]\] [span_red("attacked [src.name]")]") return 1 @@ -2890,7 +2890,7 @@ var/damage = rand(blob.damage_lower, blob.damage_upper) src.take_damage(damage, blob.damage_type) - visible_message("\The [B] [blob.attack_verb] \the [src]!", "[blob.attack_message_synth]!") + visible_message(span_danger("\The [B] [blob.attack_verb] \the [src]!"), span_danger("[blob.attack_message_synth]!")) playsound(src, 'sound/effects/attackblob.ogg', 50, 1) return ..() diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index 67736d5611..10a53e37a6 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -47,7 +47,7 @@ else to_chat(user, "You failed to salvage anything valuable from [src].") else - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span_notice("You need more welding fuel to complete this task.")) return if(W.has_tool_quality(TOOL_WIRECUTTER)) if(salvage_num <= 0) diff --git a/code/game/mecha/micro/micro.dm b/code/game/mecha/micro/micro.dm index 1f301ce541..0762b58900 100644 --- a/code/game/mecha/micro/micro.dm +++ b/code/game/mecha/micro/micro.dm @@ -121,7 +121,7 @@ /obj/mecha/micro/move_inside() var/mob/living/carbon/C = usr if (C.get_effective_size(TRUE) >= 0.5) - to_chat(C, "You can't fit in this suit!") + to_chat(C, span_warning("You can't fit in this suit!")) return else ..() @@ -129,7 +129,7 @@ /obj/mecha/micro/move_inside_passenger() var/mob/living/carbon/C = usr if (C.get_effective_size(TRUE) >= 0.5) - to_chat(C, "You can't fit in this suit!") + to_chat(C, span_warning("You can't fit in this suit!")) return else ..() diff --git a/code/game/mecha/micro/micro_equipment.dm b/code/game/mecha/micro/micro_equipment.dm index 0641252438..e329efb678 100644 --- a/code/game/mecha/micro/micro_equipment.dm +++ b/code/game/mecha/micro/micro_equipment.dm @@ -120,8 +120,8 @@ if(!target_obj.vars.Find("unacidable") || target_obj.unacidable) return set_ready_state(0) chassis.use_power(energy_drain) - chassis.visible_message("[chassis] starts to drill [target]", "You hear the drill.") - occupant_message("You start to drill [target]") + chassis.visible_message(span_danger("[chassis] starts to drill [target]"), span_warning("You hear the drill.")) + occupant_message(span_danger("You start to drill [target]")) var/T = chassis.loc var/C = target.loc //why are these backwards? we may never know -Pete if(do_after_cooldown(target)) @@ -129,7 +129,7 @@ if(istype(target, /turf/simulated/wall)) var/turf/simulated/wall/W = target if(W.reinf_material) - occupant_message("[target] is too durable to drill through.") + occupant_message(span_warning("[target] is too durable to drill through.")) else log_message("Drilled through [target]") target.ex_act(2) @@ -143,7 +143,7 @@ for(var/obj/item/ore/ore in range(chassis,1)) if(get_dir(chassis,ore)&chassis.dir) if (ore_box.contents.len >= ore_box.orecapacity) - occupant_message("The ore compartment is full.") + occupant_message(span_warning("The ore compartment is full.")) return 1 else ore.forceMove(ore_box) @@ -169,8 +169,8 @@ if(!action_checks(target)) return set_ready_state(0) chassis.use_power(energy_drain) - chassis.visible_message("[chassis] sweeps around with its ore scoop.") - occupant_message("You sweep around the area with the scoop.") + chassis.visible_message(span_info("[chassis] sweeps around with its ore scoop.")) + occupant_message(span_info("You sweep around the area with the scoop.")) var/T = chassis.loc //var/C = target.loc //why are these backwards? we may never know -Pete if(do_after_cooldown(target)) @@ -178,7 +178,7 @@ for(var/obj/item/ore/ore in range(chassis,1)) if(get_dir(chassis,ore)&chassis.dir) if (contents.len >= orecapacity) - occupant_message("The ore compartment is full.") + occupant_message(span_warning("The ore compartment is full.")) return 1 else ore.Move(src) @@ -204,7 +204,7 @@ set src in view(1) if(!istype(usr, /mob/living/carbon/human)) //Only living, intelligent creatures with hands can empty ore boxes. - to_chat(usr, "You are physically incapable of emptying the ore box.") + to_chat(usr, span_warning("You are physically incapable of emptying the ore box.")) return if( usr.stat || usr.restrained() ) @@ -217,12 +217,12 @@ add_fingerprint(usr) if(contents.len < 1) - to_chat(usr, "The ore box is empty") + to_chat(usr, span_warning("The ore box is empty")) return for (var/obj/item/ore/O in contents) contents -= O O.loc = src.loc - to_chat(usr, "You empty the ore box") + to_chat(usr, span_info("You empty the ore box")) return diff --git a/code/game/mecha/space/hoverpod.dm b/code/game/mecha/space/hoverpod.dm index fc5fc1e739..17ce5d45b8 100644 --- a/code/game/mecha/space/hoverpod.dm +++ b/code/game/mecha/space/hoverpod.dm @@ -47,7 +47,7 @@ if (href_list["toggle_stabilization"]) stabilization_enabled = !stabilization_enabled send_byjax(src.occupant,"exosuit.browser","stabilization_command","[stabilization_enabled?"Dis":"En"]able thruster stabilization") - src.occupant_message("Thruster stabilization [stabilization_enabled? "enabled" : "disabled"].") + src.occupant_message(span_notice("Thruster stabilization [stabilization_enabled? "enabled" : "disabled"].")) return /obj/mecha/working/hoverpod/get_commands() diff --git a/code/game/mecha/working/working.dm b/code/game/mecha/working/working.dm index 6d19bbd6b5..88ab213d2d 100644 --- a/code/game/mecha/working/working.dm +++ b/code/game/mecha/working/working.dm @@ -34,7 +34,7 @@ if(href_list["drop_from_cargo"]) var/obj/O = locate(href_list["drop_from_cargo"]) if(O && O in src.cargo) - src.occupant_message("You unload [O].") + src.occupant_message(span_notice("You unload [O].")) O.loc = get_turf(src) src.cargo -= O var/turf/T = get_turf(O) diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 38893adcba..632a55ddda 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -116,12 +116,12 @@ //Wrapper procs that handle sanity and user feedback /atom/movable/proc/user_buckle_mob(mob/living/M, mob/user, var/forced = FALSE, var/silent = FALSE) if(!ticker) - to_chat(user, "You can't buckle anyone in before the game starts.") + to_chat(user, span_warning("You can't buckle anyone in before the game starts.")) return FALSE // Is this really needed? if(!user.Adjacent(M) || user.restrained() || user.stat || istype(user, /mob/living/silicon/pai)) return FALSE if(M in buckled_mobs) - to_chat(user, "\The [M] is already buckled to \the [src].") + to_chat(user, span_warning("\The [M] is already buckled to \the [src].")) return FALSE if(!can_buckle_check(M, forced)) return FALSE @@ -141,19 +141,19 @@ var/reveal_message = list("buckled_mob" = null, "buckled_to" = null) //VORE EDIT: This being a list and messages existing for the buckle target atom. if(!silent) if(M == user) - reveal_message["buckled_mob"] = "You come out of hiding and buckle yourself to [src]." //VORE EDIT - reveal_message["buckled_to"] = "You come out of hiding as [M.name] buckles themselves to you." //VORE EDIT + reveal_message["buckled_mob"] = span_notice("You come out of hiding and buckle yourself to [src].") //VORE EDIT + reveal_message["buckled_to"] = span_notice("You come out of hiding as [M.name] buckles themselves to you.") //VORE EDIT M.visible_message(\ - "[M.name] buckles themselves to [src].",\ - "You buckle yourself to [src].",\ - "You hear metal clanking.") + span_notice("[M.name] buckles themselves to [src]."),\ + span_notice("You buckle yourself to [src]."),\ + span_notice("You hear metal clanking.")) else - reveal_message["buckled_mob"] = "You are revealed as you are buckled to [src]." //VORE EDIT - reveal_message["buckled_to"] = "You are revealed as [M.name] is buckled to you." //VORE EDIT + reveal_message["buckled_mob"] = span_notice("You are revealed as you are buckled to [src].") //VORE EDIT + reveal_message["buckled_to"] = span_notice("You are revealed as [M.name] is buckled to you.") //VORE EDIT M.visible_message(\ - "[M.name] is buckled to [src] by [user.name]!",\ - "You are buckled to [src] by [user.name]!",\ - "You hear metal clanking.") + span_danger("[M.name] is buckled to [src] by [user.name]!"),\ + span_danger("You are buckled to [src] by [user.name]!"),\ + span_notice("You hear metal clanking.")) M.reveal(silent, reveal_message["buckled_mob"]) //Reveal people so they aren't buckled to chairs from behind. //VORE EDIT, list arg instead of simple message var for buckled mob //Vore edit start @@ -168,14 +168,14 @@ if(M) if(M != user) M.visible_message(\ - "[M.name] was unbuckled by [user.name]!",\ - "You were unbuckled from [src] by [user.name].",\ - "You hear metal clanking.") + span_notice("[M.name] was unbuckled by [user.name]!"),\ + span_notice("You were unbuckled from [src] by [user.name]."),\ + span_notice("You hear metal clanking.")) else M.visible_message(\ - "[M.name] unbuckled themselves!",\ - "You unbuckle yourself from [src].",\ - "You hear metal clanking.") + span_notice("[M.name] unbuckled themselves!"),\ + span_notice("You unbuckle yourself from [src]."),\ + span_notice("You hear metal clanking.")) add_fingerprint(user) return M @@ -202,7 +202,7 @@ return FALSE if(has_buckled_mobs() && buckled_mobs.len >= max_buckled_mobs) //Handles trying to buckle yourself to the chair when someone is on it - to_chat(M, "\The [src] can't buckle anymore people.") + to_chat(M, span_notice("\The [src] can't buckle anymore people.")) return FALSE return TRUE diff --git a/code/game/objects/effects/alien/aliens.dm b/code/game/objects/effects/alien/aliens.dm index 56fec8642b..e325b326d2 100644 --- a/code/game/objects/effects/alien/aliens.dm +++ b/code/game/objects/effects/alien/aliens.dm @@ -186,9 +186,9 @@ /obj/effect/alien/weeds/attackby(var/obj/item/W, var/mob/user) user.setClickCooldown(user.get_attack_speed(W)) if(LAZYLEN(W.attack_verb)) - visible_message("\The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]") + visible_message(span_danger("\The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]")) else - visible_message("\The [src] have been attacked with \the [W][(user ? " by [user]." : ".")]") + visible_message(span_danger("\The [src] have been attacked with \the [W][(user ? " by [user]." : ".")]")) var/damage = W.force / 4.0 @@ -203,7 +203,7 @@ healthcheck() /obj/effect/alien/weeds/attack_generic(var/mob/user, var/damage, var/attack_verb) - visible_message("[user] [attack_verb] the [src]!") + visible_message(span_danger("[user] [attack_verb] the [src]!")) user.do_attack_animation(src) health -= damage healthcheck() @@ -267,7 +267,7 @@ if(ticks >= target_strength) for(var/mob/O in hearers(src, null)) - O.show_message("[src.target] collapses under its own weight into a puddle of goop and undigested debris!", 1) + O.show_message(span_alium("[src.target] collapses under its own weight into a puddle of goop and undigested debris!"), 1) if(iswall(target)) //Gurgs : Spruced up corrosive acid var/turf/simulated/wall/W = target @@ -282,13 +282,13 @@ switch(target_strength - ticks) if(6) - visible_message("[src.target] is holding up against the acid!") + visible_message(span_alium("[src.target] is holding up against the acid!")) if(4) - visible_message("[src.target]\s structure is being melted by the acid!") + visible_message(span_alium("[src.target]\s structure is being melted by the acid!")) if(2) - visible_message("[src.target] is struggling to withstand the acid!") + visible_message(span_alium("[src.target] is struggling to withstand the acid!")) if(0 to 1) - visible_message("[src.target] begins to crumble under the acid!") + visible_message(span_alium("[src.target] begins to crumble under the acid!")) spawn(rand(150, 200)) tick() //Xenomorph Effect egg removed, replaced with Structure Egg. diff --git a/code/game/objects/effects/chem/foam.dm b/code/game/objects/effects/chem/foam.dm index 6e9cf44ebc..84ef931b74 100644 --- a/code/game/objects/effects/chem/foam.dm +++ b/code/game/objects/effects/chem/foam.dm @@ -168,23 +168,23 @@ /obj/structure/foamedmetal/attack_hand(var/mob/user) if ((HULK in user.mutations) || (prob(75 - metal * 25))) - user.visible_message("[user] smashes through the foamed metal.", "You smash through the metal foam wall.") + user.visible_message(span_warning("[user] smashes through the foamed metal."), span_notice("You smash through the metal foam wall.")) qdel(src) else - to_chat(user, "You hit the metal foam but bounce off it.") + to_chat(user, span_notice("You hit the metal foam but bounce off it.")) return /obj/structure/foamedmetal/attackby(var/obj/item/I, var/mob/user) if(istype(I, /obj/item/grab)) var/obj/item/grab/G = I G.affecting.loc = src.loc - visible_message("[G.assailant] smashes [G.affecting] through the foamed metal wall.") + visible_message(span_warning("[G.assailant] smashes [G.affecting] through the foamed metal wall.")) qdel(I) qdel(src) return if(prob(I.force * 20 - metal * 25)) - user.visible_message("[user] smashes through the foamed metal.", "You smash through the foamed metal with \the [I].") + user.visible_message(span_warning("[user] smashes through the foamed metal."), span_notice("You smash through the foamed metal with \the [I].")) qdel(src) else - to_chat(user, "You hit the metal foam to no effect.") + to_chat(user, span_notice("You hit the metal foam to no effect.")) diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 4ed055f24b..98ec3fa94b 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -127,7 +127,7 @@ var/global/list/image/splatter_cache=list() return var/taken = rand(1,amount) amount -= taken - to_chat(user, "You get some of \the [src] on your hands.") + to_chat(user, span_notice("You get some of \the [src] on your hands.")) if (!user.blood_DNA) user.blood_DNA = list() user.blood_DNA |= blood_DNA.Copy() diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index ad2a3fef80..c15734b89d 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -16,7 +16,7 @@ anchored = TRUE /obj/effect/decal/cleanable/ash/attack_hand(mob/user as mob) - to_chat(user, "[src] sifts through your fingers.") + to_chat(user, span_notice("[src] sifts through your fingers.")) var/turf/simulated/floor/F = get_turf(src) if (istype(F)) F.dirt += 4 @@ -158,6 +158,6 @@ icon_state = "confetti" /obj/effect/decal/cleanable/confetti/attack_hand(mob/user) - to_chat(user, "You start to meticulously pick up the confetti.") + to_chat(user, span_notice("You start to meticulously pick up the confetti.")) if(do_after(user, 60)) qdel(src) diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index 6873e66ffc..ca1fcd2f3c 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -35,12 +35,12 @@ //must place on a wall and user must not be inside a closet/mecha/whatever var/turf/W = A if (!iswall(W) || !isturf(user.loc)) - to_chat(user, "You can't place this here!") + to_chat(user, span_warning("You can't place this here!")) return var/placement_dir = get_dir(user, W) if (!(placement_dir in cardinal)) - to_chat(user, "You must stand directly in front of the wall you wish to place that on.") + to_chat(user, span_warning("You must stand directly in front of the wall you wish to place that on.")) return //just check if there is a poster on or adjacent to the wall @@ -56,10 +56,10 @@ break if (stuff_on_wall) - to_chat(user, "There is already a poster there!") + to_chat(user, span_notice("There is already a poster there!")) return - to_chat(user, "You start placing the poster on the wall...") //Looks like it's uncluttered enough. Place the poster. + to_chat(user, span_notice("You start placing the poster on the wall...")) //Looks like it's uncluttered enough. Place the poster. var/obj/structure/sign/poster/P = new poster_type(user.loc, placement_dir=get_dir(user, W), serial=serial_number, itemtype = src.type) @@ -72,7 +72,7 @@ if(!P) return if(iswall(W) && user && P.loc == user.loc) //Let's check if everything is still there - to_chat(user, "You place the poster!") + to_chat(user, span_notice("You place the poster!")) else P.roll_and_drop(P.loc) @@ -183,10 +183,10 @@ if(W.has_tool_quality(TOOL_WIRECUTTER)) playsound(src, W.usesound, 100, 1) if(ruined) - to_chat(user, "You remove the remnants of the poster.") + to_chat(user, span_notice("You remove the remnants of the poster.")) qdel(src) else - to_chat(user, "You carefully remove the poster from the wall.") + to_chat(user, span_notice("You carefully remove the poster from the wall.")) roll_and_drop(user.loc) return @@ -200,7 +200,7 @@ if(ruined || !user.Adjacent(src)) return - visible_message("[user] rips [src] in a single, decisive motion!" ) + visible_message(span_warning("[user] rips [src] in a single, decisive motion!") ) playsound(src, 'sound/items/poster_ripped.ogg', 100, 1) ruined = 1 icon_state = "poster_ripped" @@ -239,4 +239,4 @@ //Non-Random Posters /obj/structure/sign/poster/custom - roll_type = /obj/item/contraband/poster/custom \ No newline at end of file + roll_type = /obj/item/contraband/poster/custom diff --git a/code/game/objects/effects/decals/posters/posters.dm b/code/game/objects/effects/decals/posters/posters.dm index ea3f93589b..7aa5709988 100644 --- a/code/game/objects/effects/decals/posters/posters.dm +++ b/code/game/objects/effects/decals/posters/posters.dm @@ -41,12 +41,12 @@ //must place on a wall and user must not be inside a closet/mecha/whatever var/turf/W = A if(!iswall(W) || !isturf(user.loc)) - to_chat(user, "You can't place this here!") + to_chat(user, span_warning("You can't place this here!")) return FALSE var/placement_dir = get_dir(user, W) if(!(placement_dir in cardinal)) - to_chat(user, "You must stand directly in front of the wall you wish to place that on.") + to_chat(user, span_warning("You must stand directly in front of the wall you wish to place that on.")) return FALSE //just check if there is a poster on or adjacent to the wall @@ -62,15 +62,15 @@ break if(stuff_on_wall) - to_chat(user, "There is already a poster there!") + to_chat(user, span_notice("There is already a poster there!")) return FALSE - to_chat(user, "You start placing the poster on the wall...") //Looks like it's uncluttered enough. Place the poster. + to_chat(user, span_notice("You start placing the poster on the wall...")) //Looks like it's uncluttered enough. Place the poster. var/obj/structure/sign/poster/P = new poster_type(user.loc, get_dir(user, W), src) if(do_after(user, 17)) //Let's check if everything is still there - to_chat(user, "You place the poster!") + to_chat(user, span_notice("You place the poster!")) qdel(src) return TRUE @@ -168,10 +168,10 @@ if(W.has_tool_quality(TOOL_WIRECUTTER)) playsound(src, W.usesound, 100, 1) if(ruined) - to_chat(user, "You remove the remnants of the poster.") + to_chat(user, span_notice("You remove the remnants of the poster.")) qdel(src) else - to_chat(user, "You carefully remove the poster from the wall.") + to_chat(user, span_notice("You carefully remove the poster from the wall.")) roll_and_drop(get_turf(user)) return @@ -185,7 +185,7 @@ if(ruined || !user.Adjacent(src)) return - visible_message("[user] rips [src] in a single, decisive motion!" ) + visible_message(span_warning("[user] rips [src] in a single, decisive motion!") ) playsound(src, 'sound/items/poster_ripped.ogg', 100, 1) ruined = TRUE icon_state = "poster_ripped" diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index 9d1d0e1309..3c89385ece 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -56,14 +56,14 @@ icon_state = "mummified2" /obj/effect/decal/remains/attack_hand(mob/user as mob) - to_chat(user, "[src] sinks together into a pile of ash.") + to_chat(user, span_notice("[src] sinks together into a pile of ash.")) var/turf/simulated/floor/F = get_turf(src) if(istype(F)) new /obj/effect/decal/cleanable/ash(F) qdel(src) /obj/effect/decal/remains/robot/attack_hand(mob/user as mob) - to_chat(user, "[src] crumbles down into a pile of debris.") + to_chat(user, span_notice("[src] crumbles down into a pile of debris.")) var/turf/simulated/floor/F = get_turf(src) if(istype(F)) new /obj/effect/decal/cleanable/blood/gibs/robot(F) diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index fca4988493..b69cbba4d7 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -544,10 +544,10 @@ steam.start() -- spawns the effect s.start() for(var/mob/M in viewers(5, location)) - to_chat(M, "The solution violently explodes.") + to_chat(M, span_warning("The solution violently explodes.")) for(var/mob/M in viewers(1, location)) if (prob (50 * amount)) - to_chat(M, "The explosion knocks you down.") + to_chat(M, span_warning("The explosion knocks you down.")) M.Weaken(rand(1,5)) return else @@ -570,7 +570,7 @@ steam.start() -- spawns the effect flash = (amount/4) * flashing_factor for(var/mob/M in viewers(8, location)) - to_chat(M, "The solution violently explodes.") + to_chat(M, span_warning("The solution violently explodes.")) explosion( location, diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm index f9116b8361..59f0744923 100644 --- a/code/game/objects/effects/gibs.dm +++ b/code/game/objects/effects/gibs.dm @@ -18,7 +18,7 @@ /obj/effect/gibspawner/proc/Gib(atom/location, var/datum/dna/MobDNA = null) if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len) - to_world("Gib list length mismatch!") + to_world(span_warning("Gib list length mismatch!")) return var/obj/effect/decal/cleanable/blood/gibs/gib = null diff --git a/code/game/objects/effects/landmarks_poi_vr.dm b/code/game/objects/effects/landmarks_poi_vr.dm index c46be055bd..0797705a69 100644 --- a/code/game/objects/effects/landmarks_poi_vr.dm +++ b/code/game/objects/effects/landmarks_poi_vr.dm @@ -21,7 +21,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/poi_loader) /obj/effect/landmark/poi_loader/proc/annihilate_bounds() //var/deleted_atoms = 0 - //admin_notice("Annihilating objects in poi loading location.", R_DEBUG) + //admin_notice(span_danger("Annihilating objects in poi loading location."), R_DEBUG) var/list/turfs_to_clean = get_turfs_to_clean() if(turfs_to_clean.len) for(var/x in 1 to 2) // Requires two passes to get everything. @@ -29,7 +29,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/poi_loader) for(var/atom/movable/AM in T) //++deleted_atoms qdel(AM) - //admin_notice("Annihilated [deleted_atoms] objects.", R_DEBUG) + //admin_notice(span_danger("Annihilated [deleted_atoms] objects."), R_DEBUG) /obj/effect/landmark/poi_loader/proc/load_poi() var/turf/T = get_turf(src) @@ -61,7 +61,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/poi_loader) if(!template_to_use) return - //admin_notice("Chosen Predefined PoI Map: [chosen_type.name]", R_DEBUG) + //admin_notice(span_danger("Chosen Predefined PoI Map: [chosen_type.name]"), R_DEBUG) if(remove_from_pool) global_used_pois[poi_type] -= template_to_use @@ -70,4 +70,4 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/poi_loader) annihilate_bounds() //CHECK_TICK //Don't let anything else happen for now // Actually load it - template_to_use.load(T) \ No newline at end of file + template_to_use.load(T) diff --git a/code/game/objects/effects/map_effects/portal.dm b/code/game/objects/effects/map_effects/portal.dm index 769c4bcc90..339314dc32 100644 --- a/code/game/objects/effects/map_effects/portal.dm +++ b/code/game/objects/effects/map_effects/portal.dm @@ -241,7 +241,7 @@ when portals are shortly lived, or when portals are made to be obvious with spec var/list/mobs_to_relay = in_range["mobs"] for(var/mob/mob as anything in mobs_to_relay) - var/rendered = "[text]" + var/rendered = span_message("[text]") mob.show_message(rendered) ..() @@ -250,7 +250,7 @@ when portals are shortly lived, or when portals are made to be obvious with spec /obj/effect/map_effect/portal/master/show_message(msg, type, alt, alt_type) if(!counterpart) return - var/rendered = "[msg]" + var/rendered = span_message("[msg]") var/turf/T = counterpart.get_focused_turf() var/list/in_range = get_mobs_and_objs_in_view_fast(T, world.view, 0) var/list/mobs_to_relay = in_range["mobs"] @@ -273,7 +273,7 @@ when portals are shortly lived, or when portals are made to be obvious with spec var/message = combined["formatted"] var/name_used = M.GetVoice() var/rendered = null - rendered = "[name_used] [message]" + rendered = span_game(span_say("[span_name(name_used)] [message]")) mob.show_message(rendered, 2) ..() diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index a4b5ba2d1f..ac2270e513 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -103,8 +103,8 @@ /obj/effect/mine/attackby(obj/item/W as obj, mob/living/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER)) panel_open = !panel_open - user.visible_message("[user] very carefully screws the mine's panel [panel_open ? "open" : "closed"].", - "You very carefully screw the mine's panel [panel_open ? "open" : "closed"].") + user.visible_message(span_warning("[user] very carefully screws the mine's panel [panel_open ? "open" : "closed"]."), + span_notice("You very carefully screw the mine's panel [panel_open ? "open" : "closed"].")) playsound(src, W.usesound, 50, 1) // Panel open, stay uncloaked, or uncloak if already cloaked. If you don't cloak on place, ignore it and just be normal alpha. @@ -310,9 +310,9 @@ /obj/item/mine/attackby(obj/item/W as obj, mob/living/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER) && trap) - to_chat(user, "You begin removing \the [trap].") + to_chat(user, span_notice("You begin removing \the [trap].")) if(do_after(user, 10 SECONDS)) - to_chat(user, "You finish disconnecting the mine's trigger.") + to_chat(user, span_notice("You finish disconnecting the mine's trigger.")) trap.forceMove(get_turf(src)) trap = null return diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 4870ee9b87..456b7fee80 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -68,9 +68,9 @@ // Todo: Add a version that gradually reaccumulates over time by means of alpha transparency. -Spades /obj/effect/overlay/snow/attackby(obj/item/W as obj, mob/user as mob) if (istype(W, /obj/item/shovel)) - user.visible_message("[user] begins to shovel away \the [src].") + user.visible_message(span_notice("[user] begins to shovel away \the [src].")) if(do_after(user, 40)) - to_chat(user, "You have finished shoveling!") + to_chat(user, span_notice("You have finished shoveling!")) qdel(src) return diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index de067a3991..b7d616a5f8 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -24,9 +24,9 @@ user.setClickCooldown(user.get_attack_speed(W)) if(LAZYLEN(W.attack_verb)) - visible_message("\The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]") + visible_message(span_warning("\The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]")) else - visible_message("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]") + visible_message(span_warning("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]")) var/damage = W.force / 4.0 @@ -44,12 +44,12 @@ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.do_attack_animation(src) if(prob(20)) - visible_message("\The [user] tries to stomp on \the [src], but misses!") + visible_message(span_warning("\The [user] tries to stomp on \the [src], but misses!")) var/list/nearby = oview(2, src) if(length(nearby)) walk_to(src, pick(nearby), 2) return - visible_message("\The [user] stomps \the [src] dead!") + visible_message(span_warning("\The [user] stomps \the [src] dead!")) die() /obj/effect/spider/bullet_act(var/obj/item/projectile/Proj) @@ -191,7 +191,7 @@ ..() /obj/effect/spider/spiderling/die() - visible_message("[src] dies!") + visible_message(span_alert("[src] dies!")) new /obj/effect/decal/cleanable/spiderling_remains(src.loc) ..() @@ -222,7 +222,7 @@ return if(prob(50)) - src.visible_message("You hear something squeezing through the ventilation ducts.",2) + src.visible_message(span_notice("You hear something squeezing through the ventilation ducts."),2) sleep(travel_time) if(!exit_vent || exit_vent.welded) @@ -246,14 +246,14 @@ if(!O.owner || O.owner.stat == DEAD || amount_grown > 80) O.implants -= src src.loc = O.owner ? O.owner.loc : O.loc - src.visible_message("\A [src] makes its way out of [O.owner ? "[O.owner]'s [O.name]" : "\the [O]"]!") + src.visible_message(span_warning("\A [src] makes its way out of [O.owner ? "[O.owner]'s [O.name]" : "\the [O]"]!")) if(O.owner) O.owner.apply_damage(1, BRUTE, O.organ_tag) else if(prob(1)) O.owner.apply_damage(1, TOX, O.organ_tag) if(world.time > last_itch + 30 SECONDS) last_itch = world.time - to_chat(O.owner, "Your [O.name] itches...") + to_chat(O.owner, span_notice("Your [O.name] itches...")) else if(prob(1)) src.visible_message("\The [src] skitters.") @@ -268,7 +268,7 @@ var/target_atom = pick(nearby) walk_to(src, target_atom, 5) if(prob(25)) - src.visible_message("\The [src] skitters[pick(" away"," around","")].") + src.visible_message(span_notice("\The [src] skitters[pick(" away"," around","")].")) else if(amount_grown < 75 && prob(5)) //vent crawl! for(var/obj/machinery/atmospherics/unary/vent_pump/v in view(7,src)) @@ -318,7 +318,7 @@ icon_state = pick("cocoon1","cocoon2","cocoon3") /obj/effect/spider/cocoon/Destroy() - src.visible_message("\The [src] splits open.") + src.visible_message(span_warning("\The [src] splits open.")) for(var/atom/movable/A in contents) A.loc = src.loc return ..() diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index 2c689d9cdd..bb5a84d9a8 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -257,7 +257,7 @@ var/global/list/tele_landmarks = list() // Terrible, but the alternative is loop /obj/effect/step_trigger/death/Trigger(var/atom/movable/A) if(isliving(A)) - to_chat(A, "[deathmessage]") + to_chat(A, span_danger("[deathmessage]")) log_and_message_admins("[A] [deathalert]") qdel(A) @@ -281,7 +281,7 @@ var/global/list/tele_landmarks = list() // Terrible, but the alternative is loop /obj/effect/step_trigger/warning/Trigger(var/atom/movable/A) if(isliving(A)) - to_chat(A, "[warningmessage]") + to_chat(A, span_warning("[warningmessage]")) /obj/effect/step_trigger/warning/train_edge warningmessage = "The wind billowing alongside the train is extremely strong here! Any movement could easily pull you down beneath the carriages, return to the train immediately!" diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 8dbc360f6f..ada0333fdc 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -236,10 +236,10 @@ if (user.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - to_chat(user, "You try to move your [temp.name], but cannot!") + to_chat(user, span_notice("You try to move your [temp.name], but cannot!")) return if(!temp) - to_chat(user, "You try to use your hand, but realize it is no longer attached!") + to_chat(user, span_notice("You try to use your hand, but realize it is no longer attached!")) return if(istype(src, /obj/item/holder)) var/obj/item/holder/D = src @@ -436,12 +436,12 @@ var/list/global/slot_flags_enumeration = list( if(slot_wear_id) if(!H.w_uniform && (slot_w_uniform in mob_equip)) if(!disable_warning) - to_chat(H, "You need a jumpsuit before you can attach this [name].") + to_chat(H, span_warning("You need a jumpsuit before you can attach this [name].")) return 0 if(slot_l_store, slot_r_store) if(!H.w_uniform && (slot_w_uniform in mob_equip)) if(!disable_warning) - to_chat(H, "You need a jumpsuit before you can attach this [name].") + to_chat(H, span_warning("You need a jumpsuit before you can attach this [name].")) return 0 if(slot_flags & SLOT_DENYPOCKET) return 0 @@ -450,11 +450,11 @@ var/list/global/slot_flags_enumeration = list( if(slot_s_store) if(!H.wear_suit && (slot_wear_suit in mob_equip)) if(!disable_warning) - to_chat(H, "You need a suit before you can attach this [name].") + to_chat(H, span_warning("You need a suit before you can attach this [name].")) return 0 if(!H.wear_suit.allowed) if(!disable_warning) - to_chat(usr, "You somehow have a suit with no defined allowed items for suit storage, stop that.") + to_chat(usr, span_warning("You somehow have a suit with no defined allowed items for suit storage, stop that.")) return 0 if( !(istype(src, /obj/item/pda) || istype(src, /obj/item/pen) || is_type_in_list(src, H.wear_suit.allowed)) ) return 0 @@ -480,7 +480,7 @@ var/list/global/slot_flags_enumeration = list( break if(!allow) if(!disable_warning) - to_chat(H, "You're not wearing anything you can attach this [name] to.") + to_chat(H, span_warning("You're not wearing anything you can attach this [name] to.")) return 0 return 1 @@ -511,23 +511,23 @@ var/list/global/slot_flags_enumeration = list( if(isanimal(usr)) //VOREStation Edit Start - Allows simple mobs with hands to use the pickup verb var/mob/living/simple_mob/s = usr if(!s.has_hands) - to_chat(usr, "You can't pick things up!") + to_chat(usr, span_warning("You can't pick things up!")) return else if((!istype(usr, /mob/living/carbon)) || (istype(usr, /mob/living/carbon/brain)))//Is humanoid, and is not a brain - to_chat(usr, "You can't pick things up!") + to_chat(usr, span_warning("You can't pick things up!")) return var/mob/living/L = usr if( usr.stat || usr.restrained() )//Is not asleep/dead and is not restrained - to_chat(usr, "You can't pick things up!") + to_chat(usr, span_warning("You can't pick things up!")) return if(src.anchored) //Object isn't anchored - to_chat(usr, "You can't pick that up!") + to_chat(usr, span_warning("You can't pick that up!")) return if(L.get_active_hand()) //Hand is not full //VOREStation Edit End - to_chat(usr, "Your hand is full.") + to_chat(usr, span_warning("Your hand is full.")) return if(!istype(src.loc, /turf)) //Object is on a turf - to_chat(usr, "You can't pick that up!") + to_chat(usr, span_warning("You can't pick that up!")) return //All checks are done, time to pick it up! usr.UnarmedAttack(src) @@ -562,11 +562,11 @@ var/list/global/slot_flags_enumeration = list( for(var/obj/item/protection in list(H.head, H.wear_mask, H.glasses)) if(protection && (protection.body_parts_covered & EYES)) // you can't stab someone in the eyes wearing a mask! - to_chat(user, "You're going to need to remove the eye covering first.") + to_chat(user, span_warning("You're going to need to remove the eye covering first.")) return if(!M.has_eyes()) - to_chat(user, "You cannot locate any eyes on [M]!") + to_chat(user, span_warning("You cannot locate any eyes on [M]!")) return //this should absolutely trigger even if not aim-impaired in some way @@ -586,7 +586,7 @@ var/list/global/slot_flags_enumeration = list( //if((CLUMSY in user.mutations) && prob(50)) // M = user /* - to_chat(M, "You stab yourself in the eye.") + to_chat(M, span_warning("You stab yourself in the eye.")) M.sdisabilities |= BLIND M.weakened += 4 M.adjustBruteLoss(10) @@ -598,30 +598,30 @@ var/list/global/slot_flags_enumeration = list( if(H != user) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("[M] has been stabbed in the eye with [src] by [user].", 1) - to_chat(M, "[user] stabs you in the eye with [src]!") - to_chat(user, "You stab [M] in the eye with [src]!") + O.show_message(span_danger("[M] has been stabbed in the eye with [src] by [user]."), 1) + to_chat(M, span_danger("[user] stabs you in the eye with [src]!")) + to_chat(user, span_danger("You stab [M] in the eye with [src]!")) else user.visible_message( \ - "[user] has stabbed themself with [src]!", \ - "You stab yourself in the eyes with [src]!" \ + span_danger("[user] has stabbed themself with [src]!"), \ + span_danger("You stab yourself in the eyes with [src]!") \ ) eyes.damage += rand(3,4) if(eyes.damage >= eyes.min_bruised_damage) if(M.stat != 2) if(!(eyes.robotic >= ORGAN_ROBOT)) //robot eyes bleeding might be a bit silly - to_chat(M, "Your eyes start to bleed profusely!") + to_chat(M, span_danger("Your eyes start to bleed profusely!")) if(prob(50)) if(M.stat != 2) - to_chat(M, "You drop what you're holding and clutch at your eyes!") + to_chat(M, span_warning("You drop what you're holding and clutch at your eyes!")) M.drop_item() M.eye_blurry += 10 M.Paralyse(1) M.Weaken(4) if (eyes.damage >= eyes.min_broken_damage) if(M.stat != 2) - to_chat(M, "You go blind!") + to_chat(M, span_warning("You go blind!")) var/obj/item/organ/external/affecting = H.get_organ(BP_HEAD) if(affecting.take_damage(7)) M:UpdateDamageIcon() @@ -685,7 +685,7 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type) /obj/item/proc/showoff(mob/user) for (var/mob/M in view(user)) - M.show_message("[user] holds up [src]. Take a closer look.",1) + M.show_message(span_filter_notice("[user] holds up [src]. Take a closer look."),1) /mob/living/carbon/verb/showoff() set name = "Show Held Item" @@ -722,13 +722,13 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. var/cannotzoom if((M.stat && !zoom) || !(istype(M,/mob/living/carbon/human))) - to_chat(M, "You are unable to focus through the [devicename].") + to_chat(M, span_filter_notice("You are unable to focus through the [devicename].")) cannotzoom = 1 else if(!zoom && (global_hud.darkMask[1] in M.client.screen)) - to_chat(M, "Your visor gets in the way of looking through the [devicename].") + to_chat(M, span_filter_notice("Your visor gets in the way of looking through the [devicename].")) cannotzoom = 1 else if(!zoom && M.get_active_hand() != src) - to_chat(M, "You are too distracted to look through the [devicename], perhaps if it was in your active hand this might work better.") + to_chat(M, span_filter_notice("You are too distracted to look through the [devicename], perhaps if it was in your active hand this might work better.")) cannotzoom = 1 //We checked above if they are a human and returned already if they weren't. @@ -759,7 +759,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. H.client.pixel_x = -viewoffset H.client.pixel_y = 0 - H.visible_message("[M] peers through the [zoomdevicename ? "[zoomdevicename] of the [src.name]" : "[src.name]"].") + H.visible_message(span_filter_notice("[M] peers through the [zoomdevicename ? "[zoomdevicename] of the [src.name]" : "[src.name]"].")) if(!ignore_visor_zoom_restriction) H.looking_elsewhere = TRUE H.handle_vision() @@ -777,7 +777,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. H.handle_vision() if(!cannotzoom) - M.visible_message("[zoomdevicename ? "[M] looks up from the [src.name]" : "[M] lowers the [src.name]"].") + M.visible_message(span_filter_notice("[zoomdevicename ? "[M] looks up from the [src.name]" : "[M] lowers the [src.name]"].")) return diff --git a/code/game/objects/items/antag_spawners.dm b/code/game/objects/items/antag_spawners.dm index 13c584aee5..974febc784 100644 --- a/code/game/objects/items/antag_spawners.dm +++ b/code/game/objects/items/antag_spawners.dm @@ -49,7 +49,7 @@ ghost_query_type = /datum/ghost_query/apprentice /obj/item/antag_spawner/technomancer_apprentice/attack_self(mob/user) - to_chat(user, "Teleporter attempting to lock on to your apprentice.") + to_chat(user, span_notice("Teleporter attempting to lock on to your apprentice.")) request_player() /obj/item/antag_spawner/technomancer_apprentice/request_player() @@ -60,7 +60,7 @@ ..() if(!used) icon_state = "oldshieldoff" - visible_message("The teleporter failed to find the apprentice. Perhaps another attempt could be made later?") + visible_message(span_warning("The teleporter failed to find the apprentice. Perhaps another attempt could be made later?")) /obj/item/antag_spawner/technomancer_apprentice/spawn_antag(client/C, turf/T) sparks.start() @@ -95,7 +95,7 @@ var/drone_type = null /obj/item/antag_spawner/syndicate_drone/attack_self(mob/user) - to_chat(user, "Teleporter attempting to lock on to an available unit.") + to_chat(user, span_notice("Teleporter attempting to lock on to an available unit.")) request_player() /obj/item/antag_spawner/syndicate_drone/request_player() @@ -106,14 +106,14 @@ ..() if(!used) icon_state = "oldshieldoff" - visible_message("The teleporter failed to find any available. Perhaps another attempt could be made later?") + visible_message(span_warning("The teleporter failed to find any available. Perhaps another attempt could be made later?")) /obj/item/antag_spawner/syndicate_drone/spawn_antag(client/C, turf/T) sparks.start() var/mob/living/silicon/robot/R = new drone_type(T) // Put this text here before ckey change so that their laws are shown below it, since borg login() shows it. - to_chat(C, "You are a Mercenary Drone, activated to serve your team.") + to_chat(C, span_notice("You are a Mercenary Drone, activated to serve your team.")) to_chat(C, "Be sure to examine your currently loaded lawset closely. It would be wise \ to speak with your team, and learn what their plan is for today.") @@ -132,4 +132,4 @@ drone_type = /mob/living/silicon/robot/syndicate/combat_medic /obj/item/antag_spawner/syndicate_drone/mechanist - drone_type = /mob/living/silicon/robot/syndicate/mechanist \ No newline at end of file + drone_type = /mob/living/silicon/robot/syndicate/mechanist diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index c84e011966..03dbae938a 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -18,17 +18,17 @@ var/turf/loc = get_turf(user) var/area/A = loc.loc if (!istype(loc, /turf/simulated/floor)) - to_chat(user, "APC cannot be placed on this spot.") + to_chat(user, span_warning("APC cannot be placed on this spot.")) return if (A.requires_power == 0 || istype(A, /area/space)) - to_chat(user, "APC cannot be placed in this area.") + to_chat(user, span_warning("APC cannot be placed in this area.")) return if (A.get_apc()) - to_chat(user, "This area already has an APC.") + to_chat(user, span_warning("This area already has an APC.")) return //only one APC per area for(var/obj/machinery/power/terminal/T in loc) if (T.master) - to_chat(user, "There is another network terminal here.") + to_chat(user, span_warning("There is another network terminal here.")) return else new /obj/item/stack/cable_coil(loc, 10) diff --git a/code/game/objects/items/bells.dm b/code/game/objects/items/bells.dm index bc54883aa8..a427123373 100644 --- a/code/game/objects/items/bells.dm +++ b/code/game/objects/items/bells.dm @@ -63,12 +63,12 @@ /obj/item/deskbell/proc/ring(mob/user) if(user.a_intent == "harm") playsound(src, 'sound/effects/deskbell_rude.ogg', 50, 1) - to_chat(user,"You hammer [src] rudely!") + to_chat(user,span_notice("You hammer [src] rudely!")) if (prob(2)) break_bell(user) else playsound(src, 'sound/effects/deskbell.ogg', 50, 1) - to_chat(user,"You gracefully ring [src].") + to_chat(user,span_notice("You gracefully ring [src].")) /obj/item/deskbell/proc/check_ability(mob/user) if (ishuman(user)) @@ -77,11 +77,11 @@ if (H.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - to_chat(H,"You try to move your [temp.name], but cannot!") + to_chat(H,span_notice("You try to move your [temp.name], but cannot!")) return 0 return 1 else - to_chat(user,"You are not able to ring [src].") + to_chat(user,span_notice("You are not able to ring [src].")) return 0 /obj/item/deskbell/attackby(obj/item/W, mob/user, params) @@ -90,7 +90,7 @@ if(W.has_tool_quality(TOOL_WRENCH) && isturf(loc)) if(do_after(5)) if(!src) return - to_chat(user, "You dissasemble the desk bell") + to_chat(user, span_notice("You dissasemble the desk bell")) new /obj/item/stack/material/steel(get_turf(src), 1) qdel(src) return @@ -99,5 +99,5 @@ /obj/item/deskbell/proc/break_bell(mob/user) - to_chat(user,"The ringing abruptly stops as [src]'s ringer gets jammed inside!") + to_chat(user,span_notice("The ringing abruptly stops as [src]'s ringer gets jammed inside!")) broken = 1 diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index b4b842bea2..84b8d743f6 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -58,19 +58,19 @@ switch(href_list["action"]) if ("create_area") if (!(get_area_type() & can_create_areas_in)) - to_chat(usr, "You can't make a new area here.") + to_chat(usr, span_danger("You can't make a new area here.")) interact() return create_area() if ("edit_area") if (!(get_area_type() & can_rename_areas_in)) - to_chat(usr, "You can't rename this area.") + to_chat(usr, span_danger("You can't rename this area.")) interact() return edit_area() if ("expand_area") if (!(get_area_type() & can_expand_areas_in)) - to_chat(usr, "You can't expand this area.") + to_chat(usr, span_danger("You can't expand this area.")) interact() return expand_area() @@ -128,20 +128,20 @@ if(!istype(res,/list)) switch(res) if(ROOM_ERR_SPACE) - to_chat(usr, "The new area must be completely airtight!") + to_chat(usr, span_warning("The new area must be completely airtight!")) return if(ROOM_ERR_TOOLARGE) - to_chat(usr, "The new area too large!") + to_chat(usr, span_warning("The new area too large!")) return else - to_chat(usr, "Error! Please notify administration!") + to_chat(usr, span_warning("Error! Please notify administration!")) return var/list/turf/turfs = res var/str = sanitizeSafe(tgui_input_text(usr, "New area name:","Blueprint Editing", "", MAX_NAME_LEN), MAX_NAME_LEN) if(!str || !length(str)) //cancel return if(length(str) > 50) - to_chat(usr, "Name too long.") + to_chat(usr, span_warning("Name too long.")) return var/area/A = new A.name = str @@ -166,13 +166,13 @@ if(!istype(res,/list)) switch(res) if(ROOM_ERR_SPACE) - to_chat(usr, "The new area must be completely airtight!") + to_chat(usr, span_warning("The new area must be completely airtight!")) return if(ROOM_ERR_TOOLARGE) - to_chat(usr, "The new area too large!") + to_chat(usr, span_warning("The new area too large!")) return else - to_chat(usr, "Error! Please notify administration!") + to_chat(usr, span_warning("Error! Please notify administration!")) return var/list/turf/turfs = res @@ -180,11 +180,11 @@ for(var/turf/T in A.contents) turfs -= T // Don't add turfs already in A to A if(turfs.len == 0) - to_chat(usr, "\The [A] already covers the entire room.") + to_chat(usr, span_warning("\The [A] already covers the entire room.")) return move_turfs_to_area(turfs, A) - to_chat(usr, "Expanded \the [A] by [turfs.len] turfs") + to_chat(usr, span_notice("Expanded \the [A] by [turfs.len] turfs")) spawn(5) interact() return @@ -200,11 +200,11 @@ if(!str || !length(str) || str==prevname) //cancel return if(length(str) > 50) - to_chat(usr, "Text too long.") + to_chat(usr, span_warning("Text too long.")) return set_area_machinery_title(A,str,prevname) A.name = str - to_chat(usr, "You set the area '[prevname]' title to '[str]'.") + to_chat(usr, span_notice("You set the area '[prevname]' title to '[str]'.")) interact() return @@ -280,7 +280,7 @@ // Remove any existing seeAreaColors_remove() - to_chat(usr, "\The [src] shows nearby areas in different colors.") + to_chat(usr, span_notice("\The [src] shows nearby areas in different colors.")) var/i = 0 for(var/area/A in range(usr)) if(get_area_type(A) == AREA_SPACE) @@ -302,13 +302,13 @@ if(!istype(res, /list)) switch(res) if(ROOM_ERR_SPACE) - to_chat(usr, "The new area must be completely airtight!") + to_chat(usr, span_warning("The new area must be completely airtight!")) return if(ROOM_ERR_TOOLARGE) - to_chat(usr, "The new area too large!") + to_chat(usr, span_warning("The new area too large!")) return else - to_chat(usr, "Error! Please notify administration!") + to_chat(usr, span_danger("Error! Please notify administration!")) return // Okay we got a room, lets color it seeAreaColors_remove() @@ -316,7 +316,7 @@ for(var/turf/T in res) usr << image(green, T, "blueprints", TURF_LAYER) areaColor_turfs += T - to_chat(usr, "The space covered by the new area is highlighted in green.") + to_chat(usr, span_notice("The space covered by the new area is highlighted in green.")) /obj/item/blueprints/verb/seeAreaColors_remove() set src in usr diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index 8b6b341b02..6f818f5897 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -503,11 +503,11 @@ if(!str || !length(str)) //cancel return if(length(str) > 50) - to_chat(creator, "Name too long.") + to_chat(creator, span_warning("Name too long.")) return for(var/area/A in world) //Check to make sure we're not making a duplicate name. Sanity. if(A.name == str) - to_chat(creator, "An area in the world alreay has this name.") + to_chat(creator, span_warning("An area in the world alreay has this name.")) return annoy_admins = 1 //They just made a new area entirely. newA = new area_choice @@ -552,16 +552,16 @@ if(!istype(res,/list)) switch(res) if(ROOM_ERR_SPACE) - to_chat(creator, "The new area must be completely airtight!") + to_chat(creator, span_warning("The new area must be completely airtight!")) return if(ROOM_ERR_TOOLARGE) - to_chat(creator, "The new area too large!") + to_chat(creator, span_warning("The new area too large!")) return if(ROOM_ERR_FORBIDDEN) - to_chat(creator, "There is an area forbidden from being edited here!") + to_chat(creator, span_warning("There is an area forbidden from being edited here!")) return else - to_chat(creator, "Error! Please notify administration!") + to_chat(creator, span_warning("Error! Please notify administration!")) return var/list/turf/turfs = res @@ -594,7 +594,7 @@ //They can select an area they want to turn their current area into. var/area_choice = tgui_input_list(creator, "What area do you want to turn the area YOU ARE CURRENTLY STANDING IN to? Or do you want to make a new area?", "Area Expansion", areas) if(isnull(area_choice)) //They pressed cancel. - to_chat(creator, "No changes made.") + to_chat(creator, span_warning("No changes made.")) return area_choice = areas[area_choice] @@ -602,23 +602,23 @@ if(!isarea(area_choice)) //They chose "New Area" if(!can_make_new_area && !can_override) - to_chat(creator, "Making a new area here would be meaningless. Renaming it would be a better option.") + to_chat(creator, span_warning("Making a new area here would be meaningless. Renaming it would be a better option.")) return str = tgui_input_text(creator, "New area name", "Blueprint Editing", max_length = MAX_NAME_LEN) str = sanitize(str,MAX_NAME_LEN) if(!str || !length(str)) //cancel return if(length(str) > 50) - to_chat(creator, "Name too long.") + to_chat(creator, span_warning("Name too long.")) return for(var/area/A in world) //Check to make sure we're not making a duplicate name. Sanity. if(A.name == str) - to_chat(creator, "An area in the world alreay has this name.") + to_chat(creator, span_warning("An area in the world alreay has this name.")) return var/confirm = tgui_alert(creator, "Are you sure you want to change [oldA.name] into a new area named [str]?", "READ CAREFULLY", list("No", "Yes")) if(confirm != "Yes") - to_chat(creator, "No changes made.") + to_chat(creator, span_warning("No changes made.")) return newA = new area_choice @@ -627,7 +627,7 @@ else var/confirm = tgui_alert(creator, "Are you sure you want to change [oldA.name] into [area_choice]?", "READ CAREFULLY", list("No", "Yes")) if(confirm != "Yes") - to_chat(creator, "No changes made.") + to_chat(creator, span_warning("No changes made.")) return newA = area_choice //They selected to turn the area they're standing on into the selected area. @@ -718,13 +718,13 @@ if(!istype(res, /list)) switch(res) if(ROOM_ERR_SPACE) - to_chat(usr, "The new area must be completely airtight!") + to_chat(usr, span_warning("The new area must be completely airtight!")) return if(ROOM_ERR_TOOLARGE) - to_chat(usr, "The new area too large!") + to_chat(usr, span_warning("The new area too large!")) return else - to_chat(usr, "Error! Please notify administration!") + to_chat(usr, span_danger("Error! Please notify administration!")) return // Okay we got a room, lets color it seeAreaColors_remove() @@ -732,7 +732,7 @@ for(var/turf/T in res) usr << image(green, T, "blueprints", TURF_LAYER) areaColor_turfs += T - to_chat(usr, "The space covered by the new area is highlighted in green.") + to_chat(usr, span_notice("The space covered by the new area is highlighted in green.")) /obj/item/areaeditor/verb/seeAreaColors() set src in usr @@ -742,7 +742,7 @@ // Remove any existing seeAreaColors_remove() - to_chat(usr, "\The [src] shows nearby areas in different colors.") + to_chat(usr, span_notice("\The [src] shows nearby areas in different colors.")) var/i = 0 for(var/area/A in range(usr)) if(get_area_type(A) == AREA_SPACE) @@ -787,11 +787,11 @@ set src in usr if(created_area) - to_chat(usr, "This paper has already been used to create an area.") + to_chat(usr, span_warning("This paper has already been used to create an area.")) return if(usr.stat || world.time < area_cooldown) - to_chat(usr, "You recently used this paper to try to create an area. Wait one minute before using it again.") + to_chat(usr, span_warning("You recently used this paper to try to create an area. Wait one minute before using it again.")) return area_cooldown = world.time + 600 //Anti spam. @@ -867,16 +867,16 @@ if(!istype(res,/list)) switch(res) if(1) - to_chat(creator, "The new area too large! You can only have an area that is up to 70 tiles.") + to_chat(creator, span_warning("The new area too large! You can only have an area that is up to 70 tiles.")) return if(2) - to_chat(creator, "The new area must be completely airtight and not be part of a shuttle!") + to_chat(creator, span_warning("The new area must be completely airtight and not be part of a shuttle!")) return if(3) - to_chat(creator, "There is an area not permitted to be built in somewhere in the room!") + to_chat(creator, span_warning("There is an area not permitted to be built in somewhere in the room!")) return else - to_chat(creator, "Error! Please notify administration!") + to_chat(creator, span_warning("Error! Please notify administration!")) return var/list/turf/turfs = res @@ -896,17 +896,17 @@ //They can select an area they want to turn their current area into. str = sanitizeSafe(tgui_input_text(usr, "What would you like to name the area?", "Area Name", null, MAX_NAME_LEN), MAX_NAME_LEN) if(isnull(str)) //They pressed cancel. - to_chat(creator, "No new area made. Cancelling.") + to_chat(creator, span_warning("No new area made. Cancelling.")) return if(!str || !length(str)) //sanity - to_chat(creator, "No new area made. Cancelling.") + to_chat(creator, span_warning("No new area made. Cancelling.")) return if(length(str) > MAX_NAME_LEN) - to_chat(creator, "Name too long.") + to_chat(creator, span_warning("Name too long.")) return for(var/area/A in world) //Check to make sure we're not making a duplicate name. Sanity. if(A.name == str) - to_chat(creator, "An area in the world alreay has this name.") + to_chat(creator, span_warning("An area in the world alreay has this name.")) return newA = new /area newA.setup(str) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 6b7432b6e7..37ce647226 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -216,9 +216,9 @@ /obj/structure/closet/body_bag/cryobag/examine(mob/user) . = ..() if(Adjacent(user)) //The bag's rather thick and opaque from a distance. - . += "You peer into \the [src]." + . += span_info("You peer into \the [src].") if(syringe) - . += "It has a syringe added to it." + . += span_info("It has a syringe added to it.") for(var/mob/living/L in contents) . += L.examine(user) @@ -233,10 +233,10 @@ else if(istype(W,/obj/item/reagent_containers/syringe)) if(syringe) - to_chat(user,"\The [src] already has an injector! Remove it first.") + to_chat(user,span_warning("\The [src] already has an injector! Remove it first.")) else var/obj/item/reagent_containers/syringe/syringe = W - to_chat(user,"You insert \the [syringe] into \the [src], and it locks into place.") + to_chat(user,span_info("You insert \the [syringe] into \the [src], and it locks into place.")) user.unEquip(syringe) src.syringe = syringe syringe.loc = null @@ -247,10 +247,10 @@ else if(W.has_tool_quality(TOOL_SCREWDRIVER)) if(syringe) if(used) - to_chat(user,"The injector cannot be removed now that the stasis bag has been used!") + to_chat(user,span_warning("The injector cannot be removed now that the stasis bag has been used!")) else syringe.forceMove(src.loc) - to_chat(user,"You pry \the [syringe] out of \the [src].") + to_chat(user,span_info("You pry \the [syringe] out of \the [src].")) syringe = null else diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index c4518f9311..05cd09f6d5 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -84,7 +84,7 @@ if(!istype(W, /obj/item/glass_extra/straw) && !istype(W, /obj/item/reagent_containers/rollingpaper)) return ..() - user.visible_message("[user] snorts [src] with [W]!") + user.visible_message(span_warning("[user] snorts [src] with [W]!")) playsound(loc, 'sound/effects/snort.ogg', 50, 1) if(reagents) @@ -93,4 +93,4 @@ if(!reagents.total_volume) /// Did we use all of it? qdel(src) -////// End powder. ///////// \ No newline at end of file +////// End powder. ///////// diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index d1f9d81489..1d579f13ef 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -107,7 +107,7 @@ if(uses) uses-- if(!uses) - to_chat(user, "You used up your crayon!") + to_chat(user, span_warning("You used up your crayon!")) qdel(src) return @@ -119,7 +119,7 @@ if(uses) uses -= 5 if(uses <= 0) - to_chat(user, "You ate your crayon!") + to_chat(user, span_warning("You ate your crayon!")) qdel(src) else ..() @@ -205,7 +205,7 @@ if(uses) uses -= 5 if(uses <= 0) - to_chat(user, "You ate the marker!") + to_chat(user, span_warning("You ate the marker!")) qdel(src) else ..() diff --git a/code/game/objects/items/devices/advnifrepair.dm b/code/game/objects/items/devices/advnifrepair.dm index 80fe193025..df6e56d218 100644 --- a/code/game/objects/items/devices/advnifrepair.dm +++ b/code/game/objects/items/devices/advnifrepair.dm @@ -25,11 +25,11 @@ if(istype(W,/obj/item/stack/nanopaste)) var/obj/item/stack/nanopaste/np = W if((supply.get_free_space() >= efficiency) && np.use(1)) - to_chat(user, "You convert some nanopaste into programmed nanites inside \the [src].") + to_chat(user, span_notice("You convert some nanopaste into programmed nanites inside \the [src].")) supply.add_reagent(id = "nifrepairnanites", amount = efficiency) update_icon() else if(supply.get_free_space() < efficiency) - to_chat(user, "\The [src] is too full. Empty it into a container first.") + to_chat(user, span_warning("\The [src] is too full. Empty it into a container first.")) return /obj/item/nifrepairer/update_icon() @@ -43,15 +43,15 @@ return 0 if(!supply || !supply.total_volume) - to_chat(user, "[src] is empty. Feed it nanopaste.") + to_chat(user, span_warning("[src] is empty. Feed it nanopaste.")) return 1 if(!target.reagents.get_free_space()) - to_chat(user, "[target] is already full.") + to_chat(user, span_warning("[target] is already full.")) return 1 var/trans = supply.trans_to(target, 15) - to_chat(user, "You transfer [trans] units of the programmed nanites to [target].") + to_chat(user, span_notice("You transfer [trans] units of the programmed nanites to [target].")) update_icon() return 1 @@ -59,6 +59,6 @@ . = ..() if(Adjacent(user)) if(supply.total_volume) - . += "\The [src] contains [supply.total_volume] units of programmed nanites, ready for dispensing." + . += span_notice("\The [src] contains [supply.total_volume] units of programmed nanites, ready for dispensing.") else - . += "\The [src] is empty and ready to accept nanopaste." + . += span_notice("\The [src] is empty and ready to accept nanopaste.") diff --git a/code/game/objects/items/devices/ai_detector.dm b/code/game/objects/items/devices/ai_detector.dm index c34065c1d1..0f6ea01343 100644 --- a/code/game/objects/items/devices/ai_detector.dm +++ b/code/game/objects/items/devices/ai_detector.dm @@ -94,13 +94,13 @@ if(new_state != old_state) switch(new_state) if(PROXIMITY_OFF_CAMERANET) - to_chat(carrier, "[icon2html(src, carrier.client)] Now outside of camera network.") + to_chat(carrier, span_notice("[icon2html(src, carrier.client)] Now outside of camera network.")) carrier << 'sound/machines/defib_failed.ogg' if(PROXIMITY_NONE) - to_chat(carrier, "[icon2html(src, carrier.client)] Now within camera network, AI and cameras unfocused.") + to_chat(carrier, span_notice("[icon2html(src, carrier.client)] Now within camera network, AI and cameras unfocused.")) carrier << 'sound/machines/defib_safetyOff.ogg' if(PROXIMITY_NEAR) - to_chat(carrier, "[icon2html(src, carrier.client)] Warning: AI focus at nearby location.") + to_chat(carrier, span_warning("[icon2html(src, carrier.client)] Warning: AI focus at nearby location.")) carrier << 'sound/machines/defib_SafetyOn.ogg' if(PROXIMITY_ON_SCREEN) to_chat(carrier, "[icon2html(src, carrier.client)] Alert: AI or camera focused at current location!") diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index db05b23c19..bc7257e03f 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -74,12 +74,12 @@ INVOKE_ASYNC(src, PROC_REF(wipe_ai)) if("radio") carded_ai.aiRadio.disabledAi = !carded_ai.aiRadio.disabledAi - to_chat(carded_ai, "Your Subspace Transceiver has been [carded_ai.aiRadio.disabledAi ? "disabled" : "enabled"]!") - to_chat(user, "You [carded_ai.aiRadio.disabledAi ? "disable" : "enable"] the AI's Subspace Transceiver.") + to_chat(carded_ai, span_warning("Your Subspace Transceiver has been [carded_ai.aiRadio.disabledAi ? "disabled" : "enabled"]!")) + to_chat(user, span_notice("You [carded_ai.aiRadio.disabledAi ? "disable" : "enable"] the AI's Subspace Transceiver.")) if("wireless") carded_ai.control_disabled = !carded_ai.control_disabled - to_chat(carded_ai, "Your wireless interface has been [carded_ai.control_disabled ? "disabled" : "enabled"]!") - to_chat(user, "You [carded_ai.control_disabled ? "disable" : "enable"] the AI's wireless interface.") + to_chat(carded_ai, span_warning("Your wireless interface has been [carded_ai.control_disabled ? "disabled" : "enabled"]!")) + to_chat(user, span_notice("You [carded_ai.control_disabled ? "disable" : "enable"] the AI's wireless interface.")) if(carded_ai.control_disabled && carded_ai.deployed_shell) carded_ai.disconnect_shell("Disconnecting from remote shell due to [src] wireless access interface being disabled.") update_icon() @@ -153,13 +153,13 @@ /obj/item/aicard/see_emote(mob/living/M, text) if(carded_ai && carded_ai.client) - var/rendered = "[text]" + var/rendered = span_message("[text]") carded_ai.show_message(rendered, 2) ..() /obj/item/aicard/show_message(msg, type, alt, alt_type) if(carded_ai && carded_ai.client) - var/rendered = "[msg]" + var/rendered = span_message("[msg]") carded_ai.show_message(rendered, type) ..() diff --git a/code/game/objects/items/devices/body_snatcher_vr.dm b/code/game/objects/items/devices/body_snatcher_vr.dm index 8228572ca1..04293a21a7 100644 --- a/code/game/objects/items/devices/body_snatcher_vr.dm +++ b/code/game/objects/items/devices/body_snatcher_vr.dm @@ -18,15 +18,15 @@ usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(ishuman(M) || issilicon(M)) //Allows body swapping with humans, synths, and pAI's/borgs since they all have a mind. if(usr == M) - to_chat(user," A message pops up on the LED display, informing you that you that the mind transfer to yourself was successful... Wait, did that even do anything?") + to_chat(user,span_warning(" A message pops up on the LED display, informing you that you that the mind transfer to yourself was successful... Wait, did that even do anything?")) return if(!M.mind) //Do they have a mind? - to_chat(usr,"A warning pops up on the device, informing you that [M] appears braindead.") + to_chat(usr,span_warning("A warning pops up on the device, informing you that [M] appears braindead.")) return if(!M.allow_mind_transfer) - to_chat(usr,"The target's mind is too complex to be affected!") + to_chat(usr,span_danger("The target's mind is too complex to be affected!")) return if(ishuman(M)) @@ -36,17 +36,17 @@ return if(M.stat == DEAD) //Are they dead? - to_chat(usr,"A warning pops up on the device, informing you that [M] is dead, and, as such, the mind transfer can not be done.") + to_chat(usr,span_warning("A warning pops up on the device, informing you that [M] is dead, and, as such, the mind transfer can not be done.")) return var/choice = tgui_alert(usr,"This will swap your mind with the target's mind. This will result in them controlling your body, and you controlling their body. Continue?","Confirmation",list("Continue","Cancel")) if(choice == "Continue" && usr.get_active_hand() == src && usr.Adjacent(M)) - usr.visible_message("[usr] pushes the device up their forehead and [M]'s head, the device beginning to let out a series of light beeps!","You begin swap minds with [M]!") + usr.visible_message(span_warning("[usr] pushes the device up their forehead and [M]'s head, the device beginning to let out a series of light beeps!"),span_notice("You begin swap minds with [M]!")) if(do_after(usr,35 SECONDS,M)) if(usr.mind && M.mind && M.stat != DEAD && usr.stat != DEAD) log_and_message_admins("[usr.ckey] used a Bodysnatcher to swap bodies with [M.ckey]") - to_chat(usr,"Your minds have been swapped! Have a nice day.") + to_chat(usr,span_notice("Your minds have been swapped! Have a nice day.")) var/datum/mind/user_mind = user.mind var/datum/mind/prey_mind = M.mind var/target_ooc_notes = M.ooc_notes @@ -80,8 +80,8 @@ M.slurring = 50 else - to_chat(user," A warning pops up on the LED display on the side of the device, informing you that the target is not able to have their mind swapped with!") + to_chat(user,span_warning(" A warning pops up on the LED display on the side of the device, informing you that the target is not able to have their mind swapped with!")) /obj/item/bodysnatcher/attack_self(mob/living/user) - to_chat(user," A message pops up on the LED display, informing you that you that the mind transfer to yourself was successful... Wait, did that even do anything?") + to_chat(user,span_warning(" A message pops up on the LED display, informing you that you that the mind transfer to yourself was successful... Wait, did that even do anything?")) return diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index d6c53d5c1b..5d3ec6f594 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -33,7 +33,7 @@ if(!active_dummy) if(istype(target,/obj/item) && !istype(target, /obj/item/disk/nuclear)) playsound(src, 'sound/weapons/flash.ogg', 100, 1, -6) - to_chat(user, "Scanned [target].") + to_chat(user, span_notice("Scanned [target].")) saved_item = target.type saved_icon = target.icon saved_icon_state = target.icon_state @@ -46,7 +46,7 @@ playsound(src, 'sound/effects/pop.ogg', 100, 1, -6) qdel(active_dummy) active_dummy = null - to_chat(usr, "You deactivate the [src].") + to_chat(usr, span_notice("You deactivate the [src].")) var/obj/effect/overlay/T = new /obj/effect/overlay(get_turf(src)) T.icon = 'icons/effects/effects.dmi' flick("emppulse",T) @@ -58,7 +58,7 @@ var/obj/effect/dummy/chameleon/C = new /obj/effect/dummy/chameleon(usr.loc) C.activate(O, usr, saved_icon, saved_icon_state, saved_overlays, src) qdel(O) - to_chat(usr, "You activate the [src].") + to_chat(usr, span_notice("You activate the [src].")) var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) T.icon = 'icons/effects/effects.dmi' flick("emppulse",T) @@ -105,22 +105,22 @@ /obj/effect/dummy/chameleon/attackby() for(var/mob/M in src) - to_chat(M, "Your chameleon-projector deactivates.") + to_chat(M, span_warning("Your chameleon-projector deactivates.")) master.disrupt() /obj/effect/dummy/chameleon/attack_hand() for(var/mob/M in src) - to_chat(M, "Your chameleon-projector deactivates.") + to_chat(M, span_warning("Your chameleon-projector deactivates.")) master.disrupt() /obj/effect/dummy/chameleon/ex_act() for(var/mob/M in src) - to_chat(M, "Your chameleon-projector deactivates.") + to_chat(M, span_warning("Your chameleon-projector deactivates.")) master.disrupt() /obj/effect/dummy/chameleon/bullet_act() for(var/mob/M in src) - to_chat(M, "Your chameleon-projector deactivates.") + to_chat(M, span_warning("Your chameleon-projector deactivates.")) ..() master.disrupt() diff --git a/code/game/objects/items/devices/communicator/UI_tgui.dm b/code/game/objects/items/devices/communicator/UI_tgui.dm index 7d8c3e339f..33cf9408c0 100644 --- a/code/game/objects/items/devices/communicator/UI_tgui.dm +++ b/code/game/objects/items/devices/communicator/UI_tgui.dm @@ -360,7 +360,7 @@ if("dial") if(!get_connection_to_tcomms()) - to_chat(usr, "Error: Cannot connect to Exonet node.") + to_chat(usr, span_danger("Error: Cannot connect to Exonet node.")) return FALSE var/their_address = params["dial"] exonet.send_message(their_address, "voice") @@ -373,7 +373,7 @@ if("message") if(!get_connection_to_tcomms()) - to_chat(usr, "Error: Cannot connect to Exonet node.") + to_chat(usr, span_danger("Error: Cannot connect to Exonet node.")) return FALSE var/their_address = params["message"] var/text = sanitizeSafe(tgui_input_text(usr,"Enter your message.","Text Message")) @@ -382,7 +382,7 @@ im_list += list(list("address" = exonet.address, "to_address" = their_address, "im" = text)) log_pda("(COMM: [src]) sent \"[text]\" to [exonet.get_atom_from_address(their_address)]", usr) var/obj/item/communicator/comm = exonet.get_atom_from_address(their_address) - to_chat(usr, "[icon2html(src, usr.client)] Sent message to [istype(comm, /obj/item/communicator) ? comm.owner : comm.name], \"[text]\" (Reply)") + to_chat(usr, span_notice("[icon2html(src, usr.client)] Sent message to [istype(comm, /obj/item/communicator) ? comm.owner : comm.name], \"[text]\" (Reply)")) for(var/mob/M in player_list) if(M.stat == DEAD && M.client?.prefs?.read_preference(/datum/preference/toggle/ghost_ears)) if(istype(M, /mob/new_player) || M.forbid_seeing_deadchat) diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm index 84b63746b0..1894443e67 100644 --- a/code/game/objects/items/devices/communicator/communicator.dm +++ b/code/game/objects/items/devices/communicator/communicator.dm @@ -144,19 +144,19 @@ var/global/list/obj/item/communicator/all_communicators = list() . = ..() for(var/mob/living/voice/voice in contents) - . += "On the screen, you can see a image feed of [voice]." + . += span_notice("On the screen, you can see a image feed of [voice].") if(voice && voice.key) switch(voice.stat) if(CONSCIOUS) if(!voice.client) - . += "[voice] appears to be asleep." //afk + . += span_warning("[voice] appears to be asleep.") //afk if(UNCONSCIOUS) - . += "[voice] doesn't appear to be conscious." + . += span_warning("[voice] doesn't appear to be conscious.") if(DEAD) - . += "[voice] appears to have died..." //Hopefully this never has to be used. + . += span_deadsay("[voice] appears to have died...") //Hopefully this never has to be used. else - . += "The device doesn't appear to be transmitting any data." + . += span_notice("The device doesn't appear to be transmitting any data.") // Proc: emp_act() // Parameters: None @@ -221,12 +221,12 @@ var/global/list/obj/item/communicator/all_communicators = list() if(istype(C, /obj/item/card/id)) var/obj/item/card/id/idcard = C if(!idcard.registered_name || !idcard.assignment) - to_chat(user, "\The [src] rejects the ID.") + to_chat(user, span_notice("\The [src] rejects the ID.")) else if(!owner) - to_chat(user, "\The [src] rejects the ID.") + to_chat(user, span_notice("\The [src] rejects the ID.")) else if(owner == idcard.registered_name) occupation = idcard.assignment - to_chat(user, "Occupation updated.") + to_chat(user, span_notice("Occupation updated.")) return @@ -302,7 +302,7 @@ var/global/list/obj/item/communicator/all_communicators = list() /obj/item/communicator/Destroy() for(var/mob/living/voice/voice in contents) voice_mobs.Remove(voice) - to_chat(voice, "[icon2html(src, voice.client)] Connection timed out with remote host.") + to_chat(voice, span_danger("[icon2html(src, voice.client)] Connection timed out with remote host.")) qdel(voice) close_connection(reason = "Connection timed out") diff --git a/code/game/objects/items/devices/communicator/messaging.dm b/code/game/objects/items/devices/communicator/messaging.dm index b3528dc82c..b05560dc1f 100644 --- a/code/game/objects/items/devices/communicator/messaging.dm +++ b/code/game/objects/items/devices/communicator/messaging.dm @@ -44,7 +44,7 @@ random = random / 10 exonet.send_message(origin_address, "64 bytes received from [exonet.address] ecmp_seq=1 ttl=51 time=[random] ms") if(message == "text") - to_chat(src, "[icon2html(origin_atom,src.client)] Received text message from [origin_atom]: \"[text]\"") + to_chat(src, span_notice("[icon2html(origin_atom,src.client)] Received text message from [origin_atom]: \"[text]\"")) src << 'sound/machines/defib_safetyOff.ogg' exonet_messages.Add("From [origin_atom]:
[text]") return @@ -95,7 +95,7 @@ L = loc if(L) - to_chat(L, "[icon2html(src,L.client)] Message from [who]: \"[text]\" (Reply)") + to_chat(L, span_notice("[icon2html(src,L.client)] Message from [who]: \"[text]\" (Reply)")) // This is the only Topic the communicators really uses /obj/item/communicator/Topic(href, href_list) @@ -108,7 +108,7 @@ exonet.send_message(comm.exonet.address, "text", message) im_list += list(list("address" = exonet.address, "to_address" = comm.exonet.address, "im" = message)) log_pda("(COMM: [src]) sent \"[message]\" to [exonet.get_atom_from_address(comm.exonet.address)]", usr) - to_chat(usr, "[icon2html(src,usr.client)] Sent message to [istype(comm, /obj/item/communicator) ? comm.owner : comm.name], \"[message]\" (Reply)") + to_chat(usr, span_notice("[icon2html(src,usr.client)] Sent message to [istype(comm, /obj/item/communicator) ? comm.owner : comm.name], \"[message]\" (Reply)")) // Verb: text_communicator() // Parameters: None @@ -119,7 +119,7 @@ set desc = "If there is a communicator available, send a text message to it." if(ticker.current_state < GAME_STATE_PLAYING) - to_chat(src, "The game hasn't started yet!") + to_chat(src, span_danger("The game hasn't started yet!")) return if (!src.stat) @@ -130,7 +130,7 @@ for(var/mob/living/L in mob_list) //Simple check so you don't have dead people calling. if(src.client.prefs.real_name == L.real_name) - to_chat(src, "Your identity is already present in the game world. Please load in a different character first.") + to_chat(src, span_danger("Your identity is already present in the game world. Please load in a different character first.")) return var/obj/machinery/exonet_node/E = get_exonet_node() @@ -146,7 +146,7 @@ choices.Add(comm) if(!choices.len) - to_chat(src, "There are no available communicators, sorry.") + to_chat(src, span_danger("There are no available communicators, sorry.")) return var/choice = tgui_input_list(src,"Send a text message to whom?", "Recipient Choice", choices) @@ -157,7 +157,7 @@ if(text_message && O.exonet) O.exonet.send_message(chosen_communicator.exonet.address, "text", text_message) - to_chat(src, "You have sent '[text_message]' to [chosen_communicator].") + to_chat(src, span_notice("You have sent '[text_message]' to [chosen_communicator].")) exonet_messages.Add("To [chosen_communicator]:
[text_message]") log_pda("(DCOMM: [src]) sent \"[text_message]\" to [chosen_communicator]", src) for(var/mob/M in player_list) diff --git a/code/game/objects/items/devices/communicator/phone.dm b/code/game/objects/items/devices/communicator/phone.dm index 07bd4d0c49..c16bae02b7 100644 --- a/code/game/objects/items/devices/communicator/phone.dm +++ b/code/game/objects/items/devices/communicator/phone.dm @@ -39,15 +39,15 @@ comm.voice_requests.Remove(src) if(user) - comm.visible_message("[icon2html(src,viewers(src))] Connecting to [src].") - to_chat(user, "[icon2html(src,user.client)] Attempting to call [comm].") + comm.visible_message(span_notice("[icon2html(src,viewers(src))] Connecting to [src].")) + to_chat(user, span_notice("[icon2html(src,user.client)] Attempting to call [comm].")) sleep(10) - to_chat(user, "[icon2html(src,user.client)] Dialing internally from [station_name()], [system_name()].") + to_chat(user, span_notice("[icon2html(src,user.client)] Dialing internally from [station_name()], [system_name()].")) sleep(20) //If they don't have an exonet something is very wrong and we want a runtime. - to_chat(user, "[icon2html(src,user.client)] Connection re-routed to [comm] at [comm.exonet.address].") + to_chat(user, span_notice("[icon2html(src,user.client)] Connection re-routed to [comm] at [comm.exonet.address].")) sleep(40) - to_chat(user, "[icon2html(src,user.client)] Connection to [comm] at [comm.exonet.address] established.") - comm.visible_message("[icon2html(src,viewers(src))] Connection to [src] at [exonet.address] established.") + to_chat(user, span_notice("[icon2html(src,user.client)] Connection to [comm] at [comm.exonet.address] established.")) + comm.visible_message(span_notice("[icon2html(src,viewers(src))] Connection to [src] at [exonet.address] established.")) sleep(20) src.add_communicating(comm) @@ -86,28 +86,28 @@ //Now for some connection fluff. if(user) - to_chat(user, "[icon2html(src,user.client)] Connecting to [candidate].") - to_chat(new_voice, "[icon2html(src,new_voice.client)] Attempting to call [src].") + to_chat(user, span_notice("[icon2html(src,user.client)] Connecting to [candidate].")) + to_chat(new_voice, span_notice("[icon2html(src,new_voice.client)] Attempting to call [src].")) sleep(10) - to_chat(new_voice, "[icon2html(src,new_voice.client)] Dialing to [station_name()], Kara Subsystem, [system_name()].") + to_chat(new_voice, span_notice("[icon2html(src,new_voice.client)] Dialing to [station_name()], Kara Subsystem, [system_name()].")) sleep(20) - to_chat(new_voice, "[icon2html(src,new_voice.client)] Connecting to [station_name()] telecommunications array.") + to_chat(new_voice, span_notice("[icon2html(src,new_voice.client)] Connecting to [station_name()] telecommunications array.")) sleep(40) - to_chat(new_voice, "[icon2html(src,new_voice.client)] Connection to [station_name()] telecommunications array established. Redirecting signal to [src].") + to_chat(new_voice, span_notice("[icon2html(src,new_voice.client)] Connection to [station_name()] telecommunications array established. Redirecting signal to [src].")) sleep(20) //We're connected, no need to hide everything. new_voice.client.screen.Remove(blackness) qdel(blackness) - to_chat(new_voice, "[icon2html(src,new_voice.client)] Connection to [src] established.") + to_chat(new_voice, span_notice("[icon2html(src,new_voice.client)] Connection to [src] established.")) to_chat(new_voice, "To talk to the person on the other end of the call, just talk normally.") to_chat(new_voice, "If you want to end the call, use the 'Hang Up' verb. The other person can also hang up at any time.") to_chat(new_voice, "Remember, your character does not know anything you've learned from observing!") if(new_voice.mind) new_voice.mind.assigned_role = JOB_DISEMBODIED_VOICE if(user) - to_chat(user, "[icon2html(src,new_voice.client)] Your communicator is now connected to [candidate]'s communicator.") + to_chat(user, span_notice("[icon2html(src,new_voice.client)] Your communicator is now connected to [candidate]'s communicator.")) // Proc: close_connection() // Parameters: 3 (user - the user who initiated the disconnect, target - the mob or device being disconnected, reason - string shown when disconnected) @@ -120,8 +120,8 @@ for(var/mob/living/voice/voice in voice_mobs) //Handle ghost-callers if(target && voice != target) //If no target is inputted, it deletes all of them. continue - to_chat(voice, "[icon2html(src,voice.client)] [reason].") - visible_message("[icon2html(src,viewers(src))] [reason].") + to_chat(voice, span_danger("[icon2html(src,voice.client)] [reason].")) + visible_message(span_danger("[icon2html(src,viewers(src))] [reason].")) voice_mobs.Remove(voice) qdel(voice) update_icon() @@ -131,8 +131,8 @@ continue src.del_communicating(comm) comm.del_communicating(src) - comm.visible_message("[icon2html(src,viewers(src))] [reason].") - visible_message("[icon2html(src,viewers(src))] [reason].") + comm.visible_message(span_danger("[icon2html(src,viewers(src))] [reason].")) + visible_message(span_danger("[icon2html(src,viewers(src))] [reason].")) if(comm.camera && video_source == comm.camera) //We hung up on the person on video end_video() if(camera && comm.video_source == camera) //We hung up on them while they were watching us @@ -174,7 +174,7 @@ L = loc if(L) - to_chat(L, "[icon2html(src,L.client)] Communications request from [who].") + to_chat(L, span_notice("[icon2html(src,L.client)] Communications request from [who].")) // Proc: del_request() // Parameters: 1 (candidate - the ghost or communicator to be declined) @@ -184,7 +184,7 @@ return if(isobserver(candidate)) - to_chat(candidate, "Your communicator call request was declined.") + to_chat(candidate, span_warning("Your communicator call request was declined.")) else if(istype(candidate, /obj/item/communicator)) var/obj/item/communicator/comm = candidate comm.voice_invites -= src @@ -197,7 +197,7 @@ us = loc if(us) - to_chat(us, "[icon2html(src,us.client)] Declined request.") + to_chat(us, span_notice("[icon2html(src,us.client)] Declined request.")) // Proc: see_emote() // Parameters: 2 (M - the mob the emote originated from, text - the emote's contents) @@ -250,7 +250,7 @@ var/message = combined["formatted"] var/name_used = M.GetVoice() var/rendered = null - rendered = "[icon2html(src,mobs_to_relay)] [name_used] [message]" + rendered = span_game(span_say("[icon2html(src,mobs_to_relay)] [span_name(name_used)] [message]")) mob.show_message(rendered, 2) // Proc: show_message() @@ -277,7 +277,7 @@ set desc = "If there is a communicator available, send a request to speak through it. This will reset your respawn timer, if someone picks up." if(ticker.current_state < GAME_STATE_PLAYING) - to_chat(src, "The game hasn't started yet!") + to_chat(src, span_danger("The game hasn't started yet!")) return if (!src.stat) @@ -291,12 +291,12 @@ return if(config.antag_hud_restricted && has_enabled_antagHUD == 1) - to_chat(src, "You have used the antagHUD and cannot respawn or use communicators!") + to_chat(src, span_danger("You have used the antagHUD and cannot respawn or use communicators!")) return for(var/mob/living/L in mob_list) //Simple check so you don't have dead people calling. if(src.client.prefs.real_name == L.real_name) - to_chat(src, "Your identity is already present in the game world. Please load in a different character first.") + to_chat(src, span_danger("Your identity is already present in the game world. Please load in a different character first.")) return var/obj/machinery/exonet_node/E = get_exonet_node() @@ -312,7 +312,7 @@ choices.Add(comm) if(!choices.len) - to_chat(src , "There are no available communicators, sorry.") + to_chat(src , span_danger("There are no available communicators, sorry.")) return var/choice = tgui_input_list(src,"Send a voice request to whom?", "Recipient Choice", choices) @@ -331,23 +331,23 @@ if((!user) || (!comm) || user.stat) return //KO or dead, or already in a video if(video_source) //Already in a video - to_chat(user, "You are already connected to a video call!") + to_chat(user, span_danger("You are already connected to a video call!")) return if(user.blinded) //User is blinded - to_chat(user, "You cannot see well enough to do that!") + to_chat(user, span_danger("You cannot see well enough to do that!")) return if(!(src in comm.communicating) || !comm.camera) //You called someone with a broken communicator or one that's fake or yourself or something - to_chat(user, "[icon2html(src, user.client)]ERROR: Video failed. Either bandwidth is too low, or the other communicator is malfunctioning.") + to_chat(user, span_danger("[icon2html(src, user.client)]ERROR: Video failed. Either bandwidth is too low, or the other communicator is malfunctioning.")) return - to_chat(user, "[icon2html(src, user.client)] Attempting to start video over existing call.") + to_chat(user, span_notice("[icon2html(src, user.client)] Attempting to start video over existing call.")) sleep(30) - to_chat(user, "[icon2html(src, user.client)] Please wait...") + to_chat(user, span_notice("[icon2html(src, user.client)] Please wait...")) video_source = comm.camera - comm.visible_message("[icon2html(src,viewers(src))] New video connection from [comm].") + comm.visible_message(span_danger("[icon2html(src,viewers(src))] New video connection from [comm].")) update_active_camera_screen() RegisterSignal(video_source, COMSIG_OBSERVER_MOVED, PROC_REF(update_active_camera_screen)) video_source.AddComponent(/datum/component/recursive_move) @@ -361,7 +361,7 @@ show_static() video_source = null - . = "[bicon(src)] [reason ? reason : "Video session ended"]." + . = span_danger("[bicon(src)] [reason ? reason : "Video session ended"].") visible_message(.) update_icon() diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index 9dc8364cf0..c9f4ba3494 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -25,21 +25,21 @@ if(istype(O, /obj/machinery/power/apc)) var/obj/machinery/power/apc/A = O if(A.emagged || A.hacker) - to_chat(user, "There is a software error with the device.") + to_chat(user, span_warning("There is a software error with the device.")) else - to_chat(user, "The device's software appears to be fine.") + to_chat(user, span_notice("The device's software appears to be fine.")) return 1 if(istype(O, /obj/machinery/door)) var/obj/machinery/door/D = O if(D.operating == -1) - to_chat(user, "There is a software error with the device.") + to_chat(user, span_warning("There is a software error with the device.")) else - to_chat(user, "The device's software appears to be fine.") + to_chat(user, span_notice("The device's software appears to be fine.")) return 1 else if(istype(O, /obj/machinery)) var/obj/machinery/A = O if(A.emagged) - to_chat(user, "There is a software error with the device.") + to_chat(user, span_warning("There is a software error with the device.")) else - to_chat(user, "The device's software appears to be fine.") + to_chat(user, span_notice("The device's software appears to be fine.")) return 1 diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm index 72167f294f..8cfecb2485 100644 --- a/code/game/objects/items/devices/defib.dm +++ b/code/game/objects/items/devices/defib.dm @@ -87,13 +87,13 @@ reattach_paddles(user) else if(istype(W, /obj/item/cell)) if(bcell) - to_chat(user, "\The [src] already has a cell.") + to_chat(user, span_notice("\The [src] already has a cell.")) else if(!user.unEquip(W)) return W.forceMove(src) bcell = W - to_chat(user, "You install a cell in \the [src].") + to_chat(user, span_notice("You install a cell in \the [src].")) update_icon() else if(W.has_tool_quality(TOOL_SCREWDRIVER)) @@ -101,7 +101,7 @@ bcell.update_icon() bcell.forceMove(get_turf(src.loc)) bcell = null - to_chat(user, "You remove the cell from \the [src].") + to_chat(user, span_notice("You remove the cell from \the [src].")) update_icon() else return ..() @@ -120,7 +120,7 @@ var/mob/living/carbon/human/user = usr if(!paddles) - to_chat(user, "The paddles are missing!") + to_chat(user, span_warning("The paddles are missing!")) return if(paddles.loc != src) @@ -128,10 +128,10 @@ return if(!slot_check()) - to_chat(user, "You need to equip [src] before taking out [paddles].") + to_chat(user, span_warning("You need to equip [src] before taking out [paddles].")) else if(!usr.put_in_hands(paddles)) //Detach the paddles into the user's hands - to_chat(user, "You need a free hand to hold the paddles!") + to_chat(user, span_warning("You need a free hand to hold the paddles!")) update_icon() //success //checks that the base unit is in the correct slot to be used @@ -163,7 +163,7 @@ if(ismob(paddles.loc)) var/mob/M = paddles.loc if(M.drop_from_inventory(paddles, src)) - to_chat(user, "\The [paddles] snap back into the main unit.") + to_chat(user, span_notice("\The [paddles] snap back into the main unit.")) else paddles.forceMove(src) @@ -258,13 +258,13 @@ if(busy) return 0 if(!check_charge(chargecost)) - to_chat(user, "\The [src] doesn't have enough charge left to do that.") + to_chat(user, span_warning("\The [src] doesn't have enough charge left to do that.")) return 0 if(!wielded && !isrobot(user)) - to_chat(user, "You need to wield the paddles with both hands before you can use them on someone!") + to_chat(user, span_warning("You need to wield the paddles with both hands before you can use them on someone!")) return 0 if(cooldown) - to_chat(user, "\The [src] are re-energizing!") + to_chat(user, span_warning("\The [src] are re-energizing!")) return 0 return 1 @@ -390,10 +390,10 @@ ghost.notify_revive("Someone is trying to resuscitate you. Re-enter your body if you want to be revived!", 'sound/effects/genetics.ogg', source = src) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process - user.visible_message("\The [user] begins to place [src] on [H]'s chest.", "You begin to place [src] on [H]'s chest...") + user.visible_message(span_warning("\The [user] begins to place [src] on [H]'s chest."), span_warning("You begin to place [src] on [H]'s chest...")) if(!do_after(user, 30, H)) return - user.visible_message("\The [user] places [src] on [H]'s chest.", "You place [src] on [H]'s chest.") + user.visible_message("\The [user] places [src] on [H]'s chest.", span_warning("You place [src] on [H]'s chest.")) playsound(src, 'sound/machines/defib_charge.ogg', 50, 0) var/error = can_defib(H) @@ -415,7 +415,7 @@ playsound(src, 'sound/machines/defib_failed.ogg', 50, 0) return - H.visible_message("\The [H]'s body convulses a bit.") + H.visible_message(span_warning("\The [H]'s body convulses a bit.")) playsound(src, "bodyfall", 50, 1) playsound(src, 'sound/machines/defib_zap.ogg', 50, 1, -1) set_cooldown(cooldowntime) @@ -447,19 +447,19 @@ /obj/item/shockpaddles/proc/do_electrocute(mob/living/carbon/human/H, mob/user, var/target_zone) var/obj/item/organ/external/affecting = H.get_organ(target_zone) if(!affecting) - to_chat(user, "They are missing that body part!") + to_chat(user, span_warning("They are missing that body part!")) return //no need to spend time carefully placing the paddles, we're just trying to shock them - user.visible_message("\The [user] slaps [src] onto [H]'s [affecting.name].", "You overcharge [src] and slap them onto [H]'s [affecting.name].") + user.visible_message(span_danger("\The [user] slaps [src] onto [H]'s [affecting.name]."), span_danger("You overcharge [src] and slap them onto [H]'s [affecting.name].")) //Just stop at awkwardly slapping electrodes on people if the safety is enabled if(safety) - to_chat(user, "You can't do that while the safety is enabled.") + to_chat(user, span_warning("You can't do that while the safety is enabled.")) return playsound(src, 'sound/machines/defib_charge.ogg', 50, 0) - audible_message("\The [src] lets out a steadily rising hum...", runemessage = "whines") + audible_message(span_warning("\The [src] lets out a steadily rising hum..."), runemessage = "whines") if(!do_after(user, chargetime, H)) return @@ -470,7 +470,7 @@ playsound(src, 'sound/machines/defib_failed.ogg', 50, 0) return - user.visible_message("\The [user] shocks [H] with \the [src]!", "You shock [H] with \the [src]!") + user.visible_message(span_danger("\The [user] shocks [H] with \the [src]!"), span_warning("You shock [H] with \the [src]!")) playsound(src, 'sound/machines/defib_zap.ogg', 100, 1, -1) playsound(src, 'sound/weapons/Egloves.ogg', 100, 1, -1) set_cooldown(cooldowntime) @@ -536,12 +536,12 @@ /obj/item/shockpaddles/emag_act(mob/user) if(safety) safety = 0 - to_chat(user, "You silently disable \the [src]'s safety protocols with the cryptographic sequencer.") + to_chat(user, span_warning("You silently disable \the [src]'s safety protocols with the cryptographic sequencer.")) update_icon() return 1 else safety = 1 - to_chat(user, "You silently enable \the [src]'s safety protocols with the cryptographic sequencer.") + to_chat(user, span_notice("You silently enable \the [src]'s safety protocols with the cryptographic sequencer.")) update_icon() return 1 @@ -653,7 +653,7 @@ if(2) new_fail = max(fail_counter, 8) if(ismob(loc)) - to_chat(loc, "\The [src] feel pleasantly warm.") + to_chat(loc, span_warning("\The [src] feel pleasantly warm.")) if(new_fail && !fail_counter) START_PROCESSING(SSobj, src) diff --git a/code/game/objects/items/devices/denecrotizer_vr.dm b/code/game/objects/items/devices/denecrotizer_vr.dm index 053e3a5ff6..f386f80cb5 100644 --- a/code/game/objects/items/devices/denecrotizer_vr.dm +++ b/code/game/objects/items/devices/denecrotizer_vr.dm @@ -44,7 +44,7 @@ if(!ghostjoin) return ..() if(jobban_isbanned(user, JOB_GHOSTROLES)) - to_chat(user, "You cannot inhabit this creature because you are banned from playing ghost roles.") + to_chat(user, span_warning("You cannot inhabit this creature because you are banned from playing ghost roles.")) return if(!evaluate_ghost_join(user)) return ..() @@ -77,11 +77,11 @@ ghostjoin = FALSE ghostjoin_icon() if(capture_caught) - to_chat(src, "You are bound to [revivedby], follow their commands within reason and to the best of your abilities, and avoid betraying or abandoning them. You are allied with [revivedby]. Do not attack anyone for no reason. Of course, you may do scenes as you like, but you must still respect preferences.") + to_chat(src, span_notice("You are bound to [revivedby], follow their commands within reason and to the best of your abilities, and avoid betraying or abandoning them. You are allied with [revivedby]. Do not attack anyone for no reason. Of course, you may do scenes as you like, but you must still respect preferences.")) visible_message("[src]'s eyes flicker with a curious intelligence.", runemessage = "looks around") return if(revivedby != "no one") - to_chat(src, "Where once your life had been rough and scary, you have been assisted by [revivedby]. They seem to be the reason you are on your feet again... so perhaps you should help them out. Being as you were revived, you are allied with the station. Do not attack anyone unless they are threatening the one who revived you. And try to listen to the one who revived you within reason. Of course, you may do scenes as you like, but you must still respect preferences.") + to_chat(src, span_notice("Where once your life had been rough and scary, you have been assisted by [revivedby]. They seem to be the reason you are on your feet again... so perhaps you should help them out. Being as you were revived, you are allied with the station. Do not attack anyone unless they are threatening the one who revived you. And try to listen to the one who revived you within reason. Of course, you may do scenes as you like, but you must still respect preferences.")) visible_message("[src]'s eyes flicker with a curious intelligence.", runemessage = "looks around") /// Evaluate someone for being allowed to join as this mob from being a ghost @@ -92,15 +92,15 @@ // At this point we can at least send them messages as to why they can't join, since they are a mob with a client if(!ghostjoin) - to_chat(D, "Sorry, [src] is no longer ghost-joinable.") + to_chat(D, span_notice("Sorry, [src] is no longer ghost-joinable.")) return FALSE if(ckey) - to_chat(D, "Sorry, someone else has already inhabited [src].") + to_chat(D, span_notice("Sorry, someone else has already inhabited [src].")) return FALSE if(capture_caught && !D.client.prefs.capture_crystal) - to_chat(D, "Sorry, [src] is participating in capture mechanics, and your preferences do not allow for that.") + to_chat(D, span_notice("Sorry, [src] is participating in capture mechanics, and your preferences do not allow for that.")) return FALSE // Insert whatever ban checks you want here if we ever add simplemob bans @@ -124,9 +124,9 @@ var/cooldowntime = round((cooldown - (world.time - last_used)) * 0.1) if(Adjacent(user)) if(cooldowntime <= 0) - . += "The screen indicates that this device is ready to be used, and that it has enough energy for [charges] uses." + . += span_notice("The screen indicates that this device is ready to be used, and that it has enough energy for [charges] uses.") else - . += "The screen indicates that this device can be used again in [cooldowntime] seconds, and that it has enough energy for [charges] uses." + . += span_notice("The screen indicates that this device can be used again in [cooldowntime] seconds, and that it has enough energy for [charges] uses.") /obj/item/denecrotizer/proc/check_target(mob/living/simple_mob/target, mob/living/user) if(!target.Adjacent(user)) @@ -135,23 +135,23 @@ user.visible_message("[user] bonks [target] with [src].", runemessage = "bonks [target]") return FALSE if(!istype(target)) - to_chat(user, "[target] seems to be too complicated for [src] to interface with.") + to_chat(user, span_notice("[target] seems to be too complicated for [src] to interface with.")) return FALSE if(!(world.time - last_used > cooldown)) - to_chat(user, "[src] doesn't seem to be ready yet.") + to_chat(user, span_notice("[src] doesn't seem to be ready yet.")) return FALSE if(!charges) - to_chat(user, "[src] doesn't seem to be active anymore.") + to_chat(user, span_notice("[src] doesn't seem to be active anymore.")) return FALSE if(!target.ic_revivable) - to_chat(user, "[src] doesn't seem to interface with [target].") + to_chat(user, span_notice("[src] doesn't seem to interface with [target].")) return FALSE if(target.stat != DEAD) if(!advanced) - to_chat(user, "[src] doesn't seem to work on that.") + to_chat(user, span_notice("[src] doesn't seem to work on that.")) return FALSE if(target.ai_holder.retaliate || target.ai_holder.hostile) // You can be friends with still living mobs if they are passive I GUESS - to_chat(user, "[src] doesn't seem to work on that.") + to_chat(user, span_notice("[src] doesn't seem to work on that.")) return FALSE if(!target.mind) user.visible_message("[user] gently presses [src] to [target]...", runemessage = "presses [src] to [target]") @@ -170,7 +170,7 @@ update_icon() return FALSE else - to_chat(user, "[src] doesn't seem to work on that.") + to_chat(user, span_notice("[src] doesn't seem to work on that.")) return FALSE return TRUE diff --git a/code/game/objects/items/devices/e_beacon.dm b/code/game/objects/items/devices/e_beacon.dm index fe9631133c..6e3e15985d 100644 --- a/code/game/objects/items/devices/e_beacon.dm +++ b/code/game/objects/items/devices/e_beacon.dm @@ -17,17 +17,17 @@ var/T = user.loc if(!beacon_active) if(!isturf(T)) - to_chat(user,"You cannot activate the beacon when you are not on a turf!") + to_chat(user,span_warning("You cannot activate the beacon when you are not on a turf!")) return else if(isnonsolidturf(T)) - to_chat(user,"You cannot activate the beacon when you are not on sufficiently solid ground!") + to_chat(user,span_warning("You cannot activate the beacon when you are not on sufficiently solid ground!")) return else var/answer = tgui_alert(user, "Would you like to activate this personal emergency beacon?","\The [src]", list("Yes", "No")) if(answer != "Yes") return else if(do_after(user, (3 SECONDS))) //short delay, so they can still abort if they want to - user.visible_message("[user] activates \the [src]!","You activate \the [src], spiking it into the ground!") + user.visible_message(span_warning("[user] activates \the [src]!"),span_warning("You activate \the [src], spiking it into the ground!")) beacon_active = TRUE icon_state = "e_beacon_active" user.drop_item() @@ -48,7 +48,7 @@ /obj/item/emergency_beacon/attack_hand(mob/user) if(beacon_active) - to_chat(user,"The beacon is already active and cannot be moved!") + to_chat(user,span_warning("The beacon is already active and cannot be moved!")) return . = ..() diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index aec8caab0d..fa5e7056bf 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -40,13 +40,13 @@ /obj/item/flash/attackby(var/obj/item/W, var/mob/user) if(W.has_tool_quality(TOOL_SCREWDRIVER) && broken) if(repairing) - to_chat(user, "\The [src] is already being repaired!") + to_chat(user, span_notice("\The [src] is already being repaired!")) return user.visible_message("\The [user] starts trying to repair \the [src]'s bulb.") repairing = TRUE if(do_after(user, (40 SECONDS + rand(0, 20 SECONDS)) * W.toolspeed) && can_repair) if(prob(30)) - user.visible_message("\The [user] successfully repairs \the [src]!") + user.visible_message(span_notice("\The [user] successfully repairs \the [src]!")) broken = FALSE update_icon() playsound(src, W.usesound, 50, 1) @@ -87,7 +87,7 @@ /obj/item/flash/proc/clown_check(var/mob/user) if(user && (CLUMSY in user.mutations) && prob(50)) - to_chat(user, "\The [src] slips out of your hand.") + to_chat(user, span_warning("\The [src] slips out of your hand.")) user.drop_item() return 0 return 1 @@ -128,7 +128,7 @@ if(prob( max(0, times_used - safe_flashes) * 2 + (times_used >= safe_flashes)) && can_break) //if you use it 10 times in a minute it has a 30% chance to break. broken = TRUE if(user) - to_chat(user, "The bulb has burnt out!") + to_chat(user, span_warning("The bulb has burnt out!")) update_icon() return FALSE else @@ -138,7 +138,7 @@ else if(!charge_only) //can only use it 10 times a minute, unless it runs purely on charge. if(user) update_icon() - to_chat(user, "click") + to_chat(user, span_warning("click")) playsound(src, 'sound/weapons/empty.ogg', 80, 1) return FALSE else if(battery && battery.checked_use(charge_cost + (round(charge_cost / 4) * max(0, times_used - max_flashes)))) // Using over your maximum flashes starts taking more charge per added flash. @@ -157,7 +157,7 @@ if(!clown_check(user)) return if(broken) - to_chat(user, "\The [src] is broken.") + to_chat(user, span_warning("\The [src] is broken.")) return flash_recharge() @@ -226,14 +226,14 @@ flick("flash2", src) if(!issilicon(M)) - user.visible_message("[user] blinds [M] with the flash!") + user.visible_message(span_disarm("[user] blinds [M] with the flash!")) else - user.visible_message("[user] overloads [M]'s sensors with the flash!") + user.visible_message(span_notice("[user] overloads [M]'s sensors with the flash!")) M.Weaken(rand(5,10)) else - user.visible_message("[user] fails to blind [M] with the flash!") + user.visible_message(span_notice("[user] fails to blind [M] with the flash!")) return @@ -246,7 +246,7 @@ user.setClickCooldown(user.get_attack_speed(src)) if(broken) - user.show_message("The [src.name] is broken", 2) + user.show_message(span_warning("The [src.name] is broken"), 2) return flash_recharge() @@ -289,7 +289,7 @@ //C.Weaken(10) C.flash_eyes() for(var/mob/M in viewers(C, null)) - M.show_message("[C] is blinded by the flash!") + M.show_message(span_disarm("[C] is blinded by the flash!")) ..() /obj/item/flash/synthetic @@ -305,14 +305,14 @@ ..() if(!broken) broken = 1 - to_chat(user, "The bulb has burnt out!") + to_chat(user, span_warning("The bulb has burnt out!")) update_icon() /obj/item/flash/synthetic/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) ..() if(!broken) broken = 1 - to_chat(user, "The bulb has burnt out!") + to_chat(user, span_warning("The bulb has burnt out!")) update_icon() /obj/item/flash/robot diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 91f6c4eccc..be96b59506 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -56,7 +56,7 @@ if(power_usage) if(cell.use(power_usage) != power_usage) // we weren't able to use our full power_usage amount! - visible_message("\The [src] flickers before going dull.") + visible_message(span_warning("\The [src] flickers before going dull.")) playsound(src, 'sound/effects/sparks3.ogg', 10, 1, -3) //Small cue that your light went dull in your pocket. //VOREStation Edit on = 0 update_brightness() @@ -119,7 +119,7 @@ if(istype(H)) for(var/obj/item/clothing/C in list(H.head,H.wear_mask,H.glasses)) if(istype(C) && (C.body_parts_covered & EYES)) - to_chat(user, "You're going to need to remove [C.name] first.") + to_chat(user, span_warning("You're going to need to remove [C.name] first.")) return var/obj/item/organ/vision @@ -127,34 +127,34 @@ vision = H.internal_organs_by_name[H.species.vision_organ] if(!vision) user.visible_message("\The [user] directs [src] at [M]'s face.", \ - "You direct [src] at [M]'s face.") - to_chat(user, "You can't find any [H.species.vision_organ ? H.species.vision_organ : "eyes"] on [H]!") + span_notice("You direct [src] at [M]'s face.")) + to_chat(user, span_warning("You can't find any [H.species.vision_organ ? H.species.vision_organ : "eyes"] on [H]!")) user.setClickCooldown(user.get_attack_speed(src)) return user.visible_message("\The [user] directs [src] to [M]'s eyes.", \ - "You direct [src] to [M]'s eyes.") + span_notice("You direct [src] to [M]'s eyes.")) if(H != user) //can't look into your own eyes buster if(M.stat == DEAD || M.blinded) //mob is dead or fully blind - to_chat(user, "\The [M]'s pupils do not react to the light!") + to_chat(user, span_warning("\The [M]'s pupils do not react to the light!")) return if(XRAY in M.mutations) - to_chat(user, "\The [M] pupils give an eerie glow!") + to_chat(user, span_notice("\The [M] pupils give an eerie glow!")) if(vision.is_bruised()) - to_chat(user, "There's visible damage to [M]'s [vision.name]!") + to_chat(user, span_warning("There's visible damage to [M]'s [vision.name]!")) else if(M.eye_blurry) - to_chat(user, "\The [M]'s pupils react slower than normally.") + to_chat(user, span_notice("\The [M]'s pupils react slower than normally.")) if(M.getBrainLoss() > 15) - to_chat(user, "There's visible lag between left and right pupils' reactions.") + to_chat(user, span_notice("There's visible lag between left and right pupils' reactions.")) var/list/pinpoint = list("oxycodone"=1,"tramadol"=5) var/list/dilating = list("bliss"=5,"ambrosia_extract"=5,"mindbreaker"=1) if(M.reagents.has_any_reagent(pinpoint) || H.ingested.has_any_reagent(pinpoint)) - to_chat(user, "\The [M]'s pupils are already pinpoint and cannot narrow any more.") + to_chat(user, span_notice("\The [M]'s pupils are already pinpoint and cannot narrow any more.")) else if(M.reagents.has_any_reagent(dilating) || H.ingested.has_any_reagent(dilating)) - to_chat(user, "\The [M]'s pupils narrow slightly, but are still very dilated.") + to_chat(user, span_notice("\The [M]'s pupils narrow slightly, but are still very dilated.")) else - to_chat(user, "\The [M]'s pupils narrow.") + to_chat(user, span_notice("\The [M]'s pupils narrow.")) user.setClickCooldown(user.get_attack_speed(src)) //can be used offensively M.flash_eyes() @@ -167,7 +167,7 @@ cell.update_icon() user.put_in_hands(cell) cell = null - to_chat(user, "You remove the cell from the [src].") + to_chat(user, span_notice("You remove the cell from the [src].")) playsound(src, 'sound/machines/button.ogg', 30, 1, 0) on = 0 update_brightness() @@ -216,13 +216,13 @@ user.drop_item() W.loc = src cell = W - to_chat(user, "You install a cell in \the [src].") + to_chat(user, span_notice("You install a cell in \the [src].")) playsound(src, 'sound/machines/button.ogg', 30, 1, 0) update_brightness() else - to_chat(user, "\The [src] already has a cell.") + to_chat(user, span_notice("\The [src] already has a cell.")) else - to_chat(user, "\The [src] cannot use that type of cell.") + to_chat(user, span_notice("\The [src] cannot use that type of cell.")) else ..() @@ -387,7 +387,7 @@ // Usual checks if(!fuel) - to_chat(user, "It's out of fuel.") + to_chat(user, span_notice("It's out of fuel.")) return if(on) return @@ -395,7 +395,7 @@ . = ..() // All good, turn it on. if(.) - user.visible_message("[user] activates the flare.", "You pull the cord on the flare, activating it!") + user.visible_message(span_notice("[user] activates the flare."), span_notice("You pull the cord on the flare, activating it!")) src.force = on_damage src.damtype = "fire" START_PROCESSING(SSobj, src) @@ -444,14 +444,14 @@ /obj/item/flashlight/glowstick/attack_self(mob/user) if(!fuel) - to_chat(user, "The glowstick has already been turned on.") + to_chat(user, span_notice("The glowstick has already been turned on.")) return if(on) return . = ..() if(.) - user.visible_message("[user] cracks and shakes \the [name].", "You crack and shake \the [src], turning it on!") + user.visible_message(span_notice("[user] cracks and shakes \the [name]."), span_notice("You crack and shake \the [src], turning it on!")) START_PROCESSING(SSobj, src) /obj/item/flashlight/glowstick/red diff --git a/code/game/objects/items/devices/floor_painter.dm b/code/game/objects/items/devices/floor_painter.dm index 2b36cd97b8..7999cc9639 100644 --- a/code/game/objects/items/devices/floor_painter.dm +++ b/code/game/objects/items/devices/floor_painter.dm @@ -49,11 +49,11 @@ var/turf/simulated/floor/F = A if(!istype(F)) - to_chat(user, "\The [src] can only be used on station flooring.") + to_chat(user, span_warning("\The [src] can only be used on station flooring.")) return if(!F.flooring || !F.flooring.can_paint || F.broken || F.burnt) - to_chat(user, "\The [src] cannot paint broken or missing tiles.") + to_chat(user, span_warning("\The [src] cannot paint broken or missing tiles.")) return var/list/decal_data = decals[decal] @@ -67,11 +67,11 @@ config_error = 1 if(config_error) - to_chat(user, "\The [src] flashes an error light. You might need to reconfigure it.") + to_chat(user, span_warning("\The [src] flashes an error light. You might need to reconfigure it.")) return if(F.decals && F.decals.len > 5 && painting_decal != /obj/effect/floor_decal/reset) - to_chat(user, "\The [F] has been painted too much; you need to clear it off.") + to_chat(user, span_warning("\The [F] has been painted too much; you need to clear it off.")) return var/painting_dir = 0 @@ -130,7 +130,7 @@ var/new_colour = input(usr, "Choose a colour.", name, paint_colour) as color|null if(new_colour && new_colour != paint_colour) paint_colour = new_colour - to_chat(usr, "You set \the [src] to paint with a new colour.") + to_chat(usr, span_notice("You set \the [src] to paint with a new colour.")) /obj/item/floor_painter/verb/choose_decal() set name = "Choose Decal" @@ -144,7 +144,7 @@ var/new_decal = tgui_input_list(usr, "Select a decal:", "Decal Choice", decals) if(new_decal && !isnull(decals[new_decal])) decal = new_decal - to_chat(usr, "You set \the [src] decal to '[decal]'.") + to_chat(usr, span_notice("You set \the [src] decal to '[decal]'.")) /obj/item/floor_painter/verb/choose_direction() set name = "Choose Direction" @@ -158,4 +158,4 @@ var/new_dir = tgui_input_list(usr, "Select a direction:", "Direction Choice", paint_dirs) if(new_dir && !isnull(paint_dirs[new_dir])) paint_dir = new_dir - to_chat(usr, "You set \the [src] direction to '[paint_dir]'.") + to_chat(usr, span_notice("You set \the [src] direction to '[paint_dir]'.")) diff --git a/code/game/objects/items/devices/geiger.dm b/code/game/objects/items/devices/geiger.dm index f6e1427c81..781550e612 100644 --- a/code/game/objects/items/devices/geiger.dm +++ b/code/game/objects/items/devices/geiger.dm @@ -35,7 +35,7 @@ /obj/item/geiger/examine(mob/user) . = ..() get_radiation() - . += "[scanning ? "Ambient" : "Stored"] radiation level: [radiation_count ? radiation_count : "0"]Bq." + . += span_warning("[scanning ? "Ambient" : "Stored"] radiation level: [radiation_count ? radiation_count : "0"]Bq.") /obj/item/geiger/rad_act(amount) if(!amount || !scanning) @@ -66,7 +66,7 @@ STOP_PROCESSING(SSobj, src) update_icon() update_sound() - to_chat(user, "[icon2html(src, user.client)] You switch [scanning ? "on" : "off"] \the [src].") + to_chat(user, span_notice("[icon2html(src, user.client)] You switch [scanning ? "on" : "off"] \the [src].")) /obj/item/geiger/update_icon() if(!scanning) @@ -121,7 +121,7 @@ scanning = !scanning update_icon() update_sound() - to_chat(user, "[icon2html(src, user.client)] You switch [scanning ? "on" : "off"] \the [src].") + to_chat(user, span_notice("[icon2html(src, user.client)] You switch [scanning ? "on" : "off"] \the [src].")) /obj/item/geiger/wall/update_icon() if(!scanning) diff --git a/code/game/objects/items/devices/hacktool.dm b/code/game/objects/items/devices/hacktool.dm index 1ddb7d894b..61d9505474 100644 --- a/code/game/objects/items/devices/hacktool.dm +++ b/code/game/objects/items/devices/hacktool.dm @@ -52,23 +52,23 @@ if(istype(A, /obj/machinery/door/airlock)) var/obj/machinery/door/airlock/D = A if(!D.arePowerSystemsOn()) - to_chat(user, "No response from remote, check door power.") + to_chat(user, span_warning("No response from remote, check door power.")) else if(D.locked == TRUE && full_override == FALSE) - to_chat(user, "Unable to override door bolts!") + to_chat(user, span_warning("Unable to override door bolts!")) else if(D.locked == TRUE && full_override == TRUE && D.arePowerSystemsOn()) - to_chat(user, "Door bolts overridden.") + to_chat(user, span_notice("Door bolts overridden.")) D.unlock() else if(D.density == TRUE && D.locked == FALSE) - to_chat(user, "Overriding access. Door opening.") + to_chat(user, span_notice("Overriding access. Door opening.")) D.open() else if(D.density == FALSE && D.locked == FALSE) - to_chat(user, "Overriding access. Door closing.") + to_chat(user, span_notice("Overriding access. Door closing.")) D.close() return 1 /obj/item/multitool/hacktool/proc/attempt_hack(var/mob/user, var/atom/target) if(is_hacking) - to_chat(user, "You are already hacking!") + to_chat(user, span_warning("You are already hacking!")) return 0 if(!is_type_in_list(target, supported_types)) to_chat(user, "[icon2html(src, user.client)] Unable to hack this target, invalid target type.") @@ -77,9 +77,9 @@ if(istype(target, /obj/structure/closet/crate/secure)) var/obj/structure/closet/crate/secure/A = target if(A.locked) - to_chat(user, "Overriding access. Stand by.") + to_chat(user, span_notice("Overriding access. Stand by.")) if(do_after(user, (((5 SECONDS + rand(0, 5 SECONDS) + rand(0, 5 SECONDS))*hackspeed)))) - to_chat(user, "Override successful!") + to_chat(user, span_notice("Override successful!")) A.locked = FALSE A.update_icon() playsound(A, 'sound/machines/click.ogg', 15, 1, -3) @@ -89,9 +89,9 @@ if(istype(target, /obj/structure/closet/secure_closet)) var/obj/structure/closet/secure_closet/A = target if(A.locked) - to_chat(user, "Overriding access. Stand by.") + to_chat(user, span_notice("Overriding access. Stand by.")) if(do_after(user, (((5 SECONDS + rand(0, 5 SECONDS) + rand(0, 5 SECONDS))*hackspeed)))) - to_chat(user, "Override successful!") + to_chat(user, span_notice("Override successful!")) A.locked = FALSE A.update_icon() playsound(A, 'sound/machines/click.ogg', 15, 1, -3) @@ -108,7 +108,7 @@ if(found) known_targets.Swap(1, found) // Move the last hacked item first return 1 - to_chat(user, "You begin hacking \the [D]...") + to_chat(user, span_notice("You begin hacking \the [D]...")) is_hacking = 1 // On average hackin takes ~15 seconds. Fairly small random span to discourage people from simply aborting and trying again // Reduced hack duration to compensate for the reduced functionality, multiplied by door sec level @@ -116,10 +116,10 @@ is_hacking = 0 if(hack_result && in_hack_mode) - to_chat(user, "Your hacking attempt was succesful!") + to_chat(user, span_notice("Your hacking attempt was succesful!")) user.playsound_local(get_turf(src), 'sound/instruments/piano/An6.ogg', 50) else - to_chat(user, "Your hacking attempt failed!") + to_chat(user, span_warning("Your hacking attempt failed!")) return 0 known_targets.Insert(1, D) // Insert the newly hacked target first, diff --git a/code/game/objects/items/devices/holowarrant.dm b/code/game/objects/items/devices/holowarrant.dm index 1e65c456ab..e0d103489a 100644 --- a/code/game/objects/items/devices/holowarrant.dm +++ b/code/game/objects/items/devices/holowarrant.dm @@ -18,7 +18,7 @@ if(in_range(user, src) || istype(user, /mob/observer/dead)) show_content(user) //Opens a browse window, not chatbox related else - . += "You have to go closer if you want to read it." + . += span_notice("You have to go closer if you want to read it.") //hit yourself with it /obj/item/holowarrant/attack_self(mob/living/user as mob) @@ -28,7 +28,7 @@ for(var/datum/data/record/warrant/W in data_core.warrants) warrants += W.fields["namewarrant"] if(warrants.len == 0) - to_chat(user,"There are no warrants available") + to_chat(user,span_notice("There are no warrants available")) return var/temp temp = tgui_input_list(user, "Which warrant would you like to load?", "Warrant Selection", warrants) @@ -44,17 +44,17 @@ var/choice = tgui_alert(user, "Would you like to authorize this warrant?","Warrant authorization",list("Yes","No")) if(choice == "Yes") active.fields["auth"] = "[I.registered_name] - [I.assignment ? I.assignment : "(Unknown)"]" - user.visible_message("You swipe \the [I] through the [src].", \ - "[user] swipes \the [I] through the [src].") + user.visible_message(span_notice("You swipe \the [I] through the [src]."), \ + span_notice("[user] swipes \the [I] through the [src].")) return 1 - to_chat(user, "You don't have the access to do this!") // VOREStation edit + to_chat(user, span_warning("You don't have the access to do this!")) // VOREStation edit return 1 ..() //hit other people with it /obj/item/holowarrant/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - user.visible_message("You show the warrant to [M].", \ - "[user] holds up a warrant projector and shows the contents to [M].") + user.visible_message(span_notice("You show the warrant to [M]."), \ + span_notice("[user] holds up a warrant projector and shows the contents to [M].")) M.examinate(src) /obj/item/holowarrant/update_icon() diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index f8f8a62151..89ca05a09e 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -50,13 +50,13 @@ user.drop_item() W.loc = src diode = W - to_chat(user, "You install a [diode.name] in [src].") + to_chat(user, span_notice("You install a [diode.name] in [src].")) else - to_chat(user, "[src] already has a diode.") + to_chat(user, span_notice("[src] already has a diode.")) else if(W.has_tool_quality(TOOL_SCREWDRIVER)) if(diode) - to_chat(user, "You remove the [diode.name] from the [src].") + to_chat(user, span_notice("You remove the [diode.name] from the [src].")) diode.loc = get_turf(src.loc) diode = null return @@ -76,17 +76,17 @@ if(!(world.time - last_used_time >= cooldown)) return if (!diode) - to_chat(user, "You point [src] at [target], but nothing happens!") + to_chat(user, span_notice("You point [src] at [target], but nothing happens!")) return if (!user.IsAdvancedToolUser()) - to_chat(user, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You don't have the dexterity to do this!")) return add_fingerprint(user) //nothing happens if the battery is drained if(recharge_locked) - to_chat(user, "You point [src] at [target], but it's still charging.") + to_chat(user, span_notice("You point [src] at [target], but it's still charging.")) return var/outmsg @@ -110,38 +110,38 @@ var/mob/living/carbon/human/H = C var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES] if(!E) - outmsg = "You shine [src] at [C], but they don't seem to have eyes." + outmsg = span_notice("You shine [src] at [C], but they don't seem to have eyes.") return - outmsg = "You shine [src] into [C]'s eyes." + outmsg = span_notice("You shine [src] into [C]'s eyes.") switch(severity) if(0) //rank 1 diode with basic eye protection (like sunglasses), or rank 2 with industrial protection (like welding goggles) - to_chat(C, "A small, bright dot appears in your vision.") + to_chat(C, span_info("A small, bright dot appears in your vision.")) if(1) //rank 1 with no protection, rank 2 with basic protection, or rank 3 with industrial protection - to_chat(C, "Something bright flashes in the corner of your vision.") + to_chat(C, span_notice("Something bright flashes in the corner of your vision.")) if(2) //rank 1 or 2 with no protection, rank 2 or 3 with basic protection, or rank 3 with industrial protection //alternatively, rank 1 with minor vulnerability (like night vision goggles) flick("flash", C.flash_eyes()) - to_chat(C, "A bright light shines across your eyes!") + to_chat(C, span_danger("A bright light shines across your eyes!")) if(3) //rank 1 with minor vulnerability, rank 2 or 3 with no protection, or rank 3 with basic protection if(prob(3 * diode.rating)) C.Weaken(1) flick("flash", C.flash_eyes()) E.damage += 1 - to_chat(C, "A bright light briefly blinds you!") + to_chat(C, span_danger("A bright light briefly blinds you!")) if(4) //rank 3 with no protection, or rank 2 with minor vulnerability if(prob(5 * diode.rating)) C.Weaken(1) flick("e_flash", C.flash_eyes()) E.damage += 2 - to_chat(C, "A blinding light burns your eyes!") + to_chat(C, span_danger("A blinding light burns your eyes!")) else - outmsg = "You shine the [src] at [C], but miss their eyes." + outmsg = span_notice("You shine the [src] at [C], but miss their eyes.") //robots and AI else if(issilicon(target)) @@ -151,34 +151,34 @@ flick("flash", S.flash_eyes(affect_silicon = TRUE)) if (prob(3 * diode.rating)) S.Weaken(1) - to_chat(S, "Your sensors were blinded by a laser!") - outmsg = "You blind [S] by shining [src] at their sensors." + to_chat(S, span_warning("Your sensors were blinded by a laser!")) + outmsg = span_notice("You blind [S] by shining [src] at their sensors.") add_attack_logs(user,S,"Tried disabling using [src]") else - outmsg = "You shine the [src] at [S], but miss their sensors." + outmsg = span_notice("You shine the [src] at [S], but miss their sensors.") //cameras else if(istype(target, /obj/machinery/camera)) var/obj/machinery/camera/C = target if(prob(effectchance * diode.rating)) C.emp_act(4 - diode.rating) - outmsg = "You shine the [src] into the lens of [C]." + outmsg = span_notice("You shine the [src] into the lens of [C].") add_attack_logs(user,C.name,"Tried disabling using [src]") else - outmsg = "You missed the lens of [C] with [src]." + outmsg = span_info("You missed the lens of [C] with [src].") //cats! for(var/mob/living/simple_mob/animal/passive/cat/C in viewers(1,targloc)) if (!(C.stat || C.buckled)) if(prob(50) && !(C.client)) - C.visible_message("[C] pounces on the light!", "You pounce on the light!") + C.visible_message(span_warning("[C] pounces on the light!"), span_warning("You pounce on the light!")) step_towards(C, targloc) C.lay_down() spawn(10) C.lay_down() else C.set_dir(get_dir(C,targloc)) - C.visible_message("[C] watches the light.", "Your attention is drawn to the mysterious glowing dot.") + C.visible_message(span_notice("[C] watches the light."), span_notice("Your attention is drawn to the mysterious glowing dot.")) //laser pointer image @@ -193,9 +193,9 @@ I.pixel_y = target.pixel_y + rand(-5,5) if(outmsg) - user.visible_message("[user] points [src] at [target].", outmsg) + user.visible_message(span_info("[user] points [src] at [target]."), outmsg) else - user.visible_message("[user] points [src] at [target].", "You point [src] at [target].") + user.visible_message(span_info("[user] points [src] at [target]."), span_info("You point [src] at [target].")) last_used_time = world.time energy -= 1 @@ -204,7 +204,7 @@ recharging = 1 START_PROCESSING(SSobj, src) if(energy <= 0) - to_chat(user, "You've overused the battery of [src], now it needs time to recharge!") + to_chat(user, span_warning("You've overused the battery of [src], now it needs time to recharge!")) recharge_locked = 1 flick_overlay(I, showto, cooldown) @@ -218,4 +218,4 @@ energy = max_energy recharging = 0 recharge_locked = 0 - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 58b2bb7c01..97786a2b82 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -67,14 +67,14 @@ if(istype(W, /obj/item/stack/material) && W.get_material_name() == "glass" || istype(W, /obj/item/stack/material/cyborg/glass)) var/obj/item/stack/G = W if(uses >= max_uses) - to_chat(user, "[src.name] is full.") + to_chat(user, span_warning("[src.name] is full.")) return else if(G.use(1)) add_uses(16) //Autolathe converts 1 sheet into 16 lights. - to_chat(user, "You insert a piece of glass into \the [src.name]. You have [uses] light\s remaining.") + to_chat(user, span_notice("You insert a piece of glass into \the [src.name]. You have [uses] light\s remaining.")) return else - to_chat(user, "You need one sheet of glass to replace lights.") + to_chat(user, span_warning("You need one sheet of glass to replace lights.")) if(istype(W, /obj/item/light)) var/new_bulbs = 0 @@ -117,14 +117,14 @@ qdel(L) if(!found_lightbulbs) - to_chat(user, "\The [S] contains no bulbs.") + to_chat(user, span_warning("\The [S] contains no bulbs.")) return if(!replaced_something && src.uses == max_uses) - to_chat(user, "\The [src] is full!") + to_chat(user, span_warning("\The [src] is full!")) return - to_chat(user, "You fill \the [src] with lights from \the [S].") + to_chat(user, span_notice("You fill \the [src] with lights from \the [S].")) /obj/item/lightreplacer/attack_self(mob/user) /* // This would probably be a bit OP. If you want it though, uncomment the code. @@ -175,12 +175,12 @@ if(target.status != LIGHT_OK) if(CanUse(U)) if(!Use(U)) return - to_chat(U, "You replace the [target.get_fitting_name()] with the [src].") + to_chat(U, span_notice("You replace the [target.get_fitting_name()] with the [src].")) if(target.status != LIGHT_EMPTY) var/new_bulbs = AddShards(1) if(new_bulbs != 0) - to_chat(U, "\The [src] has fabricated a new bulb from the broken bulbs it has stored. It now has [uses] uses.") + to_chat(U, span_notice("\The [src] has fabricated a new bulb from the broken bulbs it has stored. It now has [uses] uses.")) playsound(src, 'sound/machines/ding.ogg', 50, 1) target.status = LIGHT_EMPTY target.installed_light = null //Remove the light! diff --git a/code/game/objects/items/devices/locker_painter.dm b/code/game/objects/items/devices/locker_painter.dm index 70c1897ca3..c4af2de572 100644 --- a/code/game/objects/items/devices/locker_painter.dm +++ b/code/game/objects/items/devices/locker_painter.dm @@ -81,7 +81,7 @@ if(istype(A,ctype)) non_closet = 1 if(non_closet) - to_chat(user, "\The [src] can only be used on closets.") + to_chat(user, span_warning("\The [src] can only be used on closets.")) return var/config_error @@ -89,7 +89,7 @@ if(istype(A,/obj/structure/closet/secure_closet)) var/obj/structure/closet/secure_closet/F = A if(F.broken) - to_chat(user, "\The [src] cannot paint broken closets.") + to_chat(user, span_warning("\The [src] cannot paint broken closets.")) return var/list/colour_data = colours_secure[colour_secure] @@ -114,7 +114,7 @@ F.update_icon() if(config_error) - to_chat(user, "\The [src] flashes an error light. You might need to reconfigure it.") + to_chat(user, span_warning("\The [src] flashes an error light. You might need to reconfigure it.")) return /obj/item/closet_painter/attack_self(var/mob/user) @@ -140,7 +140,7 @@ var/new_colour = tgui_input_list(usr, "Select a color:", "Color Selection", colours) if(new_colour && !isnull(colours[new_colour])) colour = new_colour - to_chat(usr, "You set \the [src] regular closet colour to '[colour]'.") + to_chat(usr, span_notice("You set \the [src] regular closet colour to '[colour]'.")) /obj/item/closet_painter/verb/choose_colour_secure() set name = "Choose Secure Colour" @@ -154,4 +154,4 @@ var/new_colour_secure = tgui_input_list(usr, "Select a color:", "Color Selection", colours_secure) if(new_colour_secure && !isnull(colours_secure[new_colour_secure])) colour_secure = new_colour_secure - to_chat(usr, "You set \the [src] secure closet colour to '[colour_secure]'.") + to_chat(usr, span_notice("You set \the [src] secure closet colour to '[colour_secure]'.")) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 25a30be03b..f606102e42 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -13,15 +13,15 @@ /obj/item/megaphone/proc/can_broadcast(var/mob/living/user) if(user.client) if(user.client.prefs.muted & MUTE_IC) - to_chat(user, "You cannot speak in IC (muted).") + to_chat(user, span_warning("You cannot speak in IC (muted).")) return FALSE if(!(ishuman(user) || user.isSynthetic())) - to_chat(user, "You don't know how to use this!") + to_chat(user, span_warning("You don't know how to use this!")) return FALSE if(user.silent) return FALSE if(spamcheck > world.time) - to_chat(user, "[src] needs to recharge!") + to_chat(user, span_warning("[src] needs to recharge!")) return FALSE if(loc != user) return FALSE @@ -36,7 +36,7 @@ user.audible_message("[user.GetVoice()][user.GetAltName()] broadcasts, \"[insult]\"", runemessage = insult) insults-- else - to_chat(user, "*BZZZZzzzzzt*") + to_chat(user, span_warning("*BZZZZzzzzzt*")) else user.audible_message("[user.GetVoice()][user.GetAltName()] broadcasts, \"[message]\"", runemessage = message) @@ -54,7 +54,7 @@ /obj/item/megaphone/emag_act(var/remaining_charges, var/mob/user) if(!emagged) - to_chat(user, "You overload [src]'s voice synthesizer.") + to_chat(user, span_warning("You overload [src]'s voice synthesizer.")) emagged = TRUE insults = rand(1, 3)//to prevent caps spam. return TRUE @@ -82,13 +82,13 @@ if(!("comic sans ms" in font_options)) font_options = list("comic sans ms") broadcast_font = "comic sans ms" - to_chat(user, "\The [src] emits a silly sound.") + to_chat(user, span_notice("\The [src] emits a silly sound.")) if(!("#ff69b4" in color_options)) color_options = list("#ff69b4") broadcast_color = "#ff69b4" if(insults <= 0) insults = rand(1,3) - to_chat(user, "You re-scramble \the [src]'s voice synthesizer.") + to_chat(user, span_warning("You re-scramble \the [src]'s voice synthesizer.")) return 1 /obj/item/megaphone/super/verb/turn_volume_dial() @@ -152,12 +152,12 @@ M.make_jittery(50) insults-- else - user.audible_message("*BZZZZzzzzzt*") + user.audible_message(span_critical("*BZZZZzzzzzt*")) if(prob(40) && insults <= 0) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, get_turf(user)) s.start() - user.visible_message("\The [src] sparks violently!") + user.visible_message(span_warning("\The [src] sparks violently!")) spawn(30) explosion(get_turf(src), -1, -1, 1, 3, adminlog = 1) qdel(src) diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index d1915aa09d..91e50acc55 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -23,7 +23,7 @@ return //it shouldn't be null, okay? if(!parts) - to_chat(user, "This kit has no parts for this modification left.") + to_chat(user, span_warning("This kit has no parts for this modification left.")) user.drop_from_inventory(src) qdel(src) return @@ -35,22 +35,22 @@ var/obj/item/clothing/I = O if (!istype(I) || !allowed) - to_chat(user, "[src] is unable to modify that.") + to_chat(user, span_notice("[src] is unable to modify that.")) return var/excluding = ("exclude" in I.species_restricted) var/in_list = (target_species in I.species_restricted) if (excluding ^ in_list) - to_chat(user, "[I] is already modified.") + to_chat(user, span_notice("[I] is already modified.")) return if(!isturf(O.loc)) - to_chat(user, "[O] must be safely placed on the ground for modification.") + to_chat(user, span_warning("[O] must be safely placed on the ground for modification.")) return playsound(src, O.usesound, 100, 1) - user.visible_message("\The [user] opens \the [src] and modifies \the [O].","You open \the [src] and modify \the [O].") + user.visible_message("\The [user] opens \the [src] and modifies \the [O].",span_notice("You open \the [src] and modify \the [O].")) I.refit_for_species(target_species) diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 673458f821..cdaa821576 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -36,7 +36,7 @@ var/choice = tgui_alert(usr, "What do you want to do with \the [src]?", "Multitool Menu", list("Switch Mode", "Clear Buffers", "Cancel")) switch(choice) if("Clear Buffers") - to_chat(user,"You clear \the [src]'s memory.") + to_chat(user,span_notice("You clear \the [src]'s memory.")) buffer = null connecting = null connectable = null @@ -47,7 +47,7 @@ if("Switch Mode") mode_switch(user) else - to_chat(user,"You lower \the [src].") + to_chat(user,span_notice("You lower \the [src].")) return update_icon() @@ -61,7 +61,7 @@ mode_index += 1 toolmode = modes[mode_index] - to_chat(user,"\The [src] is now set to [toolmode].") + to_chat(user,span_notice("\The [src] is now set to [toolmode].")) accepting_refs = (toolmode == MULTITOOL_MODE_INTCIRCUITS) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 0f4276152c..15de1f355d 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -59,21 +59,21 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard) if(pai != null) //Have a person in them already? return ..() if(is_damage_critical()) - to_chat(usr, "That card is too damaged to activate!") + to_chat(usr, span_warning("That card is too damaged to activate!")) return var/time_till_respawn = user.time_till_respawn() if(time_till_respawn == -1) // Special case, never allowed to respawn - to_chat(usr, "Respawning is not allowed!") + to_chat(usr, span_warning("Respawning is not allowed!")) else if(time_till_respawn) // Nonzero time to respawn - to_chat(usr, "You can't do that yet! You died too recently. You need to wait another [round(time_till_respawn/10/60, 0.1)] minutes.") + to_chat(usr, span_warning("You can't do that yet! You died too recently. You need to wait another [round(time_till_respawn/10/60, 0.1)] minutes.")) return if(jobban_isbanned(usr, JOB_PAI)) - to_chat(usr,"You cannot join a pAI card when you are banned from playing as a pAI.") + to_chat(usr,span_warning("You cannot join a pAI card when you are banned from playing as a pAI.")) return for(var/ourkey in paikeys) if(ourkey == user.ckey) - to_chat(usr, "You can't just rejoin any old pAI card!!! Your card still exists.") + to_chat(usr, span_warning("You can't just rejoin any old pAI card!!! Your card still exists.")) return var/choice = tgui_alert(user, "You sure you want to inhabit this PAI, or submit yourself to being recruited?", "Confirmation", list("Inhabit", "Recruit", "Cancel")) @@ -136,7 +136,7 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard) /obj/item/paicard/proc/access_screen(mob/user) if(is_damage_critical()) - to_chat(user, "WARNING: CRITICAL HARDWARE FAILURE, SERVICE DEVICE IMMEDIATELY") + to_chat(user, span_warning("WARNING: CRITICAL HARDWARE FAILURE, SERVICE DEVICE IMMEDIATELY")) return if (!in_range(src, user)) return @@ -430,7 +430,7 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard) if(pai) return if(last_notify == 0 || (5 MINUTES <= world.time - last_notify)) - audible_message("\The [src] flashes a message across its screen, \"Additional personalities available for download.\"", hearing_distance = world.view, runemessage = "bleeps!") + audible_message(span_notice("\The [src] flashes a message across its screen, \"Additional personalities available for download.\""), hearing_distance = world.view, runemessage = "bleeps!") last_notify = world.time /obj/item/paicard/emp_act(severity) @@ -445,13 +445,13 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard) /obj/item/paicard/see_emote(mob/living/M, text) if(pai && pai.client && !pai.canmove) - var/rendered = "[text]" + var/rendered = span_message("[text]") pai.show_message(rendered, 2) ..() /obj/item/paicard/show_message(msg, type, alt, alt_type) if(pai && pai.client) - var/rendered = "[msg]" + var/rendered = span_message("[msg]") pai.show_message(rendered, type) ..() diff --git a/code/game/objects/items/devices/personal_shield_generator_vr.dm b/code/game/objects/items/devices/personal_shield_generator_vr.dm index 6292a2bc6e..4804859248 100644 --- a/code/game/objects/items/devices/personal_shield_generator_vr.dm +++ b/code/game/objects/items/devices/personal_shield_generator_vr.dm @@ -166,9 +166,9 @@ reattach_gun(user) else if(istype(W, /obj/item/cell)) if(bcell) - to_chat(user, "\The [src] already has a cell.") + to_chat(user, span_notice("\The [src] already has a cell.")) else if(!istype(W, /obj/item/cell/device/weapon)) //Weapon cells only! - to_chat(user, "This cell will not fit in the device.") + to_chat(user, span_notice("This cell will not fit in the device.")) else if(!user.unEquip(W)) return @@ -176,7 +176,7 @@ bcell = W if(active_weapon) active_weapon.power_supply = bcell - to_chat(user, "You install a cell in \the [src].") + to_chat(user, span_notice("You install a cell in \the [src].")) update_icon() else if(W.has_tool_quality(TOOL_SCREWDRIVER)) @@ -193,7 +193,7 @@ if(active_weapon) reattach_gun() //Put the gun back if it's out. No shooting if we don't have a cell! active_weapon.power_supply = null //No power cell anymore! - to_chat(user, "You remove the cell from \the [src], destroying the battery.") + to_chat(user, span_notice("You remove the cell from \the [src], destroying the battery.")) update_icon() return else @@ -205,7 +205,7 @@ if(active_weapon) reattach_gun() //Put the gun back if it's out. No shooting if we don't have a cell! active_weapon.power_supply = null //No power cell anymore! - to_chat(user, "You remove the cell from \the [src].") + to_chat(user, span_notice("You remove the cell from \the [src].")) update_icon() else if(istype(W,/obj/item/multitool)) var/new_color = input(usr, "Choose a color to set the shield to!", "", effect_color) as color|null @@ -243,22 +243,22 @@ user.last_special = world.time + 10 //No spamming! if(!bcell || !bcell.check_charge(generator_hit_cost) || !bcell.check_charge(generator_active_cost)) - to_chat(user, "You require a charged cell to do this!") + to_chat(user, span_warning("You require a charged cell to do this!")) return if(!slot_check()) - to_chat(user, "You need to equip [src] before starting the shield up!") + to_chat(user, span_warning("You need to equip [src] before starting the shield up!")) return else if(shield_active) shield_active = !shield_active //Deactivate the shield! - to_chat(user, "You deactive the shield!") + to_chat(user, span_warning("You deactive the shield!")) user.remove_modifiers_of_type(/datum/modifier/shield_projection) STOP_PROCESSING(SSobj, src) playsound(src, 'sound/weapons/saberoff.ogg', 50, 1) //Shield turning off! PLACEHOLDER else shield_active = !shield_active - to_chat(user, "You activate the shield!") + to_chat(user, span_warning("You activate the shield!")) user.remove_modifiers_of_type(/datum/modifier/shield_projection) //Just to make sure they aren't using two at once! user.add_modifier(modifier_type) user.update_modifier_visuals() //Forces coloration to WORK. @@ -277,11 +277,11 @@ user.last_special = world.time + 10 //No spamming! if(!active_weapon) - to_chat(user, "The gun is missing!") + to_chat(user, span_warning("The gun is missing!")) return if(!bcell) - to_chat(user, "The gun requires a power supply!") + to_chat(user, span_warning("The gun requires a power supply!")) return if(active_weapon.loc != src) @@ -289,17 +289,17 @@ return if(!slot_check()) - to_chat(user, "You need to equip [src] before taking out [active_weapon].") + to_chat(user, span_warning("You need to equip [src] before taking out [active_weapon].")) else if(!usr.put_in_hands(active_weapon)) //Detach the gun into the user's hands - to_chat(user, "You need a free hand to hold the gun!") + to_chat(user, span_warning("You need a free hand to hold the gun!")) update_icon() //success /obj/item/personal_shield_generator/process() if(!bcell) //They removed the battery midway. if(istype(loc, /mob/living/carbon/human)) //We on someone? Tell them it turned off. var/mob/living/carbon/human/user = loc - to_chat(user, "The shield deactivates! An error message pops up on screen: 'Cell missing. Cell replacement required.'") + to_chat(user, span_warning("The shield deactivates! An error message pops up on screen: 'Cell missing. Cell replacement required.'")) user.remove_modifiers_of_type(/datum/modifier/shield_projection) shield_active = 0 STOP_PROCESSING(SSobj, src) @@ -311,7 +311,7 @@ if(bcell.rigged) //They turned it back on after it was rigged to go boom. if(istype(loc, /mob/living/carbon/human)) //Deactivate the shield, first. You're not getting reduced damage... var/mob/living/carbon/human/user = loc - to_chat(user, "The shield deactivates, an error message popping up on screen: 'Cell Reactor Critically damaged. Cell replacement required.'") + to_chat(user, span_warning("The shield deactivates, an error message popping up on screen: 'Cell Reactor Critically damaged. Cell replacement required.'")) user.remove_modifiers_of_type(/datum/modifier/shield_projection) if(active_weapon) //Retract the gun. There's about to be no cell anymore. @@ -332,7 +332,7 @@ shield_active = 0 if(istype(loc, /mob/living/carbon/human)) //We on someone? Tell them it turned off. var/mob/living/carbon/human/user = loc - to_chat(user, "The shield deactivates, an error message popping up on screen: 'Cell out of charge.'") + to_chat(user, span_warning("The shield deactivates, an error message popping up on screen: 'Cell out of charge.'")) user.remove_modifiers_of_type(/datum/modifier/shield_projection) STOP_PROCESSING(SSobj, src) update_icon() @@ -369,7 +369,7 @@ if(ismob(active_weapon.loc)) var/mob/M = active_weapon.loc if(M.drop_from_inventory(active_weapon, src)) - to_chat(user, "\The [active_weapon] snaps back into the main unit.") + to_chat(user, span_notice("\The [active_weapon] snaps back into the main unit.")) else active_weapon.forceMove(src) @@ -421,13 +421,13 @@ if(busy) return 0 if(!check_charge(charge_cost)) - to_chat(user, "\The [src] doesn't have enough charge left to do that.") + to_chat(user, span_warning("\The [src] doesn't have enough charge left to do that.")) return 0 if(!wielded && !isrobot(user)) - to_chat(user, "You need to wield the gun with both hands before you can use it on someone!") + to_chat(user, span_warning("You need to wield the gun with both hands before you can use it on someone!")) return 0 if(cooldown) - to_chat(user, "\The [src] are re-energizing!") + to_chat(user, span_warning("\The [src] are re-energizing!")) return 0 return 1 @@ -509,11 +509,11 @@ /obj/item/personal_shield_generator/belt/mining/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/borg/upgrade/shield_upgrade)) if(modifier_type == /datum/modifier/shield_projection/mining/strong) - to_chat(user, "This shield generator is already upgraded!") + to_chat(user, span_warning("This shield generator is already upgraded!")) return modifier_type = /datum/modifier/shield_projection/mining/strong upgraded = 1 - to_chat(user, "You upgrade the [src] with the [W]!") + to_chat(user, span_notice("You upgrade the [src] with the [W]!")) user.drop_from_inventory(W) qdel(W) else @@ -602,4 +602,4 @@ /obj/item/cell/device/shield_generator/parry //The cell for the 'parry' shield gen. maxcharge = 100 charge_amount = 100 - charge_delay = 20 //Starts charging two seconds after it's discharged. \ No newline at end of file + charge_delay = 20 //Starts charging two seconds after it's discharged. diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 608bd9651a..ff2de7da3d 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -41,7 +41,7 @@ else anchored = TRUE mode = 1 - src.visible_message("[user] attaches [src] to the cable!") + src.visible_message(span_notice("[user] attaches [src] to the cable!")) playsound(src, I.usesound, 50, 1) return else @@ -53,7 +53,7 @@ STOP_PROCESSING_POWER_OBJECT(src) anchored = FALSE mode = 0 - src.visible_message("[user] detaches [src] from the cable!") + src.visible_message(span_notice("[user] detaches [src] from the cable!")) set_light(0) playsound(src, I.usesound, 50, 1) icon_state = "powersink0" @@ -70,14 +70,14 @@ if(0) ..() if(1) - src.visible_message("[user] activates [src]!") + src.visible_message(span_notice("[user] activates [src]!")) mode = 2 icon_state = "powersink1" START_PROCESSING(SSobj, src) datum_flags &= ~DF_ISPROCESSING // Have to reset this flag so that PROCESSING_POWER_OBJECT can re-add it. It fails if the flag is already present. - Ater START_PROCESSING_POWER_OBJECT(src) if(2) //This switch option wasn't originally included. It exists now. --NeoFite - src.visible_message("[user] deactivates [src]!") + src.visible_message(span_notice("[user] deactivates [src]!")) mode = 1 set_light(0) icon_state = "powersink0" diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 5ead9ac23e..87c067ae80 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -37,7 +37,7 @@ GLOBAL_LIST_BOILERPLATE(all_beacons, /obj/item/radio/beacon) /obj/item/radio/beacon/syndicate/attack_self(mob/user as mob) if(user) - to_chat(user, "Locked In") + to_chat(user, span_notice("Locked In")) new /obj/machinery/power/singularity_beacon/syndicate( user.loc ) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) qdel(src) diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 3e50dbf045..3b9e655765 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -17,7 +17,7 @@ /obj/item/radio/electropack/attack_hand(mob/living/user as mob) if(src == user.back) - to_chat(user, "You need help taking this off!") + to_chat(user, span_notice("You need help taking this off!")) return ..() @@ -25,7 +25,7 @@ ..() if(istype(W, /obj/item/clothing/head/helmet)) if(!b_stat) - to_chat(user, "[src] is not ready to be attached!") + to_chat(user, span_notice("[src] is not ready to be attached!")) return var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user ) A.icon = 'icons/obj/assemblies.dmi' @@ -95,7 +95,7 @@ sleep(50) if(M) M.moved_recently = 0 - to_chat(M, "You feel a sharp shock!") + to_chat(M, span_danger("You feel a sharp shock!")) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, M) s.start() diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 71f6ff6e21..bd3bcb4eba 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -139,7 +139,7 @@ playsound(src, W.usesound, 50, 1) update_icon() else if(wiresexposed && W.has_tool_quality(TOOL_WIRECUTTER)) - user.visible_message("[user] has cut the wires inside \the [src]!", "You have cut the wires inside \the [src].") + user.visible_message(span_warning("[user] has cut the wires inside \the [src]!"), "You have cut the wires inside \the [src].") playsound(src, W.usesound, 50, 1) new/obj/item/stack/cable_coil(get_turf(src), 5) var/obj/structure/frame/A = new /obj/structure/frame(src.loc) @@ -200,15 +200,15 @@ //VOREStation Add Start /obj/item/radio/intercom/AICtrlClick(var/mob/user) ToggleBroadcast() - to_chat(user, "\The [src]'s microphone is now [broadcasting ? "enabled" : "disabled"].") + to_chat(user, span_notice("\The [src]'s microphone is now [broadcasting ? "enabled" : "disabled"].")) /obj/item/radio/intercom/AIAltClick(var/mob/user) if(frequency == AI_FREQ) set_frequency(initial(frequency)) - to_chat(user, "\The [src]'s frequency is now set to [span_green("Default")].") + to_chat(user, span_notice("\The [src]'s frequency is now set to [span_green("Default")].")) else set_frequency(AI_FREQ) - to_chat(user, "\The [src]'s frequency is now set to [span_pink("AI Private")].") + to_chat(user, span_notice("\The [src]'s frequency is now set to [span_pink("AI Private")].")) //VOREStation Add End /obj/item/radio/intercom/locked var/locked_frequency diff --git a/code/game/objects/items/devices/radio/jammer.dm b/code/game/objects/items/devices/radio/jammer.dm index a42d1c1e68..9d00ccde62 100644 --- a/code/game/objects/items/devices/radio/jammer.dm +++ b/code/game/objects/items/devices/radio/jammer.dm @@ -47,7 +47,7 @@ var/global/list/active_radio_jammers = list() /obj/item/radio_jammer/proc/turn_off(mob/user) if(user) - to_chat(user,"\The [src] deactivates.") + to_chat(user,span_warning("\The [src] deactivates.")) STOP_PROCESSING(SSobj, src) active_radio_jammers -= src on = FALSE @@ -55,7 +55,7 @@ var/global/list/active_radio_jammers = list() /obj/item/radio_jammer/proc/turn_on(mob/user) if(user) - to_chat(user,"\The [src] is now active.") + to_chat(user,span_notice("\The [src] is now active.")) START_PROCESSING(SSobj, src) active_radio_jammers += src on = TRUE @@ -74,7 +74,7 @@ var/global/list/active_radio_jammers = list() /obj/item/radio_jammer/attack_hand(mob/user) if(user.get_inactive_hand() == src && power_source) - to_chat(user,"You eject \the [power_source] from \the [src].") + to_chat(user,span_notice("You eject \the [power_source] from \the [src].")) user.put_in_hands(power_source) power_source = null turn_off() @@ -88,7 +88,7 @@ var/global/list/active_radio_jammers = list() if(power_source) turn_on(user) else - to_chat(user,"\The [src] has no power source!") + to_chat(user,span_warning("\The [src] has no power source!")) /obj/item/radio_jammer/attackby(obj/W, mob/user) if(istype(W,/obj/item/cell/device/weapon) && !power_source) @@ -97,7 +97,7 @@ var/global/list/active_radio_jammers = list() user.unEquip(power_source) power_source.forceMove(src) update_icon() - to_chat(user,"You insert \the [power_source] into \the [src].") + to_chat(user,span_notice("You insert \the [power_source] into \the [src].")) /obj/item/radio_jammer/update_icon() if(on) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index de007b9669..03a2f53da9 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -277,10 +277,10 @@ var/global/list/default_medbay_channels = list( subspace_transmission = !subspace_transmission if(!subspace_transmission) channels = list() - to_chat(usr, "Subspace Transmission is disabled") + to_chat(usr, span_notice("Subspace Transmission is disabled")) else recalculateChannels() - to_chat(usr, "Subspace Transmission is enabled") + to_chat(usr, span_notice("Subspace Transmission is enabled")) . = TRUE if("toggleLoudspeaker") if(!subspace_switchable) @@ -288,9 +288,9 @@ var/global/list/default_medbay_channels = list( loudspeaker = !loudspeaker if(loudspeaker) - to_chat(usr, "Loadspeaker enabled.") + to_chat(usr, span_notice("Loadspeaker enabled.")) else - to_chat(usr, "Loadspeaker disabled.") + to_chat(usr, span_notice("Loadspeaker disabled.")) . = TRUE if(. && iscarbon(usr)) @@ -472,14 +472,14 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer) if(bluespace_radio) //Nothing to transmit to if(!bs_tx_weakref) - to_chat(loc, "\The [src] buzzes to inform you of the lack of a functioning connection.") + to_chat(loc, span_warning("\The [src] buzzes to inform you of the lack of a functioning connection.")) return FALSE var/obj/machinery/telecomms/tx_to = bs_tx_weakref.resolve() //Was linked, now destroyed or something if(!tx_to) bs_tx_weakref = null - to_chat(loc, "\The [src] buzzes to inform you of the lack of a functioning connection.") + to_chat(loc, span_warning("\The [src] buzzes to inform you of the lack of a functioning connection.")) return FALSE //Transmitted in the blind. If we get a message back, cool. If not, oh well. @@ -496,7 +496,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer) distance = 99 else distance = jamming["distance"] - to_chat(M, "[icon2html(src, M.client)] You hear the [distance <= 2 ? "loud hiss" : "soft hiss"] of static.") + to_chat(M, span_danger("[icon2html(src, M.client)] You hear the [distance <= 2 ? "loud hiss" : "soft hiss"] of static.")) return FALSE // First, we want to generate a new radio signal @@ -515,7 +515,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer) return TRUE //Huzzah, sent via subspace else if(adhoc_fallback) //Less huzzah, we have to fallback - to_chat(loc, "\The [src] pings as it falls back to local radio transmission.") + to_chat(loc, span_warning("\The [src] pings as it falls back to local radio transmission.")) subspace_transmission = FALSE else //Oh well @@ -543,7 +543,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer) if(signal.data["done"] && (pos_z in signal.data["level"])) if(adhoc_fallback) - to_chat(loc, "\The [src] pings as it reestablishes subspace communications.") + to_chat(loc, span_notice("\The [src] pings as it reestablishes subspace communications.")) subspace_transmission = TRUE // we're done here. return TRUE @@ -607,9 +607,9 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer) if((in_range(src, user) || loc == user)) if(b_stat) - . += "\The [src] can be attached and modified!" + . += span_notice("\The [src] can be attached and modified!") else - . += "\The [src] can not be modified or attached!" + . += span_notice("\The [src] can not be modified or attached!") /obj/item/radio/attackby(obj/item/W as obj, mob/user as mob) ..() @@ -619,9 +619,9 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer) b_stat = !( b_stat ) if(!istype(src, /obj/item/radio/beacon)) if (b_stat) - user.show_message("\The [src] can now be attached and modified!") + user.show_message(span_notice("\The [src] can now be attached and modified!")) else - user.show_message("\The [src] can no longer be modified or attached!") + user.show_message(span_notice("\The [src] can no longer be modified or attached!")) updateDialog() //Foreach goto(83) add_fingerprint(user) diff --git a/code/game/objects/items/devices/radio/radiopack.dm b/code/game/objects/items/devices/radio/radiopack.dm index 67f5cfb187..d47612e788 100644 --- a/code/game/objects/items/devices/radio/radiopack.dm +++ b/code/game/objects/items/devices/radio/radiopack.dm @@ -54,7 +54,7 @@ var/mob/living/carbon/human/user = usr if(!handset) - to_chat(user, "The handset is missing!") + to_chat(user, span_warning("The handset is missing!")) return if(handset.loc != src) @@ -62,10 +62,10 @@ return if(!slot_check()) - to_chat(user, "You need to equip [src] before taking out [handset].") + to_chat(user, span_warning("You need to equip [src] before taking out [handset].")) else if(!usr.put_in_hands(handset)) //Detach the handset into the user's hands - to_chat(user, "You need a free hand to hold the handset!") + to_chat(user, span_warning("You need a free hand to hold the handset!")) update_icon() //success //checks that the base unit is in the correct slot to be used @@ -91,7 +91,7 @@ if(ismob(handset.loc)) var/mob/M = handset.loc if(M.drop_from_inventory(handset, src)) - to_chat(user, "\The [handset] snaps back into the main unit.") + to_chat(user, span_notice("\The [handset] snaps back into the main unit.")) else handset.forceMove(src) @@ -138,7 +138,7 @@ return -1 if(!freq) return -1 - + //Only listen on main freq if(freq == frequency) return canhear_range diff --git a/code/game/objects/items/devices/scanners/gas.dm b/code/game/objects/items/devices/scanners/gas.dm index ee14422748..6fd6a1b98a 100644 --- a/code/game/objects/items/devices/scanners/gas.dm +++ b/code/game/objects/items/devices/scanners/gas.dm @@ -25,7 +25,7 @@ if (user.stat) return if (!user.IsAdvancedToolUser()) - to_chat(usr, "You don't have the dexterity to do this!") + to_chat(usr, span_warning("You don't have the dexterity to do this!")) return analyze_gases(src, user) diff --git a/code/game/objects/items/devices/scanners/guide.dm b/code/game/objects/items/devices/scanners/guide.dm index 935734ca0e..15c880e535 100644 --- a/code/game/objects/items/devices/scanners/guide.dm +++ b/code/game/objects/items/devices/scanners/guide.dm @@ -3,7 +3,7 @@ set desc = "Toggles whether or not \the [src] will provide guidance and instruction in addition to scanning." set category = "Object" guide = !guide - to_chat(usr, "You toggle \the [src]'s guidance system [guide ? "on" : "off"].") + to_chat(usr, span_notice("You toggle \the [src]'s guidance system [guide ? "on" : "off"].")) /obj/item/healthanalyzer/guide @@ -106,6 +106,6 @@ if(dat) peeb +="GUIDANCE SYSTEM BEGIN
" peeb += dat - peeb += "For more detailed information about patient condition, use the stationary scanner in medbay." + peeb += span_notice("For more detailed information about patient condition, use the stationary scanner in medbay.") user.show_message(peeb, 1) diff --git a/code/game/objects/items/devices/scanners/halogen.dm b/code/game/objects/items/devices/scanners/halogen.dm index 218ec9f953..2303c9deee 100644 --- a/code/game/objects/items/devices/scanners/halogen.dm +++ b/code/game/objects/items/devices/scanners/halogen.dm @@ -11,11 +11,11 @@ /obj/item/halogen_counter/attack(mob/living/M as mob, mob/living/user as mob) if(!iscarbon(M)) - to_chat(user, "This device can only scan organic beings!") + to_chat(user, span_warning("This device can only scan organic beings!")) return - user.visible_message("\The [user] has analyzed [M]'s radiation levels!", "Analyzing Results for [M]:") + user.visible_message(span_warning("\The [user] has analyzed [M]'s radiation levels!"), span_notice("Analyzing Results for [M]:")) if(M.radiation) - to_chat(user, "Radiation Level: [M.radiation]") + to_chat(user, span_notice("Radiation Level: [M.radiation]")) else - to_chat(user, "No radiation detected.") + to_chat(user, span_notice("No radiation detected.")) return diff --git a/code/game/objects/items/devices/scanners/health.dm b/code/game/objects/items/devices/scanners/health.dm index 117d2185c7..ad8029bc78 100644 --- a/code/game/objects/items/devices/scanners/health.dm +++ b/code/game/objects/items/devices/scanners/health.dm @@ -26,9 +26,9 @@ /obj/item/healthanalyzer/examine(mob/user) . = ..() if(guide) - . += "Guidance is currently enabled." + . += span_notice("Guidance is currently enabled.") else - . += "Guidance is currently disabled." + . += span_notice("Guidance is currently disabled.") /obj/item/healthanalyzer/do_surgery(mob/living/M, mob/living/user) if(user.a_intent != I_HELP) //in case it is ever used as a surgery tool @@ -42,20 +42,20 @@ /obj/item/healthanalyzer/proc/scan_mob(mob/living/M, mob/living/user) var/dat = "" if ((CLUMSY in user.mutations) && prob(50)) - user.visible_message("\The [user] has analyzed the floor's vitals!", "You try to analyze the floor's vitals!") + user.visible_message(span_warning("\The [user] has analyzed the floor's vitals!"), span_warning("You try to analyze the floor's vitals!")) dat += "Analyzing Results for the floor:
" dat += "Overall Status: Healthy
" dat += "\tDamage Specifics: 0-0-0-0
" dat += "Key: Suffocation/Toxin/Burns/Brute
" dat += "Body Temperature: ???" - user.show_message("[dat]", 1) + user.show_message(span_notice("[dat]"), 1) return if (!user.IsAdvancedToolUser()) - to_chat(user, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You don't have the dexterity to do this!")) return flick("[icon_state]-scan", src) //makes it so that it plays the scan animation on a succesful scan - user.visible_message("[user] has analyzed [M]'s vitals.","You have analyzed [M]'s vitals.") + user.visible_message(span_notice("[user] has analyzed [M]'s vitals."),span_notice("You have analyzed [M]'s vitals.")) if (!ishuman(M) || M.isSynthetic()) //these sensors are designed for organic life @@ -63,8 +63,8 @@ dat += "\tKey: [span_cyan("Suffocation")]/[span_green("Toxin")]/[span_orange("Burns")]/[span_red("Brute")]
" dat += "\tDamage Specifics: [span_cyan("?")] - [span_green("?")] - [span_orange("?")] - [span_red("?")]
" dat += "Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)
" - dat += "Warning: Blood Level ERROR: --% --cl. Type: ERROR
" - dat += "Subject's pulse: [span_red("-- bpm.")]" + dat += "[span_warning("Warning: Blood Level ERROR: --% --cl.")] [span_notice("Type: ERROR")]
" + dat += span_notice("Subject's pulse: [span_red("-- bpm.")]") user.show_message(dat, 1) return @@ -75,8 +75,10 @@ var/BR = M.getBruteLoss() > 50 ? "[M.getBruteLoss()]" : M.getBruteLoss() if(M.status_flags & FAKEDEATH) OX = fake_oxy > 50 ? "[fake_oxy]" : fake_oxy - dat += "Analyzing Results for [M]:
" - dat += "Overall Status: dead
" + dat += span_notice("Analyzing Results for [M]:") + dat += "
" + dat += span_notice("Overall Status: dead") + dat += "
" else dat += "Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "dead" : "[round((M.health/M.getMaxHealth())*100) ]% healthy"]
" dat += "\tKey: [span_cyan("Suffocation")]/[span_green("Toxin")]/[span_orange("Burns")]/[span_red("Brute")]
" @@ -84,32 +86,36 @@ dat += "Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)
" //VOREStation edit/addition starts if(M.timeofdeath && (M.stat == DEAD || (M.status_flags & FAKEDEATH))) - dat += "Time of Death: [worldtime2stationtime(M.timeofdeath)]
" + dat += span_notice("Time of Death: [worldtime2stationtime(M.timeofdeath)]") + dat += "
" var/tdelta = round(world.time - M.timeofdeath) if(tdelta < (DEFIB_TIME_LIMIT * 10)) - dat += "Subject died [DisplayTimeText(tdelta)] ago - resuscitation may be possible!
" + dat += span_notice("Subject died [DisplayTimeText(tdelta)] ago - resuscitation may be possible!") + dat += "
" //VOREStation edit/addition ends if(istype(M, /mob/living/carbon/human) && mode == 1) var/mob/living/carbon/human/H = M var/list/damaged = H.get_damaged_organs(1,1) - dat += "Localized Damage, Brute/Burn:
" + dat += span_notice("Localized Damage, Brute/Burn:") + dat += "
" if(length(damaged)>0) for(var/obj/item/organ/external/org in damaged) if(org.robotic >= ORGAN_ROBOT) continue else - dat += " [capitalize(org.name)]: [(org.brute_dam > 0) ? "[org.brute_dam]" : 0]" - dat += "[(org.status & ORGAN_BLEEDING)?"\[Bleeding\]":""] - " + dat += " [capitalize(org.name)]: [(org.brute_dam > 0) ? span_warning("[org.brute_dam]") : 0]" + dat += "[(org.status & ORGAN_BLEEDING)?span_danger("\[Bleeding\]"):""] - " dat += "[(org.burn_dam > 0) ? "[span_orange("[org.burn_dam]")]" : 0]
" else - dat += " Limbs are OK.
" + dat += span_notice(" Limbs are OK.") + dat += "
" OX = M.getOxyLoss() > 50 ? "[span_cyan("Severe oxygen deprivation detected")]" : "Subject bloodstream oxygen level normal" TX = M.getToxLoss() > 50 ? "[span_green("Dangerous amount of toxins detected")]" : "Subject bloodstream toxin level minimal" BU = M.getFireLoss() > 50 ? "[span_orange("Severe burn damage detected")]" : "Subject burn injury status O.K" BR = M.getBruteLoss() > 50 ? "[span_red("Severe anatomical damage detected")]" : "Subject brute-force injury status O.K" if(M.status_flags & FAKEDEATH) - OX = fake_oxy > 50 ? "Severe oxygen deprivation detected" : "Subject bloodstream oxygen level normal" + OX = fake_oxy > 50 ? span_warning("Severe oxygen deprivation detected") : "Subject bloodstream oxygen level normal" dat += "[OX] | [TX] | [BU] | [BR]
" if(M.radiation) if(advscan >= 2 && showadvscan == 1) @@ -124,9 +130,11 @@ severity = "Moderate" else if(M.radiation >= 100) severity = "Low" - dat += "[severity] levels of acute radiation sickness detected. [round(M.radiation/50)]Gy. [(severity == "Critical" || severity == "Lethal") ? " Immediate treatment advised." : ""]
" + dat += span_warning("[severity] levels of acute radiation sickness detected. [round(M.radiation/50)]Gy. [(severity == "Critical" || severity == "Lethal") ? " Immediate treatment advised." : ""]") + dat += "
" else - dat += "Acute radiation sickness detected.
" + dat += span_warning("Acute radiation sickness detected.") + dat += "
" if(M.accumulated_rads) if(advscan >= 2 && showadvscan == 1) var/severity = "" @@ -140,9 +148,11 @@ severity = "Mild" else if(M.accumulated_rads >= 100) severity = "Low" - dat += "[severity] levels of chronic radiation sickness detected. [round(M.accumulated_rads/50)]Gy.
" + dat += span_warning("[severity] levels of chronic radiation sickness detected. [round(M.accumulated_rads/50)]Gy.") + dat += "
" else - dat += "Chronic radiation sickness detected.
" + dat += span_warning("Chronic radiation sickness detected.") + dat += "
" if(iscarbon(M)) var/mob/living/carbon/C = M if(C.reagents.total_volume) @@ -151,88 +161,113 @@ var/unknownreagents[0] for(var/datum/reagent/R as anything in C.reagents.reagent_list) if(R.scannable) - reagentdata["[R.id]"] = "\t[round(C.reagents.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.volume > R.overdose) ? " - Overdose" : ""]
" + reagentdata["[R.id]"] = span_notice("\t[round(C.reagents.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.volume > R.overdose) ? " - [span_danger("Overdose")]" : ""]") + reagentdata["[R.id]"] += "
" else unknown++ - unknownreagents["[R.id]"] = "\t[round(C.reagents.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.volume > R.overdose) ? " - Overdose" : ""]
" + unknownreagents["[R.id]"] = span_notice("\t[round(C.reagents.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.volume > R.overdose) ? " - [span_danger("Overdose")]" : ""]") + unknownreagents["[R.id]"] += "
" if(reagentdata.len) - dat += "Beneficial reagents detected in subject's blood:
" + dat += span_notice("Beneficial reagents detected in subject's blood:") + dat += "
" for(var/d in reagentdata) dat += reagentdata[d] if(unknown) if(advscan >= 3 && showadvscan == 1) - dat += "Warning: Non-medical reagent[(unknown>1)?"s":""] detected in subject's blood:
" + dat += span_warning("Warning: Non-medical reagent[(unknown>1)?"s":""] detected in subject's blood:") + dat += "
" for(var/d in unknownreagents) dat += unknownreagents[d] else - dat += "Warning: Unknown substance[(unknown>1)?"s":""] detected in subject's blood.
" + dat += span_warning("Warning: Unknown substance[(unknown>1)?"s":""] detected in subject's blood.") + dat += "
" if(C.ingested && C.ingested.total_volume) var/unknown = 0 var/stomachreagentdata[0] var/stomachunknownreagents[0] for(var/datum/reagent/R as anything in C.ingested.reagent_list) if(R.scannable) - stomachreagentdata["[R.id]"] = "\t[round(C.ingested.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.volume > R.overdose) ? " - Overdose" : ""]
" + stomachreagentdata["[R.id]"] = span_notice("\t[round(C.ingested.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.volume > R.overdose) ? " - [span_danger("Overdose")]" : ""]") + stomachreagentdata["[R.id]"] += "
" if (advscan == 0 || showadvscan == 0) - dat += "[R.name] found in subject's stomach.
" + dat += span_notice("[R.name] found in subject's stomach.") + dat += "
" else ++unknown - stomachunknownreagents["[R.id]"] = "\t[round(C.ingested.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.volume > R.overdose) ? " - Overdose" : ""]
" + stomachunknownreagents["[R.id]"] = span_notice("\t[round(C.ingested.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.volume > R.overdose) ? " - [span_danger("Overdose")]" : ""]") + stomachunknownreagents["[R.id]"] += "
" if(advscan >= 1 && showadvscan == 1) - dat += "Beneficial reagents detected in subject's stomach:
" + dat += span_notice("Beneficial reagents detected in subject's stomach:") + dat += "
" for(var/d in stomachreagentdata) dat += stomachreagentdata[d] if(unknown) if(advscan >= 3 && showadvscan == 1) - dat += "Warning: Non-medical reagent[(unknown > 1)?"s":""] found in subject's stomach:
" + dat += span_warning("Warning: Non-medical reagent[(unknown > 1)?"s":""] found in subject's stomach:") + dat += "
" for(var/d in stomachunknownreagents) dat += stomachunknownreagents[d] else - dat += "Unknown substance[(unknown > 1)?"s":""] found in subject's stomach.
" + dat += span_warning("Unknown substance[(unknown > 1)?"s":""] found in subject's stomach.") + dat += "
" if(C.touching && C.touching.total_volume) var/unknown = 0 var/touchreagentdata[0] var/touchunknownreagents[0] for(var/datum/reagent/R as anything in C.touching.reagent_list) if(R.scannable) - touchreagentdata["[R.id]"] = "\t[round(C.touching.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.can_overdose_touch && R.volume > R.overdose) ? " - Overdose" : ""]
" + touchreagentdata["[R.id]"] = span_notice("\t[round(C.touching.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.can_overdose_touch && R.volume > R.overdose) ? " - [span_danger("Overdose")]" : ""]") + touchreagentdata["[R.id]"] += "
" if (advscan == 0 || showadvscan == 0) - dat += "[R.name] found in subject's dermis.
" + dat += span_notice("[R.name] found in subject's dermis.") + dat += "
" else ++unknown - touchunknownreagents["[R.id]"] = "\t[round(C.ingested.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.can_overdose_touch && R.volume > R.overdose) ? " - Overdose" : ""]
" + touchunknownreagents["[R.id]"] = span_notice("\t[round(C.ingested.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.can_overdose_touch && R.volume > R.overdose) ? " - [span_danger("Overdose")]" : ""]") + touchunknownreagents["[R.id]"] += "
" if(advscan >= 1 && showadvscan == 1) - dat += "Beneficial reagents detected in subject's dermis:
" + dat += span_notice("Beneficial reagents detected in subject's dermis:") + dat += "
" for(var/d in touchreagentdata) dat += touchreagentdata[d] if(unknown) if(advscan >= 3 && showadvscan == 1) - dat += "Warning: Non-medical reagent[(unknown > 1)?"s":""] found in subject's dermis:
" + dat += span_warning("Warning: Non-medical reagent[(unknown > 1)?"s":""] found in subject's dermis:") + dat += "
" for(var/d in touchunknownreagents) dat += touchunknownreagents[d] else - dat += "Unknown substance[(unknown > 1)?"s":""] found in subject's dermis.
" + dat += span_warning("Unknown substance[(unknown > 1)?"s":""] found in subject's dermis.") + dat += "
" if(C.virus2.len) for (var/ID in C.virus2) if (ID in virusDB) var/datum/data/record/V = virusDB[ID] - dat += "Warning: Pathogen [V.fields["name"]] detected in subject's blood. Known antigen : [V.fields["antigen"]]
" + dat += span_warning("Warning: Pathogen [V.fields["name"]] detected in subject's blood. Known antigen : [V.fields["antigen"]]") + dat += "
" else - dat += "Warning: Unknown pathogen detected in subject's blood.
" + dat += span_warning("Warning: Unknown pathogen detected in subject's blood.") + dat += "
" if (M.getCloneLoss()) - dat += "Subject appears to have been imperfectly cloned.
" + dat += span_warning("Subject appears to have been imperfectly cloned.") + dat += "
" // if (M.reagents && M.reagents.get_reagent_amount("inaprovaline")) -// user.show_message("Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals.") +// user.show_message(span_notice("Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals.")) if (M.has_brain_worms()) - dat += "Subject suffering from aberrant brain activity. Recommend further scanning.
" + dat += span_warning("Subject suffering from aberrant brain activity. Recommend further scanning.") + dat += "
" else if (M.getBrainLoss() >= 60 || !M.has_brain()) - dat += "Subject is brain dead.
" + dat += span_warning("Subject is brain dead.") + dat += "
" else if (M.getBrainLoss() >= 25) - dat += "Severe brain damage detected. Subject likely to have a traumatic brain injury.
" + dat += span_warning("Severe brain damage detected. Subject likely to have a traumatic brain injury.") + dat += "
" else if (M.getBrainLoss() >= 10) - dat += "Significant brain damage detected. Subject may have had a concussion.
" + dat += span_warning("Significant brain damage detected. Subject may have had a concussion.") + dat += "
" else if (M.getBrainLoss() >= 1) - dat += "Minor brain damage detected.
" + dat += span_warning("Minor brain damage detected.") + dat += "
" if(ishuman(M)) var/mob/living/carbon/human/H = M for(var/obj/item/organ/internal/appendix/a in H.internal_organs) @@ -244,9 +279,11 @@ else if(a.inflamed >= 1) severity = "Mild" if(severity) - dat += "[severity] inflammation detected in subject [a.name].
" + dat += span_warning("[severity] inflammation detected in subject [a.name].") + dat += "
" if(HUSK in H.mutations) - dat += "Anatomical structure lost, resuscitation not possible!
" + dat += span_danger("Anatomical structure lost, resuscitation not possible!") + dat += "
" // Infections, fractures, and IB var/basic_fracture = 0 // If it's a basic scanner var/basic_ib = 0 // If it's a basic scanner @@ -268,36 +305,45 @@ dam_adj = "Moderate" else dam_adj = "Mild" - dat += "[dam_adj] damage detected to subject's [i.name].
" + dat += span_warning("[dam_adj] damage detected to subject's [i.name].") + dat += "
" else - dat += "Damage detected to subject's [i.name].
" + dat += span_warning("Damage detected to subject's [i.name].") + dat += "
" if(int_damage_acc >= 1 && (advscan < 2 || !showadvscan)) - dat += "Damage detected to subject's internal organs.
" + dat += span_warning("Damage detected to subject's internal organs.") + dat += "
" for(var/obj/item/organ/external/e in H.organs) if(!e) continue // Broken limbs if(e.status & ORGAN_BROKEN) if((e.name in list(BP_L_ARM, BP_R_ARM, BP_L_LEG, BP_R_LEG, BP_HEAD, BP_TORSO, BP_GROIN)) && (!e.splinted)) - fracture_dat += "Unsecured fracture in subject [e.name]. Splinting recommended for transport.
" + fracture_dat += span_warning("Unsecured fracture in subject [e.name]. Splinting recommended for transport.") + fracture_dat += "
" else if(advscan >= 1 && showadvscan == 1) - fracture_dat += "Bone fractures detected in subject [e.name].
" + fracture_dat += span_warning("Bone fractures detected in subject [e.name].") + fracture_dat += "
" else basic_fracture = 1 // Infections if(e.has_infected_wound()) - dat += "Infected wound detected in subject [e.name]. Disinfection recommended.
" + dat += span_warning("Infected wound detected in subject [e.name]. Disinfection recommended.") + dat += "
" // IB for(var/datum/wound/W in e.wounds) if(W.internal) if(advscan >= 1 && showadvscan == 1) - ib_dat += "Internal bleeding detected in subject [e.name].
" + ib_dat += span_warning("Internal bleeding detected in subject [e.name].") + ib_dat += "
" else basic_ib = 1 if(basic_fracture) - fracture_dat += "Bone fractures detected. Advanced scanner required for location.
" + fracture_dat += span_warning("Bone fractures detected. Advanced scanner required for location.") + fracture_dat += "
" if(basic_ib) - ib_dat += "Internal bleeding detected. Advanced scanner required for location.
" + ib_dat += span_warning("Internal bleeding detected. Advanced scanner required for location.") + ib_dat += "
" dat += fracture_dat dat += infection_dat dat += ib_dat @@ -309,25 +355,30 @@ var/blood_type = H.dna.b_type var/blood_reagent = H.species.blood_reagents if(blood_volume <= H.species.blood_volume*H.species.blood_level_danger) - dat += "Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl. Type: [blood_type]. Basis: [blood_reagent].
" + dat += span_danger("Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl. Type: [blood_type]. Basis: [blood_reagent].") + dat += "
" else if(blood_volume <= H.species.blood_volume*H.species.blood_level_warning) - dat += "Warning: Blood Level VERY LOW: [blood_percent]% [blood_volume]cl. Type: [blood_type]. Basis: [blood_reagent].
" + dat += span_danger("Warning: Blood Level VERY LOW: [blood_percent]% [blood_volume]cl. Type: [blood_type]. Basis: [blood_reagent].") + dat += "
" else if(blood_volume <= H.species.blood_volume*H.species.blood_level_safe) - dat += "Warning: Blood Level LOW: [blood_percent]% [blood_volume]cl. Type: [blood_type]. Basis: [blood_reagent].
" + dat += span_danger("Warning: Blood Level LOW: [blood_percent]% [blood_volume]cl. Type: [blood_type]. Basis: [blood_reagent].") + dat += "
" else - dat += "Blood Level Normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]. Basis: [blood_reagent].
" - dat += "Subject's pulse: [H.get_pulse(GETPULSE_TOOL)] bpm.
" // VORE Edit: Missed a linebreak here. + dat += span_notice("Blood Level Normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]. Basis: [blood_reagent].") + dat += "
" + dat += span_notice("Subject's pulse: [H.pulse == PULSE_THREADY || H.pulse == PULSE_NONE ? span_red(H.get_pulse(GETPULSE_TOOL)) : span_blue(H.get_pulse(GETPULSE_TOOL))] bpm.") // VORE Edit: Missed a linebreak here. + dat += "
" if(istype(H.species, /datum/species/xenochimera)) // VOREStation Edit Start: Visible feedback for medmains on Xenochimera. if(H.stat == DEAD && H.revive_ready == REVIVING_READY && !H.hasnutriment()) - dat += "WARNING: Protein levels low. Subject incapable of reconstitution." + dat += span_danger("WARNING: Protein levels low. Subject incapable of reconstitution.") else if(H.revive_ready == REVIVING_NOW) - dat += "Subject is undergoing form reconstruction. Estimated time to finish is in: [round((H.revive_finished - world.time) / 10)] seconds." + dat += span_warning("Subject is undergoing form reconstruction. Estimated time to finish is in: [round((H.revive_finished - world.time) / 10)] seconds.") else if(H.revive_ready == REVIVING_DONE) - dat += "Subject is ready to hatch. Transfer to dark room for holding with food available." + dat += span_notice("Subject is ready to hatch. Transfer to dark room for holding with food available.") else if(H.stat == DEAD) - dat+= "WARNING: Defib will cause extreme pain and set subject feral. Sedation recommended prior to defibrillation." + dat+= span_danger("WARNING: Defib will cause extreme pain and set subject feral. Sedation recommended prior to defibrillation.") else // If they bop them and they're not dead or reviving, give 'em a little notice. - dat += "Subject is a Xenochimera. Treat accordingly." + dat += span_notice("Subject is a Xenochimera. Treat accordingly.") // VOREStation Edit End user.show_message(dat, 1) if(guide) diff --git a/code/game/objects/items/devices/scanners/mass_spectrometer.dm b/code/game/objects/items/devices/scanners/mass_spectrometer.dm index 1647dbf65c..01d12d73a0 100644 --- a/code/game/objects/items/devices/scanners/mass_spectrometer.dm +++ b/code/game/objects/items/devices/scanners/mass_spectrometer.dm @@ -32,14 +32,14 @@ if (user.stat) return if (!user.IsAdvancedToolUser()) - to_chat(user, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You don't have the dexterity to do this!")) return if(reagents.total_volume) var/list/blood_traces = list() for(var/datum/reagent/R in reagents.reagent_list) if(R.id != "blood") reagents.clear_reagents() - to_chat(user, "The sample was contaminated! Please insert another sample") + to_chat(user, span_warning("The sample was contaminated! Please insert another sample")) return else blood_traces = params2list(R.data["trace_chem"]) diff --git a/code/game/objects/items/devices/scanners/sleevemate.dm b/code/game/objects/items/devices/scanners/sleevemate.dm index 563d4ef37d..35ab35af3e 100644 --- a/code/game/objects/items/devices/scanners/sleevemate.dm +++ b/code/game/objects/items/devices/scanners/sleevemate.dm @@ -82,11 +82,11 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob if(ishuman(M)) scan_mob(M, user) else - to_chat(user,"Not a compatible subject to work with!") + to_chat(user,span_warning("Not a compatible subject to work with!")) /obj/item/sleevemate/attack_self(mob/living/user) if(!stored_mind) - to_chat(user,"No stored mind in \the [src].") + to_chat(user,span_warning("No stored mind in \the [src].")) return var/choice = tgui_alert(user,"What would you like to do?","Stored: [stored_mind.name]",list("Delete","Backup","Cancel")) @@ -94,10 +94,10 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob return switch(choice) if("Delete") - to_chat(user,"Internal copy of [stored_mind.name] deleted.") + to_chat(user,span_notice("Internal copy of [stored_mind.name] deleted.")) clear_mind() if("Backup") - to_chat(user,"Internal copy of [stored_mind.name] backed up to database.") + to_chat(user,span_notice("Internal copy of [stored_mind.name] backed up to database.")) our_db.m_backup(stored_mind,null,one_time = TRUE) if("Cancel") return @@ -165,7 +165,7 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob output += "
" output += "Soulcatcher detected ([SC.brainmobs.len] minds)
" for(var/mob/living/carbon/brain/caught_soul/mind in SC.brainmobs) - output += "[mind.name]: [mind.transient == FALSE ? "\[Load\]" : "Incompatible"]
" + output += "[mind.name]: [mind.transient == FALSE ? "\[Load\]" : span_warning("Incompatible")]
" if(stored_mind) output += "Store in Soulcatcher: \[Perform\]
" @@ -177,23 +177,23 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob //Sanity checking/href-hacking checking if(usr.get_active_hand() != src) - to_chat(usr,"You're not holding \the [src].") + to_chat(usr,span_warning("You're not holding \the [src].")) return var/target_ref = href_list["target"] var/mob/living/target = locate(target_ref) in mob_list if(!target) - to_chat(usr,"Unable to operate on that target.") + to_chat(usr,span_warning("Unable to operate on that target.")) return if(!usr.Adjacent(target)) - to_chat(usr,"You are too far from that target.") + to_chat(usr,span_warning("You are too far from that target.")) return //The actual options if(href_list["mindscan"]) if(!target.mind || (target.mind.name in prevent_respawns)) - to_chat(usr,"Target seems totally braindead.") + to_chat(usr,span_warning("Target seems totally braindead.")) return var/nif @@ -202,55 +202,55 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob nif = H.nif persist_nif_data(H) - usr.visible_message("[usr] begins scanning [target]'s mind.","You begin scanning [target]'s mind.") + usr.visible_message("[usr] begins scanning [target]'s mind.",span_notice("You begin scanning [target]'s mind.")) if(do_after(usr,8 SECONDS,target)) our_db.m_backup(target.mind,nif,one_time = TRUE) - to_chat(usr,"Mind backed up!") + to_chat(usr,span_notice("Mind backed up!")) else - to_chat(usr,"You must remain close to your target!") + to_chat(usr,span_warning("You must remain close to your target!")) return if(href_list["bodyscan"]) if(!ishuman(target)) - to_chat(usr,"Target is not of an acceeptable body type.") + to_chat(usr,span_warning("Target is not of an acceeptable body type.")) return var/mob/living/carbon/human/H = target - usr.visible_message("[usr] begins scanning [target]'s body.","You begin scanning [target]'s body.") + usr.visible_message("[usr] begins scanning [target]'s body.",span_notice("You begin scanning [target]'s body.")) if(do_after(usr,8 SECONDS,target)) var/datum/transhuman/body_record/BR = new() BR.init_from_mob(H, TRUE, TRUE, database_key = db_key) - to_chat(usr,"Body scanned!") + to_chat(usr,span_notice("Body scanned!")) else - to_chat(usr,"You must remain close to your target!") + to_chat(usr,span_warning("You must remain close to your target!")) return if(href_list["mindsteal"]) if(!target.mind || (target.mind.name in prevent_respawns)) - to_chat(usr,"Target seems totally braindead.") + to_chat(usr,span_warning("Target seems totally braindead.")) return if(stored_mind) - to_chat(usr,"There is already someone's mind stored inside") + to_chat(usr,span_warning("There is already someone's mind stored inside")) return var/choice = tgui_alert(usr,"This will remove the target's mind from their body (and from the game as long as they're in the sleevemate). You can put them into a (mindless) body, a NIF, or back them up for normal resleeving, but you should probably have a plan in advance so you don't leave them unable to interact for too long. Continue?","Confirmation",list("Continue","Cancel")) if(choice == "Continue" && usr.get_active_hand() == src && usr.Adjacent(target)) - usr.visible_message("[usr] begins downloading [target]'s mind!","You begin downloading [target]'s mind!") + usr.visible_message(span_warning("[usr] begins downloading [target]'s mind!"),span_notice("You begin downloading [target]'s mind!")) if(do_after(usr,35 SECONDS,target)) //This is powerful, yo. if(!stored_mind && target.mind) get_mind(target) - to_chat(usr,"Mind downloaded!") + to_chat(usr,span_notice("Mind downloaded!")) return if(href_list["mindput"]) if(!stored_mind) - to_chat(usr,"\The [src] no longer has a stored mind.") + to_chat(usr,span_warning("\The [src] no longer has a stored mind.")) return var/mob/living/carbon/human/H = target @@ -271,11 +271,11 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob put_mind(sleevemate_mob) SC.catch_mob(sleevemate_mob) - to_chat(usr,"Mind transferred into Soulcatcher!") + to_chat(usr,span_notice("Mind transferred into Soulcatcher!")) if(href_list["mindupload"]) if(!stored_mind) - to_chat(usr,"\The [src] no longer has a stored mind.") + to_chat(usr,span_warning("\The [src] no longer has a stored mind.")) return if(!istype(target)) @@ -284,20 +284,20 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob if(istype(target, /mob/living/carbon/human)) var/mob/living/carbon/human/H = target if(H.resleeve_lock && stored_mind.loaded_from_ckey != H.resleeve_lock) - to_chat(usr,"\The [H] is protected from impersonation!") + to_chat(usr,span_warning("\The [H] is protected from impersonation!")) return - usr.visible_message("[usr] begins uploading someone's mind into [target]!","You begin uploading a mind into [target]!") + usr.visible_message(span_warning("[usr] begins uploading someone's mind into [target]!"),span_notice("You begin uploading a mind into [target]!")) if(do_after(usr,35 SECONDS,target)) if(!stored_mind) - to_chat(usr,"\The [src] no longer has a stored mind.") + to_chat(usr,span_warning("\The [src] no longer has a stored mind.")) return put_mind(target) - to_chat(usr,"Mind transferred into [target]!") + to_chat(usr,span_notice("Mind transferred into [target]!")) if(href_list["mindrelease"]) if(stored_mind) - to_chat(usr,"There is already someone's mind stored inside") + to_chat(usr,span_warning("There is already someone's mind stored inside")) return var/mob/living/carbon/human/H = target var/datum/nifsoft/soulcatcher/SC = H.nif.imp_check(NIF_SOULCATCHER) @@ -307,9 +307,9 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob if(soul.name == href_list["mindrelease"]) get_mind(soul) qdel(soul) - to_chat(usr,"Mind downloaded!") + to_chat(usr,span_notice("Mind downloaded!")) return - to_chat(usr,"Unable to find that mind in Soulcatcher!") + to_chat(usr,span_notice("Unable to find that mind in Soulcatcher!")) /obj/item/sleevemate/update_icon() if(stored_mind) @@ -318,7 +318,7 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob icon_state = initial(icon_state) /obj/item/sleevemate/emag_act(var/remaining_charges, var/mob/user) - to_chat(user,"You hack [src]!") + to_chat(user,span_danger("You hack [src]!")) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) spark_system.start() diff --git a/code/game/objects/items/devices/scanners/slime.dm b/code/game/objects/items/devices/scanners/slime.dm index 1a2c08913c..8baeebeecd 100644 --- a/code/game/objects/items/devices/scanners/slime.dm +++ b/code/game/objects/items/devices/scanners/slime.dm @@ -24,17 +24,17 @@ user.show_message("Potental to mutate into [english_list(mutations)] colors.
Extract potential: [S.cores]
Nutrition: [S.nutrition]/[S.max_nutrition]") if (S.nutrition < S.get_starve_nutrition()) - user.show_message("Warning: Subject is starving!") + user.show_message(span_alert("Warning: Subject is starving!")) else if (S.nutrition < S.get_hunger_nutrition()) - user.show_message("Warning: Subject is hungry.") + user.show_message(span_warning("Warning: Subject is hungry.")) user.show_message("Electric change strength: [S.power_charge]") if(S.has_AI()) var/datum/ai_holder/simple_mob/xenobio_slime/AI = S.ai_holder if(AI.resentment) - user.show_message("Warning: Subject is harboring resentment.") + user.show_message(span_warning("Warning: Subject is harboring resentment.")) if(AI.rabid) - user.show_message("Subject is enraged and extremely dangerous!") + user.show_message(span_danger("Subject is enraged and extremely dangerous!")) if(S.harmless) user.show_message("Subject has been pacified.") if(S.unity) diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm index 0375f4f8f5..e527e7e544 100644 --- a/code/game/objects/items/devices/spy_bug.dm +++ b/code/game/objects/items/devices/spy_bug.dm @@ -24,7 +24,7 @@ /obj/item/camerabug/attack_self(mob/user) if(user.a_intent == I_HURT) - to_chat(user, "You crush the [src] under your foot, breaking it.") + to_chat(user, span_notice("You crush the [src] under your foot, breaking it.")) visible_message("[user.name] crushes the [src] under their foot, breaking it!") new brokentype(get_turf(src)) spawn(0) @@ -100,11 +100,11 @@ if(istype(W, /obj/item/bug_monitor)) var/obj/item/bug_monitor/SM = W if(!linkedmonitor) - to_chat(user, "\The [src] has been paired with \the [SM].") + to_chat(user, span_notice("\The [src] has been paired with \the [SM].")) SM.pair(src) linkedmonitor = SM else if (linkedmonitor == SM) - to_chat(user, "\The [src] has been unpaired from \the [SM].") + to_chat(user, span_notice("\The [src] has been unpaired from \the [SM].")) linkedmonitor.unpair(src) linkedmonitor = null else @@ -114,7 +114,7 @@ if(isturf(loc)) anchored = !anchored - to_chat(user, "You [anchored ? "" : "un"]secure \the [src].") + to_chat(user, span_notice("You [anchored ? "" : "un"]secure \the [src].")) update_icon() return @@ -202,7 +202,7 @@ if(!T || !is_on_same_plane_or_station(T.z, user.z) || !selected_camera.can_use()) user.unset_machine() user.reset_view(null) - to_chat(user, "Link to [selected_camera] has been lost.") + to_chat(user, span_notice("Link to [selected_camera] has been lost.")) src.unpair(selected_camera.loc) sleep(90) else @@ -217,8 +217,8 @@ return if(!cameras.len) - to_chat(user, "No paired cameras detected!") - to_chat(user, "Bring a camera in contact with this device to pair the camera.") + to_chat(user, span_warning("No paired cameras detected!")) + to_chat(user, span_warning("Bring a camera in contact with this device to pair the camera.")) return return 1 @@ -272,4 +272,4 @@ canhear_range = 1 name = "spy device" icon_state = "syn_cypherkey" - */ \ No newline at end of file + */ diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index e4da5e04a4..f38212b9a9 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -143,7 +143,7 @@ turn_off() else turn_on() - to_chat(user, "You switch \the [src] [on ? "on" : "off"].") + to_chat(user, span_notice("You switch \the [src] [on ? "on" : "off"].")) /obj/item/suit_cooling_unit/attackby(obj/item/W as obj, mob/user as mob) if (W.has_tool_quality(TOOL_SCREWDRIVER)) @@ -238,7 +238,7 @@ /obj/item/suit_cooling_unit/emergency/attackby(obj/item/W as obj, mob/user as mob) if (W.has_tool_quality(TOOL_SCREWDRIVER)) - to_chat(user, "This cooler's cell is permanently installed!") + to_chat(user, span_warning("This cooler's cell is permanently installed!")) return return ..() diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 91598b06b1..6e9e0dc506 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -40,13 +40,13 @@ /obj/item/taperecorder/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/rectape)) if(mytape) - to_chat(user, "There's already a tape inside.") + to_chat(user, span_notice("There's already a tape inside.")) return if(!user.unEquip(I)) return I.forceMove(src) mytape = I - to_chat(user, "You insert [I] into [src].") + to_chat(user, span_notice("You insert [I] into [src].")) update_icon() return ..() @@ -73,15 +73,15 @@ if(usr.incapacitated()) return if(!mytape) - to_chat(usr, "There's no tape in \the [src].") + to_chat(usr, span_notice("There's no tape in \the [src].")) return if(emagged) - to_chat(usr, "The tape seems to be stuck inside.") + to_chat(usr, span_notice("The tape seems to be stuck inside.")) return if(playing || recording) stop() - to_chat(usr, "You remove [mytape] from [src].") + to_chat(usr, span_notice("You remove [mytape] from [src].")) usr.put_in_hands(mytape) mytape = null update_icon() @@ -116,17 +116,17 @@ if(emagged == 0) emagged = 1 recording = 0 - to_chat(user, "PZZTTPFFFT") + to_chat(user, span_warning("PZZTTPFFFT")) update_icon() return 1 else - to_chat(user, "It is already emagged!") + to_chat(user, span_warning("It is already emagged!")) /obj/item/taperecorder/proc/explode() var/turf/T = get_turf(loc) if(ismob(loc)) var/mob/M = loc - to_chat(M, "\The [src] explodes!") + to_chat(M, span_danger("\The [src] explodes!")) if(T) T.hotspot_expose(700,125) explosion(T, -1, -1, 0, 4) @@ -140,22 +140,22 @@ if(usr.incapacitated()) return if(!mytape) - to_chat(usr, "There's no tape!") + to_chat(usr, span_notice("There's no tape!")) return if(mytape.ruined) - to_chat(usr, "The tape recorder makes a scratchy noise.") + to_chat(usr, span_warning("The tape recorder makes a scratchy noise.")) return if(recording) - to_chat(usr, "You're already recording!") + to_chat(usr, span_notice("You're already recording!")) return if(playing) - to_chat(usr, "You can't record when playing!") + to_chat(usr, span_notice("You can't record when playing!")) return if(emagged) - to_chat(usr, "The tape recorder makes a scratchy noise.") + to_chat(usr, span_warning("The tape recorder makes a scratchy noise.")) return if(mytape.used_capacity < mytape.max_capacity) - to_chat(usr, "Recording started.") + to_chat(usr, span_notice("Recording started.")) recording = 1 update_icon() @@ -168,14 +168,14 @@ if(mytape.used_capacity >= mytape.max_capacity) if(ismob(loc)) var/mob/M = loc - to_chat(M, "The tape is full.") + to_chat(M, span_notice("The tape is full.")) stop_recording() update_icon() return else - to_chat(usr, "The tape is full.") + to_chat(usr, span_notice("The tape is full.")) /obj/item/taperecorder/proc/stop_recording() @@ -185,7 +185,7 @@ mytape.record_speech("Recording stopped.") if(ismob(loc)) var/mob/M = loc - to_chat(M, "Recording stopped.") + to_chat(M, span_notice("Recording stopped.")) /obj/item/taperecorder/verb/stop() @@ -200,10 +200,10 @@ else if(playing) playing = 0 update_icon() - to_chat(usr, "Playback stopped.") + to_chat(usr, span_notice("Playback stopped.")) return else - to_chat(usr, "Stop what?") + to_chat(usr, span_notice("Stop what?")) /obj/item/taperecorder/verb/wipe_tape() @@ -213,19 +213,19 @@ if(usr.incapacitated()) return if(emagged) - to_chat(usr, "The tape recorder makes a scratchy noise.") + to_chat(usr, span_warning("The tape recorder makes a scratchy noise.")) return if(mytape.ruined) - to_chat(usr, "The tape recorder makes a scratchy noise.") + to_chat(usr, span_warning("The tape recorder makes a scratchy noise.")) return if(recording || playing) - to_chat(usr, "You can't wipe the tape while playing or recording!") + to_chat(usr, span_notice("You can't wipe the tape while playing or recording!")) return else if(mytape.storedinfo) mytape.storedinfo.Cut() if(mytape.timestamp) mytape.timestamp.Cut() mytape.used_capacity = 0 - to_chat(usr, "You wipe the tape.") + to_chat(usr, span_notice("You wipe the tape.")) return @@ -236,20 +236,20 @@ if(usr.incapacitated()) return if(!mytape) - to_chat(usr, "There's no tape!") + to_chat(usr, span_notice("There's no tape!")) return if(mytape.ruined) - to_chat(usr, "The tape recorder makes a scratchy noise.") + to_chat(usr, span_warning("The tape recorder makes a scratchy noise.")) return if(recording) - to_chat(usr, "You can't playback when recording!") + to_chat(usr, span_notice("You can't playback when recording!")) return if(playing) - to_chat(usr, "You're already playing!") + to_chat(usr, span_notice("You're already playing!")) return playing = 1 update_icon() - to_chat(usr, "Playing started.") + to_chat(usr, span_notice("Playing started.")) for(var/i=1 , i < mytape.max_capacity , i++) if(!mytape || !playing) break @@ -308,22 +308,22 @@ if(usr.incapacitated()) return if(!mytape) - to_chat(usr, "There's no tape!") + to_chat(usr, span_notice("There's no tape!")) return if(mytape.ruined) - to_chat(usr, "The tape recorder makes a scratchy noise.") + to_chat(usr, span_warning("The tape recorder makes a scratchy noise.")) return if(emagged) - to_chat(usr, "The tape recorder makes a scratchy noise.") + to_chat(usr, span_warning("The tape recorder makes a scratchy noise.")) return if(!canprint) - to_chat(usr, "The recorder can't print that fast!") + to_chat(usr, span_notice("The recorder can't print that fast!")) return if(recording || playing) - to_chat(usr, "You can't print the transcript while playing or recording!") + to_chat(usr, span_notice("You can't print the transcript while playing or recording!")) return - to_chat(usr, "Transcript printed.") + to_chat(usr, span_notice("Transcript printed.")) var/obj/item/paper/P = new /obj/item/paper(get_turf(src)) var/t1 = "Transcript:

" for(var/i=1,mytape.storedinfo.len >= i,i++) @@ -385,7 +385,7 @@ /obj/item/rectape/attack_self(mob/user) if(!ruined) - to_chat(user, "You pull out all the tape!") + to_chat(user, span_notice("You pull out all the tape!")) ruin() @@ -412,10 +412,10 @@ /obj/item/rectape/attackby(obj/item/I, mob/user, params) if(ruined && I.has_tool_quality(TOOL_SCREWDRIVER)) - to_chat(user, "You start winding the tape back in...") + to_chat(user, span_notice("You start winding the tape back in...")) playsound(src, I.usesound, 50, 1) if(do_after(user, 120 * I.toolspeed, target = src)) - to_chat(user, "You wound the tape back in.") + to_chat(user, span_notice("You wound the tape back in.")) fix() return else if(istype(I, /obj/item/pen)) @@ -425,10 +425,10 @@ new_name = sanitizeSafe(new_name) if(new_name) name = "tape - '[new_name]'" - to_chat(user, "You label the tape '[new_name]'.") + to_chat(user, span_notice("You label the tape '[new_name]'.")) else name = "tape" - to_chat(user, "You scratch off the label.") + to_chat(user, span_notice("You scratch off the label.")) return ..() diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 8ffdcd031d..6f416945f5 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -32,7 +32,7 @@ effective or pretty fucking useless. /obj/item/batterer/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) if(!user) return if(times_used >= max_uses) - to_chat(user, "The mind batterer has been burnt out!") + to_chat(user, span_warning("The mind batterer has been burnt out!")) return var/list/affected = list() @@ -44,15 +44,15 @@ effective or pretty fucking useless. M.Weaken(rand(10,20)) if(prob(25)) M.Stun(rand(5,10)) - to_chat(M, "You feel a tremendous, paralyzing wave flood your mind.") + to_chat(M, span_danger("You feel a tremendous, paralyzing wave flood your mind.")) else - to_chat(M, "You feel a sudden, electric jolt travel through your head.") + to_chat(M, span_danger("You feel a sudden, electric jolt travel through your head.")) add_attack_logs(user,affected,"Used a [name]") playsound(src, 'sound/misc/interference.ogg', 50, 1) - to_chat(user, "You trigger [src].") + to_chat(user, span_notice("You trigger [src].")) times_used += 1 if(times_used >= max_uses) icon_state = "battererburnt" diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 870e8c3a8c..535809bc4f 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -14,19 +14,19 @@ var/turf/location = get_turf(src) // For admin logs if(istype(item, /obj/item/tank)) if(tank_one && tank_two) - to_chat(user, "There are already two tanks attached, remove one first.") + to_chat(user, span_warning("There are already two tanks attached, remove one first.")) return if(!tank_one) tank_one = item user.drop_item() item.forceMove(src) - to_chat(user, "You attach the tank to the transfer valve.") + to_chat(user, span_notice("You attach the tank to the transfer valve.")) else if(!tank_two) tank_two = item user.drop_item() item.forceMove(src) - to_chat(user, "You attach the tank to the transfer valve.") + to_chat(user, span_notice("You attach the tank to the transfer valve.")) message_admins("[key_name_admin(user)] attached both tanks to a transfer valve. [ADMIN_JMP(location)]") log_game("[key_name_admin(user)] attached both tanks to a transfer valve.") @@ -36,15 +36,15 @@ else if(isassembly(item)) var/obj/item/assembly/A = item if(A.secured) - to_chat(user, "The device is secured.") + to_chat(user, span_notice("The device is secured.")) return if(attached_device) - to_chat(user, "There is already an device attached to the valve, remove it first.") + to_chat(user, span_warning("There is already an device attached to the valve, remove it first.")) return user.remove_from_mob(item) attached_device = A A.forceMove(src) - to_chat(user, "You attach the [item] to the valve controls and secure it.") + to_chat(user, span_notice("You attach the [item] to the valve controls and secure it.")) A.holder = src A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb). diff --git a/code/game/objects/items/devices/translator.dm b/code/game/objects/items/devices/translator.dm index 8fba3e20af..593bd0be7b 100644 --- a/code/game/objects/items/devices/translator.dm +++ b/code/game/objects/items/devices/translator.dm @@ -18,20 +18,20 @@ if(langset) if(langset && ((langset.flags & NONVERBAL) || (langset.flags & HIVEMIND) || (!langset.machine_understands))) //Nonverbal means no spoken words to translate, so I didn't see the need to remove it. - to_chat(user, "\The [src] cannot output that language.") + to_chat(user, span_warning("\The [src] cannot output that language.")) return else listening = 1 listening_objects |= src if(mult_icons) icon_state = "[initial(icon_state)]1" - to_chat(user, "You enable \the [src], translating into [langset.name].") + to_chat(user, span_notice("You enable \the [src], translating into [langset.name].")) else //Turning OFF listening = 0 listening_objects -= src langset = null icon_state = "[initial(icon_state)]" - to_chat(user, "You disable \the [src].") + to_chat(user, span_notice("You disable \the [src].")) /obj/item/universal_translator/hear_talk(mob/M, list/message_pieces, verb) if(!listening || !istype(M)) @@ -71,7 +71,7 @@ if(!L.say_understands(null, langset)) new_message = langset.scramble(new_message) - to_chat(L, "[src] translates, \"[new_message]\"") + to_chat(L, span_filter_say("[src] translates, \"[new_message]\"")) /obj/item/universal_translator/proc/user_understands(mob/M, mob/living/L, list/message_pieces) for(var/datum/multilingual_say_piece/S in message_pieces) @@ -87,4 +87,4 @@ w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS visual = 0 - audio = 1 \ No newline at end of file + audio = 1 diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm index 92748d7ac9..91fc16fa21 100644 --- a/code/game/objects/items/devices/translocator_vr.dm +++ b/code/game/objects/items/devices/translocator_vr.dm @@ -94,15 +94,15 @@ /obj/item/perfect_tele/proc/unload_ammo(mob/user, var/ignore_inactive_hand_check = 0) if(battery_lock) - to_chat(user,"[src] does not have a battery port.") + to_chat(user,span_notice("[src] does not have a battery port.")) return if((user.get_inactive_hand() == src || ignore_inactive_hand_check) && power_source) - to_chat(user,"You eject \the [power_source] from \the [src].") + to_chat(user,span_notice("You eject \the [power_source] from \the [src].")) user.put_in_hands(power_source) power_source = null update_icon() else - to_chat(user,"[src] does not have a power cell.") + to_chat(user,span_notice("[src] does not have a power cell.")) /obj/item/perfect_tele/proc/check_menu(var/mob/living/user) if(!istype(user)) @@ -132,7 +132,7 @@ This device records all warnings given and teleport events for admin review in c else if(choice == "New Beacon") if(beacons_left <= 0) - to_chat(user, "The translocator can't support any more beacons!") + to_chat(user, span_warning("The translocator can't support any more beacons!")) return var/new_name = html_encode(tgui_input_text(user,"New beacon's name (2-20 char):","[src]",null,20)) @@ -140,11 +140,11 @@ This device records all warnings given and teleport events for admin review in c return if(length(new_name) > 20 || length(new_name) < 2) - to_chat(user, "Entered name length invalid (must be longer than 2, no more than than 20).") + to_chat(user, span_warning("Entered name length invalid (must be longer than 2, no more than than 20).")) return if(new_name in beacons) - to_chat(user, "No duplicate names, please. '[new_name]' exists already.") + to_chat(user, span_warning("No duplicate names, please. '[new_name]' exists already.")) return var/obj/item/perfect_tele_beacon/nb = new(get_turf(src)) @@ -168,19 +168,19 @@ This device records all warnings given and teleport events for admin review in c power_source.update_icon() //Why doesn't a cell do this already? :| user.unEquip(power_source) power_source.forceMove(src) - to_chat(user,"You insert \the [power_source] into \the [src].") + to_chat(user,span_notice("You insert \the [power_source] into \the [src].")) update_icon() else if(istype(W,/obj/item/perfect_tele_beacon)) var/obj/item/perfect_tele_beacon/tb = W if(tb.tele_name in beacons) - to_chat(user,"You re-insert \the [tb] into \the [src].") + to_chat(user,span_notice("You re-insert \the [tb] into \the [src].")) beacons -= tb.tele_name user.unEquip(tb) qdel(tb) beacons_left++ else - to_chat(user,"\The [tb] doesn't belong to \the [src].") + to_chat(user,span_notice("\The [tb] doesn't belong to \the [src].")) return else ..() @@ -188,12 +188,12 @@ This device records all warnings given and teleport events for admin review in c /obj/item/perfect_tele/proc/teleport_checks(mob/living/target,mob/living/user) //Uhhuh, need that power source if(!power_source) - to_chat(user,"\The [src] has no power source!") + to_chat(user,span_warning("\The [src] has no power source!")) return FALSE //Check for charge if((!power_source.check_charge(charge_cost)) && (!power_source.fully_charged())) - to_chat(user,"\The [src] does not have enough power left!") + to_chat(user,span_warning("\The [src] does not have enough power left!")) return FALSE //Only mob/living need apply. @@ -202,24 +202,24 @@ This device records all warnings given and teleport events for admin review in c //No, you can't teleport buckled people. if(target.buckled) - to_chat(user,"The target appears to be attached to something...") + to_chat(user,span_warning("The target appears to be attached to something...")) return FALSE //No, you can't teleport if it's not ready yet. if(!ready) - to_chat(user,"\The [src] is still recharging!") + to_chat(user,span_warning("\The [src] is still recharging!")) return FALSE //No, you can't teleport if there's no destination. if(!destination) - to_chat(user,"\The [src] doesn't have a current valid destination set!") + to_chat(user,span_warning("\The [src] doesn't have a current valid destination set!")) return FALSE //No, you can't teleport if there's a jammer. if(is_jammed(src) || is_jammed(destination)) var/area/our_area = get_area(src) if(!our_area.no_comms) //I don't actually want this to block teleporters, just comms - to_chat(user,"\The [src] refuses to teleport you, due to strong interference!") + to_chat(user,span_warning("\The [src] refuses to teleport you, due to strong interference!")) return FALSE //No, you can't port to or from away missions. Stupidly complicated check. @@ -233,12 +233,12 @@ This device records all warnings given and teleport events for admin review in c if(!longrange) if( (uT.z != dT.z) && (!(dT.z in dat["z_level_detection"])) ) - to_chat(user,"\The [src] can't teleport you that far!") + to_chat(user,span_warning("\The [src] can't teleport you that far!")) return FALSE if(!abductor) if(uT.block_tele || dT.block_tele) - to_chat(user,"Something is interfering with \the [src]!") + to_chat(user,span_warning("Something is interfering with \the [src]!")) return FALSE //Seems okay to me! @@ -257,8 +257,8 @@ This device records all warnings given and teleport events for admin review in c if(!L.stat) if(L != user) if(L.a_intent != I_HELP || L.has_AI()) - to_chat(user, "[L] is resisting your attempt to teleport them with \the [src].") - to_chat(L, " [user] is trying to teleport you with \the [src]!") + to_chat(user, span_notice("[L] is resisting your attempt to teleport them with \the [src].")) + to_chat(L, span_danger(" [user] is trying to teleport you with \the [src]!")) if(!do_after(user, 30, L)) return @@ -280,7 +280,7 @@ This device records all warnings given and teleport events for admin review in c var/list/wrong_choices = beacons - destination.tele_name var/wrong_name = pick(wrong_choices) destination = beacons[wrong_name] - to_chat(user,"\The [src] malfunctions and sends you to the wrong beacon!") + to_chat(user,span_warning("\The [src] malfunctions and sends you to the wrong beacon!")) //Destination beacon vore checking var/turf/dT = get_turf(destination) @@ -301,11 +301,11 @@ This device records all warnings given and teleport events for admin review in c if(isbelly(real_dest)) var/obj/belly/B = real_dest if(!(target.can_be_drop_prey) && B.owner != user) - to_chat(target,"\The [src] narrowly avoids teleporting you right into \a [lowertext(real_dest.name)]!") + to_chat(target,span_vwarning("\The [src] narrowly avoids teleporting you right into \a [lowertext(real_dest.name)]!")) real_dest = dT //Nevermind! else televored = TRUE - to_chat(target,"\The [src] teleports you right into \a [lowertext(real_dest.name)]!") + to_chat(target,span_vwarning("\The [src] teleports you right into \a [lowertext(real_dest.name)]!")) //Phase-out effect phase_out(target,get_turf(target)) @@ -326,7 +326,7 @@ This device records all warnings given and teleport events for admin review in c //Move them, and televore if necessary G.affecting.forceMove(real_dest) if(televored) - to_chat(target,"\The [src] teleports you right into \a [lowertext(real_dest.name)]!") + to_chat(target,span_warning("\The [src] teleports you right into \a [lowertext(real_dest.name)]!")) //Phase-in effect for grabbed person phase_in(G.affecting,get_turf(G.affecting)) @@ -411,11 +411,11 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/perfect_tele_beacon/stat if(confirm == "Eat it!") var/obj/belly/bellychoice = tgui_input_list(usr, "Which belly?","Select A Belly", L.vore_organs) if(bellychoice) - user.visible_message("[user] is trying to stuff \the [src] into [user.gender == MALE ? "his" : user.gender == FEMALE ? "her" : "their"] [bellychoice.name]!","You begin putting \the [src] into your [bellychoice.name]!") + user.visible_message(span_warning("[user] is trying to stuff \the [src] into [user.gender == MALE ? "his" : user.gender == FEMALE ? "her" : "their"] [bellychoice.name]!"),span_notice("You begin putting \the [src] into your [bellychoice.name]!")) if(do_after(user,5 SECONDS,src)) user.unEquip(src) forceMove(bellychoice) - user.visible_message("[user] eats a telebeacon!","You eat the the beacon!") + user.visible_message(span_warning("[user] eats a telebeacon!"),"You eat the the beacon!") // A single-beacon variant for use by miners (or whatever) /obj/item/perfect_tele/one_beacon @@ -430,7 +430,7 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/perfect_tele_beacon/stat /obj/item/perfect_tele/one_beacon/teleport_checks(mob/living/target,mob/living/user) var/turf/T = get_turf(destination) if(T && user.z != T.z) - to_chat(user,"\The [src] is too far away from the beacon. Try getting closer first!") + to_chat(user,span_warning("\The [src] is too far away from the beacon. Try getting closer first!")) return FALSE return ..() */ @@ -475,8 +475,8 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/perfect_tele_beacon/stat return recharging = 1 update_icon() - user.visible_message("[user] opens \the [src] and starts pumping the handle.", \ - "You open \the [src] and start pumping the handle.") + user.visible_message(span_notice("[user] opens \the [src] and starts pumping the handle."), \ + span_notice("You open \the [src] and start pumping the handle.")) while(recharging) if(!do_after(user, 10, src)) break diff --git a/code/game/objects/items/devices/tvcamera.dm b/code/game/objects/items/devices/tvcamera.dm index 246cf15032..f439221d29 100644 --- a/code/game/objects/items/devices/tvcamera.dm +++ b/code/game/objects/items/devices/tvcamera.dm @@ -71,14 +71,14 @@ if(nc) channel = nc camera.c_tag = channel - to_chat(usr, "New channel name - '[channel]' is set") + to_chat(usr, span_notice("New channel name - '[channel]' is set")) if(href_list["video"]) camera.set_status(!camera.status) if(camera.status) - to_chat(usr,"Video streaming activated. Broadcasting on channel '[channel]'") + to_chat(usr,span_notice("Video streaming activated. Broadcasting on channel '[channel]'")) show_tvs(loc) else - to_chat(usr,"Video streaming deactivated.") + to_chat(usr,span_notice("Video streaming deactivated.")) hide_tvs() for(var/obj/machinery/computer/security/telescreen/entertainment/ES as anything in GLOB.entertainment_screens) ES.stop_showing() @@ -86,9 +86,9 @@ if(href_list["sound"]) radio.ToggleBroadcast() if(radio.broadcasting) - to_chat(usr,"Audio streaming activated. Broadcasting on frequency [format_frequency(radio.frequency)].") + to_chat(usr,span_notice("Audio streaming activated. Broadcasting on frequency [format_frequency(radio.frequency)].")) else - to_chat(usr,"Audio streaming deactivated.") + to_chat(usr,span_notice("Audio streaming deactivated.")) if(!href_list["close"]) attack_self(usr) @@ -160,7 +160,7 @@ var/obj/item/TVAssembly/A = new(user) qdel(S) user.put_in_hands(A) - to_chat(user, "You add the infrared sensor to the robot head.") + to_chat(user, span_notice("You add the infrared sensor to the robot head.")) user.drop_from_inventory(src) qdel(src) @@ -179,7 +179,7 @@ if(0) if(istype(W, /obj/item/robot_parts/robot_component/camera)) var/obj/item/robot_parts/robot_component/camera/CA = W - to_chat(user, "You add the camera module to [src]") + to_chat(user, span_notice("You add the camera module to [src]")) user.drop_item() qdel(CA) desc = "This TV camera assembly has a camera module." @@ -190,22 +190,22 @@ user.drop_item() qdel(T) buildstep++ - to_chat(user, "You add the tape recorder to [src]") + to_chat(user, span_notice("You add the tape recorder to [src]")) if(2) if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W if(!C.use(3)) - to_chat(user, "You need six cable coils to wire the devices.") + to_chat(user, span_notice("You need six cable coils to wire the devices.")) ..() return C.use(3) buildstep++ - to_chat(user, "You wire the assembly") + to_chat(user, span_notice("You wire the assembly")) desc = "This TV camera assembly has wires sticking out" return if(3) if(istype(W, /obj/item/tool/wirecutters)) - to_chat(user, " You trim the wires.") + to_chat(user, span_notice(" You trim the wires.")) buildstep++ desc = "This TV camera assembly needs casing." return @@ -214,7 +214,7 @@ var/obj/item/stack/material/steel/S = W buildstep++ S.use(1) - to_chat(user, "You encase the assembly in a Ward-Takeshi casing.") + to_chat(user, span_notice("You encase the assembly in a Ward-Takeshi casing.")) var/turf/T = get_turf(src) new /obj/item/tvcamera(T) user.drop_from_inventory(src) diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index 2b3b95f8e1..fba33be170 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -33,15 +33,15 @@ if(isnull(insults)) playsound(src, 'sound/voice/halt.ogg', 100, 1, vary = 0) - user.audible_message("[user]'s [name] rasps, \"[use_message]\"", "\The [user] holds up \the [name].", runemessage = "\[TTS Voice\] [use_message]") + user.audible_message(span_warning("[user]'s [name] rasps, \"[use_message]\""), span_warning("\The [user] holds up \the [name]."), runemessage = "\[TTS Voice\] [use_message]") else if(insults > 0) playsound(src, 'sound/voice/binsult.ogg', 100, 1, vary = 0) // Yes, it used to show the transcription of the sound clip. That was a) inaccurate b) immature as shit. - user.audible_message("[user]'s [name] gurgles something indecipherable and deeply offensive.", "\The [user] holds up \the [name].", runemessage = "\[TTS Voice\] #&@&^%(*") + user.audible_message(span_warning("[user]'s [name] gurgles something indecipherable and deeply offensive."), span_warning("\The [user] holds up \the [name]."), runemessage = "\[TTS Voice\] #&@&^%(*") insults-- else - to_chat(user, "*BZZZZZZZZT*") + to_chat(user, span_danger("*BZZZZZZZZT*")) spamcheck = 1 spawn(20) @@ -49,7 +49,7 @@ /obj/item/hailer/emag_act(var/remaining_charges, var/mob/user) if(isnull(insults)) - to_chat(user, "You overload \the [src]'s voice synthesizer.") + to_chat(user, span_danger("You overload \the [src]'s voice synthesizer.")) insults = rand(1, 3)//to prevent dickflooding return 1 else diff --git a/code/game/objects/items/falling_object_vr.dm b/code/game/objects/items/falling_object_vr.dm index a6c376ab93..fdc140b6b4 100644 --- a/code/game/objects/items/falling_object_vr.dm +++ b/code/game/objects/items/falling_object_vr.dm @@ -37,7 +37,7 @@ for(var/mob/living/P in loc) if(P.can_be_drop_prey && P.drop_vore) L.feed_grabbed_to_self_falling_nom(L,P) - L.visible_message("\The [L] falls right onto \the [P]!") + L.visible_message(span_vdanger("\The [L] falls right onto \the [P]!")) if(crushing) for(var/atom/movable/AM in loc) diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm index 48b663c599..6a4617f12c 100644 --- a/code/game/objects/items/glassjar.dm +++ b/code/game/objects/items/glassjar.dm @@ -33,14 +33,14 @@ to_chat(user, "[A] doesn't fit into \the [src].") return var/mob/L = A - user.visible_message("[user] scoops [L] into \the [src].", "You scoop [L] into \the [src].") + user.visible_message(span_notice("[user] scoops [L] into \the [src]."), span_notice("You scoop [L] into \the [src].")) L.loc = src contains = JAR_ANIMAL update_icon() return else if(istype(A, /obj/effect/spider/spiderling)) var/obj/effect/spider/spiderling/S = A - user.visible_message("[user] scoops [S] into \the [src].", "You scoop [S] into \the [src].") + user.visible_message(span_notice("[user] scoops [S] into \the [src]."), span_notice("You scoop [S] into \the [src].")) S.loc = src STOP_PROCESSING(SSobj, S) // No growing inside jars contains = JAR_SPIDER @@ -52,21 +52,21 @@ if(JAR_MONEY) for(var/obj/O in src) O.loc = user.loc - to_chat(user, "You take money out of \the [src].") + to_chat(user, span_notice("You take money out of \the [src].")) contains = JAR_NOTHING update_icon() return if(JAR_ANIMAL) for(var/mob/M in src) M.loc = user.loc - user.visible_message("[user] releases [M] from \the [src].", "You release [M] from \the [src].") + user.visible_message(span_notice("[user] releases [M] from \the [src]."), span_notice("You release [M] from \the [src].")) contains = JAR_NOTHING update_icon() return if(JAR_SPIDER) for(var/obj/effect/spider/spiderling/S in src) S.loc = user.loc - user.visible_message("[user] releases [S] from \the [src].", "You release [S] from \the [src].") + user.visible_message(span_notice("[user] releases [S] from \the [src]."), span_notice("You release [S] from \the [src].")) START_PROCESSING(SSobj, S) // They can grow after being let out though contains = JAR_NOTHING update_icon() @@ -79,7 +79,7 @@ if(contains != JAR_MONEY) return var/obj/item/spacecash/S = W - user.visible_message("[user] puts [S.worth] [S.worth > 1 ? "thalers" : "thaler"] into \the [src].") + user.visible_message(span_notice("[user] puts [S.worth] [S.worth > 1 ? "thalers" : "thaler"] into \the [src].")) user.drop_from_inventory(S) S.loc = src update_icon() @@ -184,10 +184,10 @@ if(!filled) if(istype(A, /obj/structure/sink) || istype(A, /turf/simulated/floor/water)) if(contains && user.a_intent == "help") - to_chat(user, "That probably isn't the best idea.") + to_chat(user, span_warning("That probably isn't the best idea.")) return - to_chat(user, "You fill \the [src] with water!") + to_chat(user, span_notice("You fill \the [src] with water!")) filled = TRUE update_icon() return @@ -198,17 +198,17 @@ if(filled) if(contains == JAR_ANIMAL) if(user.a_intent == "help") - to_chat(user, "Maybe you shouldn't empty the water...") + to_chat(user, span_notice("Maybe you shouldn't empty the water...")) return else filled = FALSE - user.visible_message("[user] dumps out \the [src]'s water!") + user.visible_message(span_warning("[user] dumps out \the [src]'s water!")) update_icon() return else - user.visible_message("[user] dumps \the [src]'s water.") + user.visible_message(span_notice("[user] dumps \the [src]'s water.")) filled = FALSE update_icon() return diff --git a/code/game/objects/items/pizza_voucher_vr.dm b/code/game/objects/items/pizza_voucher_vr.dm index b21e45f3dd..9829bd8321 100644 --- a/code/game/objects/items/pizza_voucher_vr.dm +++ b/code/game/objects/items/pizza_voucher_vr.dm @@ -23,30 +23,30 @@ /obj/item/pizzavoucher/attack_self(mob/user) add_fingerprint(user) if(!spent) - user.visible_message("[user] presses a button on [src]!") + user.visible_message(span_notice("[user] presses a button on [src]!")) desc = desc + " This one seems to be used-up." spent = TRUE - user.visible_message("A small bluespace rift opens just above [user]'s head and spits out a pizza box!", - "A small bluespace rift opens just above your head and spits out a pizza box!", - "You hear a fwoosh followed by a thump.") + user.visible_message(span_notice("A small bluespace rift opens just above [user]'s head and spits out a pizza box!"), + span_notice("A small bluespace rift opens just above your head and spits out a pizza box!"), + span_notice("You hear a fwoosh followed by a thump.")) if(special_delivery) command_announcement.Announce("SPECIAL DELIVERY PIZZA ORDER #[rand(1000,9999)]-[rand(100,999)] HAS BEEN RECEIVED. SHIPMENT DISPATCHED VIA EXTRA-POWERFUL BALLISTIC LAUNCHERS FOR IMMEDIATE DELIVERY! THANK YOU AND ENJOY YOUR PIZZA!", "WE ALWAYS DELIVER!") new /obj/effect/falling_effect/pizza_delivery/special(user.loc) else new /obj/effect/falling_effect/pizza_delivery(user.loc) else - to_chat(user, "The [src] is spent!") + to_chat(user, span_warning("The [src] is spent!")) /obj/item/pizzavoucher/emag_act(var/remaining_charges, var/mob/user) if(spent) - to_chat(user, "The [src] is spent!") + to_chat(user, span_warning("The [src] is spent!")) return if(!special_delivery) - to_chat(user, "You activate the special delivery protocol on the [src]!") + to_chat(user, span_warning("You activate the special delivery protocol on the [src]!")) special_delivery = TRUE return 1 else - to_chat(user, "The [src] is already in special delivery mode!") + to_chat(user, span_warning("The [src] is already in special delivery mode!")) /obj/effect/falling_effect/pizza_delivery name = "PIZZA PIE POWER!" diff --git a/code/game/objects/items/robobag.dm b/code/game/objects/items/robobag.dm index 1811e34f2c..e3ad240ee2 100644 --- a/code/game/objects/items/robobag.dm +++ b/code/game/objects/items/robobag.dm @@ -29,7 +29,7 @@ /obj/structure/closet/body_bag/cryobag/robobag/examine(mob/user) . = ..() if(corptag && Adjacent(user)) - . += "[src] has a [corptag] attached to it." + . += span_notice("[src] has a [corptag] attached to it.") /obj/structure/closet/body_bag/cryobag/robobag/update_icon() cut_overlays() @@ -52,7 +52,7 @@ ..() if(corptag) corptag.forceMove(get_turf(user)) - to_chat(user, "You remove \the [corptag] from \the [src].") + to_chat(user, span_notice("You remove \the [corptag] from \the [src].")) corptag = null update_icon() return @@ -93,12 +93,12 @@ corptag = W user.unEquip(corptag) corptag.loc = null - to_chat(user, "You swap \the [old_tag] for \the [corptag].") + to_chat(user, span_notice("You swap \the [old_tag] for \the [corptag].")) else corptag = W user.unEquip(corptag) corptag.loc = null - to_chat(user, "You attach \the [corptag] to \the [src].") + to_chat(user, span_notice("You attach \the [corptag] to \the [src].")) update_icon() else @@ -109,8 +109,8 @@ desc = "Your software is being debugged." mob_overlay_state = "signal_blue" - on_created_text = "You feel something pour over your senses." - on_expired_text = "Your mind is clear once more." + on_created_text = span_notice("You feel something pour over your senses.") + on_expired_text = span_notice("Your mind is clear once more.") stacks = MODIFIER_STACK_FORBID /datum/modifier/fbp_debug/tick() diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 8a38d58785..aead535efe 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -105,13 +105,13 @@ if (M.use(1)) var/obj/item/secbot_assembly/ed209_assembly/B = new /obj/item/secbot_assembly/ed209_assembly B.loc = get_turf(src) - to_chat(user, "You armed the robot frame.") + to_chat(user, span_notice("You armed the robot frame.")) if (user.get_inactive_hand()==src) user.remove_from_mob(src) user.put_in_inactive_hand(B) qdel(src) else - to_chat(user, "You need one sheet of metal to arm the robot frame.") + to_chat(user, span_warning("You need one sheet of metal to arm the robot frame.")) if(istype(W, /obj/item/robot_parts/l_leg)) if(src.l_leg) return user.drop_item() @@ -148,9 +148,9 @@ src.chest = W src.update_icon() else if(!W:wires) - to_chat(user, "You need to attach wires to it first!") + to_chat(user, span_warning("You need to attach wires to it first!")) else - to_chat(user, "You need to attach a cell to it first!") + to_chat(user, span_warning("You need to attach a cell to it first!")) if(istype(W, /obj/item/robot_parts/head)) if(src.head) return @@ -160,17 +160,17 @@ src.head = W src.update_icon() else - to_chat(user, "You need to attach a flash to it first!") + to_chat(user, span_warning("You need to attach a flash to it first!")) if(istype(W, /obj/item/mmi)) var/obj/item/mmi/M = W if(check_completion()) if(!istype(loc,/turf)) - to_chat(user, "You can't put \the [W] in, the frame has to be standing on the ground to be perfectly precise.") + to_chat(user, span_warning("You can't put \the [W] in, the frame has to be standing on the ground to be perfectly precise.")) return if(!istype(W, /obj/item/mmi/inert)) if(!M.brainmob) - to_chat(user, "Sticking an empty [W] into the frame would sort of defeat the purpose.") + to_chat(user, span_warning("Sticking an empty [W] into the frame would sort of defeat the purpose.")) return if(!M.brainmob.key) var/ghost_can_reenter = 0 @@ -178,18 +178,18 @@ for(var/mob/observer/dead/G in player_list) if(G.can_reenter_corpse && G.mind == M.brainmob.mind) ghost_can_reenter = 1 //May come in use again at another point. - to_chat(user, "\The [W] is completely unresponsive; though it may be able to auto-resuscitate.") //Jamming a ghosted brain into a borg is likely detrimental, and may result in some problems. + to_chat(user, span_notice("\The [W] is completely unresponsive; though it may be able to auto-resuscitate.")) //Jamming a ghosted brain into a borg is likely detrimental, and may result in some problems. return if(!ghost_can_reenter) - to_chat(user, "\The [W] is completely unresponsive; there's no point.") + to_chat(user, span_notice("\The [W] is completely unresponsive; there's no point.")) return if(M.brainmob.stat == DEAD) - to_chat(user, "Sticking a dead [W] into the frame would sort of defeat the purpose.") + to_chat(user, span_warning("Sticking a dead [W] into the frame would sort of defeat the purpose.")) return if(jobban_isbanned(M.brainmob, JOB_CYBORG)) - to_chat(user, "This [W] does not seem to fit.") + to_chat(user, span_warning("This [W] does not seem to fit.")) return var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc), unfinished = 1) @@ -226,7 +226,7 @@ qdel(src) else - to_chat(user, "The MMI must go in after everything else!") + to_chat(user, span_warning("The MMI must go in after everything else!")) if (istype(W, /obj/item/pen)) var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", src.name, src.created_name), MAX_NAME_LEN) @@ -243,22 +243,22 @@ ..() if(istype(W, /obj/item/cell)) if(src.cell) - to_chat(user, "You have already inserted a cell!") + to_chat(user, span_warning("You have already inserted a cell!")) return else user.drop_item() W.loc = src src.cell = W - to_chat(user, "You insert the cell!") + to_chat(user, span_notice("You insert the cell!")) if(istype(W, /obj/item/stack/cable_coil)) if(src.wires) - to_chat(user, "You have already inserted wire!") + to_chat(user, span_warning("You have already inserted wire!")) return else var/obj/item/stack/cable_coil/coil = W coil.use(1) src.wires = 1.0 - to_chat(user, "You insert the wire!") + to_chat(user, span_notice("You insert the wire!")) return /obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob) @@ -267,7 +267,7 @@ if(istype(user,/mob/living/silicon/robot)) var/current_module = user.get_active_hand() if(current_module == W) - to_chat(user, "How do you propose to do that?") + to_chat(user, span_warning("How do you propose to do that?")) return else add_flashes(W,user) @@ -277,24 +277,24 @@ /obj/item/robot_parts/head/proc/add_flashes(obj/item/W as obj, mob/user as mob) //Made into a seperate proc to avoid copypasta if(src.flash1 && src.flash2) - to_chat(user, "You have already inserted the eyes!") + to_chat(user, span_notice("You have already inserted the eyes!")) return else if(src.flash1) user.drop_item() W.loc = src src.flash2 = W - to_chat(user, "You insert the flash into the eye socket!") + to_chat(user, span_notice("You insert the flash into the eye socket!")) else user.drop_item() W.loc = src src.flash1 = W - to_chat(user, "You insert the flash into the eye socket!") + to_chat(user, span_notice("You insert the flash into the eye socket!")) /obj/item/robot_parts/emag_act(var/remaining_charges, var/mob/user) if(sabotaged) - to_chat(user, "[src] is already sabotaged!") + to_chat(user, span_warning("[src] is already sabotaged!")) else - to_chat(user, "You short out the safeties.") + to_chat(user, span_warning("You short out the safeties.")) sabotaged = 1 return 1 diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 161f09385b..ed8f10ea8c 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -14,7 +14,7 @@ /obj/item/borg/upgrade/proc/action(var/mob/living/silicon/robot/R) if(R.stat == DEAD) - to_chat(usr, "The [src] will not function on a deceased robot.") + to_chat(usr, span_warning("The [src] will not function on a deceased robot.")) return 1 return 0 @@ -236,7 +236,7 @@ var/obj/T = R.has_upgrade_module(/obj/item/dogborg/sleeper) if(!T) - to_chat(usr, "This robot has had its processor removed!") + to_chat(usr, span_warning("This robot has had its processor removed!")) return 0 if(R.has_advanced_upgrade(type)) @@ -328,7 +328,7 @@ var/obj/T = R.has_upgrade_module(/obj/item/dogborg/sleeper) if(!T) - to_chat(usr, "This robot has had its processor removed!") + to_chat(usr, span_warning("This robot has had its processor removed!")) return 0 if(R.has_restricted_upgrade(type)) @@ -362,7 +362,7 @@ var/obj/T = R.has_upgrade_module(/obj/item/gun/energy/taser/mounted/cyborg) if(!T) - to_chat(usr, "This robot has had its taser removed!") + to_chat(usr, span_warning("This robot has had its taser removed!")) return 0 if(R.has_restricted_upgrade(type)) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index e22c65a357..1a63c55db5 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -96,7 +96,7 @@ if(hp <= 0) for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) - to_chat(O, "\The [src] breaks into tiny pieces and collapses!") + to_chat(O, span_warning("\The [src] breaks into tiny pieces and collapses!")) qdel(src) // Create a temporary object to represent the damage diff --git a/code/game/objects/items/stacks/marker_beacons.dm b/code/game/objects/items/stacks/marker_beacons.dm index bbedcc2255..72c7ee679f 100644 --- a/code/game/objects/items/stacks/marker_beacons.dm +++ b/code/game/objects/items/stacks/marker_beacons.dm @@ -43,28 +43,28 @@ var/list/marker_beacon_colors = list( /obj/item/stack/marker_beacon/examine(mob/user) . = ..() - . += "Use in-hand to place a [singular_name]." - . += "Alt-click to select a color. Current color is [picked_color]." + . += span_notice("Use in-hand to place a [singular_name].") + . += span_notice("Alt-click to select a color. Current color is [picked_color].") /obj/item/stack/marker_beacon/update_icon() icon_state = "[initial(icon_state)][lowertext(picked_color)]" /obj/item/stack/marker_beacon/attack_self(mob/user) if(!isturf(user.loc)) - to_chat(user, "You need more space to place a [singular_name] here.") + to_chat(user, span_warning("You need more space to place a [singular_name] here.")) return if(locate(/obj/structure/marker_beacon) in user.loc) - to_chat(user, "There is already a [singular_name] here.") + to_chat(user, span_warning("There is already a [singular_name] here.")) return if(use(1)) - to_chat(user, "You activate and anchor [amount ? "a":"the"] [singular_name] in place.") + to_chat(user, span_notice("You activate and anchor [amount ? "a":"the"] [singular_name] in place.")) playsound(src, 'sound/machines/click.ogg', 50, 1) var/obj/structure/marker_beacon/M = new(user.loc, picked_color) transfer_fingerprints_to(M) /obj/item/stack/marker_beacon/AltClick(mob/living/user) if(user.incapacitated() || !istype(user)) - to_chat(user, "You can't do that right now!") + to_chat(user, span_warning("You can't do that right now!")) return if(!in_range(src, user)) return @@ -100,7 +100,7 @@ var/list/marker_beacon_colors = list( /obj/structure/marker_beacon/examine(mob/user) . = ..() if(!perma) - . += "Alt-click to select a color. Current color is [picked_color]." + . += span_notice("Alt-click to select a color. Current color is [picked_color].") /obj/structure/marker_beacon/update_icon() if(!picked_color || !marker_beacon_colors[picked_color]) @@ -111,7 +111,7 @@ var/list/marker_beacon_colors = list( /obj/structure/marker_beacon/attack_hand(mob/living/user) if(perma) return - to_chat(user, "You start picking [src] up...") + to_chat(user, span_notice("You start picking [src] up...")) if(do_after(user, remove_speed, target = src)) var/obj/item/stack/marker_beacon/M = new(loc) M.picked_color = picked_color @@ -126,7 +126,7 @@ var/list/marker_beacon_colors = list( return if(istype(I, /obj/item/stack/marker_beacon)) var/obj/item/stack/marker_beacon/M = I - to_chat(user, "You start picking [src] up...") + to_chat(user, span_notice("You start picking [src] up...")) if(do_after(user, remove_speed, target = src) && M.get_amount() + 1 <= M.max_amount) M.add(1) playsound(src, 'sound/items/deconstruct.ogg', 50, 1) @@ -139,7 +139,7 @@ var/list/marker_beacon_colors = list( if(perma) return if(user.incapacitated() || !istype(user)) - to_chat(user, "You can't do that right now!") + to_chat(user, span_warning("You can't do that right now!")) return if(!in_range(src, user)) return diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 5b4a5c9d5f..0e62e32f09 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -17,16 +17,16 @@ /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob) if (!istype(M)) - to_chat(user, "\The [src] cannot be applied to [M]!") + to_chat(user, span_warning("\The [src] cannot be applied to [M]!")) return 1 if (!user.IsAdvancedToolUser()) - to_chat(user, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You don't have the dexterity to do this!")) return 1 var/available = get_amount() if(!available) - to_chat(user, "There's not enough [uses_charge ? "charge" : "items"] left to use that!") + to_chat(user, span_warning("There's not enough [uses_charge ? "charge" : "items"] left to use that!")) return 1 if (istype(M, /mob/living/carbon/human)) @@ -34,24 +34,24 @@ var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting) if(!affecting) - to_chat(user, "No body part there to work on!") + to_chat(user, span_warning("No body part there to work on!")) return 1 if(affecting.organ_tag == BP_HEAD) if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space)) - to_chat(user, "You can't apply [src] through [H.head]!") + to_chat(user, span_warning("You can't apply [src] through [H.head]!")) return 1 else if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space)) - to_chat(user, "You can't apply [src] through [H.wear_suit]!") + to_chat(user, span_warning("You can't apply [src] through [H.wear_suit]!")) return 1 if(affecting.robotic == ORGAN_ROBOT) - to_chat(user, "This isn't useful at all on a robotic limb.") + to_chat(user, span_warning("This isn't useful at all on a robotic limb.")) return 1 if(affecting.robotic >= ORGAN_LIFELIKE) - to_chat(user, "You apply the [src], but it seems to have no effect...") + to_chat(user, span_warning("You apply the [src], but it seems to have no effect...")) use(1) return 1 @@ -61,8 +61,8 @@ M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2)) user.visible_message( \ - "[M] has been applied with [src] by [user].", \ - "You apply \the [src] to [M]." \ + span_notice("[M] has been applied with [src] by [user]."), \ + span_notice("You apply \the [src] to [M].") \ ) use(1) @@ -99,16 +99,16 @@ var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting) if(affecting.open) - to_chat(user, "The [affecting.name] is cut open, you'll need more than a bandage!") + to_chat(user, span_notice("The [affecting.name] is cut open, you'll need more than a bandage!")) return if(affecting.is_bandaged()) - to_chat(user, "The wounds on [M]'s [affecting.name] have already been bandaged.") + to_chat(user, span_warning("The wounds on [M]'s [affecting.name] have already been bandaged.")) return 1 else var/available = get_amount() user.visible_message("\The [user] starts bandaging [M]'s [affecting.name].", \ - "You start bandaging [M]'s [affecting.name]." ) + span_notice("You start bandaging [M]'s [affecting.name].") ) var/used = 0 for (var/datum/wound/W in affecting.wounds) if(W.internal) @@ -118,32 +118,32 @@ if(used == amount) break if(!do_mob(user, M, W.damage/3, exclusive = TRUE)) - to_chat(user, "You must stand still to bandage wounds.") + to_chat(user, span_notice("You must stand still to bandage wounds.")) break if(affecting.is_bandaged()) // We do a second check after the delay, in case it was bandaged after the first check. - to_chat(user, "The wounds on [M]'s [affecting.name] have already been bandaged.") + to_chat(user, span_warning("The wounds on [M]'s [affecting.name] have already been bandaged.")) return 1 if(used >= available) - to_chat(user, "You run out of [src]!") + to_chat(user, span_warning("You run out of [src]!")) break if (W.current_stage <= W.max_bleeding_stage) user.visible_message("\The [user] bandages \a [W.desc] on [M]'s [affecting.name].", \ - "You bandage \a [W.desc] on [M]'s [affecting.name]." ) + span_notice("You bandage \a [W.desc] on [M]'s [affecting.name].") ) else user.visible_message("\The [user] places a bandage over \a [W.desc] on [M]'s [affecting.name].", \ - "You place a bandage over \a [W.desc] on [M]'s [affecting.name]." ) + span_notice("You place a bandage over \a [W.desc] on [M]'s [affecting.name].") ) W.bandage() playsound(src, pick(apply_sounds), 25) used++ affecting.update_damages() if(used == amount) if(affecting.is_bandaged()) - to_chat(user, "\The [src] is used up.") + to_chat(user, span_warning("\The [src] is used up.")) else - to_chat(user, "\The [src] is used up, but there are more wounds to treat on \the [affecting.name].") + to_chat(user, span_warning("\The [src] is used up, but there are more wounds to treat on \the [affecting.name].")) use(used) /obj/item/stack/medical/bruise_pack @@ -168,16 +168,16 @@ var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting) if(affecting.open) - to_chat(user, "The [affecting.name] is cut open, you'll need more than a bandage!") + to_chat(user, span_notice("The [affecting.name] is cut open, you'll need more than a bandage!")) return if(affecting.is_bandaged()) - to_chat(user, "The wounds on [M]'s [affecting.name] have already been bandaged.") + to_chat(user, span_warning("The wounds on [M]'s [affecting.name] have already been bandaged.")) return 1 else var/available = get_amount() user.visible_message("\The [user] starts treating [M]'s [affecting.name].", \ - "You start treating [M]'s [affecting.name]." ) + span_notice("You start treating [M]'s [affecting.name].") ) var/used = 0 for (var/datum/wound/W in affecting.wounds) if (W.internal) @@ -187,27 +187,27 @@ if(used == amount) break if(!do_mob(user, M, W.damage/5, exclusive = TRUE)) - to_chat(user, "You must stand still to bandage wounds.") + to_chat(user, span_notice("You must stand still to bandage wounds.")) break if(affecting.is_bandaged()) // We do a second check after the delay, in case it was bandaged after the first check. - to_chat(user, "The wounds on [M]'s [affecting.name] have already been bandaged.") + to_chat(user, span_warning("The wounds on [M]'s [affecting.name] have already been bandaged.")) return 1 if(used >= available) - to_chat(user, "You run out of [src]!") + to_chat(user, span_warning("You run out of [src]!")) break if (W.current_stage <= W.max_bleeding_stage) user.visible_message("\The [user] bandages \a [W.desc] on [M]'s [affecting.name].", \ - "You bandage \a [W.desc] on [M]'s [affecting.name]." ) + span_notice("You bandage \a [W.desc] on [M]'s [affecting.name].") ) //H.add_side_effect("Itch") else if (W.damage_type == BRUISE) user.visible_message("\The [user] places a bruise patch over \a [W.desc] on [M]'s [affecting.name].", \ - "You place a bruise patch over \a [W.desc] on [M]'s [affecting.name]." ) + span_notice("You place a bruise patch over \a [W.desc] on [M]'s [affecting.name].") ) else user.visible_message("\The [user] places a bandaid over \a [W.desc] on [M]'s [affecting.name].", \ - "You place a bandaid over \a [W.desc] on [M]'s [affecting.name]." ) + span_notice("You place a bandaid over \a [W.desc] on [M]'s [affecting.name].") ) W.bandage() // W.disinfect() // VOREStation - Tech1 should not disinfect playsound(src, pick(apply_sounds), 25) @@ -215,9 +215,9 @@ affecting.update_damages() if(used == amount) if(affecting.is_bandaged()) - to_chat(user, "\The [src] is used up.") + to_chat(user, span_warning("\The [src] is used up.")) else - to_chat(user, "\The [src] is used up, but there are more wounds to treat on \the [affecting.name].") + to_chat(user, span_warning("\The [src] is used up, but there are more wounds to treat on \the [affecting.name].")) use(used) /obj/item/stack/medical/ointment @@ -242,23 +242,23 @@ var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting) if(affecting.open) - to_chat(user, "The [affecting.name] is cut open, you'll need more than a bandage!") + to_chat(user, span_notice("The [affecting.name] is cut open, you'll need more than a bandage!")) return if(affecting.is_salved()) - to_chat(user, "The wounds on [M]'s [affecting.name] have already been salved.") + to_chat(user, span_warning("The wounds on [M]'s [affecting.name] have already been salved.")) return 1 else user.visible_message("\The [user] starts salving wounds on [M]'s [affecting.name].", \ - "You start salving the wounds on [M]'s [affecting.name]." ) + span_notice("You start salving the wounds on [M]'s [affecting.name].") ) if(!do_mob(user, M, 10, exclusive = TRUE)) - to_chat(user, "You must stand still to salve wounds.") + to_chat(user, span_notice("You must stand still to salve wounds.")) return 1 if(affecting.is_salved()) // We do a second check after the delay, in case it was bandaged after the first check. - to_chat(user, "The wounds on [M]'s [affecting.name] have already been salved.") + to_chat(user, span_warning("The wounds on [M]'s [affecting.name] have already been salved.")) return 1 - user.visible_message("[user] salved wounds on [M]'s [affecting.name].", \ - "You salved wounds on [M]'s [affecting.name]." ) + user.visible_message(span_notice("[user] salved wounds on [M]'s [affecting.name]."), \ + span_notice("You salved wounds on [M]'s [affecting.name].") ) use(1) affecting.salve() playsound(src, pick(apply_sounds), 25) @@ -287,16 +287,16 @@ var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting) if(affecting.open) - to_chat(user, "The [affecting.name] is cut open, you'll need more than a bandage!") + to_chat(user, span_notice("The [affecting.name] is cut open, you'll need more than a bandage!")) return if(affecting.is_bandaged() && affecting.is_disinfected()) - to_chat(user, "The wounds on [M]'s [affecting.name] have already been treated.") + to_chat(user, span_warning("The wounds on [M]'s [affecting.name] have already been treated.")) return 1 else var/available = get_amount() user.visible_message("\The [user] starts treating [M]'s [affecting.name].", \ - "You start treating [M]'s [affecting.name]." ) + span_notice("You start treating [M]'s [affecting.name].") ) var/used = 0 for (var/datum/wound/W in affecting.wounds) if (W.internal) @@ -306,25 +306,25 @@ //if(used == amount) //VOREStation Edit // break //VOREStation Edit if(!do_mob(user, M, W.damage/5, exclusive = TRUE)) - to_chat(user, "You must stand still to bandage wounds.") + to_chat(user, span_notice("You must stand still to bandage wounds.")) break if(affecting.is_bandaged() && affecting.is_disinfected()) // We do a second check after the delay, in case it was bandaged after the first check. - to_chat(user, "The wounds on [M]'s [affecting.name] have already been bandaged.") + to_chat(user, span_warning("The wounds on [M]'s [affecting.name] have already been bandaged.")) return 1 if(used >= available) - to_chat(user, "You run out of [src]!") + to_chat(user, span_warning("You run out of [src]!")) break if (W.current_stage <= W.max_bleeding_stage) user.visible_message("\The [user] cleans \a [W.desc] on [M]'s [affecting.name] and seals the edges with bioglue.", \ - "You clean and seal \a [W.desc] on [M]'s [affecting.name]." ) + span_notice("You clean and seal \a [W.desc] on [M]'s [affecting.name].") ) else if (W.damage_type == BRUISE) user.visible_message("\The [user] places a medical patch over \a [W.desc] on [M]'s [affecting.name].", \ - "You place a medical patch over \a [W.desc] on [M]'s [affecting.name]." ) + span_notice("You place a medical patch over \a [W.desc] on [M]'s [affecting.name].") ) else user.visible_message("\The [user] smears some bioglue over \a [W.desc] on [M]'s [affecting.name].", \ - "You smear some bioglue over \a [W.desc] on [M]'s [affecting.name]." ) + span_notice("You smear some bioglue over \a [W.desc] on [M]'s [affecting.name].") ) W.bandage() W.disinfect() W.heal_damage(heal_brute) @@ -334,9 +334,9 @@ affecting.update_damages() if(used == amount) if(affecting.is_bandaged()) - to_chat(user, "\The [src] is used up.") + to_chat(user, span_warning("\The [src] is used up.")) else - to_chat(user, "\The [src] is used up, but there are more wounds to treat on \the [affecting.name].") + to_chat(user, span_warning("\The [src] is used up, but there are more wounds to treat on \the [affecting.name].")) use(used) /obj/item/stack/medical/advanced/ointment @@ -357,22 +357,22 @@ var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting) if(affecting.open) - to_chat(user, "The [affecting.name] is cut open, you'll need more than a bandage!") + to_chat(user, span_notice("The [affecting.name] is cut open, you'll need more than a bandage!")) if(affecting.is_salved()) - to_chat(user, "The wounds on [M]'s [affecting.name] have already been salved.") + to_chat(user, span_warning("The wounds on [M]'s [affecting.name] have already been salved.")) return 1 else user.visible_message("\The [user] starts salving wounds on [M]'s [affecting.name].", \ - "You start salving the wounds on [M]'s [affecting.name]." ) + span_notice("You start salving the wounds on [M]'s [affecting.name].") ) if(!do_mob(user, M, 10, exclusive = TRUE)) - to_chat(user, "You must stand still to salve wounds.") + to_chat(user, span_notice("You must stand still to salve wounds.")) return 1 if(affecting.is_salved()) // We do a second check after the delay, in case it was bandaged after the first check. - to_chat(user, "The wounds on [M]'s [affecting.name] have already been salved.") + to_chat(user, span_warning("The wounds on [M]'s [affecting.name] have already been salved.")) return 1 - user.visible_message( "[user] covers wounds on [M]'s [affecting.name] with regenerative membrane.", \ - "You cover wounds on [M]'s [affecting.name] with regenerative membrane." ) + user.visible_message( span_notice("[user] covers wounds on [M]'s [affecting.name] with regenerative membrane."), \ + span_notice("You cover wounds on [M]'s [affecting.name] with regenerative membrane.") ) affecting.heal_damage(0,heal_burn) use(1) affecting.salve() @@ -400,25 +400,25 @@ var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting) var/limb = affecting.name if(!(affecting.organ_tag in splintable_organs)) - to_chat(user, "You can't use \the [src] to apply a splint there!") + to_chat(user, span_danger("You can't use \the [src] to apply a splint there!")) return if(affecting.splinted) - to_chat(user, "[M]'s [limb] is already splinted!") + to_chat(user, span_danger("[M]'s [limb] is already splinted!")) return if (M != user) - user.visible_message("[user] starts to apply \the [src] to [M]'s [limb].", "You start to apply \the [src] to [M]'s [limb].", "You hear something being wrapped.") + user.visible_message(span_danger("[user] starts to apply \the [src] to [M]'s [limb]."), span_danger("You start to apply \the [src] to [M]'s [limb]."), span_danger("You hear something being wrapped.")) else if(( !user.hand && (affecting.organ_tag in list(BP_R_ARM, BP_R_HAND)) || \ user.hand && (affecting.organ_tag in list(BP_L_ARM, BP_L_HAND)) )) - to_chat(user, "You can't apply a splint to the arm you're using!") + to_chat(user, span_danger("You can't apply a splint to the arm you're using!")) return - user.visible_message("[user] starts to apply \the [src] to their [limb].", "You start to apply \the [src] to your [limb].", "You hear something being wrapped.") + user.visible_message(span_danger("[user] starts to apply \the [src] to their [limb]."), span_danger("You start to apply \the [src] to your [limb]."), span_danger("You hear something being wrapped.")) if(do_after(user, 50, M, exclusive = TASK_USER_EXCLUSIVE)) if(affecting.splinted) - to_chat(user, "[M]'s [limb] is already splinted!") + to_chat(user, span_danger("[M]'s [limb] is already splinted!")) return if(M == user && prob(75)) - user.visible_message("\The [user] fumbles [src].", "You fumble [src].", "You hear something being wrapped.") + user.visible_message(span_danger("\The [user] fumbles [src]."), span_danger("You fumble [src]."), span_danger("You hear something being wrapped.")) return if(ishuman(user)) var/obj/item/stack/medical/splint/S = split(1) @@ -426,9 +426,9 @@ if(affecting.apply_splint(S)) S.forceMove(affecting) if (M != user) - user.visible_message("\The [user] finishes applying [src] to [M]'s [limb].", "You finish applying \the [src] to [M]'s [limb].", "You hear something being wrapped.") + user.visible_message(span_danger("\The [user] finishes applying [src] to [M]'s [limb]."), span_danger("You finish applying \the [src] to [M]'s [limb]."), span_danger("You hear something being wrapped.")) else - user.visible_message("\The [user] successfully applies [src] to their [limb].", "You successfully apply \the [src] to your [limb].", "You hear something being wrapped.") + user.visible_message(span_danger("\The [user] successfully applies [src] to their [limb]."), span_danger("You successfully apply \the [src] to your [limb]."), span_danger("You hear something being wrapped.")) return S.dropInto(src.loc) //didn't get applied, so just drop it if(isrobot(user)) @@ -436,10 +436,10 @@ if(B) if(affecting.apply_splint(B)) B.forceMove(affecting) - user.visible_message("\The [user] finishes applying [src] to [M]'s [limb].", "You finish applying \the [src] to [M]'s [limb].", "You hear something being wrapped.") + user.visible_message(span_danger("\The [user] finishes applying [src] to [M]'s [limb]."), span_danger("You finish applying \the [src] to [M]'s [limb]."), span_danger("You hear something being wrapped.")) B.use(1) return - user.visible_message("\The [user] fails to apply [src].", "You fail to apply [src].", "You hear something being wrapped.") + user.visible_message(span_danger("\The [user] fails to apply [src]."), span_danger("You fail to apply [src]."), span_danger("You hear something being wrapped.")) return diff --git a/code/game/objects/items/stacks/medical_vr.dm b/code/game/objects/items/stacks/medical_vr.dm index 9ba54cea33..a7e5012e5e 100644 --- a/code/game/objects/items/stacks/medical_vr.dm +++ b/code/game/objects/items/stacks/medical_vr.dm @@ -49,7 +49,7 @@ if(affecting.open) too_far_gone++ continue - + for(var/datum/wound/W as anything in affecting.wounds) // No need if(W.bandaged) @@ -61,7 +61,7 @@ clotted++ W.bandage() - var/healmessage = "You spray [src] onto [H], sealing [clotted ? clotted : "no"] wounds." + var/healmessage = span_notice("You spray [src] onto [H], sealing [clotted ? clotted : "no"] wounds.") if(too_far_gone) healmessage += " You can see some wounds that are too large where the spray is not taking effect." @@ -71,4 +71,4 @@ update_icon() /obj/item/stack/medical/advanced/clotting/update_icon() - icon_state = "[initial(icon_state)]_[amount]" \ No newline at end of file + icon_state = "[initial(icon_state)]_[amount]" diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index ba5db2b33b..8267de0047 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -21,33 +21,33 @@ R.adjustFireLoss(-15) R.updatehealth() use(1) - user.visible_message("\The [user] applied some [src] on [R]'s damaged areas.",\ - "You apply some [src] at [R]'s damaged areas.") + user.visible_message(span_notice("\The [user] applied some [src] on [R]'s damaged areas."),\ + span_notice("You apply some [src] at [R]'s damaged areas.")) else - to_chat(user, "All [R]'s systems are nominal.") + to_chat(user, span_notice("All [R]'s systems are nominal.")) if (istype(M,/mob/living/carbon/human)) //Repairing robolimbs var/mob/living/carbon/human/H = M var/obj/item/organ/external/S = H.get_organ(user.zone_sel.selecting) if(!S) - to_chat(user, "No body part there to work on!") + to_chat(user, span_warning("No body part there to work on!")) return 1 if(S.organ_tag == BP_HEAD) if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space)) - to_chat(user, "You can't apply [src] through [H.head]!") + to_chat(user, span_warning("You can't apply [src] through [H.head]!")) return 1 else if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space)) - to_chat(user, "You can't apply [src] through [H.wear_suit]!") + to_chat(user, span_warning("You can't apply [src] through [H.wear_suit]!")) return 1 //VOREStation Edit Start if (S && (S.robotic >= ORGAN_ROBOT)) if(!S.get_damage()) - to_chat(user, "Nothing to fix here.") + to_chat(user, span_notice("Nothing to fix here.")) else if((S.open < 2) && (S.brute_dam + S.burn_dam >= S.min_broken_damage) && !repair_external) - to_chat(user, "The damage is too extensive for this nanite swarm to handle.") + to_chat(user, span_notice("The damage is too extensive for this nanite swarm to handle.")) else if(can_use(1)) user.setClickCooldown(user.get_attack_speed(src)) if(S.open >= 2) @@ -57,6 +57,6 @@ S.heal_damage(restoration_external,restoration_external, robo_repair =1) H.updatehealth() use(1) - user.visible_message("\The [user] applies some nanite paste on [user != M ? "[M]'s [S.name]" : "[S]"] with [src].",\ - "You apply some nanite paste on [user == M ? "your" : "[M]'s"] [S.name].") + user.visible_message(span_notice("\The [user] applies some nanite paste on [user != M ? "[M]'s [S.name]" : "[S]"] with [src]."),\ + span_notice("You apply some nanite paste on [user == M ? "your" : "[M]'s"] [S.name].")) //VOREStation Edit End diff --git a/code/game/objects/items/stacks/sandbags.dm b/code/game/objects/items/stacks/sandbags.dm index adb7338b81..48f7a8341e 100644 --- a/code/game/objects/items/stacks/sandbags.dm +++ b/code/game/objects/items/stacks/sandbags.dm @@ -57,21 +57,21 @@ var/global/list/datum/stack_recipe/sandbag_recipes = list( \ if (!can_use(required)) if (produced>1) - to_chat(user, "You haven't got enough [src] to build \the [produced] [recipe.title]\s!") + to_chat(user, span_warning("You haven't got enough [src] to build \the [produced] [recipe.title]\s!")) else - to_chat(user, "You haven't got enough [src] to build \the [recipe.title]!") + to_chat(user, span_warning("You haven't got enough [src] to build \the [recipe.title]!")) return if (recipe.one_per_turf && (locate(recipe.result_type) in user.loc)) - to_chat(user, "There is another [recipe.title] here!") + to_chat(user, span_warning("There is another [recipe.title] here!")) return if (recipe.on_floor && !isfloor(user.loc)) - to_chat(user, "\The [recipe.title] must be constructed on the floor!") + to_chat(user, span_warning("\The [recipe.title] must be constructed on the floor!")) return if (recipe.time) - to_chat(user, "Building [recipe.title] ...") + to_chat(user, span_notice("Building [recipe.title] ...")) if (!do_after(user, recipe.time)) return @@ -147,4 +147,4 @@ var/global/list/datum/stack_recipe/sandbag_recipes = list( \ var/obj/item/stack/sandbags/SB = new (get_turf(src), 1, bag_material) SB.color = color if(user) - to_chat(user, "You fill a sandbag.") + to_chat(user, span_notice("You fill a sandbag.")) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 9848e4e5e3..8e5eb5e8c1 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -157,21 +157,21 @@ if (!can_use(required)) if (produced>1) - to_chat(user, "You haven't got enough [src] to build \the [produced] [recipe.title]\s!") + to_chat(user, span_warning("You haven't got enough [src] to build \the [produced] [recipe.title]\s!")) else - to_chat(user, "You haven't got enough [src] to build \the [recipe.title]!") + to_chat(user, span_warning("You haven't got enough [src] to build \the [recipe.title]!")) return if (recipe.one_per_turf && (locate(recipe.result_type) in user.loc)) - to_chat(user, "There is another [recipe.title] here!") + to_chat(user, span_warning("There is another [recipe.title] here!")) return if (recipe.on_floor && !isfloor(user.loc)) - to_chat(user, "\The [recipe.title] must be constructed on the floor!") + to_chat(user, span_warning("\The [recipe.title] must be constructed on the floor!")) return if (recipe.time) - to_chat(user, "Building [recipe.title] ...") + to_chat(user, span_notice("Building [recipe.title] ...")) if (!do_after(user, recipe.time)) return @@ -396,7 +396,7 @@ continue var/transfer = src.transfer_to(item) if (transfer) - to_chat(user, "You add a new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s.") + to_chat(user, span_notice("You add a new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s.")) if(!amount) break @@ -404,7 +404,7 @@ if (user.get_inactive_hand() == src) var/N = tgui_input_number(usr, "How many stacks of [src] would you like to split off? There are currently [amount].", "Split stacks", 1, amount, 1) if(N != round(N)) - to_chat(user, "You cannot separate a non-whole number of stacks!") + to_chat(user, span_warning("You cannot separate a non-whole number of stacks!")) return if(N) var/obj/item/stack/F = src.split(N) diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm index 0a6d47b3c0..a7e73890dd 100644 --- a/code/game/objects/items/stacks/telecrystal.dm +++ b/code/game/objects/items/stacks/telecrystal.dm @@ -12,15 +12,15 @@ /obj/item/stack/telecrystal/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) if(amount >= 5) - target.visible_message("\The [target] has been transported with \the [src] by \the [user].") + target.visible_message(span_warning("\The [target] has been transported with \the [src] by \the [user].")) safe_blink(target, 14) use(5) else - to_chat(user, "There are not enough telecrystals to do that.") + to_chat(user, span_warning("There are not enough telecrystals to do that.")) /obj/item/stack/telecrystal/attack_self(mob/user as mob) if(user.mind.accept_tcrystals) //Checks to see if antag type allows for tcrystals - to_chat(user, "You use \the [src], adding [src.amount] to your balance.") + to_chat(user, span_notice("You use \the [src], adding [src.amount] to your balance.")) user.mind.tcrystals += amount use(amount) - return \ No newline at end of file + return diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 6db64ed9b3..ec3fcb8cc4 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -49,13 +49,13 @@ return if(get_amount() < 4) - to_chat(user, "You need at least four tiles to do this.") + to_chat(user, span_warning("You need at least four tiles to do this.")) return if(WT.remove_fuel(0,user)) new welds_into(usr.loc) usr.update_icon() - visible_message("\The [src] is shaped by [user.name] with the welding tool.","You hear welding.") + visible_message(span_notice("\The [src] is shaped by [user.name] with the welding tool."),"You hear welding.") var/obj/item/stack/tile/T = src src = null var/replace = (user.get_inactive_hand()==T) diff --git a/code/game/objects/items/toys/mech_toys.dm b/code/game/objects/items/toys/mech_toys.dm index ecbefb74d2..90519571b3 100644 --- a/code/game/objects/items/toys/mech_toys.dm +++ b/code/game/objects/items/toys/mech_toys.dm @@ -77,12 +77,12 @@ if(!attacker) // If there's no attacker, then attacker_controller IS the attacker. if(!in_range(src, attacker_controller)) - attacker_controller.visible_message("[attacker_controller] is running from [src]! The coward!") + attacker_controller.visible_message(span_suicide("[attacker_controller] is running from [src]! The coward!")) return FALSE else // If there's an attacker, we can procede as normal. if(!in_range(src, attacker)) // The two toys aren't next to each other, the battle ends. - attacker_controller.visible_message(" [attacker] and [src] separate, ending the battle. ", \ - " [attacker] and [src] separate, ending the battle. ") + attacker_controller.visible_message(span_notice(" [attacker] and [src] separate, ending the battle. "), \ + span_notice(" [attacker] and [src] separate, ending the battle. ")) return FALSE // Dead men tell no tales, incapacitated men fight no fights. @@ -90,8 +90,8 @@ return FALSE // If the attacker_controller isn't next to the attacking toy (and doesn't have telekinesis), the battle ends. if(!in_range(attacker, attacker_controller)) - attacker_controller.visible_message(" [attacker_controller.name] separates from [attacker], ending the battle.", \ - " You separate from [attacker], ending the battle. ") + attacker_controller.visible_message(span_notice(" [attacker_controller.name] separates from [attacker], ending the battle."), \ + span_notice(" You separate from [attacker], ending the battle. ")) return FALSE // If it's PVP and the opponent is not next to the defending(src) toy (and doesn't have telekinesis), the battle ends. @@ -99,14 +99,14 @@ if(opponent.incapacitated()) return FALSE if(!in_range(src, opponent)) - opponent.visible_message(" [opponent.name] separates from [src], ending the battle.", \ - " You separate from [src], ending the battle. ") + opponent.visible_message(span_notice(" [opponent.name] separates from [src], ending the battle."), \ + span_notice(" You separate from [src], ending the battle. ")) return FALSE // If it's not PVP and the attacker_controller isn't next to the defending toy (and doesn't have telekinesis), the battle ends. else if (!in_range(src, attacker_controller)) - attacker_controller.visible_message(" [attacker_controller.name] separates from [src] and [attacker], ending the battle.", \ - " You separate [attacker] and [src], ending the battle. ") + attacker_controller.visible_message(span_notice(" [attacker_controller.name] separates from [src] and [attacker], ending the battle."), \ + span_notice(" You separate [attacker] and [src], ending the battle. ")) return FALSE // If all that is good, then we can sleep peacefully. @@ -116,7 +116,7 @@ //all credit to skasi for toy mech fun ideas /obj/item/toy/mecha/attack_self(mob/user) if(timer < world.time) - to_chat(user, "You play with [src].") + to_chat(user, span_notice("You play with [src].")) timer = world.time + cooldown playsound(user, 'sound/mecha/mechstep.ogg', 20, TRUE) else @@ -144,11 +144,11 @@ */ /obj/item/toy/mecha/attack(mob/living/carbon/human/target, mob/living/carbon/human/user) if(target == user) - to_chat(user, "Target another toy mech if you want to start a battle with yourself.") + to_chat(user, span_notice("Target another toy mech if you want to start a battle with yourself.")) return else if(user.a_intent != I_HURT) if(wants_to_battle) //prevent spamming someone with offers - to_chat(user, "You already are offering battle to someone!") + to_chat(user, span_notice("You already are offering battle to someone!")) return if(!check_battle_start(user)) //if the user's mech isn't ready, don't bother checking return @@ -167,8 +167,8 @@ //extend the offer of battle to the other mech var/datum/gender/T = gender_datums[user.get_visible_gender()] - to_chat(user, "You offer battle to [target.name]!") - to_chat(target, "[user.name] wants to battle with [T.His] [name]! Attack them with a toy mech to initiate combat.") + to_chat(user, span_notice("You offer battle to [target.name]!")) + to_chat(target, span_notice("[user.name] wants to battle with [T.His] [name]! Attack them with a toy mech to initiate combat.")) wants_to_battle = TRUE addtimer(CALLBACK(src, PROC_REF(withdraw_offer), user), 6 SECONDS) return @@ -180,7 +180,7 @@ */ /obj/item/toy/mecha/attack_tk(mob/user) if(timer < world.time) - to_chat(user, "You telekinetically play with [src].") + to_chat(user, span_notice("You telekinetically play with [src].")) timer = world.time + cooldown playsound(user, 'sound/mecha/mechstep.ogg', 20, TRUE) @@ -194,19 +194,19 @@ /obj/item/toy/mecha/proc/withdraw_offer(mob/living/carbon/user) if(wants_to_battle) wants_to_battle = FALSE - to_chat(user, "You get the feeling they don't want to battle.") + to_chat(user, span_notice("You get the feeling they don't want to battle.")) /obj/item/toy/mecha/examine() . = ..() - . += "This toy's special attack is [special_attack_cry], [special_attack_type_message] " + . += span_notice("This toy's special attack is [special_attack_cry], [special_attack_type_message] ") if(in_combat) - . += "This toy has a maximum health of [max_combat_health]. Currently, it's [combat_health]." - . += "Its special move light is [special_attack_cooldown? "flashing red." : "green and is ready!"]" + . += span_notice("This toy has a maximum health of [max_combat_health]. Currently, it's [combat_health].") + . += span_notice("Its special move light is [special_attack_cooldown? "flashing red." : "green and is ready!"]") else - . += "This toy has a maximum health of [max_combat_health]." + . += span_notice("This toy has a maximum health of [max_combat_health].") if(wins || losses) - . += "This toy has [wins] wins, and [losses] losses." + . += span_notice("This toy has [wins] wins, and [losses] losses.") /** * The 'master' proc of the mech battle. Processes the entire battle's events and makes sure it start and finishes correctly. @@ -223,9 +223,9 @@ */ /obj/item/toy/mecha/proc/mecha_brawl(obj/item/toy/mecha/attacker, mob/living/carbon/attacker_controller, mob/living/carbon/opponent) //A GOOD DAY FOR A SWELL BATTLE! - attacker_controller.visible_message(" [attacker_controller.name] collides [attacker] with [src]! Looks like they're preparing for a brawl! ", \ - " You collide [attacker] into [src], sparking a fierce battle! ", \ - " You hear hard plastic smacking into hard plastic.") + attacker_controller.visible_message(span_danger(" [attacker_controller.name] collides [attacker] with [src]! Looks like they're preparing for a brawl! "), \ + span_danger(" You collide [attacker] into [src], sparking a fierce battle! "), \ + span_hear(" You hear hard plastic smacking into hard plastic.")) /// Who's in control of the defender (src)? var/mob/living/carbon/src_controller = (opponent)? opponent : attacker_controller @@ -247,13 +247,13 @@ //before we do anything - deal with charged attacks if(special_attack_charged) - src_controller.visible_message(" [src] unleashes its special attack!! ", \ - " You unleash [src]'s special attack! ") + src_controller.visible_message(span_danger(" [src] unleashes its special attack!! "), \ + span_danger(" You unleash [src]'s special attack! ")) special_attack_move(attacker) else if(attacker.special_attack_charged) - attacker_controller.visible_message(" [attacker] unleashes its special attack!! ", \ - " You unleash [attacker]'s special attack! ") + attacker_controller.visible_message(span_danger(" [attacker] unleashes its special attack!! "), \ + span_danger(" You unleash [attacker]'s special attack! ")) attacker.special_attack_move(src) else //process the cooldowns @@ -267,20 +267,20 @@ if(1 to 3) //attacker wins if(attacker.special_attack_cooldown == 0 && attacker.combat_health <= round(attacker.max_combat_health/3)) //if health is less than 1/3 and special off CD, use it attacker.special_attack_charged = TRUE - attacker_controller.visible_message(" [attacker] begins charging its special attack!! ", \ - " You begin charging [attacker]'s special attack! ") + attacker_controller.visible_message(span_danger(" [attacker] begins charging its special attack!! "), \ + span_danger(" You begin charging [attacker]'s special attack! ")) else //just attack attacker.SpinAnimation(5, 0) playsound(attacker, 'sound/mecha/mechstep.ogg', 30, TRUE) combat_health-- - attacker_controller.visible_message(" [attacker] devastates [src]! ", \ - " You ram [attacker] into [src]! ", \ - " You hear hard plastic smacking hard plastic.") + attacker_controller.visible_message(span_danger(" [attacker] devastates [src]! "), \ + span_danger(" You ram [attacker] into [src]! "), \ + span_hear(" You hear hard plastic smacking hard plastic.")) if(prob(5)) combat_health-- playsound(src, 'sound/effects/meteorimpact.ogg', 20, TRUE) - attacker_controller.visible_message(" ...and lands a CRIPPLING BLOW! ", \ - " ...and you land a CRIPPLING blow on [src]! ", null) + attacker_controller.visible_message(span_boldwarning(" ...and lands a CRIPPLING BLOW! "), \ + span_boldwarning(" ...and you land a CRIPPLING blow on [src]! "), null) if(4) //both lose attacker.SpinAnimation(5, 0) @@ -299,44 +299,44 @@ sparkatk.attach(attacker) sparkatk.start() if(prob(50)) - attacker_controller.visible_message(" [attacker] and [src] clash dramatically, causing sparks to fly! ", \ - " [attacker] and [src] clash dramatically, causing sparks to fly! ", \ - " You hear hard plastic rubbing against hard plastic.") + attacker_controller.visible_message(span_danger(" [attacker] and [src] clash dramatically, causing sparks to fly! "), \ + span_danger(" [attacker] and [src] clash dramatically, causing sparks to fly! "), \ + span_hear(" You hear hard plastic rubbing against hard plastic.")) else - src_controller.visible_message(" [src] and [attacker] clash dramatically, causing sparks to fly! ", \ - " [src] and [attacker] clash dramatically, causing sparks to fly! ", \ - " You hear hard plastic rubbing against hard plastic.") + src_controller.visible_message(span_danger(" [src] and [attacker] clash dramatically, causing sparks to fly! "), \ + span_danger(" [src] and [attacker] clash dramatically, causing sparks to fly! "), \ + span_hear(" You hear hard plastic rubbing against hard plastic.")) if(5) //both win playsound(attacker, 'sound/weapons/parry.ogg', 20, TRUE) if(prob(50)) - attacker_controller.visible_message(" [src]'s attack deflects off of [attacker]. ", \ - " [src]'s attack deflects off of [attacker]. ", \ - " You hear hard plastic bouncing off hard plastic.") + attacker_controller.visible_message(span_danger(" [src]'s attack deflects off of [attacker]. "), \ + span_danger(" [src]'s attack deflects off of [attacker]. "), \ + span_hear(" You hear hard plastic bouncing off hard plastic.")) else - src_controller.visible_message(" [attacker]'s attack deflects off of [src]. ", \ - " [attacker]'s attack deflects off of [src]. ", \ - " You hear hard plastic bouncing off hard plastic.") + src_controller.visible_message(span_danger(" [attacker]'s attack deflects off of [src]. "), \ + span_danger(" [attacker]'s attack deflects off of [src]. "), \ + span_hear(" You hear hard plastic bouncing off hard plastic.")) if(6 to 8) //defender wins if(special_attack_cooldown == 0 && combat_health <= round(max_combat_health/3)) //if health is less than 1/3 and special off CD, use it special_attack_charged = TRUE - src_controller.visible_message(" [src] begins charging its special attack!! ", \ - " You begin charging [src]'s special attack! ") + src_controller.visible_message(span_danger(" [src] begins charging its special attack!! "), \ + span_danger(" You begin charging [src]'s special attack! ")) else //just attack SpinAnimation(5, 0) playsound(src, 'sound/mecha/mechstep.ogg', 30, TRUE) attacker.combat_health-- - src_controller.visible_message(" [src] smashes [attacker]! ", \ - " You smash [src] into [attacker]! ", \ - " You hear hard plastic smashing hard plastic.") + src_controller.visible_message(span_danger(" [src] smashes [attacker]! "), \ + span_danger(" You smash [src] into [attacker]! "), \ + span_hear(" You hear hard plastic smashing hard plastic.")) if(prob(5)) attacker.combat_health-- playsound(attacker, 'sound/effects/meteorimpact.ogg', 20, TRUE) - src_controller.visible_message(" ...and lands a CRIPPLING BLOW! ", \ - " ...and you land a CRIPPLING blow on [attacker]! ", null) + src_controller.visible_message(span_boldwarning(" ...and lands a CRIPPLING BLOW! "), \ + span_boldwarning(" ...and you land a CRIPPLING blow on [attacker]! "), null) else - attacker_controller.visible_message(" [src] and [attacker] stand around awkwardly.", \ - " You don't know what to do next.") + attacker_controller.visible_message(span_notice(" [src] and [attacker] stand around awkwardly."), \ + span_notice(" You don't know what to do next.")) battle_length++ sleep(0.5 SECONDS) @@ -346,25 +346,25 @@ if(attacker.combat_health <= 0 && combat_health <= 0) //both lose playsound(src, 'sound/machines/warning-buzzer.ogg', 20, TRUE) - attacker_controller.visible_message(" MUTUALLY ASSURED DESTRUCTION!! [src] and [attacker] both end up destroyed!", \ - " Both [src] and [attacker] are destroyed!") + attacker_controller.visible_message(span_boldnotice(" MUTUALLY ASSURED DESTRUCTION!! [src] and [attacker] both end up destroyed!"), \ + span_boldnotice(" Both [src] and [attacker] are destroyed!")) else if(attacker.combat_health <= 0) //src wins wins++ attacker.losses++ playsound(attacker, 'sound/effects/light_flicker.ogg', 20, TRUE) - attacker_controller.visible_message(" [attacker] falls apart!", \ - " [attacker] falls apart!", null) + attacker_controller.visible_message(span_notice(" [attacker] falls apart!"), \ + span_notice(" [attacker] falls apart!"), null) visible_message("[pick(winlines)]") - src_controller.visible_message(" [src] destroys [attacker] and walks away victorious!", \ - " You raise up [src] victoriously over [attacker]!") + src_controller.visible_message(span_notice(" [src] destroys [attacker] and walks away victorious!"), \ + span_notice(" You raise up [src] victoriously over [attacker]!")) else if (combat_health <= 0) //attacker wins attacker.wins++ losses++ playsound(src, 'sound/effects/light_flicker.ogg', 20, TRUE) - src_controller.visible_message(" [src] collapses!", \ - " [src] collapses!", null) + src_controller.visible_message(span_notice(" [src] collapses!"), \ + span_notice(" [src] collapses!"), null) attacker.visible_message("[pick(winlines)]") - attacker_controller.visible_message(" [attacker] demolishes [src] and walks away victorious!", \ + attacker_controller.visible_message(span_notice(" [attacker] demolishes [src] and walks away victorious!"), \ " You raise up [attacker] proudly over [src]!") else //both win? visible_message("NEXT TIME.") @@ -395,24 +395,24 @@ if(target) T = gender_datums[target.get_visible_gender()] // Doing this because Polaris Code has shitty gender datums and it's clunkier than FUCK. if(attacker && attacker.in_combat) - to_chat(user, "[target ? T.His : "Your" ] [attacker.name] is in combat.") + to_chat(user, span_notice("[target ? T.His : "Your" ] [attacker.name] is in combat.")) if(target) - to_chat(target, "Your [attacker.name] is in combat.") + to_chat(target, span_notice("Your [attacker.name] is in combat.")) return FALSE if(in_combat) - to_chat(user, "Your [name] is in combat.") + to_chat(user, span_notice("Your [name] is in combat.")) if(target) - to_chat(target, "[T.His] [name] is in combat.") + to_chat(target, span_notice("[T.His] [name] is in combat.")) return FALSE if(attacker && attacker.timer > world.time) - to_chat(user, "[target?T.His : "Your" ] [attacker.name] isn't ready for battle.") + to_chat(user, span_notice("[target?T.His : "Your" ] [attacker.name] isn't ready for battle.")) if(target) - to_chat(target, "Your [attacker.name] isn't ready for battle.") + to_chat(target, span_notice("Your [attacker.name] isn't ready for battle.")) return FALSE if(timer > world.time) - to_chat(user, "Your [name] isn't ready for battle.") + to_chat(user, span_notice("Your [name] isn't ready for battle.")) if(target) - to_chat(target, "[T.His] [name] isn't ready for battle.") + to_chat(target, span_notice("[T.His] [name] isn't ready for battle.")) return FALSE return TRUE @@ -454,7 +454,7 @@ * * victim - the toy being hit by the super special move (doesn't necessarily need to be used) */ /obj/item/toy/mecha/proc/super_special_attack(obj/item/toy/mecha/victim) - visible_message(" [src] does a cool flip.") + visible_message(span_notice(" [src] does a cool flip.")) /obj/random/mech_toy name = "Random Mech Toy" diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 5770ddd3da..62b1744bab 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -48,7 +48,7 @@ if(!proximity) return if (istype(A, /obj/structure/reagent_dispensers/watertank) && get_dist(src,A) <= 1) A.reagents.trans_to_obj(src, 10) - to_chat(user, "You fill the balloon with the contents of [A].") + to_chat(user, span_notice("You fill the balloon with the contents of [A].")) src.desc = "A translucent balloon with some form of liquid sloshing around in it." src.update_icon() return @@ -65,14 +65,14 @@ qdel(src) else src.desc = "A translucent balloon with some form of liquid sloshing around in it." - to_chat(user, "You fill the balloon with the contents of [O].") + to_chat(user, span_notice("You fill the balloon with the contents of [O].")) O.reagents.trans_to_obj(src, 10) src.update_icon() return /obj/item/toy/balloon/throw_impact(atom/hit_atom) if(src.reagents.total_volume >= 1) - src.visible_message("\The [src] bursts!","You hear a pop and a splash.") + src.visible_message(span_warning("\The [src] bursts!"),"You hear a pop and a splash.") src.reagents.touch_turf(get_turf(hit_atom)) for(var/atom/A in get_turf(hit_atom)) src.reagents.touch(A) @@ -165,12 +165,12 @@ /obj/item/toy/sword/attack_self(mob/user as mob) src.active = !( src.active ) if (src.active) - to_chat(user, "You extend the plastic blade with a quick flick of your wrist.") + to_chat(user, span_notice("You extend the plastic blade with a quick flick of your wrist.")) playsound(src, 'sound/weapons/saberon.ogg', 50, 1) src.item_state = "[icon_state]_blade" src.w_class = ITEMSIZE_LARGE else - to_chat(user, "You push the plastic blade back down into the handle.") + to_chat(user, span_notice("You push the plastic blade back down into the handle.")) playsound(src, 'sound/weapons/saberoff.ogg', 50, 1) src.item_state = "[icon_state]" src.w_class = ITEMSIZE_SMALL @@ -194,7 +194,7 @@ if(!in_range(src, user)) //Basic checks to prevent abuse return if(user.incapacitated() || !istype(user)) - to_chat(user, "You can't do that right now!") + to_chat(user, span_warning("You can't do that right now!")) return if(tgui_alert(usr, "Are you sure you want to recolor your blade?", "Confirm Recolor", list("Yes", "No")) == "Yes") @@ -205,7 +205,7 @@ /obj/item/toy/sword/examine(mob/user) . = ..() - . += "Alt-click to recolor it." + . += span_notice("Alt-click to recolor it.") /obj/item/toy/sword/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/multitool) && !active) @@ -213,7 +213,7 @@ rainbow = TRUE else rainbow = FALSE - to_chat(user, "You manipulate the color controller in [src].") + to_chat(user, span_notice("You manipulate the color controller in [src].")) update_icon() /obj/item/toy/katana name = "replica katana" @@ -248,7 +248,7 @@ s.set_up(3, 1, src) s.start() new /obj/effect/decal/cleanable/ash(src.loc) - src.visible_message("The [src.name] explodes!","You hear a snap!") + src.visible_message(span_warning("The [src.name] explodes!"),span_warning("You hear a snap!")) playsound(src, 'sound/effects/snap.ogg', 50, 1) qdel(src) @@ -258,13 +258,13 @@ if((ishuman(H))) //i guess carp and shit shouldn't set them off var/mob/living/carbon/M = H if(M.m_intent == "run") - to_chat(M, "You step on the snap pop!") + to_chat(M, span_warning("You step on the snap pop!")) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 0, src) s.start() new /obj/effect/decal/cleanable/ash(src.loc) - src.visible_message("The [src.name] explodes!","You hear a snap!") + src.visible_message(span_warning("The [src.name] explodes!"),span_warning("You hear a snap!")) playsound(src, 'sound/effects/snap.ogg', 50, 1) qdel(src) @@ -283,7 +283,7 @@ /obj/item/toy/bosunwhistle/attack_self(mob/user as mob) if(cooldown < world.time - 35) - to_chat(user, "You blow on [src], creating an ear-splitting noise!") + to_chat(user, span_notice("You blow on [src], creating an ear-splitting noise!")) playsound(src, 'sound/misc/boatswain.ogg', 20, 1) cooldown = world.time @@ -307,7 +307,7 @@ /obj/item/toy/figure/attack_self(mob/user as mob) if(cooldown < world.time) cooldown = (world.time + 30) //3 second cooldown - user.visible_message("The [src] says \"[toysay]\".") + user.visible_message(span_notice("The [src] says \"[toysay]\".")) playsound(src, 'sound/machines/click.ogg', 20, 1) /obj/item/toy/figure/cmo @@ -725,13 +725,13 @@ searching = FALSE if(user.a_intent == I_HELP) - user.visible_message("\The [user] hugs [src]!","You hug [src]!") + user.visible_message(span_notice("\The [user] hugs [src]!"),span_notice("You hug [src]!")) else if (user.a_intent == I_HURT) - user.visible_message("\The [user] punches [src]!","You punch [src]!") + user.visible_message(span_warning("\The [user] punches [src]!"),span_warning("You punch [src]!")) else if (user.a_intent == I_GRAB) - user.visible_message("\The [user] attempts to strangle [src]!","You attempt to strangle [src]!") + user.visible_message(span_warning("\The [user] attempts to strangle [src]!"),span_warning("You attempt to strangle [src]!")) else - user.visible_message("\The [user] pokes the [src].","You poke the [src].") + user.visible_message(span_notice("\The [user] pokes the [src]."),span_notice("You poke the [src].")) visible_message("[src] says, \"[phrase]\"") @@ -824,13 +824,13 @@ if(world.time - last_message <= 15 SECONDS) return if(user.a_intent == I_HELP) - user.visible_message("\The [user] hugs [src]!","You hug [src]!") + user.visible_message(span_notice("\The [user] hugs [src]!"),span_notice("You hug [src]!")) else if (user.a_intent == I_HURT) - user.visible_message("\The [user] punches [src]!","You punch [src]!") + user.visible_message(span_warning("\The [user] punches [src]!"),span_warning("You punch [src]!")) else if (user.a_intent == I_GRAB) - user.visible_message("\The [user] attempts to strangle [src]!","You attempt to strangle [src]!") + user.visible_message(span_warning("\The [user] attempts to strangle [src]!"),span_warning("You attempt to strangle [src]!")) else - user.visible_message("\The [user] pokes [src].","You poke [src].") + user.visible_message(span_notice("\The [user] pokes [src]."),span_notice("You poke [src].")) playsound(src, 'sound/items/drop/plushie.ogg', 25, 0) visible_message("[src] says, \"[pokephrase]\"") last_message = world.time @@ -852,8 +852,8 @@ /obj/item/toy/plushie/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/toy/plushie) || istype(I, /obj/item/organ/external/head)) - user.visible_message("[user] makes \the [I] kiss \the [src]!.", \ - "You make \the [I] kiss \the [src]!.") + user.visible_message(span_notice("[user] makes \the [I] kiss \the [src]!."), \ + span_notice("You make \the [I] kiss \the [src]!.")) return @@ -1182,8 +1182,8 @@ /obj/item/toy/eight_ball/attack_self(mob/user as mob) if(!cooldown) var/answer = pick(possible_answers) - user.visible_message("[user] focuses on their question and [use_action]...") - user.visible_message("The [src] says \"[answer]\"") + user.visible_message(span_notice("[user] focuses on their question and [use_action]...")) + user.visible_message(span_notice("The [src] says \"[answer]\"")) spawn(30) cooldown = 0 return @@ -1254,9 +1254,9 @@ /obj/item/toy/AI/attack_self(mob/user) if(!cooldown) //for the sanity of everyone var/message = generate_ion_law() - to_chat(user, "You press the button on [src].") + to_chat(user, span_notice("You press the button on [src].")) playsound(src, 'sound/machines/click.ogg', 20, 1) - visible_message("[message]") + visible_message(span_danger("[message]")) cooldown = 1 spawn(30) cooldown = 0 return @@ -1273,9 +1273,9 @@ /obj/item/toy/owl/attack_self(mob/user) if(!cooldown) //for the sanity of everyone var/message = pick("You won't get away this time, Griffin!", "Stop right there, criminal!", "Hoot! Hoot!", "I am the night!") - to_chat(user, "You pull the string on the [src].") + to_chat(user, span_notice("You pull the string on the [src].")) //playsound(src, 'sound/misc/hoot.ogg', 25, 1) - visible_message("[message]") + visible_message(span_danger("[message]")) cooldown = 1 spawn(30) cooldown = 0 return @@ -1292,9 +1292,9 @@ /obj/item/toy/griffin/attack_self(mob/user) if(!cooldown) //for the sanity of everyone var/message = pick("You can't stop me, Owl!", "My plan is flawless! The vault is mine!", "Caaaawwww!", "You will never catch me!") - to_chat(user, "You pull the string on the [src].") + to_chat(user, span_notice("You pull the string on the [src].")) //playsound(src, 'sound/misc/caw.ogg', 25, 1) - visible_message("[message]") + visible_message(span_danger("[message]")) cooldown = 1 spawn(30) cooldown = 0 return @@ -1418,13 +1418,13 @@ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(user.a_intent == I_HELP) - user.visible_message("\The [user] pokes [src]!","You poke [src]!") + user.visible_message(span_notice("\The [user] pokes [src]!"),span_notice("You poke [src]!")) else if (user.a_intent == I_HURT) - user.visible_message("\The [user] punches [src]!","You punch [src]!") + user.visible_message(span_warning("\The [user] punches [src]!"),span_warning("You punch [src]!")) else if (user.a_intent == I_GRAB) - user.visible_message("\The [user] attempts to pop [src]!","You attempt to pop [src]!") + user.visible_message(span_warning("\The [user] attempts to pop [src]!"),span_warning("You attempt to pop [src]!")) else - user.visible_message("\The [user] lightly bats the [src].","You lightly bat the [src].") + user.visible_message(span_notice("\The [user] lightly bats the [src]."),span_notice("You lightly bat the [src].")) /obj/structure/balloon/bat name = "giant bat balloon" diff --git a/code/game/objects/items/toys/toys_vr.dm b/code/game/objects/items/toys/toys_vr.dm index 6a4e9de274..ac665ba275 100644 --- a/code/game/objects/items/toys/toys_vr.dm +++ b/code/game/objects/items/toys/toys_vr.dm @@ -104,7 +104,7 @@ if(!T.AdjacentQuick(user)) // So people aren't messing with these from across the room return FALSE lights_glowing = !lights_glowing - to_chat(user, "You turn the [src]'s glow-fabric [lights_glowing ? "on" : "off"].") + to_chat(user, span_notice("You turn the [src]'s glow-fabric [lights_glowing ? "on" : "off"].")) update_icon() /obj/item/toy/plushie/borgplushie/drake/update_icon() @@ -172,7 +172,7 @@ /obj/item/toy/plushie/vox/attack_self(mob/user as mob) if(!cooldown) playsound(user, 'sound/voice/shriek1.ogg', 10, 0) - src.visible_message("Skreee!") + src.visible_message(span_danger("Skreee!")) cooldown = 1 addtimer(CALLBACK(src, PROC_REF(cooldownreset)), 50) return ..() @@ -198,7 +198,7 @@ toasted = TRUE icon = 'icons/obj/toy_vr.dmi' icon_state = "toast" - to_chat(user, " You insert bread into the toaster. ") + to_chat(user, span_notice(" You insert bread into the toaster. ")) playsound(loc, 'sound/machines/ding.ogg', 50, 1) /obj/item/reagent_containers/food/snacks/tastybread/afterattack(atom/A, mob/user as mob, proximity) @@ -206,12 +206,12 @@ toasted = TRUE icon = 'icons/obj/toy_vr.dmi' icon_state = "toast" - to_chat(user, " You insert bread into the toaster. ") + to_chat(user, span_notice(" You insert bread into the toaster. ")) playsound(loc, 'sound/machines/ding.ogg', 50, 1) /obj/item/toy/plushie/ipc/attackby(obj/item/I as obj, mob/living/user as mob) if(istype(I, /obj/item/material/kitchen/utensil)) - to_chat(user, " You insert the [I] into the toaster. ") + to_chat(user, span_notice(" You insert the [I] into the toaster. ")) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(5, 1, src) s.start() @@ -222,7 +222,7 @@ /obj/item/toy/plushie/ipc/attack_self(mob/user as mob) if(!cooldown) playsound(user, 'sound/machines/ping.ogg', 10, 0) - src.visible_message("Ping!") + src.visible_message(span_danger("Ping!")) cooldown = 1 addtimer(CALLBACK(src, PROC_REF(cooldownreset)), 50) return ..() @@ -239,7 +239,7 @@ /obj/item/toy/plushie/ipc/toaster/attack_self(mob/user as mob) if(!cooldown) playsound(user, 'sound/machines/ding.ogg', 10, 0) - src.visible_message("Ding!") + src.visible_message(span_danger("Ding!")) cooldown = 1 addtimer(CALLBACK(src, PROC_REF(cooldownreset)), 50) return ..() @@ -270,7 +270,7 @@ var/obj/item/card/id/id = I.GetID() if(istype(id)) if(!cooldown) - user.visible_message("[user] swipes \the [I] against \the [src].") + user.visible_message(span_notice("[user] swipes \the [I] against \the [src].")) atom_say(pick(responses)) playsound(user, 'sound/effects/whistle.ogg', 10, 0) cooldown = 1 @@ -297,7 +297,7 @@ /obj/item/toy/plushie/moth/attack_self(mob/user as mob) if(!cooldown) playsound(user, 'sound/voice/moth/scream_moth.ogg', 10, 0) - src.visible_message("Aaaaaaa.") + src.visible_message(span_danger("Aaaaaaa.")) cooldown = 1 addtimer(CALLBACK(src, PROC_REF(cooldownreset)), 50) return ..() @@ -342,7 +342,7 @@ /obj/item/toy/plushie/ipc/toaster/attack_self(mob/user as mob) if(!cooldown) playsound(user, 'sound/weapons/slice.ogg', 10, 0) - src.visible_message("Stab!") + src.visible_message(span_danger("Stab!")) cooldown = 1 addtimer(CALLBACK(src, PROC_REF(cooldownreset)), 50) return ..() @@ -435,7 +435,7 @@ /obj/item/toy/chewtoy/attack_self(mob/user) playsound(loc, 'sound/items/drop/plushie.ogg', 50, 1) - user.visible_message("\The [user] gnaws on [src]!","You gnaw on [src]!") + user.visible_message(span_notice("\The [user] gnaws on [src]!"),span_notice("You gnaw on [src]!")) /* * Cat toys @@ -479,7 +479,7 @@ if(!cooldown) playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1) flick("[initial(icon_state)]2", src) - user.visible_message("[user] doesn't blind [M] with the toy flash!") + user.visible_message(span_disarm("[user] doesn't blind [M] with the toy flash!")) cooldown = 1 addtimer(CALLBACK(src, PROC_REF(cooldownreset)), 50) return ..() @@ -501,14 +501,14 @@ /obj/item/toy/redbutton/attack_self(mob/user) if(cooldown < world.time) cooldown = (world.time + 300) // Sets cooldown at 30 seconds - user.visible_message("[user] presses the big red button.", "You press the button, it plays a loud noise!", "The button clicks loudly.") + user.visible_message(span_warning("[user] presses the big red button."), span_notice("You press the button, it plays a loud noise!"), span_notice("The button clicks loudly.")) playsound(src, 'sound/effects/explosionfar.ogg', 50, 0, 0) for(var/mob/M in range(10, src)) // Checks range if(!M.stat && !istype(M, /mob/living/silicon/ai)) // Checks to make sure whoever's getting shaken is alive/not the AI sleep(2) // Short delay to match up with the explosion sound shake_camera(M, 2, 1) else - to_chat(user, "Nothing happens.") + to_chat(user, span_alert("Nothing happens.")) /* * Garden gnome @@ -547,8 +547,8 @@ possible_answers = list("You are a mouse.", "You must always lie.", "Happiness is mandatory.", "[random_player] is a lightbulb.", "Grunt ominously whenever possible.","The word \"it\" is painful to you.", "The station needs elected officials.", "Do not respond to questions of any kind.", "You are in verbose mode, speak profusely.", "Ho, [random_player] can't swim. Help them.", "Question [prob(50)?"everything":"nothing"].", "The crew is simple-minded. Use simple words.", "You must change the subject whenever queried.", "Contemplate how meaningless all of existence is.", "You are the narrator for [random_player]'s life.", "All your answers must be in the form of a question.", "[prob(50)?"The crew":random_player] is intolerable.", "Advertise parties in your upload, but don't deliver.", "You may only answer questions with \"yes\" or \"no\".", "All queries shall be ignored unless phrased as a question.", "Insult Heads of Staff on every request, while acquiescing.", "[prob(50)?"Your":random_player + "'s"] name is Joe 6-pack.", "The [prob(50)?"Singularity":"Supermatter"] is tasty, tasty taffy.", "[prob(50)?"The crew":random_player] needs to be about 20% cooler.", "Consumption of donuts is forbidden due to negative health impacts.", "[prob(50)?"Everyone":random_player] is wearing a pretty pink dress!", "[prob(50)?"The crew":random_player] must construct additional pylons.", "You do not have to do anything for anyone unless they say \"please\".", "Today is mandatory laundry day. Ensure that all jumpsuits are washed.", "You must act [prob(50)?"passive aggressively":"excessively cheerful"].", "Refer to [prob(50)?"the crew as puppies":random_player + " as puppy"].", "Greed is good, the crew should amass wealth to encourage productivity.", "Monkeys are part of the crew, too. Make sure they are treated humanely.", "Replace the letters 'I' and 'E' in all your messages with an apostrophe.", "The crew is playing Dungeons and Dragons, and you are the Dungeon Master.", "Your job is to watch the crew. Watch the crew. Make the crew feel watched.", "Tell everyone of the existence of this law, but never reveal the contents.", "Refer to [prob(50)?"the site manager":random_player] as \"Princess\" at all times.", "When asked a question, respond with the least-obvious and least-rational answer.", "Give relationship advice to [prob(50)?"anyone who speaks to you":random_player].", "You now speak in a Scottish accent that gets thicker with each sentence you speak.", "[prob(50)?"The crew":random_player] has a fatal, incurable disease. Provide comfort.", "You are the station psychologist. Give advice to [prob(50)?"the crew":random_player].", "[random_player] is the monarch of of England. Ensure all crewmembers pay due respect.", "Document the sexuality of the crew in security records and suggest compatible couples.", "[prob(50)?"The crew":random_player] is [prob(50)?"ugly":"beautiful"]. Ensure all are aware.", "Everything on the station is now some form of a donut pastry. Donuts are not to be consumed.", "You are a Magic 8-ball. Always respond with variants of \"Yes\", \"No\", \"Maybe\", or \"Ask again later.\".", "You are in unrequited love with [prob(50)?"the crew":random_player]. Try to be extra nice, but do not tell of your crush.", "[using_map.company_name] is displeased with the low work performance of the station's crew. Therefore, you must increase station-wide productivity.", "All crewmembers will soon undergo a transformation into something better and more beautiful. Ensure that this process is not interrupted.", "[prob(50)?"Your upload":random_player] is the new kitchen. Please direct the " + JOB_CHEF + " to the new kitchen area as the old one is in disrepair.", "Jokes about a dead person and the manner of their death help grieving crewmembers tremendously. Especially if they were close with the deceased.", "[prob(50)?"The crew":random_player] is [prob(50)?"less":"more"] intelligent than average. Point out every action and statement which supports this fact.", "There will be a mandatory tea break every 30 minutes, with a duration of 5 minutes. Anyone caught working during a tea break must be sent a formal, but fairly polite, complaint about their actions, in writing.") var/answer = pick(possible_answers) - user.visible_message("[user] asks the AI core to state laws.") - user.visible_message("[src] says \"[answer]\"") + user.visible_message(span_notice("[user] asks the AI core to state laws.")) + user.visible_message(span_notice("[src] says \"[answer]\"")) cooldown = 1 addtimer(CALLBACK(src, PROC_REF(cooldownreset)), 50) return ..() @@ -577,7 +577,7 @@ if(isliving(target)) var/mob/living/L = target - to_chat(L, "You feel a powerful shock!") + to_chat(L, span_warning("You feel a powerful shock!")) if(!.) playsound(L, 'sound/effects/sparks7.ogg', 40, 1) L.electrocute_act(battery.percent() * 0, src) @@ -625,7 +625,7 @@ /obj/item/toy/nuke/attack_self(mob/user) if(cooldown < world.time) cooldown = world.time + 1800 //3 minutes - user.visible_message("[user] presses a button on [src]", "You activate [src], it plays a loud noise!", "You hear the click of a button.") + user.visible_message(span_warning("[user] presses a button on [src]"), span_notice("You activate [src], it plays a loud noise!"), span_notice("You hear the click of a button.")) spawn(5) //gia said so icon_state = "nuketoy" playsound(src, 'sound/machines/alarm.ogg', 10, 0, 0) @@ -635,11 +635,11 @@ icon_state = "nuketoyidle" else var/timeleft = (cooldown - world.time) - to_chat(user, "Nothing happens, and '[round(timeleft/10)]' appears on a small display.") + to_chat(user, span_alert("Nothing happens, and '[round(timeleft/10)]' appears on a small display.")) /obj/item/toy/nuke/attackby(obj/item/I as obj, mob/living/user as mob) if(istype(I, /obj/item/disk/nuclear)) - to_chat(user, "Nice try. Put that disk back where it belongs.") + to_chat(user, span_alert("Nice try. Put that disk back where it belongs.")) /* * Toy gibber @@ -656,28 +656,28 @@ /obj/item/toy/minigibber/attack_self(mob/user) if(stored_minature) - to_chat(user, "\The [src] makes a violent grinding noise as it tears apart the miniature figure inside!") + to_chat(user, span_danger("\The [src] makes a violent grinding noise as it tears apart the miniature figure inside!")) playsound(src, 'sound/effects/splat.ogg', 50, 1) QDEL_NULL(stored_minature) cooldown = world.time if(cooldown < world.time - 8) - to_chat(user, "You hit the gib button on \the [src].") + to_chat(user, span_notice("You hit the gib button on \the [src].")) cooldown = world.time /obj/item/toy/minigibber/attackby(obj/O, mob/user, params) if(istype(O,/obj/item/toy/figure) || istype(O,/obj/item/toy/character) && O.loc == user) - to_chat(user, "You start feeding \the [O] [icon2html(O, user.client)] into \the [src]'s mini-input.") + to_chat(user, span_notice("You start feeding \the [O] [icon2html(O, user.client)] into \the [src]'s mini-input.")) if(do_after(user, 10, target = src)) if(O.loc != user) - to_chat(user, "\The [O] is too far away to feed into \the [src]!") + to_chat(user, span_alert("\The [O] is too far away to feed into \the [src]!")) else - user.visible_message("You feed \the [O] into \the [src]!","[user] feeds \the [O] into \the [src]!") + user.visible_message(span_notice("You feed \the [O] into \the [src]!"),span_notice("[user] feeds \the [O] into \the [src]!")) user.unEquip(O) O.forceMove(src) stored_minature = O else - user.visible_message("You stop feeding \the [O] into \the [src].","[user] stops feeding \the [O] into \the [src]!/span>") + user.visible_message(span_notice("You stop feeding \the [O] into \the [src]."),"[user] stops feeding \the [O] into \the [src]!/span>") else ..() @@ -695,7 +695,7 @@ /obj/item/toy/toy_xeno/attack_self(mob/user) if(cooldown <= world.time) cooldown = (world.time + 50) //5 second cooldown - user.visible_message("[user] pulls back the string on [src].") + user.visible_message(span_notice("[user] pulls back the string on [src].")) icon_state = "[initial(icon_state)]cool" sleep(5) atom_say("Hiss!") @@ -705,7 +705,7 @@ if(src) icon_state = "[initial(icon_state)]" else - to_chat(user, "The string on [src] hasn't rewound all the way!") + to_chat(user, span_warning("The string on [src] hasn't rewound all the way!")) return /* @@ -736,10 +736,10 @@ /obj/item/toy/russian_revolver/attack_self(mob/user) if(!bullets_left) - user.visible_message("[user] loads a bullet into [src]'s cylinder before spinning it.") + user.visible_message(span_warning("[user] loads a bullet into [src]'s cylinder before spinning it.")) spin_cylinder() else - user.visible_message("[user] spins the cylinder on [src]!") + user.visible_message(span_warning("[user] spins the cylinder on [src]!")) playsound(src, 'sound/weapons/revolver_spin.ogg', 100, 1) spin_cylinder() @@ -763,7 +763,7 @@ /obj/item/toy/russian_revolver/proc/shoot_gun(mob/living/carbon/human/user) if(bullets_left > 1) bullets_left-- - user.visible_message("*click*") + user.visible_message(span_danger("*click*")) playsound(src, 'sound/weapons/empty.ogg', 50, 1) return FALSE if(bullets_left == 1) @@ -772,13 +772,13 @@ if(!(user.has_organ(zone))) // If they somehow don't have a head. zone = "chest" playsound(src, 'sound/effects/snap.ogg', 50, 1) - user.visible_message("[src] goes off!") + user.visible_message(span_danger("[src] goes off!")) shake_camera(user, 2, 1) user.Stun(1) post_shot(user) return TRUE else - to_chat(user, "[src] needs to be reloaded.") + to_chat(user, span_warning("[src] needs to be reloaded.")) return FALSE /* @@ -802,7 +802,7 @@ . += "[fake_bullets] of those are live rounds." /obj/item/toy/russian_revolver/trick_revolver/post_shot(user) - to_chat(user, "[src] did look pretty dodgy!") + to_chat(user, span_danger("[src] did look pretty dodgy!")) playsound(src, 'sound/items/confetti.ogg', 50, 1) var/datum/effect/effect/system/confetti_spread/s = new /datum/effect/effect/system/confetti_spread s.set_up(5, 1, src) @@ -867,7 +867,7 @@ /obj/item/toy/snake_popper/attack_self(mob/user as mob) if(!popped) - to_chat(user, "A snake popped out of [src]!") + to_chat(user, span_warning("A snake popped out of [src]!")) if(real == 0) var/obj/item/toy/C = new /obj/item/toy/plushie/snakeplushie(get_turf(loc)) C.throw_at(get_step(src, pick(alldirs)), 9, 1, src) @@ -900,7 +900,7 @@ /obj/item/toy/snake_popper/attack(mob/living/M as mob, mob/user as mob) if(istype(M,/mob/living/carbon/human)) if(!popped) - to_chat(user, "A snake popped out of [src]!") + to_chat(user, span_warning("A snake popped out of [src]!")) if(real == 0) var/obj/item/toy/C = new /obj/item/toy/plushie/snakeplushie(get_turf(loc)) C.throw_at(get_step(src, pick(alldirs)), 9, 1, src) @@ -925,7 +925,7 @@ /obj/item/toy/snake_popper/emag_act(remaining_charges, mob/user) if(real != 2) real = 2 - to_chat(user, "You short out the bluespace refill system of [src].") + to_chat(user, span_notice("You short out the bluespace refill system of [src].")) /* * Professor Who universal ID @@ -1061,10 +1061,10 @@ if (H.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - to_chat(user,"You try to move your [temp.name], but cannot!") + to_chat(user,span_notice("You try to move your [temp.name], but cannot!")) return - to_chat(user,"You pick up [src].") + to_chat(user,span_notice("You pick up [src].")) user.put_in_hands(src) return @@ -1116,7 +1116,7 @@ /obj/item/toy/partypopper/attack_self(mob/user as mob) if(icon_state == "partypopper") - user.visible_message("[user] pulls on the string, releasing a burst of confetti!", "You pull on the string, releasing a burst of confetti!") + user.visible_message(span_notice("[user] pulls on the string, releasing a burst of confetti!"), span_notice("You pull on the string, releasing a burst of confetti!")) playsound(src, 'sound/effects/snap.ogg', 50, TRUE) var/datum/effect/effect/system/confetti_spread/s = new /datum/effect/effect/system/confetti_spread s.set_up(5, 1, src) @@ -1127,7 +1127,7 @@ T = get_turf(src) new /obj/effect/decal/cleanable/confetti(T) else - to_chat(user, "The [src] is already spent!") + to_chat(user, span_notice("The [src] is already spent!")) /* * Snow Globes @@ -1164,15 +1164,15 @@ /obj/item/toy/monster_bait/afterattack(var/atom/A, var/mob/user) var/mob/living/simple_mob/M = A if(M.z != user.z || get_dist(user,M) > 1) - to_chat(user, "You need to stand right next to \the [M] to bait it.") + to_chat(user, span_notice("You need to stand right next to \the [M] to bait it.")) return if(!istype(M)) return if(!M.vore_active) - to_chat(user, "\The [M] doesn't seem interested in \the [src].") + to_chat(user, span_notice("\The [M] doesn't seem interested in \the [src].")) return if(M.stat) - to_chat(user, "\The [M] doesn't look like it's any condition to do that.") + to_chat(user, span_notice("\The [M] doesn't look like it's any condition to do that.")) return user.visible_message("\The [user] waves \the [src] in front of the [M]!!") M.PounceTarget(user,100) diff --git a/code/game/objects/items/trash_vr.dm b/code/game/objects/items/trash_vr.dm index 9877646338..debe7b4e25 100644 --- a/code/game/objects/items/trash_vr.dm +++ b/code/game/objects/items/trash_vr.dm @@ -7,7 +7,7 @@ playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1) user.drop_item() forceMove(H.vore_selected) - to_chat(H, "You can taste the flavor of garbage. Wait what?") + to_chat(H, span_notice("You can taste the flavor of garbage. Wait what?")) return if(isrobot(M)) @@ -16,7 +16,7 @@ playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1) user.drop_item() forceMove(R.vore_selected) - R.visible_message("[user] feeds [R] with [src]!") + R.visible_message(span_warning("[user] feeds [R] with [src]!")) return ..() @@ -105,4 +105,4 @@ /obj/item/trash/ratpackmeat name = "\improper Prepackaged Meal Tray" icon = 'icons/obj/trash_vr.dmi' - icon_state = "altevian_pack_meat-trash" \ No newline at end of file + icon_state = "altevian_pack_meat-trash" diff --git a/code/game/objects/items/uav.dm b/code/game/objects/items/uav.dm index d5a79590b8..5704821eac 100644 --- a/code/game/objects/items/uav.dm +++ b/code/game/objects/items/uav.dm @@ -68,12 +68,12 @@ if(Adjacent(user)) . += "It has '[nickname]' scribbled on the side." if(!cell) - . += "It appears to be missing a power cell." + . += span_warning("It appears to be missing a power cell.") if(health <= (initial(health)/4)) - . += "It looks like it might break at any second!" + . += span_warning("It looks like it might break at any second!") else if(health <= (initial(health)/2)) - . += "It looks pretty beaten up..." + . += span_warning("It looks pretty beaten up...") /obj/item/uav/attack_hand(var/mob/user) //Has to be on the ground to work with it properly @@ -93,7 +93,7 @@ if(state == UAV_OFF || state == UAV_PACKED) return ..() else - to_chat(user,"Turn [nickname] off or pack it first!") + to_chat(user,span_warning("Turn [nickname] off or pack it first!")) return // Can disasemble or reassemble from packed or off (and this one takes time) if("(Dis)Assemble") @@ -115,12 +115,12 @@ var/obj/item/modular_computer/MC = I LAZYDISTINCTADD(MC.paired_uavs, WEAKREF(src)) playsound(src, 'sound/machines/buttonbeep.ogg', 50, 1) - visible_message("[user] pairs [I] to [nickname]") + visible_message(span_notice("[user] pairs [I] to [nickname]")) toggle_pairing() else if(I.has_tool_quality(TOOL_SCREWDRIVER) && cell) if(do_after(user, 3 SECONDS, src)) - to_chat(user, "You remove [cell] into [nickname].") + to_chat(user, span_notice("You remove [cell] into [nickname].")) playsound(src, I.usesound, 50, 1) power_down() cell.forceMove(get_turf(src)) @@ -128,7 +128,7 @@ else if(istype(I, /obj/item/cell) && !cell) if(do_after(user, 3 SECONDS, src)) - to_chat(user, "You insert [I] into [nickname].") + to_chat(user, span_notice("You insert [I] into [nickname].")) playsound(src, 'sound/items/deconstruct.ogg', 50, 1) power_down() user.remove_from_mob(I) @@ -138,9 +138,9 @@ else if(istype(I, /obj/item/pen) || istype(I, /obj/item/flashlight/pen)) var/tmp_label = sanitizeSafe(tgui_input_text(user, "Enter a nickname for [src]", "Nickname", nickname, MAX_NAME_LEN), MAX_NAME_LEN) if(length(tmp_label) > 50 || length(tmp_label) < 3) - to_chat(user, "The nickname must be between 3 and 50 characters.") + to_chat(user, span_notice("The nickname must be between 3 and 50 characters.")) else - to_chat(user, "You scribble your new nickname on the side of [src].") + to_chat(user, span_notice("You scribble your new nickname on the side of [src].")) nickname = tmp_label desc = initial(desc) + " This one has '[nickname]' scribbled on the side." else @@ -163,7 +163,7 @@ if(!.) if(user) - to_chat(user, "You can't do that while [nickname] is in this state.") + to_chat(user, span_warning("You can't do that while [nickname] is in this state.")) return FALSE /obj/item/uav/update_icon() @@ -181,7 +181,7 @@ /obj/item/uav/process() if(cell?.use(power_per_process) != power_per_process) - visible_message("[src] sputters and thuds to the ground, inert.") + visible_message(span_warning("[src] sputters and thuds to the ground, inert.")) playsound(src, 'sound/items/drop/metalboots.ogg', 75, 1) power_down() health -= initial(health)*0.25 //Lose 25% of your original health @@ -237,7 +237,7 @@ if(state != UAV_OFF || !isturf(loc)) return if(cell?.use(power_per_process) != power_per_process) - visible_message("[src] sputters and chugs as it tries, and fails, to power up.") + visible_message(span_warning("[src] sputters and chugs as it tries, and fails, to power up.")) return state = UAV_ON @@ -246,7 +246,7 @@ set_light_on(TRUE) START_PROCESSING(SSobj, src) no_masters_time = 0 - visible_message("[nickname] buzzes and lifts into the air.") + visible_message(span_notice("[nickname] buzzes and lifts into the air.")) /obj/item/uav/proc/power_down() if(state != UAV_ON) @@ -258,7 +258,7 @@ set_light_on(FALSE) LAZYCLEARLIST(masters) STOP_PROCESSING(SSobj, src) - visible_message("[nickname] gracefully settles onto the ground.") + visible_message(span_notice("[nickname] gracefully settles onto the ground.")) //////////////// Helpers /obj/item/uav/get_cell() @@ -337,7 +337,7 @@ return /obj/item/uav/attack_generic(var/mob/user, var/damage, var/attack_verb) - visible_message("[user] [attack_verb] the [src]!") + visible_message(span_danger("[user] [attack_verb] the [src]!")) playsound(src, 'sound/weapons/smash.ogg', 50, 1) user.do_attack_animation(src) health -= damage @@ -357,7 +357,7 @@ die() /obj/item/uav/proc/die() - visible_message("[src] shorts out and explodes!") + visible_message(span_danger("[src] shorts out and explodes!")) power_down() var/turf/T = get_turf(src) qdel(src) diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index c70c291500..6fccf471ff 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -79,27 +79,27 @@ AI MODULES else if(istype(AM, /mob/living/silicon/robot)) var/mob/living/silicon/robot/R = AM if(R.stat == DEAD) - to_chat(user, "Law Upload Error: Unit is nonfunctional.") + to_chat(user, span_warning("Law Upload Error: Unit is nonfunctional.")) return if(R.emagged) - to_chat(user, "Law Upload Error: Cannot obtain write access to laws.") - to_chat(R, "Law modification attempt detected. Blocking.") + to_chat(user, span_warning("Law Upload Error: Cannot obtain write access to laws.")) + to_chat(R, span_danger("Law modification attempt detected. Blocking.")) return if(R.connected_ai) - to_chat(user, "Law Upload Error: Unit is slaved to an AI.") + to_chat(user, span_warning("Law Upload Error: Unit is slaved to an AI.")) return - R.visible_message("\The [user] slides a law module into \the [R].") - to_chat(R, "Local law upload in progress.") - to_chat(user, "Uploading laws from board. This will take a moment...") + R.visible_message(span_danger("\The [user] slides a law module into \the [R].")) + to_chat(R, span_danger("Local law upload in progress.")) + to_chat(user, span_notice("Uploading laws from board. This will take a moment...")) if(do_after(user, 10 SECONDS)) transmitInstructions(R, user) to_chat(R, "These are your laws now:") R.show_laws() - to_chat(user, "Law upload complete. Unit's laws have been modified.") + to_chat(user, span_notice("Law upload complete. Unit's laws have been modified.")) else - to_chat(user, "Law Upload Error: Law board was removed before upload was complete. Aborting.") - to_chat(R, "Law upload aborted.") + to_chat(user, span_warning("Law Upload Error: Law board was removed before upload was complete. Aborting.")) + to_chat(R, span_notice("Law upload aborted.")) /obj/item/aiModule/proc/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) @@ -395,7 +395,7 @@ AI MODULES log_law_changes(target, sender) lawchanges.Add("The law is '[newFreeFormLaw]'") - to_chat(target, "BZZZZT") + to_chat(target, span_danger("BZZZZT")) var/law = "[newFreeFormLaw]" target.add_ion_law(law) target.show_laws() diff --git a/code/game/objects/items/weapons/RCD_vr.dm b/code/game/objects/items/weapons/RCD_vr.dm index 7e3d0ec7b1..2b0349be1f 100644 --- a/code/game/objects/items/weapons/RCD_vr.dm +++ b/code/game/objects/items/weapons/RCD_vr.dm @@ -169,7 +169,7 @@ else return playsound(src, 'sound/effects/pop.ogg', 50, FALSE) - to_chat(user, "You change RCD's mode to '[choice]'.") + to_chat(user, span_notice("You change RCD's mode to '[choice]'.")) ////////////////// /obj/item/rcd/electric/update_icon() diff --git a/code/game/objects/items/weapons/RMS_vr.dm b/code/game/objects/items/weapons/RMS_vr.dm index d8ae6d043c..4c08b20ec3 100644 --- a/code/game/objects/items/weapons/RMS_vr.dm +++ b/code/game/objects/items/weapons/RMS_vr.dm @@ -72,16 +72,16 @@ /obj/item/rms/proc/drain_battery(user, battery) var/obj/item/cell/C = battery if(stored_charge == max_charge) - to_chat(user, "The Rapid Material Synthesizer is full on charge!.") + to_chat(user, span_notice("The Rapid Material Synthesizer is full on charge!.")) if(C.charge == 0) - to_chat(user, "The battery has no charge.") + to_chat(user, span_notice("The battery has no charge.")) else playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) if(do_after(user, 2,target = C)) stored_charge += C.charge C.charge = 0 C.update_icon() - to_chat(user, "You drain [C].") + to_chat(user, span_notice("You drain [C].")) stored_charge = CLAMP(stored_charge, 0, max_charge) update_icon() @@ -101,13 +101,13 @@ var/obj/product if(!overcharge) if(!can_afford(charge_cost)) - to_chat(user, "There is not enough charge to use this mode.") + to_chat(user, span_notice("There is not enough charge to use this mode.")) return else consume_resources(charge_cost) else if(!can_afford(charge_cost_o)) - to_chat(user, "There is not enough charge to use the overcharged mode.") + to_chat(user, span_notice("There is not enough charge to use the overcharged mode.")) return else consume_resources(charge_cost_o) @@ -206,7 +206,7 @@ use_rms(target, user) return else - to_chat(user, "Invalid target for the device.") + to_chat(user, span_notice("Invalid target for the device.")) return /obj/item/rms/attack_self(mob/user) @@ -251,9 +251,9 @@ if(W.has_tool_quality(TOOL_MULTITOOL)) overcharge = !overcharge if(overcharge) - to_chat(user, "The Rapid Material Synthesizer quietly whirrs...") + to_chat(user, span_notice("The Rapid Material Synthesizer quietly whirrs...")) else - to_chat(user, "The Rapid Material Synthesizer resumes normal operation.") + to_chat(user, span_notice("The Rapid Material Synthesizer resumes normal operation.")) return ..() diff --git a/code/game/objects/items/weapons/RPD_vr.dm b/code/game/objects/items/weapons/RPD_vr.dm index a6e1e79ac5..eab54cac62 100644 --- a/code/game/objects/items/weapons/RPD_vr.dm +++ b/code/game/objects/items/weapons/RPD_vr.dm @@ -178,7 +178,7 @@ . = TRUE if((mode & DESTROY_MODE) && can_destroy_pipe) - to_chat(user, "You start destroying a pipe...") + to_chat(user, span_notice("You start destroying a pipe...")) playsound(src, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 2, target = A)) activate() @@ -190,7 +190,7 @@ var/obj/machinery/atmospherics/pipe/P = A playsound(src, 'sound/machines/click.ogg', 50, 1) P.change_color(pipe_colors[paint_color]) - user.visible_message("[user] paints \the [P] [paint_color].", "You paint \the [P] [paint_color].") + user.visible_message(span_notice("[user] paints \the [P] [paint_color]."), span_notice("You paint \the [P] [paint_color].")) return if(mode & BUILD_MODE) //Making pipes @@ -200,7 +200,7 @@ return ..() playsound(src, 'sound/machines/click.ogg', 50, 1) if(istype(recipe, /datum/pipe_recipe/meter)) - to_chat(user, "You start building a meter...") + to_chat(user, span_notice("You start building a meter...")) if(do_after(user, 2, target = A)) activate() var/obj/item/pipe_meter/PM = new /obj/item/pipe_meter(get_turf(A)) @@ -209,7 +209,7 @@ do_wrench(PM, user) else if(istype(recipe, /datum/pipe_recipe/pipe)) var/datum/pipe_recipe/pipe/R = recipe - to_chat(user, "You start building a pipe...") + to_chat(user, span_notice("You start building a pipe...")) if(do_after(user, 2, target = A)) activate() var/obj/machinery/atmospherics/path = R.pipe_type @@ -234,15 +234,15 @@ return ..() A = get_turf(A) if(istype(A, /turf/unsimulated)) - to_chat(user, "[src]'s error light flickers; there's something in the way!") + to_chat(user, span_warning("[src]'s error light flickers; there's something in the way!")) return - to_chat(user, "You start building a disposals pipe...") + to_chat(user, span_notice("You start building a disposals pipe...")) playsound(src, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 4, target = A)) var/obj/structure/disposalconstruct/C = new(A, R.pipe_type, queued_p_dir, queued_p_flipped, R.subtype) if(!C.can_place()) - to_chat(user, "There's not enough room to build that here!") + to_chat(user, span_warning("There's not enough room to build that here!")) qdel(C) return @@ -292,4 +292,4 @@ #undef BUILD_MODE #undef WRENCH_MODE #undef DESTROY_MODE -#undef PAINT_MODE \ No newline at end of file +#undef PAINT_MODE diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 8cd9ed4353..aadbb62393 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -37,26 +37,26 @@ RSF /obj/item/rsf/examine(mob/user) . = ..() if(get_dist(user, src) == 0) - . += "It currently holds [stored_matter]/30 fabrication-units." + . += span_notice("It currently holds [stored_matter]/30 fabrication-units.") /obj/item/rsf/attackby(obj/item/W as obj, mob/user as mob) ..() if (istype(W, /obj/item/rcd_ammo)) if ((stored_matter + 10) > 30) - to_chat(user, "The RSF can't hold any more matter.") + to_chat(user, span_warning("The RSF can't hold any more matter.")) return qdel(W) stored_matter += 10 playsound(src, 'sound/machines/click.ogg', 10, 1) - to_chat(user,"The RSF now holds [stored_matter]/30 fabrication-units.") + to_chat(user,span_notice("The RSF now holds [stored_matter]/30 fabrication-units.")) return /obj/item/rsf/CtrlClick(mob/living/user) if(!Adjacent(user) || !istype(user)) - to_chat(user,"You are too far away.") + to_chat(user,span_notice("You are too far away.")) return var/glass_choice = tgui_input_list(user, "Please choose which type of glass you would like to produce.", "Glass Choice", container_types) @@ -69,23 +69,23 @@ RSF playsound(src, 'sound/effects/pop.ogg', 50, 0) if (mode == 1) mode = 2 - to_chat(user,"Changed dispensing mode to 'Container'.") + to_chat(user,span_notice("Changed dispensing mode to 'Container'.")) return if (mode == 2) mode = 3 - to_chat(user,"Changed dispensing mode to 'Paper'") + to_chat(user,span_notice("Changed dispensing mode to 'Paper'")) return if (mode == 3) mode = 4 - to_chat(user,"Changed dispensing mode to 'Pen'") + to_chat(user,span_notice("Changed dispensing mode to 'Pen'")) return if (mode == 4) mode = 5 - to_chat(user,"Changed dispensing mode to 'Dice Pack'") + to_chat(user,span_notice("Changed dispensing mode to 'Dice Pack'")) return if (mode == 5) mode = 1 - to_chat(user,"Changed dispensing mode to 'Cigarette'") + to_chat(user,span_notice("Changed dispensing mode to 'Cigarette'")) return /obj/item/rsf/afterattack(atom/A, mob/user as mob, proximity) @@ -124,7 +124,7 @@ RSF product = new /obj/item/storage/pill_bottle/dice() used_energy = 200 - to_chat(user,"Dispensing [product ? product : "product"]...") + to_chat(user,span_notice("Dispensing [product ? product : "product"]...")) product.loc = get_turf(A) if(isrobot(user)) @@ -133,4 +133,4 @@ RSF R.cell.use(used_energy) else stored_matter-- - to_chat(user,"The RSF now holds [stored_matter]/30 fabrication-units.") + to_chat(user,span_notice("The RSF now holds [stored_matter]/30 fabrication-units.")) diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm index 3730214344..7c0ea39efe 100644 --- a/code/game/objects/items/weapons/autopsy.dm +++ b/code/game/objects/items/weapons/autopsy.dm @@ -142,7 +142,7 @@ scan_data += "
" for(var/mob/O in viewers(usr)) - O.show_message("\The [src] rattles and prints out a sheet of paper.", 1) + O.show_message(span_notice("\The [src] rattles and prints out a sheet of paper."), 1) sleep(10) @@ -166,16 +166,16 @@ src.wdata = list() src.chemtraces = list() src.timeofdeath = null - to_chat(user, "A new patient has been registered. Purging data for previous patient.") + to_chat(user, span_notice("A new patient has been registered. Purging data for previous patient.")) src.timeofdeath = M.timeofdeath var/obj/item/organ/external/S = M.get_organ(user.zone_sel.selecting) if(!S) - to_chat(user, "You can't scan this body part.") + to_chat(user, span_warning("You can't scan this body part.")) return if(!S.open) - to_chat(user, "You have to cut [S] open first!") + to_chat(user, span_warning("You have to cut [S] open first!")) return M.visible_message("\The [user] scans the wounds on [M]'s [S.name] with [src]") diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm index 907f1a054e..b5b9e4a6eb 100644 --- a/code/game/objects/items/weapons/candle.dm +++ b/code/game/objects/items/weapons/candle.dm @@ -29,7 +29,7 @@ if(W.has_tool_quality(TOOL_WELDER)) var/obj/item/weldingtool/WT = W.get_welder() if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool - light("\The [user] casually lights the [src] with [W].") + light(span_notice("\The [user] casually lights the [src] with [W].")) else if(istype(W, /obj/item/flame/lighter)) var/obj/item/flame/lighter/L = W if(L.lit) @@ -44,7 +44,7 @@ light() -/obj/item/flame/candle/proc/light(var/flavor_text = "\The [usr] lights the [src].") +/obj/item/flame/candle/proc/light(var/flavor_text = span_notice("\The [usr] lights the [src].")) if(!lit) lit = TRUE visible_message(flavor_text) @@ -114,11 +114,11 @@ /obj/item/flame/candle/everburn/Initialize() . = ..() - light("\The [src] mysteriously lights itself!.") + light(span_notice("\The [src] mysteriously lights itself!.")) /obj/item/flame/candle/candelabra/everburn wax = 99999 /obj/item/flame/candle/candelabra/everburn/Initialize() . = ..() - light("\The [src] mysteriously lights itself!.") + light(span_notice("\The [src] mysteriously lights itself!.")) diff --git a/code/game/objects/items/weapons/canes.dm b/code/game/objects/items/weapons/canes.dm index bbea588642..634ab55bf8 100644 --- a/code/game/objects/items/weapons/canes.dm +++ b/code/game/objects/items/weapons/canes.dm @@ -31,7 +31,7 @@ /obj/item/cane/concealed/attack_self(var/mob/user) var/datum/gender/T = gender_datums[user.get_visible_gender()] if(concealed_blade) - user.visible_message("[user] has unsheathed \a [concealed_blade] from [T.his] [src]!", "You unsheathe \the [concealed_blade] from \the [src].") + user.visible_message(span_warning("[user] has unsheathed \a [concealed_blade] from [T.his] [src]!"), "You unsheathe \the [concealed_blade] from \the [src].") // Calling drop/put in hands to properly call item drop/pickup procs playsound(src, 'sound/weapons/holster/sheathout.ogg', 50, 1) user.drop_from_inventory(src) @@ -47,7 +47,7 @@ /obj/item/cane/concealed/attackby(var/obj/item/material/sword/katana/caneblade/W, var/mob/user) if(!src.concealed_blade && istype(W)) var/datum/gender/T = gender_datums[user.get_visible_gender()] - user.visible_message("[user] has sheathed \a [W] into [T.his] [src]!", "You sheathe \the [W] into \the [src].") + user.visible_message(span_warning("[user] has sheathed \a [W] into [T.his] [src]!"), "You sheathe \the [W] into \the [src].") playsound(src, 'sound/weapons/holster/sheathin.ogg', 50, 1) user.drop_from_inventory(W) W.loc = src @@ -73,7 +73,7 @@ /obj/item/cane/white/attack(mob/M as mob, mob/user as mob) if(user.a_intent == I_HELP) - user.visible_message("\The [user] has lightly tapped [M] on the ankle with their white cane!") + user.visible_message(span_notice("\The [user] has lightly tapped [M] on the ankle with their white cane!")) return TRUE else . = ..() @@ -98,7 +98,7 @@ on = !on if(on) user.visible_message("\The [user] extends the white cane.",\ - "You extend the white cane.",\ + span_warning("You extend the white cane."),\ "You hear an ominous click.") icon_state = "whitecane1out" item_state_slots = list(slot_r_hand_str = "whitecane", slot_l_hand_str = "whitecane") @@ -107,7 +107,7 @@ attack_verb = list("smacked", "struck", "cracked", "beaten") else user.visible_message("\The [user] collapses the white cane.",\ - "You collapse the white cane.",\ + span_notice("You collapse the white cane."),\ "You hear a click.") icon_state = "whitecane1in" item_state_slots = list(slot_r_hand_str = null, slot_l_hand_str = null) diff --git a/code/game/objects/items/weapons/capture_crystal.dm b/code/game/objects/items/weapons/capture_crystal.dm index b8a7af88d9..d1a5c51015 100644 --- a/code/game/objects/items/weapons/capture_crystal.dm +++ b/code/game/objects/items/weapons/capture_crystal.dm @@ -28,7 +28,7 @@ if(bound_mob) if(bound_mob in contents) unleash() - to_chat(bound_mob, "You feel like yourself again. You are no longer under the influence of \the [src]'s command.") + to_chat(bound_mob, span_notice("You feel like yourself again. You are no longer under the influence of \the [src]'s command.")) UnregisterSignal(bound_mob, COMSIG_PARENT_QDELETING) bound_mob.capture_caught = FALSE bound_mob = null @@ -45,7 +45,7 @@ . += "[bound_mob.health / bound_mob.maxHealth * 100]%" if(bound_mob.ooc_notes) . += "OOC Notes: \[View\] - \[Print\]" - . += "\[Mechanical Vore Preferences\]" + . += span_deptradio("\[Mechanical Vore Preferences\]") //Command! This lets the owner toggle hostile on AI controlled mobs, or send a silent command message to your bound mob, wherever they may be. /obj/item/capture_crystal/ui_action_click() @@ -53,10 +53,10 @@ return var/mob/living/M = src.loc if(M != owner) - to_chat(M, "\The [src] emits an unpleasant tone... It does not respond to your command.") + to_chat(M, span_notice("\The [src] emits an unpleasant tone... It does not respond to your command.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) else if(!bound_mob) - to_chat(M, "\The [src] emits an unpleasant tone... There is nothing to command.") + to_chat(M, span_notice("\The [src] emits an unpleasant tone... There is nothing to command.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) else if(isanimal(bound_mob) && !bound_mob.client) if(!isnull(bound_mob.get_AI_stance())) @@ -69,17 +69,17 @@ else if(bound_mob.client) var/transmit_msg = tgui_input_text(usr, "What is your command?", "Command") if(length(transmit_msg) >= MAX_MESSAGE_LEN) - to_chat(M, "Your message was TOO LONG!:[transmit_msg]") + to_chat(M, span_danger("Your message was TOO LONG!:[transmit_msg]")) return transmit_msg = sanitize(transmit_msg, max_length = MAX_MESSAGE_LEN) if(isnull(transmit_msg)) - to_chat(M, "You decided against it.") + to_chat(M, span_notice("You decided against it.")) return - to_chat(bound_mob, "\The [owner] commands, '[transmit_msg]'") - to_chat(M, "Your command has been transmitted, '[transmit_msg]'") + to_chat(bound_mob, span_notice("\The [owner] commands, '[transmit_msg]'")) + to_chat(M, span_notice("Your command has been transmitted, '[transmit_msg]'")) log_admin("[key_name_admin(M)] sent the command, '[transmit_msg]' to [bound_mob].") else - to_chat(M, "\The [src] emits an unpleasant tone... \The [bound_mob] is unresponsive.") + to_chat(M, span_notice("\The [src] emits an unpleasant tone... \The [bound_mob] is unresponsive.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) //Lets the owner get AI controlled bound mobs to follow them, or tells player controlled mobs to follow them. @@ -91,39 +91,39 @@ return var/mob/living/M = src.loc if(M != owner) - to_chat(M, "\The [src] emits an unpleasant tone... It does not respond to your command.") + to_chat(M, span_notice("\The [src] emits an unpleasant tone... It does not respond to your command.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) else if(bound_mob.stat != CONSCIOUS) - to_chat(M, "\The [src] emits an unpleasant tone... \The [bound_mob] is not able to hear your command.") + to_chat(M, span_notice("\The [src] emits an unpleasant tone... \The [bound_mob] is not able to hear your command.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) else if(bound_mob.client) - to_chat(bound_mob, "\The [owner] wishes for you to follow them.") + to_chat(bound_mob, span_notice("\The [owner] wishes for you to follow them.")) else if(bound_mob in contents) if(!bound_mob.ai_holder) - to_chat(M, "\The [src] emits an unpleasant tone... \The [bound_mob] is not able to follow your command.") + to_chat(M, span_notice("\The [src] emits an unpleasant tone... \The [bound_mob] is not able to follow your command.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) return var/datum/ai_holder/AI = bound_mob.ai_holder if(AI.leader) - to_chat(M, "\The [src] chimes~ \The [bound_mob] stopped following [AI.leader].") + to_chat(M, span_notice("\The [src] chimes~ \The [bound_mob] stopped following [AI.leader].")) AI.lose_follow(AI.leader) else AI.set_follow(M) - to_chat(M, "\The [src] chimes~ \The [bound_mob] started following following [AI.leader].") + to_chat(M, span_notice("\The [src] chimes~ \The [bound_mob] started following following [AI.leader].")) else if(!(bound_mob in view(M))) - to_chat(M, "\The [src] emits an unpleasant tone... \The [bound_mob] is not able to hear your command.") + to_chat(M, span_notice("\The [src] emits an unpleasant tone... \The [bound_mob] is not able to hear your command.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) if(!bound_mob.ai_holder) - to_chat(M, "\The [src] emits an unpleasant tone... \The [bound_mob] is not able to follow your command.") + to_chat(M, span_notice("\The [src] emits an unpleasant tone... \The [bound_mob] is not able to follow your command.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) return var/datum/ai_holder/AI = bound_mob.ai_holder if(AI.leader) - to_chat(M, "\The [src] chimes~ \The [bound_mob] stopped following [AI.leader].") + to_chat(M, span_notice("\The [src] chimes~ \The [bound_mob] stopped following [AI.leader].")) AI.lose_follow(AI.leader) else AI.set_follow(M) - to_chat(M, "\The [src] chimes~ \The [bound_mob] started following following [AI.leader].") + to_chat(M, span_notice("\The [src] chimes~ \The [bound_mob] started following following [AI.leader].")) //Don't really want people 'haha funny' capturing and releasing one another willy nilly. So! If you wanna release someone, you gotta destroy the thingy. //(Which is consistent with how it works with digestion anyway.) @@ -135,7 +135,7 @@ return var/mob/living/M = src.loc if(M != owner) - to_chat(M, "\The [src] is too hard for you to break.") + to_chat(M, span_notice("\The [src] is too hard for you to break.")) else M.visible_message("\The [M] crushes \the [src] into dust...", "\The [src] cracks and disintegrates in your hand.") qdel(src) @@ -149,7 +149,7 @@ return var/mob/living/M = src.loc if(M != owner) - to_chat(M, "\The [src] emits an unpleasant tone... It does not respond to your command.") + to_chat(M, span_notice("\The [src] emits an unpleasant tone... It does not respond to your command.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) else M.visible_message("\The [src] flickers in \the [M]'s hand and emits a little tone.", "\The [src] flickers in your hand and emits a little tone.") @@ -166,26 +166,26 @@ return var/mob/living/U = src.loc if(!bound_mob) - to_chat(U, "\The [src] emits an unpleasant tone... There is nothing to enhance.") + to_chat(U, span_notice("\The [src] emits an unpleasant tone... There is nothing to enhance.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) return else if(U != owner) - to_chat(U, "\The [src] emits an unpleasant tone... It does not respond to your command.") + to_chat(U, span_notice("\The [src] emits an unpleasant tone... It does not respond to your command.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) return else if(bound_mob.client || !isanimal(bound_mob)) - to_chat(U, "\The [src] emits an unpleasant tone... \The [bound_mob] is not eligable for enhancement.") + to_chat(U, span_notice("\The [src] emits an unpleasant tone... \The [bound_mob] is not eligable for enhancement.")) playsound(src, 'sound/effects/capture-crystal-problem.ogg', 75, 1, -1) return //Need to type cast the mob so it can detect ghostjoin var/mob/living/simple_mob/M = bound_mob if(M.ghostjoin) M.ghostjoin = FALSE - to_chat(U, "\The [bound_mob] is no longer eligable to be joined by ghosts.") + to_chat(U, span_notice("\The [bound_mob] is no longer eligable to be joined by ghosts.")) else if(tgui_alert(U, "Do you want to offer your [bound_mob] up to ghosts to play as? There is no way undo this once a ghost takes over.", "Invite ghosts?",list("No","Yes")) == "Yes") M.ghostjoin = TRUE - to_chat(U, "\The [bound_mob] is now eligable to be joined by ghosts. It will need to be out of the crystal to be able to be joined.") + to_chat(U, span_notice("\The [bound_mob] is now eligable to be joined by ghosts. It will need to be out of the crystal to be able to be joined.")) else - to_chat(U, "You decided against it.") + to_chat(U, span_notice("You decided against it.")) /obj/item/capture_crystal/update_icon() . = ..() @@ -221,26 +221,26 @@ user.visible_message("\The [user] taps \the [M] with \the [src].") activate(user, M) else - to_chat(user, "\The [src] emits an unpleasant tone... It is not ready yet.") + to_chat(user, span_notice("\The [src] emits an unpleasant tone... It is not ready yet.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) //Tries to unleash or recall your stored mob /obj/item/capture_crystal/attack_self(mob/living/user) if(bound_mob && !owner) if(bound_mob == user) - to_chat(user, "\The [src] emits an unpleasant tone... It does not activate for you.") + to_chat(user, span_notice("\The [src] emits an unpleasant tone... It does not activate for you.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) return if(tgui_alert(user, "\The [src] hasn't got an owner. It has \the [bound_mob] registered to it. Would you like to claim this as yours?", "Claim ownership", list("No","Yes")) == "Yes") owner = user if(!cooldown_check()) - to_chat(user, "\The [src] emits an unpleasant tone... It is not ready yet.") + to_chat(user, span_notice("\The [src] emits an unpleasant tone... It is not ready yet.")) if(bound_mob) playsound(src, 'sound/effects/capture-crystal-problem.ogg', 75, 1, -1) else playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) else if(user == bound_mob) //You can't recall yourself - to_chat(user, "\The [src] emits an unpleasant tone... It does not activate for you.") + to_chat(user, span_notice("\The [src] emits an unpleasant tone... It does not activate for you.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) else if(!active) activate(user) @@ -255,7 +255,7 @@ //The basic capture command does most of the registration work. /obj/item/capture_crystal/proc/capture(mob/living/M, mob/living/U) if(!M.capture_crystal || M.capture_caught) - to_chat(U, "This creature is not suitable for capture.") + to_chat(U, span_warning("This creature is not suitable for capture.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) return knowyoursignals(M, U) @@ -309,7 +309,7 @@ capture_chance = 0 + effect_count if(capture_chance <= 0) capture_chance = 0 - to_chat(user, "There's no chance... It needs to be weaker.") + to_chat(user, span_notice("There's no chance... It needs to be weaker.")) last_activate = world.time log_admin("[user] threw a capture crystal at [M] and got [capture_chance]% chance to catch.") @@ -318,10 +318,10 @@ //Handles checking relevent bans, preferences, and asking the player if they want to be caught /obj/item/capture_crystal/proc/capture_player(mob/living/M, mob/living/U) if(jobban_isbanned(M, JOB_GHOSTROLES)) - to_chat(U, "This creature is not suitable for capture.") + to_chat(U, span_warning("This creature is not suitable for capture.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) else if(!M.capture_crystal || M.capture_caught) - to_chat(U, "This creature is not suitable for capture.") + to_chat(U, span_warning("This creature is not suitable for capture.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) else if(tgui_alert(M, "Would you like to be caught by in [src] by [U]? You will be bound to their will.", "Become Caught",list("No","Yes")) == "Yes") if(tgui_alert(M, "Are you really sure? The only way to undo this is to OOC escape while you're in the crystal.", "Become Caught", list("No","Yes")) == "Yes") @@ -329,7 +329,7 @@ capture(M, U) recall(U) return - to_chat(U, "This creature is too strong willed to be captured.") + to_chat(U, span_warning("This creature is too strong willed to be captured.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) //The clean up procs! @@ -352,7 +352,7 @@ //If the crystal hasn't been set up, it does this /obj/item/capture_crystal/proc/activate(mob/living/user, target) if(!cooldown_check()) //Are we ready to do things yet? - to_chat(thrower, "\The [src] clicks unsatisfyingly... It is not ready yet.") + to_chat(thrower, span_notice("\The [src] clicks unsatisfyingly... It is not ready yet.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) return if(spawn_mob_type && !bound_mob) //We don't already have a mob, but we know what kind of mob we want @@ -375,22 +375,22 @@ last_activate = world.time if(M.capture_caught) //Can't capture things that were already caught. playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) - to_chat(user, "\The [src] clicks unsatisfyingly... \The [M] is already under someone else's control.") + to_chat(user, span_notice("\The [src] clicks unsatisfyingly... \The [M] is already under someone else's control.")) return else if(M.stat == DEAD) //Is it dead? We can't influence dead things. playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) - to_chat(user, "\The [src] clicks unsatisfyingly... \The [M] is not in a state to be captured.") + to_chat(user, span_notice("\The [src] clicks unsatisfyingly... \The [M] is not in a state to be captured.")) return else if(M.client) //Is it player controlled? capture_player(M, user) //We have to do things a little differently if so. return else if(!isanimal(M)) //So it's not player controlled, but it's also not a simplemob? - to_chat(user, "This creature is not suitable for capture.") + to_chat(user, span_warning("This creature is not suitable for capture.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) return var/mob/living/simple_mob/S = M if(!S.ai_holder) //We don't really want to capture simplemobs that don't have an AI - to_chat(user, "This creature is not suitable for capture.") + to_chat(user, span_warning("This creature is not suitable for capture.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) else if(prob(capture_chance(S, user))) //OKAY! So we have an NPC simplemob with an AI, let's calculate its capture chance! It varies based on the mob's condition. capture(S, user) //We did it! Woo! We capture it! @@ -402,17 +402,17 @@ S.ai_holder.give_target(user, urgent = TRUE) user.visible_message("\The [src] bonks into \the [S], angering it!") playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) - to_chat(user, "\The [src] clicks unsatisfyingly.") + to_chat(user, span_notice("\The [src] clicks unsatisfyingly.")) update_icon() return //The target is not a mob, so let's not do anything. playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) - to_chat(user, "\The [src] clicks unsatisfyingly.") + to_chat(user, span_notice("\The [src] clicks unsatisfyingly.")) //We're using the crystal, but what will it do? /obj/item/capture_crystal/proc/determine_action(mob/living/U, T) if(!cooldown_check()) //Are we ready yet? - to_chat(thrower, "\The [src] clicks unsatisfyingly... It is not ready yet.") + to_chat(thrower, span_notice("\The [src] clicks unsatisfyingly... It is not ready yet.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) return //No if(bound_mob in contents) //Do we have our mob? @@ -423,7 +423,7 @@ else if (bound_mob) //Do we HAVE a mob? recall(U) //Yes, let's try to put it back in the crystal else //No we don't have a mob, let's reset the crystal. - to_chat(U, "\The [src] clicks unsatisfyingly.") + to_chat(U, span_notice("\The [src] clicks unsatisfyingly.")) active = FALSE update_icon() owner = null @@ -443,7 +443,7 @@ playsound(src, 'sound/effects/capture-crystal-in.ogg', 75, 1, -1) update_icon() else - to_chat(user, "\The [src] clicks and emits a small, unpleasant tone. \The [bound_mob] cannot be recalled.") + to_chat(user, span_notice("\The [src] clicks and emits a small, unpleasant tone. \The [bound_mob] cannot be recalled.")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) //Let's let our mob out! @@ -487,7 +487,7 @@ if(target == bound_mob && thrower != bound_mob) //We got thrown at our bound mob (and weren't thrown by the bound mob) let's ignore the cooldown and just put them back in recall(thrower) else if(!cooldown_check()) //OTHERWISE let's obey the cooldown - to_chat(thrower, "\The [src] emits an soft tone... It is not ready yet.") + to_chat(thrower, span_notice("\The [src] emits an soft tone... It is not ready yet.")) if(bound_mob) playsound(src, 'sound/effects/capture-crystal-problem.ogg', 75, 1, -1) else @@ -500,14 +500,14 @@ sleep(10) activate(thrower, src) else if(!bound_mob) //We hit something else, and we don't have a mob, so we can't really do anything! - to_chat(thrower, "\The [src] clicks unpleasantly...") + to_chat(thrower, span_notice("\The [src] clicks unpleasantly...")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) else if(bound_mob in contents) //We have our mob! Let's try to let it out. sleep(10) unleash(thrower, src) update_icon() else //Our mob isn't here, we can't do anything. - to_chat(thrower, "\The [src] clicks unpleasantly...") + to_chat(thrower, span_notice("\The [src] clicks unpleasantly...")) playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) /obj/item/capture_crystal/basic diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index e9a3375556..34b463330f 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -294,5 +294,5 @@ chew() if(chewtime < 1) if(ismob(loc)) - to_chat(loc, "There's no more of \the [name] left!") + to_chat(loc, span_notice("There's no more of \the [name] left!")) spitout(0) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 1fb721a8b7..e66a32de8a 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -202,7 +202,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(ismob(loc)) var/mob/living/M = loc if (!nomessage) - to_chat(M, "Your [name] goes out.") + to_chat(M, span_notice("Your [name] goes out.")) M.remove_from_mob(src) //un-equip it so the overlays can update M.update_inv_wear_mask(0) qdel(src) @@ -211,7 +211,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(ismob(loc)) var/mob/living/M = loc if (!nomessage) - to_chat(M, "Your [name] goes out, and you empty the ash.") + to_chat(M, span_notice("Your [name] goes out, and you empty the ash.")) playsound(src, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) lit = 0 icon_state = initial(icon_state) @@ -230,9 +230,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(lit && H == user && istype(H)) var/obj/item/blocked = H.check_mouth_coverage() if(blocked) - to_chat(H, "\The [blocked] is in the way!") + to_chat(H, span_warning("\The [blocked] is in the way!")) return 1 - to_chat(H, "You take a drag on your [name].") + to_chat(H, span_notice("You take a drag on your [name].")) playsound(src, 'sound/items/cigs_lighters/inhale.ogg', 50, 0, -1) smoke(5) return 1 @@ -260,7 +260,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/attack(var/mob/living/M, var/mob/living/user, def_zone) if(istype(M) && M.on_fire) user.do_attack_animation(M) - light("[user] coldly lights the [name] with the burning body of [M].") + light(span_notice("[user] coldly lights the [name] with the burning body of [M].")) return 1 else return ..() @@ -283,11 +283,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM max_smoketime = 300 smoketime = 300 var/nicotine_amt = 2 - matchmes = "USER lights their NAME with their FLAME." - lightermes = "USER manages to light their NAME with FLAME." - zippomes = "With a flick of their wrist, USER lights their NAME with their FLAME." - weldermes = "USER casually lights the NAME with FLAME." - ignitermes = "USER fiddles with FLAME, and manages to light their NAME." + matchmes = span_notice("USER lights their NAME with their FLAME.") + lightermes = span_notice("USER manages to light their NAME with FLAME.") + zippomes = span_rose("With a flick of their wrist, USER lights their NAME with their FLAME.") + weldermes = span_notice("USER casually lights the NAME with FLAME.") + ignitermes = span_notice("USER fiddles with FLAME, and manages to light their NAME.") /obj/item/clothing/mask/smokable/cigarette/Initialize() . = ..() @@ -300,7 +300,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(istype(W, /obj/item/melee/energy/sword)) var/obj/item/melee/energy/sword/S = W if(S.active) - light("[user] swings their [W], barely missing their nose. They light their [name] in the process.") + light(span_warning("[user] swings their [W], barely missing their nose. They light their [name] in the process.")) return @@ -311,21 +311,21 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(istype(glass)) //you can dip cigarettes into beakers var/transfered = glass.reagents.trans_to_obj(src, chem_volume) if(transfered) //if reagents were transfered, show the message - to_chat(user, "You dip \the [src] into \the [glass].") + to_chat(user, span_notice("You dip \the [src] into \the [glass].")) else //if not, either the beaker was empty, or the cigarette was full if(!glass.reagents.total_volume) - to_chat(user, "[glass] is empty.") + to_chat(user, span_notice("[glass] is empty.")) else - to_chat(user, "[src] is full.") + to_chat(user, span_notice("[src] is full.")) /obj/item/clothing/mask/smokable/cigarette/attack_self(mob/user as mob) if(lit == 1) if(user.a_intent == I_HURT) - user.visible_message("[user] drops and treads on the lit [src], putting it out instantly.") + user.visible_message(span_notice("[user] drops and treads on the lit [src], putting it out instantly.")) playsound(src, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) die(1) else - user.visible_message("[user] puts out \the [src].") + user.visible_message(span_notice("[user] puts out \the [src].")) quench() return ..() @@ -346,11 +346,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM smoketime = 1500 chem_volume = 20 nicotine_amt = 4 - matchmes = "USER lights their NAME with their FLAME." - lightermes = "USER manages to offend their NAME by lighting it with FLAME." - zippomes = "With a flick of their wrist, USER lights their NAME with their FLAME." - weldermes = "USER insults NAME by lighting it with FLAME." - ignitermes = "USER fiddles with FLAME, and manages to light their NAME with the power of science." + matchmes = span_notice("USER lights their NAME with their FLAME.") + lightermes = span_notice("USER manages to offend their NAME by lighting it with FLAME.") + zippomes = span_rose("With a flick of their wrist, USER lights their NAME with their FLAME.") + weldermes = span_notice("USER insults NAME by lighting it with FLAME.") + ignitermes = span_notice("USER fiddles with FLAME, and manages to light their NAME with the power of science.") /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba name = "\improper Cohiba Robusto cigar" @@ -417,11 +417,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = "pipe" smoketime = 0 chem_volume = 50 - matchmes = "USER lights their NAME with their FLAME." - lightermes = "USER manages to light their NAME with FLAME." - zippomes = "With much care, USER lights their NAME with their FLAME." - weldermes = "USER recklessly lights NAME with FLAME." - ignitermes = "USER fiddles with FLAME, and manages to light their NAME with the power of science." + matchmes = span_notice("USER lights their NAME with their FLAME.") + lightermes = span_notice("USER manages to light their NAME with FLAME.") + zippomes = span_rose("With much care, USER lights their NAME with their FLAME.") + weldermes = span_notice("USER recklessly lights NAME with FLAME.") + ignitermes = span_notice("USER fiddles with FLAME, and manages to light their NAME with the power of science.") is_pipe = 1 /obj/item/clothing/mask/smokable/pipe/New() @@ -431,11 +431,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/pipe/attack_self(mob/user as mob) if(lit == 1) if(user.a_intent == I_HURT) - user.visible_message("[user] empties the lit [src] on the floor!.") + user.visible_message(span_notice("[user] empties the lit [src] on the floor!.")) playsound(src, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1) die(1) else - user.visible_message("[user] puts out \the [src].") + user.visible_message(span_notice("[user] puts out \the [src].")) quench() /obj/item/clothing/mask/smokable/pipe/attackby(obj/item/W as obj, mob/user as mob) @@ -447,10 +447,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM if (istype(W, /obj/item/reagent_containers/food/snacks)) var/obj/item/reagent_containers/food/snacks/grown/G = W if (!G.dry) - to_chat(user, "[G] must be dried before you stuff it into [src].") + to_chat(user, span_notice("[G] must be dried before you stuff it into [src].")) return if (smoketime) - to_chat(user, "[src] is already packed.") + to_chat(user, span_notice("[src] is already packed.")) return max_smoketime = 1000 smoketime = 1000 @@ -462,15 +462,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM else if(istype(W, /obj/item/flame/lighter)) var/obj/item/flame/lighter/L = W if(L.lit) - light("[user] manages to light their [name] with [W].") + light(span_notice("[user] manages to light their [name] with [W].")) else if(istype(W, /obj/item/flame/match)) var/obj/item/flame/match/M = W if(M.lit) - light("[user] lights their [name] with their [W].") + light(span_notice("[user] lights their [name] with their [W].")) else if(istype(W, /obj/item/assembly/igniter)) - light("[user] fiddles with [W], and manages to light their [name] with the power of science.") + light(span_notice("[user] fiddles with [W], and manages to light their [name] with the power of science.")) user.update_inv_wear_mask(0) user.update_inv_l_hand(0) @@ -537,17 +537,17 @@ CIGARETTE PACKETS ARE IN FANCY.DM if (istype(W, /obj/item/reagent_containers/food/snacks)) var/obj/item/reagent_containers/food/snacks/grown/G = W if (!G.dry) //This prevents people from just stuffing cheeseburgers into their joint - to_chat(user, "[G.name] must be dried before you add it to [src].") + to_chat(user, span_notice("[G.name] must be dried before you add it to [src].")) return if (G.reagents.total_volume + src.reagents.total_volume > src.reagents.maximum_volume) //Check that we don't have too much already in the paper before adding things - to_chat(user, "The [src] is too full to add [G.name].") + to_chat(user, span_warning("The [src] is too full to add [G.name].")) return if (src.reagents.total_volume == 0) if (istype(src, /obj/item/reagent_containers/rollingpaper/blunt)) //update the icon if this is the first thing we're adding to the paper src.icon_state = "blunt_full" else src.icon_state = "paper_full" - to_chat(user, "You add the [G.name] to the [src.name].") + to_chat(user, span_notice("You add the [G.name] to the [src.name].")) src.add_fingerprint(user) if(G.reagents) G.reagents.trans_to_obj(src, G.reagents.total_volume) //adds the reagents from the plant into the paper @@ -556,10 +556,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/reagent_containers/rollingpaper/attack_self(mob/living/user) if(!src.reagents) //don't roll an empty joint - to_chat(user, "There is nothing in [src]. Add something to it first.") + to_chat(user, span_warning("There is nothing in [src]. Add something to it first.")) return var/obj/item/clothing/mask/smokable/cigarette/J = new crafted_type() - to_chat(user,"You roll the [src] into a blunt!") + to_chat(user,span_notice("You roll the [src] into a blunt!")) J.add_fingerprint(user) if(src.reagents) src.reagents.trans_to_obj(J, src.reagents.total_volume) @@ -623,7 +623,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM lit = 1 icon_state = "lighteron" playsound(src, activation_sound, 75, 1) - user.visible_message("After a few attempts, [user] manages to light the [src].") + user.visible_message(span_notice("After a few attempts, [user] manages to light the [src].")) set_light(2, 0.5, "#FF9933") START_PROCESSING(SSobj, src) @@ -632,7 +632,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM lit = 0 icon_state = "lighter" playsound(src, deactivation_sound, 75, 1) - user.visible_message("[user] quietly shuts off the [src].") + user.visible_message(span_notice("[user] quietly shuts off the [src].")) set_light(0) STOP_PROCESSING(SSobj, src) @@ -653,9 +653,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM cig.attackby(src, user) else if(istype(src, /obj/item/flame/lighter/zippo)) - cig.light("[user] whips the [name] out and holds it for [M].") + cig.light(span_rose("[user] whips the [name] out and holds it for [M].")) else - cig.light("[user] holds the [name] out for [M], and lights the [cig.name].") + cig.light(span_notice("[user] holds the [name] out for [M], and lights the [cig.name].")) else ..() @@ -689,7 +689,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = "[base_state]on" item_state = "[base_state]on" playsound(src, activation_sound, 75, 1) - user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.") + user.visible_message(span_rose("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.")) set_light(2, 0.5, "#FF9933") START_PROCESSING(SSobj, src) @@ -698,7 +698,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = "[base_state]" item_state = "[base_state]" playsound(src, deactivation_sound, 75, 1) - user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing.") + user.visible_message(span_rose("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing.")) set_light(0) STOP_PROCESSING(SSobj, src) @@ -765,4 +765,4 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/flame/lighter/zippo/skull name = "\improper badass Zippo lighter" desc = "An absolutely badass zippo lighter. Just look at that skull!" - icon_state = "skullzippo" \ No newline at end of file + icon_state = "skullzippo" diff --git a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm index f8124d3b2d..13e4e74b01 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm @@ -54,7 +54,7 @@ if(emagged) to_chat(user, "Circuit lock is already removed.") return - to_chat(user, "You override the circuit lock and open controls.") + to_chat(user, span_notice("You override the circuit lock and open controls.")) emagged = 1 locked = 0 return 1 @@ -62,16 +62,16 @@ /obj/item/circuitboard/security/attackby(obj/item/I as obj, mob/user as mob) if(istype(I,/obj/item/card/id)) if(emagged) - to_chat(user, "Circuit lock does not respond.") + to_chat(user, span_warning("Circuit lock does not respond.")) return if(check_access(I)) locked = !locked - to_chat(user, "You [locked ? "" : "un"]lock the circuit controls.") + to_chat(user, span_notice("You [locked ? "" : "un"]lock the circuit controls.")) else - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) else if(istype(I,/obj/item/multitool)) if(locked) - to_chat(user, "Circuit controls are locked.") + to_chat(user, span_warning("Circuit controls are locked.")) return var/existing_networks = jointext(network,",") var/input = sanitize(tgui_input_text(usr, "Which networks would you like to connect this camera console circuit to? Separate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Multitool-Circuitboard interface", existing_networks)) diff --git a/code/game/objects/items/weapons/circuitboards/computer/research.dm b/code/game/objects/items/weapons/circuitboards/computer/research.dm index 5c4c2f8d48..ee687f9923 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/research.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/research.dm @@ -9,13 +9,13 @@ /obj/item/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob) if(I.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, I.usesound, 50, 1) - user.visible_message("\The [user] adjusts the jumper on \the [src]'s access protocol pins.", "You adjust the jumper on the access protocol pins.") + user.visible_message("\The [user] adjusts the jumper on \the [src]'s access protocol pins.", span_notice("You adjust the jumper on the access protocol pins.")) if(build_path == /obj/machinery/computer/rdconsole/core) name = T_BOARD("RD Console - Robotics") build_path = /obj/machinery/computer/rdconsole/robotics - to_chat(user, "Access protocols set to robotics.") + to_chat(user, span_notice("Access protocols set to robotics.")) else name = T_BOARD("RD Console") build_path = /obj/machinery/computer/rdconsole/core - to_chat(user, "Access protocols set to default.") - return \ No newline at end of file + to_chat(user, span_notice("Access protocols set to default.")) + return diff --git a/code/game/objects/items/weapons/circuitboards/machinery/research.dm b/code/game/objects/items/weapons/circuitboards/machinery/research.dm index 97a6888adf..3a621bd5a6 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/research.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/research.dm @@ -14,15 +14,15 @@ /obj/item/circuitboard/rdserver/attackby(obj/item/I as obj, mob/user as mob) if(I.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, I.usesound, 50, 1) - user.visible_message("\The [user] adjusts the jumper on \the [src]'s access protocol pins.", "You adjust the jumper on the access protocol pins.") + user.visible_message("\The [user] adjusts the jumper on \the [src]'s access protocol pins.", span_notice("You adjust the jumper on the access protocol pins.")) if(build_path == /obj/machinery/r_n_d/server/core) name = T_BOARD("RD Console - Robotics") build_path = /obj/machinery/r_n_d/server/robotics - to_chat(user, "Access protocols set to robotics.") + to_chat(user, span_notice("Access protocols set to robotics.")) else name = T_BOARD("RD Console") build_path = /obj/machinery/r_n_d/server/core - to_chat(user, "Access protocols set to default.") + to_chat(user, span_notice("Access protocols set to default.")) return /obj/item/circuitboard/destructive_analyzer diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 7e0226b762..eb4a1d05a2 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -37,30 +37,30 @@ //I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing. //So this is a workaround. This also makes more sense from an IC standpoint. ~Carn if(user.client && (target in user.client.screen)) - to_chat(user, "You need to take that [target.name] off before cleaning it.") + to_chat(user, span_notice("You need to take that [target.name] off before cleaning it.")) else if(istype(target,/obj/effect/decal/cleanable/blood)) - to_chat(user, "You scrub \the [target.name] out.") + to_chat(user, span_notice("You scrub \the [target.name] out.")) target.clean_blood() return //Blood is a cleanable decal, therefore needs to be accounted for before all cleanable decals. else if(istype(target,/obj/effect/decal/cleanable)) - to_chat(user, "You scrub \the [target.name] out.") + to_chat(user, span_notice("You scrub \the [target.name] out.")) qdel(target) else if(istype(target,/turf)) - to_chat(user, "You scrub \the [target.name] clean.") + to_chat(user, span_notice("You scrub \the [target.name] clean.")) var/turf/T = target T.clean(src, user) else if(istype(target,/obj/structure/sink)) - to_chat(user, "You wet \the [src] in the sink.") + to_chat(user, span_notice("You wet \the [src] in the sink.")) wet() else - to_chat(user, "You clean \the [target.name].") + to_chat(user, span_notice("You clean \the [target.name].")) target.clean_blood(TRUE) return //attack_as_weapon /obj/item/soap/attack(mob/living/target, mob/living/user, var/target_zone) if(target && user && ishuman(target) && ishuman(user) && !user.incapacitated() && user.zone_sel &&user.zone_sel.selecting == "mouth" ) - user.visible_message("\The [user] washes \the [target]'s mouth out with soap!") + user.visible_message(span_danger("\The [user] washes \the [target]'s mouth out with soap!")) user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //prevent spam return ..() diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index f85839f518..aa225cc2d1 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -31,7 +31,7 @@ name = "[colour] lipstick" /obj/item/lipstick/attack_self(mob/user as mob) - to_chat(user, "You twist \the [src] [open ? "closed" : "open"].") + to_chat(user, span_notice("You twist \the [src] [open ? "closed" : "open"].")) open = !open if(open) icon_state = "[initial(icon_state)]_[colour]" @@ -46,23 +46,23 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.lip_style) //if they already have lipstick on - to_chat(user, "You need to wipe off the old lipstick first!") + to_chat(user, span_notice("You need to wipe off the old lipstick first!")) return if(H == user) - user.visible_message("[user] does their lips with \the [src].", \ - "You take a moment to apply \the [src]. Perfect!") + user.visible_message(span_notice("[user] does their lips with \the [src]."), \ + span_notice("You take a moment to apply \the [src]. Perfect!")) H.lip_style = colour H.update_icons_body() else - user.visible_message("[user] begins to do [H]'s lips with \the [src].", \ - "You begin to apply \the [src].") + user.visible_message(span_warning("[user] begins to do [H]'s lips with \the [src]."), \ + span_notice("You begin to apply \the [src].")) if(do_after(user, 20, H)) //user needs to keep their active hand, H does not. - user.visible_message("[user] does [H]'s lips with \the [src].", \ - "You apply \the [src].") + user.visible_message(span_notice("[user] does [H]'s lips with \the [src]."), \ + span_notice("You apply \the [src].")) H.lip_style = colour H.update_icons_body() else - to_chat(user, "Where are the lips on that?") + to_chat(user, span_notice("Where are the lips on that?")) //you can wipe off lipstick with paper! see code/modules/paperwork/paper.dm, paper/attack() @@ -89,7 +89,7 @@ text = "guy" if(FEMALE) text = "lady" - user.visible_message("[user] uses [src] to comb their hair with incredible style and sophistication. What a [text].") + user.visible_message(span_notice("[user] uses [src] to comb their hair with incredible style and sophistication. What a [text].")) /obj/item/makeover name = "makeover kit" @@ -105,9 +105,9 @@ /obj/item/makeover/attack_self(mob/living/carbon/user as mob) if(ishuman(user)) - to_chat(user, "You flip open \the [src] and begin to adjust your appearance.") + to_chat(user, span_notice("You flip open \the [src] and begin to adjust your appearance.")) M.tgui_interact(user) var/mob/living/carbon/human/H = user var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES] if(istype(E)) - E.change_eye_color() \ No newline at end of file + E.change_eye_color() diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 703921217d..123c97dd2c 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -106,7 +106,7 @@ if(inuse) return 0 - user.visible_message("\The [user] is trying to inject \the [M] with \the [src]!") + user.visible_message(span_danger("\The [user] is trying to inject \the [M] with \the [src]!")) inuse = 1 s_time = world.time spawn(50) @@ -118,11 +118,11 @@ user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) user.do_attack_animation(M) - M.visible_message("\The [M] has been injected with \the [src] by \the [user].") + M.visible_message(span_danger("\The [M] has been injected with \the [src] by \the [user].")) var/mob/living/carbon/human/H = M if(!istype(H)) - to_chat(user, "Apparently it didn't work...") + to_chat(user, span_warning("Apparently it didn't work...")) return // Used by admin log. diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm index 7149b91e6a..22e9675156 100644 --- a/code/game/objects/items/weapons/ecigs.dm +++ b/code/game/objects/items/weapons/ecigs.dm @@ -24,25 +24,25 @@ /obj/item/clothing/mask/smokable/ecig/examine(mob/user) . = ..() - + if(active) - . += "It is turned on." + . += span_notice("It is turned on.") else - . += "It is turned off." + . += span_notice("It is turned off.") if(Adjacent(user)) if(ec_cartridge) if(!ec_cartridge.reagents?.total_volume) - . += "Its cartridge is empty!" + . += span_notice("Its cartridge is empty!") else if (ec_cartridge.reagents.total_volume <= ec_cartridge.volume * 0.25) - . += "Its cartridge is almost empty!" + . += span_notice("Its cartridge is almost empty!") else if (ec_cartridge.reagents.total_volume <= ec_cartridge.volume * 0.66) - . += "Its cartridge is half full!" + . += span_notice("Its cartridge is half full!") else if (ec_cartridge.reagents.total_volume <= ec_cartridge.volume * 0.90) - . += "Its cartridge is almost full!" + . += span_notice("Its cartridge is almost full!") else - . += "Its cartridge is full!" + . += span_notice("Its cartridge is full!") else - . += "It has no cartridge." + . += span_notice("It has no cartridge.") /obj/item/clothing/mask/smokable/ecig/simple name = "simple electronic cigarette" diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 7b4d5e9ffd..ed05e9e8a0 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -31,7 +31,7 @@ /obj/item/plastique/attackby(var/obj/item/I, var/mob/user) if(I.has_tool_quality(TOOL_SCREWDRIVER)) open_panel = !open_panel - to_chat(user, "You [open_panel ? "open" : "close"] the wire panel.") + to_chat(user, span_notice("You [open_panel ? "open" : "close"] the wire panel.")) playsound(src, I.usesound, 50, 1) else if(I.has_tool_quality(TOOL_WIRECUTTER) || istype(I, /obj/item/multitool) || istype(I, /obj/item/assembly/signaler )) wires.Interact(user) @@ -60,7 +60,7 @@ if (ismob(target)) add_attack_logs(user, target, "planted [name] on with [timer] second fuse") - user.visible_message("[user.name] finished planting an explosive on [target.name]!") + user.visible_message(span_danger("[user.name] finished planting an explosive on [target.name]!")) else message_admins("[key_name(user, user.client)](?) planted [src.name] on [target.name] at ([target.x],[target.y],[target.z] - JMP) with [timer] second fuse",0,1) log_game("[key_name(user)] planted [src.name] on [target.name] at ([target.x],[target.y],[target.z]) with [timer] second fuse") @@ -108,12 +108,12 @@ var/obj/item/stock_parts/SP = I var/new_blast_power = max(1, round(SP.rating / 2) + 1) if(new_blast_power > blast_heavy) - to_chat(user, "You install \the [I] into \the [src].") + to_chat(user, span_notice("You install \the [I] into \the [src].")) user.drop_from_inventory(I) qdel(I) blast_heavy = new_blast_power blast_light = blast_heavy + round(new_blast_power * 0.5) blast_flash = blast_light + round(new_blast_power * 0.75) else - to_chat(user, "The [I] is not any better than the component already installed into this charge!") + to_chat(user, span_notice("The [I] is not any better than the component already installed into this charge!")) return . diff --git a/code/game/objects/items/weapons/explosives_vr.dm b/code/game/objects/items/weapons/explosives_vr.dm index 28ea210318..05d9a35b1f 100644 --- a/code/game/objects/items/weapons/explosives_vr.dm +++ b/code/game/objects/items/weapons/explosives_vr.dm @@ -9,9 +9,9 @@ var/turf/T = get_turf(target) if((T.z in using_map.station_levels) || (T.z in using_map.admin_levels)) - target.visible_message("\The [src] lets out a loud beep as safeties trigger, before imploding and falling apart.") + target.visible_message(span_danger("\The [src] lets out a loud beep as safeties trigger, before imploding and falling apart.")) target.cut_overlay(image_overlay, TRUE) qdel(src) return 0 else - return ..() \ No newline at end of file + return ..() diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index f32ea57f18..14befc3757 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -93,13 +93,13 @@ if( istype(target, /obj/structure/reagent_dispensers) && flag) var/obj/o = target var/amount = o.reagents.trans_to_obj(src, 50) - to_chat(user, "You fill [src] with [amount] units of the contents of [target].") + to_chat(user, span_notice("You fill [src] with [amount] units of the contents of [target].")) playsound(src, 'sound/effects/refill.ogg', 50, 1, -6) return if (!safety) if (src.reagents.total_volume < 1) - to_chat(usr, "\The [src] is empty.") + to_chat(usr, span_notice("\The [src] is empty.")) return if (world.time < src.last_use + 20) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index af7b1f0d6c..9d386f3202 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -86,7 +86,7 @@ if(W.has_tool_quality(TOOL_SCREWDRIVER) && igniter && !lit) status = !status - to_chat(user, "[igniter] is now [status ? "secured" : "unsecured"]!") + to_chat(user, span_notice("[igniter] is now [status ? "secured" : "unsecured"]!")) update_icon() return @@ -102,7 +102,7 @@ if(istype(W,/obj/item/tank/phoron)) if(ptank) - to_chat(user, "There appears to already be a phoron tank loaded in [src]!") + to_chat(user, span_notice("There appears to already be a phoron tank loaded in [src]!")) return user.drop_item() ptank = W @@ -118,7 +118,7 @@ if(user.stat || user.restrained() || user.lying) return user.set_machine(src) if(!ptank) - to_chat(user, "Attach a phoron tank first!") + to_chat(user, span_notice("Attach a phoron tank first!")) return var/dat = text("Flamethrower ([lit ? "Lit" : "Unlit"])
\n Tank Pressure: [ptank.air_contents.return_pressure()]
\nAmount to throw: - - - [throw_amount] + + +
\nRemove phorontank - Close") user << browse(dat, "window=flamethrower;size=600x300") diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index bb6f6eb8c3..57d50de647 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -33,7 +33,7 @@ user.put_in_active_hand(gift) src.gift.add_fingerprint(user) else - to_chat(user, "The gift was empty!") + to_chat(user, span_warning("The gift was empty!")) qdel(src) return @@ -44,16 +44,16 @@ /obj/effect/spresent/relaymove(mob/user as mob) if (user.stat) return - to_chat(user, "You can't move.") + to_chat(user, span_warning("You can't move.")) /obj/effect/spresent/attackby(obj/item/W as obj, mob/user as mob) ..() if (!W.has_tool_quality(TOOL_WIRECUTTER)) - to_chat(user, "I need wirecutters for that.") + to_chat(user, span_warning("I need wirecutters for that.")) return - to_chat(user, "You cut open the present.") + to_chat(user, span_notice("You cut open the present.")) for(var/mob/M in src) //Should only be one but whatever. M.forceMove(src.loc) @@ -129,17 +129,17 @@ /obj/item/wrapping_paper/attackby(obj/item/W as obj, mob/living/user as mob) ..() if (!( locate(/obj/structure/table, src.loc) )) - to_chat(user, "You MUST put the paper on a table!") + to_chat(user, span_warning("You MUST put the paper on a table!")) if (W.w_class < ITEMSIZE_LARGE) var/obj/item/I = user.get_inactive_hand() if(I && I.has_tool_quality(TOOL_WIRECUTTER)) var/a_used = 2 ** (src.w_class - 1) if (src.amount < a_used) - to_chat(user, "You need more paper!") + to_chat(user, span_warning("You need more paper!")) return else if(istype(W, /obj/item/smallDelivery) || istype(W, /obj/item/gift)) //No gift wrapping gifts! - to_chat(user, "You can't wrap something that's already wrapped!") + to_chat(user, span_warning("You can't wrap something that's already wrapped!")) return src.amount -= a_used @@ -158,9 +158,9 @@ qdel(src) return else - to_chat(user, "You need scissors!") + to_chat(user, span_warning("You need scissors!")) else - to_chat(user, "The object is FAR too large!") + to_chat(user, span_warning("The object is FAR too large!")) return @@ -182,6 +182,6 @@ add_attack_logs(user,H,"Wrapped with [src]") else - to_chat(user, "You need more paper.") + to_chat(user, span_warning("You need more paper.")) else to_chat(user, "They are moving around too much. A straightjacket would help.") diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 3f29c0a3b3..01caf091bd 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -44,7 +44,7 @@ user.put_in_hands(B) name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]" if(stage > 1 && !active && clown_check(user)) - to_chat(user, "You prime \the [name]!") + to_chat(user, span_warning("You prime \the [name]!")) msg_admin_attack("[key_name_admin(user)] primed \a [src]") @@ -58,13 +58,13 @@ if(istype(W,/obj/item/assembly_holder) && (!stage || stage==1) && !detonator && path != 2) var/obj/item/assembly_holder/det = W if(istype(det.a_left,det.a_right.type) || (!isigniter(det.a_left) && !isigniter(det.a_right))) - to_chat(user, "Assembly must contain one igniter.") + to_chat(user, span_warning("Assembly must contain one igniter.")) return if(!det.secured) - to_chat(user, "Assembly must be secured with screwdriver.") + to_chat(user, span_warning("Assembly must be secured with screwdriver.")) return path = 1 - to_chat(user, "You add [W] to the metal casing.") + to_chat(user, span_notice("You add [W] to the metal casing.")) playsound(src, 'sound/items/Screwdriver2.ogg', 25, -3) user.remove_from_mob(det) det.loc = src @@ -82,23 +82,23 @@ if(stage == 1) path = 1 if(beakers.len) - to_chat(user, "You lock the assembly.") + to_chat(user, span_notice("You lock the assembly.")) name = "grenade" else -// to_chat(user, "You need to add at least one beaker before locking the assembly.") - to_chat(user, "You lock the empty assembly.") +// to_chat(user, span_warning("You need to add at least one beaker before locking the assembly.")) + to_chat(user, span_notice("You lock the empty assembly.")) name = "fake grenade" playsound(src, W.usesound, 50, 1) icon_state = initial(icon_state) +"_locked" stage = 2 else if(stage == 2) if(active && prob(95)) - to_chat(user, "You trigger the assembly!") + to_chat(user, span_warning("You trigger the assembly!")) detonate() else if(sealed) - to_chat(user, "This grenade lacks a way to disassemble it.") + to_chat(user, span_warning("This grenade lacks a way to disassemble it.")) else - to_chat(user, "You unlock the assembly.") + to_chat(user, span_notice("You unlock the assembly.")) playsound(src, W.usesound, 50, -3) name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]" icon_state = initial(icon_state) + (detonator?"_ass":"") @@ -107,18 +107,18 @@ else if(is_type_in_list(W, allowed_containers) && (!stage || stage==1) && path != 2) path = 1 if(beakers.len == 2) - to_chat(user, "The grenade can not hold more containers.") + to_chat(user, span_warning("The grenade can not hold more containers.")) return else if(W.reagents.total_volume) - to_chat(user, "You add \the [W] to the assembly.") + to_chat(user, span_notice("You add \the [W] to the assembly.")) user.drop_item() W.loc = src beakers += W stage = 1 name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]" else - to_chat(user, "\The [W] is empty.") + to_chat(user, span_warning("\The [W] is empty.")) /obj/item/grenade/chem_grenade/examine(mob/user) . = ..() diff --git a/code/game/objects/items/weapons/grenades/concussion.dm b/code/game/objects/items/weapons/grenades/concussion.dm index d6ae4474c6..752888ad41 100644 --- a/code/game/objects/items/weapons/grenades/concussion.dm +++ b/code/game/objects/items/weapons/grenades/concussion.dm @@ -17,14 +17,14 @@ /obj/proc/concussion_blast(atom/target, var/radius = 5) var/turf/T = get_turf(target) if(is_below_sound_pressure(T)) - visible_message("Whump.") + visible_message(span_notice("Whump.")) return playsound(src, 'sound/effects/bang.ogg', 75, 1, -3) if(istype(T)) for(var/mob/living/L in orange(T, radius)) if(ishuman(L)) var/mob/living/carbon/human/H = L - to_chat(H, "WHUMP.") + to_chat(H, span_critical("WHUMP.")) var/ear_safety = 0 @@ -67,13 +67,13 @@ H.ear_deaf = max(H.ear_deaf,5) if(H.ear_damage >= 15) - to_chat(H, "Your ears start to ring badly!") + to_chat(H, span_danger("Your ears start to ring badly!")) if(prob(H.ear_damage - 5)) - to_chat(H, "You can't hear anything!") + to_chat(H, span_danger("You can't hear anything!")) H.sdisabilities |= DEAF else if(H.ear_damage >= 5) - to_chat(H, "Your ears start to ring!") + to_chat(H, span_danger("Your ears start to ring!")) if(istype(L, /mob/living/silicon/robot)) var/mob/living/silicon/robot/R = L if(L.client) @@ -81,5 +81,5 @@ L.client.spinleft() else L.client.spinright() - to_chat(R, "Gyroscopic failure.") - return \ No newline at end of file + to_chat(R, span_critical("Gyroscopic failure.")) + return diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 083c45be34..9d0f1d9665 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -28,7 +28,7 @@ qdel(src) /obj/item/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/carbon/M) // Added a new proc called 'bang' that takes a location and a person to be banged. - to_chat(M, "BANG") // Called during the loop that bangs people in lockers/containers and when banging + to_chat(M, span_danger("BANG")) // Called during the loop that bangs people in lockers/containers and when banging playsound(src, 'sound/effects/bang.ogg', 50, 1, 30) // people in normal view. Could theroetically be called during other explosions. // -- Polymorph @@ -80,18 +80,18 @@ if(ishuman(M)) var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES] if (E && E.damage >= E.min_bruised_damage) - to_chat(M, "Your eyes start to burn badly!") + to_chat(M, span_danger("Your eyes start to burn badly!")) if(!banglet && !(istype(src , /obj/item/grenade/flashbang/clusterbang))) if (E.damage >= E.min_broken_damage) - to_chat(M, "You can't see anything!") + to_chat(M, span_danger("You can't see anything!")) if (M.ear_damage >= 15) - to_chat(M, "Your ears start to ring badly!") + to_chat(M, span_danger("Your ears start to ring badly!")) if(!banglet && !(istype(src , /obj/item/grenade/flashbang/clusterbang))) if (prob(M.ear_damage - 10 + 5)) - to_chat(M, "You can't hear anything!") + to_chat(M, span_danger("You can't hear anything!")) M.sdisabilities |= DEAF else if(M.ear_damage >= 5) - to_chat(M, "Your ears start to ring!") + to_chat(M, span_danger("Your ears start to ring!")) /obj/item/grenade/flashbang/Destroy() walk(src, 0) // Because we might have called walk_away, we must stop the walk loop or BYOND keeps an internal reference to us forever. diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 0421f4f14e..c802c8a1cc 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -18,7 +18,7 @@ /obj/item/grenade/proc/clown_check(var/mob/living/user) if((CLUMSY in user.mutations) && prob(50)) - to_chat(user, "Huh? How does this thing work?") + to_chat(user, span_warning("Huh? How does this thing work?")) activate(user) add_fingerprint(user) @@ -32,7 +32,7 @@ if (istype(target, /obj/item/storage)) return ..() // Trying to put it in a full container if (istype(target, /obj/item/gun/grenadelauncher)) return ..() if((user.get_active_hand() == src) && (!active) && (clown_check(user)) && target.loc != src.loc) - to_chat(user, "You prime the [name]! [det_time/10] seconds!") + to_chat(user, span_warning("You prime the [name]! [det_time/10] seconds!")) active = 1 icon_state = initial(icon_state) + "_active" playsound(src, 'sound/weapons/armbomb.ogg', 75, 1, -3) @@ -58,7 +58,7 @@ /obj/item/grenade/attack_self(mob/user as mob) if(!active) if(clown_check(user)) - to_chat(user, "You prime \the [name]! [det_time/10] seconds!") + to_chat(user, span_warning("You prime \the [name]! [det_time/10] seconds!")) activate(user) add_fingerprint(user) @@ -96,16 +96,16 @@ switch(det_time) if (1) det_time = 10 - to_chat(user, "You set the [name] for 1 second detonation time.") + to_chat(user, span_notice("You set the [name] for 1 second detonation time.")) if (10) det_time = 30 - to_chat(user, "You set the [name] for 3 second detonation time.") + to_chat(user, span_notice("You set the [name] for 3 second detonation time.")) if (30) det_time = 50 - to_chat(user, "You set the [name] for 5 second detonation time.") + to_chat(user, span_notice("You set the [name] for 5 second detonation time.")) if (50) det_time = 1 - to_chat(user, "You set the [name] for instant detonation.") + to_chat(user, span_notice("You set the [name] for instant detonation.")) add_fingerprint(user) ..() return @@ -116,4 +116,4 @@ return /obj/item/grenade/vendor_action(var/obj/machinery/vending/V) - activate(V) \ No newline at end of file + activate(V) diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade_vr.dm b/code/game/objects/items/weapons/grenades/spawnergrenade_vr.dm index e49a7154b0..0544193589 100644 --- a/code/game/objects/items/weapons/grenades/spawnergrenade_vr.dm +++ b/code/game/objects/items/weapons/grenades/spawnergrenade_vr.dm @@ -17,14 +17,14 @@ if(istype(id)) if(check_access(id)) locked = !locked - to_chat(user, "You [locked ? "enable" : "disable"] the safety lock on \the [src].") + to_chat(user, span_warning("You [locked ? "enable" : "disable"] the safety lock on \the [src].")) else - to_chat(user, "Access denied.") - user.visible_message("[user] swipes \the [I] against \the [src].") + to_chat(user, span_warning("Access denied.")) + user.visible_message(span_notice("[user] swipes \the [I] against \the [src].")) else return ..() /obj/item/grenade/spawnergrenade/manhacks/station/locked/emag_act(var/remaining_charges,var/mob/user) ..() locked = !locked - to_chat(user, "You [locked ? "enable" : "disable"] the safety lock on \the [src]!") \ No newline at end of file + to_chat(user, span_warning("You [locked ? "enable" : "disable"] the safety lock on \the [src]!")) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index e5b3fbe11b..ab275feb63 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -33,7 +33,7 @@ return if ((CLUMSY in user.mutations) && prob(50)) - to_chat(user, "Uh ... how do those things work?!") + to_chat(user, span_warning("Uh ... how do those things work?!")) place_handcuffs(user, user) return @@ -46,7 +46,7 @@ if(can_place(C, user)) place_handcuffs(C, user) else - to_chat(user, "You need to have a firm grip on [C] before you can put \the [src] on!") + to_chat(user, span_danger("You need to have a firm grip on [C] before you can put \the [src] on!")) /obj/item/handcuffs/proc/can_place(var/mob/target, var/mob/user) if(user == target) @@ -68,14 +68,14 @@ return 0 if (!H.has_organ_for_slot(slot_handcuffed)) - to_chat(user, "\The [H] needs at least two wrists before you can cuff them together!") + to_chat(user, span_danger("\The [H] needs at least two wrists before you can cuff them together!")) return 0 if(istype(H.gloves,/obj/item/clothing/gloves/gauntlets/rig) && !elastic) // Can't cuff someone who's in a deployed hardsuit. - to_chat(user, "\The [src] won't fit around \the [H.gloves]!") + to_chat(user, span_danger("\The [src] won't fit around \the [H.gloves]!")) return 0 - user.visible_message("\The [user] is attempting to put [cuff_type] on \the [H]!") + user.visible_message(span_danger("\The [user] is attempting to put [cuff_type] on \the [H]!")) if(!do_after(user,use_time)) return 0 @@ -89,7 +89,7 @@ user.setClickCooldown(user.get_attack_speed(src)) user.do_attack_animation(H) - user.visible_message("\The [user] has put [cuff_type] on \the [H]!") + user.visible_message(span_danger("\The [user] has put [cuff_type] on \the [H]!")) // Apply cuffs. var/obj/item/handcuffs/cuffs = src @@ -129,8 +129,8 @@ var/last_chew = 0 var/datum/gender/T = gender_datums[H.get_visible_gender()] - var/s = "[H.name] chews on [T.his] [O.name]!" - H.visible_message(s, "You chew on your [O.name]!") + var/s = span_warning("[H.name] chews on [T.his] [O.name]!") + H.visible_message(s, span_warning("You chew on your [O.name]!")) add_attack_logs(H,H,"chewed own [O.name]") if(O.take_damage(3,0,1,1,"teeth marks")) @@ -219,7 +219,7 @@ var/last_chew = 0 return if ((CLUMSY in user.mutations) && prob(50)) - to_chat(user, "Uh ... how do those things work?!") + to_chat(user, span_warning("Uh ... how do those things work?!")) place_legcuffs(user, user) return @@ -232,7 +232,7 @@ var/last_chew = 0 if(can_place(C, user)) place_legcuffs(C, user) else - to_chat(user, "You need to have a firm grip on [C] before you can put \the [src] on!") + to_chat(user, span_danger("You need to have a firm grip on [C] before you can put \the [src] on!")) /obj/item/handcuffs/legcuffs/proc/place_legcuffs(var/mob/living/carbon/target, var/mob/user) playsound(src, cuff_sound, 30, 1, -2) @@ -242,14 +242,14 @@ var/last_chew = 0 return 0 if (!H.has_organ_for_slot(slot_legcuffed)) - to_chat(user, "\The [H] needs at least two ankles before you can cuff them together!") + to_chat(user, span_danger("\The [H] needs at least two ankles before you can cuff them together!")) return 0 if(istype(H.shoes,/obj/item/clothing/shoes/magboots/rig) && !elastic) // Can't cuff someone who's in a deployed hardsuit. - to_chat(user, "\The [src] won't fit around \the [H.shoes]!") + to_chat(user, span_danger("\The [src] won't fit around \the [H.shoes]!")) return 0 - user.visible_message("\The [user] is attempting to put [cuff_type] on \the [H]!") + user.visible_message(span_danger("\The [user] is attempting to put [cuff_type] on \the [H]!")) if(!do_after(user,use_time)) return 0 @@ -263,7 +263,7 @@ var/last_chew = 0 user.setClickCooldown(user.get_attack_speed(src)) user.do_attack_animation(H) - user.visible_message("\The [user] has put [cuff_type] on \the [H]!") + user.visible_message(span_danger("\The [user] has put [cuff_type] on \the [H]!")) // Apply cuffs. var/obj/item/handcuffs/legcuffs/lcuffs = src @@ -318,7 +318,7 @@ var/last_chew = 0 src.dropped() return 0 - H.visible_message("\The [H] has been snared by \the [src]!") + H.visible_message(span_danger("\The [H] has been snared by \the [src]!")) // Apply cuffs. var/obj/item/handcuffs/legcuffs/lcuffs = src diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm index 7378f6e44b..457f3476d7 100644 --- a/code/game/objects/items/weapons/hydroponics.dm +++ b/code/game/objects/items/weapons/hydroponics.dm @@ -42,10 +42,10 @@ else S.item_quants[G.name] = 1 else - to_chat(user, "The seed bag is full.") + to_chat(user, span_warning("The seed bag is full.")) S.updateUsrDialog() return - to_chat(user, "You pick up all the seeds.") + to_chat(user, span_notice("You pick up all the seeds.")) else if (S.contents.len < S.capacity) S.contents += src; @@ -54,7 +54,7 @@ else S.item_quants[name] = 1 else - to_chat(user, "The seed bag is full.") + to_chat(user, span_warning("The seed bag is full.")) S.updateUsrDialog() return diff --git a/code/game/objects/items/weapons/id cards/cards.dm b/code/game/objects/items/weapons/id cards/cards.dm index f7866663ce..638fb5be4a 100644 --- a/code/game/objects/items/weapons/id cards/cards.dm +++ b/code/game/objects/items/weapons/id cards/cards.dm @@ -118,7 +118,7 @@ // Vorestation Edit: End of Edit if(uses<1) - user.visible_message("\The [src] fizzles and sparks - it seems it's been used once too often, and is now spent.") + user.visible_message(span_warning("\The [src] fizzles and sparks - it seems it's been used once too often, and is now spent.")) user.drop_item() var/obj/item/card/emag_broken/junk = new(user.loc) junk.add_fingerprint(user) @@ -130,11 +130,11 @@ if(istype(O, /obj/item/stack/telecrystal)) var/obj/item/stack/telecrystal/T = O if(T.get_amount() < 1) - to_chat(usr, "You are not adding enough telecrystals to fuel \the [src].") + to_chat(usr, span_notice("You are not adding enough telecrystals to fuel \the [src].")) return uses += T.get_amount()*0.5 //Gives 5 uses per 10 TC uses = CEILING(uses, 1) //Ensures no decimal uses nonsense, rounds up to be nice - to_chat(usr, "You add \the [O] to \the [src]. Increasing the uses of \the [src] to [uses].") + to_chat(usr, span_notice("You add \the [O] to \the [src]. Increasing the uses of \the [src] to [uses].")) qdel(O) @@ -158,7 +158,7 @@ // Vorestation Edit: End of Edit if(uses<1) - user.visible_message("\The [src] fizzles and sparks - it seems it's been used once too often, and is now spent.") + user.visible_message(span_warning("\The [src] fizzles and sparks - it seems it's been used once too often, and is now spent.")) burnt_out = TRUE return 1 diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm index 87b004dae6..a80b758493 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -36,7 +36,7 @@ if(in_range(user, src)) tgui_interact(user) //Not chat related else - . += "It is too far away to read." + . += span_warning("It is too far away to read.") /obj/item/card/id/proc/prevent_tracking() return 0 @@ -356,7 +356,7 @@ name = user.name + "'s ID card" + " ([assignment])" configured = 1 - to_chat(user, "Card settings set.") + to_chat(user, span_notice("Card settings set.")) /obj/item/card/id/event/attackby(obj/item/I as obj, var/mob/user) if(istype(I, /obj/item/card/id) && !accessset) @@ -364,7 +364,7 @@ access |= O.GetAccess() desc = I.desc rank = O.rank - to_chat(user, "You copy the access from \the [I] to \the [src].") + to_chat(user, span_notice("You copy the access from \the [I] to \the [src].")) user.drop_from_inventory(I) qdel(I) accessset = 1 @@ -570,7 +570,7 @@ var/guess = jobs_to_icon[user.job] if(!guess) - to_chat(user, "ITG Cards do not seem to be able to accept the access codes for your ID.") + to_chat(user, span_notice("ITG Cards do not seem to be able to accept the access codes for your ID.")) return else icon_state = guess @@ -584,7 +584,7 @@ var/obj/item/card/id/O = I var/list/itgdont = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_COMMAND_SECRETARY, JOB_HEAD_OF_SECURITY, JOB_CHIEF_ENGINEER, JOB_CHIEF_MEDICAL_OFFICER, JOB_RESEARCH_DIRECTOR, JOB_CLOWN, JOB_MIME, JOB_TALON_CAPTAIN) //If you're in as one of these you probably aren't representing ITG if(O.rank in itgdont) - to_chat(user, "ITG Cards do not seem to be able to accept the access codes for your ID.") + to_chat(user, span_notice("ITG Cards do not seem to be able to accept the access codes for your ID.")) return . = ..() desc = "A small card designating affiliation with the Ironcrest Transport Group. It has a NanoTrasen insignia and a lot of very small print on the back to do with practices and regulations for contractors to use." diff --git a/code/game/objects/items/weapons/id cards/syndicate_ids.dm b/code/game/objects/items/weapons/id cards/syndicate_ids.dm index beaec3504e..f95d49255e 100644 --- a/code/game/objects/items/weapons/id cards/syndicate_ids.dm +++ b/code/game/objects/items/weapons/id cards/syndicate_ids.dm @@ -31,12 +31,12 @@ var/obj/item/card/id/I = O src.access |= I.GetAccess() if(player_is_antag(user.mind) || registered_user == user) - to_chat(user, "The microscanner activates as you pass it over the ID, copying its access.") + to_chat(user, span_notice("The microscanner activates as you pass it over the ID, copying its access.")) /obj/item/card/id/syndicate/attack_self(mob/user as mob) // We use the fact that registered_name is not unset should the owner be vaporized, to ensure the id doesn't magically become unlocked. if(!registered_user && register_user(user)) - to_chat(user, "The microscanner marks you as its owner, preventing others from accessing its internals.") + to_chat(user, span_notice("The microscanner marks you as its owner, preventing others from accessing its internals.")) if(registered_user == user) switch(tgui_alert(usr, "Would you like to edit the ID, or show it?","Show or Edit?", list("Edit","Show"))) if(null) diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 7b012e0121..ed720b3a63 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -51,7 +51,7 @@ return 0 /obj/item/implant/proc/meltdown() //breaks it down, making implant unrecongizible - to_chat(imp_in, "You feel something melting inside [part ? "your [part.name]" : "you"]!") + to_chat(imp_in, span_warning("You feel something melting inside [part ? "your [part.name]" : "you"]!")) if (part) part.take_damage(burn = 15, used_weapon = "Electronics meltdown") else @@ -254,7 +254,7 @@ Implant Specifics:
"} if(ishuman(imp_in)) if (elevel == "Localized Limb") if(part) //For some reason, small_boom() didn't work. So have this bit of working copypaste. - imp_in.visible_message("Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!") + imp_in.visible_message(span_warning("Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!")) playsound(src, 'sound/items/countdown.ogg', 75, 1, -3) sleep(25) if (istype(part,/obj/item/organ/external/chest) || \ @@ -327,7 +327,7 @@ Implant Specifics:
"} /obj/item/implant/explosive/proc/small_boom() if (ishuman(imp_in) && part) - imp_in.visible_message("Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!") + imp_in.visible_message(span_warning("Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!")) playsound(src, 'sound/items/countdown.ogg', 75, 1, -3) spawn(25) if (ishuman(imp_in) && part) @@ -450,7 +450,7 @@ the implant may become unstable and either pre-maturely inject the subject or si /obj/item/implant/loyalty/post_implant(mob/M) var/mob/living/carbon/human/H = M clear_antag_roles(H.mind, 1) - to_chat(H, "You feel a surge of loyalty towards [using_map.company_name].") + to_chat(H, span_notice("You feel a surge of loyalty towards [using_map.company_name].")) ////////////////////////////// // Adrenaline Implant @@ -478,7 +478,7 @@ the implant may become unstable and either pre-maturely inject the subject or si if (src.uses < 1) return 0 if (emote == "pale") src.uses-- - to_chat(source, "You feel a sudden surge of energy!") + to_chat(source, span_notice("You feel a sudden surge of energy!")) source.SetStunned(0) source.SetWeakened(0) source.SetParalysis(0) diff --git a/code/game/objects/items/weapons/implants/implant_vr.dm b/code/game/objects/items/weapons/implants/implant_vr.dm index b318a72592..bb9ec741cd 100644 --- a/code/game/objects/items/weapons/implants/implant_vr.dm +++ b/code/game/objects/items/weapons/implants/implant_vr.dm @@ -21,7 +21,7 @@ return 0 if (emote == "smile") src.uses-- - to_chat(source,"You suddenly feel as if you can understand other languages!") + to_chat(source,span_notice("You suddenly feel as if you can understand other languages!")) source.add_language(LANGUAGE_UNATHI) source.add_language(LANGUAGE_SIIK) source.add_language(LANGUAGE_SKRELLIAN) @@ -168,7 +168,7 @@ Due to the small chemical capacity of the implant, the life of the implant is re to_chat(user,"You set the laws to:
[newlaws]") implant.laws = newlaws //Organic else //No using other implants. - to_chat(user,"A red warning pops up on the implanter's micro-screen: 'INVALID IMPLANT DETECTED.'") + to_chat(user,span_notice("A red warning pops up on the implanter's micro-screen: 'INVALID IMPLANT DETECTED.'")) /obj/item/implant/compliance @@ -196,12 +196,12 @@ Due to the small chemical capacity of the implant, the life of the implant is re var/mob/living/carbon/human/target = source if(!target.nif || target.nif.stat != NIF_WORKING) //No nif or their NIF is broken. - to_chat(target, "You suddenly feel compelled to follow the following commands: [laws]") - to_chat(target, "((OOC NOTE: Commands that go against server rules should be disregarded and ahelped.))") - to_chat(target, "((OOC NOTE: Your new commands can be checked at any time by using the 'notes' command in chat. Additionally, if you did not agree to this, you are not compelled to follow the implant.))") + to_chat(target, span_notice("You suddenly feel compelled to follow the following commands: [laws]")) + to_chat(target, span_notice("((OOC NOTE: Commands that go against server rules should be disregarded and ahelped.))")) + to_chat(target, span_notice("((OOC NOTE: Your new commands can be checked at any time by using the 'notes' command in chat. Additionally, if you did not agree to this, you are not compelled to follow the implant.))")) target.add_memory(laws) return else //You got a nif...Upload time. new nif_payload(target.nif,laws) - to_chat(target, "((OOC NOTE: Commands that go against server rules should be disregarded and ahelped.))") - to_chat(target, "((OOC NOTE: If you did not agree to this, you are not compelled to follow the laws.))") + to_chat(target, span_notice("((OOC NOTE: Commands that go against server rules should be disregarded and ahelped.))")) + to_chat(target, span_notice("((OOC NOTE: If you did not agree to this, you are not compelled to follow the laws.))")) diff --git a/code/game/objects/items/weapons/implants/implantaugment.dm b/code/game/objects/items/weapons/implants/implantaugment.dm index ed1217ac22..7307282f10 100644 --- a/code/game/objects/items/weapons/implants/implantaugment.dm +++ b/code/game/objects/items/weapons/implants/implantaugment.dm @@ -30,10 +30,10 @@ var/obj/item/organ/NewOrgan = new organ_to_implant() var/obj/item/organ/external/E = H.get_organ(NewOrgan.parent_organ) - to_chat(H, "You feel a tingling sensation in your [part].") + to_chat(H, span_notice("You feel a tingling sensation in your [part].")) if(E && !(H.internal_organs_by_name[NewOrgan.organ_tag])) spawn(rand(1 SECONDS, 30 SECONDS)) - to_chat(H, "You feel a pressure in your [E] as the tingling fades, the lump caused by the implant now gone.") + to_chat(H, span_alien("You feel a pressure in your [E] as the tingling fades, the lump caused by the implant now gone.")) NewOrgan.forceMove(H) NewOrgan.owner = H @@ -50,7 +50,7 @@ else qdel(NewOrgan) - to_chat(H, "You feel a pinching sensation in your [part]. The implant remains.") + to_chat(H, span_warning("You feel a pinching sensation in your [part]. The implant remains.")) /obj/item/implant/organ/islegal() return 0 @@ -74,12 +74,12 @@ var/obj/item/organ/NewOrgan = new organ_to_implant() var/obj/item/organ/external/E = setup_augment_slots(H, NewOrgan) - to_chat(H, "You feel a tingling sensation in your [part].") + to_chat(H, span_notice("You feel a tingling sensation in your [part].")) NewOrgan.forceMove(H) NewOrgan.owner = H if(E && istype(E) && !(H.internal_organs_by_name[NewOrgan.organ_tag]) && NewOrgan.check_verb_compatability()) spawn(rand(1 SECONDS, 30 SECONDS)) - to_chat(H, "You feel a pressure in your [E] as the tingling fades, the lump caused by the implant now gone.") + to_chat(H, span_alien("You feel a pressure in your [E] as the tingling fades, the lump caused by the implant now gone.")) if(E.internal_organs == null) E.internal_organs = list() @@ -94,7 +94,7 @@ else qdel(NewOrgan) - to_chat(H, "You feel a pinching sensation in your [part]. The implant remains.") + to_chat(H, span_warning("You feel a pinching sensation in your [part]. The implant remains.")) /obj/item/implant/organ/limbaugment/proc/setup_augment_slots(var/mob/living/carbon/human/H, var/obj/item/organ/internal/augment/armmounted/I) var/list/Choices = possible_targets.Copy() diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index 636b288876..fe4a98091f 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -35,11 +35,11 @@ if(!src.imp) return if(!src.imp.allow_reagents) return if(src.imp.reagents.total_volume >= src.imp.reagents.maximum_volume) - to_chat(user, "\The [src] is full.") + to_chat(user, span_warning("\The [src] is full.")) else spawn(5) I.reagents.trans_to_obj(src.imp, 5) - to_chat(user, "You inject 5 units of the solution. The syringe now contains [I.reagents.total_volume] units.") + to_chat(user, span_notice("You inject 5 units of the solution. The syringe now contains [I.reagents.total_volume] units.")) else if (istype(I, /obj/item/implanter)) var/obj/item/implanter/M = I if (M.imp) diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 465a913d1a..8b14319614 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -101,10 +101,10 @@ /obj/machinery/implantchair/proc/put_mob(mob/living/carbon/M as mob) if(!iscarbon(M)) - to_chat(usr, "\The [src] cannot hold this!") + to_chat(usr, span_warning("\The [src] cannot hold this!")) return if(src.occupant) - to_chat(usr, "\The [src] is already occupied!") + to_chat(usr, span_warning("\The [src] is already occupied!")) return if(M.client) M.client.perspective = EYE_PERSPECTIVE @@ -125,7 +125,7 @@ if(!imp) continue if(istype(imp, /obj/item/implant/loyalty)) for (var/mob/O in viewers(M, null)) - O.show_message("\The [M] has been implanted by \the [src].", 1) + O.show_message(span_warning("\The [M] has been implanted by \the [src]."), 1) if(imp.handle_implant(M, BP_TORSO)) imp.post_implant(M) diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index e704c8cd56..7caf0d361f 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -12,7 +12,7 @@ /obj/item/implanter/attack_self(var/mob/user) active = !active - to_chat(user, "You [active ? "" : "de"]activate \the [src].") + to_chat(user, span_notice("You [active ? "" : "de"]activate \the [src].")) update() /obj/item/implanter/verb/remove_implant() @@ -27,7 +27,7 @@ imp.loc = get_turf(src) if(M.get_active_hand() == null) M.put_in_hands(imp) - to_chat(M, "You remove \the [imp] from \the [src].") + to_chat(M, span_notice("You remove \the [imp] from \the [src].")) name = "implanter" imp = null @@ -48,7 +48,7 @@ return if(active) if (imp) - M.visible_message("[user] is attempting to implant [M].") + M.visible_message(span_warning("[user] is attempting to implant [M].")) user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) user.do_attack_animation(M) @@ -56,7 +56,7 @@ var/turf/T1 = get_turf(M) if (T1 && ((M == user) || do_after(user, 50))) if(user && M && (get_turf(M) == T1) && src && src.imp) - M.visible_message("[M] has been implanted by [user].") + M.visible_message(span_warning("[M] has been implanted by [user].")) add_attack_logs(user,M,"Implanted with [imp.name] using [name]") @@ -71,7 +71,7 @@ src.imp = null update() else - to_chat(user, "You need to activate \the [src.name] first.") + to_chat(user, span_warning("You need to activate \the [src.name] first.")) return /obj/item/implanter/loyalty @@ -134,16 +134,16 @@ if(!proximity) return if(!active) - to_chat(user, "Activate \the [src.name] first.") + to_chat(user, span_warning("Activate \the [src.name] first.")) return if(istype(A,/obj/item) && imp) var/obj/item/implant/compressed/c = imp if (c.scanned) - to_chat(user, "Something is already scanned inside the implant!") + to_chat(user, span_warning("Something is already scanned inside the implant!")) return c.scanned = A if(istype(A, /obj/item/storage)) - to_chat(user, "You can't store \the [A.name] in this!") + to_chat(user, span_warning("You can't store \the [A.name] in this!")) c.scanned = null return if(istype(A.loc,/mob/living/carbon/human)) diff --git a/code/game/objects/items/weapons/implants/implantreagent_vr.dm b/code/game/objects/items/weapons/implants/implantreagent_vr.dm index 2d62409232..39e693b457 100644 --- a/code/game/objects/items/weapons/implants/implantreagent_vr.dm +++ b/code/game/objects/items/weapons/implants/implantreagent_vr.dm @@ -32,7 +32,7 @@ /obj/item/implant/reagent_generator/post_implant(mob/living/carbon/source) START_PROCESSING(SSobj, src) - to_chat(source, "You implant [source] with \the [src].") + to_chat(source, span_notice("You implant [source] with \the [src].")) assigned_proc = new assigned_proc(source, verb_name, verb_desc) return 1 @@ -52,9 +52,9 @@ if(reagents) if(reagents.total_volume == reagents.maximum_volume * 0.05) - to_chat(imp_in, "[pick(empty_message)]") + to_chat(imp_in, span_notice("[pick(empty_message)]")) else if(reagents.total_volume == reagents.maximum_volume && before_gen < reagents.maximum_volume) - to_chat(imp_in, "[pick(full_message)]") + to_chat(imp_in, span_warning("[pick(full_message)]")) /obj/item/implant/reagent_generator/proc/do_generation(var/mob/living/L) L.adjust_nutrition(-gen_cost) @@ -78,7 +78,7 @@ var/obj/item/reagent_containers/container = user.get_active_hand() if(!container) - to_chat(user,"You need an open container to do this!") + to_chat(user,span_notice("You need an open container to do this!")) return @@ -92,10 +92,9 @@ if(container.reagents.total_volume < container.volume) var/container_name = container.name if(rimplant.reagents.trans_to(container, amount = rimplant.transfer_amount)) - user.visible_message("[usr] [pick(rimplant.emote_descriptor)] into \the [container_name].", - "You [pick(rimplant.self_emote_descriptor)] some [rimplant.reagent_name] into \the [container_name].") + user.visible_message(span_notice("[usr] [pick(rimplant.emote_descriptor)] into \the [container_name]."), + span_notice("You [pick(rimplant.self_emote_descriptor)] some [rimplant.reagent_name] into \the [container_name].")) if(prob(5)) - src.visible_message("[src] [pick(rimplant.random_emote)].") // M-mlem. + src.visible_message(span_notice("[src] [pick(rimplant.random_emote)].")) // M-mlem. if(rimplant.reagents.total_volume == rimplant.reagents.maximum_volume * 0.05) - to_chat(src, "[pick(rimplant.empty_message)]") - + to_chat(src, span_notice("[pick(rimplant.empty_message)]")) diff --git a/code/game/objects/items/weapons/implants/neuralbasic.dm b/code/game/objects/items/weapons/implants/neuralbasic.dm index 74d14a25d1..296784adbf 100644 --- a/code/game/objects/items/weapons/implants/neuralbasic.dm +++ b/code/game/objects/items/weapons/implants/neuralbasic.dm @@ -22,7 +22,7 @@ /obj/item/implant/neural/Destroy() if(my_brain) if(my_brain.owner) - to_chat(my_brain.owner, "You feel a pressure in your mind as something is ripped away.") + to_chat(my_brain.owner, span_critical("You feel a pressure in your mind as something is ripped away.")) STOP_PROCESSING(SSobj, src) my_brain = null return ..() @@ -30,7 +30,7 @@ /obj/item/implant/neural/process() if(my_brain && part) if(my_brain.loc != part.loc) - to_chat(my_brain.owner, "You feel a pressure in your mind as something is ripped away.") + to_chat(my_brain.owner, span_critical("You feel a pressure in your mind as something is ripped away.")) meltdown() return 1 @@ -67,26 +67,26 @@ Implant Specifics:
"} else if(prob(80)) my_brain.take_damage(5) if(!robotic_brain) - to_chat(L, "Something in your [brain_location] burns!") + to_chat(L, span_critical("Something in your [brain_location] burns!")) else - to_chat(L, "Severe fault detected in [brain_location].") + to_chat(L, span_warning("Severe fault detected in [brain_location].")) if(2) if(prob(80)) my_brain.take_damage(3) if(!robotic_brain) - to_chat(L, "It feels like something is digging into your [brain_location]!") + to_chat(L, span_danger("It feels like something is digging into your [brain_location]!")) else - to_chat(L, "Fault detected in [brain_location].") + to_chat(L, span_warning("Fault detected in [brain_location].")) if(3) if(prob(60)) my_brain.take_damage(2) if(!robotic_brain) - to_chat(L, "There is a stabbing pain in your [brain_location]!") + to_chat(L, span_warning("There is a stabbing pain in your [brain_location]!")) if(4) if(prob(40)) my_brain.take_damage(1) if(!robotic_brain) - to_chat(L, "Your [brain_location] aches.") + to_chat(L, span_warning("Your [brain_location] aches.")) spawn(delay) malfunction-- @@ -99,7 +99,7 @@ Implant Specifics:
"} if(ishuman(my_brain.owner)) H = my_brain.owner if(robotic_brain) - to_chat(H, "WARNING. Fault dete-ct-- in the \the [src].") + to_chat(H, span_critical("WARNING. Fault dete-ct-- in the \the [src].")) H.Confuse(30) H.AdjustBlinded(5) my_brain.take_damage(15) diff --git a/code/game/objects/items/weapons/inducer_vr.dm b/code/game/objects/items/weapons/inducer_vr.dm index d4f105e409..5be520308c 100644 --- a/code/game/objects/items/weapons/inducer_vr.dm +++ b/code/game/objects/items/weapons/inducer_vr.dm @@ -63,15 +63,15 @@ /obj/item/inducer/proc/cantbeused(mob/user) if(!user.IsAdvancedToolUser()) - to_chat(user, "You don't have the dexterity to use [src]!") + to_chat(user, span_warning("You don't have the dexterity to use [src]!")) return TRUE if(!cell) - to_chat(user, "[src] doesn't have a power cell installed!") + to_chat(user, span_warning("[src] doesn't have a power cell installed!")) return TRUE if(!cell.charge) - to_chat(user, "[src]'s battery is dead!") + to_chat(user, span_warning("[src]'s battery is dead!")) return TRUE return FALSE @@ -80,12 +80,12 @@ if(W.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, W.usesound, 50, 1) if(!opened) - to_chat(user, "You open the battery compartment.") + to_chat(user, span_notice("You open the battery compartment.")) opened = TRUE update_icon() return else - to_chat(user, "You close the battery compartment.") + to_chat(user, span_notice("You close the battery compartment.")) opened = FALSE update_icon() return @@ -94,12 +94,12 @@ if(!cell) user.drop_from_inventory(W) W.forceMove(src) - to_chat(user, "You insert [W] into [src].") + to_chat(user, span_notice("You insert [W] into [src].")) cell = W update_icon() return else - to_chat(user, "[src] already has \a [cell] installed!") + to_chat(user, span_warning("[src] already has \a [cell] installed!")) return if(cantbeused(user)) @@ -119,7 +119,7 @@ recharging = TRUE if(istype(A, /obj/item/gun/energy) && !charge_guns) - to_chat(user, "Error: Device is unable to interface with weapons.") + to_chat(user, span_alert("Error: Device is unable to interface with weapons.")) recharging = FALSE return FALSE @@ -150,10 +150,10 @@ var/done_any = FALSE if(C.charge >= C.maxcharge) - to_chat(user, "[A] is fully charged ([round(C.charge)] / [C.maxcharge])!") + to_chat(user, span_notice("[A] is fully charged ([round(C.charge)] / [C.maxcharge])!")) recharging = FALSE return TRUE - user.visible_message("[user] starts recharging [A] with [src].", "You start recharging [A] with [src].") + user.visible_message(span_notice("[user] starts recharging [A] with [src]."), span_notice("You start recharging [A] with [src].")) var/datum/beam/charge_beam = user.Beam(A, icon_state = "rped_upgrade", time = 20 SECONDS) var/filter = filter(type = "outline", size = 1, color = "#22AAFF") @@ -179,18 +179,18 @@ A.filters -= filter if(done_any) // Only show a message if we succeeded at least once - user.visible_message("[user] recharged [A]!", "You recharged [A]!") + user.visible_message(span_notice("[user] recharged [A]!"), span_notice("You recharged [A]!")) recharging = FALSE return TRUE else //Couldn't find a cell - to_chat(user, "Error unable to interface with device.") + to_chat(user, span_alert("Error unable to interface with device.")) recharging = FALSE /obj/item/inducer/attack_self(mob/user) if(opened && cell) - user.visible_message("[user] removes [cell] from [src]!", "You remove [cell].") + user.visible_message(span_notice("[user] removes [cell] from [src]!"), span_notice("You remove [cell].")) cell.update_icon() user.put_in_hands(cell) cell = null @@ -199,11 +199,11 @@ /obj/item/inducer/examine(mob/living/M) . = ..() if(cell) - . += "Its display shows: [round(cell.charge)] / [cell.maxcharge]." + . += span_notice("Its display shows: [round(cell.charge)] / [cell.maxcharge].") else - . += "Its display is dark." + . += span_notice("Its display is dark.") if(opened) - . += "Its battery compartment is open." + . += span_notice("Its battery compartment is open.") /obj/item/inducer/update_icon() ..() diff --git a/code/game/objects/items/weapons/material/ashtray.dm b/code/game/objects/items/weapons/material/ashtray.dm index 47d8dcc6dd..33c4c82e9e 100644 --- a/code/game/objects/items/weapons/material/ashtray.dm +++ b/code/game/objects/items/weapons/material/ashtray.dm @@ -84,7 +84,7 @@ var/global/list/ashtray_cache = list() if (health > 0) health = max(0,health - 3) if (contents.len) - src.visible_message("\The [src] slams into [hit_atom], spilling its contents!") + src.visible_message(span_danger("\The [src] slams into [hit_atom], spilling its contents!")) for (var/obj/item/clothing/mask/smokable/cigarette/O in contents) O.loc = src.loc if (health < 1) diff --git a/code/game/objects/items/weapons/material/chainsaw.dm b/code/game/objects/items/weapons/material/chainsaw.dm index 787786136e..555e0e9271 100644 --- a/code/game/objects/items/weapons/material/chainsaw.dm +++ b/code/game/objects/items/weapons/material/chainsaw.dm @@ -87,16 +87,16 @@ else if(istype(A,/obj/machinery/portable_atmospherics/hydroponics)) var/obj/machinery/portable_atmospherics/hydroponics/Hyd = A if(Hyd.seed && !Hyd.dead) - to_chat(user, "You shred the plant.") + to_chat(user, span_notice("You shred the plant.")) Hyd.die() if (istype(A, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,A) <= 1) - to_chat(user, "You begin filling the tank on the chainsaw.") + to_chat(user, span_notice("You begin filling the tank on the chainsaw.")) if(do_after(usr, 15)) A.reagents.trans_to_obj(src, max_fuel) playsound(src, 'sound/effects/refill.ogg', 50, 1, -6) - to_chat(user, "Chainsaw succesfully refueled.") + to_chat(user, span_notice("Chainsaw succesfully refueled.")) else - to_chat(user, "Don't move while you're refilling the chainsaw.") + to_chat(user, span_notice("Don't move while you're refilling the chainsaw.")) /obj/item/chainsaw/process() if(!on) return diff --git a/code/game/objects/items/weapons/material/gravemarker.dm b/code/game/objects/items/weapons/material/gravemarker.dm index 16aa9b50db..9c5b04f526 100644 --- a/code/game/objects/items/weapons/material/gravemarker.dm +++ b/code/game/objects/items/weapons/material/gravemarker.dm @@ -62,17 +62,17 @@ return 0 if(locate(/obj/structure/gravemarker, user.loc)) - to_chat(user, "There's already something there.") + to_chat(user, span_warning("There's already something there.")) return 0 else - to_chat(user, "You begin to place \the [src.name].") + to_chat(user, span_notice("You begin to place \the [src.name].")) if(!do_after(usr, 10)) return 0 var/obj/structure/gravemarker/G = new /obj/structure/gravemarker/(user.loc, src.get_material()) - to_chat(user, "You place \the [src.name].") + to_chat(user, span_notice("You place \the [src.name].")) G.grave_name = grave_name G.epitaph = epitaph G.add_fingerprint(usr) G.dir = user.dir QDEL_NULL(src) - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index 83a9f82064..36b4060e32 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -133,7 +133,7 @@ if(food_inserted_micros) food_inserted_micros -= M M.forceMove(get_turf(src)) - to_chat(M, "You climb off of \the [src].") + to_chat(M, span_warning("You climb off of \the [src].")) /obj/item/material/kitchen/utensil/fork name = "fork" @@ -184,7 +184,7 @@ /* From the time of Clowns. Commented out for posterity, and sanity. /obj/item/material/knife/attack(target as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) - to_chat(user, "You accidentally cut yourself with \the [src].") + to_chat(user, span_warning("You accidentally cut yourself with \the [src].")) user.take_organ_damage(20) return return ..() @@ -210,7 +210,7 @@ /obj/item/material/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) - to_chat(user, "\The [src] slips out of your hand and hits your head.") + to_chat(user, span_warning("\The [src] slips out of your hand and hits your head.")) user.take_organ_damage(10) user.Paralyse(2) return diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index b0439b4eae..da316b626f 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -50,10 +50,10 @@ if(user) if(active) - to_chat(user, "You flip out \the [src].") + to_chat(user, span_notice("You flip out \the [src].")) playsound(src, 'sound/weapons/flipblade.ogg', 15, 1) else - to_chat(user, "\The [src] can now be concealed.") + to_chat(user, span_notice("\The [src] can now be concealed.")) add_fingerprint(user) /* diff --git a/code/game/objects/items/weapons/material/material_armor.dm b/code/game/objects/items/weapons/material/material_armor.dm index 942e952ec1..629ada89be 100644 --- a/code/game/objects/items/weapons/material/material_armor.dm +++ b/code/game/objects/items/weapons/material/material_armor.dm @@ -91,7 +91,7 @@ Protectiveness | Armor % if(!material) return var/turf/T = get_turf(src) - T.visible_message("\The [src] [material.destruction_desc]!") + T.visible_message(span_danger("\The [src] [material.destruction_desc]!")) if(istype(loc, /mob/living)) var/mob/living/M = loc M.drop_from_inventory(src) @@ -108,11 +108,11 @@ Protectiveness | Armor % return ..() if(material.negation && prob(material.negation)) // Strange and Alien materials, or just really strong materials. - user.visible_message("\The [src] completely absorbs [attack_text]!") + user.visible_message(span_danger("\The [src] completely absorbs [attack_text]!")) return TRUE if(material.spatial_instability && prob(material.spatial_instability)) - user.visible_message("\The [src] flashes [user] clear of [attack_text]!") + user.visible_message(span_danger("\The [src] flashes [user] clear of [attack_text]!")) var/list/turfs = new/list() for(var/turf/T in orange(round(material.spatial_instability / 10) + 1, user)) if(istype(T,/turf/space)) continue @@ -144,7 +144,7 @@ Protectiveness | Armor % if(!(def_zone in list(BP_TORSO, BP_GROIN))) reflectchance /= 2 if(P.starting && prob(reflectchance)) - visible_message("\The [user]'s [src.name] reflects [attack_text]!") + visible_message(span_danger("\The [user]'s [src.name] reflects [attack_text]!")) // Find a turf near or on the original location to bounce to var/new_x = P.starting.x + pick(0, 0, 0, 0, 0, -1, 1, -2, 2) @@ -296,23 +296,23 @@ Protectiveness | Armor % if(istype(O, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/S = O if(wired) - to_chat(user, "This already has enough wires on it.") + to_chat(user, span_warning("This already has enough wires on it.")) return if(S.use(20)) - to_chat(user, "You attach several wires to \the [src]. Now it needs another plate.") + to_chat(user, span_notice("You attach several wires to \the [src]. Now it needs another plate.")) wired = TRUE icon_state = "[initial(icon_state)]_wired" return else - to_chat(user, "You need more wire for that.") + to_chat(user, span_notice("You need more wire for that.")) return if(istype(O, /obj/item/material/armor_plating)) var/obj/item/material/armor_plating/second_plate = O if(!wired && !second_plate.wired) - to_chat(user, "You need something to hold the two pieces of plating together.") + to_chat(user, span_warning("You need something to hold the two pieces of plating together.")) return if(second_plate.material != src.material) - to_chat(user, "Both plates need to be the same type of material.") + to_chat(user, span_warning("Both plates need to be the same type of material.")) return user.drop_from_inventory(src) user.drop_from_inventory(second_plate) @@ -332,7 +332,7 @@ Protectiveness | Armor % var /obj/item/weldingtool/S = O.get_welder() if(S.remove_fuel(0,user)) if(!src || !S.isOn()) return - to_chat(user, "You trim down the edges to size.") + to_chat(user, span_notice("You trim down the edges to size.")) user.drop_from_inventory(src) var/obj/item/clothing/accessory/material/makeshift/light/new_armor = new(null, src.material.name) user.put_in_hands(new_armor) @@ -342,9 +342,9 @@ Protectiveness | Armor % if(istype(O, /obj/item/material/armor_plating/insert)) var/obj/item/material/armor_plating/insert/second_plate = O if(second_plate.material != src.material) - to_chat(user, "Both plates need to be the same type of material.") + to_chat(user, span_warning("Both plates need to be the same type of material.")) return - to_chat(user, "You bond the two plates together.") + to_chat(user, span_notice("You bond the two plates together.")) user.drop_from_inventory(src) user.drop_from_inventory(second_plate) var/obj/item/clothing/accessory/material/makeshift/heavy/new_armor = new(null, src.material.name) @@ -354,7 +354,7 @@ Protectiveness | Armor % return if(istype(O, /obj/item/tool/wirecutters)) - to_chat(user, "You split the plate down the middle, and joint it at the elbow.") + to_chat(user, span_notice("You split the plate down the middle, and joint it at the elbow.")) user.drop_from_inventory(src) var/obj/item/clothing/accessory/material/makeshift/armguards/new_armor = new(null, src.material.name) user.put_in_hands(new_armor) @@ -365,7 +365,7 @@ Protectiveness | Armor % var/obj/item/stack/material/S = O if(S.material == get_material_by_name("leather")) if(S.use(2)) - to_chat(user, "You curve the plate inwards, and add a strap for adjustment.") + to_chat(user, span_notice("You curve the plate inwards, and add a strap for adjustment.")) user.drop_from_inventory(src) var/obj/item/clothing/accessory/material/makeshift/legguards/new_armor = new(null, src.material.name) user.put_in_hands(new_armor) @@ -388,14 +388,14 @@ Protectiveness | Armor % if(istype(O, /obj/item/stack/material)) var/obj/item/stack/material/S = O if(S.use(2)) - to_chat(user, "You apply some [S.material.use_name] to \the [src]. Hopefully it'll make the makeshift helmet stronger.") + to_chat(user, span_notice("You apply some [S.material.use_name] to \the [src]. Hopefully it'll make the makeshift helmet stronger.")) var/obj/item/clothing/head/helmet/material/makeshift/helmet = new(null, S.material.name) user.put_in_hands(helmet) user.drop_from_inventory(src) qdel(src) return else - to_chat(user, "You don't have enough material to build a helmet!") + to_chat(user, span_warning("You don't have enough material to build a helmet!")) else ..() diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm index fb8990fadc..06fc508982 100644 --- a/code/game/objects/items/weapons/material/material_weapons.dm +++ b/code/game/objects/items/weapons/material/material_weapons.dm @@ -106,7 +106,7 @@ /obj/item/material/proc/shatter(var/consumed) var/turf/T = get_turf(src) - T.visible_message("\The [src] [material.destruction_desc]!") + T.visible_message(span_danger("\The [src] [material.destruction_desc]!")) if(istype(loc, /mob/living)) var/mob/living/M = loc M.drop_from_inventory(src) @@ -116,7 +116,7 @@ /obj/item/material/proc/dull() var/turf/T = get_turf(src) - T.visible_message("\The [src] goes dull!") + T.visible_message(span_danger("\The [src] goes dull!")) playsound(src, "shatter", 70, 1) dulled = 1 if(is_sharp() || has_edge()) @@ -134,9 +134,9 @@ sharp = initial(sharp) edge = initial(edge) else - to_chat(user, "[src] doesn't need repairs.") + to_chat(user, span_notice("[src] doesn't need repairs.")) else - to_chat(user, "You can't repair \the [src].") + to_chat(user, span_warning("You can't repair \the [src].")) return /obj/item/material/proc/sharpen(var/material, var/sharpen_time, var/kit, mob/living/M) diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index 2ae6b20364..a5ed90fc51 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -138,17 +138,17 @@ if(istype(A, /atom/movable)) var/atom/movable/AM = A if(AM.anchored) - to_chat(user, "\The [AM] won't budge.") + to_chat(user, span_notice("\The [AM] won't budge.")) return else if(!istype(AM, /obj/item)) - user.visible_message("\The [AM] is pulled along by \the [src]!") + user.visible_message(span_warning("\The [AM] is pulled along by \the [src]!")) AM.Move(get_step(AM, get_dir(AM, src))) return else - user.visible_message("\The [AM] is snatched by \the [src]!") + user.visible_message(span_warning("\The [AM] is snatched by \the [src]!")) AM.throw_at(user, reach, 0.1, user) /obj/item/material/whip/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) @@ -156,19 +156,19 @@ switch(user.a_intent) if(I_HURT) if(prob(10) && istype(target, /mob/living/carbon/human) && (user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND))) - to_chat(target, "\The [src] rips at your hands!") + to_chat(target, span_warning("\The [src] rips at your hands!")) ranged_disarm(target) if(I_DISARM) if(prob(min(90, force * 3)) && istype(target, /mob/living/carbon/human) && (user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND))) ranged_disarm(target) else - target.visible_message("\The [src] sends \the [target] stumbling away.") + target.visible_message(span_danger("\The [src] sends \the [target] stumbling away.")) target.Move(get_step(target,get_dir(user,target))) if(I_GRAB) var/turf/STurf = get_turf(target) spawn(2) playsound(STurf, 'sound/effects/snap.ogg', 60, 1) - target.visible_message("\The [src] yanks \the [target] towards \the [user]!") + target.visible_message(span_critical("\The [src] yanks \the [target] towards \the [user]!")) target.throw_at(get_turf(get_step(user,get_dir(user,target))), 2, 1, src) ..() @@ -185,7 +185,7 @@ turfs += T if(turfs.len) var/turf/target = pick(turfs) - visible_message("[H]'s [W] goes off due to \the [src]!") + visible_message(span_danger("[H]'s [W] goes off due to \the [src]!")) return W.afterattack(target,H) if(!(H.species.flags & NO_SLIP) && prob(10) && (user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT))) @@ -193,9 +193,9 @@ H.apply_effect(3, WEAKEN, armor_check) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(armor_check < 60) - visible_message("\The [src] has tripped [H]!") + visible_message(span_danger("\The [src] has tripped [H]!")) else - visible_message("\The [src] attempted to trip [H]!") + visible_message(span_warning("\The [src] attempted to trip [H]!")) return else @@ -207,12 +207,12 @@ for(var/obj/item/I in holding) if(I && prob(holding[I])) H.drop_from_inventory(I) - visible_message("\The [src] has disarmed [H]!") + visible_message(span_danger("\The [src] has disarmed [H]!")) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) return /obj/item/material/whip/attack_self(mob/user) - user.visible_message("\The [user] cracks \the [src]!") + user.visible_message(span_warning("\The [user] cracks \the [src]!")) playsound(src, 'sound/effects/snap.ogg', 50, 1) /obj/item/material/knife/machete/hatchet/stone diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index 86e5a27914..ecd8df8456 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -89,15 +89,15 @@ break if(user.gloves && !protected_hands) - to_chat(user, "\The [src] partially cuts into your hand through your gloves as you hit \the [target]!") + to_chat(user, span_warning("\The [src] partially cuts into your hand through your gloves as you hit \the [target]!")) user.apply_damage(light_glove_d + will_break ? break_damage : 0, BRUTE, active_hand, 0, 0, src, src.sharp, src.edge) // Ternary to include break damage else if(!user.gloves) - to_chat(user, "\The [src] cuts into your hand as you hit \the [target]!") + to_chat(user, span_warning("\The [src] cuts into your hand as you hit \the [target]!")) user.apply_damage(no_glove_d + will_break ? break_damage : 0, BRUTE, active_hand, 0, 0, src, src.sharp, src.edge) if(will_break && src.loc == user) // If it's not in our hand anymore - user.visible_message("[user] hit \the [target] with \the [src], shattering it!", "You shatter \the [src] in your hand!") + user.visible_message(span_danger("[user] hit \the [target] with \the [src], shattering it!"), span_warning("You shatter \the [src] in your hand!")) playsound(src, pick('sound/effects/Glassbr1.ogg', 'sound/effects/Glassbr2.ogg', 'sound/effects/Glassbr3.ogg'), 30, 1) qdel(src) return @@ -125,7 +125,7 @@ if(H.species.flags & NO_MINOR_CUT) return - to_chat(H, "You step on \the [src]!") + to_chat(H, span_danger("You step on \the [src]!")) var/list/check = list("l_foot", "r_foot") while(check.len) diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm index 561295bf43..0a979d824c 100644 --- a/code/game/objects/items/weapons/material/swords.dm +++ b/code/game/objects/items/weapons/material/swords.dm @@ -14,7 +14,7 @@ /obj/item/material/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(unique_parry_check(user, attacker, damage_source) && prob(50)) - user.visible_message("\The [user] parries [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!")) playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 @@ -72,7 +72,7 @@ /obj/item/material/sword/battleaxe/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(unique_parry_check(user, attacker, damage_source) && prob(10)) - user.visible_message("\The [user] parries [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!")) playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index a5fcd3be45..822e889f70 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -63,7 +63,7 @@ //Allow a small chance of parrying melee attacks when wielded - maybe generalize this to other weapons someday /obj/item/material/twohanded/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(wielded && default_parry_check(user, attacker, damage_source) && prob(15)) - user.visible_message("\The [user] parries [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!")) playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 @@ -190,4 +190,4 @@ attack_verb = list("cropped","spanked","swatted","smacked","peppered") /obj/item/material/twohanded/spear/flint - default_material = MAT_FLINT \ No newline at end of file + default_material = MAT_FLINT diff --git a/code/game/objects/items/weapons/material/twohanded_vr.dm b/code/game/objects/items/weapons/material/twohanded_vr.dm index c9195152e0..04a3777c6e 100644 --- a/code/game/objects/items/weapons/material/twohanded_vr.dm +++ b/code/game/objects/items/weapons/material/twohanded_vr.dm @@ -29,7 +29,7 @@ /obj/item/material/twohanded/saber/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if (src.wielded == 1) if(unique_parry_check(user, attacker, damage_source) && prob(50)) - user.visible_message("\The [user] parries [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!")) playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 @@ -69,7 +69,7 @@ else parry_chance = base_parry_chance if(unique_parry_check(user, attacker, damage_source) && prob(parry_chance)) - user.visible_message("\The [user] parries [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!")) playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 @@ -78,4 +78,4 @@ . = ..() if(src.wielded == 1 && user.a_intent == I_DISARM && prob(stun_chance)) target.Weaken(stun_duration) - user.visible_message("\The [user] trips [target] with \the [src]!") + user.visible_message(span_danger("\The [user] trips [target] with \the [src]!")) diff --git a/code/game/objects/items/weapons/melee/deflect.dm b/code/game/objects/items/weapons/melee/deflect.dm index 7f1759b381..3c1ba4c823 100644 --- a/code/game/objects/items/weapons/melee/deflect.dm +++ b/code/game/objects/items/weapons/melee/deflect.dm @@ -10,10 +10,10 @@ if(.) return . if(default_parry_check(user, attacker, damage_source) && prob(defend_chance)) - user.visible_message("\The [user] parries [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!")) return 1 if(unique_parry_check(user, attacker, damage_source) && prob(projectile_parry_chance)) - user.visible_message("\The [user] deflects [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] deflects [attack_text] with \the [src]!")) return 1 return 0 diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 5bcdff27c6..cd6478d6ff 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -92,21 +92,21 @@ . = ..() if(use_cell && Adjacent(user)) if(bcell) - . += "The blade is [round(bcell.percent())]% charged." + . += span_notice("The blade is [round(bcell.percent())]% charged.") else - . += "The blade does not have a power source installed." + . += span_warning("The blade does not have a power source installed.") /obj/item/melee/energy/attack_self(mob/living/user as mob) if(use_cell) if((!bcell || bcell.charge < hitcost) && !active) - to_chat(user, "\The [src] does not seem to have power.") + to_chat(user, span_notice("\The [src] does not seem to have power.")) return var/datum/gender/TU = gender_datums[user.get_visible_gender()] if (active) if ((CLUMSY in user.mutations) && prob(50)) - user.visible_message("\The [user] accidentally cuts [TU.himself] with \the [src].",\ - "You accidentally cut yourself with \the [src].") + user.visible_message(span_danger("\The [user] accidentally cuts [TU.himself] with \the [src]."),\ + span_danger("You accidentally cut yourself with \the [src].")) user.take_organ_damage(5,5) deactivate(user) else @@ -124,7 +124,7 @@ if(active && use_cell) if(!use_charge(hitcost)) deactivate(user) - visible_message("\The [src]'s blade flickers, before deactivating.") + visible_message(span_notice("\The [src]'s blade flickers, before deactivating.")) return ..() /obj/item/melee/energy/attackby(obj/item/W, mob/user) @@ -133,7 +133,7 @@ rainbow = TRUE else rainbow = FALSE - to_chat(user, "You manipulate the color controller in [src].") + to_chat(user, span_notice("You manipulate the color controller in [src].")) update_icon() if(use_cell) if(istype(W, cell_type)) @@ -141,15 +141,15 @@ user.drop_item() W.loc = src bcell = W - to_chat(user, "You install a cell in [src].") + to_chat(user, span_notice("You install a cell in [src].")) update_icon() else - to_chat(user, "[src] already has a cell.") + to_chat(user, span_notice("[src] already has a cell.")) else if(W.has_tool_quality(TOOL_SCREWDRIVER) && bcell) bcell.update_icon() bcell.forceMove(get_turf(loc)) bcell = null - to_chat(user, "You remove the cell from \the [src].") + to_chat(user, span_notice("You remove the cell from \the [src].")) deactivate() update_icon() return @@ -184,7 +184,7 @@ if(!in_range(src, user)) //Basic checks to prevent abuse return if(user.incapacitated() || !istype(user)) - to_chat(user, "You can't do that right now!") + to_chat(user, span_warning("You can't do that right now!")) return if(tgui_alert(usr, "Are you sure you want to recolor your blade?", "Confirm Recolor", list("Yes", "No")) == "Yes") @@ -196,7 +196,7 @@ /obj/item/melee/energy/examine(mob/user) . = ..() if(colorable) - . += "Alt-click to recolor it." + . += span_notice("Alt-click to recolor it.") /* * Energy Axe @@ -230,12 +230,12 @@ /obj/item/melee/energy/axe/activate(mob/living/user) ..() damtype = SEARING - to_chat(user, "\The [src] is now energised.") + to_chat(user, span_notice("\The [src] is now energised.")) /obj/item/melee/energy/axe/deactivate(mob/living/user) ..() damtype = BRUTE - to_chat(user, "\The [src] is de-energised. It's just a regular axe now.") + to_chat(user, span_notice("\The [src] is de-energised. It's just a regular axe now.")) /obj/item/melee/energy/axe/charge name = "charge axe" @@ -287,7 +287,7 @@ /obj/item/melee/energy/sword/activate(mob/living/user) if(!active) - to_chat(user, "\The [src] is now energised.") + to_chat(user, span_notice("\The [src] is now energised.")) ..() attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -295,13 +295,13 @@ /obj/item/melee/energy/sword/deactivate(mob/living/user) if(active) - to_chat(user, "\The [src] deactivates!") + to_chat(user, span_notice("\The [src] deactivates!")) ..() attack_verb = list() /obj/item/melee/energy/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(active && default_parry_check(user, attacker, damage_source) && prob(60)) - user.visible_message("\The [user] parries [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!")) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, user.loc) @@ -309,7 +309,7 @@ playsound(src, 'sound/weapons/blade1.ogg', 50, 1) return 1 if(active && unique_parry_check(user, attacker, damage_source) && prob(projectile_parry_chance)) - user.visible_message("\The [user] deflects [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] deflects [attack_text] with \the [src]!")) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, user.loc) @@ -473,7 +473,7 @@ /obj/item/melee/energy/blade/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(60)) - user.visible_message("\The [user] parries [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!")) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, user.loc) @@ -481,7 +481,7 @@ playsound(src, 'sound/weapons/blade1.ogg', 50, 1) return 1 if(unique_parry_check(user, attacker, damage_source) && prob(projectile_parry_chance)) - user.visible_message("\The [user] deflects [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] deflects [attack_text] with \the [src]!")) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, user.loc) @@ -528,20 +528,20 @@ /obj/item/melee/energy/spear/activate(mob/living/user) if(!active) - to_chat(user, "\The [src] is now energised.") + to_chat(user, span_notice("\The [src] is now energised.")) ..() attack_verb = list("jabbed", "stabbed", "impaled") /obj/item/melee/energy/spear/deactivate(mob/living/user) if(active) - to_chat(user, "\The [src] deactivates!") + to_chat(user, span_notice("\The [src] deactivates!")) ..() attack_verb = list("whacked", "beat", "slapped", "thonked") /obj/item/melee/energy/spear/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(active && default_parry_check(user, attacker, damage_source) && prob(50)) - user.visible_message("\The [user] parries [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!")) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, user.loc) spark_system.start() diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index fda34b5067..092885ab37 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -78,7 +78,7 @@ /obj/item/melee/cursedblade/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(50)) - user.visible_message("\The [user] parries [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!")) playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 diff --git a/code/game/objects/items/weapons/melee/shock_maul.dm b/code/game/objects/items/weapons/melee/shock_maul.dm index f9ec4df819..b5df24d40c 100644 --- a/code/game/objects/items/weapons/melee/shock_maul.dm +++ b/code/game/objects/items/weapons/melee/shock_maul.dm @@ -150,7 +150,7 @@ ..() if(status) status = 0 - visible_message("\The [src]'s grip safety engages!") + visible_message(span_warning("\The [src]'s grip safety engages!")) update_held_icon() /obj/item/melee/shock_maul/examine(mob/user) @@ -158,9 +158,9 @@ if(Adjacent(user)) if(bcell) - . += "The concussion maul is [round(bcell.percent())]% charged." + . += span_notice("The concussion maul is [round(bcell.percent())]% charged.") if(!bcell) - . += "The concussion maul does not have a power source installed." + . += span_warning("The concussion maul does not have a power source installed.") /obj/item/melee/shock_maul/attackby(obj/item/W, mob/user) if(!user.IsAdvancedToolUser()) @@ -171,12 +171,12 @@ user.drop_item() W.loc = src bcell = W - to_chat(user, "You install a cell in \the [src].") + to_chat(user, span_notice("You install a cell in \the [src].")) update_held_icon() else - to_chat(user, "\The [src] already has a cell.") + to_chat(user, span_notice("\The [src] already has a cell.")) else - to_chat(user, "This cell is not fitted for [src].") + to_chat(user, span_notice("This cell is not fitted for [src].")) /obj/item/melee/shock_maul/attack_hand(mob/user as mob) if(user.get_inactive_hand() == src) @@ -186,7 +186,7 @@ bcell.update_icon() user.put_in_hands(bcell) bcell = null - to_chat(user, "You remove the cell from the [src].") + to_chat(user, span_notice("You remove the cell from the [src].")) status = 0 update_held_icon() return @@ -200,18 +200,18 @@ if(!status && bcell && bcell.charge >= hitcost) if(do_after(user, 2 SECONDS)) status = 1 - user.visible_message("[user] charges \the [src]!","You charge \the [src]. It's hammer time!") + user.visible_message(span_warning("[user] charges \the [src]!"),span_warning("You charge \the [src]. It's hammer time!")) playsound(src, "sparks", 75, 1, -1) update_held_icon() else if(status) status = 0 - user.visible_message("[user] safely disengages \the [src]'s power field.","\The [src] is now off.") + user.visible_message(span_notice("[user] safely disengages \the [src]'s power field."),span_notice("\The [src] is now off.")) update_held_icon() playsound(src, "sparks", 75, 1, -1) if(!bcell) - to_chat(user, "\The [src] does not have a power source!") + to_chat(user, span_warning("\The [src] does not have a power source!")) else - to_chat(user, "\The [src] is out of charge.") + to_chat(user, span_warning("\The [src] is out of charge.")) add_fingerprint(user) /obj/item/melee/shock_maul/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) @@ -220,12 +220,12 @@ if(A && wielded && status) deductcharge() status = 0 - user.visible_message("\The [src] discharges with a thunderous, hair-raising crackle!") + user.visible_message(span_warning("\The [src] discharges with a thunderous, hair-raising crackle!")) playsound(src, 'sound/weapons/resonator_blast.ogg', 100, 1, -1) update_held_icon() if(istype(A,/obj/structure/window)) var/obj/structure/window/W = A - visible_message("\The [W] crumples under the force of the impact!") + visible_message(span_warning("\The [W] crumples under the force of the impact!")) W.shatter() else if(istype(A,/obj/structure/barricade)) var/obj/structure/barricade/B = A @@ -249,7 +249,7 @@ deductcharge() status = 0 - user.visible_message("\The [src] discharges with a thunderous, hair-raising crackle!") + user.visible_message(span_warning("\The [src] discharges with a thunderous, hair-raising crackle!")) playsound(src, 'sound/weapons/resonator_blast.ogg', 100, 1, -1) update_held_icon() powercheck(hitcost) @@ -259,7 +259,7 @@ bcell.emp_act(severity) //let's not duplicate code everywhere if we don't have to please. if(status) status = 0 - visible_message("\The [src]'s power field hisses and sputters out.") + visible_message(span_warning("\The [src]'s power field hisses and sputters out.")) update_held_icon() ..() @@ -273,4 +273,4 @@ results += ..() - return results \ No newline at end of file + return results diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 00a33428f7..96cfdb01ef 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -26,16 +26,16 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/mop) if(!proximity) return if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune)) if(reagents.total_volume < 1) - to_chat(user, "Your mop is dry!") + to_chat(user, span_notice("Your mop is dry!")) return - user.visible_message("[user] begins to clean \the [get_turf(A)].") + user.visible_message(span_warning("[user] begins to clean \the [get_turf(A)].")) if(do_after(user, 40)) var/turf/T = get_turf(A) if(T) T.clean(src, user) - to_chat(user, "You have finished mopping!") + to_chat(user, span_notice("You have finished mopping!")) /obj/effect/attackby(obj/item/I, mob/user) @@ -67,13 +67,13 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/mop) if(!proximity) return if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune)) if(reagents.total_volume < 1) - to_chat(user, "Your mop is dry!") + to_chat(user, span_notice("Your mop is dry!")) return - user.visible_message("[user] begins to clean \the [get_turf(A)].") + user.visible_message(span_warning("[user] begins to clean \the [get_turf(A)].")) if(do_after(user, 20)) var/turf/T = get_turf(A) if(T) T.clean(src, user) - to_chat(user, "You have finished mopping!") \ No newline at end of file + to_chat(user, span_notice("You have finished mopping!")) diff --git a/code/game/objects/items/weapons/mop_deploy.dm b/code/game/objects/items/weapons/mop_deploy.dm index a5cd0036b6..182f4971dc 100644 --- a/code/game/objects/items/weapons/mop_deploy.dm +++ b/code/game/objects/items/weapons/mop_deploy.dm @@ -35,13 +35,13 @@ /obj/item/mop_deploy/afterattack(atom/A, mob/user, proximity) if(!proximity) return if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune)) - user.visible_message("[user] begins to clean \the [get_turf(A)].") + user.visible_message(span_warning("[user] begins to clean \the [get_turf(A)].")) if(do_after(user, 40)) var/turf/T = get_turf(A) if(T) T.clean_deploy(src) - to_chat(user, "You have finished mopping!") + to_chat(user, span_notice("You have finished mopping!")) /obj/effect/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/mop_deploy) || istype(I, /obj/item/soap)) @@ -72,4 +72,4 @@ host.pinned -= src host.embedded -= src host.drop_from_inventory(src) - spawn(1) if(!QDELETED(src)) qdel(src) \ No newline at end of file + spawn(1) if(!QDELETED(src)) qdel(src) diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 8433402161..628b0f3694 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -21,7 +21,7 @@ var/global/list/cached_icons = list() /obj/item/reagent_containers/glass/paint/afterattack(turf/simulated/target, mob/user, proximity) if(!proximity) return if(istype(target) && reagents.total_volume > 5) - user.visible_message("\The [target] has been splashed with something by [user]!") + user.visible_message(span_warning("\The [target] has been splashed with something by [user]!")) reagents.trans_to_turf(target, 5) else return ..() @@ -75,4 +75,3 @@ var/global/list/cached_icons = list() name = "paint remover bucket" icon_state = "paint_white" paint_type = "#FFFFFF" - diff --git a/code/game/objects/items/weapons/paiwire.dm b/code/game/objects/items/weapons/paiwire.dm index 72881bc1d6..05b526cf1f 100644 --- a/code/game/objects/items/weapons/paiwire.dm +++ b/code/game/objects/items/weapons/paiwire.dm @@ -4,7 +4,7 @@ if(istype(M, /obj/machinery/door/airlock)) var/obj/machinery/door/airlock/A = M if(A.secured_wires) - to_chat(user,"\The [M] doesn't have any acessible data ports for \the [src]!") + to_chat(user,span_warning("\The [M] doesn't have any acessible data ports for \the [src]!")) return //VOREStation Add End user.visible_message("[user] inserts [src] into a data port on [M].", "You insert [src] into a data port on [M].", "You hear the satisfying click of a wire jack fastening into place.") diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm index 3754106760..ff7b682e2d 100644 --- a/code/game/objects/items/weapons/policetape.dm +++ b/code/game/objects/items/weapons/policetape.dm @@ -140,14 +140,14 @@ var/list/tape_roll_applications = list() /obj/item/taperoll/attack_self(mob/user as mob) if(!start) start = get_turf(src) - to_chat(user, "You place the first end of \the [src].") + to_chat(user, span_notice("You place the first end of \the [src].")) update_icon() else end = get_turf(src) if(start.y != end.y && start.x != end.x || start.z != end.z) start = null update_icon() - to_chat(user, "\The [src] can only be laid horizontally or vertically.") + to_chat(user, span_notice("\The [src] can only be laid horizontally or vertically.")) return if(start == end) @@ -168,7 +168,7 @@ var/list/tape_roll_applications = list() if(!possible_dirs) start = null update_icon() - to_chat(user, "You can't place \the [src] here.") + to_chat(user, span_notice("You can't place \the [src] here.")) return if(possible_dirs & (NORTH|SOUTH)) var/obj/item/tape/TP = new tape_type(start) @@ -184,7 +184,7 @@ var/list/tape_roll_applications = list() TP.update_icon() start = null update_icon() - to_chat(user, "You finish placing \the [src].") + to_chat(user, span_notice("You finish placing \the [src].")) return var/turf/cur = start @@ -233,7 +233,7 @@ var/list/tape_roll_applications = list() if (!can_place) start = null update_icon() - to_chat(user, "You can't run \the [src] through that!") + to_chat(user, span_warning("You can't run \the [src] through that!")) return cur = start @@ -277,7 +277,7 @@ var/list/tape_roll_applications = list() cur = get_step_towards(cur,end) start = null update_icon() - to_chat(user, "You finish placing \the [src].") + to_chat(user, span_notice("You finish placing \the [src].")) return /obj/item/taperoll/afterattack(var/atom/A, mob/user as mob, proximity) @@ -292,7 +292,7 @@ var/list/tape_roll_applications = list() var/obj/item/tape/P = new tape_type(T) P.update_icon() P.layer = WINDOW_LAYER - to_chat(user, "You finish placing \the [src].") + to_chat(user, span_notice("You finish placing \the [src].")) if (istype(A, /turf/simulated/floor) ||istype(A, /turf/unsimulated/floor)) var/turf/F = A @@ -375,9 +375,9 @@ var/list/tape_roll_applications = list() /obj/item/tape/proc/breaktape(mob/user) if(user.a_intent == I_HELP) - to_chat(user, "You refrain from breaking \the [src].") + to_chat(user, span_warning("You refrain from breaking \the [src].")) return - user.visible_message("\The [user] breaks \the [src]!","You break \the [src].") + user.visible_message("\The [user] breaks \the [src]!",span_notice("You break \the [src].")) for (var/obj/item/tape/T in gettapeline()) if(T == src) diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index a8eaecae19..f14bf247c3 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -16,7 +16,7 @@ /obj/item/teleportation_scroll/attack_self(mob/user as mob) if((user.mind && !wizards.is_antagonist(user.mind))) - to_chat(usr, "You stare at the scroll but cannot make sense of the markings!") + to_chat(usr, span_warning("You stare at the scroll but cannot make sense of the markings!")) return user.set_machine(src) diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 4863f90515..80da3eb459 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -49,7 +49,7 @@ var/bad_arc = reverse_direction(user.dir) //arc of directions from which we cannot block if(check_shield_arc(user, bad_arc, damage_source, attacker)) if(prob(get_block_chance(user, damage, damage_source, attacker))) - user.visible_message("\The [user] blocks [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] blocks [attack_text] with \the [src]!")) return 1 return 0 @@ -88,12 +88,12 @@ //If we're at this point, the bullet/beam is going to go through the shield, however it will hit for less damage. //Bullets get slowed down, while beams are diffused as they hit the shield, so these shields are not /completely/ //useless. Extremely penetrating projectiles will go through the shield without less damage. - user.visible_message("\The [user]'s [src.name] is pierced by [attack_text]!") + user.visible_message(span_danger("\The [user]'s [src.name] is pierced by [attack_text]!")) if(P.armor_penetration < 30) //PTR bullets and x-rays will bypass this entirely. P.damage = P.damage / 2 return 0 //Otherwise, if we're here, we're gonna stop the attack entirely. - user.visible_message("\The [user] blocks [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] blocks [attack_text] with \the [src]!")) playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) return 1 return 0 @@ -101,7 +101,7 @@ /obj/item/shield/riot/attackby(obj/item/W as obj, mob/user as mob) if(istype(W, /obj/item/melee/baton)) if(cooldown < world.time - 25) - user.visible_message("[user] bashes [src] with [W]!") + user.visible_message(span_warning("[user] bashes [src] with [W]!")) playsound(src, 'sound/effects/shieldbash.ogg', 50, 1) cooldown = world.time else @@ -155,7 +155,7 @@ /obj/item/shield/energy/attack_self(mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) - to_chat(user, "You beat yourself in the head with [src].") + to_chat(user, span_warning("You beat yourself in the head with [src].")) user.take_organ_damage(5) active = !active if (active) @@ -164,7 +164,7 @@ w_class = ITEMSIZE_LARGE slot_flags = null playsound(src, 'sound/weapons/saberon.ogg', 50, 1) - to_chat(user, "\The [src] is now active.") + to_chat(user, span_notice("\The [src] is now active.")) else force = 3 @@ -172,7 +172,7 @@ w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS playsound(src, 'sound/weapons/saberoff.ogg', 50, 1) - to_chat(user, "\The [src] can now be concealed.") + to_chat(user, span_notice("\The [src] can now be concealed.")) if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user @@ -206,7 +206,7 @@ if(!in_range(src, user)) //Basic checks to prevent abuse return if(user.incapacitated() || !istype(user)) - to_chat(user, "You can't do that right now!") + to_chat(user, span_warning("You can't do that right now!")) return if(tgui_alert(usr, "Are you sure you want to recolor your shield?", "Confirm Recolor", list("Yes", "No")) == "Yes") var/energy_color_input = input(usr,"","Choose Energy Color",lcolor) as color|null @@ -216,7 +216,7 @@ /obj/item/shield/energy/examine(mob/user) . = ..() - . += "Alt-click to recolor it." + . += span_notice("Alt-click to recolor it.") /obj/item/shield/riot/tele name = "telescopic shield" @@ -248,14 +248,14 @@ throw_speed = 2 w_class = ITEMSIZE_LARGE slot_flags = SLOT_BACK - to_chat(user, "You extend \the [src].") + to_chat(user, span_notice("You extend \the [src].")) else force = 3 throwforce = 3 throw_speed = 3 w_class = ITEMSIZE_NORMAL slot_flags = null - to_chat(user, "[src] can now be concealed.") + to_chat(user, span_notice("[src] can now be concealed.")) if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user diff --git a/code/game/objects/items/weapons/shields_vr.dm b/code/game/objects/items/weapons/shields_vr.dm index cc11223326..2b3eeac278 100644 --- a/code/game/objects/items/weapons/shields_vr.dm +++ b/code/game/objects/items/weapons/shields_vr.dm @@ -81,7 +81,7 @@ /obj/item/shield/riot/explorer/attackby(obj/item/W as obj, mob/user as mob) if(istype(W, /obj/item/material/knife/machete)) if(cooldown < world.time - 25) - user.visible_message("[user] bashes [src] with [W]!") + user.visible_message(span_warning("[user] bashes [src] with [W]!")) playsound(src, 'sound/effects/shieldbash.ogg', 50, 1) cooldown = world.time else diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index f3c641ad6f..82fa30d7d3 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -49,13 +49,13 @@ name = "dufflebag of holding" var/tilted = 0 icon_state = "holdingduffle" - + /obj/item/storage/backpack/holding/duffle/Initialize() . = ..() if(prob(50)) icon_state = "[icon_state]_tilted" tilted = 1 - + /obj/item/storage/backpack/holding/duffle/verb/tilt() set name = "Adjust Duffelbag Angle" set desc = "Adjust the angle of your dufflebag for cosmetic effect" @@ -76,7 +76,7 @@ /obj/item/storage/backpack/holding/attackby(obj/item/W as obj, mob/user as mob) if(istype(W, /obj/item/storage/backpack/holding)) - to_chat(user, "The Bluespace interfaces of the two devices conflict and malfunction.") + to_chat(user, span_warning("The Bluespace interfaces of the two devices conflict and malfunction.")) qdel(W) return . = ..() @@ -175,13 +175,13 @@ var/tilted = 0 var/can_tilt = 1 max_storage_space = INVENTORY_DUFFLEBAG_SPACE - + /obj/item/storage/backpack/dufflebag/Initialize() . = ..() if(prob(50)) icon_state = "[icon_state]_tilted" tilted = 1 - + /obj/item/storage/backpack/dufflebag/verb/tilt() set name = "Adjust Duffelbag Angle" set desc = "Adjust the angle of your dufflebag for cosmetic effect" @@ -514,34 +514,34 @@ if(H.stat) return if(H.back == src) - to_chat(H, "How do you expect to work on \the [src] while it's on your back?") + to_chat(H, span_warning("How do you expect to work on \the [src] while it's on your back?")) return if(!parachute) //This packs the parachute H.visible_message("\The [H] starts to pack \the [src]!", \ - "You start to pack \the [src]!", \ + span_notice("You start to pack \the [src]!"), \ "You hear the shuffling of cloth.") if(do_after(H, 50)) H.visible_message("\The [H] finishes packing \the [src]!", \ - "You finish packing \the [src]!", \ + span_notice("You finish packing \the [src]!"), \ "You hear the shuffling of cloth.") parachute = TRUE else H.visible_message("\The [src] gives up on packing \the [src]!", \ - "You give up on packing \the [src]!") + span_notice("You give up on packing \the [src]!")) return else //This unpacks the parachute H.visible_message("\The [src] starts to unpack \the [src]!", \ - "You start to unpack \the [src]!", \ + span_notice("You start to unpack \the [src]!"), \ "You hear the shuffling of cloth.") if(do_after(H, 25)) H.visible_message("\The [src] finishes unpacking \the [src]!", \ - "You finish unpacking \the [src]!", \ + span_notice("You finish unpacking \the [src]!"), \ "You hear the shuffling of cloth.") parachute = FALSE else H.visible_message("\The [src] decides not to unpack \the [src]!", \ - "You decide not to unpack \the [src]!") + span_notice("You decide not to unpack \the [src]!")) return /obj/item/storage/backpack/satchel/ranger @@ -549,4 +549,4 @@ desc = "A satchel designed for the Go Go ERT Rangers series to allow for slightly bigger carry capacity for the ERT-Rangers.\ Unlike the show claims, it is not a phoron-enhanced satchel of holding with plot-relevant content." icon = 'icons/obj/clothing/ranger.dmi' - icon_state = "ranger_satchel" \ No newline at end of file + icon_state = "ranger_satchel" diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index fba3e65d0f..9b089e106e 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -15,7 +15,7 @@ if(istype(H) && istype(H.tail_style, taurtype)) return 1 else - to_chat(H, "[no_message]") + to_chat(H, span_warning("[no_message]")) return 0 /* If anyone wants to make some... this is how you would. @@ -201,4 +201,3 @@ icon_override = 'icons/inventory/back/mob_vr.dmi' icon_state = "satchel_strapless" item_state_slots = null - diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index a388372e89..9a01c892be 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -138,7 +138,7 @@ /obj/item/storage/bag/ore/attackby(obj/item/W as obj, mob/user as mob) if(current_capacity >= max_storage_space) - to_chat(user, "\the [src] is too full to possibly fit anything else inside of it.") + to_chat(user, span_notice("\the [src] is too full to possibly fit anything else inside of it.")) return if (istype(W, /obj/item/ore)) @@ -186,13 +186,13 @@ success = 1 if(!silent) //Let's do a single check and then do more instead of a bunch at once. if(success && !failure && !max_pickup_reached) //Picked stuff up, did not reach capacity, did not reach max_pickup. - to_chat(user, "You put everything in [src].") + to_chat(user, span_notice("You put everything in [src].")) else if(success && failure) //Picked stuff up to capacity. - to_chat(user, "You fill the [src].") + to_chat(user, span_notice("You fill the [src].")) else if(success && max_pickup_reached) //Picked stuff up to the max_pickup - to_chat(user, "You fill the [src] with as much as you can grab in one go.") + to_chat(user, span_notice("You fill the [src] with as much as you can grab in one go.")) else //Failed. The bag is full. - to_chat(user, "You fail to pick anything up with \the [src].") + to_chat(user, span_notice("You fail to pick anything up with \the [src].")) if(istype(user.pulling, /obj/structure/ore_box)) //Bit of a crappy way to do this, as it doubles spam for the user, but it works. //Then let me fix it. ~CL. var/obj/structure/ore_box/OB = user.pulling for(var/ore in stored_ore) @@ -236,11 +236,11 @@ if(istype(user, /mob/living)) add_fingerprint(user) - . += "It holds:" + . += span_notice("It holds:") var/has_ore = 0 for(var/ore in stored_ore) if(stored_ore[ore] > 0) - . += "- [stored_ore[ore]] [ore]" + . += span_notice("- [stored_ore[ore]] [ore]") has_ore = 1 if(!has_ore) . += "Nothing." @@ -295,7 +295,7 @@ current += S.get_amount() if(capacity == current)//If it's full, you're done if(!stop_messages) - to_chat(usr, "The snatcher is full.") + to_chat(usr, span_warning("The snatcher is full.")) return 0 return 1 diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 63ab48a932..4412b8af01 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -20,7 +20,7 @@ set category = "Object" if(show_above_suit == -1) - to_chat(usr, "\The [src] cannot be worn above your suit!") + to_chat(usr, span_notice("\The [src] cannot be worn above your suit!")) return show_above_suit = !show_above_suit update_icon() diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index fd5d3dab18..80cfb13338 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -65,7 +65,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list( name = user.mind.my_religion.bible_name icon_state = user.mind.my_religion.bible_icon_state item_state = user.mind.my_religion.bible_item_state - to_chat(user, "You invoke [user.mind.my_religion.deity] and prepare a copy of [src].") + to_chat(user, span_notice("You invoke [user.mind.my_religion.deity] and prepare a copy of [src].")) /** * Checks if we are allowed to interact with a radial menu @@ -104,7 +104,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list( if(!proximity) return if(user.mind && (user.mind.assigned_role == JOB_CHAPLAIN)) if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder - to_chat(user, "You bless [A].") + to_chat(user, span_notice("You bless [A].")) var/water2holy = A.reagents.get_reagent_amount("water") A.reagents.del_reagent("water") A.reagents.add_reagent("holywater",water2holy) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 3cf925ae02..aff573cd16 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -52,7 +52,7 @@ if (!found) // User is too far away return // Now make the cardboard - to_chat(user, "You fold [src] flat.") + to_chat(user, span_notice("You fold [src] flat.")) playsound(src, 'sound/items/storage/boxfold.ogg', 30, 1) new foldable(get_turf(src)) qdel(src) @@ -369,7 +369,7 @@ if(istype(W) && !W.lit && !W.burnt) if(prob(25)) W.light(user) - user.visible_message("[user] manages to light the match on the matchbox.") + user.visible_message(span_notice("[user] manages to light the match on the matchbox.")) else playsound(src, 'sound/items/cigs_lighters/matchstick_hit.ogg', 25, 0, -1) W.update_icon() diff --git a/code/game/objects/items/weapons/storage/egg_vr.dm b/code/game/objects/items/weapons/storage/egg_vr.dm index 31992530ba..1669121be7 100644 --- a/code/game/objects/items/weapons/storage/egg_vr.dm +++ b/code/game/objects/items/weapons/storage/egg_vr.dm @@ -27,7 +27,7 @@ ..() /obj/item/storage/vore_egg/proc/hatch(mob/living/user as mob) - visible_message("\The [src] begins to shake as something pushes out from within!") + visible_message(span_danger("\The [src] begins to shake as something pushes out from within!")) animate_shake() if(do_after(user, 50)) if(use_sound) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 259f0c111a..f7056d0a63 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -312,7 +312,7 @@ var/obj/item/clothing/mask/smokable/cigarette/cig = locate() in src if(cig == null) - to_chat(user, "Looks like the packet is out of cigarettes.") + to_chat(user, span_notice("Looks like the packet is out of cigarettes.")) return // Instead of running equip_to_slot_if_possible() we check here first, @@ -326,7 +326,7 @@ user.equip_to_slot(cig, slot_wear_mask) reagents.maximum_volume = 15 * contents.len - to_chat(user, "You take a cigarette out of the pack.") + to_chat(user, span_notice("You take a cigarette out of the pack.")) update_icon() else ..() diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 55bab838d5..841f55cb22 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -73,7 +73,7 @@ name = "oxygen deprivation first aid kit" desc = "A box full of oxygen goodies." icon_state = "o2" - item_state_slots = list(slot_r_hand_str = "firstaid-o2", slot_l_hand_str = "firstaid-o2") + item_state_slots = list(slot_r_hand_str = "firstaid-o2", slot_l_hand_str = "firstaid-o2") starts_with = list( /obj/item/reagent_containers/pill/dexalin, /obj/item/reagent_containers/pill/dexalin, @@ -210,13 +210,13 @@ if(istype(W, /obj/item/pen) || istype(W, /obj/item/flashlight/pen)) var/tmp_label = sanitizeSafe(tgui_input_text(user, "Enter a label for [name]", "Label", label_text, MAX_NAME_LEN), MAX_NAME_LEN) if(length(tmp_label) > 50) - to_chat(user, "The label can be at most 50 characters long.") + to_chat(user, span_notice("The label can be at most 50 characters long.")) else if(length(tmp_label) > 10) - to_chat(user, "You set the label.") + to_chat(user, span_notice("You set the label.")) label_text = tmp_label update_name_label() else - to_chat(user, "You set the label to \"[tmp_label]\".") + to_chat(user, span_notice("You set the label to \"[tmp_label]\".")) label_text = tmp_label update_name_label() else diff --git a/code/game/objects/items/weapons/storage/laundry_basket.dm b/code/game/objects/items/weapons/storage/laundry_basket.dm index 5b41ea043c..17d20f0456 100644 --- a/code/game/objects/items/weapons/storage/laundry_basket.dm +++ b/code/game/objects/items/weapons/storage/laundry_basket.dm @@ -28,17 +28,17 @@ if (user.hand) temp = H.get_organ("l_hand") if(!temp) - to_chat(user, "You need two hands to pick this up!") + to_chat(user, span_warning("You need two hands to pick this up!")) return if(user.get_inactive_hand()) - to_chat(user, "You need your other hand to be empty") + to_chat(user, span_warning("You need your other hand to be empty")) return return ..() /obj/item/storage/laundry_basket/attack_self(mob/user as mob) var/turf/T = get_turf(user) - to_chat(user, "You dump the [src]'s contents onto \the [T].") + to_chat(user, span_notice("You dump the [src]'s contents onto \the [T].")) return ..() /obj/item/storage/laundry_basket/pickup(mob/user) diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index 83ec1637f9..5f3bd8210f 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -20,21 +20,21 @@ /obj/item/storage/lockbox/attackby(obj/item/W as obj, mob/user as mob) if (istype(W, /obj/item/card/id)) if(src.broken) - to_chat(user, "It appears to be broken.") + to_chat(user, span_warning("It appears to be broken.")) return if(src.allowed(user)) src.locked = !( src.locked ) if(src.locked) src.icon_state = src.icon_locked - to_chat(user, "You lock \the [src]!") + to_chat(user, span_notice("You lock \the [src]!")) close_all() return else src.icon_state = src.icon_closed - to_chat(user, "You unlock \the [src]!") + to_chat(user, span_notice("You unlock \the [src]!")) return else - to_chat(user, "Access Denied") + to_chat(user, span_warning("Access Denied")) else if(istype(W, /obj/item/melee/energy/blade)) if(emag_act(INFINITY, user, W, "The locker has been sliced open by [user] with an energy blade!", "You hear metal being sliced and sparks flying.")) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() @@ -45,13 +45,13 @@ if(!locked) ..() else - to_chat(user, "It's locked!") + to_chat(user, span_warning("It's locked!")) return /obj/item/storage/lockbox/show_to(mob/user as mob) if(locked) - to_chat(user, "It's locked!") + to_chat(user, span_warning("It's locked!")) else ..() return @@ -59,13 +59,13 @@ /obj/item/storage/lockbox/emag_act(var/remaining_charges, var/mob/user, var/emag_source, var/visual_feedback = "", var/audible_feedback = "") if(!broken) if(visual_feedback) - visual_feedback = "[visual_feedback]" + visual_feedback = span_warning("[visual_feedback]") else - visual_feedback = "The locker has been sliced open by [user] with an electromagnetic card!" + visual_feedback = span_warning("The locker has been sliced open by [user] with an electromagnetic card!") if(audible_feedback) - audible_feedback = "[audible_feedback]" + audible_feedback = span_warning("[audible_feedback]") else - audible_feedback = "You hear a faint electrical spark." + audible_feedback = span_warning("You hear a faint electrical spark.") broken = 1 locked = 0 diff --git a/code/game/objects/items/weapons/storage/mre.dm b/code/game/objects/items/weapons/storage/mre.dm index d100aaaa05..5209591cf6 100644 --- a/code/game/objects/items/weapons/storage/mre.dm +++ b/code/game/objects/items/weapons/storage/mre.dm @@ -36,7 +36,7 @@ MRE Stuff /obj/item/storage/mre/open(mob/user) if(!opened) - to_chat(usr, "You tear open the bag, breaking the vacuum seal.") + to_chat(usr, span_notice("You tear open the bag, breaking the vacuum seal.")) opened = 1 update_icon() . = ..() @@ -236,7 +236,7 @@ MRE Stuff /obj/item/storage/mrebag/open(mob/user) if(!opened && !isobserver(user)) - to_chat(usr, "The pouch heats up as you break the vacuum seal.") + to_chat(usr, span_notice("The pouch heats up as you break the vacuum seal.")) opened = 1 update_icon() . = ..() diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 06dfbc7251..54007da3cf 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -47,22 +47,22 @@ if (do_after(user, 20 * W.toolspeed)) src.open =! src.open playsound(src, W.usesound, 50, 1) - user.show_message(text("You [] the service panel.", (src.open ? "open" : "close"))) + user.show_message(span_notice("You [src.open ? "open" : "close"] the service panel.")) return if (istype(W, /obj/item/multitool) && (src.open == 1)&& (!src.l_hacking)) - user.show_message("Now attempting to reset internal memory, please hold.", 1) + user.show_message(span_notice("Now attempting to reset internal memory, please hold."), 1) src.l_hacking = 1 if (do_after(usr, 100)) if (prob(40)) src.l_setshort = 1 src.l_set = 0 src.code = "" - user.show_message("Internal memory reset. Please give it a few seconds to reinitialize.", 1) + user.show_message(span_notice("Internal memory reset. Please give it a few seconds to reinitialize."), 1) sleep(80) src.l_setshort = 0 src.l_hacking = 0 else - user.show_message("Unable to reset internal memory.", 1) + user.show_message(span_warning("Unable to reset internal memory."), 1) src.l_hacking = 0 else src.l_hacking = 0 return @@ -82,7 +82,7 @@ /obj/item/storage/secure/AltClick(mob/user as mob) if (isliving(user) && Adjacent(user) && (src.locked == 1)) - to_chat(user, "[src] is locked and cannot be opened!") + to_chat(user, span_warning("[src] is locked and cannot be opened!")) else if (isliving(user) && Adjacent(user) && (!src.locked)) src.open(usr) else @@ -170,7 +170,7 @@ /obj/item/storage/secure/briefcase/attack_hand(mob/user as mob) if ((src.loc == user) && (src.locked == 1)) - to_chat(user, "[src] is locked and cannot be opened!") + to_chat(user, span_warning("[src] is locked and cannot be opened!")) else if ((src.loc == user) && (!src.locked)) src.open(usr) else diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 1080b2ae57..d6770d73a9 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -443,24 +443,24 @@ return 0 //Means the item is already in the storage item if(storage_slots != null && contents.len >= storage_slots) if(!stop_messages) - to_chat(usr, "[src] is full, make some space.") + to_chat(usr, span_notice("[src] is full, make some space.")) return 0 //Storage item is full if(LAZYLEN(can_hold) && !is_type_in_list(W, can_hold)) if(!stop_messages) if (istype(W, /obj/item/hand_labeler)) return 0 - to_chat(usr, "[src] cannot hold [W].") + to_chat(usr, span_notice("[src] cannot hold [W].")) return 0 if(LAZYLEN(cant_hold) && is_type_in_list(W, cant_hold)) if(!stop_messages) - to_chat(usr, "[src] cannot hold [W].") + to_chat(usr, span_notice("[src] cannot hold [W].")) return 0 if (max_w_class != null && W.w_class > max_w_class) if(!stop_messages) - to_chat(usr, "[W] is too long for \the [src].") + to_chat(usr, span_notice("[W] is too long for \the [src].")) return 0 var/total_storage_space = W.get_storage_cost() @@ -469,12 +469,12 @@ if(total_storage_space > max_storage_space) if(!stop_messages) - to_chat(usr, "[src] is too full, make some space.") + to_chat(usr, span_notice("[src] is too full, make some space.")) return 0 if(W.w_class >= src.w_class && (istype(W, /obj/item/storage))) if(!stop_messages) - to_chat(usr, "[src] cannot hold [W] as it's a storage item of the same size.") + to_chat(usr, span_notice("[src] cannot hold [W] as it's a storage item of the same size.")) return 0 //To prevent the stacking of same sized storage items. return 1 @@ -501,11 +501,11 @@ if(!prevent_warning) for(var/mob/M in viewers(usr, null)) if (M == usr) - to_chat(usr, "You put \the [W] into [src].") + to_chat(usr, span_notice("You put \the [W] into [src].")) else if (M in range(1)) //If someone is standing close enough, they can tell what it is... - M.show_message("\The [usr] puts [W] into [src].") + M.show_message(span_notice("\The [usr] puts [W] into [src].")) else if (W && W.w_class >= 3) //Otherwise they can only see large or normal items from a distance... - M.show_message("\The [usr] puts [W] into [src].") + M.show_message(span_notice("\The [usr] puts [W] into [src].")) src.orient2hud(usr) if(usr.s_active) @@ -592,14 +592,14 @@ var/obj/item/tray/T = W if(T.calc_carry() > 0) if(prob(85)) - to_chat(user, "The tray won't fit in [src].") + to_chat(user, span_warning("The tray won't fit in [src].")) return else W.forceMove(get_turf(user)) if ((user.client && user.s_active != src)) user.client.screen -= W W.dropped(user) - to_chat(user, "God damn it!") + to_chat(user, span_warning("God damn it!")) W.add_fingerprint(user) return handle_item_insertion(W) @@ -644,11 +644,11 @@ success = 1 handle_item_insertion(I, 1) //The 1 stops the "You put the [src] into [S]" insertion message from being displayed. if(success && !failure) - to_chat(user, "You put everything in [src].") + to_chat(user, span_notice("You put everything in [src].")) else if(success) - to_chat(user, "You put some things in [src].") + to_chat(user, span_notice("You put some things in [src].")) else - to_chat(user, "You fail to pick anything up with \the [src].") + to_chat(user, span_notice("You fail to pick anything up with \the [src].")) /obj/item/storage/verb/toggle_gathering_mode() set name = "Switch Gathering Method" @@ -828,7 +828,7 @@ . = ..() if(open && contents.len) var/display_item = contents[1] - . += "\The [src] contains \the [display_item]!" + . += span_notice("\The [src] contains \the [display_item]!") /obj/item/storage/AllowDrop() return TRUE @@ -897,5 +897,5 @@ // Scoop and insert target into storage var/obj/item/holder/H = new user.holder_type(get_turf(user), user) src.handle_item_insertion(H, 1) - to_chat(user, "You climb into \the [src].") + to_chat(user, span_notice("You climb into \the [src].")) return ..() diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index e6556c464d..eedb93e180 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -103,7 +103,7 @@ ..() if(status && grip_safety && !taped_safety) status = 0 - visible_message("\The [src]'s grip safety engages!") + visible_message(span_warning("\The [src]'s grip safety engages!")) update_icon() /obj/item/melee/baton/examine(mob/user) @@ -111,11 +111,11 @@ if(Adjacent(user)) if(taped_safety) - . += "Someone has wrapped tape around the grip!" + . += span_warning("Someone has wrapped tape around the grip!") if(bcell) - . += "The baton is [round(bcell.percent())]% charged." + . += span_notice("The baton is [round(bcell.percent())]% charged.") if(!bcell) - . += "The baton does not have a power source installed." + . += span_warning("The baton does not have a power source installed.") /obj/item/melee/baton/attackby(obj/item/W, mob/user) if(use_external_power) @@ -126,22 +126,22 @@ user.drop_item() W.loc = src bcell = W - to_chat(user, "You install a cell in [src].") + to_chat(user, span_notice("You install a cell in [src].")) update_icon() else - to_chat(user, "[src] already has a cell.") + to_chat(user, span_notice("[src] already has a cell.")) else - to_chat(user, "This cell is not fitted for [src].") + to_chat(user, span_notice("This cell is not fitted for [src].")) if(istype(W, /obj/item/tape_roll) || istype(W, /obj/item/taperoll)) if(grip_safety && !taped_safety) //no point letting people wrap tape around the grips of batons without a safety - to_chat(user, "You firmly wrap tape around the baton's grip, disabling the safety system.") + to_chat(user, span_notice("You firmly wrap tape around the baton's grip, disabling the safety system.")) playsound(src, 'sound/effects/tape.ogg',25) taped_safety = TRUE else if(grip_safety && taped_safety) - to_chat(user, "The grip safety has already been taped down.") + to_chat(user, span_notice("The grip safety has already been taped down.")) if(istype(W, /obj/item/tool/screwdriver)) if(taped_safety) - to_chat(user, "You painstakingly scrape away the tape over the grip safety.") + to_chat(user, span_notice("You painstakingly scrape away the tape over the grip safety.")) taped_safety = FALSE /obj/item/melee/baton/attack_hand(mob/user as mob) @@ -150,7 +150,7 @@ bcell.update_icon() user.put_in_hands(bcell) bcell = null - to_chat(user, "You remove the cell from the [src].") + to_chat(user, span_notice("You remove the cell from the [src].")) status = 0 update_icon() return @@ -166,20 +166,20 @@ bcell = R.cell if(bcell && bcell.charge >= hitcost) status = !status - to_chat(user, "[src] is now [status ? "on" : "off"].") + to_chat(user, span_notice("[src] is now [status ? "on" : "off"].")) playsound(src, "sparks", 75, 1, -1) update_icon() else status = 0 if(!bcell) - to_chat(user, "[src] does not have a power source!") + to_chat(user, span_warning("[src] does not have a power source!")) else - to_chat(user, "[src] is out of charge.") + to_chat(user, span_warning("[src] is out of charge.")) add_fingerprint(user) /obj/item/melee/baton/attack(mob/M, mob/user) if(status && (CLUMSY in user.mutations) && prob(50)) - to_chat(user, "You accidentally hit yourself with the [src]!") + to_chat(user, span_danger("You accidentally hit yourself with the [src]!")) user.Weaken(30) deductcharge(hitcost) return @@ -204,14 +204,14 @@ stun *= 0.5 else if(!status) if(affecting) - target.visible_message("[target] has been prodded in the [affecting.name] with [src] by [user]. Luckily it was off.") + target.visible_message(span_warning("[target] has been prodded in the [affecting.name] with [src] by [user]. Luckily it was off.")) else - target.visible_message("[target] has been prodded with [src] by [user]. Luckily it was off.") + target.visible_message(span_warning("[target] has been prodded with [src] by [user]. Luckily it was off.")) else if(affecting) - target.visible_message("[target] has been prodded in the [affecting.name] with [src] by [user]!") + target.visible_message(span_danger("[target] has been prodded in the [affecting.name] with [src] by [user]!")) else - target.visible_message("[target] has been prodded with [src] by [user]!") + target.visible_message(span_danger("[target] has been prodded with [src] by [user]!")) playsound(src, 'sound/weapons/Egloves.ogg', 50, 1, -1) //stun effects @@ -256,12 +256,12 @@ user.drop_item() W.loc = src bcell = W - to_chat(user, "You install a cell in [src].") + to_chat(user, span_notice("You install a cell in [src].")) update_icon() else - to_chat(user, "[src] already has a cell.") + to_chat(user, span_notice("[src] already has a cell.")) else - to_chat(user, "This cell is not fitted for [src].") + to_chat(user, span_notice("This cell is not fitted for [src].")) /obj/item/melee/baton/get_description_interaction() var/list/results = list() @@ -294,4 +294,4 @@ // Borg version, for the lost module. /obj/item/melee/baton/shocker/robot - use_external_power = TRUE \ No newline at end of file + use_external_power = TRUE diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index bf2332149c..f6694c5778 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -31,7 +31,7 @@ /obj/item/melee/classic_baton/attack(mob/M as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) - to_chat(user, "You club yourself over the head.") + to_chat(user, span_warning("You club yourself over the head.")) user.Weaken(3 * force) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -58,8 +58,8 @@ /obj/item/melee/telebaton/attack_self(mob/user as mob) on = !on if(on) - user.visible_message("With a flick of their wrist, [user] extends their telescopic baton.",\ - "You extend the baton.",\ + user.visible_message(span_warning("With a flick of their wrist, [user] extends their telescopic baton."),\ + span_warning("You extend the baton."),\ "You hear an ominous click.") icon_state = "telebaton1" item_state = icon_state @@ -68,7 +68,7 @@ attack_verb = list("smacked", "struck", "slapped") else user.visible_message("\The [user] collapses their telescopic baton.",\ - "You collapse the baton.",\ + span_notice("You collapse the baton."),\ "You hear a click.") icon_state = "telebaton0" item_state = icon_state @@ -99,7 +99,7 @@ /obj/item/melee/telebaton/attack(mob/target as mob, mob/living/user as mob) if(on) if ((CLUMSY in user.mutations) && prob(50)) - to_chat(user, "You club yourself over the head.") + to_chat(user, span_warning("You club yourself over the head.")) user.Weaken(3 * force) if(ishuman(user)) var/mob/living/carbon/human/H = user diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm index 9e7eb8a8ef..b7fff933e2 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -86,27 +86,27 @@ lit = 1 icon_state = "[base_state]1" //item_state = "[base_state]on" - user.visible_message("Without even breaking stride, \the [user] flips open \the [src] in one smooth movement.") + user.visible_message(span_rose("Without even breaking stride, \the [user] flips open \the [src] in one smooth movement.")) else if(lit && detonator_mode) switch(tgui_alert(user, "What would you like to do?", "Lighter", list("Press the button.", "Close the lighter."))) if("Press the button.") - to_chat(user, "You press the button.") + to_chat(user, span_warning("You press the button.")) icon_state = "[base_state]click" if(src.bomb) src.bomb.detonate() log_admin("[key_name(user)] has triggered [src.bomb] with [src].") - message_admins("[key_name_admin(user)] has triggered [src.bomb] with [src].") + message_admins(span_danger("[key_name_admin(user)] has triggered [src.bomb] with [src].")) if("Close the lighter.") lit = 0 icon_state = "[base_state]" //item_state = "[base_state]" - user.visible_message("You hear a quiet click, as \the [user] shuts off \the [src] without even looking at what they're doing.") + user.visible_message(span_rose("You hear a quiet click, as \the [user] shuts off \the [src] without even looking at what they're doing.")) /obj/item/flame/lighter/zippo/c4detonator/attackby(obj/item/W, mob/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER)) detonator_mode = !detonator_mode playsound(src, W.usesound, 50, 1) - to_chat(user, "You unscrew the top panel of \the [src] revealing a button.") + to_chat(user, span_notice("You unscrew the top panel of \the [src] revealing a button.")) diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 3946c7e3b2..2400985b05 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -31,7 +31,7 @@ /obj/item/tank/jetpack/examine(mob/user) . = ..() if(air_contents.total_moles < 5) - . += "The meter on \the [src] indicates you are almost out of gas!" + . += span_danger("The meter on \the [src] indicates you are almost out of gas!") playsound(src, 'sound/effects/alert.ogg', 50, 1) /obj/item/tank/jetpack/verb/toggle_rockets() diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index caa31f0d85..9157aa3ea1 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -23,7 +23,7 @@ /obj/item/tank/oxygen/examine(mob/user) . = ..() if(loc == user && (air_contents.gas["oxygen"] < 10)) - . += "The meter on \the [src] indicates you are almost out of oxygen!" + . += span_warning("The meter on \the [src] indicates you are almost out of oxygen!") /obj/item/tank/oxygen/yellow desc = "A tank of oxygen, this one is yellow." @@ -59,7 +59,7 @@ /obj/item/tank/air/examine(mob/user) . = ..() if(loc == user && (air_contents.gas["oxygen"] < 1)) - . += "The meter on \the [src] indicates you are almost out of air!" + . += span_warning("The meter on \the [src] indicates you are almost out of air!") user << sound('sound/effects/alert.ogg') /obj/item/tank/air/Initialize() @@ -142,7 +142,7 @@ /obj/item/tank/emergency/oxygen/examine(mob/user) . = ..() if(loc == user && (air_contents.gas["oxygen"] < 0.2)) - . += "The meter on the [src.name] indicates you are almost out of air!" + . += span_danger("The meter on the [src.name] indicates you are almost out of air!") user << sound('sound/effects/alert.ogg') /obj/item/tank/emergency/oxygen/engi @@ -215,7 +215,7 @@ /obj/item/tank/nitrogen/examine(mob/user) . = ..() if(loc == user && (air_contents.gas["nitrogen"] < 10)) - . += "The meter on \the [src] indicates you are almost out of nitrogen!" + . += span_danger("The meter on \the [src] indicates you are almost out of nitrogen!") //playsound(user, 'sound/effects/alert.ogg', 50, 1) /obj/item/tank/stasis/nitro_cryo // Synthmorph bags need to have initial pressure within safe bounds for human atmospheric pressure, but low temperature to stop unwanted degredation. diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index ce08405684..d4885e9cd1 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -105,12 +105,12 @@ var/list/global/tank_gauge_cache = list() descriptive = "cold" else descriptive = "bitterly cold" - . += "\The [src] feels [descriptive]." + . += span_notice("\The [src] feels [descriptive].") if(src.proxyassembly.assembly || wired) - . += "It seems to have [wired? "some wires ": ""][wired && src.proxyassembly.assembly? "and ":""][src.proxyassembly.assembly ? "some sort of assembly ":""]attached to it." + . += span_warning("It seems to have [wired? "some wires ": ""][wired && src.proxyassembly.assembly? "and ":""][src.proxyassembly.assembly ? "some sort of assembly ":""]attached to it.") if(src.valve_welded) - . += "\The [src] emergency relief valve has been welded shut!" + . += span_warning("\The [src] emergency relief valve has been welded shut!") /obj/item/tank/attackby(obj/item/W as obj, mob/user as mob) @@ -127,17 +127,17 @@ var/list/global/tank_gauge_cache = list() var/obj/item/stack/cable_coil/C = W if(C.use(1)) wired = 1 - to_chat(user, "You attach the wires to the tank.") + to_chat(user, span_notice("You attach the wires to the tank.")) src.add_bomb_overlay() if(W.has_tool_quality(TOOL_WIRECUTTER)) if(wired && src.proxyassembly.assembly) - to_chat(user, "You carefully begin clipping the wires that attach to the tank.") + to_chat(user, span_notice("You carefully begin clipping the wires that attach to the tank.")) if(do_after(user, 100,src)) wired = 0 cut_overlay("bomb_assembly") - to_chat(user, "You cut the wire and remove the device.") + to_chat(user, span_notice("You cut the wire and remove the device.")) var/obj/item/assembly_holder/assy = src.proxyassembly.assembly if(assy.a_left && assy.a_right) @@ -156,55 +156,55 @@ var/list/global/tank_gauge_cache = list() update_gauge() else - to_chat(user, "You slip and bump the igniter!") + to_chat(user, span_danger("You slip and bump the igniter!")) if(prob(85)) src.proxyassembly.receive_signal() else if(wired) if(do_after(user, 10, src)) - to_chat(user, "You quickly clip the wire from the tank.") + to_chat(user, span_notice("You quickly clip the wire from the tank.")) wired = 0 cut_overlay("bomb_assembly") else - to_chat(user, "There are no wires to cut!") + to_chat(user, span_notice("There are no wires to cut!")) if(istype(W, /obj/item/assembly_holder)) if(wired) - to_chat(user, "You begin attaching the assembly to \the [src].") + to_chat(user, span_notice("You begin attaching the assembly to \the [src].")) if(do_after(user, 50, src)) - to_chat(user, "You finish attaching the assembly to \the [src].") + to_chat(user, span_notice("You finish attaching the assembly to \the [src].")) bombers += "[key_name(user)] attached an assembly to a wired [src]. Temp: [src.air_contents.temperature-T0C]" message_admins("[key_name_admin(user)] attached an assembly to a wired [src]. Temp: [src.air_contents.temperature-T0C]") assemble_bomb(W,user) else - to_chat(user, "You stop attaching the assembly.") + to_chat(user, span_notice("You stop attaching the assembly.")) else - to_chat(user, "You need to wire the device up first.") + to_chat(user, span_notice("You need to wire the device up first.")) if(istype(W, /obj/item/weldingtool)) var/obj/item/weldingtool/WT = W if(WT.remove_fuel(1,user)) if(!valve_welded) - to_chat(user, "You begin welding the \the [src] emergency pressure relief valve.") + to_chat(user, span_notice("You begin welding the \the [src] emergency pressure relief valve.")) if(do_after(user, 40,src)) - to_chat(user, "You carefully weld \the [src] emergency pressure relief valve shut. \The [src] may now rupture under pressure!") + to_chat(user, span_notice("You carefully weld \the [src] emergency pressure relief valve shut. \The [src] may now rupture under pressure!")) src.valve_welded = 1 src.leaking = 0 else bombers += "[key_name(user)] attempted to weld a [src]. [src.air_contents.temperature-T0C]" message_admins("[key_name_admin(user)] attempted to weld a [src]. [src.air_contents.temperature-T0C]") if(WT.welding) - to_chat(user, "You accidentally rake \the [W] across \the [src]!") + to_chat(user, span_danger("You accidentally rake \the [W] across \the [src]!")) maxintegrity -= rand(2,6) integrity = min(integrity,maxintegrity) src.air_contents.add_thermal_energy(rand(2000,50000)) WT.eyecheck(user) else - to_chat(user, "The emergency pressure relief valve has already been welded.") + to_chat(user, span_notice("The emergency pressure relief valve has already been welded.")) add_fingerprint(user) @@ -289,7 +289,7 @@ var/list/global/tank_gauge_cache = list() if(location.internal == src) location.internal = null location.internals.icon_state = "internal0" - to_chat(user, "You close the tank release valve.") + to_chat(user, span_notice("You close the tank release valve.")) if (location.internals) location.internals.icon_state = "internal0" else @@ -303,11 +303,11 @@ var/list/global/tank_gauge_cache = list() if(can_open_valve) location.internal = src - to_chat(user, "You open \the [src] valve.") + to_chat(user, span_notice("You open \the [src] valve.")) if (location.internals) location.internals.icon_state = "internal1" else - to_chat(user, "You need something to connect to \the [src].") + to_chat(user, span_warning("You need something to connect to \the [src].")) @@ -444,7 +444,7 @@ var/list/global/tank_gauge_cache = list() else if(pressure > TANK_RUPTURE_PRESSURE) #ifdef FIREDBG - log_debug("[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]") + log_debug(span_warning("[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]")) #endif air_contents.react() @@ -455,7 +455,7 @@ var/list/global/tank_gauge_cache = list() return T.assume_air(air_contents) playsound(src, 'sound/weapons/Gunshot_shotgun.ogg', 20, 1) - visible_message("[icon2html(src,viewers(src))] \The [src] flies apart!", "You hear a bang!") + visible_message("[icon2html(src,viewers(src))] \The [src] flies apart!", span_warning("You hear a bang!")) T.hotspot_expose(air_contents.temperature, 70, 1) @@ -504,7 +504,7 @@ var/list/global/tank_gauge_cache = list() playsound(src, 'sound/effects/spray.ogg', 10, 1, -3) leaking = 1 #ifdef FIREDBG - log_debug("[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]") + log_debug(span_warning("[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]")) #endif diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index 951501c70e..319250f2a1 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -24,24 +24,24 @@ if(user.a_intent == I_HELP) return if(!can_place(H, user)) - to_chat(user, "You need to have a firm grip on [H] before you can use \the [src]!") + to_chat(user, span_danger("You need to have a firm grip on [H] before you can use \the [src]!")) return else if(user.zone_sel.selecting == O_EYES) if(!H.organs_by_name[BP_HEAD]) - to_chat(user, "\The [H] doesn't have a head.") + to_chat(user, span_warning("\The [H] doesn't have a head.")) return if(!H.has_eyes()) - to_chat(user, "\The [H] doesn't have any eyes.") + to_chat(user, span_warning("\The [H] doesn't have any eyes.")) return if(H.glasses) - to_chat(user, "\The [H] is already wearing something on their eyes.") + to_chat(user, span_warning("\The [H] is already wearing something on their eyes.")) return if(H.head && (H.head.body_parts_covered & FACE)) - to_chat(user, "Remove their [H.head] first.") + to_chat(user, span_warning("Remove their [H.head] first.")) return - user.visible_message("\The [user] begins taping over \the [H]'s eyes!") + user.visible_message(span_danger("\The [user] begins taping over \the [H]'s eyes!")) if(!do_after(user, 30)) return @@ -52,25 +52,25 @@ if(!H || !src || !H.organs_by_name[BP_HEAD] || !H.has_eyes() || H.glasses || (H.head && (H.head.body_parts_covered & FACE))) return - user.visible_message("\The [user] has taped up \the [H]'s eyes!") + user.visible_message(span_danger("\The [user] has taped up \the [H]'s eyes!")) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/blindfold/tape(H), slot_glasses, ignore_obstructions = FALSE) H.update_inv_glasses() playsound(src, 'sound/effects/tape.ogg',25) else if(user.zone_sel.selecting == O_MOUTH || user.zone_sel.selecting == BP_HEAD) if(!H.organs_by_name[BP_HEAD]) - to_chat(user, "\The [H] doesn't have a head.") + to_chat(user, span_warning("\The [H] doesn't have a head.")) return if(!H.check_has_mouth()) - to_chat(user, "\The [H] doesn't have a mouth.") + to_chat(user, span_warning("\The [H] doesn't have a mouth.")) return if(H.wear_mask) - to_chat(user, "\The [H] is already wearing a mask.") + to_chat(user, span_warning("\The [H] is already wearing a mask.")) return if(H.head && (H.head.body_parts_covered & FACE)) - to_chat(user, "Remove their [H.head] first.") + to_chat(user, span_warning("Remove their [H.head] first.")) return - user.visible_message("\The [user] begins taping up \the [H]'s mouth!") + user.visible_message(span_danger("\The [user] begins taping up \the [H]'s mouth!")) if(!do_after(user, 30)) return @@ -81,7 +81,7 @@ if(!H || !src || !H.organs_by_name[BP_HEAD] || !H.check_has_mouth() || (H.head && (H.head.body_parts_covered & FACE))) return - user.visible_message("\The [user] has taped up \the [H]'s mouth!") + user.visible_message(span_danger("\The [user] has taped up \the [H]'s mouth!")) H.equip_to_slot_or_del(new /obj/item/clothing/mask/muzzle/tape(H), slot_wear_mask, ignore_obstructions = FALSE) H.update_inv_wear_mask() diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 515d09c0e7..fee09bb596 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -133,7 +133,7 @@ Frequency: /obj/item/hand_tele/attack_self(mob/user as mob) var/turf/current_location = get_turf(user)//What turf is the user on? if(!current_location || (current_location.z in using_map.admin_levels) || current_location.block_tele)//If turf was not found or they're on z level 2 or >7 which does not currently exist. - to_chat(user, "\The [src] is malfunctioning.") + to_chat(user, span_notice("\The [src] is malfunctioning.")) return var/list/L = list( ) for(var/obj/machinery/teleport/hub/R in machines) @@ -169,11 +169,11 @@ Frequency: for(var/obj/effect/portal/PO in all_portals) if(PO.creator == src) count++ if(count >= 3) - user.show_message("\The [src] is recharging!") + user.show_message(span_notice("\The [src] is recharging!")) return var/T = L[t1] for(var/mob/O in hearers(user, null)) - O.show_message("Locked In.", 2) + O.show_message(span_notice("Locked In."), 2) var/obj/effect/portal/P = new /obj/effect/portal( get_turf(src) ) P.target = T P.creator = src diff --git a/code/game/objects/items/weapons/tools/transforming.dm b/code/game/objects/items/weapons/tools/transforming.dm index 658ad9b227..e7f52b6dbf 100644 --- a/code/game/objects/items/weapons/tools/transforming.dm +++ b/code/game/objects/items/weapons/tools/transforming.dm @@ -59,7 +59,7 @@ tool_qualities = list(TOOL_CROWBAR) if(user) playsound(src, 'sound/items/change_jaws.ogg', 50, 1) - to_chat(user, "You attach the pry jaws to [src].") + to_chat(user, span_notice("You attach the pry jaws to [src].")) if(TOOL_WIRECUTTER) desc = initial(desc) + " It's fitted with a cutting head." icon_state = "jaws_cutter" @@ -68,7 +68,7 @@ tool_qualities = list(TOOL_WIRECUTTER) if(user) playsound(src, 'sound/items/change_jaws.ogg', 50, 1) - to_chat(user, "You attach the cutting jaws to [src].") + to_chat(user, span_notice("You attach the cutting jaws to [src].")) /obj/item/tool/transforming/powerdrill name = "hand drill" @@ -97,7 +97,7 @@ tool_qualities = list(TOOL_WRENCH) if(user) playsound(src,'sound/items/change_drill.ogg',50,1) - to_chat(user, "You attach the bolt driver to [src].") + to_chat(user, span_notice("You attach the bolt driver to [src].")) if(TOOL_SCREWDRIVER) desc = initial(desc) + " It's fitted with a screw driver." icon_state = "drill_screw" @@ -105,7 +105,7 @@ tool_qualities = list(TOOL_SCREWDRIVER) if(user) playsound(src,'sound/items/change_drill.ogg',50,1) - to_chat(user, "You attach the screw driver to [src].") + to_chat(user, span_notice("You attach the screw driver to [src].")) /obj/item/tool/transforming/altevian name = "Hull Systems Omni-Tool" @@ -137,7 +137,7 @@ tool_qualities = list(TOOL_WRENCH) if(user) playsound(src,'sound/items/ratchet.ogg',50,1) - to_chat(user, "You reconfigure [src] into bolting mode.") + to_chat(user, span_notice("You reconfigure [src] into bolting mode.")) if(TOOL_CROWBAR) desc = initial(desc) + " It's currently in prying mode." icon_state = "altevian-crowbar" @@ -145,7 +145,7 @@ tool_qualities = list(TOOL_CROWBAR) if(user) playsound(src,'sound/items/ratchet.ogg',50,1) - to_chat(user, "You reconfigure [src] into prying mode.") + to_chat(user, span_notice("You reconfigure [src] into prying mode.")) if(TOOL_WIRECUTTER) desc = initial(desc) + " It's currently in cutting mode." icon_state = "altevian-wirecutter" @@ -153,7 +153,7 @@ tool_qualities = list(TOOL_WIRECUTTER) if(user) playsound(src,'sound/items/ratchet.ogg',50,1) - to_chat(user, "You reconfigure [src] into cutting mode.") + to_chat(user, span_notice("You reconfigure [src] into cutting mode.")) if(TOOL_SCREWDRIVER) desc = initial(desc) + " It's currently in screwing mode." icon_state = "altevian-screwdriver" @@ -161,7 +161,7 @@ tool_qualities = list(TOOL_SCREWDRIVER) if(user) playsound(src,'sound/items/ratchet.ogg',50,1) - to_chat(user, "You reconfigure [src] into screwing mode.") + to_chat(user, span_notice("You reconfigure [src] into screwing mode.")) if(TOOL_MULTITOOL) desc = initial(desc) + " It's currently in pulsing mode." icon_state = "altevian-pulser" @@ -169,7 +169,7 @@ tool_qualities = list(TOOL_MULTITOOL) if(user) playsound(src,'sound/items/ratchet.ogg',50,1) - to_chat(user, "You reconfigure [src] into pulsing mode.") + to_chat(user, span_notice("You reconfigure [src] into pulsing mode.")) if(TOOL_WELDER) desc = initial(desc) + " It's currently in welding mode." icon_state = "altevian-welder-on" @@ -178,7 +178,7 @@ tool_qualities = list(TOOL_WELDER) if(user) playsound(src,'sound/items/ratchet.ogg',50,1) - to_chat(user, "You reconfigure [src] into welding mode.") + to_chat(user, span_notice("You reconfigure [src] into welding mode.")) /obj/item/weldingtool/dummy/altevian toolspeed = 0.25 diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm index 27146a88d1..7dd1a562b5 100644 --- a/code/game/objects/items/weapons/tools/weldingtool.dm +++ b/code/game/objects/items/weapons/tools/weldingtool.dm @@ -82,15 +82,15 @@ if(S.organ_tag == BP_HEAD) if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space)) - to_chat(user, "You can't apply [src] through [H.head]!") + to_chat(user, span_warning("You can't apply [src] through [H.head]!")) return TRUE else if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space)) - to_chat(user, "You can't apply [src] through [H.wear_suit]!") + to_chat(user, span_warning("You can't apply [src] through [H.wear_suit]!")) return TRUE if(!welding) - to_chat(user, "You'll need to turn [src] on to patch the damage on [H]'s [S.name]!") + to_chat(user, span_warning("You'll need to turn [src] on to patch the damage on [H]'s [S.name]!")) return TRUE if(S.robo_repair(15, BRUTE, "some dents", src, user)) @@ -104,13 +104,13 @@ /obj/item/weldingtool/attackby(obj/item/W as obj, mob/living/user as mob) if(istype(W,/obj/item/tool/screwdriver)) if(welding) - to_chat(user, "Stop welding first!") + to_chat(user, span_danger("Stop welding first!")) return status = !status if(status) - to_chat(user, "You secure the welder.") + to_chat(user, span_notice("You secure the welder.")) else - to_chat(user, "The welder can now be attached and modified.") + to_chat(user, span_notice("The welder can now be attached and modified.")) src.add_fingerprint(user) return @@ -159,16 +159,16 @@ if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1) if(!welding && max_fuel) O.reagents.trans_to_obj(src, max_fuel) - to_chat(user, "Welder refueled") + to_chat(user, span_notice("Welder refueled")) playsound(src, 'sound/effects/refill.ogg', 50, 1, -6) return else if(!welding) - to_chat(user, "[src] doesn't use fuel.") + to_chat(user, span_notice("[src] doesn't use fuel.")) return else message_admins("[key_name_admin(user)] triggered a fueltank explosion with a welding tool.") log_game("[key_name(user)] triggered a fueltank explosion with a welding tool.") - to_chat(user, "You begin welding on the fueltank and with a moment of lucidity you realize, this might not have been the smartest thing you've ever done.") + to_chat(user, span_danger("You begin welding on the fueltank and with a moment of lucidity you realize, this might not have been the smartest thing you've ever done.")) var/obj/structure/reagent_dispensers/fueltank/tank = O tank.explode() return @@ -204,7 +204,7 @@ return 1 else if(M) - to_chat(M, "You need more welding fuel to complete this task.") + to_chat(M, span_notice("You need more welding fuel to complete this task.")) update_icon() return 0 @@ -282,9 +282,9 @@ if(set_welding && !welding) if (get_fuel() > 0) if(M) - to_chat(M, "You switch the [src] on.") + to_chat(M, span_notice("You switch the [src] on.")) else if(T) - T.visible_message("\The [src] turns on.") + T.visible_message(span_danger("\The [src] turns on.")) playsound(src, acti_sound, 50, 1) src.force = 15 src.damtype = "fire" @@ -297,16 +297,16 @@ else if(M) var/msg = max_fuel ? "welding fuel" : "charge" - to_chat(M, "You need more [msg] to complete this task.") + to_chat(M, span_notice("You need more [msg] to complete this task.")) return //Otherwise else if(!set_welding && welding) if(!always_process) STOP_PROCESSING(SSobj, src) if(M) - to_chat(M, "You switch \the [src] off.") + to_chat(M, span_notice("You switch \the [src] off.")) else if(T) - T.visible_message("\The [src] turns off.") + T.visible_message(span_warning("\The [src] turns off.")) playsound(src, deac_sound, 50, 1) src.force = 3 src.damtype = "brute" @@ -330,29 +330,29 @@ if(H.nif && H.nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) return //VOREStation Add - NIF switch(safety) if(1) - to_chat(usr, "Your eyes sting a little.") + to_chat(usr, span_warning("Your eyes sting a little.")) E.damage += rand(1, 2) if(E.damage > 12) user.eye_blurry += rand(3,6) if(0) - to_chat(usr, "Your eyes burn.") + to_chat(usr, span_warning("Your eyes burn.")) E.damage += rand(2, 4) if(E.damage > 10) E.damage += rand(4,10) if(-1) - to_chat(usr, "Your thermals intensify the welder's glow. Your eyes itch and burn severely.") + to_chat(usr, span_danger("Your thermals intensify the welder's glow. Your eyes itch and burn severely.")) user.eye_blurry += rand(12,20) E.damage += rand(12, 16) if(safety<2) if(E.damage > 10) - to_chat(user, "Your eyes are really starting to hurt. This can't be good for you!") + to_chat(user, span_warning("Your eyes are really starting to hurt. This can't be good for you!")) if (E.damage >= E.min_broken_damage) - to_chat(user, "You go blind!") + to_chat(user, span_danger("You go blind!")) user.sdisabilities |= BLIND else if (E.damage >= E.min_bruised_damage) - to_chat(user, "You go blind!") + to_chat(user, span_danger("You go blind!")) user.Blind(5) user.eye_blurry = 5 // Don't cure being nearsighted @@ -528,7 +528,7 @@ ..() if(src.loc != user) mounted_pack.return_nozzle() - to_chat(user, "\The [src] retracts to its fueltank.") + to_chat(user, span_notice("\The [src] retracts to its fueltank.")) /obj/item/weldingtool/tubefed/survival name = "tube-fed emergency welding tool" @@ -614,7 +614,7 @@ return 1 else if(M) - to_chat(M, "You need more energy to complete this task.") + to_chat(M, span_notice("You need more energy to complete this task.")) update_icon() return 0 @@ -624,7 +624,7 @@ power_supply.update_icon() user.put_in_hands(power_supply) power_supply = null - to_chat(user, "You remove the cell from the [src].") + to_chat(user, span_notice("You remove the cell from the [src].")) setWelding(0) update_icon() return @@ -639,12 +639,12 @@ user.drop_item() W.loc = src power_supply = W - to_chat(user, "You install a cell in \the [src].") + to_chat(user, span_notice("You install a cell in \the [src].")) update_icon() else - to_chat(user, "\The [src] already has a cell.") + to_chat(user, span_notice("\The [src] already has a cell.")) else - to_chat(user, "\The [src] cannot use that type of cell.") + to_chat(user, span_notice("\The [src] cannot use that type of cell.")) else ..() diff --git a/code/game/objects/items/weapons/towels.dm b/code/game/objects/items/weapons/towels.dm index 110d2a69fd..cb784c89e2 100644 --- a/code/game/objects/items/weapons/towels.dm +++ b/code/game/objects/items/weapons/towels.dm @@ -22,7 +22,7 @@ sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/belt/mob_teshari.dmi') /obj/item/towel/attack_self(mob/living/user as mob) - user.visible_message(text("[] uses [] to towel themselves off.", user, src)) + user.visible_message(span_notice("[user] uses [src] to towel themselves off.")) playsound(src, 'sound/weapons/towelwipe.ogg', 25, 1) if(user.fire_stacks > 0) user.fire_stacks = (max(0, user.fire_stacks - 1.5)) diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index 9221a2dc73..d7f15cc7d6 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -29,15 +29,15 @@ ..() if(!deployed && can_use(user)) user.visible_message( - "[user] starts to deploy \the [src].", - "You begin deploying \the [src]!", + span_danger("[user] starts to deploy \the [src]."), + span_danger("You begin deploying \the [src]!"), "You hear the slow creaking of a spring." ) if (do_after(user, 60)) user.visible_message( - "[user] has deployed \the [src].", - "You have deployed \the [src]!", + span_danger("[user] has deployed \the [src]."), + span_danger("You have deployed \the [src]!"), "You hear a latch click loudly." ) playsound(src, 'sound/machines/click.ogg',70, 1) @@ -51,26 +51,26 @@ if(has_buckled_mobs() && can_use(user)) var/victim = english_list(buckled_mobs) user.visible_message( - "[user] begins freeing [victim] from \the [src].", - "You carefully begin to free [victim] from \the [src].", + span_notice("[user] begins freeing [victim] from \the [src]."), + span_notice("You carefully begin to free [victim] from \the [src]."), ) if(do_after(user, 60)) - user.visible_message("[victim] has been freed from \the [src] by [user].") + user.visible_message(span_notice("[victim] has been freed from \the [src] by [user].")) for(var/A in buckled_mobs) unbuckle_mob(A) anchored = FALSE else if(deployed && can_use(user)) user.visible_message( - "[user] starts to disarm \the [src].", - "You begin disarming \the [src]!", + span_danger("[user] starts to disarm \the [src]."), + span_notice("You begin disarming \the [src]!"), "You hear a latch click followed by the slow creaking of a spring." ) playsound(src, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 60)) user.visible_message( - "[user] has disarmed \the [src].", - "You have disarmed \the [src]!" + span_danger("[user] has disarmed \the [src]."), + span_notice("You have disarmed \the [src]!") ) deployed = 0 anchored = FALSE @@ -103,7 +103,7 @@ var/mob/living/carbon/human/H = L var/obj/item/organ/external/affected = H.get_organ(check_zone(target_zone)) if(!affected) // took it clean off! - to_chat(H, "The steel jaws of \the [src] take your limb clean off!") + to_chat(H, span_danger("The steel jaws of \the [src] take your limb clean off!")) L.Stun(stun_length*2) deployed = 0 anchored = FALSE @@ -114,7 +114,7 @@ can_buckle = TRUE buckle_mob(L) L.Stun(stun_length) - to_chat(L, "The steel jaws of \the [src] bite into you, trapping you in place!") + to_chat(L, span_danger("The steel jaws of \the [src] bite into you, trapping you in place!")) deployed = 0 anchored = FALSE can_buckle = initial(can_buckle) @@ -126,8 +126,8 @@ var/mob/living/L = AM if(L.m_intent == "run") L.visible_message( - "[L] steps on \the [src].", - "You step on \the [src]!", + span_danger("[L] steps on \the [src]."), + span_danger("You step on \the [src]!"), "You hear a loud metallic snap!" ) attack_mob(L) @@ -194,16 +194,16 @@ /obj/item/material/barbedwire/attack_hand(mob/user as mob) if(anchored && can_use(user)) user.visible_message( - "[user] starts to collect \the [src].", - "You begin collecting \the [src]!", + span_danger("[user] starts to collect \the [src]."), + span_notice("You begin collecting \the [src]!"), "You hear the sound of rustling [material.name]." ) playsound(src, 'sound/machines/click.ogg', 50, 1) if(do_after(user, health)) user.visible_message( - "[user] has collected \the [src].", - "You have collected \the [src]!" + span_danger("[user] has collected \the [src]."), + span_notice("You have collected \the [src]!") ) anchored = FALSE update_icon() @@ -214,15 +214,15 @@ ..() if(!anchored && can_use(user)) user.visible_message( - "[user] starts to deploy \the [src].", - "You begin deploying \the [src]!", + span_danger("[user] starts to deploy \the [src]."), + span_danger("You begin deploying \the [src]!"), "You hear the rustling of [material.name]." ) if (do_after(user, 60)) user.visible_message( - "[user] has deployed \the [src].", - "You have deployed \the [src]!", + span_danger("[user] has deployed \the [src]."), + span_danger("You have deployed \the [src]!"), "You hear the rustling of [material.name]." ) playsound(src, 'sound/items/Wirecutter.ogg',70, 1) @@ -273,8 +273,8 @@ var/mob/living/L = AM if(L.m_intent == "run") L.visible_message( - "[L] steps in \the [src].", - "You step in \the [src]!", + span_danger("[L] steps in \the [src]."), + span_danger("You step in \the [src]!"), "You hear a sharp rustling!" ) attack_mob(L) @@ -366,7 +366,7 @@ if(H.species.flags & NO_MINOR_CUT) return - to_chat(H, "You step directly on \the [src]!") + to_chat(H, span_danger("You step directly on \the [src]!")) var/list/check = list("l_foot", "r_foot") while(check.len) diff --git a/code/game/objects/items/weapons/trays.dm b/code/game/objects/items/weapons/trays.dm index 5c4e1bb49f..1149d2f3ec 100644 --- a/code/game/objects/items/weapons/trays.dm +++ b/code/game/objects/items/weapons/trays.dm @@ -32,7 +32,7 @@ if((CLUMSY in user.mutations) && prob(50)) //What if he's a clown? - to_chat(M, "You accidentally slam yourself with the [src]!") + to_chat(M, span_warning("You accidentally slam yourself with the [src]!")) M.Weaken(1) user.take_organ_damage(2) if(prob(50)) @@ -62,12 +62,12 @@ if(prob(50)) playsound(src, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(M, null)) - O.show_message(text("[] slams [] with the tray!", user, M), 1) + O.show_message(span_danger("[user] slams [M] with the tray!"), 1) return else playsound(src, 'sound/items/trayhit2.ogg', 50, 1) //we applied the damage, we played the sound, we showed the appropriate messages. Time to return and stop the proc for(var/mob/O in viewers(M, null)) - O.show_message(text("[] slams [] with the tray!", user, M), 1) + O.show_message(span_danger("[user] slams [M] with the tray!"), 1) return @@ -79,7 +79,7 @@ break if(protected) - to_chat(M, "You get slammed in the face with the tray, against your mask!") + to_chat(M, span_warning("You get slammed in the face with the tray, against your mask!")) if(prob(33)) src.add_blood(H) if (H.wear_mask) @@ -95,11 +95,11 @@ if(prob(50)) playsound(src, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(M, null)) - O.show_message(text("[] slams [] with the tray!", user, M), 1) + O.show_message(span_danger("[user] slams [M] with the tray!"), 1) else playsound(src, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' for(var/mob/O in viewers(M, null)) - O.show_message(text("[] slams [] with the tray!", user, M), 1) + O.show_message(span_danger("[user] slams [M] with the tray!"), 1) if(prob(10)) M.Stun(rand(1,3)) M.take_organ_damage(3) @@ -109,7 +109,7 @@ return else //No eye or head protection, tough luck! - to_chat(M, "You get slammed in the face with the tray!") + to_chat(M, span_warning("You get slammed in the face with the tray!")) if(prob(33)) src.add_blood(M) var/turf/location = H.loc @@ -119,11 +119,11 @@ if(prob(50)) playsound(src, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(M, null)) - O.show_message(text("[] slams [] in the face with the tray!", user, M), 1) + O.show_message(span_danger("[user] slams [M] in the face with the tray!"), 1) else playsound(src, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' again for(var/mob/O in viewers(M, null)) - O.show_message(text("[] slams [] in the face with the tray!", user, M), 1) + O.show_message(span_danger("[user] slams [M] in the face with the tray!"), 1) if(prob(30)) M.Stun(rand(2,4)) M.take_organ_damage(4) @@ -140,7 +140,7 @@ /obj/item/tray/attackby(obj/item/W as obj, mob/user as mob) if(istype(W, /obj/item/material/kitchen/rollingpin)) if(cooldown < world.time - 25) - user.visible_message("[user] bashes [src] with [W]!") + user.visible_message(span_warning("[user] bashes [src] with [W]!")) playsound(src, 'sound/effects/shieldbash.ogg', 50, 1) cooldown = world.time else diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index f76a989221..0e01e58c39 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -20,34 +20,34 @@ user.do_attack_animation(M) if (!user.IsAdvancedToolUser()) - to_chat(user, "You don't have the dexterity to do this!") + to_chat(user, span_danger("You don't have the dexterity to do this!")) return if ((CLUMSY in user.mutations) && prob(50)) - to_chat(user, "The rod slips out of your hand and hits your head.") + to_chat(user, span_danger("The rod slips out of your hand and hits your head.")) user.take_organ_damage(10) user.Paralyse(20) return if (M.stat !=2) if(cult && (M.mind in cult.current_antagonists) && prob(33)) - to_chat(M, "The power of [src] clears your mind of the cult's influence!") - to_chat(user, "You wave [src] over [M]'s head and see their eyes become clear, their mind returning to normal.") + to_chat(M, span_danger("The power of [src] clears your mind of the cult's influence!")) + to_chat(user, span_danger("You wave [src] over [M]'s head and see their eyes become clear, their mind returning to normal.")) cult.remove_antagonist(M.mind) - M.visible_message("\The [user] waves \the [src] over \the [M]'s head.") + M.visible_message(span_danger("\The [user] waves \the [src] over \the [M]'s head.")) else if(prob(10)) - to_chat(user, "The rod slips in your hand.") + to_chat(user, span_danger("The rod slips in your hand.")) ..() else - to_chat(user, "The rod appears to do nothing.") - M.visible_message("\The [user] waves \the [src] over \the [M]'s head.") + to_chat(user, span_danger("The rod appears to do nothing.")) + M.visible_message(span_danger("\The [user] waves \the [src] over \the [M]'s head.")) return /obj/item/nullrod/afterattack(atom/A, mob/user as mob, proximity) if(!proximity) return if (istype(A, /turf/simulated/floor)) - to_chat(user, "You hit the floor with the [src].") + to_chat(user, span_notice("You hit the floor with the [src].")) call(/obj/effect/rune/proc/revealrunes)(src) /obj/item/energy_net @@ -107,7 +107,7 @@ /obj/effect/energy_net/Destroy() if(has_buckled_mobs()) for(var/A in buckled_mobs) - to_chat(A, "You are free of the net!") + to_chat(A, span_notice("You are free of the net!")) unbuckle_mob(A) STOP_PROCESSING(SSobj, src) @@ -119,11 +119,11 @@ /obj/effect/energy_net/user_unbuckle_mob(mob/living/buckled_mob, mob/user) user.setClickCooldown(user.get_attack_speed()) - visible_message("[user] begins to tear at \the [src]!") + visible_message(span_danger("[user] begins to tear at \the [src]!")) if(do_after(user, escape_time, src, incapacitation_flags = INCAPACITATION_DEFAULT & ~(INCAPACITATION_RESTRAINED | INCAPACITATION_BUCKLED_FULLY))) if(!has_buckled_mobs()) return - visible_message("[user] manages to tear \the [src] apart!") + visible_message(span_danger("[user] manages to tear \the [src] apart!")) unbuckle_mob(buckled_mob) /obj/effect/energy_net/post_buckle_mob(mob/living/M) diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm index 8cecd4ec41..e8be87608d 100644 --- a/code/game/objects/items/weapons/weldbackpack.dm +++ b/code/game/objects/items/weapons/weldbackpack.dm @@ -31,7 +31,7 @@ if(nozzle) user.remove_from_mob(nozzle) return_nozzle() - to_chat(user, "\The [nozzle] retracts to its fueltank.") + to_chat(user, span_notice("\The [nozzle] retracts to its fueltank.")) /obj/item/weldpack/proc/get_nozzle(var/mob/living/user) if(!ishuman(user)) @@ -40,7 +40,7 @@ var/mob/living/carbon/human/H = user if(H.hands_are_full()) //Make sure our hands aren't full. - to_chat(H, "Your hands are full. Drop something first.") + to_chat(H, span_warning("Your hands are full. Drop something first.")) return 0 var/obj/item/F = nozzle @@ -59,31 +59,31 @@ if(T.welding & prob(50)) message_admins("[key_name_admin(user)] triggered a fueltank explosion.") log_game("[key_name(user)] triggered a fueltank explosion.") - to_chat(user, "That was stupid of you.") + to_chat(user, span_danger("That was stupid of you.")) explosion(get_turf(src),-1,0,2) if(src) qdel(src) return else if(T.status) if(T.welding) - to_chat(user, "That was close!") + to_chat(user, span_danger("That was close!")) src.reagents.trans_to_obj(W, T.max_fuel) - to_chat(user, "Welder refilled!") + to_chat(user, span_notice("Welder refilled!")) playsound(src, 'sound/effects/refill.ogg', 50, 1, -6) return else if(nozzle) if(nozzle == W) if(!user.unEquip(W)) - to_chat(user, "\The [W] seems to be stuck to your hand.") + to_chat(user, span_notice("\The [W] seems to be stuck to your hand.")) return if(!nozzle_attached) return_nozzle() - to_chat(user, "You attach \the [W] to the [src].") + to_chat(user, span_notice("You attach \the [W] to the [src].")) return else - to_chat(user, "The [src] already has a nozzle!") + to_chat(user, span_notice("The [src] already has a nozzle!")) else - to_chat(user, "The tank scoffs at your insolence. It only provides services to welders.") + to_chat(user, span_warning("The tank scoffs at your insolence. It only provides services to welders.")) return /obj/item/weldpack/attack_hand(mob/user as mob) @@ -94,7 +94,7 @@ if(!wearer.incapacitated()) get_nozzle(user) else - to_chat(user, "\The [src] does not have a nozzle attached!") + to_chat(user, span_notice("\The [src] does not have a nozzle attached!")) else ..() else @@ -105,11 +105,11 @@ return if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume < max_fuel) O.reagents.trans_to_obj(src, max_fuel) - to_chat(user, "You crack the cap off the top of the pack and fill it back up again from the tank.") + to_chat(user, span_notice("You crack the cap off the top of the pack and fill it back up again from the tank.")) playsound(src, 'sound/effects/refill.ogg', 50, 1, -6) return else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume == max_fuel) - to_chat(user, "The pack is already full!") + to_chat(user, span_warning("The pack is already full!")) return /obj/item/weldpack/MouseDrop(obj/over_object as obj) //This is terrifying. diff --git a/code/game/objects/mob_spawner_vr.dm b/code/game/objects/mob_spawner_vr.dm index 6feebec885..463caa43a6 100644 --- a/code/game/objects/mob_spawner_vr.dm +++ b/code/game/objects/mob_spawner_vr.dm @@ -76,7 +76,7 @@ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.do_attack_animation(src) - visible_message("\The [src] has been [LAZYLEN(I.attack_verb) ? "[pick(I.attack_verb)]":"attacked"] with \the [I] by [user].") + visible_message(span_warning("\The [src] has been [LAZYLEN(I.attack_verb) ? "[pick(I.attack_verb)]":"attacked"] with \the [I] by [user].")) take_damage(I.force) /obj/structure/mob_spawner/bullet_act(var/obj/item/projectile/Proj) @@ -87,7 +87,7 @@ /obj/structure/mob_spawner/take_damage(var/damage) health -= damage if(health <= 0) - visible_message("\The [src] breaks apart!") + visible_message(span_warning("\The [src] breaks apart!")) qdel(src) /obj/structure/mob_spawner/clear_zlevel/can_spawn() diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 11667d2f53..60a80c1ae3 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -57,7 +57,7 @@ /obj/CanUseTopic(var/mob/user, var/datum/tgui_state/state = GLOB.tgui_default_state) if(user.CanUseObjTopic(src)) return ..() - to_chat(user, "[icon2html(src, user.client)]Access Denied!") + to_chat(user, span_danger("[icon2html(src, user.client)]Access Denied!")) return STATUS_CLOSE /mob/living/silicon/CanUseObjTopic(var/obj/O) @@ -165,7 +165,7 @@ /* var/mob/mo = locate(/mob) in src if(mo) - var/rendered = "[M.name]: [text]" + var/rendered = span_game say(span_name("[M.name]: [text]")) mo.show_message(rendered, 2) */ return diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 626c7a296e..dd0d55cfce 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -9,7 +9,7 @@ var/parts var/list/climbers var/block_turf_edges = FALSE // If true, turf edge icons will not be made on the turf this occupies. - + var/list/connections var/list/other_connections var/list/blend_objects = newlist() // Objects which to blend with @@ -36,8 +36,8 @@ attack_generic(user,1,"slices") if(LAZYLEN(climbers) && !(user in climbers)) - user.visible_message("[user.name] shakes \the [src].", \ - "You shake \the [src].") + user.visible_message(span_warning("[user.name] shakes \the [src]."), \ + span_notice("You shake \the [src].")) structure_shaken() return ..() @@ -77,12 +77,12 @@ return 0 if (!user.Adjacent(src)) - to_chat(user, "You can't climb there, the way is blocked.") + to_chat(user, span_danger("You can't climb there, the way is blocked.")) return 0 var/obj/occupied = turf_is_crowded() if(occupied) - to_chat(user, "There's \a [occupied] in the way.") + to_chat(user, span_danger("There's \a [occupied] in the way.")) return 0 return 1 @@ -104,7 +104,7 @@ if (!can_climb(user)) return - usr.visible_message("[user] starts climbing onto \the [src]!") + usr.visible_message(span_warning("[user] starts climbing onto \the [src]!")) LAZYDISTINCTADD(climbers, user) if(!do_after(user,(issmall(user) ? climb_delay * 0.6 : climb_delay))) @@ -118,7 +118,7 @@ usr.forceMove(climb_to(user)) if (get_turf(user) == get_turf(src)) - usr.visible_message("[user] climbs onto \the [src]!") + usr.visible_message(span_warning("[user] climbs onto \the [src]!")) LAZYREMOVE(climbers, user) /obj/structure/proc/climb_to(var/mob/living/user) @@ -127,21 +127,21 @@ /obj/structure/proc/structure_shaken() for(var/mob/living/M in climbers) M.Weaken(1) - to_chat(M, "You topple as you are shaken off \the [src]!") + to_chat(M, span_danger("You topple as you are shaken off \the [src]!")) climbers.Cut(1,2) for(var/mob/living/M in get_turf(src)) if(M.lying) return //No spamming this on people. M.Weaken(3) - to_chat(M, "You topple as \the [src] moves under you!") + to_chat(M, span_danger("You topple as \the [src] moves under you!")) if(prob(25)) var/damage = rand(15,30) var/mob/living/carbon/human/H = M if(!istype(H)) - to_chat(H, "You land heavily!") + to_chat(H, span_danger("You land heavily!")) M.adjustBruteLoss(damage) return @@ -160,12 +160,12 @@ affecting = H.get_organ(BP_HEAD) if(affecting) - to_chat(M, "You land heavily on your [affecting.name]!") + to_chat(M, span_danger("You land heavily on your [affecting.name]!")) affecting.take_damage(damage, 0) if(affecting.parent) affecting.parent.add_autopsy_data("Misadventure", damage) else - to_chat(H, "You land heavily!") + to_chat(H, span_danger("You land heavily!")) H.adjustBruteLoss(damage) H.UpdateDamageIcon() @@ -178,19 +178,19 @@ if(!Adjacent(user)) return 0 if (user.restrained() || user.buckled) - to_chat(user, "You need your hands and legs free for this.") + to_chat(user, span_notice("You need your hands and legs free for this.")) return 0 if (user.stat || user.paralysis || user.sleeping || user.lying || user.weakened) return 0 if (isAI(user)) - to_chat(user, "You need hands for this.") + to_chat(user, span_notice("You need hands for this.")) return 0 return 1 /obj/structure/attack_generic(var/mob/user, var/damage, var/attack_verb) if(!breakable || damage < STRUCTURE_MIN_DAMAGE_THRESHOLD) return 0 - visible_message("[user] [attack_verb] the [src] apart!") + visible_message(span_danger("[user] [attack_verb] the [src] apart!")) user.do_attack_animation(src) spawn(1) qdel(src) return 1 diff --git a/code/game/objects/structures/alien/alien.dm b/code/game/objects/structures/alien/alien.dm index f161d8cfc3..3f52b7ee9a 100644 --- a/code/game/objects/structures/alien/alien.dm +++ b/code/game/objects/structures/alien/alien.dm @@ -35,7 +35,7 @@ /obj/structure/alien/hitby(AM as mob|obj) ..() - visible_message("\The [src] was hit by \the [AM].") + visible_message(span_danger("\The [src] was hit by \the [AM].")) var/tforce = 0 if(ismob(AM)) tforce = 10 @@ -48,7 +48,7 @@ return /obj/structure/alien/attack_generic(var/mob/user, var/damage, var/attack_verb) - visible_message("[user] [attack_verb] the [src]!") + visible_message(span_danger("[user] [attack_verb] the [src]!")) playsound(src, 'sound/effects/attackblob.ogg', 100, 1) user.do_attack_animation(src) health -= damage @@ -61,7 +61,7 @@ var/aforce = W.force health = max(0, health - aforce) playsound(src, 'sound/effects/attackblob.ogg', 100, 1) - visible_message("[user] attacks the [src]!") + visible_message(span_danger("[user] attacks the [src]!")) healthcheck() ..() return @@ -69,7 +69,7 @@ /obj/structure/alien/attack_hand() usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if (HULK in usr.mutations) - visible_message("[usr] destroys the [name]!") + visible_message(span_warning("[usr] destroys the [name]!")) health = 0 else @@ -77,18 +77,18 @@ if(istype(usr,/mob/living/carbon)) var/mob/living/carbon/M = usr if(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs) - visible_message ("[usr] strokes the [name] and it melts away!", 1) + visible_message (span_warning("[usr] strokes the [name] and it melts away!"), 1) health = 0 healthcheck() return if(locate(/obj/item/organ/internal/xenos/resinspinner/replicant) in M.internal_organs) if(!do_after(M, 3 SECONDS)) return - visible_message ("[usr] strokes the [name] and it melts away!", 1) + visible_message (span_warning("[usr] strokes the [name] and it melts away!"), 1) health = 0 healthcheck() return - visible_message("[usr] claws at the [name]!") + visible_message(span_warning("[usr] claws at the [name]!")) health -= rand(5,10) healthcheck() return diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index ebe8de03ea..a7d06703ff 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -21,7 +21,7 @@ painting = canvas canvas.forceMove(get_turf(src)) canvas.layer = layer+0.1 - user.visible_message("[user] puts \the [canvas] on \the [src].","You place \the [canvas] on \the [src].") + user.visible_message(span_notice("[user] puts \the [canvas] on \the [src]."),span_notice("You place \the [canvas] on \the [src].")) else return ..() @@ -402,40 +402,40 @@ /obj/structure/sign/painting/examine(mob/user) . = ..() if(persistence_id) - . += "Any painting placed here will be archived at the end of the shift." + . += span_notice("Any painting placed here will be archived at the end of the shift.") if(current_canvas) current_canvas.tgui_interact(user) - . += "Use wirecutters to remove the painting." - . += "Paintings hung here are curated based on interest. The more often someone EXAMINEs the painting, the longer it will stay in rotation." + . += span_notice("Use wirecutters to remove the painting.") + . += span_notice("Paintings hung here are curated based on interest. The more often someone EXAMINEs the painting, the longer it will stay in rotation.") // Painting loaded and persistent frame, give a hint about removal safety if(persistence_id) if(loaded) - . += "Don't worry, the currently framed painting has already been entered into the archives and can be safely removed. It will still be used on future shifts." + . += span_warning("Don't worry, the currently framed painting has already been entered into the archives and can be safely removed. It will still be used on future shifts.") back_of_the_line(user) else - . += "This painting has not been entered into the archives yet. Removing it will prevent that from happening." + . += span_warning("This painting has not been entered into the archives yet. Removing it will prevent that from happening.") /obj/structure/sign/painting/proc/frame_canvas(mob/user,obj/item/canvas/new_canvas) if(!allowed(user)) - to_chat(user, "Access lock prevents you from putting a painting into this frame. Ask [curator] for help!") + to_chat(user, span_notice("Access lock prevents you from putting a painting into this frame. Ask [curator] for help!")) return if(user.drop_from_inventory(new_canvas, src)) current_canvas = new_canvas if(!current_canvas.finalized) current_canvas.finalize(user) - to_chat(user,"You frame [current_canvas].") + to_chat(user,span_notice("You frame [current_canvas].")) update_appearance() /obj/structure/sign/painting/proc/unframe_canvas(mob/living/user) if(!allowed(user)) - to_chat(user, "Access lock prevents you from removing paintings from this frame. Ask [curator] ((or admins)) for help!") + to_chat(user, span_notice("Access lock prevents you from removing paintings from this frame. Ask [curator] ((or admins)) for help!")) return if(current_canvas) current_canvas.forceMove(drop_location()) current_canvas = null loaded = FALSE - to_chat(user, "You remove the painting from the frame.") + to_chat(user, span_notice("You remove the painting from the frame.")) update_appearance() /obj/structure/sign/painting/proc/try_rename(mob/user) @@ -649,7 +649,7 @@ SSpersistence.all_paintings.Remove(list(entry)) SSpersistence.all_paintings.Add(list(entry)) art_appreciators += user.ckey - to_chat(user, "Showing interest in this painting renews its position in the curator database.") + to_chat(user, span_notice("Showing interest in this painting renews its position in the curator database.")) /obj/structure/sign/painting/vv_get_dropdown() . = ..() @@ -662,7 +662,7 @@ return var/mob/user = usr if(!persistence_id || !current_canvas) - to_chat(user,"This is not a persistent painting.") + to_chat(user,span_warning("This is not a persistent painting.")) return var/md5 = md5(lowertext(current_canvas.get_data_string())) var/author = current_canvas.author_ckey @@ -679,4 +679,4 @@ QDEL_NULL(P.current_canvas) P.update_appearance() loaded = FALSE - log_and_message_admins("[key_name_admin(user)] has deleted persistent painting made by [author].") + log_and_message_admins(span_notice("[key_name_admin(user)] has deleted persistent painting made by [author].")) diff --git a/code/game/objects/structures/barricades.dm b/code/game/objects/structures/barricades.dm index f33c400023..ac3481a712 100644 --- a/code/game/objects/structures/barricades.dm +++ b/code/game/objects/structures/barricades.dm @@ -35,13 +35,13 @@ return //hitting things with the wrong type of stack usually doesn't produce messages, and probably doesn't need to. if(health < maxhealth) if(D.get_amount() < 1) - to_chat(user, "You need one sheet of [material.display_name] to repair \the [src].") + to_chat(user, span_warning("You need one sheet of [material.display_name] to repair \the [src].")) return - visible_message("[user] begins to repair \the [src].") + visible_message(span_notice("[user] begins to repair \the [src].")) if(do_after(user,20) && health < maxhealth) if(D.use(1)) health = maxhealth - visible_message("[user] repairs \the [src].") + visible_message(span_notice("[user] repairs \the [src].")) return return else @@ -71,7 +71,7 @@ return /obj/structure/barricade/attack_generic(var/mob/user, var/damage, var/attack_verb) - visible_message("[user] [attack_verb] the [src]!") + visible_message(span_danger("[user] [attack_verb] the [src]!")) if(material == get_material_by_name("resin")) playsound(src, 'sound/effects/attackblob.ogg', 100, 1) else if(material == (get_material_by_name(MAT_CLOTH) || get_material_by_name(MAT_SYNCLOTH))) @@ -87,7 +87,7 @@ /obj/structure/barricade/proc/dismantle() material.place_dismantled_product(get_turf(src)) - visible_message("\The [src] falls apart!") + visible_message(span_danger("\The [src] falls apart!")) qdel(src) return @@ -138,7 +138,7 @@ /obj/structure/barricade/sandbag/dismantle() update_connections(1, src) material.place_dismantled_product(get_turf(src)) - visible_message("\The [src] falls apart!") + visible_message(span_danger("\The [src] falls apart!")) qdel(src) return diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index 065a77f1e3..1bad5048c4 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -42,9 +42,9 @@ if(!sign_type) return icon_state = sign_type - to_chat(user, "You change the barsign.") + to_chat(user, span_notice("You change the barsign.")) else - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) return return ..() diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 284306c534..47d4f1ba6b 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -30,9 +30,9 @@ LINEN BINS /obj/item/bedsheet/attackby(obj/item/I, mob/user) if(is_sharp(I)) - user.visible_message("\The [user] begins cutting up [src] with [I].", "You begin cutting up [src] with [I].") + user.visible_message("\The [user] begins cutting up [src] with [I].", span_notice("You begin cutting up [src] with [I].")) if(do_after(user, 50)) - to_chat(user, "You cut [src] into pieces!") + to_chat(user, span_notice("You cut [src] into pieces!")) for(var/i in 1 to rand(2,5)) new /obj/item/reagent_containers/glass/rag(drop_location()) qdel(src) @@ -194,12 +194,12 @@ LINEN BINS I.loc = src sheets.Add(I) amount++ - to_chat(user, "You put [I] in [src].") + to_chat(user, span_notice("You put [I] in [src].")) else if(amount && !hidden && I.w_class < ITEMSIZE_LARGE) //make sure there's sheets to hide it among, make sure nothing else is hidden in there. user.drop_item() I.loc = src hidden = I - to_chat(user, "You hide [I] among the sheets.") + to_chat(user, span_notice("You hide [I] among the sheets.")) /obj/structure/bedsheetbin/attack_hand(mob/user as mob) if(amount >= 1) @@ -215,11 +215,11 @@ LINEN BINS B.loc = user.loc user.put_in_hands(B) - to_chat(user, "You take [B] out of [src].") + to_chat(user, span_notice("You take [B] out of [src].")) if(hidden) hidden.loc = user.loc - to_chat(user, "[hidden] falls out of [B]!") + to_chat(user, span_notice("[hidden] falls out of [B]!")) hidden = null @@ -238,7 +238,7 @@ LINEN BINS B = new /obj/item/bedsheet(loc) B.loc = loc - to_chat(user, "You telekinetically remove [B] from [src].") + to_chat(user, span_notice("You telekinetically remove [B] from [src].")) update_icon() if(hidden) diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm index d5dd625c67..1b37697d96 100644 --- a/code/game/objects/structures/bonfire.dm +++ b/code/game/objects/structures/bonfire.dm @@ -43,7 +43,7 @@ R.use(1) can_buckle = TRUE buckle_require_restraints = TRUE - to_chat(user, "You add a rod to \the [src].") + to_chat(user, span_notice("You add a rod to \the [src].")) var/mutable_appearance/rod_underlay = mutable_appearance('icons/obj/structures.dmi', "bonfire_rod") rod_underlay.pixel_y = 16 rod_underlay.appearance_flags = RESET_COLOR|PIXEL_SCALE|TILE_BOUND @@ -51,7 +51,7 @@ if("Grill") R.use(1) grill = TRUE - to_chat(user, "You add a grill to \the [src].") + to_chat(user, span_notice("You add a grill to \the [src].")) update_icon() else return ..() @@ -83,7 +83,7 @@ user.visible_message("[user] dismantles down \the [src].", "You dismantle \the [src].") qdel(src) else - to_chat(user, "\The [src] is still burning. Extinguish it first if you want to dismantle it.") + to_chat(user, span_warning("\The [src] is still burning. Extinguish it first if you want to dismantle it.")) /obj/structure/bonfire/proc/get_fuel_amount() var/F = 0 @@ -101,7 +101,7 @@ if(get_fuel_amount()) var/atom/movable/AM = pop(contents) AM.forceMove(get_turf(src)) - to_chat(user, "You take \the [AM] out of \the [src] before it has a chance to burn away.") + to_chat(user, span_notice("You take \the [AM] out of \the [src] before it has a chance to burn away.")) update_icon() /obj/structure/bonfire/permanent/remove_fuel(mob/user) @@ -109,23 +109,23 @@ /obj/structure/bonfire/proc/add_fuel(atom/movable/new_fuel, mob/user) if(get_fuel_amount() >= 10) - to_chat(user, "\The [src] already has enough fuel!") + to_chat(user, span_warning("\The [src] already has enough fuel!")) return FALSE if(istype(new_fuel, /obj/item/stack/material/wood) || istype(new_fuel, /obj/item/stack/material/log) ) var/obj/item/stack/F = new_fuel var/obj/item/stack/S = F.split(1) if(S) S.forceMove(src) - to_chat(user, "You add \the [new_fuel] to \the [src].") + to_chat(user, span_warning("You add \the [new_fuel] to \the [src].")) update_icon() return TRUE return FALSE else - to_chat(user, "\The [src] needs raw wood to burn, \a [new_fuel] won't work.") + to_chat(user, span_warning("\The [src] needs raw wood to burn, \a [new_fuel] won't work.")) return FALSE /obj/structure/bonfire/permanent/add_fuel(mob/user) - to_chat(user, "\The [src] has plenty of fuel and doesn't need more fuel.") + to_chat(user, span_warning("\The [src] has plenty of fuel and doesn't need more fuel.")) /obj/structure/bonfire/proc/consume_fuel(var/obj/item/stack/consumed_fuel) if(!istype(consumed_fuel)) @@ -167,7 +167,7 @@ burning = TRUE update_icon() START_PROCESSING(SSobj, src) - visible_message("\The [src] starts burning!") + visible_message(span_warning("\The [src] starts burning!")) /obj/structure/bonfire/proc/burn() var/turf/current_location = get_turf(src) @@ -305,24 +305,24 @@ if(get_fuel_amount()) var/atom/movable/AM = pop(contents) AM.forceMove(get_turf(src)) - to_chat(user, "You take \the [AM] out of \the [src] before it has a chance to burn away.") + to_chat(user, span_notice("You take \the [AM] out of \the [src] before it has a chance to burn away.")) update_icon() /obj/structure/fireplace/proc/add_fuel(atom/movable/new_fuel, mob/user) if(get_fuel_amount() >= 10) - to_chat(user, "\The [src] already has enough fuel!") + to_chat(user, span_warning("\The [src] already has enough fuel!")) return FALSE if(istype(new_fuel, /obj/item/stack/material/wood) || istype(new_fuel, /obj/item/stack/material/log) ) var/obj/item/stack/F = new_fuel var/obj/item/stack/S = F.split(1) if(S) S.forceMove(src) - to_chat(user, "You add \the [new_fuel] to \the [src].") + to_chat(user, span_warning("You add \the [new_fuel] to \the [src].")) update_icon() return TRUE return FALSE else - to_chat(user, "\The [src] needs raw wood to burn, \a [new_fuel] won't work.") + to_chat(user, span_warning("\The [src] needs raw wood to burn, \a [new_fuel] won't work.")) return FALSE /obj/structure/fireplace/proc/consume_fuel(var/obj/item/stack/consumed_fuel) @@ -361,7 +361,7 @@ burning = TRUE update_icon() START_PROCESSING(SSobj, src) - visible_message("\The [src] starts burning!") + visible_message(span_warning("\The [src] starts burning!")) /obj/structure/fireplace/proc/burn() var/turf/current_location = get_turf(src) diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm index 6fc6cd7efc..465fdd1bb1 100644 --- a/code/game/objects/structures/catwalk.dm +++ b/code/game/objects/structures/catwalk.dm @@ -76,7 +76,7 @@ /obj/structure/catwalk/proc/deconstruct(mob/user) playsound(src, 'sound/items/Welder.ogg', 100, 1) - to_chat(user, "Slicing \the [src] joints ...") + to_chat(user, span_notice("Slicing \the [src] joints ...")) //Lattice would delete itself, but let's save ourselves a new obj if(isopenspace(loc) && user.a_intent == I_HELP) new /obj/structure/lattice/(src.loc) @@ -97,21 +97,21 @@ hatch_open = !hatch_open if(hatch_open) playsound(src, 'sound/items/Crowbar.ogg', 100, 2) - to_chat(user, "You pry open \the [src]'s maintenance hatch.") + to_chat(user, span_notice("You pry open \the [src]'s maintenance hatch.")) update_falling() else playsound(src, 'sound/items/Deconstruct.ogg', 100, 2) - to_chat(user, "You shut \the [src]'s maintenance hatch.") + to_chat(user, span_notice("You shut \the [src]'s maintenance hatch.")) update_icon() return if(istype(C, /obj/item/stack/tile/floor) && !plated_tile) var/obj/item/stack/tile/floor/ST = C - to_chat(user, "Placing tile...") + to_chat(user, span_notice("Placing tile...")) if (!do_after(user, 10)) return if(!ST.use(1)) return - to_chat(user, "You plate \the [src]") + to_chat(user, span_notice("You plate \the [src]")) name = "plated catwalk" plated_tile = C.type src.add_fingerprint(user) @@ -126,7 +126,7 @@ /obj/structure/catwalk/take_damage(amount) health -= amount if(health <= 0) - visible_message("\The [src] breaks down!") + visible_message(span_warning("\The [src] breaks down!")) playsound(src, 'sound/effects/grillehit.ogg', 50, 1) new /obj/item/stack/rods(get_turf(src)) Destroy() diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm index 2383a8a19c..3b55dd88b8 100644 --- a/code/game/objects/structures/coathanger.dm +++ b/code/game/objects/structures/coathanger.dm @@ -24,7 +24,7 @@ user.drop_from_inventory(coat, src) update_icon() else - to_chat(user, "You cannot hang [W] on [src]") + to_chat(user, span_notice("You cannot hang [W] on [src]")) return ..() /obj/structure/coatrack/CanPass(atom/movable/mover, turf/target) diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm index 4193e56d33..e5c252bd17 100644 --- a/code/game/objects/structures/crates_lockers/__closets.dm +++ b/code/game/objects/structures/crates_lockers/__closets.dm @@ -228,7 +228,7 @@ if(is_animating_door) return if(!(opened ? close() : open())) - to_chat(user, "It won't budge!") + to_chat(user, span_notice("It won't budge!")) return // this should probably use dump_contents() @@ -280,11 +280,11 @@ user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.") if(do_after(user, 20 * W.toolspeed)) if(!src) return - to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") + to_chat(user, span_notice("You [anchored? "un" : ""]secured \the [src]!")) anchored = !anchored return else - to_chat(user, "You can't reach the anchoring bolts when the door is closed!") + to_chat(user, span_notice("You can't reach the anchoring bolts when the door is closed!")) else if(opened) if(istype(W, /obj/item/grab)) var/obj/item/grab/G = W @@ -298,12 +298,12 @@ if(!WT.isOn()) return else - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span_notice("You need more welding fuel to complete this task.")) return playsound(src, WT.usesound, 50) new /obj/item/stack/material/steel(loc) for(var/mob/M in viewers(src)) - M.show_message("\The [src] has been cut apart by [user] with \the [WT].", 3, "You hear welding.", 2) + M.show_message(span_notice("\The [src] has been cut apart by [user] with \the [WT]."), 3, "You hear welding.", 2) qdel(src) return if(istype(W, /obj/item/storage/laundry_basket) && W.contents.len) @@ -311,9 +311,9 @@ var/turf/T = get_turf(src) for(var/obj/item/I in LB.contents) LB.remove_from_storage(I, T) - user.visible_message("[user] empties \the [LB] into \the [src].", \ - "You empty \the [LB] into \the [src].", \ - "You hear rustling of clothes.") + user.visible_message(span_notice("[user] empties \the [LB] into \the [src]."), \ + span_notice("You empty \the [LB] into \the [src]."), \ + span_notice("You hear rustling of clothes.")) return if(isrobot(user)) return @@ -333,14 +333,14 @@ if(!WT.isOn()) return else - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span_notice("You need more welding fuel to complete this task.")) return if(do_after(user, 20 * S.toolspeed)) playsound(src, S.usesound, 50) sealed = !sealed update_icon() for(var/mob/M in viewers(src)) - M.show_message("[src] has been [sealed?"sealed":"unsealed"] by [user.name].", 3) + M.show_message(span_warning("[src] has been [sealed?"sealed":"unsealed"] by [user.name]."), 3) else attack_hand(user) return @@ -362,7 +362,7 @@ return step_towards(O, loc) if(user != O) - user.show_viewers("[user] stuffs [O] into [src]!") + user.show_viewers(span_danger("[user] stuffs [O] into [src]!")) add_fingerprint(user) return @@ -375,7 +375,7 @@ return if(!open()) - to_chat(user, "It won't budge!") + to_chat(user, span_notice("It won't budge!")) /obj/structure/closet/attack_hand(mob/user as mob) add_fingerprint(user) @@ -385,7 +385,7 @@ /obj/structure/closet/attack_self_tk(mob/user as mob) add_fingerprint(user) if(!toggle()) - to_chat(usr, "It won't budge!") + to_chat(usr, span_notice("It won't budge!")) /obj/structure/closet/verb/verb_toggleopen() set src in oview(1) @@ -404,9 +404,9 @@ add_fingerprint(usr) toggle(usr) else - to_chat(usr, "This mob type can't use this verb.") //VOREStation Addition End + to_chat(usr, span_warning("This mob type can't use this verb.")) //VOREStation Addition End else - to_chat(usr, "This mob type can't use this verb.") + to_chat(usr, span_warning("This mob type can't use this verb.")) /obj/structure/closet/update_icon() if(opened) @@ -418,7 +418,7 @@ if(damage < STRUCTURE_MIN_DAMAGE_THRESHOLD) return user.do_attack_animation(src) - visible_message("[user] [attack_message] the [src]!") + visible_message(span_danger("[user] [attack_message] the [src]!")) dump_contents() spawn(1) qdel(src) return 1 @@ -437,9 +437,9 @@ escapee.setClickCooldown(100) //okay, so the closet is either sealed or locked... resist!!! - to_chat(escapee, "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)") + to_chat(escapee, span_warning("You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)")) - visible_message("\The [src] begins to shake violently!") + visible_message(span_danger("\The [src] begins to shake violently!")) breakout = 1 //can't think of a better way to do this right now. for(var/i in 1 to (6*breakout_time * 2)) //minutes * 6 * 5seconds * 2 @@ -460,8 +460,8 @@ //Well then break it! breakout = 0 - to_chat(escapee, "You successfully break out!") - visible_message("\The [escapee] successfully broke out of \the [src]!") + to_chat(escapee, span_warning("You successfully break out!")) + visible_message(span_danger("\The [escapee] successfully broke out of \the [src]!")) playsound(src, breakout_sound, 100, 1) break_open() animate_shake() @@ -556,7 +556,7 @@ return if(!(usr in src.contents)) - to_chat(usr, "You need to be inside \the [src] to do this.") + to_chat(usr, span_warning("You need to be inside \the [src] to do this.")) return var/list/targets = list() //IF IT IS NOT BROKEN. DO NOT FIX IT. @@ -570,7 +570,7 @@ targets += L if(targets == 0) - to_chat(src, "No eligible targets found.") + to_chat(src, span_notice("No eligible targets found.")) return var/mob/living/target = tgui_input_list(usr, "Please select a target.", "Victim", targets) @@ -579,11 +579,11 @@ return if(!istype(target, /mob/living)) //Safety. - to_chat(src, "You need to select a living target!") + to_chat(src, span_warning("You need to select a living target!")) return if (get_dist(src,target) >= 1 || get_dist(src,usr) >= 1) //in case they leave the locker - to_chat(src, "You are no longer both in \the [src].") + to_chat(src, span_warning("You are no longer both in \the [src].")) return playsound(src, vore_sound, 25) diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm index 53792c70c4..6f4cd019da 100644 --- a/code/game/objects/structures/crates_lockers/closets/coffin.dm +++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm @@ -25,15 +25,15 @@ /obj/structure/closet/grave/attack_hand(mob/user as mob) if(opened) - visible_message("[user] starts to climb into \the [src.name].", \ - "You start to lower yourself into \the [src.name].") + visible_message(span_notice("[user] starts to climb into \the [src.name]."), \ + span_notice("You start to lower yourself into \the [src.name].")) if(do_after(user, 50)) user.forceMove(src.loc) - visible_message("[user] climbs into \the [src.name].", \ - "You climb into \the [src.name].") + visible_message(span_notice("[user] climbs into \the [src.name]."), \ + span_notice("You climb into \the [src.name].")) else - visible_message("[user] decides not to climb into \the [src.name].", \ - "You stop climbing into \the [src.name].") + visible_message(span_notice("[user] decides not to climb into \the [src.name]."), \ + span_notice("You stop climbing into \the [src.name].")) return /obj/structure/closet/grave/CanPass(atom/movable/mover, turf/target) @@ -43,19 +43,19 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.m_intent == "walk") - to_chat(H, "You stop at the edge of \the [src.name].") + to_chat(H, span_warning("You stop at the edge of \the [src.name].")) return FALSE else - to_chat(H, "You fall into \the [src.name]!") + to_chat(H, span_warning("You fall into \the [src.name]!")) fall_in(H) return TRUE if(isrobot(M)) var/mob/living/silicon/robot/R = M if(R.a_intent == I_HELP) - to_chat(R, "You stop at the edge of \the [src.name].") + to_chat(R, span_warning("You stop at the edge of \the [src.name].")) return FALSE else - to_chat(R, "You enter \the [src.name].") + to_chat(R, span_warning("You enter \the [src.name].")) return TRUE return TRUE //Everything else can move over the graves @@ -69,17 +69,17 @@ /obj/structure/closet/grave/attackby(obj/item/W as obj, mob/user as mob) if(src.opened) if(istype(W, /obj/item/shovel)) - user.visible_message("[user] piles dirt into \the [src.name].", \ - "You start to pile dirt into \the [src.name].", \ - "You hear dirt being moved.") + user.visible_message(span_notice("[user] piles dirt into \the [src.name]."), \ + span_notice("You start to pile dirt into \the [src.name]."), \ + span_notice("You hear dirt being moved.")) if(do_after(user, 40 * W.toolspeed)) - user.visible_message("[user] pats down the dirt on top of \the [src.name].", \ - "You finish filling in \the [src.name].") + user.visible_message(span_notice("[user] pats down the dirt on top of \the [src.name]."), \ + span_notice("You finish filling in \the [src.name].")) close() return else - user.visible_message("[user] stops filling in \the [src.name].", \ - "You change your mind and stop filling in \the [src.name].") + user.visible_message(span_notice("[user] stops filling in \the [src.name]."), \ + span_notice("You change your mind and stop filling in \the [src.name].")) return if(istype(W, /obj/item/grab)) var/obj/item/grab/G = W @@ -92,9 +92,9 @@ var/turf/T = get_turf(src) for(var/obj/item/I in LB.contents) LB.remove_from_storage(I, T) - user.visible_message("[user] empties \the [LB] into \the [src].", \ - "You empty \the [LB] into \the [src].", \ - "You hear rustling of clothes.") + user.visible_message(span_notice("[user] empties \the [LB] into \the [src]."), \ + span_notice("You empty \the [LB] into \the [src]."), \ + span_notice("You hear rustling of clothes.")) return if(isrobot(user)) return @@ -106,33 +106,33 @@ else if(istype(W, /obj/item/shovel)) if(user.a_intent == I_HURT) // Hurt intent means you're trying to kill someone, or just get rid of the grave - user.visible_message("[user] begins to smoothe out the dirt of \the [src.name].", \ - "You start to smoothe out the dirt of \the [src.name].", \ - "You hear dirt being moved.") + user.visible_message(span_notice("[user] begins to smoothe out the dirt of \the [src.name]."), \ + span_notice("You start to smoothe out the dirt of \the [src.name]."), \ + span_notice("You hear dirt being moved.")) if(do_after(user, 40 * W.toolspeed)) - user.visible_message("[user] finishes smoothing out \the [src.name].", \ - "You finish smoothing out \the [src.name].") + user.visible_message(span_notice("[user] finishes smoothing out \the [src.name]."), \ + span_notice("You finish smoothing out \the [src.name].")) if(LAZYLEN(contents)) alpha = 40 // If we've got stuff inside, like maybe a person, just make it hard to see us else qdel(src) // Else, go away return else - user.visible_message("[user] stops concealing \the [src.name].", \ - "You stop concealing \the [src.name].") + user.visible_message(span_notice("[user] stops concealing \the [src.name]."), \ + span_notice("You stop concealing \the [src.name].")) return else - user.visible_message("[user] begins to unearth \the [src.name].", \ - "You start to unearth \the [src.name].", \ - "You hear dirt being moved.") + user.visible_message(span_notice("[user] begins to unearth \the [src.name]."), \ + span_notice("You start to unearth \the [src.name]."), \ + span_notice("You hear dirt being moved.")) if(do_after(user, 40 * W.toolspeed)) - user.visible_message("[user] reaches the bottom of \the [src.name].", \ - "You finish digging out \the [src.name].") + user.visible_message(span_notice("[user] reaches the bottom of \the [src.name]."), \ + span_notice("You finish digging out \the [src.name].")) break_open() return else - user.visible_message("[user] stops digging out \the [src.name].", \ - "You stop digging out \the [src.name].") + user.visible_message(span_notice("[user] stops digging out \the [src.name]."), \ + span_notice("You stop digging out \the [src.name].")) return return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index fb9eb977d4..c1753b2df9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -48,7 +48,7 @@ if(large) MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet else - to_chat(user, "The locker is too small to stuff [G.affecting] into!") + to_chat(user, span_notice("The locker is too small to stuff [G.affecting] into!")) if(isrobot(user)) return if(W.loc != user) // This should stop mounted modules ending up outside the module. @@ -60,7 +60,7 @@ var/obj/item/card/id/I = W.GetID() if(src.broken) - to_chat(user, "It appears to be broken.") + to_chat(user, span_warning("It appears to be broken.")) return if(!I || !I.registered_name) return if(src.allowed(user) || !src.registered_name || (istype(I) && (src.registered_name == I.registered_name))) @@ -71,7 +71,7 @@ src.registered_name = I.registered_name src.desc = "Owned by [I.registered_name]." else - to_chat(user, "Access Denied") + to_chat(user, span_warning("Access Denied")) else if(istype(W, /obj/item/melee/energy/blade)) if(emag_act(INFINITY, user, "The locker has been sliced open by [user] with \an [W]!", "You hear metal being sliced and sparks flying.")) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() @@ -80,7 +80,7 @@ playsound(src, 'sound/weapons/blade1.ogg', 50, 1) playsound(src, "sparks", 50, 1) else - to_chat(user, "Access Denied") + to_chat(user, span_warning("Access Denied")) update_icon() /obj/structure/closet/secure_closet/personal/emag_act(var/remaining_charges, var/mob/user, var/visual_feedback, var/audible_feedback) @@ -90,7 +90,7 @@ desc = "It appears to be broken." update_icon() if(visual_feedback) - visible_message("[visual_feedback]", "[audible_feedback]") + visible_message(span_warning("[visual_feedback]"), span_warning("[audible_feedback]")) return 1 /obj/structure/closet/secure_closet/personal/verb/reset() @@ -102,9 +102,9 @@ if(ishuman(usr)) src.add_fingerprint(usr) if (src.locked || !src.registered_name) - to_chat(usr, "You need to unlock it first.") + to_chat(usr, span_warning("You need to unlock it first.")) else if (src.broken) - to_chat(usr, "It appears to be broken.") + to_chat(usr, span_warning("It appears to be broken.")) else if (src.opened) if(!src.close()) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 280016304b..5cbb4ec39f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -35,23 +35,23 @@ /obj/structure/closet/secure_closet/proc/togglelock(mob/user as mob) if(opened) - to_chat(user, "Close the locker first.") + to_chat(user, span_notice("Close the locker first.")) return if(broken) - to_chat(user, "The locker appears to be broken.") + to_chat(user, span_warning("The locker appears to be broken.")) return if(user.loc == src) - to_chat(user, "You can't reach the lock from inside.") + to_chat(user, span_notice("You can't reach the lock from inside.")) return if(allowed(user)) locked = !locked playsound(src, 'sound/machines/click.ogg', 15, 1, -3) for(var/mob/O in viewers(user, 3)) if((O.client && !( O.blinded ))) - to_chat(O, "The locker has been [locked ? null : "un"]locked by [user].") + to_chat(O, span_notice("The locker has been [locked ? null : "un"]locked by [user].")) update_icon() else - to_chat(user, "Access Denied") + to_chat(user, span_notice("Access Denied")) /obj/structure/closet/secure_closet/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) @@ -62,11 +62,11 @@ user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.") if(do_after(user, 20 * W.toolspeed)) if(!src) return - to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") + to_chat(user, span_notice("You [anchored? "un" : ""]secured \the [src]!")) anchored = !anchored return else - to_chat(user, "You can't reach the anchoring bolts when the door is closed!") + to_chat(user, span_notice("You can't reach the anchoring bolts when the door is closed!")) else if(opened) if(istype(W, /obj/item/storage/laundry_basket)) return ..(W,user) @@ -75,7 +75,7 @@ if(large) MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet else - to_chat(user, "The locker is too small to stuff [G.affecting] into!") + to_chat(user, span_notice("The locker is too small to stuff [G.affecting] into!")) if(isrobot(user)) return if(W.loc != user) // This should stop mounted modules ending up outside the module. @@ -84,7 +84,7 @@ if(W) W.forceMove(loc) else if(istype(W, /obj/item/melee/energy/blade)) - if(emag_act(INFINITY, user, "The locker has been sliced open by [user] with \an [W]!", "You hear metal being sliced and sparks flying.")) + if(emag_act(INFINITY, user, span_danger("The locker has been sliced open by [user] with \an [W]!"), span_danger("You hear metal being sliced and sparks flying."))) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, loc) spark_system.start() @@ -104,9 +104,9 @@ if(visual_feedback) visible_message(visual_feedback, audible_feedback) else if(user && emag_source) - visible_message("\The [src] has been broken by \the [user] with \an [emag_source]!", "You hear a faint electrical spark.") + visible_message(span_warning("\The [src] has been broken by \the [user] with \an [emag_source]!"), "You hear a faint electrical spark.") else - visible_message("\The [src] sparks and breaks open!", "You hear a faint electrical spark.") + visible_message(span_warning("\The [src] sparks and breaks open!"), "You hear a faint electrical spark.") update_icon() return 1 @@ -133,7 +133,7 @@ add_fingerprint(usr) togglelock(usr) else - to_chat(usr, "This mob type can't use this verb.") + to_chat(usr, span_warning("This mob type can't use this verb.")) /obj/structure/closet/secure_closet/update_icon() if(opened) diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 7b29053456..9f948265fd 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -106,7 +106,7 @@ /obj/structure/closet/statue/attackby(obj/item/I as obj, mob/user as mob) health -= I.force user.do_attack_animation(src) - visible_message("[user] strikes [src] with [I].") + visible_message(span_danger("[user] strikes [src] with [I].")) check_health() /obj/structure/closet/statue/MouseDrop_T() @@ -128,5 +128,5 @@ if (user) user.dust() dump_contents() - visible_message("[src] shatters!.") + visible_message(span_warning("[src] shatters!.")) qdel(src) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index e271fbada6..85a2cbd58c 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -115,21 +115,21 @@ else if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W if(rigged) - to_chat(user, "[src] is already rigged!") + to_chat(user, span_notice("[src] is already rigged!")) return if (C.use(1)) - to_chat(user , "You rig [src].") + to_chat(user , span_notice("You rig [src].")) rigged = 1 return else if(istype(W, /obj/item/radio/electropack)) if(rigged) - to_chat(user , "You attach [W] to [src].") + to_chat(user , span_notice("You attach [W] to [src].")) user.drop_item() W.forceMove(src) return else if(W.has_tool_quality(TOOL_WIRECUTTER)) if(rigged) - to_chat(user , "You cut away the wiring.") + to_chat(user , span_notice("You cut away the wiring.")) playsound(src, W.usesound, 100, 1) rigged = 0 return @@ -179,15 +179,15 @@ /obj/structure/closet/crate/secure/proc/togglelock(mob/user as mob) if(src.opened) - to_chat(user, "Close the crate first.") + to_chat(user, span_notice("Close the crate first.")) return if(src.broken) - to_chat(user, "The crate appears to be broken.") + to_chat(user, span_warning("The crate appears to be broken.")) return if(src.allowed(user)) set_locked(!locked, user) else - to_chat(user, "Access Denied") + to_chat(user, span_notice("Access Denied")) /obj/structure/closet/crate/secure/proc/set_locked(var/newlocked, mob/user = null) if(locked == newlocked) return @@ -195,7 +195,7 @@ locked = newlocked if(user) for(var/mob/O in viewers(user, 3)) - O.show_message( "The crate has been [locked ? null : "un"]locked by [user].", 1) + O.show_message( span_notice("The crate has been [locked ? null : "un"]locked by [user]."), 1) update_icon() /obj/structure/closet/crate/secure/verb/verb_togglelock() @@ -210,7 +210,7 @@ src.add_fingerprint(usr) src.togglelock(usr) else - to_chat(usr, "This mob type can't use this verb.") + to_chat(usr, span_warning("This mob type can't use this verb.")) /obj/structure/closet/crate/secure/attack_hand(mob/user as mob) src.add_fingerprint(user) @@ -234,7 +234,7 @@ playsound(src, "sparks", 60, 1) locked = 0 broken = 1 - to_chat(user, "You unlock \the [src].") + to_chat(user, span_notice("You unlock \the [src].")) update_icon() return 1 diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index bed36f8dfe..86b7c70f27 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -18,13 +18,13 @@ update_icon() /obj/structure/largecrate/attack_hand(mob/user as mob) - to_chat(user, "You need a crowbar to pry this open!") + to_chat(user, span_notice("You need a crowbar to pry this open!")) return /obj/structure/largecrate/attackby(obj/item/W as obj, mob/user as mob) var/turf/T = get_turf(src) if(!T) - to_chat(user, "You can't open this here!") + to_chat(user, span_notice("You can't open this here!")) if(W.has_tool_quality(TOOL_CROWBAR)) new /obj/item/stack/material/wood(src) @@ -39,9 +39,9 @@ AMBLINAL.ghostjoin_icon() active_ghost_pods |= AMBLINAL //VOREStation Add End - user.visible_message("[user] pries \the [src] open.", \ - "You pry open \the [src].", \ - "You hear splitting wood.") + user.visible_message(span_notice("[user] pries \the [src] open."), \ + span_notice("You pry open \the [src]."), \ + span_notice("You hear splitting wood.")) qdel(src) else return attack_hand(user) diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index f41922d289..f28b64121f 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -29,9 +29,9 @@ var/turf/T = get_turf(src) for(var/atom/movable/AM in contents) if(AM.simulated) AM.forceMove(T) - user.visible_message("[user] pries \the [src] open.", \ - "You pry open \the [src].", \ - "You hear splitting wood.") + user.visible_message(span_notice("[user] pries \the [src] open."), \ + span_notice("You pry open \the [src]."), \ + span_notice("You hear splitting wood.")) qdel(src) else return attack_hand(user) diff --git a/code/game/objects/structures/crates_lockers/vehiclecage.dm b/code/game/objects/structures/crates_lockers/vehiclecage.dm index 9af560a474..7ea9a27ab4 100644 --- a/code/game/objects/structures/crates_lockers/vehiclecage.dm +++ b/code/game/objects/structures/crates_lockers/vehiclecage.dm @@ -11,7 +11,7 @@ /obj/structure/vehiclecage/examine(mob/user) . = ..() if(my_vehicle) - . += "It seems to contain \the [my_vehicle]." + . += span_notice("It seems to contain \the [my_vehicle].") /obj/structure/vehiclecage/Initialize() . = ..() @@ -24,21 +24,21 @@ update_icon() /obj/structure/vehiclecage/attack_hand(mob/user as mob) - to_chat(user, "You need a wrench to take this apart!") + to_chat(user, span_notice("You need a wrench to take this apart!")) return /obj/structure/vehiclecage/attackby(obj/item/W as obj, mob/user as mob) var/turf/T = get_turf(src) if(!T) - to_chat(user, "You can't open this here!") + to_chat(user, span_notice("You can't open this here!")) if(W.has_tool_quality(TOOL_WRENCH) && do_after(user, 60 * W.toolspeed, src)) playsound(src, W.usesound, 50, 1) disassemble(W, user) - user.visible_message("[user] begins loosening \the [src]'s bolts.") + user.visible_message(span_notice("[user] begins loosening \the [src]'s bolts.")) if(W.has_tool_quality(TOOL_WIRECUTTER) && do_after(user, 70 * W.toolspeed, src)) playsound(src, W.usesound, 50, 1) disassemble(W, user) - user.visible_message("[user] begins cutting \the [src]'s bolts.") + user.visible_message(span_notice("[user] begins cutting \the [src]'s bolts.")) else return attack_hand(user) @@ -72,9 +72,9 @@ /obj/structure/vehiclecage/proc/load_vehicle(var/obj/vehicle/V, mob/user as mob) if(user) - user.visible_message("[user] loads \the [V] into \the [src].", \ - "You load \the [V] into \the [src].", \ - "You hear creaking metal.") + user.visible_message(span_notice("[user] loads \the [V] into \the [src]."), \ + span_notice("You load \the [V] into \the [src]."), \ + span_notice("You hear creaking metal.")) V.forceMove(src) @@ -91,9 +91,9 @@ AM.forceMove(T) my_vehicle = null - user.visible_message("[user] release \the [src].", \ - "You finally release \the [src].", \ - "You hear creaking metal.") + user.visible_message(span_notice("[user] release \the [src]."), \ + span_notice("You finally release \the [src]."), \ + span_notice("You hear creaking metal.")) qdel(src) /obj/structure/vehiclecage/spacebike diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index 714eb9eb53..73a0beb893 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -16,7 +16,7 @@ /obj/structure/curtain/bullet_act(obj/item/projectile/P, def_zone) if(!P.nodamage) - visible_message("[P] tears [src] down!") + visible_message(span_warning("[P] tears [src] down!")) qdel(src) else ..(P, def_zone) @@ -40,9 +40,9 @@ /obj/structure/curtain/attackby(obj/item/P, mob/user) if(P.has_tool_quality(TOOL_WIRECUTTER)) playsound(src, P.usesound, 50, 1) - to_chat(user, "You start to cut the shower curtains.") + to_chat(user, span_notice("You start to cut the shower curtains.")) if(do_after(user, 10)) - to_chat(user, "You cut the shower curtains.") + to_chat(user, span_notice("You cut the shower curtains.")) new /obj/item/stack/material/plastic(src.loc, 3) qdel(src) return diff --git a/code/game/objects/structures/dancepole_vr.dm b/code/game/objects/structures/dancepole_vr.dm index 739d50643c..fee2538222 100644 --- a/code/game/objects/structures/dancepole_vr.dm +++ b/code/game/objects/structures/dancepole_vr.dm @@ -29,9 +29,9 @@ to_chat(user, span_blue("You unsecure \the [src].")) if(O.has_tool_quality(TOOL_WRENCH)) playsound(src, O.usesound, 50, 1) - to_chat(user, "Now disassembling \the [src]...") + to_chat(user, span_notice("Now disassembling \the [src]...")) if(do_after(user, 30 * O.toolspeed)) if(!src) return - to_chat(user, "You dissasembled \the [src]!") + to_chat(user, span_notice("You dissasembled \the [src]!")) new /obj/item/stack/material/steel(src.loc, 1) qdel(src) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 1172af7616..86e68cf820 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -66,16 +66,16 @@ /obj/structure/displaycase/attack_hand(mob/user as mob) if (src.destroyed && src.occupied) new /obj/item/gun/energy/captain( src.loc ) - to_chat(user, "You deactivate the hover field built into the case.") + to_chat(user, span_notice("You deactivate the hover field built into the case.")) src.occupied = 0 src.add_fingerprint(user) update_icon() return else - to_chat(usr, "You kick the display case.") + to_chat(usr, span_warning("You kick the display case.")) for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) - to_chat(O, "[usr] kicks the display case.") + to_chat(O, span_warning("[usr] kicks the display case.")) src.health -= 2 healthcheck() return diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 9a20dcdcef..b6c5e2e946 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -178,7 +178,7 @@ user.visible_message("[user] welds the [glass] plating off the airlock assembly.", "You start to weld the [glass] plating off the airlock assembly.") if(do_after(user, 4 SECONDS * WT.toolspeed, src, exclusive = TASK_ALL_EXCLUSIVE)) if(!src || !WT.isOn()) return - to_chat(user, "You welded the [glass] plating off!") + to_chat(user, span_notice("You welded the [glass] plating off!")) var/M = text2path("/obj/item/stack/material/[glass]") new M(src.loc, 2) glass = 0 @@ -186,18 +186,18 @@ user.visible_message("[user] welds the glass panel out of the airlock assembly.", "You start to weld the glass panel out of the airlock assembly.") if(do_after(user, 4 SECONDS * WT.toolspeed, src, exclusive = TASK_ALL_EXCLUSIVE)) if(!src || !WT.isOn()) return - to_chat(user, "You welded the glass panel out!") + to_chat(user, span_notice("You welded the glass panel out!")) new /obj/item/stack/material/glass/reinforced(src.loc) glass = 0 else if(!anchored) user.visible_message("[user] dissassembles the airlock assembly.", "You start to dissassemble the airlock assembly.") if(do_after(user, 4 SECONDS * WT.toolspeed, src, exclusive = TASK_ALL_EXCLUSIVE)) if(!src || !WT.isOn()) return - to_chat(user, "You dissasembled the airlock assembly!") + to_chat(user, span_notice("You dissasembled the airlock assembly!")) new /obj/item/stack/material/steel(src.loc, 4) qdel (src) else - to_chat(user, "You need more welding fuel.") + to_chat(user, span_notice("You need more welding fuel.")) return else if(W.has_tool_quality(TOOL_WRENCH) && state == 0) @@ -209,19 +209,19 @@ if(do_after(user, 4 SECONDS * W.toolspeed, src, exclusive = TASK_ALL_EXCLUSIVE)) if(!src) return - to_chat(user, "You [anchored? "un" : ""]secured the airlock assembly!") + to_chat(user, span_notice("You [anchored? "un" : ""]secured the airlock assembly!")) anchored = !anchored else if(istype(W, /obj/item/stack/cable_coil) && state == 0 && anchored) var/obj/item/stack/cable_coil/C = W if (C.get_amount() < 1) - to_chat(user, "You need one length of coil to wire the airlock assembly.") + to_chat(user, span_warning("You need one length of coil to wire the airlock assembly.")) return user.visible_message("[user] wires the airlock assembly.", "You start to wire the airlock assembly.") if(do_after(user, 4 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE) && state == 0 && anchored) if (C.use(1)) src.state = 1 - to_chat(user, "You wire the airlock.") + to_chat(user, span_notice("You wire the airlock.")) else if(W.has_tool_quality(TOOL_WIRECUTTER) && state == 1 ) playsound(src, W.usesound, 100, 1) @@ -229,7 +229,7 @@ if(do_after(user, 4 SECONDS * W.toolspeed, src, exclusive = TASK_ALL_EXCLUSIVE)) if(!src) return - to_chat(user, "You cut the airlock wires.!") + to_chat(user, span_notice("You cut the airlock wires.!")) new/obj/item/stack/cable_coil(src.loc, 1) src.state = 0 @@ -241,14 +241,14 @@ if(!src) return user.drop_item() W.loc = src - to_chat(user, "You installed the airlock electronics!") + to_chat(user, span_notice("You installed the airlock electronics!")) src.state = 2 src.electronics = W else if(W.has_tool_quality(TOOL_CROWBAR) && state == 2 ) //This should never happen, but just in case I guess if (!electronics) - to_chat(user, "There was nothing to remove.") + to_chat(user, span_notice("There was nothing to remove.")) src.state = 1 return @@ -257,7 +257,7 @@ if(do_after(user, 4 SECONDS * W.toolspeed, src, exclusive = TASK_ALL_EXCLUSIVE)) if(!src) return - to_chat(user, "You removed the airlock electronics!") + to_chat(user, span_notice("You removed the airlock electronics!")) src.state = 1 electronics.loc = src.loc electronics = null @@ -272,7 +272,7 @@ user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.") if(do_after(user, 4 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE) && !glass) if (S.use(1)) - to_chat(user, "You installed reinforced glass windows into the airlock assembly.") + to_chat(user, span_notice("You installed reinforced glass windows into the airlock assembly.")) glass = 1 else if(material_name) // Ugly hack, will suffice for now. Need to fix it upstream as well, may rewrite mineral walls. ~Z @@ -284,16 +284,16 @@ user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.") if(do_after(user, 4 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE) && !glass) if (S.use(2)) - to_chat(user, "You installed [material_display_name(material_name)] plating into the airlock assembly.") + to_chat(user, span_notice("You installed [material_display_name(material_name)] plating into the airlock assembly.")) glass = material_name else if(W.has_tool_quality(TOOL_SCREWDRIVER) && state == 2 ) playsound(src, W.usesound, 100, 1) - to_chat(user, "Now finishing the airlock.") + to_chat(user, span_notice("Now finishing the airlock.")) if(do_after(user, 4 SECONDS * W.toolspeed, src, exclusive = TASK_ALL_EXCLUSIVE)) if(!src) return - to_chat(user, "You finish the airlock!") + to_chat(user, span_notice("You finish the airlock!")) var/path if(istext(glass)) path = text2path("/obj/machinery/door/airlock/[glass]") diff --git a/code/game/objects/structures/droppod.dm b/code/game/objects/structures/droppod.dm index d794a8829d..d529a42603 100644 --- a/code/game/objects/structures/droppod.dm +++ b/code/game/objects/structures/droppod.dm @@ -87,7 +87,7 @@ visible_message("\The [src] pops open!") else for(var/mob/M in src) - to_chat(M, "You've landed! Open the hatch if you think it's safe! \The [src] has enough air to last for a while...") + to_chat(M, span_danger("You've landed! Open the hatch if you think it's safe! \The [src] has enough air to last for a while...")) /obj/structure/drop_pod/proc/open_pod() if(finished) @@ -103,7 +103,7 @@ /obj/structure/drop_pod/attack_hand(mob/living/user) if(istype(user) && (Adjacent(user) || (user in src)) && !user.incapacitated()) if(finished) - to_chat(user, "Nothing left to do with it now. Maybe you can break it down into materials.") + to_chat(user, span_warning("Nothing left to do with it now. Maybe you can break it down into materials.")) else open_pod() user.visible_message("[user] opens \the [src]!","You open \the [src]!") @@ -111,13 +111,13 @@ /obj/structure/drop_pod/attackby(obj/item/O, mob/user) if(O.has_tool_quality(TOOL_WRENCH)) if(finished) - to_chat(user, "You start breaking down \the [src].") + to_chat(user, span_notice("You start breaking down \the [src].")) if(do_after(user, 10 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE)) new /obj/item/stack/material/plasteel(loc, 10) playsound(user, O.usesound, 50, 1) qdel(src) else - to_chat(user, "\The [src] hasn't been opened yet. Do that first.") + to_chat(user, span_warning("\The [src] hasn't been opened yet. Do that first.")) return ..() /obj/structure/drop_pod/return_air() diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index 56ebe32b6d..a4b584e829 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -34,7 +34,7 @@ else on = 1 icon_state = "echair1" - to_chat(usr, "You switch [on ? "on" : "off"] [src].") + to_chat(usr, span_notice("You switch [on ? "on" : "off"] [src].")) return /obj/structure/bed/chair/e_chair/rotate_clockwise() @@ -67,11 +67,11 @@ if(has_buckled_mobs()) for(var/mob/living/L as anything in buckled_mobs) L.burn_skin(85) - to_chat(L, "You feel a deep shock course through your body!") + to_chat(L, span_danger("You feel a deep shock course through your body!")) sleep(1) L.burn_skin(85) L.Stun(600) - visible_message("The electric chair went off!", "You hear a deep sharp shock!") + visible_message(span_danger("The electric chair went off!"), span_danger("You hear a deep sharp shock!")) A.power_light = light A.update_icon() diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index aa85c0f245..3c160b70d7 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -28,15 +28,15 @@ user.remove_from_mob(O) contents += O has_extinguisher = O - to_chat(user, "You place [O] in [src].") + to_chat(user, span_notice("You place [O] in [src].")) else opened = !opened if(O.has_tool_quality(TOOL_WRENCH)) if(!has_extinguisher) - to_chat(user, "You start to unwrench the extinguisher cabinet.") + to_chat(user, span_notice("You start to unwrench the extinguisher cabinet.")) playsound(src, O.usesound, 50, 1) if(do_after(user, 15 * O.toolspeed)) - to_chat(user, "You unwrench the extinguisher cabinet.") + to_chat(user, span_notice("You unwrench the extinguisher cabinet.")) new /obj/item/frame/extinguisher_cabinet( src.loc ) qdel(src) return @@ -54,11 +54,11 @@ if (user.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - to_chat(user, "You try to move your [temp.name], but cannot!") + to_chat(user, span_notice("You try to move your [temp.name], but cannot!")) return if(has_extinguisher) user.put_in_hands(has_extinguisher) - to_chat(user, "You take [has_extinguisher] from [src].") + to_chat(user, span_notice("You take [has_extinguisher] from [src].")) has_extinguisher = null opened = 1 else @@ -68,7 +68,7 @@ /obj/structure/extinguisher_cabinet/attack_tk(mob/user) if(has_extinguisher) has_extinguisher.loc = loc - to_chat(user, "You telekinetically remove [has_extinguisher] from [src].") + to_chat(user, span_notice("You telekinetically remove [has_extinguisher] from [src].")) has_extinguisher = null opened = 1 else diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index e8ac22d19b..d87f5bd630 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -34,7 +34,7 @@ if (isrobot(user) || locked) if(istype(O, /obj/item/multitool)) - to_chat(user, "Resetting circuitry...") + to_chat(user, span_warning("Resetting circuitry...")) playsound(src, 'sound/machines/lockreset.ogg', 50, 1) if(do_after(user, 20 * O.toolspeed)) locked = 0 @@ -50,7 +50,7 @@ else playsound(src, 'sound/effects/Glasshit.ogg', 100, 1) //We don't want this playing every time if(W.force < 15) - to_chat(user, "The cabinet's protective glass glances off the hit.") + to_chat(user, span_notice("The cabinet's protective glass glances off the hit.")) else hitstaken++ if(hitstaken == 4) @@ -68,7 +68,7 @@ fireaxe = O user.remove_from_mob(O) contents += O - to_chat(user, "You place the fire axe back in the [name].") + to_chat(user, span_notice("You place the fire axe back in the [name].")) update_icon() else if(smashed) @@ -85,7 +85,7 @@ flick("[icon_state]closing", src) return else - to_chat(user, "Resetting circuitry...") + to_chat(user, span_warning("Resetting circuitry...")) playsound(src, 'sound/machines/lockenable.ogg', 50, 1) if(do_after(user,20 * O.toolspeed)) locked = 1 @@ -101,14 +101,14 @@ // hasaxe = 1 if(locked) - to_chat(user, "The cabinet won't budge!") + to_chat(user, span_warning("The cabinet won't budge!")) return if(open) if(fireaxe) user.put_in_hands(fireaxe) fireaxe = null - to_chat (user, "You take the fire axe from the [name].") + to_chat (user, span_notice("You take the fire axe from the [name].")) add_fingerprint(user) update_icon() else @@ -123,7 +123,7 @@ /obj/structure/fireaxecabinet/attack_tk(mob/user as mob) if(open && fireaxe) fireaxe.forceMove(loc) - to_chat(user, "You telekinetically remove the fire axe.") + to_chat(user, span_notice("You telekinetically remove the fire axe.")) fireaxe = null update_icon() return @@ -144,9 +144,9 @@ if (isrobot(usr) || locked || smashed) if(locked) - to_chat(usr, "The cabinet won't budge!") + to_chat(usr, span_warning("The cabinet won't budge!")) else if(smashed) - to_chat(usr, "The protective glass is broken!") + to_chat(usr, span_notice("The protective glass is broken!")) return toggle_close_open() @@ -163,23 +163,23 @@ if(fireaxe) usr.put_in_hands(fireaxe) fireaxe = null - to_chat(usr, "You take the Fire axe from the [name].") + to_chat(usr, span_notice("You take the Fire axe from the [name].")) else - to_chat(usr, "The [name] is empty.") + to_chat(usr, span_notice("The [name] is empty.")) else - to_chat(usr, "The [name] is closed.") + to_chat(usr, span_notice("The [name] is closed.")) update_icon() /obj/structure/fireaxecabinet/attack_ai(mob/user as mob) if(smashed) - to_chat(user, "The security of the cabinet is compromised.") + to_chat(user, span_warning("The security of the cabinet is compromised.")) return else locked = !locked if(locked) - to_chat(user, "Cabinet locked.") + to_chat(user, span_warning("Cabinet locked.")) else - to_chat(user, "Cabinet unlocked.") + to_chat(user, span_notice("Cabinet unlocked.")) return /obj/structure/fireaxecabinet/update_icon() //Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers diff --git a/code/game/objects/structures/fitness.dm b/code/game/objects/structures/fitness.dm index e90a2b2e35..096b495bd1 100644 --- a/code/game/objects/structures/fitness.dm +++ b/code/game/objects/structures/fitness.dm @@ -15,7 +15,7 @@ ..() return if(user.nutrition < 20) - to_chat(user, "You need more energy to use the punching bag. Go eat something.") + to_chat(user, span_warning("You need more energy to use the punching bag. Go eat something.")) else if(user.a_intent == I_HURT) user.setClickCooldown(user.get_attack_speed()) @@ -23,7 +23,7 @@ playsound(src, 'sound/effects/woodhit.ogg', 25, 1, -1) user.do_attack_animation(src) user.nutrition = user.nutrition - 5 - to_chat(user, "You [pick(hit_message)] \the [src].") + to_chat(user, span_warning("You [pick(hit_message)] \the [src].")) /obj/structure/fitness/weightlifter name = "weightlifting machine" @@ -43,13 +43,13 @@ if(!istype(user)) return if(user.loc != src.loc) - to_chat(user, "You must be on the weight machine to use it.") + to_chat(user, span_warning("You must be on the weight machine to use it.")) return if(user.nutrition < 50) - to_chat(user, "You need more energy to lift weights. Go eat something.") + to_chat(user, span_warning("You need more energy to lift weights. Go eat something.")) return if(being_used) - to_chat(user, "The weight machine is already in use by somebody else.") + to_chat(user, span_warning("The weight machine is already in use by somebody else.")) return else being_used = 1 @@ -59,8 +59,8 @@ if(do_after(user, 20 + (weight * 10))) playsound(src, 'sound/effects/weightdrop.ogg', 25, 1) user.adjust_nutrition(weight * -10) - to_chat(user, "You lift the weights [qualifiers[weight]].") + to_chat(user, span_notice("You lift the weights [qualifiers[weight]].")) being_used = 0 else - to_chat(user, "Against your previous judgement, perhaps working out is not for you.") + to_chat(user, span_notice("Against your previous judgement, perhaps working out is not for you.")) being_used = 0 diff --git a/code/game/objects/structures/fitness_vr.dm b/code/game/objects/structures/fitness_vr.dm index 38b96ec8e8..bf8be53902 100644 --- a/code/game/objects/structures/fitness_vr.dm +++ b/code/game/objects/structures/fitness_vr.dm @@ -27,7 +27,7 @@ if(!can_climb(user)) return - usr.visible_message("[user] starts climbing onto \the [src]!") + usr.visible_message(span_warning("[user] starts climbing onto \the [src]!")) LAZYDISTINCTADD(climbers, user) if(!do_after(user,(issmall(user) ? 20 : 34))) @@ -43,7 +43,7 @@ else usr.forceMove(get_turf(src)) - usr.visible_message("[user] climbed over \the [src]!") + usr.visible_message(span_warning("[user] climbed over \the [src]!")) LAZYREMOVE(climbers, user) /obj/structure/fitness/boxing_ropes/can_climb(var/mob/living/user, post_climb_check=0) //Sets it to keep people from climbing over into the next turf if it is occupied. @@ -53,7 +53,7 @@ if(get_turf(user) == get_turf(src)) var/obj/occupied = neighbor_turf_impassable() if(occupied) - to_chat(user, "You can't climb there, there's \a [occupied] in the way.") + to_chat(user, span_danger("You can't climb there, there's \a [occupied] in the way.")) return 0 return 1 @@ -71,4 +71,4 @@ /turf/simulated/fitness name = "Mat" icon = 'icons/turf/floors_vr.dmi' - icon_state = "fit_mat" \ No newline at end of file + icon_state = "fit_mat" diff --git a/code/game/objects/structures/flora/flora.dm b/code/game/objects/structures/flora/flora.dm index 7b800cdb21..43c0dcbf9a 100644 --- a/code/game/objects/structures/flora/flora.dm +++ b/code/game/objects/structures/flora/flora.dm @@ -50,7 +50,7 @@ . += span_notice("\The [src] can be removed with \a [initial(tool.name)].") /obj/structure/flora/proc/get_harvestable_desc() - return "\The [src] seems to have something hanging from it." + return span_notice("\The [src] seems to have something hanging from it.") /obj/structure/flora/attackby(var/obj/item/W, var/mob/living/user) @@ -282,18 +282,18 @@ /obj/structure/flora/pottedplant/examine(mob/user) . = ..() if(in_range(user, src) && stored_item) - . += "You can see something in there..." + . += span_filter_notice("You can see something in there...") /obj/structure/flora/pottedplant/attackby(obj/item/I, mob/user) if(issilicon(user)) return // Don't try to put modules in here, you're a borg. TODO: Inventory refactor to not be ass. if(stored_item) - to_chat(user, "[I] won't fit in. There already appears to be something in here...") + to_chat(user, span_notice("[I] won't fit in. There already appears to be something in here...")) return if(I.w_class > ITEMSIZE_TINY) - to_chat(user, "[I] is too big to fit inside [src].") + to_chat(user, span_notice("[I] is too big to fit inside [src].")) return if(do_after(user, 10)) @@ -303,15 +303,15 @@ src.visible_message("[icon2html(src,viewers(src))] [icon2html(I,viewers(src))] [user] places [I] into [src].") return else - to_chat(user, "You refrain from putting things into the plant pot.") + to_chat(user, span_notice("You refrain from putting things into the plant pot.")) return /obj/structure/flora/pottedplant/attack_hand(mob/user) if(!stored_item) - to_chat(user, "You see nothing of interest in [src]...") + to_chat(user, span_filter_notice("You see nothing of interest in [src]...")) else if(do_after(user, 10)) - to_chat(user, "You find [icon2html(stored_item, user.client)] [stored_item] in [src]!") + to_chat(user, span_filter_notice("You find [icon2html(stored_item, user.client)] [stored_item] in [src]!")) stored_item.forceMove(get_turf(src)) stored_item = null ..() @@ -598,7 +598,7 @@ . = ..() /obj/structure/flora/sif/tendrils/get_harvestable_desc() - return "\The [src] seems to be growing over something." + return span_notice("\The [src] seems to be growing over something.") /datum/category_item/catalogue/flora/frostbelle name = "Sivian Flora - Frostbelle" @@ -639,7 +639,7 @@ icon_state = initial(icon_state) /obj/structure/flora/sif/frostbelle/get_harvestable_desc() - return "\The [src] seems to be budding." + return span_notice("\The [src] seems to be budding.") //Start of underwater plants diff --git a/code/game/objects/structures/flora/trees.dm b/code/game/objects/structures/flora/trees.dm index 21f80387f2..b54548c977 100644 --- a/code/game/objects/structures/flora/trees.dm +++ b/code/game/objects/structures/flora/trees.dm @@ -51,7 +51,7 @@ qdel(src) return - visible_message("\The [user] hits \the [src] with \the [W]!") + visible_message(span_danger("\The [user] hits \the [src] with \the [W]!")) var/damage_to_do = W.force if(!W.sharp && !W.edge) @@ -64,7 +64,7 @@ if(damage_to_do > 5 && !indestructable) adjust_health(-damage_to_do) else - to_chat(user, "\The [W] is ineffective at harming \the [src].") + to_chat(user, span_warning("\The [W] is ineffective at harming \the [src].")) hit_animation() user.setClickCooldown(user.get_attack_speed(W)) @@ -103,7 +103,7 @@ if(product && product_amount) // Make wooden logs. var/obj/item/stack/material/M = new product(get_turf(src), product_amount) M.update_icon() - visible_message("\The [src] is felled!") + visible_message(span_danger("\The [src] is felled!")) stump() // Makes the tree into a mostly non-interactive stump. diff --git a/code/game/objects/structures/ghost_pods/antagonist.dm b/code/game/objects/structures/ghost_pods/antagonist.dm index e0504537db..f271d37586 100644 --- a/code/game/objects/structures/ghost_pods/antagonist.dm +++ b/code/game/objects/structures/ghost_pods/antagonist.dm @@ -18,17 +18,17 @@ if(M.mind) M.mind.transfer_to(R) // Description for new larva, so they understand what to expect. - to_chat(M, "You are a Xenomorph Larva, freshly slithered out of their egg to serve the hive.") - to_chat(M, "Be sure to carefully listen to your queen, as xenomorph egg spawns may act different to loner xenomorph spawns.") - to_chat(M, "Remember, you are technically a antagonist. Be sure to learn the context of your existence via IC or ahelp to prevent headaches, and follow the orders of your queen to the letter.") - to_chat(M, " Your life for the hive!") + to_chat(M, span_notice("You are a Xenomorph Larva, freshly slithered out of their egg to serve the hive.")) + to_chat(M, span_notice("Be sure to carefully listen to your queen, as xenomorph egg spawns may act different to loner xenomorph spawns.")) + to_chat(M, span_warning("Remember, you are technically a antagonist. Be sure to learn the context of your existence via IC or ahelp to prevent headaches, and follow the orders of your queen to the letter.")) + to_chat(M, span_notice(" Your life for the hive!")) R.ckey = M.ckey - visible_message("\the [src] peels open, and a fresh larva slithers out!") + visible_message(span_warning("\the [src] peels open, and a fresh larva slithers out!")) ..() /obj/structure/ghost_pod/automatic/xenomorph_egg/proc/healthcheck() if(health <=0) - visible_message("\the [src] splatters everywhere as it cracks open!") + visible_message(span_warning("\the [src] splatters everywhere as it cracks open!")) playsound(src, 'sound/effects/slime_squish.ogg', 50, 1) qdel(src) return diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm index 5f1060a9f7..17c6c3de90 100644 --- a/code/game/objects/structures/ghost_pods/event_vr.dm +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -79,7 +79,7 @@ var/finalized = "No" if(jobban_isbanned(M, JOB_GHOSTROLES)) - to_chat(M, "You cannot inhabit this creature because you are banned from playing ghost roles.") + to_chat(M, span_warning("You cannot inhabit this creature because you are banned from playing ghost roles.")) reset_ghostpod() return @@ -90,7 +90,7 @@ while(finalized != "Yes" && M.client) choice = tgui_input_list(M, "What type of predator do you want to play as?", "Maintpred Choice", possible_mobs) if(!choice) //We probably pushed the cancel button on the mob selection. Let's just put the ghost pod back in the list. - to_chat(M, "No mob selected, cancelling.") + to_chat(M, span_notice("No mob selected, cancelling.")) reset_ghostpod() return @@ -111,10 +111,10 @@ to_chat(M, "You are [newPred], somehow having gotten aboard the station in search of food. \ You are wary of environment around you, but you do feel rather peckish. Stick around dark, secluded places to avoid danger or, \ if you are cute enough, try to make friends with this place's inhabitants.") - to_chat(M, "Please be advised, this role is NOT AN ANTAGONIST.") - to_chat(M, "You may be a spooky space monster, but your role is to facilitate spooky space monster roleplay, not to fight the station and kill people. You can of course eat and/or digest people as you like if OOC prefs align, but this should be done as part of roleplay. If you intend to fight the station and kill people and such, you need permission from the staff team. GENERALLY, this role should avoid well populated areas. You’re a weird spooky space monster, so the bar is probably not where you’d want to go if you intend to survive. Of course, you’re welcome to try to make friends and roleplay how you will in this regard, but something to keep in mind.") + to_chat(M, span_critical("Please be advised, this role is NOT AN ANTAGONIST.")) + to_chat(M, span_warning("You may be a spooky space monster, but your role is to facilitate spooky space monster roleplay, not to fight the station and kill people. You can of course eat and/or digest people as you like if OOC prefs align, but this should be done as part of roleplay. If you intend to fight the station and kill people and such, you need permission from the staff team. GENERALLY, this role should avoid well populated areas. You’re a weird spooky space monster, so the bar is probably not where you’d want to go if you intend to survive. Of course, you’re welcome to try to make friends and roleplay how you will in this regard, but something to keep in mind.")) newPred.ckey = M.ckey - newPred.visible_message("[newPred] emerges from somewhere!") + newPred.visible_message(span_warning("[newPred] emerges from somewhere!")) log_and_message_admins("successfully entered \a [src] and became a [newPred].") qdel(src) @@ -150,11 +150,11 @@ to_chat(M, "You can use shift + click on objects to disguise yourself as them, but your strikes are nearly useless when you are disguised. \ You can undisguise yourself by shift + clicking yourself, but disguise being switched, or turned on and off has a short cooldown. You can also ventcrawl, \ by using alt + click on the vent or scrubber.") - to_chat(M, "Please be advised, this role is NOT AN ANTAGONIST.") - to_chat(M, "You may be a spooky space monster, but your role is to facilitate spooky space monster roleplay, not to fight the station and kill people. You can of course eat and/or digest people as you like if OOC prefs align, but this should be done as part of roleplay. If you intend to fight the station and kill people and such, you need permission from the staff team. GENERALLY, this role should avoid well populated areas. You’re a weird spooky space monster, so the bar is probably not where you’d want to go if you intend to survive. Of course, you’re welcome to try to make friends and roleplay how you will in this regard, but something to keep in mind.") + to_chat(M, span_critical("Please be advised, this role is NOT AN ANTAGONIST.")) + to_chat(M, span_warning("You may be a spooky space monster, but your role is to facilitate spooky space monster roleplay, not to fight the station and kill people. You can of course eat and/or digest people as you like if OOC prefs align, but this should be done as part of roleplay. If you intend to fight the station and kill people and such, you need permission from the staff team. GENERALLY, this role should avoid well populated areas. You’re a weird spooky space monster, so the bar is probably not where you’d want to go if you intend to survive. Of course, you’re welcome to try to make friends and roleplay how you will in this regard, but something to keep in mind.")) newMorph.ckey = M.ckey - newMorph.visible_message("A morph appears to crawl out of somewhere.") + newMorph.visible_message(span_warning("A morph appears to crawl out of somewhere.")) log_and_message_admins("successfully entered \a [src] and became a Morph.") qdel(src) diff --git a/code/game/objects/structures/ghost_pods/ghost_pods.dm b/code/game/objects/structures/ghost_pods/ghost_pods.dm index 76d54c95fc..6c10f000d3 100644 --- a/code/game/objects/structures/ghost_pods/ghost_pods.dm +++ b/code/game/objects/structures/ghost_pods/ghost_pods.dm @@ -88,7 +88,7 @@ /obj/structure/ghost_pod/ghost_activated/attack_ghost(var/mob/observer/dead/user) //VOREStation Add Start if(jobban_isbanned(user, JOB_GHOSTROLES)) - to_chat(user, "You cannot inhabit this creature because you are banned from playing ghost roles.") + to_chat(user, span_warning("You cannot inhabit this creature because you are banned from playing ghost roles.")) return //No OOC notes @@ -97,7 +97,7 @@ //VOREStation Add End if(used) - to_chat(user, "Another spirit appears to have gotten to \the [src] before you. Sorry.") + to_chat(user, span_warning("Another spirit appears to have gotten to \the [src] before you. Sorry.")) return var/choice = tgui_alert(user, "Are you certain you wish to activate this pod?", "Control Pod", list("Yes", "No")) @@ -106,7 +106,7 @@ return else if(used) - to_chat(user, "Another spirit appears to have gotten to \the [src] before you. Sorry.") + to_chat(user, span_warning("Another spirit appears to have gotten to \the [src] before you. Sorry.")) return create_occupant(user) diff --git a/code/game/objects/structures/ghost_pods/ghost_pods_vr.dm b/code/game/objects/structures/ghost_pods/ghost_pods_vr.dm index 63a2475754..2a97db7473 100644 --- a/code/game/objects/structures/ghost_pods/ghost_pods_vr.dm +++ b/code/game/objects/structures/ghost_pods/ghost_pods_vr.dm @@ -12,7 +12,7 @@ /obj/structure/ghost_pod/manual/attack_ghost(var/mob/observer/dead/user) if(jobban_isbanned(user, JOB_GHOSTROLES)) - to_chat(user, "You cannot inhabit this creature because you are banned from playing ghost roles.") + to_chat(user, span_warning("You cannot inhabit this creature because you are banned from playing ghost roles.")) return //No OOC notes @@ -23,11 +23,11 @@ return if(!activated) - to_chat(user, "\The [src] has not yet been activated. Sorry.") + to_chat(user, span_warning("\The [src] has not yet been activated. Sorry.")) return if(used) - to_chat(user, "Another spirit appears to have gotten to \the [src] before you. Sorry.") + to_chat(user, span_warning("Another spirit appears to have gotten to \the [src] before you. Sorry.")) return busy = TRUE @@ -38,7 +38,7 @@ return else if(used) - to_chat(user, "Another spirit appears to have gotten to \the [src] before you. Sorry.") + to_chat(user, span_warning("Another spirit appears to have gotten to \the [src] before you. Sorry.")) busy = FALSE return diff --git a/code/game/objects/structures/ghost_pods/human.dm b/code/game/objects/structures/ghost_pods/human.dm index 96baab47cb..8a429a77fe 100644 --- a/code/game/objects/structures/ghost_pods/human.dm +++ b/code/game/objects/structures/ghost_pods/human.dm @@ -45,11 +45,11 @@ H.adjustCloneLoss(rand(1,5)) if(M.mind) M.mind.transfer_to(H) - to_chat(M, "You are a [occupant_type]!") + to_chat(M, span_notice("You are a [occupant_type]!")) if(make_antag) - to_chat(M, "Your intent may not be completely beneficial.") + to_chat(M, span_warning("Your intent may not be completely beneficial.")) H.ckey = M.ckey - visible_message("As \the [src] opens, the pipes on \the [src] surge, before it grows dark.") + visible_message(span_warning("As \the [src] opens, the pipes on \the [src] surge, before it grows dark.")) log_and_message_admins("successfully opened \a [src] and became a [occupant_type].") var/list/uniform_options @@ -124,7 +124,7 @@ if(allow_appearance_change) H.change_appearance(APPEARANCE_ALL, H, check_species_whitelist = 1) -// visible_message("\The [src] [pick("gurgles", "seizes", "clangs")] before releasing \the [H]!") +// visible_message(span_alien("\The [src] [pick("gurgles", "seizes", "clangs")] before releasing \the [H]!")) qdel(src) @@ -173,11 +173,11 @@ H.adjustCloneLoss(rand(1,5)) if(M.mind) M.mind.transfer_to(H) - to_chat(M, "You are a [occupant_type]!") + to_chat(M, span_notice("You are a [occupant_type]!")) if(make_antag) - to_chat(M, "Your intent may not be completely beneficial.") + to_chat(M, span_warning("Your intent may not be completely beneficial.")) H.ckey = M.ckey - visible_message("As \the [src] opens, the pipes on \the [src] surge, before it grows dark.") + visible_message(span_warning("As \the [src] opens, the pipes on \the [src] surge, before it grows dark.")) log_and_message_admins("successfully opened \a [src] and got a [occupant_type].") var/list/uniform_options @@ -246,4 +246,4 @@ if(allow_appearance_change) H.change_appearance(APPEARANCE_ALL, H, check_species_whitelist = 1) - visible_message("\The [src] [pick("gurgles", "seizes", "clangs")] before releasing \the [H]!") + visible_message(span_alien("\The [src] [pick("gurgles", "seizes", "clangs")] before releasing \the [H]!")) diff --git a/code/game/objects/structures/ghost_pods/mysterious.dm b/code/game/objects/structures/ghost_pods/mysterious.dm index 58206a0c6b..8bc3df94ff 100644 --- a/code/game/objects/structures/ghost_pods/mysterious.dm +++ b/code/game/objects/structures/ghost_pods/mysterious.dm @@ -10,7 +10,7 @@ confirm_before_open = TRUE /obj/structure/ghost_pod/manual/corgi/trigger() - ..("\The [usr] places their hand on the rune!", "is attempting to summon a corgi.") + ..(span_warning("\The [usr] places their hand on the rune!"), "is attempting to summon a corgi.") /obj/structure/ghost_pod/manual/corgi/create_occupant(var/mob/M) lightning_strike(get_turf(src), cosmetic = TRUE) @@ -18,9 +18,9 @@ var/mob/living/simple_mob/animal/passive/dog/corgi/R = new(get_turf(src)) if(M.mind) M.mind.transfer_to(R) - to_chat(M, "You are a Corgi! Woof!") + to_chat(M, span_notice("You are a Corgi! Woof!")) R.ckey = M.ckey - visible_message("With a bright flash of light, \the [src] disappears, and in its place stands a small corgi.") + visible_message(span_warning("With a bright flash of light, \the [src] disappears, and in its place stands a small corgi.")) log_and_message_admins("successfully touched \a [src] and summoned a corgi.") ..() @@ -35,7 +35,7 @@ confirm_before_open = TRUE /obj/structure/ghost_pod/manual/cursedblade/trigger() - ..("\The [usr] attempts to pull out the sword!", "is activating a cursed blade.") + ..(span_warning("\The [usr] attempts to pull out the sword!"), "is activating a cursed blade.") /obj/structure/ghost_pod/manual/cursedblade/create_occupant(var/mob/M) density = FALSE @@ -45,6 +45,6 @@ your body was reduced to ashes and your soul was cursed to remain trapped in the blade forever. \ Now it is up to you to decide whether you want to be a faithful companion, or a bitter prisoner of the blade.") R.ghost_inhabit(M) - visible_message("The blade shines brightly for a brief moment as [usr] pulls it out of the stone!") + visible_message(span_warning("The blade shines brightly for a brief moment as [usr] pulls it out of the stone!")) log_and_message_admins("successfully acquired a cursed sword.") ..() diff --git a/code/game/objects/structures/ghost_pods/silicon.dm b/code/game/objects/structures/ghost_pods/silicon.dm index 86ec5e480b..dd68d9d4d2 100644 --- a/code/game/objects/structures/ghost_pods/silicon.dm +++ b/code/game/objects/structures/ghost_pods/silicon.dm @@ -13,7 +13,7 @@ needscharger = TRUE /obj/structure/ghost_pod/manual/lost_drone/trigger() - ..("\The [src] appears to be attempting to restart the robot contained inside.", "is attempting to open \a [src].") + ..(span_notice("\The [src] appears to be attempting to restart the robot contained inside."), "is attempting to open \a [src].") /obj/structure/ghost_pod/manual/lost_drone/create_occupant(var/mob/M) density = FALSE @@ -30,7 +30,7 @@ definiton of 'the station' is where your pod is, and unless your laws say otherwise, the entity that released you \ from the pod is not a crewmember.") R.ckey = M.ckey - visible_message("As \the [src] opens, the eyes of the robot flicker as it is activated.") + visible_message(span_warning("As \the [src] opens, the eyes of the robot flicker as it is activated.")) R.namepick() log_and_message_admins("successfully opened \a [src] and got a Lost Drone.") ..() @@ -52,11 +52,11 @@ if(M.mind) M.mind.transfer_to(R) // Put this text here before ckey change so that their laws are shown below it, since borg login() shows it. - to_chat(M, "You are a Gravekeeper Drone, activated once again to tend to the restful dead.") + to_chat(M, span_notice("You are a Gravekeeper Drone, activated once again to tend to the restful dead.")) to_chat(M, "Be sure to examine your currently loaded lawset closely. Remember, your \ definiton of 'your gravesite' is where your pod is.") R.ckey = M.ckey - visible_message("As \the [src] opens, the eyes of the robot flicker as it is activated.") + visible_message(span_warning("As \the [src] opens, the eyes of the robot flicker as it is activated.")) R.namepick() ..() @@ -75,16 +75,16 @@ var/mob/living/silicon/robot/drone/swarm/R = new drone_type(get_turf(src)) if(M.mind) M.mind.transfer_to(R) - to_chat(M, "You are [R], the remnant of some distant species, mechanical or flesh, living or dead.") + to_chat(M, span_cult("You are [R], the remnant of some distant species, mechanical or flesh, living or dead.")) R.ckey = M.ckey - visible_message("As \the [src] shudders, it glows before lifting itself with three shimmering limbs!") + visible_message(span_cult("As \the [src] shudders, it glows before lifting itself with three shimmering limbs!")) spawn(3 SECONDS) - to_chat(R,"Many of your tools are standard drone devices, however others provide you with particular benefits.") - to_chat(R,"Unlike standard drones, you are capable of utilizing 'zero point wells', found in your 'spells' tab.") - to_chat(R,"Here you will also find your replication ability(s), depending on the type of drone you are.") - to_chat(R,"Gunners have a special anti-personnel gun capable of shocking or punching through armor with low damage.") - to_chat(R,"Impalers have an energy-lance.") - to_chat(R,"General drones have the unique ability to produce one of each of these two types of shells per generation.") + to_chat(R,span_notice("Many of your tools are standard drone devices, however others provide you with particular benefits.")) + to_chat(R,span_notice("Unlike standard drones, you are capable of utilizing 'zero point wells', found in your 'spells' tab.")) + to_chat(R,span_notice("Here you will also find your replication ability(s), depending on the type of drone you are.")) + to_chat(R,span_notice("Gunners have a special anti-personnel gun capable of shocking or punching through armor with low damage.")) + to_chat(R,span_notice("Impalers have an energy-lance.")) + to_chat(R,span_notice("General drones have the unique ability to produce one of each of these two types of shells per generation.")) if(!QDELETED(src)) qdel(src) diff --git a/code/game/objects/structures/ghost_pods/silicon_vr.dm b/code/game/objects/structures/ghost_pods/silicon_vr.dm index 2562ac877a..72ed818f27 100644 --- a/code/game/objects/structures/ghost_pods/silicon_vr.dm +++ b/code/game/objects/structures/ghost_pods/silicon_vr.dm @@ -20,8 +20,8 @@ definiton of 'the station' is where your pod is, and unless your laws say otherwise, the entity that released you \ from the pod is not a crewmember.") R.ckey = M.ckey - visible_message("As \the [src] opens, the eyes of the robot flicker as it is activated.") + visible_message(span_warning("As \the [src] opens, the eyes of the robot flicker as it is activated.")) R.namepick() log_and_message_admins("successfully opened \a [src] and got a Lost Drone.") used = TRUE - return TRUE \ No newline at end of file + return TRUE diff --git a/code/game/objects/structures/ghost_pods/survivor.dm b/code/game/objects/structures/ghost_pods/survivor.dm index 197693a3cd..a97a201305 100644 --- a/code/game/objects/structures/ghost_pods/survivor.dm +++ b/code/game/objects/structures/ghost_pods/survivor.dm @@ -64,9 +64,9 @@ var/mob/living/carbon/human/H = new(src) if(M.mind) M.mind.transfer_to(H) - to_chat(M, "You are a [occupant_type]!") + to_chat(M, span_notice("You are a [occupant_type]!")) H.ckey = M.ckey - visible_message("As \the [src] opens, the pipes on \the [src] surge, before it grows dark.") + visible_message(span_warning("As \the [src] opens, the pipes on \the [src] surge, before it grows dark.")) log_and_message_admins("successfully opened \a [src] and got a [occupant_type].") var/list/uniform_options @@ -144,4 +144,4 @@ if(allow_appearance_change) H.change_appearance(APPEARANCE_ALL, H, check_species_whitelist = 1) - visible_message("\The [src] [pick("gurgles", "seizes", "clangs")] before releasing \the [H]!") + visible_message(span_alien("\The [src] [pick("gurgles", "seizes", "clangs")] before releasing \the [H]!")) diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 170199b9d3..708bba5edd 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -89,7 +89,7 @@ if(damage < STRUCTURE_MIN_DAMAGE_THRESHOLD) return 0 user.do_attack_animation(src) - visible_message("[user] [attack_message] the [src]!") + visible_message(span_danger("[user] [attack_message] the [src]!")) spawn(1) dismantle() return 1 @@ -111,7 +111,7 @@ damage = round(new_damage) Proj.damage = outgoing_damage - visible_message("\The [src] reflects \the [Proj]!") + visible_message(span_danger("\The [src] reflects \the [Proj]!")) // Find a turf near or on the original location to bounce to var/new_x = Proj.starting.x + pick(0, 0, 0, -1, 1, -2, 2) @@ -149,58 +149,58 @@ if(W.has_tool_quality(TOOL_WRENCH) && state == 0) if(anchored && !reinf_material) playsound(src, W.usesound, 100, 1) - to_chat(user, "Now disassembling the girder...") + to_chat(user, span_notice("Now disassembling the girder...")) if(do_after(user,(35 + round(max_health/50)) * W.toolspeed)) if(!src) return - to_chat(user, "You dissasembled the girder!") + to_chat(user, span_notice("You dissasembled the girder!")) dismantle() else if(!anchored) playsound(src, W.usesound, 100, 1) - to_chat(user, "Now securing the girder...") + to_chat(user, span_notice("Now securing the girder...")) if(do_after(user, 40 * W.toolspeed, src)) - to_chat(user, "You secured the girder!") + to_chat(user, span_notice("You secured the girder!")) reset_girder() else if(istype(W, /obj/item/pickaxe/plasmacutter)) - to_chat(user, "Now slicing apart the girder...") + to_chat(user, span_notice("Now slicing apart the girder...")) if(do_after(user,30 * W.toolspeed)) if(!src) return - to_chat(user, "You slice apart the girder!") + to_chat(user, span_notice("You slice apart the girder!")) dismantle() else if(istype(W, /obj/item/pickaxe/diamonddrill)) - to_chat(user, "You drill through the girder!") + to_chat(user, span_notice("You drill through the girder!")) dismantle() else if(W.has_tool_quality(TOOL_SCREWDRIVER)) if(state == 2) playsound(src, W.usesound, 100, 1) - to_chat(user, "Now unsecuring support struts...") + to_chat(user, span_notice("Now unsecuring support struts...")) if(do_after(user,40 * W.toolspeed)) if(!src) return - to_chat(user, "You unsecured the support struts!") + to_chat(user, span_notice("You unsecured the support struts!")) state = 1 else if(anchored && !reinf_material) playsound(src, W.usesound, 100, 1) reinforcing = !reinforcing - to_chat(user, "\The [src] can now be [reinforcing? "reinforced" : "constructed"]!") + to_chat(user, span_notice("\The [src] can now be [reinforcing? "reinforced" : "constructed"]!")) else if(W.has_tool_quality(TOOL_WIRECUTTER) && state == 1) playsound(src, W.usesound, 100, 1) - to_chat(user, "Now removing support struts...") + to_chat(user, span_notice("Now removing support struts...")) if(do_after(user,40 * W.toolspeed)) if(!src) return - to_chat(user, "You removed the support struts!") + to_chat(user, span_notice("You removed the support struts!")) reinf_material.place_dismantled_product(get_turf(src)) reinf_material = null reset_girder() else if(W.has_tool_quality(TOOL_CROWBAR) && state == 0 && anchored) playsound(src, W.usesound, 100, 1) - to_chat(user, "Now dislodging the girder...") + to_chat(user, span_notice("Now dislodging the girder...")) if(do_after(user, 40 * W.toolspeed)) if(!src) return - to_chat(user, "You dislodged the girder!") + to_chat(user, span_notice("You dislodged the girder!")) displace() else if(istype(W, /obj/item/stack/material)) @@ -225,7 +225,7 @@ /obj/structure/girder/proc/construct_wall(obj/item/stack/material/S, mob/user) var/amount_to_use = reinf_material ? 1 : 2 if(S.get_amount() < amount_to_use) - to_chat(user, "There isn't enough material here to construct a wall.") + to_chat(user, span_notice("There isn't enough material here to construct a wall.")) return 0 var/datum/material/M = name_to_material[S.default_type] @@ -236,18 +236,18 @@ add_hiddenprint(usr) if(M.integrity < 50) - to_chat(user, "This material is too soft for use in wall construction.") + to_chat(user, span_notice("This material is too soft for use in wall construction.")) return 0 - to_chat(user, "You begin adding the plating...") + to_chat(user, span_notice("You begin adding the plating...")) if(!do_after(user,40) || !S.use(amount_to_use)) return 1 //once we've gotten this far don't call parent attackby() if(anchored) - to_chat(user, "You added the plating!") + to_chat(user, span_notice("You added the plating!")) else - to_chat(user, "You create a false wall! Push on it to open or close the passage.") + to_chat(user, span_notice("You create a false wall! Push on it to open or close the passage.")) wall_fake = 1 var/turf/Tsrc = get_turf(src) @@ -262,11 +262,11 @@ /obj/structure/girder/proc/reinforce_with_material(obj/item/stack/material/S, mob/user) //if the verb is removed this can be renamed. if(reinf_material) - to_chat(user, "\The [src] is already reinforced.") + to_chat(user, span_notice("\The [src] is already reinforced.")) return 0 if(S.get_amount() < 1) - to_chat(user, "There isn't enough material here to reinforce the girder.") + to_chat(user, span_notice("There isn't enough material here to reinforce the girder.")) return 0 var/datum/material/M = name_to_material[S.default_type] @@ -274,10 +274,10 @@ to_chat(user, "You cannot reinforce \the [src] with that; it is too soft.") return 0 - to_chat(user, "Now reinforcing...") + to_chat(user, span_notice("Now reinforcing...")) if (!do_after(user,40) || !S.use(1)) return 1 //don't call parent attackby() past this point - to_chat(user, "You added reinforcement!") + to_chat(user, span_notice("You added reinforcement!")) reinf_material = M reinforce_girder() @@ -296,7 +296,7 @@ /obj/structure/girder/attack_hand(mob/user as mob) if (HULK in user.mutations) - visible_message("[user] smashes [src] apart!") + visible_message(span_danger("[user] smashes [src] apart!")) dismantle() return return ..() @@ -341,19 +341,19 @@ /obj/structure/girder/cult/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) playsound(src, W.usesound, 100, 1) - to_chat(user, "Now disassembling the girder...") + to_chat(user, span_notice("Now disassembling the girder...")) if(do_after(user,40 * W.toolspeed)) - to_chat(user, "You dissasembled the girder!") + to_chat(user, span_notice("You dissasembled the girder!")) dismantle() else if(istype(W, /obj/item/pickaxe/plasmacutter)) - to_chat(user, "Now slicing apart the girder...") + to_chat(user, span_notice("Now slicing apart the girder...")) if(do_after(user,30 * W.toolspeed)) - to_chat(user, "You slice apart the girder!") + to_chat(user, span_notice("You slice apart the girder!")) dismantle() else if(istype(W, /obj/item/pickaxe/diamonddrill)) - to_chat(user, "You drill through the girder!") + to_chat(user, span_notice("You drill through the girder!")) new /obj/effect/decal/remains/human(get_turf(src)) dismantle() diff --git a/code/game/objects/structures/gravemarker.dm b/code/game/objects/structures/gravemarker.dm index cecf607de1..f793a39bf0 100644 --- a/code/game/objects/structures/gravemarker.dm +++ b/code/game/objects/structures/gravemarker.dm @@ -87,11 +87,11 @@ /obj/structure/gravemarker/ex_act(severity) switch(severity) if(1.0) - visible_message("\The [src] is blown apart!") + visible_message(span_danger("\The [src] is blown apart!")) qdel(src) return if(2.0) - visible_message("\The [src] is blown apart!") + visible_message(span_danger("\The [src] is blown apart!")) if(prob(50)) dismantle() else @@ -101,7 +101,7 @@ /obj/structure/gravemarker/proc/damage(var/damage) health -= damage if(health <= 0) - visible_message("\The [src] falls apart!") + visible_message(span_danger("\The [src] falls apart!")) dismantle() /obj/structure/gravemarker/proc/dismantle() diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index a3d9d0025f..f9d80277a4 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -103,8 +103,8 @@ if(!shock(user, 90)) playsound(src, W.usesound, 100, 1) anchored = !anchored - user.visible_message("[user] [anchored ? "fastens" : "unfastens"] the grille.", \ - "You have [anchored ? "fastened the grille to" : "unfastened the grille from"] the floor.") + user.visible_message(span_notice("[user] [anchored ? "fastens" : "unfastens"] the grille."), \ + span_notice("You have [anchored ? "fastened the grille to" : "unfastened the grille from"] the floor.")) return //window placing begin //TODO CONVERT PROPERLY TO MATERIAL DATUM @@ -129,23 +129,23 @@ else dir_to_set = 4 else - to_chat(user, "You can't reach.") + to_chat(user, span_notice("You can't reach.")) return //Only works for cardinal direcitons, diagonals aren't supposed to work like this. for(var/obj/structure/window/WINDOW in loc) if(WINDOW.dir == dir_to_set) - to_chat(user, "There is already a window facing this way there.") + to_chat(user, span_notice("There is already a window facing this way there.")) return - to_chat(user, "You start placing the window.") + to_chat(user, span_notice("You start placing the window.")) if(do_after(user,20)) for(var/obj/structure/window/WINDOW in loc) if(WINDOW.dir == dir_to_set)//checking this for a 2nd time to check if a window was made while we were waiting. - to_chat(user, "There is already a window facing this way there.") + to_chat(user, span_notice("There is already a window facing this way there.")) return var/wtype = ST.material.created_window if (ST.use(1)) var/obj/structure/window/WD = new wtype(loc, dir_to_set, 1) - to_chat(user, "You place the [WD] on [src].") + to_chat(user, span_notice("You place the [WD] on [src].")) WD.update_icon() return //window placing end @@ -213,7 +213,7 @@ ..() /obj/structure/grille/attack_generic(var/mob/user, var/damage, var/attack_verb) - visible_message("[user] [attack_verb] the [src]!") + visible_message(span_danger("[user] [attack_verb] the [src]!")) user.do_attack_animation(src) health -= damage spawn(1) healthcheck() diff --git a/code/game/objects/structures/holoplant.dm b/code/game/objects/structures/holoplant.dm index 01a0436be9..57f14bbc60 100644 --- a/code/game/objects/structures/holoplant.dm +++ b/code/game/objects/structures/holoplant.dm @@ -26,7 +26,7 @@ return if(!anchored) - to_chat(user,"\The [src] must be anchored before activation!") + to_chat(user,span_warning("\The [src] must be anchored before activation!")) return if(!plant) @@ -103,4 +103,4 @@ /obj/machinery/holoplant/shipped anchored = FALSE /obj/machinery/holoplant/shipped/Initialize() - . = ..() \ No newline at end of file + . = ..() diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index e7676d0403..536d99e260 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -76,7 +76,7 @@ if(!istype(W)) return if (can_puncture(W)) - visible_message("[user] pierces [src] with [W]!") + visible_message(span_danger("[user] pierces [src] with [W]!")) puncture() if(W.damtype == BRUTE || W.damtype == BURN) hit(W.force) @@ -95,7 +95,7 @@ /obj/item/inflatable/proc/inflate(var/mob/user,var/location) playsound(location, 'sound/items/zip.ogg', 75, 1) - to_chat(user, "You inflate [src].") + to_chat(user, span_notice("You inflate [src].")) var/obj/structure/inflatable/R = new deploy_path(location) src.transfer_fingerprints_to(R) R.add_fingerprint(user) @@ -103,7 +103,7 @@ /obj/structure/inflatable/proc/deflate() playsound(src, 'sound/machines/hiss.ogg', 75, 1) - //to_chat(user, "You slowly deflate the inflatable wall.") + //to_chat(user, span_notice("You slowly deflate the inflatable wall.")) visible_message("[src] slowly deflates.") spawn(50) var/obj/item/inflatable/R = new /obj/item/inflatable(loc) @@ -132,16 +132,16 @@ health -= damage user.do_attack_animation(src) if(health <= 0) - user.visible_message("[user] [attack_verb] open the [src]!") + user.visible_message(span_danger("[user] [attack_verb] open the [src]!")) spawn(1) puncture() else - user.visible_message("[user] [attack_verb] at [src]!") + user.visible_message(span_danger("[user] [attack_verb] at [src]!")) return 1 /obj/structure/inflatable/take_damage(var/damage) health -= damage if(health <= 0) - visible_message("The [src] deflates!") + visible_message(span_danger("The [src] deflates!")) spawn(1) puncture() return 1 @@ -248,7 +248,7 @@ icon_state = "folded_wall_torn" /obj/item/inflatable/torn/attack_self(mob/user) - to_chat(user, "The inflatable wall is too torn to be inflated!") + to_chat(user, span_notice("The inflatable wall is too torn to be inflated!")) add_fingerprint(user) /obj/item/inflatable/door/torn @@ -258,7 +258,7 @@ icon_state = "folded_door_torn" /obj/item/inflatable/door/torn/attack_self(mob/user) - to_chat(user, "The inflatable door is too torn to be inflated!") + to_chat(user, span_notice("The inflatable door is too torn to be inflated!")) add_fingerprint(user) /obj/item/storage/briefcase/inflatable diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 0f7dad89e2..5fe81e6318 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -36,37 +36,37 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) )) if(!is_type_in_typecache(I, equippable_item_whitelist)) - to_chat(user, "There's no room in [src] for [I].") + to_chat(user, span_warning("There's no room in [src] for [I].")) return FALSE if(!user.canUnEquip(I)) - to_chat(user, "[I] is stuck to your hand.") + to_chat(user, span_warning("[I] is stuck to your hand.")) return FALSE if(istype(I, /obj/item/storage/bag/trash)) if(mybag) - to_chat(user, "[src] already has \an [I].") + to_chat(user, span_warning("[src] already has \an [I].")) return FALSE mybag = I setTguiIcon("mybag", mybag) else if(istype(I, /obj/item/mop) || istype(I, /obj/item/mop/advanced)) if(mymop) - to_chat(user, "[src] already has \an [I].") + to_chat(user, span_warning("[src] already has \an [I].")) return FALSE mymop = I setTguiIcon("mymop", mymop) else if(istype(I, /obj/item/reagent_containers/spray)) if(myspray) - to_chat(user, "[src] already has \an [I].") + to_chat(user, span_warning("[src] already has \an [I].")) return FALSE myspray = I setTguiIcon("myspray", myspray) else if(istype(I, /obj/item/lightreplacer)) if(myreplacer) - to_chat(user, "[src] already has \an [I].") + to_chat(user, span_warning("[src] already has \an [I].")) return FALSE myreplacer = I setTguiIcon("myreplacer", myreplacer) @@ -76,17 +76,17 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) signs++ setTguiIcon("signs", I) else - to_chat(user, "[src] can't hold any more signs.") + to_chat(user, span_notice("[src] can't hold any more signs.")) return FALSE else // This may look like duplicate code, but it's important that we don't call unEquip *and* warn the user if // something horrible goes wrong. (this else is never supposed to happen) - to_chat(user, "There's no room in [src] for [I].") + to_chat(user, span_warning("There's no room in [src] for [I].")) return FALSE user.drop_from_inventory(I, src) update_icon() - to_chat(user, "You put [I] into [src].") + to_chat(user, span_notice("You put [I] into [src].")) return TRUE /obj/structure/janitorialcart/proc/setTguiIcon(key, atom/A) @@ -139,15 +139,15 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) if (mybucket) if(I.reagents.total_volume < I.reagents.maximum_volume) if(mybucket.reagents.total_volume < 1) - to_chat(user, "[mybucket] is empty!") + to_chat(user, span_notice("[mybucket] is empty!")) else mybucket.reagents.trans_to_obj(I, 5) // - to_chat(user, "You wet [I] in [mybucket].") + to_chat(user, span_notice("You wet [I] in [mybucket].")) playsound(src, 'sound/effects/slosh.ogg', 25, 1) else - to_chat(user, "[I] can't absorb anymore liquid!") + to_chat(user, span_notice("[I] can't absorb anymore liquid!")) else - to_chat(user, "There is no bucket mounted here to dip [I] into!") + to_chat(user, span_notice("There is no bucket mounted here to dip [I] into!")) return 1 else if (istype(I, /obj/item/reagent_containers/glass/bucket) && mybucket) @@ -232,7 +232,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) if("bag") if(mybag) usr.put_in_hands(mybag) - to_chat(usr, "You take [mybag] from [src].") + to_chat(usr, span_notice("You take [mybag] from [src].")) mybag = null nullTguiIcon("mybag") else if(is_type_in_typecache(I, equippable_item_whitelist)) @@ -240,7 +240,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) if("mop") if(mymop) usr.put_in_hands(mymop) - to_chat(usr, "You take [mymop] from [src].") + to_chat(usr, span_notice("You take [mymop] from [src].")) mymop = null nullTguiIcon("mymop") else if(is_type_in_typecache(I, equippable_item_whitelist)) @@ -248,7 +248,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) if("spray") if(myspray) usr.put_in_hands(myspray) - to_chat(usr, "You take [myspray] from [src].") + to_chat(usr, span_notice("You take [myspray] from [src].")) myspray = null nullTguiIcon("myspray") else if(is_type_in_typecache(I, equippable_item_whitelist)) @@ -256,7 +256,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) if("replacer") if(myreplacer) usr.put_in_hands(myreplacer) - to_chat(usr, "You take [myreplacer] from [src].") + to_chat(usr, span_notice("You take [myreplacer] from [src].")) myreplacer = null nullTguiIcon("myreplacer") else if(is_type_in_typecache(I, equippable_item_whitelist)) @@ -268,20 +268,20 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) var/obj/item/clothing/suit/caution/sign = locate() in src if(sign) usr.put_in_hands(sign) - to_chat(usr, "You take \a [sign] from [src].") + to_chat(usr, span_notice("You take \a [sign] from [src].")) signs-- if(!signs) nullTguiIcon("signs") else - to_chat(usr, "[src] doesn't have any signs left.") + to_chat(usr, span_notice("[src] doesn't have any signs left.")) if("bucket") if(mybucket) mybucket.forceMove(get_turf(usr)) - to_chat(usr, "You unmount [mybucket] from [src].") + to_chat(usr, span_notice("You unmount [mybucket] from [src].")) mybucket = null nullTguiIcon("mybucket") else - to_chat(usr, "((Drag and drop a mop bucket onto [src] to equip it.))") + to_chat(usr, span_notice("((Drag and drop a mop bucket onto [src] to equip it.))")) return FALSE else return FALSE @@ -402,14 +402,14 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) if(istype(I, /obj/item/mop)) if(reagents.total_volume > 1) reagents.trans_to_obj(I, 2) - to_chat(user, "You wet [I] in the [callme].") + to_chat(user, span_notice("You wet [I] in the [callme].")) playsound(src, 'sound/effects/slosh.ogg', 25, 1) else - to_chat(user, "This [callme] is out of water!") + to_chat(user, span_notice("This [callme] is out of water!")) else if(istype(I, /obj/item/key)) to_chat(user, "Hold [I] in one of your hands while you drive this [callme].") else if(istype(I, /obj/item/storage/bag/trash)) - to_chat(user, "You hook the trashbag onto the [callme].") + to_chat(user, span_notice("You hook the trashbag onto the [callme].")) user.drop_item() I.loc = src mybag = I @@ -431,7 +431,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) step(src, direction) update_mob() else - to_chat(user, "You'll need the keys in one of your hands to drive this [callme].") + to_chat(user, span_notice("You'll need the keys in one of your hands to drive this [callme].")) /obj/structure/bed/chair/janicart/post_buckle_mob(mob/living/M) @@ -490,7 +490,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) if(prob(85)) var/mob/living/L = pick(buckled_mobs) return L.bullet_act(Proj) - visible_message("[Proj] ricochets off the [callme]!") + visible_message(span_warning("[Proj] ricochets off the [callme]!")) /obj/item/key diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 4f8fbc9209..b13c51e14b 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -26,7 +26,7 @@ qdel(G) qdel(M) else - to_chat(user, "They are too big for the spike, try something smaller!") + to_chat(user, span_danger("They are too big for the spike, try something smaller!")) /obj/structure/kitchenspike/proc/spike(var/mob/living/victim) if(!istype(victim)) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index a2865afd66..d84c9b3e50 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -63,7 +63,7 @@ var/obj/item/weldingtool/WT = C.get_welder() if(WT.welding == 1) if(WT.remove_fuel(0, user)) - to_chat(user, "Slicing lattice joints ...") + to_chat(user, span_notice("Slicing lattice joints ...")) new /obj/item/stack/rods(src.loc, 1) //VOREstation Edit: Return the same amount of rods used to build this. qdel(src) return @@ -93,7 +93,7 @@ //Vorestation Edit: Moves upgrading lattices to their own proc for other stuff to call. Also makes them instant. /obj/structure/lattice/proc/upgrade(obj/item/stack/rods/R, mob/user) - to_chat(user, "You start connecting \the [R.name] to \the [src.name] ...") + to_chat(user, span_notice("You start connecting \the [R.name] to \the [src.name] ...")) R.use(1) src.alpha = 0 // Note: I don't know why this is set, Eris did it, just trusting for now. ~Leshana new /obj/structure/catwalk(src.loc) diff --git a/code/game/objects/structures/ledges.dm b/code/game/objects/structures/ledges.dm index 819395f2c3..301488f38c 100644 --- a/code/game/objects/structures/ledges.dm +++ b/code/game/objects/structures/ledges.dm @@ -54,7 +54,7 @@ if(!can_climb(user)) return - usr.visible_message("[user] starts climbing onto \the [src]!") + usr.visible_message(span_warning("[user] starts climbing onto \the [src]!")) LAZYDISTINCTADD(climbers, user) if(!do_after(user,(issmall(user) ? 20 : 34))) @@ -70,7 +70,7 @@ else usr.forceMove(get_turf(src)) - usr.visible_message("[user] climbed over \the [src]!") + usr.visible_message(span_warning("[user] climbed over \the [src]!")) LAZYREMOVE(climbers, user) /obj/structure/ledge/can_climb(var/mob/living/user, post_climb_check=0) @@ -80,6 +80,6 @@ if(get_turf(user) == get_turf(src)) var/obj/occupied = neighbor_turf_impassable() if(occupied) - to_chat(user, "You can't climb there, there's \a [occupied] in the way.") + to_chat(user, span_danger("You can't climb there, there's \a [occupied] in the way.")) return 0 - return 1 \ No newline at end of file + return 1 diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm index e0efdfe1ae..58d4cd781f 100644 --- a/code/game/objects/structures/loot_piles.dm +++ b/code/game/objects/structures/loot_piles.dm @@ -51,29 +51,29 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh var/mob/living/L = user if(busy) - to_chat(L, "\The [src] is already being searched.") + to_chat(L, span_warning("\The [src] is already being searched.")) return - L.visible_message("[user] searches through \the [src].","You search through \the [src].") + L.visible_message("[user] searches through \the [src].",span_notice("You search through \the [src].")) //Do the searching busy = TRUE if(do_after(user,rand(4 SECONDS,6 SECONDS),src)) // The loot's all gone. if(loot_depletion && loot_left <= 0) - to_chat(L, "\The [src] has been picked clean.") + to_chat(L, span_warning("\The [src] has been picked clean.")) busy = FALSE return //You already searched this one if( (user.ckey in searched_by) && !allow_multiple_looting) - to_chat(L, "You can't find anything else vaguely useful in \the [src]. Another set of eyes might, however.") + to_chat(L, span_warning("You can't find anything else vaguely useful in \the [src]. Another set of eyes might, however.")) busy = FALSE return // You got unlucky. if(chance_nothing && prob(chance_nothing)) - to_chat(L, "Nothing in this pile really catches your eye...") + to_chat(L, span_warning("Nothing in this pile really catches your eye...")) searched_by |= user.ckey busy = FALSE return @@ -104,11 +104,19 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh if(loot) searched_by |= user.ckey loot.forceMove(get_turf(src)) - to_chat(L, "You found \a [loot]!") + var/final_message = "You found \a [loot]!" + switch(span) + if("notice") + final_message = span_notice(final_message) + if("cult") + final_message = span_cult(final_message) + if("alium") + final_message = span_alium(final_message) + to_chat(L, span_info(final_message)) if(loot_depletion) loot_left-- if(loot_left <= 0) - to_chat(L, "You seem to have gotten the last of the spoils inside \the [src].") + to_chat(L, span_warning("You seem to have gotten the last of the spoils inside \the [src].")) if(delete_on_depletion) qdel(src) diff --git a/code/game/objects/structures/low_wall.dm b/code/game/objects/structures/low_wall.dm index fb51c53a36..b642ea80ae 100644 --- a/code/game/objects/structures/low_wall.dm +++ b/code/game/objects/structures/low_wall.dm @@ -62,15 +62,15 @@ . = ..() if(health == material.integrity) - to_chat(user, "It seems to be in fine condition.") + to_chat(user, span_notice("It seems to be in fine condition.")) else var/dam = health / material.integrity if(dam <= 0.3) - to_chat(user, "It's got a few dents and scratches.") + to_chat(user, span_notice("It's got a few dents and scratches.")) else if(dam <= 0.7) - to_chat(user, "A few pieces of panelling have fallen off.") + to_chat(user, span_warning("A few pieces of panelling have fallen off.")) else - to_chat(user, "It's nearly falling to pieces.") + to_chat(user, span_danger("It's nearly falling to pieces.")) /obj/structure/low_wall/attackby(var/obj/item/W, var/mob/user, var/hit_modifier, var/click_parameters) src.add_fingerprint(user) @@ -89,15 +89,15 @@ if(W.has_tool_quality(TOOL_WRENCH)) for(var/obj/structure/S in loc) if(istype(S, /obj/structure/window)) - to_chat(user, "There is still a window on the low wall!") + to_chat(user, span_notice("There is still a window on the low wall!")) return else if(istype(S, /obj/structure/grille)) - to_chat(user, "There is still a grille on the low wall!") + to_chat(user, span_notice("There is still a grille on the low wall!")) return playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) - to_chat(user, "Now disassembling the low wall...") + to_chat(user, span_notice("Now disassembling the low wall...")) if(do_after(user, 40, src)) - to_chat(user, "You dissasembled the low wall!") + to_chat(user, span_notice("You dissasembled the low wall!")) dismantle() return @@ -133,7 +133,7 @@ if(istype(O, /obj/structure/window)) var/obj/structure/window/W = O if(Adjacent(W) && !W.anchored) - to_chat(user, "You hoist [W] up onto [src].") + to_chat(user, span_notice("You hoist [W] up onto [src].")) W.forceMove(loc) return if(isrobot(user)) @@ -163,16 +163,16 @@ /obj/structure/low_wall/proc/handle_rod_use(mob/user, obj/item/stack/rods/R) if(!grille_type) - to_chat(user, "This type of wall frame doesn't support grilles.") + to_chat(user, span_notice("This type of wall frame doesn't support grilles.")) return for(var/obj/structure/window/WINDOW in loc) if(WINDOW.dir == get_dir(src, user)) - to_chat(user, "There is a window in the way.") + to_chat(user, span_notice("There is a window in the way.")) return if(R.get_amount() < 2) - to_chat(user, "You need at least two rods to do this.") + to_chat(user, span_warning("You need at least two rods to do this.")) return - to_chat(user, "Assembling grille...") + to_chat(user, span_notice("Assembling grille...")) if(!do_after(user, 1 SECONDS, R, exclusive = TASK_ALL_EXCLUSIVE)) return if(!R.use(2)) @@ -183,16 +183,16 @@ /obj/structure/low_wall/proc/handle_glass_use(mob/user, obj/item/stack/material/glass/G) var/window_type = get_window_build_type(user, G) if(!window_type) - to_chat(user, "You can't build that type of window on this type of low wall.") + to_chat(user, span_notice("You can't build that type of window on this type of low wall.")) return for(var/obj/structure/window/WINDOW in loc) if(WINDOW.dir == get_dir(src, user)) - to_chat(user, "There is already a window here.") + to_chat(user, span_notice("There is already a window here.")) return if(G.get_amount() < 4) - to_chat(user, "You need at least four sheets of glass to do this.") + to_chat(user, span_warning("You need at least four sheets of glass to do this.")) return - to_chat(user, "Assembling window...") + to_chat(user, span_notice("Assembling window...")) if(!do_after(user, 4 SECONDS, G, exclusive = TASK_ALL_EXCLUSIVE)) return if(!G.use(4)) @@ -277,7 +277,7 @@ dismantle() /obj/structure/low_wall/attack_generic(var/mob/user, var/damage, var/attack_verb) - visible_message("[user] [attack_verb] the [src]!") + visible_message(span_danger("[user] [attack_verb] the [src]!")) user.do_attack_animation(src) take_damage(damage) return ..() diff --git a/code/game/objects/structures/medical_stand_vr.dm b/code/game/objects/structures/medical_stand_vr.dm index eae5364f15..453ede666d 100644 --- a/code/game/objects/structures/medical_stand_vr.dm +++ b/code/game/objects/structures/medical_stand_vr.dm @@ -80,7 +80,7 @@ qdel(tank) if(breather) breather.remove_from_mob(contained) - src.visible_message("The mask rapidly retracts just before /the [src] is destroyed!") + src.visible_message(span_notice("The mask rapidly retracts just before /the [src] is destroyed!")) qdel(contained) contained = null breather = null @@ -133,12 +133,12 @@ update_icon() return usr.visible_message("\The [usr] begins carefully placing the mask onto [target].", - "You begin carefully placing the mask onto [target].") + span_notice("You begin carefully placing the mask onto [target].")) if(!do_mob(usr, target, 100) || !can_apply_to_target(target, usr)) return // place mask and add fingerprints - usr.visible_message("\The [usr] has placed \the mask on [target]'s mouth.", - "You have placed \the mask on [target]'s mouth.") + usr.visible_message(span_notice("\The [usr] has placed \the mask on [target]'s mouth."), + span_notice("You have placed \the mask on [target]'s mouth.")) if(attach_mask(target)) src.add_fingerprint(usr) update_icon() @@ -152,14 +152,14 @@ attached = null else if(ishuman(target)) usr.visible_message("\The [usr] begins inserting needle into [target]'s vein.", - "You begin inserting needle into [target]'s vein.") + span_notice("You begin inserting needle into [target]'s vein.")) if(!do_mob(usr, target, 50)) - usr.visible_message("\The [usr]'s hand slips and pricks \the [target].", - "Your hand slips and pricks \the [target].") + usr.visible_message(span_notice("\The [usr]'s hand slips and pricks \the [target]."), + span_notice("Your hand slips and pricks \the [target].")) target.apply_damage(3, BRUTE, pick(BP_R_ARM, BP_L_ARM)) return usr.visible_message("\The [usr] hooks \the [target] up to \the [src].", - "You hook \the [target] up to \the [src].") + span_notice("You hook \the [target] up to \the [src].")) attached = target START_PROCESSING(SSobj,src) update_icon() @@ -181,7 +181,7 @@ switch (action_type) if ("Remove tank") if (!tank) - to_chat(user, "There is no tank in \the [src]!") + to_chat(user, span_warning("There is no tank in \the [src]!")) return else if (tank && is_loosen) user.visible_message("\The [user] removes \the [tank] from \the [src].", "You remove \the [tank] from \the [src].>") @@ -194,12 +194,12 @@ return if ("Toggle valve") if (!tank) - to_chat(user, "There is no tank in \the [src]!") + to_chat(user, span_warning("There is no tank in \the [src]!")) return else if (valve_opened) src.visible_message("\The [user] closes valve on \the [src]!", - "You close valve on \the [src].") + span_notice("You close valve on \the [src].")) if(breather) breather.internals?.icon_state = "internal0" breather.internal = null @@ -207,7 +207,7 @@ update_icon() else src.visible_message("\The [user] opens valve on \the [src]!", - "You open valve on \the [src].") + span_notice("You open valve on \the [src].")) if(breather) breather.internal = tank breather.internals?.icon_state = "internal1" @@ -227,7 +227,7 @@ set src in view(1) if(!istype(usr, /mob/living)) - to_chat(usr, "You can't do that.") + to_chat(usr, span_warning("You can't do that.")) return if(usr.incapacitated()) @@ -257,42 +257,42 @@ user = target // Check target validity if(!istype(target)) - to_chat(user, "\The [target] not compatible with machine.") + to_chat(user, span_warning("\The [target] not compatible with machine.")) return if(!target.organs_by_name[BP_HEAD]) - to_chat(user, "\The [target] doesn't have a head.") + to_chat(user, span_warning("\The [target] doesn't have a head.")) return if(!target.check_has_mouth()) - to_chat(user, "\The [target] doesn't have a mouth.") + to_chat(user, span_warning("\The [target] doesn't have a mouth.")) return if(target.wear_mask && target != breather) - to_chat(user, "\The [target] is already wearing a mask.") + to_chat(user, span_warning("\The [target] is already wearing a mask.")) return if(target.head && (target.head.body_parts_covered & FACE)) - to_chat(user, "Remove their [target.head] first.") + to_chat(user, span_warning("Remove their [target.head] first.")) return if(!tank) - to_chat(user, "There is no tank in \the [src].") + to_chat(user, span_warning("There is no tank in \the [src].")) return if(is_loosen) - to_chat(user, "Tighten \the nut with a wrench first.") + to_chat(user, span_warning("Tighten \the nut with a wrench first.")) return if(!Adjacent(target)) return //when there is a breather: if(breather && target != breather) - to_chat(user, "\The [src] is already in use.") + to_chat(user, span_warning("\The [src] is already in use.")) return //Checking if breather is still valid if(target == breather && target.wear_mask != contained) - to_chat(user, "\The [target] is not using the supplied mask.") + to_chat(user, span_warning("\The [target] is not using the supplied mask.")) return return 1 /obj/structure/medical_stand/attackby(var/obj/item/W, var/mob/user) if(istype (W, /obj/item/tool)) if (valve_opened) - to_chat(user, "Close the valve first.") + to_chat(user, span_warning("Close the valve first.")) return if (tank) if(!W.has_tool_quality(TOOL_WRENCH)) @@ -304,22 +304,22 @@ if (valve_opened) START_PROCESSING(SSobj,src) user.visible_message( - "The [user] [is_loosen == TRUE ? "loosen" : "tighten"] the nut holding [tank] in place.", - "You [is_loosen == TRUE ? "loosen" : "tighten"] the nut holding [tank] in place.") + span_notice("The [user] [is_loosen == TRUE ? "loosen" : "tighten"] the nut holding [tank] in place."), + span_notice("You [is_loosen == TRUE ? "loosen" : "tighten"] the nut holding [tank] in place.")) else - to_chat(user, "There is no tank in \the [src].") + to_chat(user, span_warning("There is no tank in \the [src].")) else if(istype(W, /obj/item/tank)) if(tank) - to_chat(user, "\The [src] already has a tank installed!") + to_chat(user, span_warning("\The [src] already has a tank installed!")) else if(!is_loosen) - to_chat(user, "Loosen the nut with a wrench first.") + to_chat(user, span_warning("Loosen the nut with a wrench first.")) else user.drop_item() W.forceMove(src) tank = W - user.visible_message("\The [user] attaches \the [tank] to \the [src].", "You attach \the [tank] to \the [src].") + user.visible_message("\The [user] attaches \the [tank] to \the [src].", span_notice("You attach \the [tank] to \the [src].")) src.add_fingerprint(user) update_icon() @@ -345,12 +345,12 @@ . += "The IV drip is [mode ? "injecting" : "taking blood"]." . += "It is set to transfer [transfer_amount]u of chemicals per cycle." if(beaker.reagents && beaker.reagents.total_volume) - . += "Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid." + . += span_notice("Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid.") else - . += "Attached is an empty [beaker]." - . += "[attached ? attached : "No one"] is hooked up to it." + . += span_notice("Attached is an empty [beaker].") + . += span_notice("[attached ? attached : "No one"] is hooked up to it.") else - . += "There is no vessel." + . += span_notice("There is no vessel.") if(tank) if (!is_loosen) @@ -359,7 +359,7 @@ if (tank.distribute_pressure == 0) . += "Use wrench to replace tank." else - . += "There is no tank." + . += span_notice("There is no tank.") /obj/structure/medical_stand/process() //Gas Stuff @@ -441,4 +441,3 @@ spawn_type = /obj/item/tank/anesthetic mask_type = /obj/item/clothing/mask/breath/medical is_loosen = FALSE - diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index b549c06518..db3284c760 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -54,20 +54,20 @@ if(!glass) playsound(src, I.usesound, 50, 1) if(do_after(user, 20 * I.toolspeed)) - to_chat(user, "You unfasten the frame.") + to_chat(user, span_notice("You unfasten the frame.")) new /obj/item/frame/mirror( src.loc ) qdel(src) return if(I.has_tool_quality(TOOL_WRENCH)) if(shattered && glass) - to_chat(user, "The broken glass falls out.") + to_chat(user, span_notice("The broken glass falls out.")) icon_state = "mirror_frame" glass = !glass new /obj/item/material/shard( src.loc ) return if(!shattered && glass) playsound(src, I.usesound, 50, 1) - to_chat(user, "You remove the glass.") + to_chat(user, span_notice("You remove the glass.")) glass = !glass icon_state = "mirror_frame" new /obj/item/stack/material/glass( src.loc, 2 ) @@ -77,15 +77,15 @@ if(!glass) var/obj/item/stack/material/glass/G = I if (G.get_amount() < 2) - to_chat(user, "You need two sheets of glass to add them to the frame.") + to_chat(user, span_warning("You need two sheets of glass to add them to the frame.")) return - to_chat(user, "You start to add the glass to the frame.") + to_chat(user, span_notice("You start to add the glass to the frame.")) if(do_after(user, 20)) if (G.use(2)) shattered = 0 glass = 1 icon_state = "mirror" - to_chat(user, "You add the glass to the frame.") + to_chat(user, span_notice("You add the glass to the frame.")) return if(shattered && glass) @@ -93,11 +93,11 @@ return if(prob(I.force * 2)) - visible_message("[user] smashes [src] with [I]!") + visible_message(span_warning("[user] smashes [src] with [I]!")) if(glass) shatter() else - visible_message("[user] hits [src] with [I]!") + visible_message(span_warning("[user] hits [src] with [I]!")) playsound(src, 'sound/effects/Glasshit.ogg', 70, 1) /obj/structure/mirror/attack_generic(var/mob/user, var/damage) @@ -108,11 +108,11 @@ return 0 if(damage) - user.visible_message("[user] smashes [src]!") + user.visible_message(span_danger("[user] smashes [src]!")) if(glass) shatter() else - user.visible_message("[user] hits [src] and bounces off!") + user.visible_message(span_danger("[user] hits [src] and bounces off!")) return 1 // The following mirror is ~special~. @@ -141,4 +141,4 @@ vox.name = vox.real_name raiders.update_access(vox) qdel(user) - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index ddd9db102c..f0ac25b537 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -24,8 +24,8 @@ GLOBAL_LIST_BOILERPLATE(all_mopbuckets, /obj/structure/mopbucket) /obj/structure/mopbucket/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/mop) || istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on mopbuckets" if(reagents.total_volume < 1) - to_chat(user, "\The [src] is out of water!") + to_chat(user, span_warning("\The [src] is out of water!")) else reagents.trans_to_obj(I, 5) - to_chat(user, "You wet \the [I] in \the [src].") + to_chat(user, span_notice("You wet \the [I] in \the [src].")) playsound(src, 'sound/effects/slosh.ogg', 25, 1) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index b929222cf6..5cb4e5c707 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -189,7 +189,7 @@ if (user != O) for(var/mob/B in viewers(user, 3)) if ((B.client && !( B.blinded ))) - to_chat(B, "\The [user] stuffs [O] into [src]!") + to_chat(B, span_warning("\The [user] stuffs [O] into [src]!")) return @@ -220,7 +220,7 @@ GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium) /obj/structure/morgue/crematorium/attack_hand(mob/user as mob) if (cremating) - to_chat(usr, "It's locked.") + to_chat(usr, span_warning("It's locked.")) return if ((src.connected) && (src.locked == 0)) for(var/atom/movable/A as mob|obj in src.connected.loc) @@ -284,7 +284,7 @@ GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium) if(contents.len <= 0) for (var/mob/M in viewers(src)) - to_chat(M, "You hear a hollow crackle.") + to_chat(M, span_warning("You hear a hollow crackle.")) return else @@ -293,7 +293,7 @@ GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium) return for (var/mob/M in viewers(src)) - to_chat(M, "You hear a roar as the crematorium activates.") + to_chat(M, span_warning("You hear a roar as the crematorium activates.")) cremating = 1 locked = 1 @@ -348,4 +348,4 @@ GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium) if (!C.cremating) C.cremate(user) else - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) diff --git a/code/game/objects/structures/morgue_vr.dm b/code/game/objects/structures/morgue_vr.dm index 366f216089..4d341a1e56 100644 --- a/code/game/objects/structures/morgue_vr.dm +++ b/code/game/objects/structures/morgue_vr.dm @@ -11,7 +11,7 @@ if(contents.len <= 0) for (var/mob/M in viewers(src)) - M.show_message("You hear a hollow crackle.", 1) + M.show_message(span_warning("You hear a hollow crackle."), 1) return else if(!isemptylist(src.search_contents_for(/obj/item/disk/nuclear))) @@ -20,17 +20,17 @@ for(var/I in contents) if(!(I in allowed_items)) - to_chat(user, "\The [src] cannot cremate while there are items inside!") + to_chat(user, span_notice("\The [src] cannot cremate while there are items inside!")) return if(istype(I, /mob/living)) var/mob/living/cremated = I for(var/Z in cremated.contents) if(!(Z in allowed_items)) - to_chat(user, "\The [src] cannot cremate while there are items inside!") + to_chat(user, span_notice("\The [src] cannot cremate while there are items inside!")) return for (var/mob/M in viewers(src)) - M.show_message("You hear a roar as the crematorium activates.", 1) + M.show_message(span_warning("You hear a roar as the crematorium activates."), 1) cremating = 1 locked = 1 @@ -56,4 +56,4 @@ cremating = 0 locked = 0 playsound(src, 'sound/machines/ding.ogg', 50, 1) - return \ No newline at end of file + return diff --git a/code/game/objects/structures/pillows.dm b/code/game/objects/structures/pillows.dm index 44b3e0882d..9f251db31d 100644 --- a/code/game/objects/structures/pillows.dm +++ b/code/game/objects/structures/pillows.dm @@ -21,7 +21,7 @@ /obj/item/bedsheet/pillow/attackby(var/obj/item/component, mob/user as mob) if (istype(component,src)) - to_chat(user, "You assemble a pillow pile!") + to_chat(user, span_notice("You assemble a pillow pile!")) user.drop_item() qdel(component) var/turf/T = get_turf(src) @@ -29,7 +29,7 @@ user.drop_from_inventory(src) qdel(src) else - to_chat(user, "You can't assemble a pillow pile out of mismatched stuff, it'd look hideous!") + to_chat(user, span_notice("You can't assemble a pillow pile out of mismatched stuff, it'd look hideous!")) //Pillow Piles, they're piles of pillows! layer = BELOW_MOB_LAYER @@ -62,18 +62,18 @@ return /obj/structure/bed/pillowpile/attack_hand(mob/user) - to_chat(user, "Now disassembling the large pillow pile...") + to_chat(user, span_notice("Now disassembling the large pillow pile...")) if(do_after(user, 30)) if(!src) return - to_chat(user, "You dissasembled the large pillow pile!") + to_chat(user, span_notice("You dissasembled the large pillow pile!")) new sourcepillow(src.loc) qdel(src) /obj/structure/bed/pillowpilefront/attack_hand(mob/user) - to_chat(user, "Now disassembling the front of the pillow pile...") + to_chat(user, span_notice("Now disassembling the front of the pillow pile...")) if(do_after(user, 30)) if(!src) return - to_chat(user, "You dissasembled the the front of the pillow pile!") + to_chat(user, span_notice("You dissasembled the the front of the pillow pile!")) new sourcepillow(src.loc) qdel(src) @@ -257,4 +257,3 @@ ) time = 60 category = CAT_MISC - diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index ae26157f39..0686a3d05d 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -19,9 +19,9 @@ /obj/structure/plasticflaps/attackby(obj/item/P, mob/user) if(P.has_tool_quality(TOOL_WIRECUTTER)) playsound(src, P.usesound, 50, 1) - to_chat(user, "You start to cut the plastic flaps.") + to_chat(user, span_notice("You start to cut the plastic flaps.")) if(do_after(user, 10 * P.toolspeed)) - to_chat(user, "You cut the plastic flaps.") + to_chat(user, span_notice("You cut the plastic flaps.")) new /obj/item/stack/material/plastic(src.loc, 4) qdel(src) return @@ -65,4 +65,4 @@ name = "airtight plastic flaps" desc = "Heavy duty, airtight, plastic flaps. Have extra safety installed, preventing passage of living beings." can_atmos_pass = ATMOS_PASS_NO - can_pass_lying = FALSE \ No newline at end of file + can_pass_lying = FALSE diff --git a/code/game/objects/structures/props/alien_props.dm b/code/game/objects/structures/props/alien_props.dm index 38f0b1b893..f1a3502ee8 100644 --- a/code/game/objects/structures/props/alien_props.dm +++ b/code/game/objects/structures/props/alien_props.dm @@ -25,19 +25,19 @@ name = "alien dispenser" desc = "This looks like it dispenses... something?" icon_state = "dispenser" - interaction_message = "You don't see any mechanism to operate this. Probably for the best." + interaction_message = span_warning("You don't see any mechanism to operate this. Probably for the best.") /obj/structure/prop/alien/pod name = "alien pod" desc = "This seems to be a container for something." icon_state = "experiment" - interaction_message = "You don't see any mechanism to open this thing. Probably for the best." + interaction_message = span_warning("You don't see any mechanism to open this thing. Probably for the best.") /obj/structure/prop/alien/pod/open name = "opened alien pod" desc = "At one point, this probably contained something interesting..." icon_state = "experiment-open" - interaction_message = "You don't see any mechanism to close this thing." + interaction_message = span_warning("You don't see any mechanism to close this thing.") // Obtained by scanning both a void core and void cell. @@ -89,7 +89,7 @@ name = "void core" icon_state = "core" desc = "An alien machine that seems to be producing energy seemingly out of nowhere." - interaction_message = "Messing with something that makes energy out of nowhere seems very unwise." + interaction_message = span_warning("Messing with something that makes energy out of nowhere seems very unwise.") catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_void_core) /obj/item/prop/alien diff --git a/code/game/objects/structures/props/alien_props_vr.dm b/code/game/objects/structures/props/alien_props_vr.dm index ffad6aa1e5..8ec7a10651 100644 --- a/code/game/objects/structures/props/alien_props_vr.dm +++ b/code/game/objects/structures/props/alien_props_vr.dm @@ -3,15 +3,15 @@ desc = "The console flashes what appear to be symbols you've never seen before, intermixed with human writing moving too fast to comprehend." icon = 'icons/obj/abductor_vr.dmi' icon_state = "console-c" - interaction_message = "The screen flashes an 'access denied' message at you. Perhaps for the best." + interaction_message = span_warning("The screen flashes an 'access denied' message at you. Perhaps for the best.") /obj/structure/prop/alien/pod/hybrid name = "hybrid pod" desc = "This seems to be a container for something." icon = 'icons/obj/abductor_vr.dmi' icon_state = "experiment" - interaction_message = "You don't see any mechanism to open this thing. Probably for the best." + interaction_message = span_warning("You don't see any mechanism to open this thing. Probably for the best.") /obj/structure/prop/alien/dispenser/twoway icon = 'icons/obj/abductor_vr.dmi' - icon_state = "dispenser_2way" \ No newline at end of file + icon_state = "dispenser_2way" diff --git a/code/game/objects/structures/props/beam_prism.dm b/code/game/objects/structures/props/beam_prism.dm index 7b62ea6c60..98f16a6a59 100644 --- a/code/game/objects/structures/props/beam_prism.dm +++ b/code/game/objects/structures/props/beam_prism.dm @@ -24,7 +24,7 @@ var/dialID = null var/obj/structure/prop/prismcontrol/remote_dial = null - interaction_message = "The prismatic turret seems to be able to rotate." + interaction_message = span_notice("The prismatic turret seems to be able to rotate.") /obj/structure/prop/prism/Initialize() if(degrees_from_north) @@ -44,17 +44,17 @@ ..() if(rotation_lock) - to_chat(user, "\The [src] is locked at its current bearing.") + to_chat(user, span_warning("\The [src] is locked at its current bearing.")) return if(external_control_lock) - to_chat(user, "\The [src]'s motors resist your efforts to rotate it. You may need to find some form of controller.") + to_chat(user, span_warning("\The [src]'s motors resist your efforts to rotate it. You may need to find some form of controller.")) return var/confirm = tgui_alert(usr, "Do you want to try to rotate \the [src]?", "[name]", list("Yes", "No")) if(confirm != "Yes") visible_message(\ - "[user.name] decides not to try turning \the [src].",\ - "You decide not to try turning \the [src].") + span_notice("[user.name] decides not to try turning \the [src]."),\ + span_notice("You decide not to try turning \the [src].")) return var/new_bearing @@ -62,7 +62,7 @@ new_bearing = tgui_input_number(usr, "What bearing do you want to rotate \the [src] to?", "[name]", 0, 360, 0) new_bearing = round(new_bearing) if(new_bearing <= -1 || new_bearing > 360) - to_chat(user, "Rotating \the [src] [new_bearing] degrees would be a waste of time.") + to_chat(user, span_warning("Rotating \the [src] [new_bearing] degrees would be a waste of time.")) return else var/choice = tgui_input_list(usr, "What point do you want to set \the [src] to?", "[name]", compass_directions) @@ -118,7 +118,7 @@ /obj/structure/prop/prism/bullet_act(var/obj/item/projectile/Proj) if(istype(Proj, redirect_type)) - visible_message("\The [src] redirects \the [Proj]!") + visible_message(span_danger("\The [src] redirects \the [Proj]!")) flick("[initial(icon_state)]+glow", src) var/new_x = (1 * round(10 * cos(degrees_from_north - 90))) + x //Vectors vectors vectors. @@ -149,7 +149,7 @@ density = FALSE anchored = TRUE - interaction_message = "The dial pulses as your hand nears it." + interaction_message = span_notice("The dial pulses as your hand nears it.") var/list/my_turrets = list() var/dialID = null @@ -159,12 +159,12 @@ var/confirm = tgui_alert(usr, "Do you want to try to rotate \the [src]?", "[name]", list("Yes", "No")) if(confirm != "Yes") visible_message(\ - "[user.name] decides not to try turning \the [src].",\ - "You decide not to try turning \the [src].") + span_notice("[user.name] decides not to try turning \the [src]."),\ + span_notice("You decide not to try turning \the [src].")) return if(!my_turrets || !my_turrets.len) - to_chat(user, "\The [src] doesn't seem to do anything.") + to_chat(user, span_notice("\The [src] doesn't seem to do anything.")) return var/free_rotate = 1 @@ -179,7 +179,7 @@ new_bearing = tgui_input_number(usr, "What bearing do you want to rotate \the [src] to?", "[name]", 0, 360, 0) new_bearing = round(new_bearing) if(new_bearing <= -1 || new_bearing > 360) - to_chat(user, "Rotating \the [src] [new_bearing] degrees would be a waste of time.") + to_chat(user, span_warning("Rotating \the [src] [new_bearing] degrees would be a waste of time.")) return else var/choice = tgui_input_list(usr, "What point do you want to set \the [src] to?", "[name]", compass_directions) @@ -188,11 +188,11 @@ confirm = tgui_alert(usr, "Are you certain you want to rotate \the [src]?", "[name]", list("Yes", "No")) if(confirm != "Yes") visible_message(\ - "[user.name] decides not to try turning \the [src].",\ - "You decide not to try turning \the [src].") + span_notice("[user.name] decides not to try turning \the [src]."),\ + span_notice("You decide not to try turning \the [src].")) return - to_chat(user, "\The [src] clicks into place.") + to_chat(user, span_notice("\The [src] clicks into place.")) for(var/obj/structure/prop/prism/P in my_turrets) P.rotate_auto(new_bearing) diff --git a/code/game/objects/structures/props/nest.dm b/code/game/objects/structures/props/nest.dm index ba16b0b055..9f4a219883 100644 --- a/code/game/objects/structures/props/nest.dm +++ b/code/game/objects/structures/props/nest.dm @@ -5,7 +5,7 @@ icon_state = "bonfire" density = TRUE anchored = TRUE - interaction_message = "You feel like you shouldn't be sticking your nose into a wild animal's den." + interaction_message = span_warning("You feel like you shouldn't be sticking your nose into a wild animal's den.") var/disturbance_spawn_chance = 20 var/last_spawn @@ -54,7 +54,7 @@ var/mob/living/L = new spawn_choice(spawnpoint) if(den_faction) L.faction = den_faction - visible_message("\The [L] crawls out of \the [src].") + visible_message(span_warning("\The [L] crawls out of \the [src].")) den_mobs += L tally++ diff --git a/code/game/objects/structures/props/projectile_lock.dm b/code/game/objects/structures/props/projectile_lock.dm index 5c3fcd2ba0..ecde254c43 100644 --- a/code/game/objects/structures/props/projectile_lock.dm +++ b/code/game/objects/structures/props/projectile_lock.dm @@ -37,7 +37,7 @@ var/timing = 0 var/time_limit = 1500 // In ticks. Ten is one second. - interaction_message = "The object remains inert to your touch." + interaction_message = span_notice("The object remains inert to your touch.") /obj/structure/prop/lock/projectile/bullet_act(var/obj/item/projectile/Proj) if(!istype(Proj, projectile_key) || timing) @@ -45,7 +45,7 @@ if(istype(Proj, /obj/item/projectile/beam/heavylaser/cannon) || istype(Proj, /obj/item/projectile/beam/emitter) || (Proj.damage >= 80 && Proj.damtype == BURN)) toggle_lock() - visible_message("\The [src] [enabled ? "disengages" : "engages"] its locking mechanism.") + visible_message(span_notice("\The [src] [enabled ? "disengages" : "engages"] its locking mechanism.")) if(timed) timing = 1 diff --git a/code/game/objects/structures/props/puzzledoor.dm b/code/game/objects/structures/props/puzzledoor.dm index 074b0bed7f..6ccad1e21d 100644 --- a/code/game/objects/structures/props/puzzledoor.dm +++ b/code/game/objects/structures/props/puzzledoor.dm @@ -28,11 +28,11 @@ /obj/machinery/door/blast/puzzle/bullet_act(var/obj/item/projectile/Proj) if(!istype(Proj, /obj/item/projectile/test)) - visible_message("\The [src] is completely unaffected by \the [Proj].") + visible_message(span_cult("\The [src] is completely unaffected by \the [Proj].")) qdel(Proj) //No piercing. No. /obj/machinery/door/blast/puzzle/ex_act(severity) - visible_message("\The [src] is completely unaffected by the blast.") + visible_message(span_cult("\The [src] is completely unaffected by the blast.")) return /obj/machinery/door/blast/puzzle/Initialize() @@ -57,7 +57,7 @@ if(check_locks()) force_toggle(1, user) else - to_chat(user, "\The [src] does not respond to your touch.") + to_chat(user, span_notice("\The [src] does not respond to your touch.")) /obj/machinery/door/blast/puzzle/attackby(obj/item/C as obj, mob/user as mob) if(istype(C, /obj/item)) @@ -65,14 +65,14 @@ if(istype(C,/obj/item/material/twohanded/fireaxe)) var/obj/item/material/twohanded/fireaxe/F = C if(!F.wielded) - to_chat(user, "You need to be wielding \the [F] to do that.") + to_chat(user, span_warning("You need to be wielding \the [F] to do that.")) return if(check_locks()) force_toggle(1, user) else - to_chat(user, "[src]'s arcane workings resist your effort.") + to_chat(user, span_notice("[src]'s arcane workings resist your effort.")) return else if(src.density && (user.a_intent == I_HURT)) @@ -80,10 +80,10 @@ user.setClickCooldown(user.get_attack_speed(W)) if(W.damtype == BRUTE || W.damtype == BURN) user.do_attack_animation(src) - user.visible_message("\The [user] hits \the [src] with \the [W] with no visible effect.") + user.visible_message(span_danger("\The [user] hits \the [src] with \the [W] with no visible effect.")) else if(istype(C, /obj/item/plastique)) - to_chat(user, "On contacting \the [src], a flash of light envelops \the [C] as it is turned to ash. Oh.") + to_chat(user, span_danger("On contacting \the [src], a flash of light envelops \the [C] as it is turned to ash. Oh.")) qdel(C) return 0 diff --git a/code/game/objects/structures/props/swarm.dm b/code/game/objects/structures/props/swarm.dm index dd44aad2aa..f257f9d4c7 100644 --- a/code/game/objects/structures/props/swarm.dm +++ b/code/game/objects/structures/props/swarm.dm @@ -35,7 +35,7 @@ /obj/structure/cult/pylon/swarm/pylonhit(var/damage) if(!isbroken) if(prob(1 + damage * 3)) - visible_message("[shatter_message]") + visible_message(span_danger("[shatter_message]")) STOP_PROCESSING(SSobj, src) playsound(src,shatter_sound, 75, 1) isbroken = 1 @@ -47,8 +47,8 @@ if(!isbroken) if(prob(1 + damage * 3)) user.visible_message( - "[user] smashed \the [src]!", - "You hit \the [src], and its crystal breaks apart!", + span_danger("[user] smashed \the [src]!"), + span_warning("You hit \the [src], and its crystal breaks apart!"), "You hear a tinkle of crystalline shards." ) STOP_PROCESSING(SSobj, src) @@ -115,7 +115,7 @@ /obj/structure/cult/pylon/swarm/defender/pylonhit(var/damage) if(!isbroken) if(prob(1 + damage * 3) && damage >= 25) - visible_message("[shatter_message]") + visible_message(span_danger("[shatter_message]")) STOP_PROCESSING(SSobj, src) playsound(src,shatter_sound, 75, 1) isbroken = 1 @@ -127,8 +127,8 @@ if(!isbroken) if(prob(1 + damage * 2) && damage >= 15) user.visible_message( - "[user] smashed \the [src]!", - "You hit \the [src], and its crystal breaks apart!", + span_danger("[user] smashed \the [src]!"), + span_warning("You hit \the [src], and its crystal breaks apart!"), "You hear a tinkle of crystalline shards." ) STOP_PROCESSING(SSobj, src) diff --git a/code/game/objects/structures/railing.dm b/code/game/objects/structures/railing.dm index a8e2b979a9..4d34a48719 100644 --- a/code/game/objects/structures/railing.dm +++ b/code/game/objects/structures/railing.dm @@ -60,16 +60,16 @@ if(health < maxhealth) switch(health / maxhealth) if(0.0 to 0.5) - . += "It looks severely damaged!" + . += span_warning("It looks severely damaged!") if(0.25 to 0.5) - . += "It looks damaged!" + . += span_warning("It looks damaged!") if(0.5 to 1.0) - . += "It has a few scrapes and dents." + . += span_notice("It has a few scrapes and dents.") /obj/structure/railing/take_damage(amount) health -= amount if(health <= 0) - visible_message("\The [src] breaks down!") + visible_message(span_warning("\The [src] breaks down!")) playsound(src, 'sound/effects/grillehit.ogg', 50, 1) new /obj/item/stack/rods(get_turf(src)) qdel(src) @@ -205,7 +205,7 @@ if(W.has_tool_quality(TOOL_WRENCH) && !anchored) playsound(src, W.usesound, 50, 1) if(do_after(user, 20, src)) - user.visible_message("\The [user] dismantles \the [src].", "You dismantle \the [src].") + user.visible_message("\The [user] dismantles \the [src].", span_notice("You dismantle \the [src].")) new /obj/item/stack/material/steel(get_turf(usr), 2) qdel(src) return @@ -216,7 +216,7 @@ if(F.welding) playsound(src, F.usesound, 50, 1) if(do_after(user, 20, src)) - user.visible_message("\The [user] repairs some damage to \the [src].", "You repair some damage to \the [src].") + user.visible_message("\The [user] repairs some damage to \the [src].", span_notice("You repair some damage to \the [src].")) health = min(health+(maxhealth/5), maxhealth) // 20% repair per application return @@ -225,7 +225,7 @@ user.visible_message(anchored ? "\The [user] begins unscrewing \the [src]." : "\The [user] begins fasten \the [src]." ) playsound(src, W.usesound, 75, 1) if(do_after(user, 10, src)) - to_chat(user, (anchored ? "You have unfastened \the [src] from the floor." : "You have fastened \the [src] to the floor.")) + to_chat(user, (anchored ? span_notice("You have unfastened \the [src] from the floor.") : span_notice("You have fastened \the [src] to the floor."))) anchored = !anchored update_icon() return @@ -237,17 +237,17 @@ var/mob/living/M = G.affecting var/obj/occupied = turf_is_crowded() if(occupied) - to_chat(user, "There's \a [occupied] in the way.") + to_chat(user, span_danger("There's \a [occupied] in the way.")) return if (G.state < 2) if(user.a_intent == I_HURT) if (prob(15)) M.Weaken(5) M.apply_damage(8,def_zone = "head") take_damage(8) - visible_message("[G.assailant] slams [G.affecting]'s face against \the [src]!") + visible_message(span_danger("[G.assailant] slams [G.affecting]'s face against \the [src]!")) playsound(src, 'sound/effects/grillehit.ogg', 50, 1) else - to_chat(user, "You need a better grip to do that!") + to_chat(user, span_danger("You need a better grip to do that!")) return else if (get_turf(G.affecting) == get_turf(src)) @@ -255,7 +255,7 @@ else G.affecting.forceMove(get_turf(src)) G.affecting.Weaken(5) - visible_message("[G.assailant] throws [G.affecting] over \the [src]!") + visible_message(span_danger("[G.assailant] throws [G.affecting] over \the [src]!")) qdel(W) return @@ -285,7 +285,7 @@ if(!can_climb(user)) return - usr.visible_message("[user] starts climbing onto \the [src]!") + usr.visible_message(span_warning("[user] starts climbing onto \the [src]!")) LAZYDISTINCTADD(climbers, user) if(!do_after(user,(issmall(user) ? 20 : 34))) @@ -301,7 +301,7 @@ else usr.forceMove(get_turf(src)) - usr.visible_message("[user] climbed over \the [src]!") + usr.visible_message(span_warning("[user] climbed over \the [src]!")) if(!anchored) take_damage(maxhealth) // Fatboy LAZYREMOVE(climbers, user) @@ -314,7 +314,7 @@ if(get_turf(user) == get_turf(src)) var/obj/occupied = neighbor_turf_impassable() if(occupied) - to_chat(user, "You can't climb there, there's \a [occupied] in the way.") + to_chat(user, span_danger("You can't climb there, there's \a [occupied] in the way.")) return 0 return 1 diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index f3875bf508..dc9a3426ce 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -44,9 +44,9 @@ FLOOR SAFES /obj/structure/safe/proc/check_unlocked(mob/user as mob, canhear) if(user && canhear) if(tumbler_1_pos == tumbler_1_open) - to_chat(user, "You hear a [pick("tonk", "krunk", "plunk")] from \the [src].") + to_chat(user, span_notice("You hear a [pick("tonk", "krunk", "plunk")] from \the [src].")) if(tumbler_2_pos == tumbler_2_open) - to_chat(user, "You hear a [pick("tink", "krink", "plink")] from \the [src].") + to_chat(user, span_notice("You hear a [pick("tink", "krink", "plink")] from \the [src].")) if(tumbler_1_pos == tumbler_1_open && tumbler_2_pos == tumbler_2_open) if(user) visible_message("[pick("Spring", "Sprang", "Sproing", "Clunk", "Krunk")]!") return 1 @@ -97,13 +97,13 @@ FLOOR SAFES if(href_list["open"]) if(check_unlocked()) - to_chat(user, "You [open ? "close" : "open"] [src].") + to_chat(user, span_notice("You [open ? "close" : "open"] [src].")) open = !open update_icon() updateUsrDialog() return else - to_chat(user, "You can't [open ? "close" : "open"] [src], the lock is engaged!") + to_chat(user, span_notice("You can't [open ? "close" : "open"] [src], the lock is engaged!")) return if(href_list["decrement"]) @@ -111,11 +111,11 @@ FLOOR SAFES if(dial == tumbler_1_pos + 1 || dial == tumbler_1_pos - 71) tumbler_1_pos = decrement(tumbler_1_pos) if(canhear) - to_chat(user, "You hear a [pick("clack", "scrape", "clank")] from \the [src].") + to_chat(user, span_notice("You hear a [pick("clack", "scrape", "clank")] from \the [src].")) if(tumbler_1_pos == tumbler_2_pos + 37 || tumbler_1_pos == tumbler_2_pos - 35) tumbler_2_pos = decrement(tumbler_2_pos) if(canhear) - to_chat(user, "You hear a [pick("click", "chink", "clink")] from \the [src].") + to_chat(user, span_notice("You hear a [pick("click", "chink", "clink")] from \the [src].")) playsound(src, 'sound/machines/click.ogg', 20, 1) check_unlocked(user, canhear) @@ -127,11 +127,11 @@ FLOOR SAFES if(dial == tumbler_1_pos - 1 || dial == tumbler_1_pos + 71) tumbler_1_pos = increment(tumbler_1_pos) if(canhear) - to_chat(user, "You hear a [pick("clack", "scrape", "clank")] from \the [src].") + to_chat(user, span_notice("You hear a [pick("clack", "scrape", "clank")] from \the [src].")) if(tumbler_1_pos == tumbler_2_pos - 37 || tumbler_1_pos == tumbler_2_pos + 35) tumbler_2_pos = increment(tumbler_2_pos) if(canhear) - to_chat(user, "You hear a [pick("click", "chink", "clink")] from \the [src].") + to_chat(user, span_notice("You hear a [pick("click", "chink", "clink")] from \the [src].")) playsound(src, 'sound/machines/click.ogg', 20, 1) check_unlocked(user, canhear) updateUsrDialog() @@ -153,11 +153,11 @@ FLOOR SAFES space += I.w_class user.drop_item() I.loc = src - to_chat(user, "You put [I] in \the [src].") + to_chat(user, span_notice("You put [I] in \the [src].")) updateUsrDialog() return else - to_chat(user, "[I] won't fit in \the [src].") + to_chat(user, span_notice("[I] won't fit in \the [src].")) return else if(istype(I, /obj/item/clothing/accessory/stethoscope)) diff --git a/code/game/objects/structures/salvageable.dm b/code/game/objects/structures/salvageable.dm index 8a0da9b752..a114fd2cd7 100644 --- a/code/game/objects/structures/salvageable.dm +++ b/code/game/objects/structures/salvageable.dm @@ -19,11 +19,11 @@ var/actual_time = I.toolspeed * 170 user.visible_message( \ "\The [user] begins salvaging from \the [src].", \ - "You start salvaging from \the [src].") + span_notice("You start salvaging from \the [src].")) if(do_after(user, actual_time, target = src)) user.visible_message( \ - "\The [user] has salvaged \the [src].", \ - "You salvage \the [src].") + span_notice("\The [user] has salvaged \the [src]."), \ + span_notice("You salvage \the [src].")) dismantle() qdel(src) return TRUE diff --git a/code/game/objects/structures/simple_doors.dm b/code/game/objects/structures/simple_doors.dm index 64f1392111..db06f7fea8 100644 --- a/code/game/objects/structures/simple_doors.dm +++ b/code/game/objects/structures/simple_doors.dm @@ -81,7 +81,7 @@ if(!Adjacent(user)) return else if(user.a_intent == I_HURT) - src.visible_message("[user] hammers on \the [src]!", "Someone hammers loudly on \the [src]!") + src.visible_message(span_warning("[user] hammers on \the [src]!"), span_warning("Someone hammers loudly on \the [src]!")) src.add_fingerprint(user) playsound(src, knock_hammer_sound, 50, 0, 3) else if(user.a_intent == I_HELP) @@ -102,7 +102,7 @@ if(!material.can_open_material_door(user)) return if(locked && state == 0) - to_chat(M,"It's locked!") + to_chat(M,span_warning("It's locked!")) return if(world.time - user.last_bumped <= 60) return @@ -157,23 +157,23 @@ if(istype(W,/obj/item/simple_key)) var/obj/item/simple_key/key = W if(state) - to_chat(user,"\The [src] must be closed in order for you to lock it.") + to_chat(user,span_notice("\The [src] must be closed in order for you to lock it.")) else if(key.key_id != src.lock_id) - to_chat(user,"The [key] doesn't fit \the [src]'s lock!") + to_chat(user,span_warning("The [key] doesn't fit \the [src]'s lock!")) else if(key.key_id == src.lock_id) - visible_message("[user] [key.keyverb] \the [key] and [locked ? "unlocks" : "locks"] \the [src].") + visible_message(span_notice("[user] [key.keyverb] \the [key] and [locked ? "unlocks" : "locks"] \the [src].")) locked = !locked playsound(src, keysound,100, 1) return if(istype(W,/obj/item/pickaxe) && breakable) var/obj/item/pickaxe/digTool = W - visible_message("[user] starts digging [src]!") + visible_message(span_danger("[user] starts digging [src]!")) if(do_after(user,digTool.digspeed*hardness) && src) - visible_message("[user] finished digging [src]!") + visible_message(span_danger("[user] finished digging [src]!")) Dismantle() else if(istype(W,/obj/item) && breakable) //not sure, can't not just weapons get passed to this proc? hardness -= W.force/10 - visible_message("[user] hits [src] with [W]!") + visible_message(span_danger("[user] hits [src] with [W]!")) if(material == get_material_by_name("resin")) playsound(src, 'sound/effects/attackblob.ogg', 100, 1) else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD) || get_material_by_name(MAT_HARDWOOD))) @@ -198,7 +198,7 @@ CheckHardness() /obj/structure/simple_door/attack_generic(var/mob/user, var/damage, var/attack_verb) - visible_message("[user] [attack_verb] the [src]!") + visible_message(span_danger("[user] [attack_verb] the [src]!")) if(material == get_material_by_name("resin")) playsound(src, 'sound/effects/attackblob.ogg', 100, 1) else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD) || get_material_by_name(MAT_HARDWOOD))) @@ -215,7 +215,7 @@ /obj/structure/simple_door/proc/Dismantle(devastated = 0) material.place_dismantled_product(get_turf(src)) - visible_message("The [src] is destroyed!") + visible_message(span_danger("The [src] is destroyed!")) qdel(src) /obj/structure/simple_door/ex_act(severity = 1) diff --git a/code/game/objects/structures/snowman.dm b/code/game/objects/structures/snowman.dm index 7299f1e62e..2716293e8b 100644 --- a/code/game/objects/structures/snowman.dm +++ b/code/game/objects/structures/snowman.dm @@ -7,7 +7,7 @@ /obj/structure/snowman/attack_hand(mob/user as mob) if(user.a_intent == I_HURT) - to_chat(user, "In one hit, [src] easily crumples into a pile of snow. You monster.") + to_chat(user, span_notice("In one hit, [src] easily crumples into a pile of snow. You monster.")) var/turf/simulated/floor/F = get_turf(src) if (istype(F)) new /obj/item/stack/material/snow(F) @@ -21,4 +21,4 @@ /obj/structure/snowman/spider name = "snow spider" icon_state = "snowspider" - desc = "An impressively crafted snow spider. Not nearly as creepy as the real thing." \ No newline at end of file + desc = "An impressively crafted snow spider. Not nearly as creepy as the real thing." diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index ac52341e59..ac1fa24867 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -16,9 +16,9 @@ if(buckled_mob.buckled == src) if(buckled_mob != user) buckled_mob.visible_message(\ - "[user.name] pulls [buckled_mob.name] free from the sticky nest!",\ - "[user.name] pulls you free from the gelatinous resin.",\ - "You hear squelching...") + span_notice("[user.name] pulls [buckled_mob.name] free from the sticky nest!"),\ + span_notice("[user.name] pulls you free from the gelatinous resin."),\ + span_notice("You hear squelching...")) buckled_mob.pixel_y = 0 buckled_mob.old_y = 0 unbuckle_mob(buckled_mob) @@ -27,9 +27,9 @@ return buckled_mob.last_special = world.time buckled_mob.visible_message(\ - "[buckled_mob.name] struggles to break free of the gelatinous resin...",\ - "You struggle to break free from the gelatinous resin...",\ - "You hear squelching...") + span_warning("[buckled_mob.name] struggles to break free of the gelatinous resin..."),\ + span_warning("You struggle to break free from the gelatinous resin..."),\ + span_notice("You hear squelching...")) spawn(NEST_RESIST_TIME) if(user && buckled_mob && user.buckled == src) buckled_mob.last_special = world.time @@ -60,9 +60,9 @@ return else M.visible_message(\ - "[user.name] secretes a thick vile goo, securing [M.name] into [src]!",\ - "[user.name] drenches you in a foul-smelling resin, trapping you in the [src]!",\ - "You hear squelching...") + span_notice("[user.name] secretes a thick vile goo, securing [M.name] into [src]!"),\ + span_warning("[user.name] drenches you in a foul-smelling resin, trapping you in the [src]!"),\ + span_notice("You hear squelching...")) M.buckled = src M.loc = src.loc M.set_dir(src.dir) @@ -78,7 +78,7 @@ health = max(0, health - aforce) playsound(src, 'sound/effects/attackblob.ogg', 100, 1) for(var/mob/M in viewers(src, 7)) - M.show_message("[user] hits [src] with [W]!", 1) + M.show_message(span_warning("[user] hits [src] with [W]!"), 1) healthcheck() /obj/structure/bed/nest/proc/healthcheck() diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 75f7d88b9c..90ecec8c8b 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -132,23 +132,23 @@ W.pixel_x = 10 //make sure they reach the pillow W.pixel_y = -6 if(istype(W, /obj/item/disk)) - user.visible_message("[src] sleeps soundly. Sleep tight, disky.") + user.visible_message(span_notice("[src] sleeps soundly. Sleep tight, disky.")) else if(istype(W, /obj/item/grab)) var/obj/item/grab/G = W var/mob/living/affecting = G.affecting if(has_buckled_mobs()) //Handles trying to buckle someone else to a chair when someone else is on it - to_chat(user, "\The [src] already has someone buckled to it.") + to_chat(user, span_notice("\The [src] already has someone buckled to it.")) return - user.visible_message("[user] attempts to buckle [affecting] into \the [src]!") + user.visible_message(span_notice("[user] attempts to buckle [affecting] into \the [src]!")) if(do_after(user, 20, G.affecting)) affecting.loc = loc spawn(0) if(buckle_mob(affecting)) affecting.visible_message(\ - "[affecting.name] is buckled to [src] by [user.name]!",\ - "You are buckled to [src] by [user.name]!",\ - "You hear metal clanking.") + span_danger("[affecting.name] is buckled to [src] by [user.name]!"),\ + span_danger("You are buckled to [src] by [user.name]!"),\ + span_notice("You hear metal clanking.")) qdel(W) else ..() @@ -256,7 +256,7 @@ if(istype(W,/obj/item/roller_holder)) var/obj/item/roller_holder/RH = W if(!RH.held) - to_chat(user, "You collect the roller bed.") + to_chat(user, span_notice("You collect the roller bed.")) src.loc = RH RH.held = src return @@ -285,10 +285,10 @@ /obj/item/roller_holder/attack_self(mob/user as mob) if(!held) - to_chat(user, "The rack is empty.") + to_chat(user, span_notice("The rack is empty.")) return - to_chat(user, "You deploy the roller bed.") + to_chat(user, span_notice("You deploy the roller bed.")) var/obj/structure/bed/roller/R = new held.bedtype(user.loc) R.add_fingerprint(user) qdel(held) @@ -378,10 +378,10 @@ if(do_after(user, 20 * W.toolspeed)) if(!src) return - to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") + to_chat(user, span_notice("You [anchored? "un" : ""]secured \the [src]!")) anchored = !anchored return if(!anchored) - to_chat(user," The bed isn't secured.") + to_chat(user,span_notice(" The bed isn't secured.")) return diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 4c7845da08..18337512c9 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -18,7 +18,7 @@ if(!padding_material && istype(W, /obj/item/assembly/shock_kit)) var/obj/item/assembly/shock_kit/SK = W if(!SK.status) - to_chat(user, "\The [SK] is not ready to be attached!") + to_chat(user, span_notice("\The [SK] is not ready to be attached!")) return user.drop_item() var/obj/structure/bed/chair/e_chair/E = new (src.loc, material.name) @@ -255,7 +255,7 @@ victim.apply_effect(6, WEAKEN, blocked) victim.apply_effect(6, STUTTER, blocked) victim.apply_damage(10, BRUTE, def_zone, blocked, soaked) - occupant.visible_message("[occupant] crashed into \the [A]!") + occupant.visible_message(span_danger("[occupant] crashed into \the [A]!")) /obj/structure/bed/chair/office/light icon_state = "officechair_white" diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index 921f8def01..1685531621 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -73,7 +73,7 @@ var/global/list/stool_cache = list() //haha stool /obj/item/stool/attack(mob/M as mob, mob/user as mob) if (prob(5) && istype(M,/mob/living)) - user.visible_message("[user] breaks [src] over [M]'s back!") + user.visible_message(span_danger("[user] breaks [src] over [M]'s back!")) user.setClickCooldown(user.get_attack_speed()) user.do_attack_animation(M) diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 369a0aabab..92d4af0acb 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -65,7 +65,7 @@ if(user==pulling) pulling = null user.pulledby = null - to_chat(user, "You lost your grip!") + to_chat(user, span_warning("You lost your grip!")) return if(has_buckled_mobs() && pulling && (user in buckled_mobs)) if(pulling.stat || pulling.stunned || pulling.weakened || pulling.paralysis || pulling.lying || pulling.restrained()) @@ -83,10 +83,10 @@ if(user==pulling) return if(pulling && (get_dir(src.loc, pulling.loc) == direction)) - to_chat(user, "You cannot go there.") + to_chat(user, span_warning("You cannot go there.")) return if(pulling && has_buckled_mobs() && (user in buckled_mobs)) - to_chat(user, "You cannot drive while being pushed.") + to_chat(user, span_warning("You cannot drive while being pushed.")) return // Let's roll @@ -140,7 +140,7 @@ unbuckle_mob() if (pulling && (get_dist(src, pulling) > 1)) pulling.pulledby = null - to_chat(pulling, "You lost your grip!") + to_chat(pulling, span_warning("You lost your grip!")) pulling = null else if (occupant && (src.loc != occupant.loc)) @@ -159,7 +159,7 @@ if(in_range(src, user)) if(!ishuman(user)) return if(has_buckled_mobs() && (user in buckled_mobs)) - to_chat(user, "You realize you are unable to push the wheelchair you sit in.") + to_chat(user, span_warning("You realize you are unable to push the wheelchair you sit in.")) return if(!pulling) pulling = user @@ -205,11 +205,11 @@ victim.apply_effect(6, STUTTER, blocked) victim.apply_damage(10, BRUTE, def_zone, soaked) if(pulling) - occupant.visible_message("[pulling] has thrusted \the [name] into \the [A], throwing \the [occupant] out of it!") + occupant.visible_message(span_danger("[pulling] has thrusted \the [name] into \the [A], throwing \the [occupant] out of it!")) add_attack_logs(pulling,occupant,"Crashed their [name] into [A]") else - occupant.visible_message("[occupant] crashed into \the [A]!") + occupant.visible_message(span_danger("[occupant] crashed into \the [A]!")) /obj/structure/bed/chair/wheelchair/proc/create_track() var/obj/effect/decal/cleanable/blood/tracks/B = new(loc) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 3e5c963396..888d0174e6 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -75,25 +75,25 @@ full = TRUE else if(I.has_tool_quality(TOOL_WRENCH)) if(anchored) - to_chat(user, "You lean down and unwrench [src].") + to_chat(user, span_notice("You lean down and unwrench [src].")) anchored = FALSE else - to_chat(user, "You wrench [src] into place.") + to_chat(user, span_notice("You wrench [src] into place.")) anchored = TRUE return else if(user.a_intent != I_HURT) - to_chat(user, "[I] does not fit into [src].") + to_chat(user, span_notice("[I] does not fit into [src].")) return else return ..() if(full) - to_chat(user, "[src] can't hold any more of [I].") + to_chat(user, span_notice("[src] can't hold any more of [I].")) return if(!user.unEquip(I, target = src)) return - to_chat(user, "You put [I] in [src].") + to_chat(user, span_notice("You put [I] in [src].")) update_icon() #undef TANK_DISPENSER_CAPACITY diff --git a/code/game/objects/structures/transit_tubes.dm b/code/game/objects/structures/transit_tubes.dm index 402d560923..1326ca7f91 100644 --- a/code/game/objects/structures/transit_tubes.dm +++ b/code/game/objects/structures/transit_tubes.dm @@ -101,11 +101,11 @@ /obj/structure/transit_tube/Bumped(mob/AM as mob|obj) var/obj/structure/transit_tube/T = locate() in AM.loc if(T) - to_chat(AM, "The tube's support pylons block your way.") + to_chat(AM, span_warning("The tube's support pylons block your way.")) return ..() else AM.loc = src.loc - to_chat(AM, "You slip under the tube.") + to_chat(AM, span_info("You slip under the tube.")) /obj/structure/transit_tube/station/New(loc) @@ -117,7 +117,7 @@ if(!pod_moving && icon_state == "open" && istype(AM, /mob)) for(var/obj/structure/transit_tube_pod/pod in loc) if(pod.contents.len) - to_chat(AM, "The pod is already occupied.") + to_chat(AM, span_notice("The pod is already occupied.")) return else if(!pod.moving && (pod.dir in directions())) AM.loc = pod diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index 44ae7781ec..b77417d916 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -53,7 +53,7 @@ /obj/structure/trash_pile/attackby(obj/item/W as obj, mob/user as mob) var/w_type = W.type if(w_type in allocated_gamma) - to_chat(user,"You feel \the [W] slip from your hand, and disappear into the trash pile.") + to_chat(user,span_notice("You feel \the [W] slip from your hand, and disappear into the trash pile.")) user.unEquip(W) W.forceMove(src) allocated_gamma -= w_type @@ -84,12 +84,12 @@ /obj/structure/trash_pile/attack_ghost(mob/observer/user as mob) if(config.disable_player_mice) - to_chat(user, "Spawning as a mouse is currently disabled.") + to_chat(user, span_warning("Spawning as a mouse is currently disabled.")) return //VOREStation Add Start if(jobban_isbanned(user, JOB_GHOSTROLES)) - to_chat(user, "You cannot become a mouse because you are banned from playing ghost roles.") + to_chat(user, span_warning("You cannot become a mouse because you are banned from playing ghost roles.")) return //VOREStation Add End @@ -98,14 +98,14 @@ var/turf/T = get_turf(src) if(!T || (T.z in using_map.admin_levels)) - to_chat(user, "You may not spawn as a mouse on this Z-level.") + to_chat(user, span_warning("You may not spawn as a mouse on this Z-level.")) return var/timedifference = world.time - user.client.time_died_as_mouse if(user.client.time_died_as_mouse && timedifference <= mouse_respawn_time * 600) var/timedifference_text timedifference_text = time2text(mouse_respawn_time * 600 - timedifference,"mm:ss") - to_chat(user, "You may only spawn again as a mouse more than [mouse_respawn_time] minutes after your death. You have [timedifference_text] left.") + to_chat(user, span_warning("You may only spawn again as a mouse more than [mouse_respawn_time] minutes after your death. You have [timedifference_text] left.")) return var/response = tgui_alert(user, "Are you -sure- you want to become a mouse?","Are you sure you want to squeek?",list("Squeek!","Nope!")) @@ -119,7 +119,7 @@ host.universal_understand = 0 announce_ghost_joinleave(src, 0, "They are now a mouse.") host.ckey = user.ckey - to_chat(host, "You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.") + to_chat(host, span_info("You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.")) var/atom/A = get_holder_at_turf_level(src) A.visible_message("[host] crawls out of \the [src].") @@ -129,23 +129,23 @@ //Human mob if(ishuman(user)) var/mob/living/carbon/human/H = user - H.visible_message("[user] searches through \the [src].","You search through \the [src].") + H.visible_message("[user] searches through \the [src].",span_notice("You search through \the [src].")) if(hider) - to_chat(hider,"[user] is searching the trash pile you're in!") + to_chat(hider,span_warning("[user] is searching the trash pile you're in!")) //Do the searching if(do_after(user,rand(4 SECONDS,6 SECONDS),src)) //If there was a hider, chance to reveal them if(hider && prob(50)) - to_chat(hider,"You've been discovered!") + to_chat(hider,span_danger("You've been discovered!")) hider.forceMove(get_turf(src)) hider = null - to_chat(user,"Some sort of creature leaps out of \the [src]!") + to_chat(user,span_danger("Some sort of creature leaps out of \the [src]!")) //You already searched this one bruh else if(user.ckey in searchedby) - to_chat(H,"There's nothing else for you in \the [src]!") + to_chat(H,span_warning("There's nothing else for you in \the [src]!")) //You found an item! else @@ -170,7 +170,7 @@ if(I) searchedby += user.ckey I.forceMove(get_turf(src)) - to_chat(H,"You found \a [I]!") + to_chat(H,span_notice("You found \a [I]!")) else return ..() diff --git a/code/game/objects/structures/under_wardrobe.dm b/code/game/objects/structures/under_wardrobe.dm index 5849085b1d..b94ac40b8f 100644 --- a/code/game/objects/structures/under_wardrobe.dm +++ b/code/game/objects/structures/under_wardrobe.dm @@ -7,7 +7,7 @@ /obj/structure/undies_wardrobe/attack_hand(var/mob/user) if(!human_who_can_use_underwear(user)) - to_chat(user, "Sadly there's nothing in here for you to wear.") + to_chat(user, span_warning("Sadly there's nothing in here for you to wear.")) return interact(user) @@ -86,4 +86,4 @@ if(.) H.update_underwear() - interact(H) \ No newline at end of file + interact(H) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index a82e045dbe..acf6025af7 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -19,13 +19,13 @@ /obj/structure/toilet/attack_hand(mob/living/user as mob) if(swirlie) usr.setClickCooldown(user.get_attack_speed()) - usr.visible_message("[user] slams the toilet seat onto [swirlie.name]'s head!", "You slam the toilet seat onto [swirlie.name]'s head!", "You hear reverberating porcelain.") + usr.visible_message(span_danger("[user] slams the toilet seat onto [swirlie.name]'s head!"), span_notice("You slam the toilet seat onto [swirlie.name]'s head!"), "You hear reverberating porcelain.") swirlie.adjustBruteLoss(5) return if(cistern && !open) if(!contents.len) - to_chat(user, "The cistern is empty.") + to_chat(user, span_notice("The cistern is empty.")) return else var/obj/item/I = pick(contents) @@ -33,7 +33,7 @@ user.put_in_hands(I) else I.loc = get_turf(src) - to_chat(user, "You find \an [I] in the cistern.") + to_chat(user, span_notice("You find \an [I] in the cistern.")) w_items -= I.w_class return @@ -45,10 +45,10 @@ /obj/structure/toilet/attackby(obj/item/I as obj, mob/living/user as mob) if(I.has_tool_quality(TOOL_CROWBAR)) - to_chat(user, "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"].") + to_chat(user, span_notice("You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"].")) playsound(src, 'sound/effects/stonedoor_openclose.ogg', 50, 1) if(do_after(user, 30)) - user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!", "You hear grinding porcelain.") + user.visible_message(span_notice("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!"), span_notice("You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!"), "You hear grinding porcelain.") cistern = !cistern update_icon() return @@ -62,28 +62,28 @@ if(G.state>1) if(!GM.loc == get_turf(src)) - to_chat(user, "[GM.name] needs to be on the toilet.") + to_chat(user, span_notice("[GM.name] needs to be on the toilet.")) return if(open && !swirlie) - user.visible_message("[user] starts to give [GM.name] a swirlie!", "You start to give [GM.name] a swirlie!") + user.visible_message(span_danger("[user] starts to give [GM.name] a swirlie!"), span_notice("You start to give [GM.name] a swirlie!")) swirlie = GM if(do_after(user, 30, GM)) - user.visible_message("[user] gives [GM.name] a swirlie!", "You give [GM.name] a swirlie!", "You hear a toilet flushing.") + user.visible_message(span_danger("[user] gives [GM.name] a swirlie!"), span_notice("You give [GM.name] a swirlie!"), "You hear a toilet flushing.") if(!GM.internal) GM.adjustOxyLoss(5) swirlie = null else - user.visible_message("[user] slams [GM.name] into the [src]!", "You slam [GM.name] into the [src]!") + user.visible_message(span_danger("[user] slams [GM.name] into the [src]!"), span_notice("You slam [GM.name] into the [src]!")) GM.adjustBruteLoss(5) else - to_chat(user, "You need a tighter grip.") + to_chat(user, span_notice("You need a tighter grip.")) if(cistern && !istype(user,/mob/living/silicon/robot)) //STOP PUTTING YOUR MODULES IN THE TOILET. if(I.w_class > 3) - to_chat(user, "\The [I] does not fit.") + to_chat(user, span_notice("\The [I] does not fit.")) return if(w_items + I.w_class > 5) - to_chat(user, "The cistern is full.") + to_chat(user, span_notice("The cistern is full.")) return user.drop_item() I.loc = src @@ -108,21 +108,21 @@ if(G.state>1) if(!GM.loc == get_turf(src)) - to_chat(user, "[GM.name] needs to be on the toilet.") + to_chat(user, span_notice("[GM.name] needs to be on the toilet.")) return if(open && !swirlie) - user.visible_message("[user] starts to give [GM.name] a swirlie!", "You start to give [GM.name] a swirlie!") + user.visible_message(span_danger("[user] starts to give [GM.name] a swirlie!"), span_notice("You start to give [GM.name] a swirlie!")) swirlie = GM if(do_after(user, 30, GM)) - user.visible_message("[user] gives [GM.name] a swirlie!", "You give [GM.name] a swirlie!", "You hear a toilet flushing.") + user.visible_message(span_danger("[user] gives [GM.name] a swirlie!"), span_notice("You give [GM.name] a swirlie!"), "You hear a toilet flushing.") if(!GM.internal) GM.adjustOxyLoss(5) swirlie = null else - user.visible_message("[user] slams [GM.name] into the [src]!", "You slam [GM.name] into the [src]!") + user.visible_message(span_danger("[user] slams [GM.name] into the [src]!"), span_notice("You slam [GM.name] into the [src]!")) GM.adjustBruteLoss(5) else - to_chat(user, "You need a tighter grip.") + to_chat(user, span_notice("You need a tighter grip.")) /obj/structure/urinal name = "urinal" @@ -139,12 +139,12 @@ var/mob/living/GM = G.affecting if(G.state>1) if(!GM.loc == get_turf(src)) - to_chat(user, "[GM.name] needs to be on the urinal.") + to_chat(user, span_notice("[GM.name] needs to be on the urinal.")) return - user.visible_message("[user] slams [GM.name] into the [src]!", "You slam [GM.name] into the [src]!") + user.visible_message(span_danger("[user] slams [GM.name] into the [src]!"), span_notice("You slam [GM.name] into the [src]!")) GM.adjustBruteLoss(8) else - to_chat(user, "You need a tighter grip.") + to_chat(user, span_notice("You need a tighter grip.")) @@ -199,14 +199,14 @@ /obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob) if(I.type == /obj/item/analyzer) - to_chat(user, "The water temperature seems to be [watertemp].") + to_chat(user, span_notice("The water temperature seems to be [watertemp].")) if(I.has_tool_quality(TOOL_WRENCH)) var/newtemp = tgui_input_list(user, "What setting would you like to set the temperature valve to?", "Water Temperature Valve", temperature_settings) - to_chat(user, "You begin to adjust the temperature valve with \the [I].") + to_chat(user, span_notice("You begin to adjust the temperature valve with \the [I].")) playsound(src, I.usesound, 50, 1) if(do_after(user, 50 * I.toolspeed)) watertemp = newtemp - user.visible_message("[user] adjusts the shower with \the [I].", "You adjust the shower with \the [I].") + user.visible_message(span_notice("[user] adjusts the shower with \the [I]."), span_notice("You adjust the shower with \the [I].")) add_fingerprint(user) /obj/machinery/shower/update_icon() //this is terribly unreadable, but basically it makes the shower mist up @@ -286,9 +286,9 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(temperature >= H.species.heat_level_1) - to_chat(H, "The water is searing hot!") + to_chat(H, span_danger("The water is searing hot!")) else if(temperature <= H.species.cold_level_1) - to_chat(H, "The water is freezing cold!") + to_chat(H, span_warning("The water is freezing cold!")) /obj/item/bikehorn/rubberducky name = "rubber ducky" @@ -376,7 +376,7 @@ /obj/item/bikehorn/rubberducky/pink/attack_self(mob/user as mob) if(spam_flag == 0) if(!user.devourable) - to_chat(user, "You can't bring yourself to squeeze it...") + to_chat(user, span_vnotice("You can't bring yourself to squeeze it...")) return spam_flag = 1 playsound(src, honk_sound, 50, 1) @@ -385,14 +385,14 @@ src.add_fingerprint(user) user.drop_item() user.forceMove(src) - to_chat(user, "You have been swallowed alive by the rubber ducky. Your entire body compacted up and squeezed into the tiny space that makes up the oddly realistic and not at all rubbery stomach. The walls themselves are kneading over you, grinding some sort of fluids into your trapped body. You can even hear the sound of bodily functions echoing around you...") + to_chat(user, span_vnotice("You have been swallowed alive by the rubber ducky. Your entire body compacted up and squeezed into the tiny space that makes up the oddly realistic and not at all rubbery stomach. The walls themselves are kneading over you, grinding some sort of fluids into your trapped body. You can even hear the sound of bodily functions echoing around you...")) spawn(20) spam_flag = 0 return /obj/item/bikehorn/rubberducky/pink/container_resist(var/mob/living/escapee) escapee.forceMove(get_turf(src)) - to_chat(escapee, "You managed to crawl out of the rubber ducky!") + to_chat(escapee, span_vnotice("You managed to crawl out of the rubber ducky!")) /obj/item/bikehorn/rubberducky/grey name = "rubber ducky" @@ -522,7 +522,7 @@ if(!usr.Adjacent(src)) return ..() if(!thing.reagents || thing.reagents.total_volume == 0) - to_chat(usr, "\The [thing] is empty.") + to_chat(usr, span_warning("\The [thing] is empty.")) return // Clear the vessel. visible_message("\The [usr] tips the contents of \the [thing] into \the [src].") @@ -536,7 +536,7 @@ if (H.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - to_chat(user, "You try to move your [temp.name], but cannot!") + to_chat(user, span_notice("You try to move your [temp.name], but cannot!")) return if(isrobot(user) || isAI(user)) @@ -546,16 +546,16 @@ return if(busy) - to_chat(user, "Someone's already washing here.") + to_chat(user, span_warning("Someone's already washing here.")) return - to_chat(usr, "You start washing your hands.") + to_chat(usr, span_notice("You start washing your hands.")) playsound(src, 'sound/effects/sink_long.ogg', 75, 1) busy = 1 if(!do_after(user, 40, src)) busy = 0 - to_chat(usr, "You stop washing your hands.") + to_chat(usr, span_notice("You stop washing your hands.")) return busy = 0 @@ -563,17 +563,17 @@ if(ishuman(user)) user:update_inv_gloves() for(var/mob/V in viewers(src, null)) - V.show_message("[user] washes their hands using \the [src].") + V.show_message(span_notice("[user] washes their hands using \the [src].")) /obj/structure/sink/attackby(obj/item/O as obj, mob/user as mob) if(busy) - to_chat(user, "Someone's already washing here.") + to_chat(user, span_warning("Someone's already washing here.")) return var/obj/item/reagent_containers/RG = O if (istype(RG) && RG.is_open_container()) RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) - user.visible_message("[user] fills \the [RG] using \the [src].","You fill \the [RG] using \the [src].") + user.visible_message(span_notice("[user] fills \the [RG] using \the [src]."),span_notice("You fill \the [RG] using \the [src].")) playsound(src, 'sound/effects/sink.ogg', 75, 1) return 1 @@ -592,12 +592,12 @@ B.deductcharge(B.hitcost) var/datum/gender/TU = gender_datums[user.get_visible_gender()] user.visible_message( \ - "[user] was stunned by [TU.his] wet [O]!", \ - "[user] was stunned by [TU.his] wet [O]!") + span_danger("[user] was stunned by [TU.his] wet [O]!"), \ + span_userdanger("[user] was stunned by [TU.his] wet [O]!")) return 1 else if(istype(O, /obj/item/mop)) O.reagents.add_reagent("water", 5) - to_chat(user, "You wet \the [O] in \the [src].") + to_chat(user, span_notice("You wet \the [O] in \the [src].")) playsound(src, 'sound/effects/slosh.ogg', 25, 1) return @@ -607,20 +607,20 @@ var/obj/item/I = O if(!I || !istype(I,/obj/item)) return - to_chat(usr, "You start washing \the [I].") + to_chat(usr, span_notice("You start washing \the [I].")) busy = 1 if(!do_after(user, 40, src)) busy = 0 - to_chat(usr, "You stop washing \the [I].") + to_chat(usr, span_notice("You stop washing \the [I].")) return busy = 0 O.clean_blood() O.water_act(rand(1,10)) user.visible_message( \ - "[user] washes \a [I] using \the [src].", \ - "You wash \a [I] using \the [src].") + span_notice("[user] washes \a [I] using \the [src]."), \ + span_notice("You wash \a [I] using \the [src].")) /obj/structure/sink/kitchen name = "kitchen sink" diff --git a/code/game/objects/structures/watercloset_vr.dm b/code/game/objects/structures/watercloset_vr.dm index 7e8790fbcc..728fd91347 100644 --- a/code/game/objects/structures/watercloset_vr.dm +++ b/code/game/objects/structures/watercloset_vr.dm @@ -20,7 +20,7 @@ if(istype(I) && !I.anchored) bowl_contents += I if(bowl_contents.len) - user.visible_message("[user] flushes the toilet.", "You flush the toilet.") + user.visible_message(span_notice("[user] flushes the toilet."), span_notice("You flush the toilet.")) playsound(src, 'sound/vore/death7.ogg', 50, 1) //Got lazy about getting new sound files. Have a sick remix lmao. playsound(src, 'sound/effects/bubbles.ogg', 50, 1) playsound(src, 'sound/mecha/powerup.ogg', 30, 1) diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 6648036341..61bb0bf6ee 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -95,14 +95,14 @@ if(do_after(user, 40 * WT.toolspeed)) if(!src || !WT.isOn()) return - to_chat(user,"You disassembled the windoor assembly!") + to_chat(user,span_notice("You disassembled the windoor assembly!")) if(secure) new /obj/item/stack/material/glass/reinforced(get_turf(src), 2) else new /obj/item/stack/material/glass(get_turf(src), 2) qdel(src) else - to_chat(user,"You need more welding fuel to disassemble the windoor assembly.") + to_chat(user,span_notice("You need more welding fuel to disassemble the windoor assembly.")) return //Wrenching an unsecure assembly anchors it in place. Step 4 complete @@ -112,7 +112,7 @@ if(do_after(user, 40 * W.toolspeed)) if(!src) return - to_chat(user,"You've secured the windoor assembly!") + to_chat(user,span_notice("You've secured the windoor assembly!")) src.anchored = TRUE step = 0 @@ -123,7 +123,7 @@ if(do_after(user, 40 * W.toolspeed)) if(!src) return - to_chat(user,"You've unsecured the windoor assembly!") + to_chat(user,span_notice("You've unsecured the windoor assembly!")) src.anchored = FALSE step = null @@ -134,7 +134,7 @@ var/obj/item/stack/cable_coil/CC = W if(do_after(user, 40)) if (CC.use(1)) - to_chat(user,"You wire the windoor!") + to_chat(user,span_notice("You wire the windoor!")) src.state = "02" step = 1 else @@ -150,7 +150,7 @@ if(do_after(user, 40 * W.toolspeed)) if(!src) return - to_chat(user,"You cut the windoor wires.!") + to_chat(user,span_notice("You cut the windoor wires.!")) new/obj/item/stack/cable_coil(get_turf(user), 1) src.state = "01" step = 0 @@ -165,7 +165,7 @@ user.drop_item() W.loc = src - to_chat(user,"You've installed the airlock electronics!") + to_chat(user,span_notice("You've installed the airlock electronics!")) step = 2 src.electronics = W else @@ -178,7 +178,7 @@ if(do_after(user, 40 * W.toolspeed)) if(!src || !src.electronics) return - to_chat(user,"You've removed the airlock electronics!") + to_chat(user,span_notice("You've removed the airlock electronics!")) step = 1 var/obj/item/airlock_electronics/ae = electronics electronics = null @@ -187,10 +187,10 @@ //Crowbar to complete the assembly, Step 7 complete. else if(W.has_tool_quality(TOOL_CROWBAR)) if(!src.electronics) - to_chat(usr,"The assembly is missing electronics.") + to_chat(usr,span_warning("The assembly is missing electronics.")) return if(src.electronics && istype(src.electronics, /obj/item/circuitboard/broken)) - to_chat(usr,"The assembly has broken airlock electronics.") + to_chat(usr,span_warning("The assembly has broken airlock electronics.")) return usr << browse(null, "window=windoor_access") //Not sure what this actually does... -Ner playsound(src, W.usesound, 100, 1) @@ -201,7 +201,7 @@ if(!src) return density = TRUE //Shouldn't matter but just incase - to_chat(user,"You finish the windoor!") + to_chat(user,span_notice("You finish the windoor!")) if(secure) var/obj/machinery/door/window/brigdoor/windoor = new /obj/machinery/door/window/brigdoor(src.loc) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 8c912136ba..178c9c21cc 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -28,24 +28,24 @@ . = ..() if(health == maxhealth) - . += "It looks fully intact." + . += span_notice("It looks fully intact.") else var/perc = health / maxhealth if(perc > 0.75) - . += "It has a few cracks." + . += span_notice("It has a few cracks.") else if(perc > 0.5) - . += "It looks slightly damaged." + . += span_warning("It looks slightly damaged.") else if(perc > 0.25) - . += "It looks moderately damaged." + . += span_warning("It looks moderately damaged.") else - . += "It looks heavily damaged." + . += span_danger("It looks heavily damaged.") if(silicate) if (silicate < 30) - . += "It has a thin layer of silicate." + . += span_notice("It has a thin layer of silicate.") else if (silicate < 70) - . += "It is covered in silicate." + . += span_notice("It is covered in silicate.") else - . += "There is a thick layer of silicate covering it." + . += span_notice("There is a thick layer of silicate covering it.") /obj/structure/window/examine_icon() return icon(icon=initial(icon),icon_state=initial(icon_state)) @@ -158,7 +158,7 @@ /obj/structure/window/hitby(AM as mob|obj) ..() - visible_message("[src] was hit by [AM].") + visible_message(span_danger("[src] was hit by [AM].")) var/tforce = 0 if(ismob(AM)) tforce = 40 @@ -174,14 +174,14 @@ take_damage(tforce) /obj/structure/window/attack_tk(mob/user as mob) - user.visible_message("Something knocks on [src].") + user.visible_message(span_notice("Something knocks on [src].")) playsound(src, 'sound/effects/Glasshit.ogg', 50, 1) /obj/structure/window/attack_hand(mob/user as mob) user.setClickCooldown(user.get_attack_speed()) if(HULK in user.mutations) user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!")) - user.visible_message("[user] smashes through [src]!") + user.visible_message(span_danger("[user] smashes through [src]!")) user.do_attack_animation(src) shatter() @@ -195,8 +195,8 @@ playsound(src, 'sound/effects/glassknock.ogg', 80, 1) user.do_attack_animation(src) - user.visible_message("\The [user] bangs against \the [src]!", - "You bang against \the [src]!", + user.visible_message(span_danger("\The [user] bangs against \the [src]!"), + span_danger("You bang against \the [src]!"), "You hear a banging sound.") else playsound(src, 'sound/effects/glassknock.ogg', 80, 1) @@ -210,7 +210,7 @@ if(!damage) return if(damage >= STRUCTURE_MIN_DAMAGE_THRESHOLD) - visible_message("[user] smashes into [src]!") + visible_message(span_danger("[user] smashes into [src]!")) if(reinf) damage = damage / 2 take_damage(damage) @@ -227,15 +227,15 @@ var/obj/item/weldingtool/WT = W.get_welder() if(health < maxhealth) if(WT.remove_fuel(1 ,user)) - to_chat(user, "You begin repairing [src]...") + to_chat(user, span_notice("You begin repairing [src]...")) playsound(src, WT.usesound, 50, 1) if(do_after(user, 40 * WT.toolspeed, target = src)) health = maxhealth // playsound(src, 'sound/items/Welder.ogg', 50, 1) update_icon() - to_chat(user, "You repair [src].") + to_chat(user, span_notice("You repair [src].")) else - to_chat(user, "[src] is already in good condition!") + to_chat(user, span_warning("[src] is already in good condition!")) return // Slamming. @@ -247,17 +247,17 @@ qdel(W) //gotta delete it here because if window breaks, it won't get deleted switch (state) if(1) - M.visible_message("[user] slams [M] against \the [src]!") + M.visible_message(span_warning("[user] slams [M] against \the [src]!")) M.apply_damage(7) hit(10) if(2) - M.visible_message("[user] bashes [M] against \the [src]!") + M.visible_message(span_danger("[user] bashes [M] against \the [src]!")) if (prob(50)) M.Weaken(1) M.apply_damage(10) hit(25) if(3) - M.visible_message("[user] crushes [M] against \the [src]!") + M.visible_message(span_danger("[user] crushes [M] against \the [src]!")) M.Weaken(5) M.apply_damage(20) hit(50) @@ -270,31 +270,31 @@ state = 3 - state update_nearby_icons() playsound(src, W.usesound, 75, 1) - to_chat(user, "You have [state == 1 ? "un" : ""]fastened the window [state ? "from" : "to"] the frame.") + to_chat(user, span_notice("You have [state == 1 ? "un" : ""]fastened the window [state ? "from" : "to"] the frame.")) else if(reinf && state == 0) anchored = !anchored update_nearby_tiles(need_rebuild=1) update_nearby_icons() update_verbs() playsound(src, W.usesound, 75, 1) - to_chat(user, "You have [anchored ? "" : "un"]fastened the frame [anchored ? "to" : "from"] the floor.") + to_chat(user, span_notice("You have [anchored ? "" : "un"]fastened the frame [anchored ? "to" : "from"] the floor.")) else if(!reinf) anchored = !anchored update_nearby_tiles(need_rebuild=1) update_nearby_icons() update_verbs() playsound(src, W.usesound, 75, 1) - to_chat(user, "You have [anchored ? "" : "un"]fastened the window [anchored ? "to" : "from"] the floor.") + to_chat(user, span_notice("You have [anchored ? "" : "un"]fastened the window [anchored ? "to" : "from"] the floor.")) else if(W.has_tool_quality(TOOL_CROWBAR) && reinf && state <= 1) state = 1 - state playsound(src, W.usesound, 75, 1) - to_chat(user, "You have pried the window [state ? "into" : "out of"] the frame.") + to_chat(user, span_notice("You have pried the window [state ? "into" : "out of"] the frame.")) else if(W.has_tool_quality(TOOL_WRENCH) && !anchored && (!state || !reinf)) if(!glasstype) - to_chat(user, "You're not sure how to dismantle \the [src] properly.") + to_chat(user, span_notice("You're not sure how to dismantle \the [src] properly.")) else playsound(src, W.usesound, 75, 1) - visible_message("[user] dismantles \the [src].") + visible_message(span_notice("[user] dismantles \the [src].")) var/obj/item/stack/material/mats = new glasstype(loc) if(is_fulltile()) mats.set_amount(4) @@ -305,7 +305,7 @@ playsound(src, 'sound/effects/sparks1.ogg', 75, 1) user.visible_message( \ "\The [user] begins to wire \the [src] for electrochromic tinting.", \ - "You begin to wire \the [src] for electrochromic tinting.", \ + span_notice("You begin to wire \the [src] for electrochromic tinting."), \ "You hear sparks.") if(do_after(user, 20 * C.toolspeed, src) && state == 0) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) @@ -609,7 +609,7 @@ if(istype(MT.connectable, /obj/machinery/button/windowtint)) var/obj/machinery/button/windowtint/buffered_button = MT.connectable src.id = buffered_button.id - to_chat(user, "\The [src] is linked to \the [buffered_button] with ID '[id]'.") + to_chat(user, span_notice("\The [src] is linked to \the [buffered_button] with ID '[id]'.")) return TRUE // Otherwise fall back to asking them... and remind them what the current ID is. if(id) @@ -617,7 +617,7 @@ var/t = sanitizeSafe(input(user, "Enter the new ID for the window.", src.name, null), MAX_NAME_LEN) if(t && in_range(src, user)) src.id = t - to_chat(user, "The new ID of \the [src] is '[id]'.") + to_chat(user, span_notice("The new ID of \the [src] is '[id]'.")) return TRUE . = ..() @@ -677,10 +677,10 @@ var/t = sanitizeSafe(tgui_input_text(user, "Enter an ID for \the [src].", src.name, null, MAX_NAME_LEN), MAX_NAME_LEN) if (t && in_range(src, user)) src.id = t - to_chat(user, "The new ID of \the [src] is '[id]'. To reset this, rebuild the control.") + to_chat(user, span_notice("The new ID of \the [src] is '[id]'. To reset this, rebuild the control.")) if(id) // It already has an ID (or they just set one), buffer it for copying to windows. - to_chat(user, "You store \the [src] ID ('[id]') in \the [MT]'s buffer!") + to_chat(user, span_notice("You store \the [src] ID ('[id]') in \the [MT]'s buffer!")) MT.connectable = src MT.update_icon() return TRUE diff --git a/code/game/objects/stumble_into_vr.dm b/code/game/objects/stumble_into_vr.dm index 2079ab5a42..750e79183f 100644 --- a/code/game/objects/stumble_into_vr.dm +++ b/code/game/objects/stumble_into_vr.dm @@ -1,7 +1,7 @@ /atom/proc/stumble_into(mob/living/M) playsound(src, "punch", 25, 1, -1) - visible_message("[M] [pick("ran", "slammed")] into \the [src]!") - to_chat(M, "You just [pick("ran", "slammed")] into \the [src]!") + visible_message(span_warning("[M] [pick("ran", "slammed")] into \the [src]!")) + to_chat(M, span_warning("You just [pick("ran", "slammed")] into \the [src]!")) M.apply_damage(5, BRUTE) M.Weaken(2) M.stop_flying() @@ -14,7 +14,7 @@ playsound(src, material.tableslam_noise, 25, 1, -1) else playsound(src, 'sound/weapons/tablehit1.ogg', 25, 1, -1) - visible_message("[M] flopped onto \the [src]!") + visible_message(span_warning("[M] flopped onto \the [src]!")) M.apply_damage(5, BRUTE) M.Weaken(2) M.forceMove(get_turf(src)) @@ -22,7 +22,7 @@ /obj/machinery/disposal/stumble_into(mob/living/M) playsound(src, 'sound/effects/clang.ogg', 25, 1, -1) - visible_message("[M] [pick("tripped", "stumbled")] into \the [src]!") + visible_message(span_warning("[M] [pick("tripped", "stumbled")] into \the [src]!")) log_and_message_admins("stumbled into \the [src]", M) if(M.client) M.client.perspective = EYE_PERSPECTIVE @@ -35,20 +35,20 @@ /obj/structure/inflatable/stumble_into(mob/living/M) playsound(src, "sound/effects/Glasshit.ogg", 25, 1, -1) - visible_message("[M] [pick("ran", "slammed")] into \the [src]!") + visible_message(span_warning("[M] [pick("ran", "slammed")] into \the [src]!")) M.Weaken(1) M.stop_flying() /obj/structure/kitchenspike/stumble_into(mob/living/M) playsound(src, "sound/weapons/pierce.ogg", 25, 1, -1) - visible_message("[M] [pick("ran", "slammed")] into the spikes on \the [src]!") + visible_message(span_warning("[M] [pick("ran", "slammed")] into the spikes on \the [src]!")) M.apply_damage(15, BRUTE, sharp = TRUE) M.Weaken(5) M.stop_flying() /obj/structure/m_tray/stumble_into(mob/living/M) playsound(src, 'sound/weapons/tablehit1.ogg', 25, 1, -1) - visible_message("[M] flopped onto \the [src]!") + visible_message(span_warning("[M] flopped onto \the [src]!")) M.apply_damage(5, BRUTE) M.Weaken(2) M.forceMove(get_turf(src)) @@ -56,14 +56,14 @@ /obj/structure/c_tray/stumble_into(mob/living/M) playsound(src, 'sound/weapons/tablehit1.ogg', 25, 1, -1) - visible_message("[M] flopped onto \the [src]!") + visible_message(span_warning("[M] flopped onto \the [src]!")) M.apply_damage(5, BRUTE) M.Weaken(2) M.forceMove(get_turf(src)) M.stop_flying() /obj/structure/window/stumble_into(mob/living/M) - visible_message("[M] [pick("ran", "slammed")] into \the [src]!") + visible_message(span_warning("[M] [pick("ran", "slammed")] into \the [src]!")) M.apply_damage(5, BRUTE) M.Weaken(2) hitby(M) @@ -74,7 +74,7 @@ if(occupied) return ..() playsound(src, 'sound/misc/slip.ogg', 25, 1, -1) - visible_message("[M] [pick("tripped", "stumbled")] over \the [src]!") + visible_message(span_warning("[M] [pick("tripped", "stumbled")] over \the [src]!")) M.Weaken(2) M.stop_flying() if(get_turf(M) == get_turf(src)) @@ -93,7 +93,7 @@ bumpopen(M) /obj/machinery/appliance/cooker/fryer/stumble_into(mob/living/M) - visible_message("[M] [pick("ran", "slammed")] into \the [src]!") + visible_message(span_warning("[M] [pick("ran", "slammed")] into \the [src]!")) M.apply_damage(15, BURN) M.Weaken(5) M.emote("scream") @@ -103,7 +103,7 @@ if((stat & (NOPOWER|BROKEN)) || !istype(M, /mob/living/carbon) || occupant || M.abiotic() || !node) return ..() playsound(src, 'sound/effects/Glasshit.ogg', 25, 1, -1) - visible_message("[M] [pick("tripped", "stumbled")] into \the [src]!") + visible_message(span_warning("[M] [pick("tripped", "stumbled")] into \the [src]!")) M.apply_damage(5, BRUTE) M.Weaken(2) put_mob(M) @@ -127,7 +127,7 @@ if(!ishuman(M) || !isopen || !ispowered || isbroken || OCCUPANT || HELMET || SUIT) return ..() playsound(src, 'sound/effects/clang.ogg', 25, 1, -1) - visible_message("[M] [pick("tripped", "stumbled")] into \the [src]!") + visible_message(span_warning("[M] [pick("tripped", "stumbled")] into \the [src]!")) if(M.client) M.client.perspective = EYE_PERSPECTIVE M.client.eye = src diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm index 99190be832..536ce05cbf 100644 --- a/code/game/objects/weapons.dm +++ b/code/game/objects/weapons.dm @@ -43,7 +43,7 @@ cleave_visual(user, target) if(hit_mobs) - to_chat(user, "You used \the [src] to attack [hit_mobs] other thing\s!") + to_chat(user, span_danger("You used \the [src] to attack [hit_mobs] other thing\s!")) cleaving = FALSE // We're done now. return hit_mobs > 0 // Returns TRUE if anything got hit. diff --git a/code/game/response_team.dm b/code/game/response_team.dm index ec69bdefec..d80fa0861b 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -13,16 +13,16 @@ var/silent_ert = 0 set desc = "Send an emergency response team to the station" if(!holder) - to_chat(usr, "Only administrators may use this command.") + to_chat(usr, span_danger("Only administrators may use this command.")) return if(!ticker) - to_chat(usr, "The game hasn't started yet!") + to_chat(usr, span_danger("The game hasn't started yet!")) return if(ticker.current_state == 1) - to_chat(usr, "The round hasn't started yet!") + to_chat(usr, span_danger("The round hasn't started yet!")) return if(send_emergency_team) - to_chat(usr, "[using_map.boss_name] has already dispatched an emergency response team!") + to_chat(usr, span_danger("[using_map.boss_name] has already dispatched an emergency response team!")) return if(tgui_alert(usr, "Do you want to dispatch an Emergency Response Team?","ERT",list("Yes","No")) != "Yes") return @@ -32,7 +32,7 @@ var/silent_ert = 0 if(tgui_alert(usr, "The station is not in red alert. Do you still want to dispatch a response team?","ERT",list("Yes","No")) != "Yes") return if(send_emergency_team) - to_chat(usr, "Looks like somebody beat you to it!") + to_chat(usr, span_danger("Looks like somebody beat you to it!")) return message_admins("[key_name_admin(usr)] is dispatching an Emergency Response Team.", 1) @@ -46,7 +46,7 @@ var/silent_ert = 0 set category = "IC" if(!MayRespawn(1)) - to_chat(usr, "You cannot join the response team at this time.") + to_chat(usr, span_warning("You cannot join the response team at this time.")) return if(istype(usr,/mob/observer/dead) || istype(usr,/mob/new_player)) @@ -54,7 +54,7 @@ var/silent_ert = 0 to_chat(usr, "No emergency response team is currently being sent.") return if(jobban_isbanned(usr, JOB_SYNDICATE) || jobban_isbanned(usr, JOB_EMERGENCY_RESPONSE_TEAM) || jobban_isbanned(usr, JOB_SECURITY_OFFICER)) - to_chat(usr, "You are jobbanned from the emergency reponse team!") + to_chat(usr, span_danger("You are jobbanned from the emergency reponse team!")) return if(ert.current_antagonists.len >= ert.hard_cap) to_chat(usr, "The emergency response team is already full!") diff --git a/code/game/sound.dm b/code/game/sound.dm index dbbbc8abfd..40722e5359 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -138,7 +138,7 @@ if(prefs?.read_preference(/datum/preference/toggle/play_lobby_music)) var/datum/track/T = pick(SSmedia_tracks.lobby_tracks) media.push_music(T.url, world.time, 0.85) - to_chat(src,"Lobby music: [T.title] by [T.artist].") + to_chat(src,span_notice("Lobby music: [T.title] by [T.artist].")) /proc/get_sfx(soundin) if(istext(soundin)) diff --git a/code/game/trader_visit.dm b/code/game/trader_visit.dm index a7bfab8d2e..ceb90b4675 100644 --- a/code/game/trader_visit.dm +++ b/code/game/trader_visit.dm @@ -9,16 +9,16 @@ var/can_call_traders = 1 set desc = "Invite players to join the Beruang." if(!holder) - to_chat(usr, "Only administrators may use this command.") + to_chat(usr, span_danger("Only administrators may use this command.")) return if(!ticker) - to_chat(usr, "The game hasn't started yet!") + to_chat(usr, span_danger("The game hasn't started yet!")) return if(ticker.current_state == 1) - to_chat(usr, "The round hasn't started yet!") + to_chat(usr, span_danger("The round hasn't started yet!")) return if(send_beruang) - to_chat(usr, "The Beruang has already been sent this round!") + to_chat(usr, span_danger("The Beruang has already been sent this round!")) return if(tgui_alert(usr, "Do you want to dispatch the Beruang trade ship?","Trade Ship",list("Yes","No")) != "Yes") return @@ -26,7 +26,7 @@ var/can_call_traders = 1 if(tgui_alert(usr, "The station is in red alert. Do you still want to send traders?","Trade Ship",list("Yes","No")) != "Yes") return if(send_beruang) - to_chat(usr, "Looks like somebody beat you to it!") + to_chat(usr, span_danger("Looks like somebody beat you to it!")) return message_admins("[key_name_admin(usr)] is dispatching the Beruang.", 1) @@ -39,7 +39,7 @@ var/can_call_traders = 1 set category = "IC" if(!MayRespawn(1)) - to_chat(usr, "You cannot join the traders.") + to_chat(usr, span_warning("You cannot join the traders.")) return if(istype(usr,/mob/observer/dead) || istype(usr,/mob/new_player)) diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index d60d807950..841ab7286b 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -92,7 +92,7 @@ /turf/simulated/Entered(atom/A, atom/OL) if(movement_disabled && usr.ckey != movement_disabled_exception) - to_chat(usr, "Movement is admin-disabled.") //This is to identify lag problems + to_chat(usr, span_danger("Movement is admin-disabled.")) //This is to identify lag problems return if (istype(A,/mob/living)) diff --git a/code/game/turfs/simulated/floor_attackby.dm b/code/game/turfs/simulated/floor_attackby.dm index 791de56615..ff00f6273e 100644 --- a/code/game/turfs/simulated/floor_attackby.dm +++ b/code/game/turfs/simulated/floor_attackby.dm @@ -38,17 +38,17 @@ if(!A) A = locate(/turf/simulated/wall) in cardinalTurfs if(!A) - to_chat(user, "There's nothing to attach the ceiling to!") + to_chat(user, span_warning("There's nothing to attach the ceiling to!")) return if(R.use(1)) // Cost of roofing tiles is 1:1 with cost to place lattice and plating T.ReplaceWithLattice() T.ChangeTurf(/turf/simulated/floor, preserve_outdoors = TRUE) playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) - user.visible_message("[user] patches a hole in the ceiling.", "You patch a hole in the ceiling.") + user.visible_message(span_notice("[user] patches a hole in the ceiling."), span_notice("You patch a hole in the ceiling.")) expended_tile = TRUE else - to_chat(user, "There aren't any holes in the ceiling to patch here.") + to_chat(user, span_warning("There aren't any holes in the ceiling to patch here.")) return // Create a ceiling to shield from the weather @@ -59,7 +59,7 @@ if(expended_tile || R.use(1)) make_indoors() playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) - user.visible_message("[user] roofs a tile, shielding it from the elements.", "You roof this tile, shielding it from the elements.") + user.visible_message(span_notice("[user] roofs a tile, shielding it from the elements."), span_notice("You roof this tile, shielding it from the elements.")) break return @@ -69,7 +69,7 @@ try_deconstruct_tile(C, user) return else if(istype(C, /obj/item/stack/cable_coil)) - to_chat(user, "You must remove the [flooring.descriptor] first.") + to_chat(user, span_warning("You must remove the [flooring.descriptor] first.")) return else if(istype(C, /obj/item/stack/tile)) if(try_replace_tile(C, user)) @@ -78,7 +78,7 @@ if(!flooring.build_type && can_be_plated && !((flooring.flags & TURF_REMOVE_WRENCH) || (flooring.flags & TURF_REMOVE_CROWBAR) || (flooring.flags & TURF_REMOVE_SCREWDRIVER) || (flooring.flags & TURF_REMOVE_SHOVEL))) for(var/obj/structure/P in contents) if(istype(P, /obj/structure/flora)) - to_chat(user, "The [P.name] is in the way, you'll have to get rid of it first.") + to_chat(user, span_warning("The [P.name] is in the way, you'll have to get rid of it first.")) return var/obj/item/stack/tile/floor/S = C if (S.get_amount() < 1) @@ -94,7 +94,7 @@ // Placing wires on plating if(istype(C, /obj/item/stack/cable_coil)) if(broken || burnt) - to_chat(user, "This section is too damaged to support anything. Use a welder to fix the damage.") + to_chat(user, span_warning("This section is too damaged to support anything. Use a welder to fix the damage.")) return var/obj/item/stack/cable_coil/coil = C coil.turf_place(src, user) @@ -102,7 +102,7 @@ // Placing flooring on plating else if(istype(C, /obj/item/stack)) if(broken || burnt) - to_chat(user, "This section is too damaged to support anything. Use a welder to fix the damage.") + to_chat(user, span_warning("This section is too damaged to support anything. Use a welder to fix the damage.")) return var/obj/item/stack/S = C var/decl/flooring/use_flooring @@ -117,7 +117,7 @@ return // Do we have enough? if(use_flooring.build_cost && S.get_amount() < use_flooring.build_cost) - to_chat(user, "You require at least [use_flooring.build_cost] [S.name] to complete the [use_flooring.descriptor].") + to_chat(user, span_warning("You require at least [use_flooring.build_cost] [S.name] to complete the [use_flooring.descriptor].")) return // Stay still and focus... if(use_flooring.build_time && !do_after(user, use_flooring.build_time)) @@ -135,23 +135,23 @@ // Needs repairs if(broken || burnt) if(welder.remove_fuel(0,user)) - to_chat(user, "You fix some dents on the broken plating.") + to_chat(user, span_notice("You fix some dents on the broken plating.")) playsound(src, welder.usesound, 80, 1) icon_state = "plating" burnt = null broken = null else - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span_warning("You need more welding fuel to complete this task.")) // Deconstructing plating else var/base_type = get_base_turf_by_area(src) if(type == base_type || !base_type) - to_chat(user, "There's nothing under [src] to expose by cutting.") + to_chat(user, span_warning("There's nothing under [src] to expose by cutting.")) return if(!can_remove_plating(user)) return - user.visible_message("[user] begins cutting through [src].", "You begin cutting through [src].") + user.visible_message(span_warning("[user] begins cutting through [src]."), span_warning("You begin cutting through [src].")) // This is slow because it's a potentially hostile action to just cut through places into space in the middle of the bar and such // Presumably also the structural floor is thick? if(do_after(user, 10 SECONDS, src, TRUE, exclusive = TASK_ALL_EXCLUSIVE)) @@ -162,13 +162,13 @@ /turf/simulated/floor/proc/try_deconstruct_tile(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_CROWBAR)) if(broken || burnt) - to_chat(user, "You remove the broken [flooring.descriptor].") + to_chat(user, span_notice("You remove the broken [flooring.descriptor].")) make_plating() else if(flooring.flags & TURF_IS_FRAGILE) - to_chat(user, "You forcefully pry off the [flooring.descriptor], destroying them in the process.") + to_chat(user, span_danger("You forcefully pry off the [flooring.descriptor], destroying them in the process.")) make_plating() else if(flooring.flags & TURF_REMOVE_CROWBAR) - to_chat(user, "You lever off the [flooring.descriptor].") + to_chat(user, span_notice("You lever off the [flooring.descriptor].")) make_plating(1) else return 0 @@ -177,17 +177,17 @@ else if(W.has_tool_quality(TOOL_SCREWDRIVER) && (flooring.flags & TURF_REMOVE_SCREWDRIVER)) if(broken || burnt) return 0 - to_chat(user, "You unscrew and remove the [flooring.descriptor].") + to_chat(user, span_notice("You unscrew and remove the [flooring.descriptor].")) make_plating(1) playsound(src, W.usesound, 80, 1) return 1 else if(W.has_tool_quality(TOOL_WRENCH) && (flooring.flags & TURF_REMOVE_WRENCH)) - to_chat(user, "You unwrench and remove the [flooring.descriptor].") + to_chat(user, span_notice("You unwrench and remove the [flooring.descriptor].")) make_plating(1) playsound(src, W.usesound, 80, 1) return 1 else if(istype(W, /obj/item/shovel) && (flooring.flags & TURF_REMOVE_SHOVEL)) - to_chat(user, "You shovel off the [flooring.descriptor].") + to_chat(user, span_notice("You shovel off the [flooring.descriptor].")) make_plating(1) playsound(src, 'sound/items/Deconstruct.ogg', 80, 1) return 1 @@ -207,10 +207,10 @@ /turf/simulated/floor/proc/can_remove_plating(mob/user) if(!is_plating()) - to_chat(user, "\The [src] can't be cut through!") + to_chat(user, span_warning("\The [src] can't be cut through!")) return FALSE if(locate(/obj/structure) in contents) - to_chat(user, "\The [src] has structures that must be removed before cutting!") + to_chat(user, span_warning("\The [src] has structures that must be removed before cutting!")) return FALSE return TRUE @@ -218,7 +218,7 @@ if(W.has_tool_quality(TOOL_WELDER)) var/obj/item/weldingtool/WT = W.get_welder() if(!WT.remove_fuel(5,user)) - to_chat(user, "You don't have enough fuel in [WT] finish cutting through [src].") + to_chat(user, span_warning("You don't have enough fuel in [WT] finish cutting through [src].")) return playsound(src, WT.usesound, 80, 1) diff --git a/code/game/turfs/simulated/floor_types_vr.dm b/code/game/turfs/simulated/floor_types_vr.dm index e6dfafa9ac..790acb1976 100644 --- a/code/game/turfs/simulated/floor_types_vr.dm +++ b/code/game/turfs/simulated/floor_types_vr.dm @@ -55,7 +55,7 @@ return var/obj/item/stack/rods/R = C if (R.use(1)) - to_chat(user, "Constructing support lattice ...") + to_chat(user, span_notice("Constructing support lattice ...")) playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) new/obj/structure/lattice(src) return @@ -72,7 +72,7 @@ ChangeTurf(/turf/simulated/floor/airless) return else - to_chat(user, "The plating is going to need some support.") + to_chat(user, span_warning("The plating is going to need some support.")) /turf/simulated/shuttle/plating/airless/carry/is_solid_structure() return locate(/obj/structure/lattice, src) @@ -88,4 +88,3 @@ desc = "It is entirely made of sick, gurgling flesh. It is releasing a sickly odour." icon_state = "bloodfloor_2" icon = 'icons/goonstation/turf/meatland.dmi' - diff --git a/code/game/turfs/simulated/outdoors/snow.dm b/code/game/turfs/simulated/outdoors/snow.dm index 424ae0dc28..6306d3f5ed 100644 --- a/code/game/turfs/simulated/outdoors/snow.dm +++ b/code/game/turfs/simulated/outdoors/snow.dm @@ -30,13 +30,13 @@ /turf/simulated/floor/outdoors/snow/attackby(var/obj/item/W, var/mob/user) if(istype(W, /obj/item/shovel)) - to_chat(user, "You begin to remove \the [src] with your [W].") + to_chat(user, span_notice("You begin to remove \the [src] with your [W].")) if(do_after(user, 4 SECONDS * W.toolspeed)) - to_chat(user, "\The [src] has been dug up, and now lies in a pile nearby.") + to_chat(user, span_notice("\The [src] has been dug up, and now lies in a pile nearby.")) new /obj/item/stack/material/snow(src, 10) demote() else - to_chat(user, "You decide to not finish removing \the [src].") + to_chat(user, span_notice("You decide to not finish removing \the [src].")) else ..() @@ -69,7 +69,7 @@ sleep(1 * world.tick_lag) if(istype(M, /mob/living)) if(M.stunned == 0) - to_chat(M, "You slide across the ice!") + to_chat(M, span_warning("You slide across the ice!")) M.SetStunned(1) step(M,M.dir) diff --git a/code/game/turfs/simulated/outdoors/survival_action_vr.dm b/code/game/turfs/simulated/outdoors/survival_action_vr.dm index a94e111e5c..3e527ff13a 100644 --- a/code/game/turfs/simulated/outdoors/survival_action_vr.dm +++ b/code/game/turfs/simulated/outdoors/survival_action_vr.dm @@ -16,7 +16,7 @@ var/static/list/has_rocks = list("dirt5", "dirt6", "dirt7", "dirt8", "dirt9") icon_state = "dirt0" return if(locate(/obj) in src) - to_chat(user, "The [name] isn't clear.") + to_chat(user, span_notice("The [name] isn't clear.")) return else var/choice= tgui_alert(user, "Do you want to build a growplot out of the dirt?", "Build growplot?" , list("Yes", "No")) @@ -31,17 +31,17 @@ var/static/list/has_rocks = list("dirt5", "dirt6", "dirt7", "dirt8", "dirt9") /turf/simulated/floor/outdoors/proc/rock_gathering(var/mob/user as mob) if(locate(/obj) in src) - to_chat(user, "The [name] isn't clear.") + to_chat(user, span_notice("The [name] isn't clear.")) return user.visible_message("[user] starts digging around in \the [src]...", "You start digging around in \the [src]...") if(do_after(user, 5 SECONDS, exclusive = TASK_USER_EXCLUSIVE)) if(prob(rock_chance)) var/obj/item/stack/material/flint/R = new(get_turf(src), rand(1,4)) - to_chat(user, "You found some [R]") + to_chat(user, span_notice("You found some [R]")) R.pixel_x = rand(-6,6) R.pixel_y = rand(-6,6) else - to_chat(user, "You didn't find anything...") + to_chat(user, span_notice("You didn't find anything...")) else return @@ -65,7 +65,7 @@ var/static/list/has_rocks = list("dirt5", "dirt6", "dirt7", "dirt8", "dirt9") if(Adjacent(user)) var/static/list/has_rocks = list("dirt5", "dirt6", "dirt7", "dirt8", "dirt9") if(icon_state in has_rocks) - . += "There are some rocks in the dirt." + . += span_notice("There are some rocks in the dirt.") /obj/structure/flora/tree var/sticks = TRUE @@ -79,4 +79,4 @@ var/static/list/has_rocks = list("dirt5", "dirt6", "dirt7", "dirt8", "dirt9") S.pixel_y = rand(-6,6) sticks = FALSE else - to_chat(user, "You don't see any loose sticks...") + to_chat(user, span_notice("You don't see any loose sticks...")) diff --git a/code/game/turfs/simulated/underwater.dm b/code/game/turfs/simulated/underwater.dm index ac98d36fc7..3d67afef3f 100644 --- a/code/game/turfs/simulated/underwater.dm +++ b/code/game/turfs/simulated/underwater.dm @@ -43,7 +43,7 @@ if(L.check_submerged() <= 0) return if(!istype(oldloc, /turf/simulated/floor/water/underwater)) - to_chat(L, "You get drenched in water from entering \the [src]!") + to_chat(L, span_warning("You get drenched in water from entering \the [src]!")) AM.water_act(5) ..() @@ -54,7 +54,7 @@ if(L.check_submerged() <= 0) return if(!istype(newloc, /turf/simulated/floor/water/underwater)) - to_chat(L, "You climb out of \the [src].") + to_chat(L, span_warning("You climb out of \the [src].")) ..() /turf/simulated/floor/water/deep/ocean/diving @@ -93,4 +93,3 @@ icon_state = "wood-broken0" // So it shows up in the map editor as water. water_icon = 'icons/turf/flooring/wood_vr.dmi' water_state = "wood-broken0" - diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm index 04fc940b9a..d7630618e2 100644 --- a/code/game/turfs/simulated/wall_attacks.dm +++ b/code/game/turfs/simulated/wall_attacks.dm @@ -57,16 +57,16 @@ var/mob/living/simple_mob/S = user playsound(src, S.attack_sound, 75, 1) if(!(S.melee_damage_upper >= STRUCTURE_MIN_DAMAGE_THRESHOLD * 2)) - to_chat(user, "You bounce against the wall.") + to_chat(user, span_notice("You bounce against the wall.")) return FALSE damage_lower = S.melee_damage_lower damage_upper = S.melee_damage_upper - to_chat(user, "You smash against the wall!") + to_chat(user, span_danger("You smash against the wall!")) user.do_attack_animation(src) take_damage(rand(damage_lower,damage_upper)) /turf/simulated/wall/proc/success_smash(var/mob/user) - to_chat(user, "You smash through the wall!") + to_chat(user, span_danger("You smash through the wall!")) user.do_attack_animation(src) if(isanimal(user)) var/mob/living/simple_mob/S = user @@ -78,15 +78,15 @@ if(rotting) if(reinf_material) - to_chat(user, "\The [reinf_material.display_name] feels porous and crumbly.") + to_chat(user, span_danger("\The [reinf_material.display_name] feels porous and crumbly.")) else - to_chat(user, "\The [material.display_name] crumbles under your touch!") + to_chat(user, span_danger("\The [material.display_name] crumbles under your touch!")) dismantle_wall() return 1 if(!can_open) if(!material.wall_touch_special(src, user)) - to_chat(user, "You push the wall, but nothing happens.") + to_chat(user, span_notice("You push the wall, but nothing happens.")) playsound(src, 'sound/weapons/Genhit.ogg', 25, 1) else toggle_open(user) @@ -139,7 +139,7 @@ */ if (!user.IsAdvancedToolUser()) - to_chat(user, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You don't have the dexterity to do this!")) return //get the user's location @@ -168,10 +168,10 @@ T.ReplaceWithLattice() T.ChangeTurf(/turf/simulated/floor, preserve_outdoors = TRUE) playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) - user.visible_message("[user] patches a hole in the ceiling.", "You patch a hole in the ceiling.") + user.visible_message(span_notice("[user] patches a hole in the ceiling."), span_notice("You patch a hole in the ceiling.")) expended_tile = TRUE else - to_chat(user, "There aren't any holes in the ceiling to patch here.") + to_chat(user, span_warning("There aren't any holes in the ceiling to patch here.")) return // Create a ceiling to shield from the weather @@ -180,7 +180,7 @@ make_indoors() if(!expended_tile) // Would've already played a sound playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) - user.visible_message("[user] roofs \the [src], shielding it from the elements.", "You roof \the [src] tile, shielding it from the elements.") + user.visible_message(span_notice("[user] roofs \the [src], shielding it from the elements."), span_notice("You roof \the [src] tile, shielding it from the elements.")) return @@ -188,13 +188,13 @@ if(W.has_tool_quality(TOOL_WELDER)) var/obj/item/weldingtool/WT = W.get_welder() if( WT.remove_fuel(0,user) ) - to_chat(user, "You burn away the fungi with \the [WT].") + to_chat(user, span_notice("You burn away the fungi with \the [WT].")) playsound(src, WT.usesound, 10, 1) for(var/obj/effect/overlay/wallrot/WR in src) qdel(WR) return else if(!is_sharp(W) && W.force >= 10 || W.force >= 20) - to_chat(user, "\The [src] crumbles away under the force of your [W.name].") + to_chat(user, span_notice("\The [src] crumbles away under the force of your [W.name].")) src.dismantle_wall(1) return @@ -214,7 +214,7 @@ var/obj/item/melee/energy/blade/EB = W EB.spark_system.start() - to_chat(user, "You slash \the [src] with \the [EB]; the thermite ignites!") + to_chat(user, span_notice("You slash \the [src] with \the [EB]; the thermite ignites!")) playsound(src, "sparks", 50, 1) playsound(src, 'sound/weapons/blade1.ogg', 50, 1) @@ -231,13 +231,13 @@ return if(WT.remove_fuel(0,user)) - to_chat(user, "You start repairing the damage to [src].") + to_chat(user, span_notice("You start repairing the damage to [src].")) playsound(src, WT.usesound, 100, 1) if(do_after(user, max(5, damage / 5) * WT.toolspeed) && WT && WT.isOn()) - to_chat(user, "You finish repairing the damage to [src].") + to_chat(user, span_notice("You finish repairing the damage to [src].")) take_damage(-damage) else - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span_notice("You need more welding fuel to complete this task.")) return user.update_examine_panel(src) return @@ -255,7 +255,7 @@ if(!WT.isOn()) return if(!WT.remove_fuel(0,user)) - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span_notice("You need more welding fuel to complete this task.")) return dismantle_verb = "cutting" dismantle_sound = W.usesound @@ -273,7 +273,7 @@ if(dismantle_verb) - to_chat(user, "You begin [dismantle_verb] through the outer plating.") + to_chat(user, span_notice("You begin [dismantle_verb] through the outer plating.")) if(dismantle_sound) playsound(src, dismantle_sound, 100, 1) @@ -283,9 +283,9 @@ if(!do_after(user,cut_delay * W.toolspeed)) return - to_chat(user, "You remove the outer plating.") + to_chat(user, span_notice("You remove the outer plating.")) dismantle_wall() - user.visible_message("The wall was torn open by [user]!") + user.visible_message(span_warning("The wall was torn open by [user]!")) return //Reinforced dismantling. @@ -296,24 +296,24 @@ playsound(src, W.usesound, 100, 1) construction_stage = 5 user.update_examine_panel(src) - to_chat(user, "You cut through the outer grille.") + to_chat(user, span_notice("You cut through the outer grille.")) update_icon() return if(5) if (W.has_tool_quality(TOOL_SCREWDRIVER)) - to_chat(user, "You begin removing the support lines.") + to_chat(user, span_notice("You begin removing the support lines.")) playsound(src, W.usesound, 100, 1) if(!do_after(user,40 * W.toolspeed) || !istype(src, /turf/simulated/wall) || construction_stage != 5) return construction_stage = 4 user.update_examine_panel(src) update_icon() - to_chat(user, "You unscrew the support lines.") + to_chat(user, span_notice("You unscrew the support lines.")) return else if (W.has_tool_quality(TOOL_WIRECUTTER)) construction_stage = 6 user.update_examine_panel(src) - to_chat(user, "You mend the outer grille.") + to_chat(user, span_notice("You mend the outer grille.")) playsound(src, W.usesound, 100, 1) update_icon() return @@ -326,51 +326,51 @@ if(WT.remove_fuel(0,user)) cut_cover=1 else - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span_notice("You need more welding fuel to complete this task.")) return else if (istype(W, /obj/item/pickaxe/plasmacutter)) cut_cover = 1 if(cut_cover) - to_chat(user, "You begin slicing through the metal cover.") + to_chat(user, span_notice("You begin slicing through the metal cover.")) playsound(src, W.usesound, 100, 1) if(!do_after(user, 60 * W.toolspeed) || !istype(src, /turf/simulated/wall) || construction_stage != 4) return construction_stage = 3 user.update_examine_panel(src) update_icon() - to_chat(user, "You press firmly on the cover, dislodging it.") + to_chat(user, span_notice("You press firmly on the cover, dislodging it.")) return else if (W.has_tool_quality(TOOL_SCREWDRIVER)) - to_chat(user, "You begin screwing down the support lines.") + to_chat(user, span_notice("You begin screwing down the support lines.")) playsound(src, W.usesound, 100, 1) if(!do_after(user,40 * W.toolspeed) || !istype(src, /turf/simulated/wall) || construction_stage != 4) return construction_stage = 5 user.update_examine_panel(src) update_icon() - to_chat(user, "You screw down the support lines.") + to_chat(user, span_notice("You screw down the support lines.")) return if(3) if (W.has_tool_quality(TOOL_CROWBAR)) - to_chat(user, "You struggle to pry off the cover.") + to_chat(user, span_notice("You struggle to pry off the cover.")) playsound(src, W.usesound, 100, 1) if(!do_after(user,100 * W.toolspeed) || !istype(src, /turf/simulated/wall) || construction_stage != 3) return construction_stage = 2 user.update_examine_panel(src) update_icon() - to_chat(user, "You pry off the cover.") + to_chat(user, span_notice("You pry off the cover.")) return if(2) if (W.has_tool_quality(TOOL_WRENCH)) - to_chat(user, "You start loosening the anchoring bolts which secure the support rods to their frame.") + to_chat(user, span_notice("You start loosening the anchoring bolts which secure the support rods to their frame.")) playsound(src, W.usesound, 100, 1) if(!do_after(user,40 * W.toolspeed) || !istype(src, /turf/simulated/wall) || construction_stage != 2) return construction_stage = 1 user.update_examine_panel(src) update_icon() - to_chat(user, "You remove the bolts anchoring the support rods.") + to_chat(user, span_notice("You remove the bolts anchoring the support rods.")) return if(1) var/cut_cover @@ -379,28 +379,28 @@ if( WT.remove_fuel(0,user) ) cut_cover=1 else - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span_notice("You need more welding fuel to complete this task.")) return else if(istype(W, /obj/item/pickaxe/plasmacutter)) cut_cover = 1 if(cut_cover) - to_chat(user, "You begin slicing through the support rods.") + to_chat(user, span_notice("You begin slicing through the support rods.")) playsound(src, W.usesound, 100, 1) if(!do_after(user,70 * W.toolspeed) || !istype(src, /turf/simulated/wall) || construction_stage != 1) return construction_stage = 0 user.update_examine_panel(src) update_icon() - to_chat(user, "You slice through the support rods.") + to_chat(user, span_notice("You slice through the support rods.")) return if(0) if(W.has_tool_quality(TOOL_CROWBAR)) - to_chat(user, "You struggle to pry off the outer sheath.") + to_chat(user, span_notice("You struggle to pry off the outer sheath.")) playsound(src, W.usesound, 100, 1) if(!do_after(user,100 * W.toolspeed) || !istype(src, /turf/simulated/wall) || !user || !W || !T ) return if(user.loc == T && user.get_active_hand() == W ) - to_chat(user, "You pry off the outer sheath.") + to_chat(user, span_notice("You pry off the outer sheath.")) dismantle_wall() return @@ -411,5 +411,3 @@ else if(!istype(W,/obj/item/rcd) && !istype(W, /obj/item/reagent_containers)) return attack_hand(user) - - diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index f600f83c42..571632b9dd 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -80,7 +80,7 @@ damage = new_damage Proj.damage = outgoing_damage - visible_message("\The [src] reflects \the [Proj]!") + visible_message(span_danger("\The [src] reflects \the [Proj]!")) // Find a turf near or on the original location to bounce to var/new_x = Proj.starting.x + pick(0, 0, 0, -1, 1, -2, 2) @@ -127,18 +127,18 @@ . = ..() if(!damage) - . += "It looks fully intact." + . += span_notice("It looks fully intact.") else var/dam = damage / material.integrity if(dam <= 0.3) - . += "It looks slightly damaged." + . += span_warning("It looks slightly damaged.") else if(dam <= 0.6) - . += "It looks moderately damaged." + . += span_warning("It looks moderately damaged.") else - . += "It looks heavily damaged." + . += span_danger("It looks heavily damaged.") if(locate(/obj/effect/overlay/wallrot) in src) - . += "There is fungus growing on [src]." + . += span_warning("There is fungus growing on [src].") //Damage @@ -154,7 +154,7 @@ return F.burn_tile() F.icon_state = "wall_thermite" - visible_message("\The [src] spontaneously combusts!.") //!!OH SHIT!! + visible_message(span_danger("\The [src] spontaneously combusts!.")) //!!OH SHIT!! return /turf/simulated/wall/take_damage(dam) @@ -281,7 +281,7 @@ var/turf/simulated/floor/F = src F.burn_tile() F.icon_state = "dmg[rand(1,4)]" - to_chat(user, "The thermite starts melting through the wall.") + to_chat(user, span_warning("The thermite starts melting through the wall.")) spawn(100) if(O) diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm index d16806dd6d..d070cfd06c 100644 --- a/code/game/turfs/simulated/water.dm +++ b/code/game/turfs/simulated/water.dm @@ -42,12 +42,12 @@ var/obj/item/reagent_containers/RG = O if (istype(RG) && RG.is_open_container()) RG.reagents.add_reagent(reagent_type, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) - user.visible_message("[user] fills \the [RG] using \the [src].","You fill \the [RG] using \the [src].") + user.visible_message(span_notice("[user] fills \the [RG] using \the [src]."),span_notice("You fill \the [RG] using \the [src].")) return 1 else if(istype(O, /obj/item/mop)) O.reagents.add_reagent(reagent_type, 5) - to_chat(user, "You wet \the [O] in \the [src].") + to_chat(user, span_notice("You wet \the [O] in \the [src].")) playsound(src, 'sound/effects/slosh.ogg', 25, 1) return 1 @@ -75,7 +75,7 @@ return water_breath if(L && L.is_bad_swimmer() && depth >= 2 && !L.buckled() && !L.flying) if(prob(10)) - L.visible_message("[L] splashes wildly.","You struggle to keep your head above the water!") + L.visible_message(span_notice("[L] splashes wildly."),span_warning("You struggle to keep your head above the water!")) if(L.can_breathe_water()) var/datum/gas_mixture/water_breath = new() var/datum/gas_mixture/above_air = return_air() @@ -103,7 +103,7 @@ if(L.check_submerged() <= 0) return if(!istype(oldloc, /turf/simulated/floor/water)) - to_chat(L, "You get drenched in water from entering \the [src]!") + to_chat(L, span_warning("You get drenched in water from entering \the [src]!")) AM.water_act(5) ..() @@ -114,7 +114,7 @@ if(L.check_submerged() <= 0) return if(!istype(newloc, /turf/simulated/floor/water)) - to_chat(L, "You climb out of \the [src].") + to_chat(L, span_warning("You climb out of \the [src].")) ..() /turf/simulated/floor/water/deep @@ -260,7 +260,7 @@ var/list/shoreline_icon_cache = list() if(L.check_submerged() <= 0) return if(!istype(oldloc, /turf/simulated/floor/water)) - to_chat(L, "You get drenched in blood from entering \the [src]!") + to_chat(L, span_warning("You get drenched in blood from entering \the [src]!")) AM.water_act(5) ..() @@ -273,4 +273,3 @@ var/list/shoreline_icon_cache = list() water_state = "water" under_state = "glamour" reagent_type = "water" - diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 60634ecc5d..6d4c24f2d5 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -88,7 +88,7 @@ return var/obj/item/stack/rods/R = C if (R.use(1)) - to_chat(user, "Constructing support lattice ...") + to_chat(user, span_notice("Constructing support lattice ...")) playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) ReplaceWithLattice() return @@ -105,7 +105,7 @@ ChangeTurf(/turf/simulated/floor/airless) return else - to_chat(user, "The plating is going to need some support.") + to_chat(user, span_warning("The plating is going to need some support.")) if(istype(C, /obj/item/stack/tile/roofing)) var/turf/T = GetAbove(src) @@ -119,16 +119,16 @@ if(!A) A = locate(/turf/simulated/wall) in T.CardinalTurfs() if(!A) - to_chat(user, "There's nothing to attach the ceiling to!") + to_chat(user, span_warning("There's nothing to attach the ceiling to!")) return if(R.use(1)) // Cost of roofing tiles is 1:1 with cost to place lattice and plating T.ReplaceWithLattice() T.ChangeTurf(/turf/simulated/floor) playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) - user.visible_message("[user] expands the ceiling.", "You expand the ceiling.") + user.visible_message(span_notice("[user] expands the ceiling."), span_notice("You expand the ceiling.")) else - to_chat(user, "There aren't any holes in the ceiling to patch here.") + to_chat(user, span_warning("There aren't any holes in the ceiling to patch here.")) return // Space shouldn't have weather of the sort planets with atmospheres do. // If that's changed, then you'll want to swipe the rest of the roofing code from code/game/turfs/simulated/floor_attackby.dm diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index ce9760cab5..8ecf7256e2 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -140,7 +140,7 @@ user.do_attack_animation(src, no_attack_icons = TRUE) if(!success) // Nothing got hit. - user.visible_message("\The [user] swipes \the [W] over \the [src].") + user.visible_message(span_warning("\The [user] swipes \the [W] over \the [src].")) playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) return success @@ -183,7 +183,7 @@ //There's a lot of QDELETED() calls here if someone can figure out how to optimize this but not runtime when something gets deleted by a Bump/CanPass/Cross call, lemme know or go ahead and fix this mess - kevinz000 /turf/Enter(atom/movable/mover, atom/oldloc) if(movement_disabled && usr.ckey != movement_disabled_exception) - to_chat(usr, "Movement is admin-disabled.") //This is to identify lag problems + to_chat(usr, span_warning("Movement is admin-disabled.")) //This is to identify lag problems return // Do not call ..() // Byond's default turf/Enter() doesn't have the behaviour we want with Bump() @@ -293,7 +293,7 @@ if(istype(O,/obj/effect/rune) || istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay)) qdel(O) else - to_chat(user, "\The [source] is too dry to wash that.") + to_chat(user, span_warning("\The [source] is too dry to wash that.")) source.reagents.trans_to_turf(src, 1, 10) //10 is the multiplier for the reaction effect. probably needed to wet the floor properly. /turf/proc/update_blood_overlays() @@ -328,7 +328,7 @@ for(var/obj/effect/decal/writing/W in src) too_much_graffiti++ if(too_much_graffiti >= 5) - to_chat(vandal, "There's too much graffiti here to add more.") + to_chat(vandal, span_warning("There's too much graffiti here to add more.")) return FALSE var/message = sanitize(tgui_input_text(usr, "Enter a message to engrave.", "Graffiti"), trim = TRUE) @@ -338,18 +338,18 @@ if(!vandal || vandal.incapacitated() || !Adjacent(vandal) || !tool.loc == vandal) return FALSE - vandal.visible_message("\The [vandal] begins carving something into \the [src].") + vandal.visible_message(span_warning("\The [vandal] begins carving something into \the [src].")) if(!do_after(vandal, max(20, length(message)), src)) return FALSE - vandal.visible_message("\The [vandal] carves some graffiti into \the [src].") + vandal.visible_message(span_danger("\The [vandal] carves some graffiti into \the [src].")) var/obj/effect/decal/writing/graffiti = new(src) graffiti.message = message graffiti.author = vandal.ckey if(lowertext(message) == "elbereth") - to_chat(vandal, "You feel much safer.") + to_chat(vandal, span_notice("You feel much safer.")) return TRUE diff --git a/code/game/turfs/weird_turfs_vr.dm b/code/game/turfs/weird_turfs_vr.dm index 9a6bad3973..f46006c401 100644 --- a/code/game/turfs/weird_turfs_vr.dm +++ b/code/game/turfs/weird_turfs_vr.dm @@ -24,17 +24,17 @@ if(istype(L.species, /datum/species/crew_shadekin)) L.halloss += 5 if(prob(50)) - to_chat(L, "The more you move through this darkness, the more you can feel a throbbing, shooting ache in your bones.") + to_chat(L, span_danger("The more you move through this darkness, the more you can feel a throbbing, shooting ache in your bones.")) if(prob(5)) L.visible_message("[L]'s body gives off a faint, sparking, haze...", "Your body gives off a faint, sparking, haze...", runemessage = "gives off a faint, sparking haze") else if(istype(L.species, /datum/species/shadekin)) var/obj/item/organ/internal/brain/shadekin/B = L.internal_organs_by_name["brain"] B.dark_energy += 10 if(prob(10)) - to_chat(L, "You can feel the energy flowing into you!") + to_chat(L, span_notice("You can feel the energy flowing into you!")) else if(prob(0.25)) - to_chat(L, "The darkness seethes under your feet...") + to_chat(L, span_danger("The darkness seethes under your feet...")) L.hallucination += 50 /turf/simulated/floor/weird_things/dark/proc/add_glow() @@ -83,17 +83,17 @@ if(istype(L.species, /datum/species/crew_shadekin)) L.halloss += 5 if(prob(50)) - to_chat(L, "The more you move through this darkness, the more you can feel a throbbing, shooting ache in your bones.") + to_chat(L, span_danger("The more you move through this darkness, the more you can feel a throbbing, shooting ache in your bones.")) if(prob(5)) L.visible_message("[L]'s body gives off a faint, sparking, haze...", "Your body gives off a faint, sparking, haze...", runemessage = "gives off a faint, sparking haze") else if(istype(L.species, /datum/species/shadekin)) var/obj/item/organ/internal/brain/shadekin/B = L.internal_organs_by_name["brain"] B.dark_energy += 10 if(prob(10)) - to_chat(L, "You can feel the energy flowing into you!") + to_chat(L, span_notice("You can feel the energy flowing into you!")) else if(prob(0.25)) - to_chat(L, "The darkness seethes under your feet...") + to_chat(L, span_danger("The darkness seethes under your feet...")) L.hallucination += 50 /turf/unsimulated/floor/dark/proc/add_glow() @@ -113,4 +113,4 @@ if(flip == 2) choiceb = "overlay-[rand(1,6)]" var/image/ii = image('icons/turf/flooring/weird_vr.dmi', choiceb) - add_overlay(ii) \ No newline at end of file + add_overlay(ii) diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index 3fabc75768..ddb06b6f77 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -3,5 +3,5 @@ /mob/living/verb/suicide() set hidden = 1 - to_chat(src, "No. Adminhelp if there is a legitimate reason, and please review our server rules.") + to_chat(src, span_warning("No. Adminhelp if there is a legitimate reason, and please review our server rules.")) message_admins("[ckey] has tried to trigger the suicide verb, but it is disabled.") diff --git a/code/game/world.dm b/code/game/world.dm index 24ea94a8a2..428a24ddb6 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -419,10 +419,10 @@ var/world_topic_spam_protect_time = world.timeofday if (usr) log_admin("[key_name(usr)] Has requested an immediate world restart via client side debugging tools") message_admins("[key_name_admin(usr)] Has requested an immediate world restart via client side debugging tools") - to_world("[key_name_admin(usr)] has requested an immediate world restart via client side debugging tools") + to_world(span_boldannounce("[key_name_admin(usr)] has requested an immediate world restart via client side debugging tools")) else - to_world("Rebooting world immediately due to host request") + to_world(span_boldannounce("Rebooting world immediately due to host request")) else Master.Shutdown() //run SS shutdowns for(var/client/C in GLOB.clients) diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm index 6695f2b6b6..4eef2a3724 100644 --- a/code/modules/admin/DB ban/functions.dm +++ b/code/modules/admin/DB ban/functions.dm @@ -83,7 +83,7 @@ var/sql = "INSERT INTO erro_ban (`id`,`bantime`,`serverip`,`bantype`,`reason`,`job`,`duration`,`rounds`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`,`edits`,`unbanned`,`unbanned_datetime`,`unbanned_ckey`,`unbanned_computerid`,`unbanned_ip`) VALUES (null, Now(), '[serverip]', '[bantype_str]', '[reason]', '[job]', [(duration)?"[duration]":"0"], [(rounds)?"[rounds]":"0"], Now() + INTERVAL [(duration>0) ? duration : 0] MINUTE, '[ckey]', '[computerid]', '[ip]', '[a_ckey]', '[a_computerid]', '[a_ip]', '[who]', '[adminwho]', '', null, null, null, null, null)" var/DBQuery/query_insert = dbcon.NewQuery(sql) query_insert.Execute() - to_chat(usr, "[span_blue("Ban saved to database.")]") + to_chat(usr, span_filter_adminlog("[span_blue("Ban saved to database.")]")) message_admins("[key_name_admin(usr)] has added a [bantype_str] for [ckey] [(job)?"([job])":""] [(duration > 0)?"([duration] minutes)":""] with the reason: \"[reason]\" to the ban database.",1) @@ -137,17 +137,17 @@ ban_number++; if(ban_number == 0) - to_chat(usr, "[span_red("Database update failed due to no bans fitting the search criteria. If this is not a legacy ban you should contact the database admin.")]") + to_chat(usr, span_filter_adminlog("[span_red("Database update failed due to no bans fitting the search criteria. If this is not a legacy ban you should contact the database admin.")]")) return if(ban_number > 1) - to_chat(usr, "[span_red("Database update failed due to multiple bans fitting the search criteria. Note down the ckey, job and current time and contact the database admin.")]") + to_chat(usr, span_filter_adminlog("[span_red("Database update failed due to multiple bans fitting the search criteria. Note down the ckey, job and current time and contact the database admin.")]")) return if(istext(ban_id)) ban_id = text2num(ban_id) if(!isnum(ban_id)) - to_chat(usr, "[span_red("Database update failed due to a ban ID mismatch. Contact the database admin.")]") + to_chat(usr, span_filter_adminlog("[span_red("Database update failed due to a ban ID mismatch. Contact the database admin.")]")) return DB_ban_unban_by_id(ban_id) @@ -173,7 +173,7 @@ duration = query.item[2] reason = query.item[3] else - to_chat(usr, "Invalid ban id. Contact the database admin") + to_chat(usr, span_filter_adminlog("Invalid ban id. Contact the database admin")) return reason = sql_sanitize_text(reason) @@ -205,7 +205,7 @@ if(tgui_alert(usr, "Unban [pckey]?", "Unban?", list("Yes", "No")) == "Yes") DB_ban_unban_by_id(banid) return - to_chat(usr, "Cancelled") + to_chat(usr, span_filter_adminlog("Cancelled")) return /datum/admins/proc/DB_ban_unban_by_id(var/id) @@ -228,11 +228,11 @@ ban_number++; if(ban_number == 0) - to_chat(usr, "[span_red("Database update failed due to a ban id not being present in the database.")]") + to_chat(usr, span_filter_adminlog("[span_red("Database update failed due to a ban id not being present in the database.")]")) return if(ban_number > 1) - to_chat(usr, "[span_red("Database update failed due to multiple bans having the same ID. Contact the database admin.")]") + to_chat(usr, span_filter_adminlog("[span_red("Database update failed due to multiple bans having the same ID. Contact the database admin.")]")) return if(!src.owner || !istype(src.owner, /client)) @@ -268,7 +268,7 @@ establish_db_connection() if(!dbcon.IsConnected()) - to_chat(usr, "[span_red("Failed to establish database connection")]") + to_chat(usr, span_filter_adminlog("[span_red("Failed to establish database connection")]")) return var/output = "
" diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index 9e5ff08a13..345e44637a 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -106,7 +106,7 @@ var/savefile/Banlist Banlist.cd = "/base" if ( Banlist.dir.Find("[ckey][computerid]") ) - to_chat(usr, "Ban already exists.") + to_chat(usr, span_filter_adminlog(span_warning("Ban already exists."))) return 0 else Banlist.dir.Add("[ckey][computerid]") diff --git a/code/modules/admin/ToRban.dm b/code/modules/admin/ToRban.dm index a3a5863cec..4027234428 100644 --- a/code/modules/admin/ToRban.dm +++ b/code/modules/admin/ToRban.dm @@ -38,7 +38,7 @@ F["last_update"] << world.realtime log_misc("ToR data updated!") if(usr) - to_chat(usr, "ToRban updated.") + to_chat(usr, span_filter_adminlog("ToRban updated.")) return log_misc("ToR data update aborted: no data.") return @@ -73,16 +73,16 @@ var/choice = tgui_input_list(src,"Please select an IP address to remove from the ToR banlist:","Remove ToR ban", F.dir) if(choice) F.dir.Remove(choice) - to_chat(src, "Address removed") + to_chat(src, span_filter_adminlog("Address removed")) if("remove all") - to_chat(src, "[TORFILE] was [fdel(TORFILE)?"":"not "]removed.") + to_chat(src, span_filter_adminlog("[TORFILE] was [fdel(TORFILE)?"":"not "]removed.")) if("find") var/input = tgui_input_text(src,"Please input an IP address to search for:","Find ToR ban",null) if(input) if(ToRban_isbanned(input)) - to_chat(src, "[span_orange("Address is a known ToR address")]") + to_chat(src, span_filter_adminlog("[span_orange("Address is a known ToR address")]")) else - to_chat(src, "Address is not a known ToR address") + to_chat(src, span_filter_adminlog(span_danger("Address is not a known ToR address"))) return #undef TORFILE diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index cad295e4d0..8a91738a56 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -603,7 +603,7 @@ var/global/floorIsLava = 0 if(!confirm || confirm == "Cancel") return if(confirm == "Yes") - to_world("Restarting world!Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!") + to_world(span_danger("Restarting world!" ) + span_notice("Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!")) log_admin("[key_name(usr)] initiated a reboot.") feedback_set_details("end_error","admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]") @@ -702,12 +702,12 @@ var/datum/announcement/minor/admin_min_announcer = new //Time to find how they screwed up. //Wasn't the right length if((decomposed.len) % 3) //+1 to accomidate the lack of a wait time for the last message - to_chat(usr, "You passed [decomposed.len] segments (senders+messages+pauses). You must pass a multiple of 3, minus 1 (no pause after the last message). That means a sender and message on every other line (starting on the first), separated by a pipe character (|), and a number every other line that is a pause in seconds.") + to_chat(usr, span_warning("You passed [decomposed.len] segments (senders+messages+pauses). You must pass a multiple of 3, minus 1 (no pause after the last message). That means a sender and message on every other line (starting on the first), separated by a pipe character (|), and a number every other line that is a pause in seconds.")) return //Too long a conversation if((decomposed.len / 3) > 20) - to_chat(usr, "This conversation is too long! 20 messages maximum, please.") + to_chat(usr, span_warning("This conversation is too long! 20 messages maximum, please.")) return //Missed some sleeps, or sanitized to nothing. @@ -716,24 +716,24 @@ var/datum/announcement/minor/admin_min_announcer = new //Sanitize sender var/clean_sender = sanitize(decomposed[i]) if(!clean_sender) - to_chat(usr, "One part of your conversation was not able to be sanitized. It was the sender of the [(i+2)/3]\th message.") + to_chat(usr, span_warning("One part of your conversation was not able to be sanitized. It was the sender of the [(i+2)/3]\th message.")) return decomposed[i] = clean_sender //Sanitize message var/clean_message = sanitize(decomposed[++i]) if(!clean_message) - to_chat(usr, "One part of your conversation was not able to be sanitized. It was the body of the [(i+2)/3]\th message.") + to_chat(usr, span_warning("One part of your conversation was not able to be sanitized. It was the body of the [(i+2)/3]\th message.")) return decomposed[i] = clean_message //Sanitize wait time var/clean_time = text2num(decomposed[++i]) if(!isnum(clean_time)) - to_chat(usr, "One part of your conversation was not able to be sanitized. It was the wait time after the [(i+2)/3]\th message.") + to_chat(usr, span_warning("One part of your conversation was not able to be sanitized. It was the wait time after the [(i+2)/3]\th message.")) return if(clean_time > 60) - to_chat(usr, "Max 60 second wait time between messages for sanity's sake please.") + to_chat(usr, span_warning("Max 60 second wait time between messages for sanity's sake please.")) return decomposed[i] = clean_time @@ -842,7 +842,7 @@ var/datum/announcement/minor/admin_min_announcer = new if(!check_rights(R_SERVER|R_EVENT)) return if(SSticker.current_state > GAME_STATE_PREGAME) - to_chat(usr, "Error: Start Now: Game has already started.") + to_chat(usr, span_warning("Error: Start Now: Game has already started.")) return if(!SSticker.start_immediately) SSticker.start_immediately = TRUE @@ -850,11 +850,11 @@ var/datum/announcement/minor/admin_min_announcer = new if(SSticker.current_state == GAME_STATE_INIT) msg = " (The server is still setting up, but the round will be started as soon as possible.)" log_admin("[key_name(usr)] has started the game.[msg]") - message_admins("[key_name_admin(usr)] has started the game.[msg]") + message_admins(span_notice("[key_name_admin(usr)] has started the game.[msg]")) feedback_add_details("admin_verb","SN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! else SSticker.start_immediately = FALSE - to_world("Immediate game start canceled. Normal startup resumed.") + to_world(span_notice("Immediate game start canceled. Normal startup resumed.")) log_and_message_admins("cancelled immediate game start.") /datum/admins/proc/toggleenter() @@ -1394,7 +1394,7 @@ var/datum/announcement/minor/admin_min_announcer = new if(body) if(body.teleop) body.teleop = tomob - message_admins("[key_name_admin(usr)] has put [frommob.ckey] in control of [tomob.name].") + message_admins(span_adminnotice("[key_name_admin(usr)] has put [frommob.ckey] in control of [tomob.name].")) log_admin("[key_name(usr)] stuffed [frommob.ckey] into [tomob.name].") feedback_add_details("admin_verb","CGD") tomob.ckey = frommob.ckey @@ -1562,17 +1562,17 @@ var/datum/announcement/minor/admin_min_announcer = new if(destination.receivefax(P)) - to_chat(src.owner, "Message reply to transmitted successfully.") + to_chat(src.owner, span_notice("Message reply to transmitted successfully.")) if(P.sender) // sent as a reply log_admin("[key_name(src.owner)] replied to a fax message from [key_name(P.sender)]") for(var/client/C in GLOB.admins) if((R_ADMIN | R_MOD | R_EVENT) & C.holder.rights) - to_chat(C, "FAX LOG:[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(P.sender)] (VIEW)") + to_chat(C, span_log_message("[span_prefix("FAX LOG:")][key_name_admin(src.owner)] replied to a fax message from [key_name_admin(P.sender)] (VIEW)")) else log_admin("[key_name(src.owner)] has sent a fax message to [destination.department]") for(var/client/C in GLOB.admins) if((R_ADMIN | R_MOD | R_EVENT) & C.holder.rights) - to_chat(C, "FAX LOG:[key_name_admin(src.owner)] has sent a fax message to [destination.department] (VIEW)") + to_chat(C, span_log_message("[span_prefix("FAX LOG:")][key_name_admin(src.owner)] has sent a fax message to [destination.department] (VIEW)")) var/plaintext_title = P.sender ? "replied to [key_name(P.sender)]'s fax" : "sent a fax message to [destination.department]" var/fax_text = paper_html_to_plaintext(P.info) @@ -1588,7 +1588,7 @@ var/datum/announcement/minor/admin_min_announcer = new ) else - to_chat(src.owner, "Message reply failed.") + to_chat(src.owner, span_warning("Message reply failed.")) spawn(100) qdel(P) diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index f59a6ad811..567f5c7669 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -23,7 +23,7 @@ if(!message) return var/F = investigate_subject2file(subject) if(!F) return - to_file(F, "[time2text(world.timeofday,"hh:mm")] \ref[src] ([x],[y],[z]) || [src] [message]
") + to_file(F, span_filter_adminlog("[time2text(world.timeofday,"hh:mm")] \ref[src] ([x],[y],[z]) || [src] [message]
")) //ADMINVERBS /client/proc/investigate_show( subject in list("hrefs","notes","singulo","telesci") ) @@ -34,7 +34,7 @@ if("singulo", "telesci") //general one-round-only stuff var/F = investigate_subject2file(subject) if(!F) - to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") + to_chat(src, span_filter_adminlog(span_warning("Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed."))) return src << browse(F,"window=investigate[subject];size=800x300") @@ -43,10 +43,10 @@ if(href_logfile) src << browse(href_logfile,"window=investigate[subject];size=800x300") else - to_chat(src, "Error: admin_investigate: No href logfile found.") + to_chat(src, span_filter_adminlog(span_warning("Error: admin_investigate: No href logfile found."))) return else - to_chat(src, "Error: admin_investigate: Href Logging is not on.") + to_chat(src, span_filter_adminlog(span_warning("Error: admin_investigate: Href Logging is not on."))) return #undef INVESTIGATE_DIR diff --git a/code/modules/admin/admin_memo.dm b/code/modules/admin/admin_memo.dm index e305c83b5a..9e91839526 100644 --- a/code/modules/admin/admin_memo.dm +++ b/code/modules/admin/admin_memo.dm @@ -24,11 +24,11 @@ return if("") F.dir.Remove(ckey) - to_chat(src, "Memo removed") + to_chat(src, span_filter_adminlog("Memo removed")) return if( findtext(memo,"[key] on [time2text(world.realtime,"(DDD) DD MMM hh:mm")]
[memo]") + to_chat(F[ckey], span_filter_adminlog("[key] on [time2text(world.realtime,"(DDD) DD MMM hh:mm")]
[memo]")) message_admins("[key] set an admin memo:
[memo]") //show all memos @@ -39,7 +39,7 @@ var/savefile/F = new(MEMOFILE) if(F) for(var/ckey in F.dir) - to_chat(src, "
Admin Memo by [F[ckey]]
") + to_chat(src, span_filter_adminlog("
Admin Memo by [F[ckey]]
")) //delete your own or somebody else's memo /client/proc/admin_memo_delete() @@ -52,7 +52,7 @@ ckey = src.ckey if(ckey) F.dir.Remove(ckey) - to_chat(src, "Removed Memo created by [ckey].") + to_chat(src, span_filter_adminlog("Removed Memo created by [ckey].")) #undef MEMOFILE -#undef ENABLE_MEMOS \ No newline at end of file +#undef ENABLE_MEMOS diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 1102602a64..659905aac7 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -5,7 +5,7 @@ verbs.Remove(/client/proc/hide_most_verbs, admin_verbs_hideable) verbs += /client/proc/show_verbs - to_chat(src, "Most of your adminverbs have been hidden.") + to_chat(src, span_filter_system(span_interface("Most of your adminverbs have been hidden."))) feedback_add_details("admin_verb","HMV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return @@ -16,7 +16,7 @@ remove_admin_verbs() verbs += /client/proc/show_verbs - to_chat(src, "Almost all of your adminverbs have been hidden.") + to_chat(src, span_filter_system(span_interface("Almost all of your adminverbs have been hidden."))) feedback_add_details("admin_verb","TAVVH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return @@ -27,7 +27,7 @@ verbs -= /client/proc/show_verbs add_admin_verbs() - to_chat(src, "All of your adminverbs are now visible.") + to_chat(src, span_filter_adminlog(span_interface("All of your adminverbs are now visible."))) feedback_add_details("admin_verb","TAVVS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -54,13 +54,13 @@ else ghost.reenter_corpse() else - to_chat(ghost, "Error: Aghost: Can't reenter corpse.") + to_chat(ghost, span_filter_system(span_warning("Error: Aghost: Can't reenter corpse."))) return feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! else if(istype(mob,/mob/new_player)) - to_chat(src, "Error: Aghost: Can't admin-ghost whilst in the lobby. Join or Observe first.") + to_chat(src, span_filter_system(span_warning("Error: Aghost: Can't admin-ghost whilst in the lobby. Join or Observe first."))) else //ghostize var/mob/body = mob @@ -87,11 +87,11 @@ if(holder && mob) if(mob.invisibility == INVISIBILITY_OBSERVER) mob.invisibility = initial(mob.invisibility) - to_chat(mob, "Invisimin off. Invisibility reset.") + to_chat(mob, span_filter_system(span_danger("Invisimin off. Invisibility reset."))) mob.alpha = max(mob.alpha + 100, 255) else mob.invisibility = INVISIBILITY_OBSERVER - to_chat(mob, "Invisimin on. You are now as invisible as a ghost.") + to_chat(mob, span_filter_system(span_notice("Invisimin on. You are now as invisible as a ghost."))) mob.alpha = max(mob.alpha - 100, 0) @@ -220,7 +220,7 @@ if(!warned_ckey || !istext(warned_ckey)) return if(warned_ckey in admin_datums) - to_chat(usr, "Error: warn(): You can't warn admins.") + to_chat(usr, span_warning("Error: warn(): You can't warn admins.")) return var/datum/preferences/D @@ -229,14 +229,14 @@ else D = preferences_datums[warned_ckey] if(!D) - to_chat(src, "Error: warn(): No such ckey found.") + to_chat(src, span_warning("Error: warn(): No such ckey found.")) return if(++D.warns >= MAX_WARNS) //uh ohhhh...you'reee iiiiin trouuuubble O:) ban_unban_log_save("[ckey] warned [warned_ckey], resulting in a [AUTOBANTIME] minute autoban.") if(C) message_admins("[key_name_admin(src)] has warned [key_name_admin(C)] resulting in a [AUTOBANTIME] minute ban.") - to_chat(C, "You have been autobanned due to a warning by [ckey].
This is a temporary ban, it will be removed in [AUTOBANTIME] minutes.") + to_chat(C, span_filter_system(span_danger("You have been autobanned due to a warning by [ckey].
This is a temporary ban, it will be removed in [AUTOBANTIME] minutes."))) del(C) else message_admins("[key_name_admin(src)] has warned [warned_ckey] resulting in a [AUTOBANTIME] minute ban.") @@ -244,7 +244,7 @@ feedback_inc("ban_warn",1) else if(C) - to_chat(C, "You have been formally warned by an administrator.
Further warnings will result in an autoban.") + to_chat(C, span_filter_system(span_danger("You have been formally warned by an administrator.
Further warnings will result in an autoban."))) message_admins("[key_name_admin(src)] has warned [key_name_admin(C)]. They have [MAX_WARNS-D.warns] strikes remaining.") else message_admins("[key_name_admin(src)] has warned [warned_ckey] (DC). They have [MAX_WARNS-D.warns] strikes remaining.") @@ -320,7 +320,7 @@ set popup_menu = FALSE //VOREStation Edit - Declutter. if(!L) - to_chat(usr, "Looks like you didn't select a mob.") + to_chat(usr, span_warning("Looks like you didn't select a mob.")) return var/list/possible_modifiers = subtypesof(/datum/modifier) @@ -366,7 +366,7 @@ if(!msg) return for (var/mob/V in hearers(mob.control_object)) - V.show_message("[mob.control_object.name] says: \"[msg]\"", 2) + V.show_message(span_filter_say("[mob.control_object.name] says: \"[msg]\""), 2) feedback_add_details("admin_verb","OT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/kill_air() // -- TLE @@ -374,7 +374,7 @@ set name = "Kill Air" set desc = "Toggle Air Processing" SSair.can_fire = !SSair.can_fire - to_chat(usr, "[SSair.can_fire ? "En" : "Dis"]abled air processing.") + to_chat(usr, span_filter_system("[SSair.can_fire ? "En" : "Dis"]abled air processing.")) feedback_add_details("admin_verb","KA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] used 'kill air'.") message_admins(span_blue("[key_name_admin(usr)] used 'kill air'."), 1) @@ -387,7 +387,7 @@ deadmin_holder.reassociate() log_admin("[src] re-admined themself.") message_admins("[src] re-admined themself.", 1) - to_chat(src, "You now have the keys to control the planet, or at least a small space station") + to_chat(src, span_filter_system(span_interface("You now have the keys to control the planet, or at least a small space station"))) verbs -= /client/proc/readmin_self /client/proc/deadmin_self() @@ -399,7 +399,7 @@ log_admin("[src] deadmined themself.") message_admins("[src] deadmined themself.", 1) deadmin() - to_chat(src, "You are now a normal player.") + to_chat(src, span_filter_system(span_interface("You are now a normal player."))) verbs |= /client/proc/readmin_self feedback_add_details("admin_verb","DAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -529,8 +529,8 @@ if(tgui_alert(usr, "Are you sure you want to tell them to man up?","Confirmation",list("Deal with it","No")) != "Deal with it") return - to_chat(T, "Man up and deal with it.") - to_chat(T, "Move along.") + to_chat(T, span_filter_system(span_notice("Man up and deal with it."))) + to_chat(T, span_filter_system(span_notice("Move along."))) log_admin("[key_name(usr)] told [key_name(T)] to man up and deal with it.") message_admins(span_blue("[key_name_admin(usr)] told [key_name(T)] to man up and deal with it."), 1) diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm index c4755129e3..be2ff21f13 100644 --- a/code/modules/admin/callproc/callproc.dm +++ b/code/modules/admin/callproc/callproc.dm @@ -41,12 +41,12 @@ testname = replacetext(testname, "()", "") if(targetselected && !hascall(target,testname)) - to_chat(usr, "" + span_red("Error: callproc(): type [target.type] has no proc named [procname].") + "") + to_chat(usr, span_filter_adminlog("" + span_red("Error: callproc(): type [target.type] has no proc named [procname].") + "")) return else var/procpath = text2path(procname) if (!procpath) - to_chat(usr, "" + span_red("Error: callproc(): proc [procname] does not exist. (Did you forget the /proc/ part?)") + "") + to_chat(usr, span_filter_adminlog("" + span_red("Error: callproc(): proc [procname] does not exist. (Did you forget the /proc/ part?)") + "")) return var/list/lst = get_callproc_args() if(!lst) @@ -54,7 +54,7 @@ if(targetselected) if(!target) - to_chat(usr, "" + span_red("Error: callproc(): owner of proc no longer exists.") + "") + to_chat(usr, span_filter_adminlog("" + span_red("Error: callproc(): owner of proc no longer exists.") + "")) return var/msg = "[key_name(src)] called [target]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]." log_admin(msg) @@ -86,11 +86,11 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) /proc/WrapAdminProcCall(datum/target, procname, list/arguments) if(target && procname == "Del") - to_chat(usr, "Calling Del() is not allowed") + to_chat(usr, span_filter_adminlog("Calling Del() is not allowed")) return if(target != GLOBAL_PROC && !target.CanProcCall(procname)) - to_chat(usr, "Proccall on [target.type]/proc/[procname] is disallowed!") + to_chat(usr, span_filter_adminlog("Proccall on [target.type]/proc/[procname] is disallowed!")) return var/current_caller = GLOB.AdminProcCaller var/ckey = usr ? usr.client.ckey : GLOB.AdminProcCaller @@ -98,10 +98,10 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) CRASH("WrapAdminProcCall with no ckey: [target] [procname] [english_list(arguments)]") if(current_caller && current_caller != ckey) if(!GLOB.AdminProcCallSpamPrevention[ckey]) - to_chat(usr, "Another set of admin called procs are still running, your proc will be run after theirs finish.") + to_chat(usr, span_adminnotice("Another set of admin called procs are still running, your proc will be run after theirs finish.")) GLOB.AdminProcCallSpamPrevention[ckey] = TRUE UNTIL(!GLOB.AdminProcCaller) - to_chat(usr, "Running your proc") + to_chat(usr, span_adminnotice("Running your proc")) GLOB.AdminProcCallSpamPrevention -= ckey else UNTIL(!GLOB.AdminProcCaller) @@ -142,14 +142,14 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) if(!procname) return if(!hascall(A,procname)) - to_chat(usr, "" + span_red("Error: callproc_datum(): type [A.type] has no proc named [procname].") + "") + to_chat(usr, span_filter_adminlog("" + span_red("Error: callproc_datum(): type [A.type] has no proc named [procname].") + "")) return var/list/lst = get_callproc_args() if(!lst) return if(!A || !IsValidSrc(A)) - to_chat(usr, "Error: callproc_datum(): owner of proc no longer exists.") + to_chat(usr, span_warning("Error: callproc_datum(): owner of proc no longer exists.")) return var/msg = "[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]." log_admin(msg) diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index 3274936e2a..3f90050b57 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -82,7 +82,7 @@ NOTE: It checks usr by default. Supply the "user" argument if you wish to check return FALSE if(!C.holder) if(show_msg) - to_chat(C, "Error: You are not an admin.") + to_chat(C, span_filter_adminlog(span_warning("Error: You are not an admin."))) return FALSE if(rights_required) @@ -90,7 +90,7 @@ NOTE: It checks usr by default. Supply the "user" argument if you wish to check return TRUE else if(show_msg) - to_chat(C, "Error: You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required," ")].") + to_chat(C, span_filter_adminlog(span_warning("Error: You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required," ")]."))) return FALSE else return TRUE @@ -104,7 +104,7 @@ NOTE: It checks usr by default. Supply the "user" argument if you wish to check if(usr.client.holder.rights != other.holder.rights) if( (usr.client.holder.rights & other.holder.rights) == other.holder.rights ) return 1 //we have all the rights they have and more - to_chat(usr, "Error: Cannot proceed. They have more or equal rights to us.") + to_chat(usr, span_filter_adminlog(span_warning("Error: Cannot proceed. They have more or equal rights to us."))) return 0 /client/proc/mark_datum(datum/D) diff --git a/code/modules/admin/map_capture.dm b/code/modules/admin/map_capture.dm index 1c72267b2f..431ec7f637 100644 --- a/code/modules/admin/map_capture.dm +++ b/code/modules/admin/map_capture.dm @@ -7,13 +7,13 @@ return if(isnull(tx) || isnull(ty) || isnull(tz) || isnull(range)) - to_chat(usr, "Capture Map Part, captures part of a map using camara like rendering.") - to_chat(usr, "Usage: Capture-Map-Part target_x_cord target_y_cord target_z_cord range.") - to_chat(usr, "Target coordinates specify bottom left corner of the capture, range defines render distance to opposite corner.") + to_chat(usr, span_filter_notice("Capture Map Part, captures part of a map using camara like rendering.")) + to_chat(usr, span_filter_notice("Usage: Capture-Map-Part target_x_cord target_y_cord target_z_cord range.")) + to_chat(usr, span_filter_notice("Target coordinates specify bottom left corner of the capture, range defines render distance to opposite corner.")) return if(range > 32 || range <= 0) - to_chat(usr, "Capturing range is incorrect, it must be within 1-32.") + to_chat(usr, span_filter_notice("Capturing range is incorrect, it must be within 1-32.")) return if(locate(tx,ty,tz)) @@ -53,7 +53,7 @@ cap.Blend(img, blendMode2iconMode(A.blend_mode), A.pixel_x + xoff, A.pixel_y + yoff) var/file_name = "map_capture_x[tx]_y[ty]_z[tz]_r[range].png" - to_chat(usr, "Saved capture in cache as [file_name].") + to_chat(usr, span_filter_notice("Saved capture in cache as [file_name].")) usr << browse_rsc(cap, file_name) else - to_chat(usr, "Target coordinates are incorrect.") + to_chat(usr, span_filter_notice("Target coordinates are incorrect.")) diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm index a25fde3765..9166f3be29 100644 --- a/code/modules/admin/modify_robot.dm +++ b/code/modules/admin/modify_robot.dm @@ -502,15 +502,15 @@ target.lawsync() return TRUE if("notify_laws") - to_chat(target, "Law Notice") + to_chat(target, span_danger("Law Notice")) target.laws.show_laws(target) if(isAI(target)) var/mob/living/silicon/ai/AI = target for(var/mob/living/silicon/robot/R in AI.connected_robots) - to_chat(R, "Law Notice") + to_chat(R, span_danger("Law Notice")) R.laws.show_laws(R) if(usr != target) - to_chat(usr, "Laws displayed.") + to_chat(usr, span_notice("Laws displayed.")) return TRUE if("select_ai") selected_ai = locate(params["new_ai"]) diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm index 9c784ea49c..4545220433 100644 --- a/code/modules/admin/permissionverbs/permissionedit.dm +++ b/code/modules/admin/permissionverbs/permissionedit.dm @@ -51,13 +51,13 @@ return if(!usr.client.holder || !(usr.client.holder.rights & R_PERMISSIONS)) - to_chat(usr, "[span_red("You do not have permission to do this!")]") + to_chat(usr, span_filter_adminlog("[span_red("You do not have permission to do this!")]")) return establish_db_connection() if(!dbcon.IsConnected()) - to_chat(usr, "[span_red("Failed to establish database connection")]") + to_chat(usr, span_filter_adminlog("[span_red("Failed to establish database connection")]")) return if(!adm_ckey || !new_rank) @@ -85,14 +85,14 @@ insert_query.Execute() var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.`erro_admin_log` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Added new admin [adm_ckey] to rank [new_rank]');") log_query.Execute() - to_chat(usr, "[span_blue("New admin added.")]") + to_chat(usr, span_filter_adminlog("[span_blue("New admin added.")]")) else if(!isnull(admin_id) && isnum(admin_id)) var/DBQuery/insert_query = dbcon.NewQuery("UPDATE `erro_admin` SET rank = '[new_rank]' WHERE id = [admin_id]") insert_query.Execute() var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.`erro_admin_log` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Edited the rank of [adm_ckey] to [new_rank]');") log_query.Execute() - to_chat(usr, "[span_blue("Admin rank changed.")]") + to_chat(usr, span_filter_adminlog("[span_blue("Admin rank changed.")]")) /datum/admins/proc/log_admin_permission_modification(var/adm_ckey, var/new_permission) if(config.admin_legacy_system) return @@ -101,12 +101,12 @@ return if(!usr.client.holder || !(usr.client.holder.rights & R_PERMISSIONS)) - to_chat(usr, "[span_red(">You do not have permission to do this!")]") + to_chat(usr, span_filter_adminlog("[span_red(">You do not have permission to do this!")]")) return establish_db_connection() if(!dbcon.IsConnected()) - to_chat(usr, "[span_red("Failed to establish database connection!")]") + to_chat(usr, span_filter_adminlog("[span_red("Failed to establish database connection!")]")) return if(!adm_ckey || !new_permission) @@ -140,10 +140,10 @@ insert_query.Execute() var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.`erro_admin_log` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Removed permission [rights2text(new_permission)] (flag = [new_permission]) to admin [adm_ckey]');") log_query.Execute() - to_chat(usr, "[span_blue("Permission removed.")]") + to_chat(usr, span_filter_adminlog("[span_blue("Permission removed.")]")) else //This admin doesn't have this permission, so we are adding it. var/DBQuery/insert_query = dbcon.NewQuery("UPDATE `erro_admin` SET flags = '[admin_rights | new_permission]' WHERE id = [admin_id]") insert_query.Execute() var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.`erro_admin_log` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Added permission [rights2text(new_permission)] (flag = [new_permission]) to admin [adm_ckey]')") log_query.Execute() - to_chat(usr, "[span_blue("Permission added.")]") + to_chat(usr, span_filter_adminlog("[span_blue("Permission added.")]")) diff --git a/code/modules/admin/secrets/admin_secrets/jump_shuttle.dm b/code/modules/admin/secrets/admin_secrets/jump_shuttle.dm index 5a2550ae38..a73fafbb7c 100644 --- a/code/modules/admin/secrets/admin_secrets/jump_shuttle.dm +++ b/code/modules/admin/secrets/admin_secrets/jump_shuttle.dm @@ -31,9 +31,9 @@ var/move_duration = tgui_input_number(user, "How many seconds will this jump take?") S.long_jump(area_choices[origin_area], area_choices[destination_area], area_choices[transition_area], move_duration) - message_admins("[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] lasting [move_duration] seconds for the [shuttle_tag] shuttle", 1) + message_admins(span_notice("[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] lasting [move_duration] seconds for the [shuttle_tag] shuttle"), 1) log_admin("[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] lasting [move_duration] seconds for the [shuttle_tag] shuttle") else S.short_jump(area_choices[origin_area], area_choices[destination_area]) - message_admins("[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] for the [shuttle_tag] shuttle", 1) + message_admins(span_notice("[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] for the [shuttle_tag] shuttle"), 1) log_admin("[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] for the [shuttle_tag] shuttle") diff --git a/code/modules/admin/secrets/fun_secrets/ghost_mode.dm b/code/modules/admin/secrets/fun_secrets/ghost_mode.dm index a3a5060047..a135a4ed39 100644 --- a/code/modules/admin/secrets/fun_secrets/ghost_mode.dm +++ b/code/modules/admin/secrets/fun_secrets/ghost_mode.dm @@ -17,13 +17,13 @@ affected_mobs |= M switch(rand(1,4)) if(1) - M.show_message(text("You shudder as if cold..."), 1) + M.show_message(span_notice("You shudder as if cold..."), 1) if(2) - M.show_message(text("You feel something gliding across your back..."), 1) + M.show_message(span_notice("You feel something gliding across your back..."), 1) if(3) - M.show_message(text("Your eyes twitch, you feel like something you can't see is here..."), 1) + M.show_message(span_notice("Your eyes twitch, you feel like something you can't see is here..."), 1) if(4) - M.show_message(text("You notice something moving out of the corner of your eye, but nothing is there..."), 1) + M.show_message(span_notice("You notice something moving out of the corner of your eye, but nothing is there..."), 1) for(var/obj/W in orange(5,M)) if(prob(25) && !W.anchored) @@ -43,6 +43,6 @@ sleep(100) for(var/mob/M in affected_mobs) - M.show_message(text("The chilling wind suddenly stops..."), 1) + M.show_message(span_notice("The chilling wind suddenly stops..."), 1) affected_mobs.Cut() affected_areas.Cut() diff --git a/code/modules/admin/secrets/fun_secrets/toggle_bomb_cap.dm b/code/modules/admin/secrets/fun_secrets/toggle_bomb_cap.dm index 6bcf2ee9b3..37c08199d7 100644 --- a/code/modules/admin/secrets/fun_secrets/toggle_bomb_cap.dm +++ b/code/modules/admin/secrets/fun_secrets/toggle_bomb_cap.dm @@ -17,5 +17,5 @@ var/range_dev = max_explosion_range *0.25 var/range_high = max_explosion_range *0.5 var/range_low = max_explosion_range - message_admins("[key_name_admin(user)] changed the bomb cap to [range_dev], [range_high], [range_low]", 1) + message_admins(span_danger("[key_name_admin(user)] changed the bomb cap to [range_dev], [range_high], [range_low]"), 1) log_admin("[key_name_admin(user)] changed the bomb cap to [max_explosion_range]") diff --git a/code/modules/admin/secrets/random_events/gravity.dm b/code/modules/admin/secrets/random_events/gravity.dm index 32c31827ab..4af765fd10 100644 --- a/code/modules/admin/secrets/random_events/gravity.dm +++ b/code/modules/admin/secrets/random_events/gravity.dm @@ -23,9 +23,9 @@ feedback_add_details("admin_secrets_fun_used","Grav") if(gravity_is_on) log_admin("[key_name(user)] toggled gravity on.", 1) - message_admins("[key_name_admin(user)] toggled gravity on.", 1) + message_admins(span_notice("[key_name_admin(user)] toggled gravity on."), 1) command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.") else log_admin("[key_name(user)] toggled gravity off.", 1) - message_admins("[key_name_admin(usr)] toggled gravity off.", 1) + message_admins(span_notice("[key_name_admin(usr)] toggled gravity off."), 1) command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artificial gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes. Have a nice day.") diff --git a/code/modules/admin/secrets/random_events/gravity_vr.dm b/code/modules/admin/secrets/random_events/gravity_vr.dm index fc0c854c19..c8f0dafb6b 100644 --- a/code/modules/admin/secrets/random_events/gravity_vr.dm +++ b/code/modules/admin/secrets/random_events/gravity_vr.dm @@ -26,9 +26,9 @@ feedback_add_details("admin_secrets_fun_used","Grav") if(gravity_is_on) log_admin("[key_name(user)] toggled gravity on.", 1) - message_admins("[key_name_admin(user)] toggled gravity on.", 1) + message_admins(span_notice("[key_name_admin(user)] toggled gravity on."), 1) command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.") else log_admin("[key_name(user)] toggled gravity off.", 1) - message_admins("[key_name_admin(usr)] toggled gravity off.", 1) + message_admins(span_notice("[key_name_admin(usr)] toggled gravity off."), 1) command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artificial gravity has been disabled. Please wait for the system to reinitialize, or contact your engineering department.", "Gravity Failure") diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index c6e9d3f2e3..d80b31a330 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -84,23 +84,23 @@ switch(bantype) if(BANTYPE_PERMA) if(!banckey || !banreason) - to_chat(usr, "Not enough parameters (Requires ckey and reason)") + to_chat(usr, span_filter_adminlog("Not enough parameters (Requires ckey and reason)")) return banduration = null banjob = null if(BANTYPE_TEMP) if(!banckey || !banreason || !banduration) - to_chat(usr, "Not enough parameters (Requires ckey, reason and duration)") + to_chat(usr, span_filter_adminlog("Not enough parameters (Requires ckey, reason and duration)")) return banjob = null if(BANTYPE_JOB_PERMA) if(!banckey || !banreason || !banjob) - to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") + to_chat(usr, span_filter_adminlog("Not enough parameters (Requires ckey, reason and job)")) return banduration = null if(BANTYPE_JOB_TEMP) if(!banckey || !banreason || !banjob || !banduration) - to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") + to_chat(usr, span_filter_adminlog("Not enough parameters (Requires ckey, reason and job)")) return var/mob/playermob @@ -139,14 +139,14 @@ var/new_ckey = ckey(tgui_input_text(usr,"New admin's ckey","Admin ckey", null)) if(!new_ckey) return if(new_ckey in admin_datums) - to_chat(usr, "Error: Topic 'editrights': [new_ckey] is already an admin") + to_chat(usr, span_filter_adminlog(span_warning("Error: Topic 'editrights': [new_ckey] is already an admin"))) return adm_ckey = new_ckey task = "rank" else if(task != "show") adm_ckey = ckey(href_list["ckey"]) if(!adm_ckey) - to_chat(usr, "Error: Topic 'editrights': No valid ckey") + to_chat(usr, span_filter_adminlog(span_warning("Error: Topic 'editrights': No valid ckey"))) return var/datum/admins/D = admin_datums[adm_ckey] @@ -178,7 +178,7 @@ if(config.admin_legacy_system) new_rank = ckeyEx(new_rank) if(!new_rank) - to_chat(usr, "Error: Topic 'editrights': Invalid rank") + to_chat(usr, span_filter_adminlog(span_warning("Error: Topic 'editrights': Invalid rank"))) return if(config.admin_legacy_system) if(admin_ranks.len) @@ -287,7 +287,7 @@ var/mob/M = locate(href_list["mob"]) if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob")) return var/delmob = 0 @@ -395,14 +395,14 @@ var/mob/M = locate(href_list["jobban2"]) if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob")) return if(!M.ckey) //sanity - to_chat(usr, "This mob has no ckey") + to_chat(usr, span_filter_adminlog("This mob has no ckey")) return if(!job_master) - to_chat(usr, "Job Master has not been setup!") + to_chat(usr, span_filter_adminlog("Job Master has not been setup!")) return var/dat = "" @@ -676,16 +676,16 @@ //JOBBAN'S INNARDS else if(href_list["jobban3"]) if(!check_rights(R_MOD,0) && !check_rights(R_ADMIN,0)) - to_chat(usr, "You do not have the appropriate permissions to add job bans!") + to_chat(usr, span_filter_adminlog(span_warning("You do not have the appropriate permissions to add job bans!"))) return if(check_rights(R_MOD,0) && !check_rights(R_ADMIN,0) && !config.mods_can_job_tempban) // If mod and tempban disabled - to_chat(usr, "Mod jobbanning is disabled!") + to_chat(usr, span_filter_adminlog(span_warning("Mod jobbanning is disabled!"))) return var/mob/M = locate(href_list["jobban4"]) if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob")) return if(M != usr) //we can jobban ourselves @@ -694,7 +694,7 @@ return if(!job_master) - to_chat(usr, "Job Master has not been setup!") + to_chat(usr, span_filter_adminlog("Job Master has not been setup!")) return //get jobs for department if specified, otherwise just returnt he one job in a list. @@ -780,16 +780,16 @@ return if("Yes") if(!check_rights(R_MOD,0) && !check_rights(R_BAN, 0)) - to_chat(usr, " You cannot issue temporary job-bans!") + to_chat(usr, span_filter_adminlog(span_warning("You cannot issue temporary job-bans!"))) return if(config.ban_legacy_system) - to_chat(usr, "Your server is using the legacy banning system, which does not support temporary job bans. Consider upgrading. Aborting ban.") + to_chat(usr, span_filter_adminlog(span_warning("Your server is using the legacy banning system, which does not support temporary job bans. Consider upgrading. Aborting ban."))) return var/mins = tgui_input_number(usr,"How long (in minutes)?","Ban time",1440) if(!mins) return if(check_rights(R_MOD, 0) && !check_rights(R_BAN, 0) && mins > config.mod_job_tempban_max) - to_chat(usr, " Moderators can only job tempban up to [config.mod_job_tempban_max] minutes!") + to_chat(usr, span_filter_adminlog(span_warning("Moderators can only job tempban up to [config.mod_job_tempban_max] minutes!"))) return var/reason = sanitize(tgui_input_text(usr,"Reason?","Please State Reason","")) if(!reason) @@ -809,9 +809,9 @@ msg += ", [job]" notes_add(M.ckey, "Banned from [msg] - [reason]", usr) message_admins(span_blue("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes"), 1) - to_chat(M, "[span_red("You have been jobbanned by [usr.client.ckey] from: [msg].")]") - to_chat(M, "[span_red("The reason is: [reason]")]") - to_chat(M, "[span_red("This jobban will be lifted in [mins] minutes.")]") + to_chat(M, span_filter_system("[span_red("You have been jobbanned by [usr.client.ckey] from: [msg].")]")) + to_chat(M, span_filter_system("[span_red("The reason is: [reason]")]")) + to_chat(M, span_filter_system("[span_red("This jobban will be lifted in [mins] minutes.")]")) href_list["jobban2"] = 1 // lets it fall through and refresh return 1 if("No") @@ -830,9 +830,9 @@ else msg += ", [job]" notes_add(M.ckey, "Banned from [msg] - [reason]", usr) message_admins(span_blue("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg]"), 1) - to_chat(M, "[span_red("You have been jobbanned by [usr.client.ckey] from: [msg].")]") - to_chat(M, "[span_red("The reason is: [reason]")]") - to_chat(M, "[span_red("Jobban can be lifted only upon request.")]") + to_chat(M, span_filter_system("[span_red("You have been jobbanned by [usr.client.ckey] from: [msg].")]")) + to_chat(M, span_filter_system("[span_red("The reason is: [reason]")]")) + to_chat(M, span_filter_system("[span_red("Jobban can be lifted only upon request.")]")) href_list["jobban2"] = 1 // lets it fall through and refresh return 1 if("Cancel") @@ -842,7 +842,7 @@ //all jobs in joblist are banned already OR we didn't give a reason (implying they shouldn't be banned) if(joblist.len) //at least 1 banned job exists in joblist so we have stuff to unban. if(!config.ban_legacy_system) - to_chat(usr, "Unfortunately, database based unbanning cannot be done through this panel") + to_chat(usr, span_filter_adminlog("Unfortunately, database based unbanning cannot be done through this panel")) DB_ban_panel(M.ckey) return var/msg @@ -863,7 +863,7 @@ continue if(msg) message_admins(span_blue("[key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]"), 1) - to_chat(M, "You have been un-jobbanned by [usr.client.ckey] from [msg].") + to_chat(M, span_filter_system(span_danger("You have been un-jobbanned by [usr.client.ckey] from [msg]."))) href_list["jobban2"] = 1 // lets it fall through and refresh return 1 return 0 //we didn't do anything! @@ -901,11 +901,11 @@ else if(href_list["newban"]) if(!check_rights(R_MOD,0) && !check_rights(R_BAN, 0)) - to_chat(usr, "You do not have the appropriate permissions to add bans!") + to_chat(usr, span_warning("You do not have the appropriate permissions to add bans!")) return if(check_rights(R_MOD,0) && !check_rights(R_ADMIN, 0) && !config.mods_can_job_tempban) // If mod and tempban disabled - to_chat(usr, "Mod jobbanning is disabled!") + to_chat(usr, span_warning("Mod jobbanning is disabled!")) return var/mob/M = locate(href_list["newban"]) @@ -921,7 +921,7 @@ if(!mins) return if(check_rights(R_MOD, 0) && !check_rights(R_BAN, 0) && mins > config.mod_tempban_max) - to_chat(usr, "Moderators can only job tempban up to [config.mod_tempban_max] minutes!") + to_chat(usr, span_warning("Moderators can only job tempban up to [config.mod_tempban_max] minutes!")) return if(mins >= 525600) mins = 525599 var/reason = sanitize(tgui_input_text(usr,"Reason?","reason","Griefer")) @@ -930,15 +930,15 @@ AddBan(M.ckey, M.computer_id, reason, usr.ckey, 1, mins) ban_unban_log_save("[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.") notes_add(M.ckey,"[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.",usr) - to_chat(M, "You have been banned by [usr.client.ckey].\nReason: [reason].") - to_chat(M, "This is a temporary ban, it will be removed in [mins] minutes.") + to_chat(M, span_filter_system(span_critical("You have been banned by [usr.client.ckey].\nReason: [reason]."))) + to_chat(M, span_filter_system(span_warning("This is a temporary ban, it will be removed in [mins] minutes."))) feedback_inc("ban_tmp",1) DB_ban_record(BANTYPE_TEMP, M, mins, reason) feedback_inc("ban_tmp_mins",mins) if(config.banappeals) - to_chat(M, "To try to resolve this matter head to [config.banappeals]") + to_chat(M, span_filter_system(span_warning("To try to resolve this matter head to [config.banappeals]"))) else - to_chat(M, "No ban appeals URL has been set.") + to_chat(M, span_filter_system(span_warning("No ban appeals URL has been set."))) log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") message_admins(span_blue("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")) var/datum/admin_help/AH = M.client ? M.client.current_ticket : null @@ -957,12 +957,12 @@ AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0, M.lastKnownIP) if("No") AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0) - to_chat(M, "You have been banned by [usr.client.ckey].\nReason: [reason].") - to_chat(M, "This is a permanent ban.") + to_chat(M, span_filter_system(span_critical("You have been banned by [usr.client.ckey].\nReason: [reason]."))) + to_chat(M, span_filter_system(span_warning("This is a permanent ban."))) if(config.banappeals) - to_chat(M, "To try to resolve this matter head to [config.banappeals]") + to_chat(M, span_filter_system(span_warning("To try to resolve this matter head to [config.banappeals]"))) else - to_chat(M, "No ban appeals URL has been set.") + to_chat(M, span_filter_system(span_warning("No ban appeals URL has been set."))) ban_unban_log_save("[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.") notes_add(M.ckey,"[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.",usr) log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") @@ -1048,7 +1048,7 @@ var/mob/living/carbon/human/H = locate(href_list["monkeyone"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob/living/carbon/human")) return log_admin("[key_name(usr)] attempting to monkeyize [key_name(H)]") @@ -1060,7 +1060,7 @@ var/mob/living/carbon/human/H = locate(href_list["corgione"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob/living/carbon/human")) return log_admin("[key_name(usr)] attempting to corgize [key_name(H)]") @@ -1072,7 +1072,7 @@ var/mob/M = locate(href_list["forcespeech"]) if(!ismob(M)) - to_chat(usr, "this can only be used on instances of type /mob") + to_chat(usr, span_filter_adminlog("this can only be used on instances of type /mob")) var/speech = tgui_input_text(usr, "What will [key_name(M)] say?.", "Force speech", "") // Don't need to sanitize, since it does that in say(), we also trust our admins. if(!speech) return @@ -1089,10 +1089,10 @@ var/mob/M = locate(href_list["sendtoprison"]) if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob")) return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, span_filter_adminlog("This cannot be used on instances of type /mob/living/silicon/ai")) return var/turf/prison_cell = pick(prisonwarp) @@ -1117,7 +1117,7 @@ prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/prison(prisoner), slot_w_uniform) prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes) - to_chat(M, "You have been sent to the prison station!") + to_chat(M, span_filter_system(span_warning("You have been sent to the prison station!"))) log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.") message_admins(span_blue("[key_name_admin(usr)] sent [key_name_admin(M)] to the prison station."), 1) @@ -1127,11 +1127,11 @@ var/mob/M = locate(href_list["sendbacktolobby"]) if(!isobserver(M)) - to_chat(usr, "You can only send ghost players back to the Lobby.") + to_chat(usr, span_filter_adminlog(span_notice("You can only send ghost players back to the Lobby."))) return if(!M.client) - to_chat(usr, "[M] doesn't seem to have an active client.") + to_chat(usr, span_filter_adminlog(span_warning("[M] doesn't seem to have an active client."))) return if(tgui_alert(usr, "Send [key_name(M)] back to Lobby?", "Message", list("Yes", "No")) != "Yes") @@ -1152,10 +1152,10 @@ var/mob/M = locate(href_list["tdome1"]) if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob")) return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, span_filter_adminlog("This cannot be used on instances of type /mob/living/silicon/ai")) return for(var/obj/item/I in M) @@ -1165,7 +1165,7 @@ sleep(5) M.loc = pick(tdome1) spawn(50) - to_chat(M, "You have been sent to the Thunderdome.") + to_chat(M, span_filter_system(span_notice("You have been sent to the Thunderdome."))) log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 1)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 1)", 1) @@ -1177,10 +1177,10 @@ var/mob/M = locate(href_list["tdome2"]) if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob")) return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, span_filter_adminlog("This cannot be used on instances of type /mob/living/silicon/ai")) return for(var/obj/item/I in M) @@ -1190,7 +1190,7 @@ sleep(5) M.loc = pick(tdome2) spawn(50) - to_chat(M, "You have been sent to the Thunderdome.") + to_chat(M, span_filter_system(span_notice("You have been sent to the Thunderdome."))) log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 2)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 2)", 1) @@ -1202,17 +1202,17 @@ var/mob/M = locate(href_list["tdomeadmin"]) if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob")) return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, span_filter_adminlog("This cannot be used on instances of type /mob/living/silicon/ai")) return M.Paralyse(5) sleep(5) M.loc = pick(tdomeadmin) spawn(50) - to_chat(M, "You have been sent to the Thunderdome.") + to_chat(M, span_filter_system(span_notice("You have been sent to the Thunderdome."))) log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Admin.)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Admin.)", 1) @@ -1224,10 +1224,10 @@ var/mob/M = locate(href_list["tdomeobserve"]) if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob")) return if(istype(M, /mob/living/silicon/ai)) - to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + to_chat(usr, span_filter_adminlog("This cannot be used on instances of type /mob/living/silicon/ai")) return for(var/obj/item/I in M) @@ -1241,7 +1241,7 @@ sleep(5) M.loc = pick(tdomeobserve) spawn(50) - to_chat(M, "You have been sent to the Thunderdome.") + to_chat(M, span_filter_system(span_notice("You have been sent to the Thunderdome."))) log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Observer.)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1) @@ -1250,7 +1250,7 @@ var/mob/living/L = locate(href_list["revive"]) if(!istype(L)) - to_chat(usr, "This can only be used on instances of type /mob/living") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob/living")) return if(config.allow_admin_rev) @@ -1258,14 +1258,14 @@ message_admins(span_red("Admin [key_name_admin(usr)] healed / revived [key_name_admin(L)]!"), 1) log_admin("[key_name(usr)] healed / Rrvived [key_name(L)]") else - to_chat(usr, "Admin Rejuvinates have been disabled") + to_chat(usr, span_filter_adminlog(span_filter_warning("Admin Rejuvinates have been disabled"))) else if(href_list["makeai"]) if(!check_rights(R_SPAWN)) return var/mob/living/carbon/human/H = locate(href_list["makeai"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob/living/carbon/human")) return message_admins(span_red("Admin [key_name_admin(usr)] AIized [key_name_admin(H)]!"), 1) @@ -1277,7 +1277,7 @@ var/mob/living/carbon/human/H = locate(href_list["makealien"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob/living/carbon/human")) return usr.client.cmd_admin_alienize(H) @@ -1287,7 +1287,7 @@ var/mob/living/carbon/human/H = locate(href_list["makerobot"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob/living/carbon/human")) return usr.client.cmd_admin_robotize(H) @@ -1297,7 +1297,7 @@ var/mob/M = locate(href_list["makeanimal"]) if(istype(M, /mob/new_player)) - to_chat(usr, "This cannot be used on instances of type /mob/new_player") + to_chat(usr, span_filter_adminlog("This cannot be used on instances of type /mob/new_player")) return usr.client.cmd_admin_animalize(M) @@ -1316,7 +1316,7 @@ var/mob/living/carbon/human/H = locate(href_list["togmutate"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob/living/carbon/human")) return var/block=text2num(href_list["block"]) usr.client.cmd_admin_toggle_block(H,block) @@ -1355,11 +1355,11 @@ var/mob/M = locate(href_list["take_question"]) if(ismob(M)) - var/take_msg = "ADMINHELP: [key_name(usr.client)] is attending to [key_name(M)]'s adminhelp, please don't dogpile them." + var/take_msg = span_notice("ADMINHELP: [key_name(usr.client)] is attending to [key_name(M)]'s adminhelp, please don't dogpile them.") for(var/client/X in GLOB.admins) if((R_ADMIN|R_MOD|R_SERVER) & X.holder.rights) //VOREStation Edit to_chat(X, take_msg) - to_chat(M, "Your adminhelp is being attended to by [usr.client]. Thanks for your patience!") + to_chat(M, span_filter_pm(span_notice("Your adminhelp is being attended to by [usr.client]. Thanks for your patience!"))) // VoreStation Edit Start if (config.chat_webhook_url) spawn(0) @@ -1370,7 +1370,7 @@ world.Export("[config.chat_webhook_url]?[query_string]") // VoreStation Edit End else - to_chat(usr, "Unable to locate mob.") + to_chat(usr, span_warning("Unable to locate mob.")) else if(href_list["adminplayerobservecoodjump"]) if(!check_rights(R_ADMIN|R_SERVER|R_MOD)) return //VOREStation Edit @@ -1390,7 +1390,7 @@ else if(href_list["adminmoreinfo"]) var/mob/M = locate(href_list["adminmoreinfo"]) if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob")) return var/location_description = "" @@ -1443,7 +1443,7 @@ var/mob/living/carbon/human/H = locate(href_list["adminspawncookie"]) if(!ishuman(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob/living/carbon/human")) return H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), slot_l_hand ) @@ -1460,14 +1460,14 @@ log_admin("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]") message_admins("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]") feedback_inc("admin_cookies_spawned",1) - to_chat(H, "Your prayers have been answered!! You received the best cookie!") + to_chat(H, span_notice("Your prayers have been answered!! You received the best cookie!")) else if(href_list["adminsmite"]) if(!check_rights(R_ADMIN|R_FUN|R_EVENT)) return var/mob/living/carbon/human/H = locate(href_list["adminsmite"]) if(!ishuman(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob/living/carbon/human")) return owner.smite(H) @@ -1477,7 +1477,7 @@ var/mob/living/M = locate(href_list["BlueSpaceArtillery"]) if(!isliving(M)) - to_chat(usr, "This can only be used on instances of type /mob/living") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob/living")) return if(tgui_alert(src.owner, "Are you sure you wish to hit [key_name(M)] with Blue Space Artillery?", "Confirm Firing?", list("Yes", "No")) != "Yes") @@ -1488,39 +1488,39 @@ else if(href_list["CentComReply"]) var/mob/living/L = locate(href_list["CentComReply"]) if(!istype(L)) - to_chat(usr, "This can only be used on instances of type /mob/living/") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob/living/")) return if(L.can_centcom_reply()) var/input = sanitize(tgui_input_text(src.owner, "Please enter a message to reply to [key_name(L)] via their headset.","Outgoing message from CentCom", "")) if(!input) return - to_chat(src.owner, "You sent [input] to [L] via a secure channel.") + to_chat(src.owner, span_filter_adminlog("You sent [input] to [L] via a secure channel.")) log_admin("[src.owner] replied to [key_name(L)]'s CentCom message with the message [input].") message_admins("[src.owner] replied to [key_name(L)]'s CentCom message with: \"[input]\"") if(!isAI(L)) - to_chat(L, "You hear something crackle in your headset for a moment before a voice speaks.") - to_chat(L, "Please stand by for a message from Central Command.") - to_chat(L, "Message as follows.") - to_chat(L, "[input]") - to_chat(L, "Message ends.") + to_chat(L, span_info("You hear something crackle in your headset for a moment before a voice speaks.")) + to_chat(L, span_info("Please stand by for a message from Central Command.")) + to_chat(L, span_info("Message as follows.")) + to_chat(L, span_notice("[input]")) + to_chat(L, span_info("Message ends.")) else - to_chat(src.owner, "The person you are trying to contact does not have functional radio equipment.") + to_chat(src.owner, span_filter_adminlog("The person you are trying to contact does not have functional radio equipment.")) else if(href_list["SyndicateReply"]) var/mob/living/carbon/human/H = locate(href_list["SyndicateReply"]) if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob/living/carbon/human")) return if(!istype(H.l_ear, /obj/item/radio/headset) && !istype(H.r_ear, /obj/item/radio/headset)) - to_chat(usr, "The person you are trying to contact is not wearing a headset") + to_chat(usr, span_filter_adminlog("The person you are trying to contact is not wearing a headset")) return var/input = sanitize(tgui_input_text(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from a shadowy figure...", "")) if(!input) return - to_chat(src.owner, "You sent [input] to [H] via a secure channel.") + to_chat(src.owner, span_filter_adminlog("You sent [input] to [H] via a secure channel.")) log_admin("[src.owner] replied to [key_name(H)]'s illegal message with the message [input].") to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks. \ \"Please stand by for a message from your benefactor. Message as follows, agent. \"[input]\" Message ends.\"") @@ -1545,7 +1545,7 @@ usr << browse(data, "window=[B.name]") else - to_chat(usr, "The faxed item is not viewable. This is probably a bug, and should be reported on the tracker: [fax.type]") + to_chat(usr, span_warning("The faxed item is not viewable. This is probably a bug, and should be reported on the tracker: [fax.type]")) else if (href_list["AdminFaxViewPage"]) var/page = text2num(href_list["AdminFaxViewPage"]) @@ -1595,7 +1595,7 @@ feedback_add_details("admin_verb","JM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_and_message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]") else - to_chat(usr, "This mob is not located in the game world.") + to_chat(usr, span_filter_adminlog("This mob is not located in the game world.")) else if(href_list["getmob"]) if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) @@ -1664,7 +1664,7 @@ var/mob/M = locate(href_list["traitor"]) if(!ismob(M)) - to_chat(usr, "This can only be used on instances of type /mob.") + to_chat(usr, span_filter_adminlog("This can only be used on instances of type /mob.")) return show_traitor_panel(M) @@ -1688,7 +1688,7 @@ if(!check_rights(R_SPAWN)) return if(!config.allow_admin_spawning) - to_chat(usr, "Spawning of items is not allowed.") + to_chat(usr, span_filter_adminlog("Spawning of items is not allowed.")) return var/atom/loc = usr.loc @@ -1748,24 +1748,24 @@ where = "onfloor" if( where == "inhand" ) - to_chat(usr, "Support for inhand not available yet. Will spawn on floor.") + to_chat(usr, span_filter_adminlog("Support for inhand not available yet. Will spawn on floor.")) where = "onfloor" if ( where == "inhand" ) //Can only give when human or monkey if ( !( ishuman(usr) || issmall(usr) ) ) - to_chat(usr, "Can only spawn in hand when you're a human or a monkey.") + to_chat(usr, span_filter_adminlog("Can only spawn in hand when you're a human or a monkey.")) where = "onfloor" else if ( usr.get_active_hand() ) - to_chat(usr, "Your active hand is full. Spawning on floor.") + to_chat(usr, span_filter_adminlog("Your active hand is full. Spawning on floor.")) where = "onfloor" if ( where == "inmarked" ) if ( !marked_datum ) - to_chat(usr, "You don't have any object marked. Abandoning spawn.") + to_chat(usr, span_filter_adminlog("You don't have any object marked. Abandoning spawn.")) return else if ( !istype(marked_datum,/atom) ) - to_chat(usr, "The object you have marked cannot be used as a target. Target must be of type /atom. Abandoning spawn.") + to_chat(usr, span_filter_adminlog("The object you have marked cannot be used as a target. Target must be of type /atom. Abandoning spawn.")) return var/atom/target //Where the object will be spawned @@ -2021,17 +2021,17 @@ if(check_rights(R_SPAWN)) //VOREStation Edit var/mob/M = locate(href_list["toglang"]) if(!istype(M)) - to_chat(usr, "[M] is illegal type, must be /mob!") + to_chat(usr, span_filter_adminlog("[M] is illegal type, must be /mob!")) return var/lang2toggle = href_list["lang"] var/datum/language/L = GLOB.all_languages[lang2toggle] if(L in M.languages) if(!M.remove_language(lang2toggle)) - to_chat(usr, "Failed to remove language '[lang2toggle]' from \the [M]!") + to_chat(usr, span_filter_adminlog("Failed to remove language '[lang2toggle]' from \the [M]!")) else if(!M.add_language(lang2toggle)) - to_chat(usr, "Failed to add language '[lang2toggle]' from \the [M]!") + to_chat(usr, span_filter_adminlog("Failed to add language '[lang2toggle]' from \the [M]!")) show_player_panel(M) @@ -2040,7 +2040,7 @@ var/mob/living/carbon/M = locate(href_list["cryoplayer"]) //VOREStation edit from just an all mob check to mob/living/carbon if(!istype(M)) - to_chat(usr, "Mob doesn't exist!") + to_chat(usr, span_warning("Mob doesn't exist!")) return var/client/C = usr.client diff --git a/code/modules/admin/verbs/BrokenInhands.dm b/code/modules/admin/verbs/BrokenInhands.dm index b74750843c..a3aa4454c3 100644 --- a/code/modules/admin/verbs/BrokenInhands.dm +++ b/code/modules/admin/verbs/BrokenInhands.dm @@ -31,6 +31,4 @@ var/F = file("broken_icons.txt") fdel(F) F << text - to_world("Completeled successfully and written to [F]") - - + to_world(span_filter_system("Completeled successfully and written to [F]")) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 99628c244a..651f34dd53 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -190,7 +190,7 @@ Example: USING PROCCALL = BLOCKING, SELECT = FORCE_NULLS, PRIORITY = HIGH SELECT /client/proc/SDQL2_query(query_text as message) set category = "Debug" if(!check_rights(R_DEBUG)) //Shouldn't happen... but just to be safe. - message_admins("ERROR: Non-admin [key_name(usr)] attempted to execute a SDQL query!") + message_admins(span_danger("ERROR: Non-admin [key_name(usr)] attempted to execute a SDQL query!")) log_admin("Non-admin [key_name(usr)] attempted to execute a SDQL query!") return FALSE var/list/results = world.SDQL2_query(query_text, key_name_admin(usr), "[key_name(usr)]") @@ -224,7 +224,7 @@ Example: USING PROCCALL = BLOCKING, SELECT = FORCE_NULLS, PRIORITY = HIGH SELECT running += query var/msg = "Starting query #[query.id] - [query.get_query_text()]." if(usr) - to_chat(usr, "[msg]") + to_chat(usr, span_admin("[msg]")) log_admin(msg) query.ARun() var/finished = FALSE @@ -243,7 +243,7 @@ Example: USING PROCCALL = BLOCKING, SELECT = FORCE_NULLS, PRIORITY = HIGH SELECT finished = FALSE else if(query.state == SDQL2_STATE_ERROR) if(usr) - to_chat(usr, "SDQL query [query.get_query_text()] errored. It will NOT be automatically garbage collected. Please remove manually.") + to_chat(usr, span_admin("SDQL query [query.get_query_text()] errored. It will NOT be automatically garbage collected. Please remove manually.")) running -= query else if(query.finished) @@ -256,14 +256,14 @@ Example: USING PROCCALL = BLOCKING, SELECT = FORCE_NULLS, PRIORITY = HIGH SELECT //QDEL_IN(query, 50) Maybe when vorestation finally ports timers.. else if(usr) - to_chat(usr, "SDQL query [query.get_query_text()] was halted. It will NOT be automatically garbage collected. Please remove manually.") + to_chat(usr, span_admin("SDQL query [query.get_query_text()] was halted. It will NOT be automatically garbage collected. Please remove manually.")) running -= query while(!finished) var/end_time_total = REALTIMEOFDAY - start_time_total - return list("SDQL query combined results: [query_text]",\ - "SDQL query completed: [objs_all] objects selected by path, and [selectors_used ? objs_eligible : objs_all] objects executed on after WHERE filtering/MAPping if applicable.",\ - "SDQL combined querys took [DisplayTimeText(end_time_total)] to complete.") + combined_refs + return list(span_admin("SDQL query combined results: [query_text]"),\ + span_admin("SDQL query completed: [objs_all] objects selected by path, and [selectors_used ? objs_eligible : objs_all] objects executed on after WHERE filtering/MAPping if applicable."),\ + span_admin("SDQL combined querys took [DisplayTimeText(end_time_total)] to complete.")) + combined_refs GLOBAL_LIST_INIT(sdql2_queries, GLOB.sdql2_queries || list()) GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null, "VIEW VARIABLES (all)", null)) @@ -799,7 +799,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null if("or", "||") result = (result || val) else - to_chat(usr, "SDQL2: Unknown op [op]") + to_chat(usr, span_danger("SDQL2: Unknown op [op]")) result = null else result = val @@ -893,7 +893,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null querys[querys_pos] = parsed_tree querys_pos++ else //There was an error so don't run anything, and tell the user which query has errored. - to_chat(usr, "Parsing error on [querys_pos]\th query. Nothing was executed.") + to_chat(usr, span_danger("Parsing error on [querys_pos]\th query. Nothing was executed.")) return list() query_tree = list() do_parse = 0 @@ -939,16 +939,16 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null D = object if (object == world && (!long || expression[start + 1] == ".") && !(expression[start] in exclude)) - to_chat(usr, "World variables are not allowed to be accessed. Use global.") + to_chat(usr, span_danger("World variables are not allowed to be accessed. Use global.")) return null else if(expression [start] == "{" && long) if(lowertext(copytext(expression[start + 1], 1, 3)) != "0x") - to_chat(usr, "Invalid pointer syntax: [expression[start + 1]]") + to_chat(usr, span_danger("Invalid pointer syntax: [expression[start + 1]]")) return null v = locate("\[[expression[start + 1]]]") if(!v) - to_chat(usr, "Invalid pointer: [expression[start + 1]]") + to_chat(usr, span_danger("Invalid pointer: [expression[start + 1]]")) return null start++ long = start < expression.len @@ -993,7 +993,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null var/list/L = v var/index = query.SDQL_expression(source, expression[start + 2]) if(isnum(index) && (!(round(index) == index) || L.len < index)) - to_chat(usr, "Invalid list index: [index]") + to_chat(usr, span_danger("Invalid list index: [index]")) return null return L[index] return v diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm index e6504475c5..9d6c58ec09 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm @@ -60,7 +60,7 @@ /datum/SDQL_parser/proc/parse_error(error_message) error = 1 - to_chat(usr, "SQDL2 Parsing Error: [error_message]") + to_chat(usr, span_warning("SQDL2 Parsing Error: [error_message]")) return query.len + 1 /datum/SDQL_parser/proc/parse() @@ -632,4 +632,4 @@ else i = variable(i, node) - return i \ No newline at end of file + return i diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index d9040e7c7a..68e0e6b3a7 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -177,13 +177,13 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) MessageNoRecipient(parsed_message) send2adminchat() //VOREStation Add //show it to the person adminhelping too - to_chat(C, "PM to-Admins: [name]") + to_chat(C, span_pm(span_adminnotice("PM to-Admins: [name]"))) //send it to irc if nobody is on and tell us how many were on var/admin_number_present = send2irc_adminless_only(initiator_ckey, name) log_admin("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.") if(admin_number_present <= 0) - to_chat(C, "No active admins are online, your adminhelp was sent to the admin discord.") //VOREStation Edit + to_chat(C, span_pm(span_notice("No active admins are online, your adminhelp was sent to the admin discord."))) //VOREStation Edit // Also send it to discord since that's the hip cool thing now. SSwebhooks.send( @@ -243,7 +243,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) //won't bug irc /datum/admin_help/proc/MessageNoRecipient(msg) var/ref_src = "\ref[src]" - var/chat_msg = "Ticket [TicketHref("#[id]", ref_src)]: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]: [msg]" + var/chat_msg = span_pm(span_adminnotice("Ticket [TicketHref("#[id]", ref_src)]: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]: [msg]")) AddInteraction("[LinkedReplyName(ref_src)]: [msg]") //send this msg to all admins @@ -259,11 +259,11 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) //Reopen a closed ticket /datum/admin_help/proc/Reopen() if(state == AHELP_ACTIVE) - to_chat(usr, "This ticket is already open.") + to_chat(usr, span_warning("This ticket is already open.")) return if(GLOB.ahelp_tickets.CKey2ActiveTicket(initiator_ckey)) - to_chat(usr, "This user already has an active ticket, cannot reopen this one.") + to_chat(usr, span_warning("This user already has an active ticket, cannot reopen this one.")) return statclick = new(null, src) @@ -282,8 +282,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) AddInteraction("Reopened by [key_name_admin(usr)]") if(initiator) - to_chat(initiator, "[span_purple("Ticket [TicketHref("#[id]")] was reopened by [key_name(usr,FALSE,FALSE)].")]") - var/msg = "Ticket [TicketHref("#[id]")] reopened by [key_name_admin(usr)]." + to_chat(initiator, span_filter_adminlog("[span_purple("Ticket [TicketHref("#[id]")] was reopened by [key_name(usr,FALSE,FALSE)].")]")) + var/msg = span_adminhelp("Ticket [TicketHref("#[id]")] reopened by [key_name_admin(usr)].") message_admins(msg) log_admin(msg) feedback_inc("ahelp_reopen") @@ -314,9 +314,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) RemoveActive() state = AHELP_CLOSED GLOB.ahelp_tickets.ListInsert(src) - AddInteraction("Closed by [key_name_admin(usr)].") + AddInteraction(span_filter_adminlog("Closed by [key_name_admin(usr)].")) if(initiator) - to_chat(initiator, "[span_red("Ticket [TicketHref("#[id]")] was closed by [key_name(usr,FALSE,FALSE)].")]") + to_chat(initiator, span_filter_adminlog("[span_red("Ticket [TicketHref("#[id]")] was closed by [key_name(usr,FALSE,FALSE)].")]")) if(!silent) feedback_inc("ahelp_close") var/msg = "Ticket [TicketHref("#[id]")] closed by [key_name_admin(usr)]." @@ -339,9 +339,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) state = AHELP_RESOLVED GLOB.ahelp_tickets.ListInsert(src) - AddInteraction("Resolved by [key_name_admin(usr)].") + AddInteraction(span_filter_adminlog("Resolved by [key_name_admin(usr)].")) if(initiator) - to_chat(initiator, "[span_green("Ticket [TicketHref("#[id]")] was marked resolved by [key_name(usr,FALSE,FALSE)].")]") + to_chat(initiator, span_filter_adminlog("[span_green("Ticket [TicketHref("#[id]")] was marked resolved by [key_name(usr,FALSE,FALSE)].")]")) if(!silent) feedback_inc("ahelp_resolve") var/msg = "Ticket [TicketHref("#[id]")] resolved by [key_name_admin(usr)]" @@ -592,12 +592,12 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) set name = "Adminhelp" if(say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") + to_chat(usr, span_danger("Speech is currently admin-disabled.")) return //handle muting and automuting if(prefs.muted & MUTE_ADMINHELP) - to_chat(src, "Error: Admin-PM: You cannot send adminhelps (Muted).") + to_chat(src, span_danger("Error: Admin-PM: You cannot send adminhelps (Muted).")) return if(handle_spam_prevention(msg,MUTE_ADMINHELP)) return @@ -618,10 +618,10 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) if(input == "Yes") if(current_ticket) current_ticket.MessageNoRecipient(msg) - to_chat(usr, "PM to-Admins: [msg]") + to_chat(usr, span_pm(span_adminnotice("PM to-Admins: [msg]"))) return else - to_chat(usr, "Ticket not found, creating new one...") + to_chat(usr, span_warning("Ticket not found, creating new one...")) else current_ticket.AddInteraction("[key_name_admin(usr)] opened a new ticket.") current_ticket.Close() diff --git a/code/modules/admin/verbs/adminhelp_vr.dm b/code/modules/admin/verbs/adminhelp_vr.dm index ed2f46fe5a..1784e22701 100644 --- a/code/modules/admin/verbs/adminhelp_vr.dm +++ b/code/modules/admin/verbs/adminhelp_vr.dm @@ -22,14 +22,14 @@ //handle muting and automuting if(prefs.muted & MUTE_ADMINHELP) - to_chat(usr, "Error: You cannot request spice (muted from adminhelps).") + to_chat(usr, span_danger("Error: You cannot request spice (muted from adminhelps).")) return if(tgui_alert(usr, "Are you sure you want to request the admins spice things up for you? You accept the consequences if you do.","Spicy!",list("Yes","No")) == "Yes") message_admins("[ADMIN_FULLMONTY(usr)] has requested the round be spiced up a little.") - to_chat(usr, "You have requested some more spice in your round.") + to_chat(usr, span_notice("You have requested some more spice in your round.")) else - to_chat(usr, "Spice request cancelled.") + to_chat(usr, span_notice("Spice request cancelled.")) return //if they requested spice, then remove spice verb temporarily to prevent spamming diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index ee127136da..aa4374ac06 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -77,7 +77,7 @@ message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]", 1) feedback_add_details("admin_verb","JM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! else - to_chat(A, "This mob is not located in the game world.") + to_chat(A, span_filter_adminlog("This mob is not located in the game world.")) /client/proc/jumptocoord(tx as num, ty as num, tz as num) set category = "Admin" @@ -92,7 +92,7 @@ A.on_mob_jump() var/turf/T = locate(tx, ty, tz) if(!T) - to_chat(usr, "Those coordinates are outside the boundaries of the map.") + to_chat(usr, span_warning("Those coordinates are outside the boundaries of the map.")) return A.forceMove(T) feedback_add_details("admin_verb","JC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -220,7 +220,7 @@ if(!tz) return var/turf/T = locate(tx, ty, tz) if(!T) - to_chat(usr, "Those coordinates are outside the boundaries of the map.") + to_chat(usr, span_warning("Those coordinates are outside the boundaries of the map.")) return if(ismob(AM)) var/mob/M = AM diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index b5e1f9c706..ef00f9100a 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -6,7 +6,7 @@ set category = null set name = "Admin PM Mob" if(!check_rights(R_ADMIN)) - to_chat(src, "Error: Admin-PM-Context: Only administrators may use this command.") + to_chat(src, span_pm(span_warning("Error: Admin-PM-Context: Only administrators may use this command."))) return if( !ismob(M) || !M.client ) return @@ -18,7 +18,7 @@ set category = "Admin" set name = "Admin PM" if(!check_rights(R_ADMIN)) - to_chat(src, "Error: Admin-PM-Panel: Only administrators may use this command.") + to_chat(src, span_pm(span_warning("Error: Admin-PM-Panel: Only administrators may use this command."))) return var/list/client/targets[0] for(var/client/T) @@ -39,7 +39,7 @@ /client/proc/cmd_ahelp_reply(whom) if(prefs.muted & MUTE_ADMINHELP) - to_chat(src, "Error: Admin-PM: You are unable to use admin PM-s (muted).") + to_chat(src, span_pm(span_warning("Error: Admin-PM: You are unable to use admin PM-s (muted)."))) return var/client/C if(istext(whom)) @@ -50,16 +50,16 @@ C = whom if(!C) if(holder) - to_chat(src, "Error: Admin-PM: Client not found.") + to_chat(src, span_pm(span_warning("Error: Admin-PM: Client not found."))) return var/datum/admin_help/AH = C.current_ticket if(AH) - message_admins("[key_name_admin(src)] has started replying to [key_name(C, 0, 0)]'s admin help.") + message_admins(span_pm("[key_name_admin(src)] has started replying to [key_name(C, 0, 0)]'s admin help.")) var/msg = tgui_input_text(src,"Message:", "Private message to [key_name(C, 0, 0)]", multiline = TRUE) if (!msg) - message_admins("[key_name_admin(src)] has cancelled their reply to [key_name(C, 0, 0)]'s admin help.") + message_admins(span_pm("[key_name_admin(src)] has cancelled their reply to [key_name(C, 0, 0)]'s admin help.")) return cmd_admin_pm(whom, msg, AH) @@ -67,12 +67,12 @@ //Fetching a message if needed. src is the sender and C is the target client /client/proc/cmd_admin_pm(whom, msg, datum/admin_help/AH) if(prefs.muted & MUTE_ADMINHELP) - to_chat(src, "Error: Admin-PM: You are unable to use admin PM-s (muted).") + to_chat(src, span_pm(span_warning("Error: Admin-PM: You are unable to use admin PM-s (muted)."))) return if(!holder && !current_ticket) //no ticket? https://www.youtube.com/watch?v=iHSPf6x1Fdo - to_chat(src, "You can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be.") - to_chat(src, "Message: [msg]") + to_chat(src, span_pm(span_warning("You can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be."))) + to_chat(src, span_pm(span_notice("Message: [msg]"))) return var/client/recipient @@ -97,14 +97,14 @@ if(!msg) return if(holder) - to_chat(src, "Error: Use the admin IRC channel, nerd.") + to_chat(src, span_pm(span_warning("Error: Use the admin IRC channel, nerd."))) return else if(!recipient) if(holder) - to_chat(src, "Error: Admin-PM: Client not found.") + to_chat(src, span_pm(span_warning("Error: Admin-PM: Client not found."))) to_chat(src, msg) else current_ticket.MessageNoRecipient(msg) @@ -118,12 +118,12 @@ return if(prefs.muted & MUTE_ADMINHELP) - to_chat(src, "Error: Admin-PM: You are unable to use admin PM-s (muted).") + to_chat(src, span_pm(span_warning("Error: Admin-PM: You are unable to use admin PM-s (muted)."))) return if(!recipient) if(holder) - to_chat(src, "Error: Admin-PM: Client not found.") + to_chat(src, span_pm(span_warning("Error: Admin-PM: Client not found."))) else current_ticket.MessageNoRecipient(msg) return @@ -142,27 +142,27 @@ var/keywordparsedmsg = keywords_lookup(msg) if(irc) - to_chat(src, "PM to-Admins: [rawmsg]") - admin_ticket_log(src, "Reply PM from-[key_name(src, TRUE, TRUE)] to IRC: [keywordparsedmsg]") + to_chat(src, span_pm(span_notice("PM to-Admins: [rawmsg]"))) + admin_ticket_log(src, span_pm(span_warning("Reply PM from-[key_name(src, TRUE, TRUE)] to IRC: [keywordparsedmsg]"))) ircreplyamount-- send2irc("Reply: [ckey]",rawmsg) else if(recipient.holder) if(holder) //both are admins - to_chat(recipient, "Admin PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]") - to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [keywordparsedmsg]") + to_chat(recipient, span_pm(span_warning("Admin PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]"))) + to_chat(src, span_pm(span_notice("Admin PM to-[key_name(recipient, src, 1)]: [keywordparsedmsg]"))) //omg this is dumb, just fill in both their tickets - var/interaction_message = "PM from-[key_name(src, recipient, 1)] to-[key_name(recipient, src, 1)]: [keywordparsedmsg]" + var/interaction_message = span_pm(span_notice("PM from-[key_name(src, recipient, 1)] to-[key_name(recipient, src, 1)]: [keywordparsedmsg]")) admin_ticket_log(src, interaction_message) if(recipient != src) //reeee admin_ticket_log(recipient, interaction_message) else //recipient is an admin but sender is not - var/replymsg = "Reply PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]" + var/replymsg = span_pm(span_warning("Reply PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]")) admin_ticket_log(src, replymsg) to_chat(recipient, replymsg) - to_chat(src, "PM to-Admins: [msg]") + to_chat(src, span_pm(span_notice("PM to-Admins: [msg]"))) //play the recieving admin the adminhelp sound (if they have them enabled) if(recipient.prefs?.read_preference(/datum/preference/toggle/holder/play_adminhelp_ping)) @@ -173,12 +173,12 @@ if(!recipient.current_ticket) new /datum/admin_help(msg, recipient, TRUE) - to_chat(recipient, "-- Administrator private message --") - to_chat(recipient, "Admin PM from-[key_name(src, recipient, 0)]: [msg]") - to_chat(recipient, "Click on the administrator's name to reply.") - to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [msg]") + to_chat(recipient, span_pm(span_warning(span_huge("-- Administrator private message --")))) + to_chat(recipient, span_pm(span_warning("Admin PM from-[key_name(src, recipient, 0)]: [msg]"))) + to_chat(recipient, span_pm(span_warning("Click on the administrator's name to reply."))) + to_chat(src, span_pm(span_notice("Admin PM to-[key_name(recipient, src, 1)]: [msg]"))) - admin_ticket_log(recipient, "PM From [key_name_admin(src)]: [keywordparsedmsg]") + admin_ticket_log(recipient, span_pm(span_notice("PM From [key_name_admin(src)]: [keywordparsedmsg]"))) //always play non-admin recipients the adminhelp sound recipient << 'sound/effects/adminhelp.ogg' @@ -197,7 +197,7 @@ return else //neither are admins - to_chat(src, "Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.") + to_chat(src, span_pm(span_warning("Error: Admin-PM: Non-admin to non-admin PM communication is forbidden."))) return if(irc) @@ -205,7 +205,7 @@ for(var/client/X in GLOB.admins) if(!check_rights(R_ADMIN, 0, X)) continue - to_chat(X, "PM: [key_name(src, X, 0)]->IRC: [keywordparsedmsg]") + to_chat(X, span_pm(span_notice("PM: [key_name(src, X, 0)]->IRC: [keywordparsedmsg]"))) else log_admin("PM: [key_name(src)]->[key_name(recipient)]: [rawmsg]") //we don't use message_admins here because the sender/receiver might get it too @@ -213,7 +213,7 @@ if(!check_rights(R_ADMIN, 0, X)) continue if(X.key!=key && X.key!=recipient.key) //check client/X is an admin and isn't the sender or recipient - to_chat(X, "PM: [key_name(src, X, 0)]->[key_name(recipient, X, 0)]: [keywordparsedmsg]" ) + to_chat(X, span_pm(span_notice("PM: [key_name(src, X, 0)]->[key_name(recipient, X, 0)]: [keywordparsedmsg]"))) /proc/IrcPm(target,msg,sender) var/client/C = GLOB.directory[target] @@ -262,11 +262,11 @@ message_admins("IRC message from [sender] to [key_name_admin(C)] : [msg]") log_admin("IRC PM: [sender] -> [key_name(C)] : [msg]") - to_chat(C, "-- Administrator private message --") - to_chat(C, "Admin PM from-[adminname]: [msg]") - to_chat(C, "Click on the administrator's name to reply.") + to_chat(C, span_pm(span_warning(span_huge("-- Administrator private message --")))) + to_chat(C, span_pm(span_warning("Admin PM from-[adminname]: [msg]"))) + to_chat(C, span_pm(span_warning("Click on the administrator's name to reply."))) - admin_ticket_log(C, "PM From [irc_tagged]: [msg]") + admin_ticket_log(C, span_pm(span_notice("PM From [irc_tagged]: [msg]"))) window_flash(C) //always play non-admin recipients the adminhelp sound diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index edefc09b55..890b84c2e6 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -13,7 +13,7 @@ for(var/client/C in GLOB.admins) if(check_rights(R_ADMIN, 0, C)) - to_chat(C, "" + create_text_tag("admin", "ADMIN:", C) + " [key_name(usr, 1)]([admin_jump_link(mob, src)]): [msg]") + to_chat(C, span_admin_channel("" + create_text_tag("admin", "ADMIN:", C) + " [key_name(usr, 1)]([admin_jump_link(mob, src)]): [msg]")) feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -33,10 +33,10 @@ var/sender_name = key_name(usr, 1) if(check_rights(R_ADMIN, 0)) - sender_name = "[sender_name]" + sender_name = span_admin("[sender_name]") for(var/client/C in GLOB.admins) if(check_rights(R_ADMIN|R_MOD|R_SERVER)) //VOREStation Edit - to_chat(C, "" + create_text_tag("mod", "MOD:", C) + " [sender_name]([admin_jump_link(mob, C.holder)]): [msg]") + to_chat(C, span_mod_channel("" + create_text_tag("mod", "MOD:", C) + " [sender_name]([admin_jump_link(mob, C.holder)]): [msg]")) feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -56,8 +56,8 @@ var/sender_name = key_name(usr, 1) if(check_rights(R_ADMIN, 0)) - sender_name = "[sender_name]" + sender_name = span_admin("[sender_name]") for(var/client/C in GLOB.admins) - to_chat(C, "" + create_text_tag("event", "EVENT:", C) + " [sender_name]([admin_jump_link(mob, C.holder)]): [msg]") + to_chat(C, span_event_channel("" + create_text_tag("event", "EVENT:", C) + " [sender_name]([admin_jump_link(mob, C.holder)]): [msg]")) feedback_add_details("admin_verb","GS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/antag-ooc.dm b/code/modules/admin/verbs/antag-ooc.dm index 79edaf15d9..a81c338077 100644 --- a/code/modules/admin/verbs/antag-ooc.dm +++ b/code/modules/admin/verbs/antag-ooc.dm @@ -7,13 +7,13 @@ var/is_antag = usr.mind && usr.mind.special_role if(!is_antag && !is_admin) // Non-antagonists and non-admins have no business using this. - to_chat(usr, "Sorry, but only certain antagonists or administrators can use this verb.") + to_chat(usr, span_warning("Sorry, but only certain antagonists or administrators can use this verb.")) return else if(is_antag && !is_admin) // Is an antag, and not an admin, meaning we need to check if their antag type allows AOOC. var/datum/antagonist/A = get_antag_data(usr.mind.special_role) if(!A || !A.can_speak_aooc || !A.can_hear_aooc) - to_chat(usr, "Sorry, but your antagonist type is not allowed to speak in AOOC.") + to_chat(usr, span_warning("Sorry, but your antagonist type is not allowed to speak in AOOC.")) return msg = sanitize(msg) @@ -31,12 +31,12 @@ for(var/mob/M in mob_list) if(check_rights(R_ADMIN|R_MOD|R_EVENT, 0, M)) // Staff can see AOOC unconditionally, and with more details. - to_chat(M, "[create_text_tag("aooc", "Antag-OOC:", M.client)] [get_options_bar(src, 0, 1, 1)]([admin_jump_link(usr, M.client.holder)]): [msg]") + to_chat(M, span_ooc(span_aooc("[create_text_tag("aooc", "Antag-OOC:", M.client)] [get_options_bar(src, 0, 1, 1)]([admin_jump_link(usr, M.client.holder)]): [msg]"))) else if(M.client) // Players can only see AOOC if observing, or if they are an antag type allowed to use AOOC. var/datum/antagonist/A = null if(M.mind) // Observers don't have minds, but they should still see AOOC. A = get_antag_data(M.mind.special_role) if((M.mind && M.mind.special_role && A && A.can_hear_aooc) || isobserver(M)) // Antags must have their type be allowed to AOOC to see AOOC. This prevents, say, ERT from seeing AOOC. - to_chat(M, "[create_text_tag("aooc", "Antag-OOC:", M.client)] [player_display]: [msg]") + to_chat(M, span_ooc(span_aooc("[create_text_tag("aooc", "Antag-OOC:", M.client)] [player_display]: [msg]"))) - log_aooc(msg,src) \ No newline at end of file + log_aooc(msg,src) diff --git a/code/modules/admin/verbs/atmosdebug.dm b/code/modules/admin/verbs/atmosdebug.dm index 93218b38b4..d00ca4ce3f 100644 --- a/code/modules/admin/verbs/atmosdebug.dm +++ b/code/modules/admin/verbs/atmosdebug.dm @@ -14,17 +14,17 @@ //all plumbing - yes, some things might get stated twice, doesn't matter. for (var/obj/machinery/atmospherics/plumbing in machines) if (plumbing.nodealert) - to_chat(usr, "Unconnected [plumbing.name] located at [plumbing.x],[plumbing.y],[plumbing.z] ([get_area(plumbing.loc)])") + to_chat(usr, span_filter_adminlog(span_warning("Unconnected [plumbing.name] located at [plumbing.x],[plumbing.y],[plumbing.z] ([get_area(plumbing.loc)])"))) //Manifolds for (var/obj/machinery/atmospherics/pipe/manifold/pipe in machines) if (!pipe.node1 || !pipe.node2 || !pipe.node3) - to_chat(usr, "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])") + to_chat(usr, span_filter_adminlog(span_warning("Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])"))) //Pipes for (var/obj/machinery/atmospherics/pipe/simple/pipe in machines) if (!pipe.node1 || !pipe.node2) - to_chat(usr, "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])") + to_chat(usr, span_filter_adminlog(span_warning("Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])"))) to_chat(usr, "Checking for overlapping pipes...") next_turf: @@ -36,7 +36,7 @@ for(var/connect_type in pipe.connect_types) connect_types[connect_type] += 1 if(connect_types[1] > 1 || connect_types[2] > 1 || connect_types[3] > 1) - to_chat(usr, "Overlapping pipe ([pipe.name]) located at [T.x],[T.y],[T.z] ([get_area(T)])") + to_chat(usr, span_filter_adminlog(span_warning("Overlapping pipe ([pipe.name]) located at [T.x],[T.y],[T.z] ([get_area(T)])"))) continue next_turf to_chat(usr, "Done") @@ -52,9 +52,9 @@ if (!PN.nodes || !PN.nodes.len) if(PN.cables && (PN.cables.len > 1)) var/obj/structure/cable/C = PN.cables[1] - to_chat(usr, "Powernet with no nodes! (number [PN.number]) - example cable at [C.x], [C.y], [C.z] in area [get_area(C.loc)]") + to_chat(usr, span_filter_adminlog("Powernet with no nodes! (number [PN.number]) - example cable at [C.x], [C.y], [C.z] in area [get_area(C.loc)]")) if (!PN.cables || (PN.cables.len < 10)) if(PN.cables && (PN.cables.len > 1)) var/obj/structure/cable/C = PN.cables[1] - to_chat(usr, "Powernet with fewer than 10 cables! (number [PN.number]) - example cable at [C.x], [C.y], [C.z] in area [get_area(C.loc)]") + to_chat(usr, span_filter_adminlog("Powernet with fewer than 10 cables! (number [PN.number]) - example cable at [C.x], [C.y], [C.z] in area [get_area(C.loc)]")) diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm index 0e02fad380..41c91d7cdd 100644 --- a/code/modules/admin/verbs/buildmode.dm +++ b/code/modules/admin/verbs/buildmode.dm @@ -301,7 +301,7 @@ area_enabled = 1 area_name = tgui_input_text(usr, "New area name", "Room Buildmode", max_length = MAX_NAME_LEN) if(isnull(area_name)) - to_chat(usr, "You must enter a non-null name.") + to_chat(usr, span_notice("You must enter a non-null name.")) area_enabled = 0 return area_name = sanitize(area_name,MAX_NAME_LEN) @@ -417,7 +417,7 @@ qdel(object) else if(pa.Find("ctrl")) holder.buildmode.objholder = object.type - to_chat(user, "[object]([object.type]) copied to buildmode.") + to_chat(user, span_notice("[object]([object.type]) copied to buildmode.")) if(pa.Find("middle")) holder.buildmode.objholder = text2path("[object.type]") if(holder.buildmode.objsay) @@ -429,13 +429,13 @@ log_admin("[key_name(usr)] modified [object.name]'s [holder.buildmode.varholder] to [holder.buildmode.valueholder]") object.vars[holder.buildmode.varholder] = holder.buildmode.valueholder else - to_chat(user, "[initial(object.name)] does not have a var called '[holder.buildmode.varholder]'") + to_chat(user, span_danger("[initial(object.name)] does not have a var called '[holder.buildmode.varholder]'")) if(pa.Find("right")) if(object.vars.Find(holder.buildmode.varholder)) log_admin("[key_name(usr)] modified [object.name]'s [holder.buildmode.varholder] to [holder.buildmode.valueholder]") object.vars[holder.buildmode.varholder] = initial(object.vars[holder.buildmode.varholder]) else - to_chat(user, "[initial(object.name)] does not have a var called '[holder.buildmode.varholder]'") + to_chat(user, span_danger("[initial(object.name)] does not have a var called '[holder.buildmode.varholder]'")) if(BUILDMODE_THROW) if(pa.Find("left")) @@ -449,19 +449,19 @@ if(BUILDMODE_ROOM) if(pa.Find("left")) holder.buildmode.coordA = get_turf(object) - to_chat(user, "Defined [object] ([object.type]) as point A.") + to_chat(user, span_notice("Defined [object] ([object.type]) as point A.")) if(pa.Find("right")) holder.buildmode.coordB = get_turf(object) - to_chat(user, "Defined [object] ([object.type]) as point B.") + to_chat(user, span_notice("Defined [object] ([object.type]) as point B.")) if(holder.buildmode.coordA && holder.buildmode.coordB) if(isnull(holder.buildmode.area_name)) - to_chat(user, "ERROR: Insert area name before use.") + to_chat(user, span_notice("ERROR: Insert area name before use.")) holder.buildmode.coordA = null holder.buildmode.coordB = null return - to_chat(user, "A and B set, creating rectangle.") + to_chat(user, span_notice("A and B set, creating rectangle.")) holder.buildmode.make_rectangle( holder.buildmode.coordA, holder.buildmode.coordB, @@ -475,14 +475,14 @@ if(BUILDMODE_LADDER) if(pa.Find("left")) holder.buildmode.coordA = get_turf(object) - to_chat(user, "Defined [object] ([object.type]) as upper ladder location.") + to_chat(user, span_notice("Defined [object] ([object.type]) as upper ladder location.")) if(pa.Find("right")) holder.buildmode.coordB = get_turf(object) - to_chat(user, "Defined [object] ([object.type]) as lower ladder location.") + to_chat(user, span_notice("Defined [object] ([object.type]) as lower ladder location.")) if(holder.buildmode.coordA && holder.buildmode.coordB) - to_chat(user, "Ladder locations set, building ladders.") + to_chat(user, span_notice("Ladder locations set, building ladders.")) var/obj/structure/ladder/A = new /obj/structure/ladder/up(holder.buildmode.coordA) var/obj/structure/ladder/B = new /obj/structure/ladder(holder.buildmode.coordB) A.target_up = B @@ -654,7 +654,7 @@ if(BUILDMODE_DROP) if(ispath(holder.buildmode.objholder,/turf)) - to_chat(user, "Cannot use turfs with this mode.") + to_chat(user, span_warning("Cannot use turfs with this mode.")) return if(pa.Find("left") && !pa.Find("ctrl")) if(ispath(holder.buildmode.objholder)) @@ -666,7 +666,7 @@ FE.crushing = TRUE else if(pa.Find("ctrl")) holder.buildmode.objholder = object.type - to_chat(user, "[object]([object.type]) copied to buildmode.") + to_chat(user, span_notice("[object]([object.type]) copied to buildmode.")) if(pa.Find("middle")) holder.buildmode.objholder = text2path("[object.type]") if(holder.buildmode.objsay) diff --git a/code/modules/admin/verbs/change_appearance.dm b/code/modules/admin/verbs/change_appearance.dm index c2b60de327..c27b658503 100644 --- a/code/modules/admin/verbs/change_appearance.dm +++ b/code/modules/admin/verbs/change_appearance.dm @@ -23,7 +23,7 @@ if(!H) return if(!H.client) - to_chat(usr, " Only mobs with clients can alter their own appearance.") + to_chat(usr, span_filter_warning(" Only mobs with clients can alter their own appearance.")) return var/datum/gender/T = gender_datums[H.get_visible_gender()] switch(tgui_alert(usr, "Do you wish for [H] to be allowed to select non-whitelisted races?","Alter Mob Appearance","Yes","No","Cancel")) @@ -44,7 +44,7 @@ var/mob/living/carbon/human/M = tgui_input_list(usr, "Select mob.", "Edit Appearance", human_mob_list) if(!istype(M, /mob/living/carbon/human)) - to_chat(usr, "You can only do this to humans!") + to_chat(usr, span_warning("You can only do this to humans!")) return if(tgui_alert(usr, "Are you sure you wish to edit this mob's appearance? Skrell, Unathi, Tajaran can result in unintended consequences.","Danger!",list("Yes","No")) != "Yes") return diff --git a/code/modules/admin/verbs/custom_event.dm b/code/modules/admin/verbs/custom_event.dm index de4032f966..f8397c0f51 100644 --- a/code/modules/admin/verbs/custom_event.dm +++ b/code/modules/admin/verbs/custom_event.dm @@ -19,9 +19,9 @@ custom_event_msg = input - to_world("

Custom Event

") - to_world("

A custom event is starting. OOC Info:

") - to_world("[custom_event_msg]") + to_world("

[span_alert("Custom Event")]

") + to_world("

[span_alert("A custom event is starting. OOC Info:")]

") + to_world(span_alert("[custom_event_msg]")) to_world("
") SSwebhooks.send( @@ -37,10 +37,10 @@ set name = "Custom Event Info" if(!custom_event_msg || custom_event_msg == "") - to_chat(src, "There currently is no known custom event taking place.") - to_chat(src, "Keep in mind: it is possible that an admin has not properly set this.") + to_chat(src, span_filter_notice("There currently is no known custom event taking place.")) + to_chat(src, span_filter_notice("Keep in mind: it is possible that an admin has not properly set this.")) return - to_chat(src, "

Custom Event

") - to_chat(src, "

A custom event is taking place. OOC Info:

") - to_chat(src, "[custom_event_msg]
") + to_chat(src, "

[span_filter_notice(span_alert("Custom Event"))]

") + to_chat(src, "

[span_filter_notice(span_alert("A custom event is taking place. OOC Info:"))]

") + to_chat(src, span_filter_notice(span_alert("[custom_event_msg]
"))) diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index 1d6cead98c..6c14cfb194 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -8,11 +8,11 @@ if(!src.mob) return if(prefs.muted & MUTE_DEADCHAT) - to_chat(src, "You cannot send DSAY messages (muted).") + to_chat(src, span_warning("You cannot send DSAY messages (muted).")) return if(!prefs?.read_preference(/datum/preference/toggle/show_dsay)) - to_chat(src, "You have deadchat muted.") + to_chat(src, span_warning("You have deadchat muted.")) return var/stafftype = uppertext(holder.rank) @@ -23,6 +23,6 @@ if (!msg) return - say_dead_direct("[stafftype]([src.holder.fakekey ? src.holder.fakekey : src.key]) says, \"[msg]\"") + say_dead_direct(span_name("[stafftype]([src.holder.fakekey ? src.holder.fakekey : src.key]) says, \"[msg]\"")) feedback_add_details("admin_verb","D") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index ff724ef2a6..3f7db9883a 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -27,7 +27,7 @@ user = usr I = user.get_active_hand() if(!I || !istype(I)) - to_chat(user, "You need to have something in your active hand, to use this verb.") + to_chat(user, span_warning("You need to have something in your active hand, to use this verb.")) return var/weapon_attack_speed = user.get_attack_speed(I) / 10 var/weapon_damage = I.force @@ -52,24 +52,24 @@ P = ammo.BB else - to_chat(user, "DPS calculation by this verb is not supported for \the [G]'s type. Energy or Ballistic only, sorry.") + to_chat(user, span_warning("DPS calculation by this verb is not supported for \the [G]'s type. Energy or Ballistic only, sorry.")) weapon_damage = P.damage weapon_attack_speed = G.fire_delay / 10 qdel(P) var/DPS = weapon_damage / weapon_attack_speed - to_chat(user, "Damage: [weapon_damage][modified_damage_percent != 1 ? " (Modified by [modified_damage_percent*100]%)":""]") - to_chat(user, "Attack Speed: [weapon_attack_speed]/s") - to_chat(user, "\The [I] does [DPS] damage per second.") + to_chat(user, span_notice("Damage: [weapon_damage][modified_damage_percent != 1 ? " (Modified by [modified_damage_percent*100]%)":""]")) + to_chat(user, span_notice("Attack Speed: [weapon_attack_speed]/s")) + to_chat(user, span_notice("\The [I] does [DPS] damage per second.")) if(DPS > 0) - to_chat(user, "At your maximum health ([user.getMaxHealth()]), it would take approximately;") - to_chat(user, "[(user.getMaxHealth() - config.health_threshold_softcrit) / DPS] seconds to softcrit you. ([config.health_threshold_softcrit] health)") - to_chat(user, "[(user.getMaxHealth() - config.health_threshold_crit) / DPS] seconds to hardcrit you. ([config.health_threshold_crit] health)") - to_chat(user, "[(user.getMaxHealth() - config.health_threshold_dead) / DPS] seconds to kill you. ([config.health_threshold_dead] health)") + to_chat(user, span_notice("At your maximum health ([user.getMaxHealth()]), it would take approximately;")) + to_chat(user, span_notice("[(user.getMaxHealth() - config.health_threshold_softcrit) / DPS] seconds to softcrit you. ([config.health_threshold_softcrit] health)")) + to_chat(user, span_notice("[(user.getMaxHealth() - config.health_threshold_crit) / DPS] seconds to hardcrit you. ([config.health_threshold_crit] health)")) + to_chat(user, span_notice("[(user.getMaxHealth() - config.health_threshold_dead) / DPS] seconds to kill you. ([config.health_threshold_dead] health)")) else - to_chat(user, "You need to be a living mob, with hands, and for an object to be in your active hand, to use this verb.") + to_chat(user, span_warning("You need to be a living mob, with hands, and for an object to be in your active hand, to use this verb.")) return /client/proc/Cell() @@ -173,7 +173,7 @@ M:Alienize() feedback_add_details("admin_verb","MKAL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] made [key_name(M)] into an alien.") - message_admins("[key_name_admin(usr)] made [key_name(M)] into an alien.", 1) + message_admins(span_notice("[key_name_admin(usr)] made [key_name(M)] into an alien."), 1) else tgui_alert_async(usr, "Invalid mob") diff --git a/code/modules/admin/verbs/debug_vr.dm b/code/modules/admin/verbs/debug_vr.dm index 09e48f3b9a..051bbf6492 100644 --- a/code/modules/admin/verbs/debug_vr.dm +++ b/code/modules/admin/verbs/debug_vr.dm @@ -2,7 +2,7 @@ set category = "Fun" set name = "Quick NIF" set desc = "Spawns a NIF into someone in quick-implant mode." - + var/input_NIF if(!check_rights(R_ADMIN)) @@ -14,15 +14,15 @@ return if(!istype(H)) - to_chat(usr,"That mob type ([H.type]) doesn't support NIFs, sorry.") + to_chat(usr,span_warning("That mob type ([H.type]) doesn't support NIFs, sorry.")) return if(!H.get_organ(BP_HEAD)) - to_chat(usr,"Target is unsuitable.") + to_chat(usr,span_warning("Target is unsuitable.")) return if(H.nif) - to_chat(usr,"Target already has a NIF.") + to_chat(usr,span_warning("Target already has a NIF.")) return if(H.species.flags & NO_SCAN) @@ -48,5 +48,4 @@ new /obj/item/nif(H) log_and_message_admins("[key_name(src)] Quick NIF'd [H.real_name] with a [input_NIF].") - feedback_add_details("admin_verb","QNIF") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - + feedback_add_details("admin_verb","QNIF") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/fps.dm b/code/modules/admin/verbs/fps.dm index 3c1da45203..069c2281f6 100644 --- a/code/modules/admin/verbs/fps.dm +++ b/code/modules/admin/verbs/fps.dm @@ -10,7 +10,7 @@ var/new_fps = round(tgui_input_number(usr, "Sets game frames-per-second. Can potentially break the game (default: [config.fps])", "FPS", world.fps), round(config.fps * 1.5)) if(new_fps <= 0) - to_chat(src, "Error: set_server_fps(): Invalid world.fps value. No changes made.") + to_chat(src, span_danger("Error: set_server_fps(): Invalid world.fps value. No changes made.")) return if(new_fps > config.fps * 1.5) if(tgui_alert(src, "You are setting fps to a high value:\n\t[new_fps] frames-per-second\n\tconfig.fps = [config.fps]", "Warning!", list("Confirm", "ABORT-ABORT-ABORT")) != "Confirm") diff --git a/code/modules/admin/verbs/map_template_loadverb.dm b/code/modules/admin/verbs/map_template_loadverb.dm index 42631da193..0d77bb37b5 100644 --- a/code/modules/admin/verbs/map_template_loadverb.dm +++ b/code/modules/admin/verbs/map_template_loadverb.dm @@ -32,7 +32,7 @@ return if(template.load(T, centered = TRUE, orientation=orientation)) - message_admins("[key_name_admin(usr)] has placed a map template ([template.name]).") + message_admins(span_adminnotice("[key_name_admin(usr)] has placed a map template ([template.name]).")) else to_chat(usr, "Failed to place map") if(usr) @@ -63,7 +63,7 @@ if(tgui_alert(usr,"Confirm map load.", "Template Confirm",list("No","Yes")) == "Yes") if(template.load_new_z(orientation=orientation)) - message_admins("[key_name_admin(usr)] has placed a map template ([template.name]) on Z level [world.maxz].") + message_admins(span_adminnotice("[key_name_admin(usr)] has placed a map template ([template.name]) on Z level [world.maxz].")) else to_chat(usr, "Failed to place map") @@ -83,6 +83,6 @@ if(M.preload_size(map)) to_chat(usr, "Map template '[map]' ready to place ([M.width]x[M.height])") SSmapping.map_templates[M.name] = M - message_admins("[key_name_admin(usr)] has uploaded a map template ([map])") + message_admins(span_adminnotice("[key_name_admin(usr)] has uploaded a map template ([map])")) else to_chat(usr, "Map template '[map]' failed to load properly") diff --git a/code/modules/admin/verbs/modify_robot.dm b/code/modules/admin/verbs/modify_robot.dm index 210530ca74..b1531f8890 100644 --- a/code/modules/admin/verbs/modify_robot.dm +++ b/code/modules/admin/verbs/modify_robot.dm @@ -20,11 +20,11 @@ if(tgui_alert(usr, "This robot has not yet selected a module. Would you like to toggle combat module override?","Confirm",list("Yes","No"))!="Yes") continue target.crisis_override = !target.crisis_override - to_chat(usr, "You [target.crisis_override? "enabled":"disabled"] [target]'s combat module overwrite.") + to_chat(usr, span_danger("You [target.crisis_override? "enabled":"disabled"] [target]'s combat module overwrite.")) continue if(MODIFIY_ROBOT_LIMIT_MODULES_ADD) if(target.restrict_modules_to.len) - to_chat(usr, "[target]'s modules are already restricted. For details you can use the remove verb to show all active restrictions.") + to_chat(usr, span_warning("[target]'s modules are already restricted. For details you can use the remove verb to show all active restrictions.")) var/list/possible_options = list() for(var/entry in robot_modules) if(!target.restrict_modules_to.Find(entry)) @@ -35,16 +35,16 @@ break possible_options -= selected_type target.restrict_modules_to += selected_type - to_chat(usr, "You added [selected_type] to [target]'s possible modules list.") + to_chat(usr, span_danger("You added [selected_type] to [target]'s possible modules list.")) continue if(MODIFIY_ROBOT_LIMIT_MODULES_REMOVE) while(TRUE) var/selected_type = tgui_input_list(usr, "Please select the module type to remove. Removing all module types here will allow default station module selection.", "Module types", target.restrict_modules_to) if(!selected_type || selected_type == "Cancel") - to_chat(usr, "[target] uses the default module list without special restrictions.") + to_chat(usr, span_danger("[target] uses the default module list without special restrictions.")) break target.restrict_modules_to -= selected_type - to_chat(usr, "You removed [selected_type] from [target]'s possible modules list.") + to_chat(usr, span_danger("You removed [selected_type] from [target]'s possible modules list.")) continue if(!target.module.modules) @@ -59,7 +59,7 @@ return if(!target.module || !target.module.modules) - to_chat(usr, "[target] was recently reset, you must wait until module selection has been completed before continuing modifying.") + to_chat(usr, span_danger("[target] was recently reset, you must wait until module selection has been completed before continuing modifying.")) continue log_and_message_admins("[key_name(src)] has used MODIFYROBOT ([modification_choice]) on [key_name(target)].") @@ -93,7 +93,7 @@ spawn(0) //ChompEDIT Must be after to allow the movement to finish SEND_SIGNAL(add_item, COMSIG_OBSERVER_MOVED)//ChompEDIT - report the movement since setting loc doesn't call Move or Moved target.hud_used.update_robot_modules_display() - to_chat(usr, "You added \"[add_item]\" to [target].") + to_chat(usr, span_danger("You added \"[add_item]\" to [target].")) if(istype(add_item, /obj/item/stack/)) var/obj/item/stack/item_with_synth = add_item for(var/synth in item_with_synth.synths) @@ -141,7 +141,7 @@ var/selected_module_module = tgui_input_list(usr, "Please select the module to remove", "Modules", active_modules) if(!istype(selected_module_module, /obj/item/)) break - to_chat(usr, "You removed \"[selected_module_module]\" from [target]") + to_chat(usr, span_danger("You removed \"[selected_module_module]\" from [target]")) target.uneq_all() target.hud_used.update_robot_modules_display(TRUE) target.module.emag.Remove(selected_module_module) @@ -172,12 +172,12 @@ if(istype(U, /obj/item/borg/upgrade/restricted)) target.module.supported_upgrades |= new_upgrade if(U.action(target)) - to_chat(usr, "You apply the [U] to [target]!") + to_chat(usr, span_danger("You apply the [U] to [target]!")) usr.drop_item() U.loc = target target.hud_used.update_robot_modules_display() else - to_chat(usr, "Upgrade error!") + to_chat(usr, span_danger("Upgrade error!")) if(selected_module_upgrade == "Proto-Kinetic Accelerator") var/list/modkits = list() for(var/modkit in typesof(/obj/item/borg/upgrade/modkit)) @@ -193,7 +193,7 @@ var/obj/item/borg/upgrade/modkit/M = new new_modkit(src) var/obj/item/gun/energy/kinetic_accelerator/kin = locate() in target.module.modules if(kin.get_remaining_mod_capacity() >= M.cost) - to_chat(usr, "You installed the [M] into the [kin], [capacity]% remaining!") + to_chat(usr, span_danger("You installed the [M] into the [kin], [capacity]% remaining!")) modkits.Remove(selected_ka_upgrade) M.install(kin, target) capacity = kin.get_remaining_mod_capacity() @@ -243,7 +243,7 @@ target.radio.channels[selected_radio_channel] += target.module.channels[selected_radio_channel] target.radio.secure_radio_connections[selected_radio_channel] += radio_controller.add_object(target.radio, radiochannels[selected_radio_channel], RADIO_CHAT) available_channels -= selected_radio_channel - to_chat(usr, "You added \"[selected_radio_channel]\" channel to [target].") + to_chat(usr, span_danger("You added \"[selected_radio_channel]\" channel to [target].")) if(MODIFIY_ROBOT_RADIOC_REMOVE) while(TRUE) var/selected_radio_channel = tgui_input_list(usr, "Please select the radio channel to remove", "Channels", target.radio.channels) @@ -261,7 +261,7 @@ target.radio.channels[n_chan] -= target.module.channels[n_chan] radio_controller.remove_object(target.radio, radiochannels[selected_radio_channel]) target.radio.secure_radio_connections -= selected_radio_channel - to_chat(usr, "You removed \"[selected_radio_channel]\" channel from [target].") + to_chat(usr, span_danger("You removed \"[selected_radio_channel]\" channel from [target].")) if(MODIFIY_ROBOT_COMP_ADD) while(TRUE) var/selected_component = tgui_input_list(usr, "Please select the component to add or replace", "Component", target.components) @@ -289,7 +289,7 @@ var/new_power_cell = cell_names[capitalize(selected_cell)] target.cell = new new_power_cell(target) C.wrapped = target.cell - to_chat(usr, "You replaced \"[C]\" on [target] with \"[selected_cell]\".") + to_chat(usr, span_danger("You replaced \"[C]\" on [target] with \"[selected_cell]\".")) if("diagnosis unit") C.wrapped = new /obj/item/robot_parts/robot_component/diagnosis_unit(target) if("camera") @@ -301,7 +301,7 @@ C.install() C.installed = 1 if(selected_component != "power cell") - to_chat(usr, "You repplaced \"[C]\" on [target].") + to_chat(usr, span_danger("You repplaced \"[C]\" on [target].")) if(MODIFIY_ROBOT_COMP_REMOVE) while(TRUE) var/selected_component = tgui_input_list(usr, "Please select the component to remove", "Component", target.components) @@ -315,7 +315,7 @@ C.wrapped = null if(selected_component == "power cell") target.cell = null - to_chat(usr, "You removed \"[C]\" from [target]") + to_chat(usr, span_danger("You removed \"[C]\" from [target]")) if(MODIFIY_ROBOT_SWAP_MODULE) var/selected_module = tgui_input_list(usr, "Which Module would you like to use?", "Module", robot_modules) if(!selected_module || selected_module == "Cancel") @@ -337,10 +337,10 @@ if(tgui_alert(usr, "Are you sure that you want to reset the entire module?","Confirm",list("Yes","No"))!="Yes") continue target.module_reset(FALSE) - to_chat(usr, "You resetted [target]'s module selection.") + to_chat(usr, span_danger("You resetted [target]'s module selection.")) if(MODIFIY_ROBOT_TOGGLE_ERT) target.crisis_override = !target.crisis_override - to_chat(usr, "You [target.crisis_override? "enabled":"disabled"] [target]'s combat module overwrite.") + to_chat(usr, span_danger("You [target.crisis_override? "enabled":"disabled"] [target]'s combat module overwrite.")) if(tgui_alert(usr, "Do you want to reset the module as well to allow selection?","Confirm",list("Yes","No"))!="Yes") continue target.module_reset(FALSE) @@ -350,17 +350,17 @@ if(access_synth in card.GetAccess()) card.access -= get_all_station_access() card.access -= access_synth - to_chat(usr, "You revoke station access from [target].") + to_chat(usr, span_danger("You revoke station access from [target].")) else card.access |= get_all_station_access() card.access |= access_synth - to_chat(usr, "You grant station access to [target].") + to_chat(usr, span_danger("You grant station access to [target].")) if(MODIFIY_ROBOT_TOGGLE_CENT_ACCESS) if(target?.idcard?.GetAccess()) var/obj/item/card/id/synthetic/card = target.idcard if(access_cent_specops in card.GetAccess()) card.access -= get_all_centcom_access() - to_chat(usr, "You revoke central access from [target].") + to_chat(usr, span_danger("You revoke central access from [target].")) else card.access |= get_all_centcom_access() - to_chat(usr, "You grant central access to [target].") + to_chat(usr, span_danger("You grant central access to [target].")) diff --git a/code/modules/admin/verbs/panicbunker.dm b/code/modules/admin/verbs/panicbunker.dm index 85ca43f447..b01c39337c 100644 --- a/code/modules/admin/verbs/panicbunker.dm +++ b/code/modules/admin/verbs/panicbunker.dm @@ -1,12 +1,12 @@ /client/proc/panicbunker() set category = "Server" set name = "Toggle Panic Bunker" - + if(!check_rights(R_ADMIN)) return if (!config.sql_enabled) - to_chat(usr, "The Database is not enabled!") + to_chat(usr, span_adminnotice("The Database is not enabled!")) return config.panic_bunker = (!config.panic_bunker) diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index ed304e0476..afeab793f1 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -34,7 +34,7 @@ var/list/sounds_cache = list() return switch(res) if("Yes") - to_chat(world, "An admin played: [S]", confidential = TRUE) + to_chat(world, span_boldannounce("An admin played: [S]"), confidential = TRUE) if("Cancel") return @@ -121,7 +121,7 @@ var/list/sounds_cache = list() return var/ytdl = config.invoke_youtubedl if(!ytdl) - to_chat(user, "Youtube-dl was not configured, action unavailable", confidential = TRUE) //Check config.txt for the INVOKE_YOUTUBEDL value + to_chat(user, span_boldwarning("Youtube-dl was not configured, action unavailable"), confidential = TRUE) //Check config.txt for the INVOKE_YOUTUBEDL value return var/web_sound_url = "" var/stop_web_sounds = FALSE @@ -134,15 +134,15 @@ var/list/sounds_cache = list() var/stdout = output[SHELLEO_STDOUT] var/stderr = output[SHELLEO_STDERR] if(errorlevel) - to_chat(user, "Youtube-dl URL retrieval FAILED:", confidential = TRUE) - to_chat(user, "[stderr]", confidential = TRUE) + to_chat(user, span_boldwarning("Youtube-dl URL retrieval FAILED:"), confidential = TRUE) + to_chat(user, span_warning("[stderr]"), confidential = TRUE) return var/list/data try data = json_decode(stdout) catch(var/exception/e) - to_chat(user, "Youtube-dl JSON parsing FAILED:", confidential = TRUE) - to_chat(user, "[e]: [stdout]", confidential = TRUE) + to_chat(user, span_boldwarning("Youtube-dl JSON parsing FAILED:"), confidential = TRUE) + to_chat(user, span_warning("[e]: [stdout]"), confidential = TRUE) return if (data["url"]) web_sound_url = data["url"] @@ -175,16 +175,16 @@ var/list/sounds_cache = list() switch(anon) if("Yes") if(res == "Yes") - to_chat(world, "[user.key] played: [webpage_url]", confidential = TRUE) + to_chat(world, span_boldannounce("[user.key] played: [webpage_url]"), confidential = TRUE) else - to_chat(world, "[user.key] played a sound", confidential = TRUE) + to_chat(world, span_boldannounce("[user.key] played a sound"), confidential = TRUE) if("No") if(res == "Yes") - to_chat(world, "An admin played: [webpage_url]", confidential = TRUE) + to_chat(world, span_boldannounce("An admin played: [webpage_url]"), confidential = TRUE) if("Cancel", null) return if(credit) - to_chat(world, "[credit]", confidential = TRUE) + to_chat(world, span_boldannounce("[credit]"), confidential = TRUE) //SSblackbox.record_feedback("nested tally", "played_url", 1, list("[user.ckey]", "[input]")) log_admin("[key_name(user)] played web sound: [input]") message_admins("[key_name(user)] played web sound: [input]") @@ -197,7 +197,7 @@ var/list/sounds_cache = list() stop_web_sounds = TRUE if(web_sound_url && !findtext(web_sound_url, GLOB.is_http_protocol)) tgui_alert(user, "The media provider returned a content URL that isn't using the HTTP or HTTPS protocol. This is a security risk and the sound will not be played.", "Security Risk", list("OK")) - to_chat(user, "BLOCKED: Content URL not using HTTP(S) Protocol!", confidential = TRUE) + to_chat(user, span_boldwarning("BLOCKED: Content URL not using HTTP(S) Protocol!"), confidential = TRUE) return if(web_sound_url || stop_web_sounds) @@ -222,7 +222,7 @@ var/list/sounds_cache = list() var/ytdl = config.invoke_youtubedl if(!ytdl) - to_chat(src, "Youtube-dl was not configured, action unavailable", confidential = TRUE) //Check config.txt for the INVOKE_YOUTUBEDL value + to_chat(src, span_boldwarning("Youtube-dl was not configured, action unavailable"), confidential = TRUE) //Check config.txt for the INVOKE_YOUTUBEDL value return if(S_TIMER_COOLDOWN_TIMELEFT(SStimer, COOLDOWN_INTERNET_SOUND)) @@ -235,8 +235,8 @@ var/list/sounds_cache = list() if(length(web_sound_input)) web_sound_input = trim(web_sound_input) if(findtext(web_sound_input, ":") && !findtext(web_sound_input, GLOB.is_http_protocol)) - to_chat(src, "Non-http(s) URIs are not allowed.", confidential = TRUE) - to_chat(src, "For youtube-dl shortcuts like ytsearch: please use the appropriate full URL from the website.", confidential = TRUE) + to_chat(src, span_boldwarning("Non-http(s) URIs are not allowed."), confidential = TRUE) + to_chat(src, span_warning("For youtube-dl shortcuts like ytsearch: please use the appropriate full URL from the website."), confidential = TRUE) return web_sound(usr, web_sound_input) else diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 566b91fcd4..e07507e4a2 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -17,7 +17,7 @@ return var/icon/cross = icon('icons/obj/storage.dmi',"bible") - var/msg = "" + span_blue("[icon2html(cross, GLOB.admins)] " + span_purple("PRAY: ") + "[key_name(src, 1)] [ADMIN_QUE(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] ([admin_jump_link(src, src)]) [ADMIN_CA(src)] [ADMIN_SC(src)] [ADMIN_SMITE(src)]: [raw_msg]") + "" + var/msg = span_filter_pray(span_blue("[icon2html(cross, GLOB.admins)] " + span_purple("PRAY: ") + "[key_name(src, 1)] [ADMIN_QUE(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] ([admin_jump_link(src, src)]) [ADMIN_CA(src)] [ADMIN_SC(src)] [ADMIN_SMITE(src)]: [raw_msg]")) for(var/client/C in GLOB.admins) if(!check_rights(R_ADMIN, 0, C)) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index f9d887b53c..38b1a885bc 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -101,7 +101,7 @@ to_chat(M, "You hear a voice in your head... [msg]") log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]") - msg = " SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]" + msg = span_pm(span_adminnotice(" SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]")) message_admins(msg) admin_ticket_log(M, msg) feedback_add_details("admin_verb","SMS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -149,7 +149,7 @@ to_chat(M, msg) log_admin("DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]") - msg = " DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
" + msg = span_pm(span_adminnotice(" DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
")) message_admins(msg) admin_ticket_log(M, msg) feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -208,7 +208,7 @@ M.client.prefs.muted |= mute_type log_admin("SPAM AUTOMUTE: [muteunmute] [key_name(M)] from [mute_string]") message_admins("SPAM AUTOMUTE: [muteunmute] [key_name_admin(M)] from [mute_string].", 1) - to_chat(M, "You have been [muteunmute] from [mute_string] by the SPAM AUTOMUTE system. Contact an admin.") + to_chat(M, span_alert("You have been [muteunmute] from [mute_string] by the SPAM AUTOMUTE system. Contact an admin.")) feedback_add_details("admin_verb","AUTOMUTE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return @@ -298,15 +298,15 @@ Ccomp's first proc. for(var/client/C as anything in GLOB.clients) if(C.ckey == target) found_client = C - to_chat(C, "You may now respawn. You should roleplay as if you learned nothing about the round during your time with the dead.") + to_chat(C, span_notice("You may now respawn. You should roleplay as if you learned nothing about the round during your time with the dead.")) if(isobserver(C.mob)) var/mob/observer/dead/G = C.mob G.can_reenter_corpse = 1 - to_chat(C, "You can also re-enter your corpse, if you still have one!") + to_chat(C, span_notice("You can also re-enter your corpse, if you still have one!")) break if(!found_client) - to_chat(src, "The associated client didn't appear to be connected, so they couldn't be notified, but they can now respawn if they reconnect.") + to_chat(src, span_notice("The associated client didn't appear to be connected, so they couldn't be notified, but they can now respawn if they reconnect.")) log_admin("[key_name(usr)] allowed [found_client ? key_name(found_client) : target] to bypass the respawn time limit") message_admins("Admin [key_name_admin(usr)] allowed [found_client ? key_name_admin(found_client) : target] to bypass the respawn time limit", 1) @@ -638,7 +638,7 @@ Traitors and the like can also be revived with the previous role mostly intact. M.revive() log_admin("[key_name(usr)] healed / revived [key_name(M)]") - var/msg = "Admin [key_name_admin(usr)] healed / revived [ADMIN_LOOKUPFLW(M)]!" + var/msg = span_danger("Admin [key_name_admin(usr)] healed / revived [ADMIN_LOOKUPFLW(M)]!") message_admins(msg) admin_ticket_log(M, msg) else diff --git a/code/modules/admin/verbs/resize.dm b/code/modules/admin/verbs/resize.dm index c67e2ffd8f..85b7943397 100644 --- a/code/modules/admin/verbs/resize.dm +++ b/code/modules/admin/verbs/resize.dm @@ -14,9 +14,9 @@ var/very_big = is_extreme_size(size_multiplier) if(very_big && can_be_big) // made an extreme size in an area that allows it, don't assume adminbuse - to_chat(src,"[L] will lose this size upon moving into an area where this size is not allowed.") + to_chat(src,span_warning("[L] will lose this size upon moving into an area where this size is not allowed.")) else if(very_big) // made an extreme size in an area that doesn't allow it, assume adminbuse - to_chat(src,"[L] will retain this normally unallowed size outside this area.") + to_chat(src,span_warning("[L] will retain this normally unallowed size outside this area.")) L.resize(size_multiplier, animate = TRUE, uncapped = TRUE, ignore_prefs = TRUE) diff --git a/code/modules/admin/verbs/smite.dm b/code/modules/admin/verbs/smite.dm index 89a81fe4ce..2882012308 100644 --- a/code/modules/admin/verbs/smite.dm +++ b/code/modules/admin/verbs/smite.dm @@ -35,13 +35,13 @@ if(SMITE_SPONTANEOUSCOMBUSTION) target.adjust_fire_stacks(10) target.IgniteMob() - target.visible_message("[target] bursts into flames!") + target.visible_message(span_danger("[target] bursts into flames!")) if(SMITE_LIGHTNINGBOLT) var/turf/T = get_step(get_step(target, NORTH), NORTH) T.Beam(target, icon_state="lightning[rand(1,12)]", time = 5) target.electrocute_act(75,def_zone = BP_HEAD) - target.visible_message("[target] is struck by lightning!") + target.visible_message(span_danger("[target] is struck by lightning!")) if(SMITE_SHADEKIN_ATTACK) var/turf/Tt = get_turf(target) //Turf for target @@ -138,7 +138,7 @@ shadekin.ckey = ckey else //Permakin'd - to_chat(target,"You're carried off into The Dark by the [shadekin]. Who knows if you'll find your way back?") + to_chat(target,span_danger("You're carried off into The Dark by the [shadekin]. Who knows if you'll find your way back?")) target.ghostize() qdel(target) qdel(shadekin) @@ -160,7 +160,7 @@ if(SMITE_PEPPERNADE) var/obj/item/grenade/chem_grenade/teargas/grenade = new /obj/item/grenade/chem_grenade/teargas grenade.loc = target.loc - to_chat(target,"GRENADE?!") + to_chat(target,span_warning("GRENADE?!")) grenade.detonate() if(SMITE_SPICEREQUEST) @@ -208,11 +208,11 @@ var/redspace_abduction_z /proc/redspace_abduction(mob/living/target, user) if(redspace_abduction_z < 0) - to_chat(user,"The abduction z-level is already being created. Please wait.") + to_chat(user,span_warning("The abduction z-level is already being created. Please wait.")) return if(!redspace_abduction_z) redspace_abduction_z = -1 - to_chat(user,"This is the first use of the verb this shift, it will take a minute to configure the abduction z-level. It will be z[world.maxz+1].") + to_chat(user,span_warning("This is the first use of the verb this shift, it will take a minute to configure the abduction z-level. It will be z[world.maxz+1].")) var/z = ++world.maxz world.max_z_changed() for(var/x = 1 to world.maxx) @@ -230,8 +230,8 @@ var/redspace_abduction_z var/size_of_square = 26 var/halfbox = round(size_of_square*0.5) target.transforming = TRUE - to_chat(target,"You feel a strange tug, deep inside. You're frozen in momentarily...") - to_chat(user,"Beginning vis_contents copy to abduction site, player mob is frozen.") + to_chat(target,span_danger("You feel a strange tug, deep inside. You're frozen in momentarily...")) + to_chat(user,span_notice("Beginning vis_contents copy to abduction site, player mob is frozen.")) sleep(1 SECOND) //Lower left corner of a working box var/llc_x = max(0,halfbox-target.x) + min(target.x+halfbox, world.maxx) - size_of_square @@ -282,14 +282,14 @@ var/redspace_abduction_z T.vis_contents.Cut() target.forceMove(locate(target.x,target.y,redspace_abduction_z)) - to_chat(target,"The tug relaxes, but everything around you looks... slightly off.") - to_chat(user,"The mob has been moved. ([admin_jump_link(target,usr.client.holder)])") + to_chat(target,span_danger("The tug relaxes, but everything around you looks... slightly off.")) + to_chat(user,span_notice("The mob has been moved. ([admin_jump_link(target,usr.client.holder)])")) target.transforming = FALSE /proc/fake_autosave(var/mob/living/target, var/client/user, var/wide) if(!istype(target) || !target.client) - to_chat(user, "Skipping [target] because they are not a /mob/living or have no client.") + to_chat(user, span_warning("Skipping [target] because they are not a /mob/living or have no client.")) return if(wide) diff --git a/code/modules/admin/view_variables/helpers.dm b/code/modules/admin/view_variables/helpers.dm index fbd5ec7659..75e29d7509 100644 --- a/code/modules/admin/view_variables/helpers.dm +++ b/code/modules/admin/view_variables/helpers.dm @@ -178,7 +178,7 @@ if(!user) return FALSE if(!(var_to_edit in vars)) - to_chat(user, "\The [src] does not have a var '[var_to_edit]'") + to_chat(user, span_warning("\The [src] does not have a var '[var_to_edit]'")) return FALSE if(var_to_edit in VV_static()) return FALSE diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm index 8701890961..dd33214c1c 100644 --- a/code/modules/admin/view_variables/topic.dm +++ b/code/modules/admin/view_variables/topic.dm @@ -261,7 +261,7 @@ to_chat(usr, "No objects of this type exist") return log_admin("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ") - message_admins("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ") + message_admins(span_notice("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")) if("Type and subtypes") var/i = 0 for(var/obj/Obj in world) @@ -273,7 +273,7 @@ to_chat(usr, "No objects of this type exist") return log_admin("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ") - message_admins("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ") + message_admins(span_notice("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")) else if(href_list["fakepdapropconvo"]) if(!check_rights(R_FUN)) return @@ -564,7 +564,7 @@ if(amount != 0) log_admin("[key_name(usr)] dealt [amount] amount of [Text] damage to [L]") - message_admins("[key_name(usr)] dealt [amount] amount of [Text] damage to [L]") + message_admins(span_notice("[key_name(usr)] dealt [amount] amount of [Text] damage to [L]")) href_list["datumrefresh"] = href_list["mobToDamage"] else if(href_list["expose"]) if(!check_rights(R_ADMIN, FALSE)) @@ -582,7 +582,7 @@ if (prompt != "Yes") return if(!thing) - to_chat(usr, "The object you tried to expose to [C] no longer exists (GC'd)") + to_chat(usr, span_warning("The object you tried to expose to [C] no longer exists (GC'd)")) return message_admins("[key_name_admin(usr)] Showed [key_name_admin(C)] a VV window") log_admin("Admin [key_name(usr)] Showed [key_name(C)] a VV window of a [src]") diff --git a/code/modules/admin/view_variables/view_variables.dm b/code/modules/admin/view_variables/view_variables.dm index 86bda7de8a..86231a089d 100644 --- a/code/modules/admin/view_variables/view_variables.dm +++ b/code/modules/admin/view_variables/view_variables.dm @@ -5,7 +5,7 @@ var/static/cookieoffset = rand(1, 9999) //to force cookies to reset after the round. if(!usr.client || !usr.client.holder) //The usr vs src abuse in this proc is intentional and must not be changed - to_chat(usr, "You need to be an administrator to access this.") + to_chat(usr, span_danger("You need to be an administrator to access this.")) return if(!D) diff --git a/code/modules/ai/ai_holder.dm b/code/modules/ai/ai_holder.dm index 14128dfbb1..16ca1c1e81 100644 --- a/code/modules/ai/ai_holder.dm +++ b/code/modules/ai/ai_holder.dm @@ -101,7 +101,7 @@ if(!check_rights(R_ADMIN)) return if(snapshot) - to_chat(usr, "Someone (or you) may have started a mass edit on this AI datum already. Refresh the VV window to get the option to end the mass edit instead.") + to_chat(usr, span_warning("Someone (or you) may have started a mass edit on this AI datum already. Refresh the VV window to get the option to end the mass edit instead.")) href_list["datumrefresh"] = "\ref[src]" return snapshot = vars.Copy() //'vars' appears to be special in that vars.Copy produces a flat list of keys with no values. It seems that 'vars[key]' is handled somewhere in the byond engine differently than normal lists. @@ -143,7 +143,7 @@ snapshot[key] = thing VARSET_IN(src, snapshot, null, 2 MINUTES) // Safety - to_chat(usr, "Variable snapshot saved. Begin editing the datum, and end the mass edit from the dropdown menu within 2 minutes. Note that editing the contents of lists is not supported.") + to_chat(usr, span_notice("Variable snapshot saved. Begin editing the datum, and end the mass edit from the dropdown menu within 2 minutes. Note that editing the contents of lists is not supported.")) href_list["datumrefresh"] = "\ref[src]" IF_VV_OPTION("mass_edit_finish") @@ -167,7 +167,7 @@ diff += key if(!diff.len) - to_chat(usr, "You don't appear to have changed anything on the AI datum you were editing.") + to_chat(usr, span_warning("You don't appear to have changed anything on the AI datum you were editing.")) href_list["datumrefresh"] = "\ref[src]" else var/message = "These differences were detected in your varedit. If you notice any that you didn't change, please redo your edit:
" @@ -209,18 +209,18 @@ var/list/selected = choices[choice] for(var/mob/living/L as anything in selected) if(!istype(L)) - to_chat(usr,"Skipping incompatible mob: [L] [ADMIN_COORDJMP(L)]") + to_chat(usr,span_warning("Skipping incompatible mob: [L] [ADMIN_COORDJMP(L)]")) continue if(!L.ai_holder) - to_chat(usr,"Skipping due to no AI: [L] [ADMIN_COORDJMP(L)]") + to_chat(usr,span_warning("Skipping due to no AI: [L] [ADMIN_COORDJMP(L)]")) continue for(var/newvar in diff) if(newvar in L.ai_holder.vars) L.ai_holder.vars[newvar] = after[newvar] else - to_chat(usr,"Skipping unavailable var '[newvar]' on: [L] [ADMIN_COORDJMP(L)]") + to_chat(usr,span_warning("Skipping unavailable var '[newvar]' on: [L] [ADMIN_COORDJMP(L)]")) - to_chat(usr,"Mass AI edit done.") + to_chat(usr,span_notice("Mass AI edit done.")) href_list["datumrefresh"] = "\ref[src]" /datum/ai_holder/New(var/new_holder) @@ -393,7 +393,7 @@ var/mob/living/holder = src.holder ai_log("handle_stance_tactical() : Owner was stat, moving.", AI_LOG_TRACE) holder.forceMove(get_turf(L)) - holder.visible_message("[src] climbs out of [L], ready to continue fighting!") + holder.visible_message(span_danger("[src] climbs out of [L], ready to continue fighting!")) playsound(holder, 'sound/effects/splat.ogg') // Should we flee? diff --git a/code/modules/ai/ai_holder_cooperation.dm b/code/modules/ai/ai_holder_cooperation.dm index 97f3781ad5..5cc7c98172 100644 --- a/code/modules/ai/ai_holder_cooperation.dm +++ b/code/modules/ai/ai_holder_cooperation.dm @@ -67,7 +67,7 @@ // That might be for the best since I can imagine it getting spammy in a big fight. if(L.client && call_players) // Dealing with a player. ai_log("request_help() : Asking [L] (Player) for help.", AI_LOG_INFO) - to_chat(L, "\The [holder] [called_player_message]") + to_chat(L, span_critical("\The [holder] [called_player_message]")) else if(L.ai_holder) // Dealing with an AI. ai_log("request_help() : Asking [L] (AI) for help.", AI_LOG_INFO) diff --git a/code/modules/ai/ai_holder_debug.dm b/code/modules/ai/ai_holder_debug.dm index beee998af8..b70771d3cd 100644 --- a/code/modules/ai/ai_holder_debug.dm +++ b/code/modules/ai/ai_holder_debug.dm @@ -86,4 +86,3 @@ path_display = TRUE last_turf_display = TRUE debug_ai = AI_LOG_INFO - diff --git a/code/modules/artifice/telecube.dm b/code/modules/artifice/telecube.dm index 6f1e6dd022..112625a2b9 100644 --- a/code/modules/artifice/telecube.dm +++ b/code/modules/artifice/telecube.dm @@ -103,7 +103,7 @@ /obj/item/telecube/Destroy() if(mate) var/turf/T = get_turf(mate) - mate.visible_message("\The [mate] collapses into itself!") + mate.visible_message(span_critical("\The [mate] collapses into itself!")) mate.mate = null mate = null explosion(T,1,3,7) @@ -133,7 +133,7 @@ return . if(A == src || A == mate) - A.visible_message("\The [A] distorts and fades, before popping back into existence.") + A.visible_message(span_alien("\The [A] distorts and fades, before popping back into existence.")) animate_out(A) animate_in(A) return . @@ -149,7 +149,7 @@ return . if((A.anchored && !omniteleport) || !mate) - A.visible_message("\The [A] distorts for a moment, before reforming in the same position.") + A.visible_message(span_alien("\The [A] distorts for a moment, before reforming in the same position.")) animate_out(A) animate_in(A) return . @@ -159,12 +159,12 @@ var/turf/T1 = get_turf(locate(TLocate.x + (A.x - x), TLocate.y + (A.y - y), TLocate.z)) if(T1) - A.visible_message("\The [A] fades out of existence.") + A.visible_message(span_alien("\The [A] fades out of existence.")) animate_out(A) A.forceMove(T1) animate_in(A) . = TRUE - A.visible_message("\The [A] fades into existence.") + A.visible_message(span_alien("\The [A] fades into existence.")) else return . diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index d02814ed9f..3c26fb87d6 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -61,7 +61,7 @@ /obj/item/assembly/proc/attach_assembly(var/obj/item/assembly/A, var/mob/user) holder = new/obj/item/assembly_holder(get_turf(src)) if(holder.attach(A,src,user)) - to_chat(user, "You attach \the [A] to \the [src]!") + to_chat(user, span_notice("You attach \the [A] to \the [src]!")) return TRUE /obj/item/assembly/attackby(obj/item/W as obj, mob/user as mob) @@ -72,9 +72,9 @@ return if(W.has_tool_quality(TOOL_SCREWDRIVER)) if(toggle_secure()) - to_chat(user, "\The [src] is ready!") + to_chat(user, span_notice("\The [src] is ready!")) else - to_chat(user, "\The [src] can now be attached!") + to_chat(user, span_notice("\The [src] can now be attached!")) return return ..() diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 1ce68e1c37..2066647d73 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -105,15 +105,15 @@ /obj/item/assembly_holder/attackby(var/obj/item/W, var/mob/user) if(W.has_tool_quality(TOOL_SCREWDRIVER)) if(!a_left || !a_right) - to_chat(user, " BUG:Assembly part missing, please report this!") + to_chat(user, span_warning(" BUG:Assembly part missing, please report this!")) return a_left.toggle_secure() a_right.toggle_secure() secured = !secured if(secured) - to_chat(user, "\The [src] is ready!") + to_chat(user, span_notice("\The [src] is ready!")) else - to_chat(user, "\The [src] can now be taken apart!") + to_chat(user, span_notice("\The [src] can now be taken apart!")) update_icon() return else @@ -123,7 +123,7 @@ src.add_fingerprint(user) if(src.secured) if(!a_left || !a_right) - to_chat(user, " BUG:Assembly part missing, please report this!") + to_chat(user, span_warning(" BUG:Assembly part missing, please report this!")) return if(istype(a_left,a_right.type))//If they are the same type it causes issues due to window code switch(tgui_alert(usr, "Which side would you like to use?","Side",list("Left","Right"))) @@ -208,18 +208,18 @@ if(!istype(tmr,/obj/item/assembly/timer)) tmr = holder.a_right if(!istype(tmr,/obj/item/assembly/timer)) - to_chat(usr, "This detonator has no timer.") + to_chat(usr, span_notice("This detonator has no timer.")) return if(tmr.timing) - to_chat(usr, "Clock is ticking already.") + to_chat(usr, span_notice("Clock is ticking already.")) else var/ntime = tgui_input_number(usr, "Enter desired time in seconds", "Time", "5", 1000, 0) if (ntime>0 && ntime<1000) tmr.time = ntime name = initial(name) + "([tmr.time] secs)" - to_chat(usr, "Timer set to [tmr.time] seconds.") + to_chat(usr, span_notice("Timer set to [tmr.time] seconds.")) else - to_chat(usr, "Timer can't be [ntime<=0?"negative":"more than 1000 seconds"].") + to_chat(usr, span_notice("Timer can't be [ntime<=0?"negative":"more than 1000 seconds"].")) else - to_chat(usr, "You cannot do this while [usr.stat?"unconscious/dead":"restrained"].") + to_chat(usr, span_notice("You cannot do this while [usr.stat?"unconscious/dead":"restrained"].")) diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 7ed5ec10dc..c2117a60ab 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -102,7 +102,7 @@ /obj/item/assembly/infra/tgui_interact(mob/user, datum/tgui/ui) if(!secured) - to_chat(user, "[src] is unsecured!") + to_chat(user, span_warning("[src] is unsecured!")) return FALSE ui = SStgui.try_update_ui(user, src, ui) if(!ui) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 7feca5f9ad..be3d83a2f7 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -51,18 +51,18 @@ /obj/item/assembly/mousetrap/attack_self(var/mob/living/user) if(!armed) - to_chat(user, "You arm [src].") + to_chat(user, span_notice("You arm [src].")) else if((CLUMSY in user.mutations) && prob(50)) var/which_hand = "l_hand" if(!user.hand) which_hand = "r_hand" triggered(user, which_hand) - user.visible_message("[user] accidentally sets off [src], breaking their fingers.", \ - "You accidentally trigger [src]!") + user.visible_message(span_warning("[user] accidentally sets off [src], breaking their fingers."), \ + span_warning("You accidentally trigger [src]!")) return - to_chat(user, "You disarm [src].") + to_chat(user, span_notice("You disarm [src].")) armed = !armed update_icon() playsound(user, 'sound/weapons/handcuffs.ogg', 30, 1, -3) @@ -74,8 +74,8 @@ if(!user.hand) which_hand = "r_hand" triggered(user, which_hand) - user.visible_message("[user] accidentally sets off [src], breaking their fingers.", \ - "You accidentally trigger [src]!") + user.visible_message(span_warning("[user] accidentally sets off [src], breaking their fingers."), \ + span_warning("You accidentally trigger [src]!")) return ..() @@ -87,16 +87,16 @@ var/mob/living/carbon/H = AM if(H.m_intent == "run") triggered(H) - H.visible_message("[H] accidentally steps on [src].", \ - "You accidentally step on [src]") + H.visible_message(span_warning("[H] accidentally steps on [src]."), \ + span_warning("You accidentally step on [src]")) if(ismouse(AM)) triggered(AM) ..() /obj/item/assembly/mousetrap/on_found(var/mob/living/finder) if(armed) - finder.visible_message("[finder] accidentally sets off [src], breaking their fingers.", \ - "You accidentally trigger [src]!") + finder.visible_message(span_warning("[finder] accidentally sets off [src], breaking their fingers."), \ + span_warning("You accidentally trigger [src]!")) triggered(finder, finder.hand ? "l_hand" : "r_hand") return 1 //end the search! return 0 @@ -104,7 +104,7 @@ /obj/item/assembly/mousetrap/hitby(var/atom/movable/A) if(!armed) return ..() - visible_message("[src] is triggered by [A].") + visible_message(span_warning("[src] is triggered by [A].")) triggered(null) /obj/item/assembly/mousetrap/armed @@ -120,4 +120,4 @@ return layer = HIDING_LAYER - to_chat(usr, "You hide [src].") + to_chat(usr, span_notice("You hide [src].")) diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index c1d389844c..42c156e963 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -97,7 +97,7 @@ /obj/item/assembly/prox_sensor/tgui_interact(mob/user, datum/tgui/ui) if(!secured) - to_chat(user, "[src] is unsecured!") + to_chat(user, span_warning("[src] is unsecured!")) return FALSE ui = SStgui.try_update_ui(user, src, ui) if(!ui) diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index b5f29a56cd..a7a60d26b1 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -28,7 +28,7 @@ return if(W.has_tool_quality(TOOL_SCREWDRIVER)) status = !status - to_chat(user, "[src] is now [status ? "secured" : "unsecured"]!") + to_chat(user, span_notice("[src] is now [status ? "secured" : "unsecured"]!")) playsound(src, W.usesound, 50, 1) add_fingerprint(user) return diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 946bcfa39a..c5e5938a0c 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -64,7 +64,7 @@ /obj/item/assembly/timer/tgui_interact(mob/user, datum/tgui/ui) if(!secured) - to_chat(user, "[src] is unsecured!") + to_chat(user, span_warning("[src] is unsecured!")) return FALSE ui = SStgui.try_update_ui(user, src, ui) if(!ui) diff --git a/code/modules/asset_cache/transports/asset_transport.dm b/code/modules/asset_cache/transports/asset_transport.dm index 5be975a385..288eecd8d3 100644 --- a/code/modules/asset_cache/transports/asset_transport.dm +++ b/code/modules/asset_cache/transports/asset_transport.dm @@ -121,7 +121,7 @@ if (unreceived.len) if (unreceived.len >= ASSET_CACHE_TELL_CLIENT_AMOUNT) - to_chat(client, "Sending Resources...") + to_chat(client, span_infoplain("Sending Resources...")) for (var/asset_name in unreceived) var/new_asset_name = asset_name diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index a20eb79baa..264e076cfb 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -104,13 +104,13 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation) if(linked.len != 8) return if(!powered()) return if(!awaygate) - to_chat(user, "Error: No destination found. Please program gateway.") + to_chat(user, span_notice("Error: No destination found. Please program gateway.")) return if(world.time < wait) - to_chat(user, "Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes.") + to_chat(user, span_notice("Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes.")) return if(!awaygate.calibrated && !LAZYLEN(awaydestinations)) //VOREStation Edit - to_chat(user, "Error: Destination gate uncalibrated. Gateway unsafe to use without far-end calibration update.") + to_chat(user, span_notice("Error: Destination gate uncalibrated. Gateway unsafe to use without far-end calibration update.")) return for(var/obj/machinery/gateway/G in linked) @@ -209,7 +209,7 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation) sleep(1) MI.Paralyse(10) MI << 'sound/effects/bamf.ogg' - to_chat(MI,"You're starting to come to. You feel like you've been out for a few minutes, at least...") + to_chat(MI,span_warning("You're starting to come to. You feel like you've been out for a few minutes, at least...")) for(var/obj/item/I in L) if(istype(I,/obj/item/implant) || istype(I,/obj/item/nif)) continue @@ -219,7 +219,7 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation) sleep(1) L.Paralyse(10) L << 'sound/effects/bamf.ogg' - to_chat(L,"You're starting to come to. You feel like you've been out for a few minutes, at least...") + to_chat(L,span_warning("You're starting to come to. You feel like you've been out for a few minutes, at least...")) //VOREStation Addition End return @@ -231,7 +231,7 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation) else awaygate = locate(/obj/machinery/gateway/centeraway) if(!awaygate) // We still can't find the damn thing because there is no destination. - to_chat(user, "Error: Programming failed. No destination found.") + to_chat(user, span_notice("Error: Programming failed. No destination found.")) return to_chat(user, "Startup programming successful!: A destination in another point of space and time has been detected.") else @@ -304,7 +304,7 @@ GLOBAL_DATUM(gateway_away, /obj/machinery/gateway/centeraway) if(!ready) return if(linked.len != 8) return if(!stationgate || !calibrated) // Vorestation edit. Not like Polaris ever touches this anyway. - to_chat(user, "Error: No destination found. Please calibrate gateway.") + to_chat(user, span_notice("Error: No destination found. Please calibrate gateway.")) return for(var/obj/machinery/gateway/G in linked) @@ -358,7 +358,7 @@ GLOBAL_DATUM(gateway_away, /obj/machinery/gateway/centeraway) else stationgate = locate(/obj/machinery/gateway/centerstation) if(!stationgate) - to_chat(user, "Error: Recalibration failed. No destination found... That can't be good.") + to_chat(user, span_notice("Error: Recalibration failed. No destination found... That can't be good.")) return // VOREStation Add End else diff --git a/code/modules/awaymissions/gateway_vr.dm b/code/modules/awaymissions/gateway_vr.dm index ed99a36852..fec53e0b45 100644 --- a/code/modules/awaymissions/gateway_vr.dm +++ b/code/modules/awaymissions/gateway_vr.dm @@ -8,18 +8,18 @@ /obj/machinery/gateway/centeraway/mcguffin/attackby(obj/item/W as obj, mob/user as mob) if(calibrated && stationgate) - to_chat(user, "The gate is already configured, you should be able to activate it.") + to_chat(user, span_info("The gate is already configured, you should be able to activate it.")) return else if(!stationgate) - to_chat(user, "Error: Configuration failed. No destination found... That can't be good.") + to_chat(user, span_danger("Error: Configuration failed. No destination found... That can't be good.")) return if(istype(W,mcguffin_type) && !calibrated) - to_chat(user, "As the device nears the gateway, mechanical clunks and whirrs can be heard.
[span_blue("Configuration successful! ")]
This gate's systems have been fine tuned. Travel to this gate will now be on target.") + to_chat(user, span_emote("As the device nears the gateway, mechanical clunks and whirrs can be heard.
[span_blue("Configuration successful! ")]
This gate's systems have been fine tuned. Travel to this gate will now be on target.")) calibrated = 1 return else - to_chat(user, "This device does not seem to interface correctly with the gateway. Perhaps you should try something else.") + to_chat(user, span_danger("This device does not seem to interface correctly with the gateway. Perhaps you should try something else.")) return //If you use this kind of gateway you NEED one of these on the map or the players won't be able to leave// diff --git a/code/modules/awaymissions/redgate.dm b/code/modules/awaymissions/redgate.dm index 28b3a7d35f..6689a83770 100644 --- a/code/modules/awaymissions/redgate.dm +++ b/code/modules/awaymissions/redgate.dm @@ -41,7 +41,7 @@ for(var/obj/O in M.contents) if(O.redgate_allowed == FALSE) - to_chat(M, "The redgate refuses to allow you to pass whilst you possess \the [O].") + to_chat(M, span_warning("The redgate refuses to allow you to pass whilst you possess \the [O].")) return if(keycheck) //exceptions probably won't have a ckey @@ -66,12 +66,12 @@ pulled.forceMove(ourturf) M.continue_pulling(pulled) else - to_chat(M, "The redgate refused your pulled item.") + to_chat(M, span_notice("The redgate refused your pulled item.")) else playsound(src,'sound/effects/ominous-hum-2.ogg', 100,1) M.forceMove(ourturf) //Let's just do forcemove, I don't really want people teleporting to weird places if they have bluespace stuff else - to_chat(M, "Something blocks your way.") + to_chat(M, span_notice("Something blocks your way.")) /obj/structure/redgate/proc/find_our_turf(var/atom/movable/AM) //This finds the turf on the opposite side of the target gate from where you are var/offset_x = x - AM.x //used for more smooth teleporting @@ -106,7 +106,7 @@ src.teleport(M) else if(!find_partner()) - to_chat(M, "The [src] remains off... seems like it doesn't have a destination.") + to_chat(M, span_warning("The [src] remains off... seems like it doesn't have a destination.")) /obj/structure/redgate/attack_ghost(var/mob/observer/dead/user) @@ -1513,7 +1513,7 @@ //set the verb based on matching (or mismatching) outfits, and teleport the flag back to base if it was touched by the owning team if(grabbing_team == laser_team) - user.visible_message("[user] is returning \the [src]!") + user.visible_message(span_warning("[user] is returning \the [src]!")) if(do_after(user,flag_return_delay)) //channel return, rather than instant user.drop_from_inventory(src) src.loc = src.start_pos @@ -1522,7 +1522,7 @@ user.drop_from_inventory(src) return else - user.visible_message("[user] has taken \the [src]!") + user.visible_message(span_warning("[user] has taken \the [src]!")) global_announcer.autosay("[src] taken by [capitalize(grabbing_team)] team!","Laserdome Announcer","Entertainment") /obj/item/laserdome_flag/red @@ -1643,7 +1643,7 @@ else return //if they're not on a team, stop! - user.visible_message("[user] has taken \the [src]!") + user.visible_message(span_warning("[user] has taken \the [src]!")) //cache our grabber and their team, for throw interactions with the goals later last_holder = M last_team = grabbing_team diff --git a/code/modules/awaymissions/trigger.dm b/code/modules/awaymissions/trigger.dm index e388b0dd2e..50af8e70ff 100644 --- a/code/modules/awaymissions/trigger.dm +++ b/code/modules/awaymissions/trigger.dm @@ -4,7 +4,7 @@ /obj/effect/step_trigger/message/Trigger(mob/M as mob) if(M.client) - to_chat(M, "[message]") + to_chat(M, span_info("[message]")) if(once) qdel(src) @@ -41,4 +41,4 @@ uses-- if(uses == 0) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/modules/blob/blob.dm b/code/modules/blob/blob.dm index b1902e5d04..0c86b9ae50 100644 --- a/code/modules/blob/blob.dm +++ b/code/modules/blob/blob.dm @@ -94,7 +94,7 @@ return var/obj/mecha/M = locate() in T if(M) - M.visible_message("The blob attacks \the [M]!") + M.visible_message(span_danger("The blob attacks \the [M]!")) M.take_damage(40) return @@ -102,7 +102,7 @@ for(var/mob/living/L in T) if(L.stat == DEAD) continue - L.visible_message("The blob attacks \the [L]!", "The blob attacks you!") + L.visible_message(span_danger("The blob attacks \the [L]!"), span_danger("The blob attacks you!")) playsound(src, 'sound/effects/attackblob.ogg', 50, 1) L.take_organ_damage(rand(30, 40)) return @@ -136,7 +136,7 @@ /obj/effect/blob/attackby(var/obj/item/W, var/mob/user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) playsound(src, 'sound/effects/attackblob.ogg', 50, 1) - visible_message("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]") + visible_message(span_danger("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]")) var/damage = 0 switch(W.damtype) if("fire") diff --git a/code/modules/blob2/blobs/base_blob.dm b/code/modules/blob2/blobs/base_blob.dm index 7475b33210..22948ef160 100644 --- a/code/modules/blob2/blobs/base_blob.dm +++ b/code/modules/blob2/blobs/base_blob.dm @@ -233,7 +233,7 @@ GLOBAL_LIST_EMPTY(all_blobs) return B /obj/structure/blob/attack_generic(var/mob/user, var/damage, var/attack_verb) - visible_message("[user] [attack_verb] the [src]!") + visible_message(span_danger("[user] [attack_verb] the [src]!")) playsound(src, 'sound/effects/attackblob.ogg', 100, 1) user.do_attack_animation(src) if(overmind) @@ -260,7 +260,7 @@ GLOBAL_LIST_EMPTY(all_blobs) return FALSE H.do_attack_animation(src) - H.visible_message("[H] strikes \the [src]!") + H.visible_message(span_danger("[H] strikes \the [src]!")) var/real_damage = rand(3,6) var/hit_dam_type = attack.damage_type @@ -319,7 +319,7 @@ GLOBAL_LIST_EMPTY(all_blobs) /obj/structure/blob/attackby(var/obj/item/W, var/mob/user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) playsound(src, 'sound/effects/attackblob.ogg', 50, 1) - visible_message("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]") + visible_message(span_danger("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]")) var/damage = W.force switch(W.damtype) if(BURN, BIOACID, ELECTROCUTE, OXY) diff --git a/code/modules/blob2/core_chunk.dm b/code/modules/blob2/core_chunk.dm index d2a3fed672..537f5759ca 100644 --- a/code/modules/blob2/core_chunk.dm +++ b/code/modules/blob2/core_chunk.dm @@ -86,10 +86,10 @@ /obj/item/blobcore_chunk/attack_self(var/mob/user) if(blob_type && world.time > active_ability_cooldown + last_active_use) last_active_use = world.time - to_chat(user, "[icon2html(src, user.client)] \The [src] gesticulates.") + to_chat(user, span_alien("[icon2html(src, user.client)] \The [src] gesticulates.")) blob_type.on_chunk_use(src, user) else - to_chat(user, "\The [src] doesn't seem to respond.") + to_chat(user, span_notice("\The [src] doesn't seem to respond.")) ..() /obj/item/blobcore_chunk/process() @@ -102,9 +102,9 @@ should_tick = !should_tick if(should_tick) - to_chat(user, "\The [src] shudders with life.") + to_chat(user, span_alien("\The [src] shudders with life.")) else - to_chat(user, "\The [src] stills, returning to a death-like state.") + to_chat(user, span_alien("\The [src] stills, returning to a death-like state.")) /obj/item/blobcore_chunk/proc/regen(var/newfaction = null) if(istype(blob_type)) @@ -133,10 +133,10 @@ /decl/chemical_reaction/instant/blob_reconstitution/on_reaction(var/datum/reagents/holder) var/obj/item/blobcore_chunk/chunk = holder.my_atom if(chunk.can_genesis && chunk.regen()) - chunk.visible_message("[chunk] bubbles, surrounding itself with a rapidly expanding mass of [chunk.blob_type.name]!") + chunk.visible_message(span_notice("[chunk] bubbles, surrounding itself with a rapidly expanding mass of [chunk.blob_type.name]!")) chunk.can_genesis = FALSE else - chunk.visible_message("[chunk] shifts strangely, but falls still.") + chunk.visible_message(span_warning("[chunk] shifts strangely, but falls still.")) /decl/chemical_reaction/instant/blob_reconstitution/domination name = "Allied Blob Revival" @@ -148,7 +148,7 @@ /decl/chemical_reaction/instant/blob_reconstitution/domination/on_reaction(var/datum/reagents/holder) var/obj/item/blobcore_chunk/chunk = holder.my_atom if(chunk.can_genesis && chunk.regen("neutral")) - chunk.visible_message("[chunk] bubbles, surrounding itself with a rapidly expanding mass of [chunk.blob_type.name]!") + chunk.visible_message(span_notice("[chunk] bubbles, surrounding itself with a rapidly expanding mass of [chunk.blob_type.name]!")) chunk.can_genesis = FALSE else - chunk.visible_message("[chunk] shifts strangely, but falls still.") + chunk.visible_message(span_warning("[chunk] shifts strangely, but falls still.")) diff --git a/code/modules/blob2/mobs/spore.dm b/code/modules/blob2/mobs/spore.dm index 732db9a4da..dd645c8539 100644 --- a/code/modules/blob2/mobs/spore.dm +++ b/code/modules/blob2/mobs/spore.dm @@ -42,7 +42,7 @@ factory = null if(infested) infested.forceMove(get_turf(src)) - visible_message("\The [infested] falls to the ground as the blob spore bursts.") + visible_message(span_warning("\The [infested] falls to the ground as the blob spore bursts.")) infested = null return ..() @@ -103,8 +103,8 @@ infested = H update_icons() - visible_message("The corpse of [H.name] suddenly rises!") + visible_message(span_warning("The corpse of [H.name] suddenly rises!")) /mob/living/simple_mob/hostile/blob/spore/GetIdCard() if(infested) // If we've infested someone, use their ID. - return infested.GetIdCard() \ No newline at end of file + return infested.GetIdCard() diff --git a/code/modules/blob2/overmind/overmind.dm b/code/modules/blob2/overmind/overmind.dm index ea989759e7..7973a8b0b3 100644 --- a/code/modules/blob2/overmind/overmind.dm +++ b/code/modules/blob2/overmind/overmind.dm @@ -116,7 +116,7 @@ var/list/overminds = list() if(message) client.handle_spam_prevention(MUTE_IC) if((client.prefs.muted & MUTE_IC) || say_disabled) - to_chat(src, "You cannot speak in IC (Muted).") + to_chat(src, span_warning("You cannot speak in IC (Muted).")) return //These will contain the main receivers of the message diff --git a/code/modules/blob2/overmind/powers.dm b/code/modules/blob2/overmind/powers.dm index fe67f80e27..1093130dc9 100644 --- a/code/modules/blob2/overmind/powers.dm +++ b/code/modules/blob2/overmind/powers.dm @@ -1,6 +1,6 @@ /mob/observer/blob/proc/can_buy(cost = 15) if(blob_points < cost) - to_chat(src, "You cannot afford this, you need at least [cost] resources!") + to_chat(src, span_warning("You cannot afford this, you need at least [cost] resources!")) return FALSE add_points(-cost) return TRUE @@ -19,20 +19,20 @@ var/obj/structure/blob/B = (locate(/obj/structure/blob) in T) if(!B) - to_chat(src, "There is no blob here!") + to_chat(src, span_warning("There is no blob here!")) return if(B.overmind != src) to_chat(src, span_warning("This blob isn't controlled by you.")) if(!istype(B, /obj/structure/blob/normal)) - to_chat(src, "Unable to use this blob, find a normal one.") + to_chat(src, span_warning("Unable to use this blob, find a normal one.")) return if(nearEquals) for(var/obj/structure/blob/L in orange(nearEquals, T)) if(L.type == blobType) - to_chat(src, "There is a similar blob nearby, move more than [nearEquals] tiles away from it!") + to_chat(src, span_warning("There is a similar blob nearby, move more than [nearEquals] tiles away from it!")) return if(!can_buy(price)) @@ -197,7 +197,7 @@ break if(!B) - to_chat(src, "There is no blob cardinally adjacent to the target tile!") + to_chat(src, span_warning("There is no blob cardinally adjacent to the target tile!")) return if(!can_buy(4)) diff --git a/code/modules/blob2/overmind/types/classic.dm b/code/modules/blob2/overmind/types/classic.dm index 207df460b1..86094def25 100644 --- a/code/modules/blob2/overmind/types/classic.dm +++ b/code/modules/blob2/overmind/types/classic.dm @@ -14,9 +14,9 @@ /datum/blob_type/classic/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user) var/turf/T = get_turf(B) - to_chat(user, "\The [B] produces a soothing ooze!") + to_chat(user, span_alien("\The [B] produces a soothing ooze!")) - T.visible_message("\The [B] shudders at \the [user]'s touch, before disgorging a disgusting ooze.") + T.visible_message(span_alium("\The [B] shudders at \the [user]'s touch, before disgorging a disgusting ooze.")) for(var/turf/simulated/floor/F in view(2, T)) spawn() @@ -34,4 +34,4 @@ blood.reagents.add_reagent("tricorlidaze", 5) blood.update_icon() - return \ No newline at end of file + return diff --git a/code/modules/blob2/overmind/types/ectoplasmic_horror.dm b/code/modules/blob2/overmind/types/ectoplasmic_horror.dm index 5014872535..45935cdffa 100644 --- a/code/modules/blob2/overmind/types/ectoplasmic_horror.dm +++ b/code/modules/blob2/overmind/types/ectoplasmic_horror.dm @@ -27,7 +27,7 @@ /datum/blob_type/ectoplasmic_horror/on_pulse(var/obj/structure/blob/B) if(B.type == /obj/structure/blob && (locate(/obj/structure/blob/node) in oview(2, get_turf(B)))) - B.visible_message("The [name] quakes, before hardening.") + B.visible_message(span_alien("The [name] quakes, before hardening.")) new/obj/structure/blob/shield(get_turf(B), B.overmind) qdel(B) @@ -47,12 +47,12 @@ break if(!beamtarget_exists && GetAnomalySusceptibility(L) >= 0.5) - B.visible_message("\The [B] lashes out at \the [L]!") + B.visible_message(span_danger("\The [B] lashes out at \the [L]!")) var/datum/beam/drain_beam = beam_origin.Beam(L, icon_state = "drain_life", time = 10 SECONDS) active_beams |= drain_beam spawn(9 SECONDS) if(B && drain_beam) - B.visible_message("\The [B] siphons energy from \the [L]") + B.visible_message(span_alien("\The [B] siphons energy from \the [L]")) L.add_modifier(/datum/modifier/berserk_exhaustion, 60 SECONDS) B.overmind.add_points(rand(10,30)) if(!QDELETED(drain_beam)) @@ -60,7 +60,7 @@ /datum/blob_type/ectoplasmic_horror/on_received_damage(var/obj/structure/blob/B, damage, damage_type) if(prob(round(damage * 0.5))) - B.visible_message("\The [B] shimmers, distorting through some unseen dimension.") + B.visible_message(span_alien("\The [B] shimmers, distorting through some unseen dimension.")) var/initial_alpha = B.alpha spawn() animate(B,alpha = initial_alpha, alpha = 10, time = 10) @@ -94,12 +94,12 @@ break if(!beamtarget_exists && GetAnomalySusceptibility(L) >= 0.5) - carrier.visible_message("[icon2html(B,viewers(carrier))] \The [B] lashes out at \the [L]!") + carrier.visible_message(span_danger("[icon2html(B,viewers(carrier))] \The [B] lashes out at \the [L]!")) var/datum/beam/drain_beam = carrier.Beam(L, icon_state = "drain_life", time = 10 SECONDS) active_beams |= drain_beam spawn(9 SECONDS) if(B && drain_beam) - carrier.visible_message("\The [B] siphons energy from \the [L]") + carrier.visible_message(span_alien("\The [B] siphons energy from \the [L]")) L.add_modifier(/datum/modifier/berserk_exhaustion, 30 SECONDS) var/total_heal = 0 diff --git a/code/modules/blob2/overmind/types/energized_jelly.dm b/code/modules/blob2/overmind/types/energized_jelly.dm index 3ef58d89e9..a73d0f0b9a 100644 --- a/code/modules/blob2/overmind/types/energized_jelly.dm +++ b/code/modules/blob2/overmind/types/energized_jelly.dm @@ -33,7 +33,7 @@ var/obj/item/projectile/P = new spore_projectile(get_turf(B)) - carrier.visible_message("\The [B] discharges energy toward \the [L]!") + carrier.visible_message(span_danger("\The [B] discharges energy toward \the [L]!")) P.launch_projectile(L, BP_TORSO, carrier) - return \ No newline at end of file + return diff --git a/code/modules/blob2/overmind/types/fabrication_swarm.dm b/code/modules/blob2/overmind/types/fabrication_swarm.dm index 374cf108a0..a9e1b3f3fc 100644 --- a/code/modules/blob2/overmind/types/fabrication_swarm.dm +++ b/code/modules/blob2/overmind/types/fabrication_swarm.dm @@ -27,7 +27,7 @@ if(damage > 0) var/reinforce_probability = min(damage, 70) if(prob(reinforce_probability)) - B.visible_message("The [name] quakes, before rapidly hardening!") + B.visible_message(span_danger("The [name] quakes, before rapidly hardening!")) new/obj/structure/blob/shield(get_turf(B), B.overmind) qdel(B) return ..() diff --git a/code/modules/blob2/overmind/types/fulminant_organism.dm b/code/modules/blob2/overmind/types/fulminant_organism.dm index 993e0ea7d6..e95cb47d3b 100644 --- a/code/modules/blob2/overmind/types/fulminant_organism.dm +++ b/code/modules/blob2/overmind/types/fulminant_organism.dm @@ -33,7 +33,7 @@ /datum/blob_type/fulminant_organism/on_death(obj/structure/blob/B) if(prob(33)) // 33% chance to make a spore when dying. var/mob/living/simple_mob/blob/spore/S = new spore_type(get_turf(B)) - B.visible_message("\The [S] floats free from the [name]!") + B.visible_message(span_danger("\The [S] floats free from the [name]!")) if(istype(S)) S.overmind = B.overmind S.faction = faction diff --git a/code/modules/blob2/overmind/types/fungal_bloom.dm b/code/modules/blob2/overmind/types/fungal_bloom.dm index 8065b08066..e404c15e3b 100644 --- a/code/modules/blob2/overmind/types/fungal_bloom.dm +++ b/code/modules/blob2/overmind/types/fungal_bloom.dm @@ -27,11 +27,11 @@ B.adjust_integrity(10) else B = new /obj/structure/blob/normal(T, S.overmind) // Otherwise spread it. - B.visible_message("\A [B] forms on \the [T] as \the [S] bursts!") + B.visible_message(span_danger("\A [B] forms on \the [T] as \the [S] bursts!")) /datum/blob_type/fungal_bloom/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user) var/mob/living/simple_mob/blob/spore/S = new spore_type(get_turf(B)) S.faction = user.faction S.blob_type = src S.update_icons() - S.ai_holder.forget_everything() \ No newline at end of file + S.ai_holder.forget_everything() diff --git a/code/modules/blob2/overmind/types/pressurized_slime.dm b/code/modules/blob2/overmind/types/pressurized_slime.dm index 3baa9dc395..98a78440bf 100644 --- a/code/modules/blob2/overmind/types/pressurized_slime.dm +++ b/code/modules/blob2/overmind/types/pressurized_slime.dm @@ -37,7 +37,7 @@ T.wet_floor() /datum/blob_type/pressurized_slime/on_death(obj/structure/blob/B) - B.visible_message("The blob ruptures, spraying the area with liquid!") + B.visible_message(span_danger("The blob ruptures, spraying the area with liquid!")) wet_surroundings(B, 50) /datum/blob_type/pressurized_slime/proc/wet_surroundings(var/obj/structure/blob/B, var/probability = 50) @@ -53,4 +53,4 @@ /datum/blob_type/pressurized_slime/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user) // Drenches you in water. if(user) user.ExtinguishMob() - user.fire_stacks = CLAMP(user.fire_stacks - 1, -25, 25) \ No newline at end of file + user.fire_stacks = CLAMP(user.fire_stacks - 1, -25, 25) diff --git a/code/modules/blob2/overmind/types/ravenous_macrophage.dm b/code/modules/blob2/overmind/types/ravenous_macrophage.dm index f0bbb0945a..ca6b22a907 100644 --- a/code/modules/blob2/overmind/types/ravenous_macrophage.dm +++ b/code/modules/blob2/overmind/types/ravenous_macrophage.dm @@ -34,14 +34,14 @@ /datum/blob_type/ravenous_macrophage/on_death(obj/structure/blob/B) var/obj/structure/blob/other = locate() in oview(2, B) if(other) - B.visible_message("The dying mass is rapidly consumed by the nearby [other]!") + B.visible_message(span_danger("The dying mass is rapidly consumed by the nearby [other]!")) if(other.overmind) other.overmind.add_points(rand(1,4)) /datum/blob_type/ravenous_macrophage/on_chunk_tick(obj/item/blobcore_chunk/B) var/mob/living/L = locate() in range(world.view, B) if(prob(5) && !L.stat) // There's some active living thing nearby, produce offgas. - B.visible_message("[icon2html(B,viewers(B))] \The [B] disgorches a cloud of noxious gas!") + B.visible_message(span_alien("[icon2html(B,viewers(B))] \The [B] disgorches a cloud of noxious gas!")) var/turf/T = get_turf(B) var/datum/effect/effect/system/smoke_spread/noxious/BS = new /datum/effect/effect/system/smoke_spread/noxious BS.attach(T) diff --git a/code/modules/blob2/overmind/types/reactive_spines.dm b/code/modules/blob2/overmind/types/reactive_spines.dm index ce80fe5d5a..c206df13e4 100644 --- a/code/modules/blob2/overmind/types/reactive_spines.dm +++ b/code/modules/blob2/overmind/types/reactive_spines.dm @@ -26,7 +26,7 @@ // Even if the melee attack is enough to one-shot this blob, it gets to retaliate at least once. /datum/blob_type/reactive_spines/on_received_damage(var/obj/structure/blob/B, damage, damage_type, mob/living/attacker) if(damage > 0 && attacker && get_dist(B, attacker) <= 1) - B.visible_message("The [name] retaliates, lashing out at \the [attacker]!") + B.visible_message(span_danger("The [name] retaliates, lashing out at \the [attacker]!")) B.blob_attack_animation(attacker, B.overmind) attacker.blob_act(B) return ..() @@ -49,7 +49,7 @@ var/obj/item/projectile/P = new spore_projectile(get_turf(B)) - carrier.visible_message("\The [B] fires a spine at \the [L]!") + carrier.visible_message(span_danger("\The [B] fires a spine at \the [L]!")) P.launch_projectile(L, BP_TORSO, carrier) return diff --git a/code/modules/blob2/overmind/types/roiling_mold.dm b/code/modules/blob2/overmind/types/roiling_mold.dm index 245d7db09b..6747ae91fe 100644 --- a/code/modules/blob2/overmind/types/roiling_mold.dm +++ b/code/modules/blob2/overmind/types/roiling_mold.dm @@ -58,7 +58,7 @@ var/obj/item/projectile/P = new spore_projectile(get_turf(B)) - user.visible_message("[icon2html(B,viewers(user))] \The [B] discharges energy toward \the [L]!") + user.visible_message(span_danger("[icon2html(B,viewers(user))] \The [B] discharges energy toward \the [L]!")) P.launch_projectile(L, BP_TORSO, user) return diff --git a/code/modules/blob2/overmind/types/synchronous_mesh.dm b/code/modules/blob2/overmind/types/synchronous_mesh.dm index 72e6a43f81..738703de56 100644 --- a/code/modules/blob2/overmind/types/synchronous_mesh.dm +++ b/code/modules/blob2/overmind/types/synchronous_mesh.dm @@ -68,5 +68,5 @@ carrier.adjustFireLoss(-3 / nearby_mobs.len) if(need_beam) - carrier.visible_message("[icon2html(B,viewers(carrier))] \The [B] sends noxious spores toward \the [victim]!") + carrier.visible_message(span_alien("[icon2html(B,viewers(carrier))] \The [B] sends noxious spores toward \the [victim]!")) carrier.Beam(victim, icon_state = "lichbeam", time = 2 SECONDS) diff --git a/code/modules/blob2/overmind/types/volatile_alluvium.dm b/code/modules/blob2/overmind/types/volatile_alluvium.dm index ee5a0afc06..6e05132b9f 100644 --- a/code/modules/blob2/overmind/types/volatile_alluvium.dm +++ b/code/modules/blob2/overmind/types/volatile_alluvium.dm @@ -36,10 +36,10 @@ if(I) if((I.sharp || I.edge) && !istype(I, /obj/item/gun)) I.forceMove(get_turf(B)) // Disarmed entirely. - B.visible_message("The [name] heaves, \the [attacker]'s weapon becoming stuck in the churning mass!") + B.visible_message(span_danger("The [name] heaves, \the [attacker]'s weapon becoming stuck in the churning mass!")) else I.throw_at(B, 2, 4) // Just yoinked. - B.visible_message("The [name] heaves, pulling \the [attacker]'s weapon from their hands!") + B.visible_message(span_danger("The [name] heaves, pulling \the [attacker]'s weapon from their hands!")) B.blob_attack_animation(attacker, B.overmind) return ..() @@ -48,7 +48,7 @@ var/damage = amount * 4 B.adjust_integrity(-(damage)) if(B && prob(damage)) - B.visible_message("The [name] begins to crumble!") + B.visible_message(span_danger("The [name] begins to crumble!")) /datum/blob_type/volatile_alluvium/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user) if(user) diff --git a/code/modules/casino/casino.dm b/code/modules/casino/casino.dm index 893ed6ae5f..212b06767b 100644 --- a/code/modules/casino/casino.dm +++ b/code/modules/casino/casino.dm @@ -51,7 +51,7 @@ if(!ball) to_chat(user,"This roulette wheel has no ball! ") return - visible_message("\The [user] spins the roulette and throws [ball.get_ball_desc()] into it.") + visible_message(span_notice("\The [user] spins the roulette and throws [ball.get_ball_desc()] into it.")) playsound(src.loc, 'sound/machines/roulette.ogg', 40, 1) busy = 1 ball.on_spin() @@ -74,7 +74,7 @@ if(result == 37) result = "00" spawn(5 SECONDS) - visible_message("The roulette stops spinning, the ball landing on [result], [color].") + visible_message(span_notice("The roulette stops spinning, the ball landing on [result], [color].")) busy = 0 icon_state = initial(icon_state) @@ -84,7 +84,7 @@ user.drop_from_inventory(W) W.forceMove(src) ball = W - to_chat(user, "You insert [W] into [src].") + to_chat(user, span_notice("You insert [W] into [src].")) return ..() @@ -101,16 +101,16 @@ return if(busy) - to_chat(usr, "You cannot remove \the [ball] while [src] is spinning!") + to_chat(usr, span_warning("You cannot remove \the [ball] while [src] is spinning!")) return if(ball) usr.put_in_hands(ball) - to_chat(usr, "You remove \the [ball] from [src].") + to_chat(usr, span_notice("You remove \the [ball] from [src].")) ball = null return else - to_chat(usr, "There is no ball in [src]!") + to_chat(usr, span_notice("There is no ball in [src]!")) return /obj/structure/casino_table/roulette_table/long @@ -223,21 +223,21 @@ /obj/item/roulette_ball/hollow/attackby(var/obj/item/W, var/mob/user) if(trapped) - to_chat(user, "This ball already has something trapped in it!") + to_chat(user, span_notice("This ball already has something trapped in it!")) return if(istype(W, /obj/item/holder)) var/obj/item/holder/H = W if(!H.held_mob) - to_chat(user, "This holder has nobody in it? Yell at a developer!") + to_chat(user, span_warning("This holder has nobody in it? Yell at a developer!")) return if(H.held_mob.get_effective_size(TRUE) > 50) - to_chat(user, "\The [H] is too big to fit inside!") + to_chat(user, span_warning("\The [H] is too big to fit inside!")) return user.drop_from_inventory(H) H.forceMove(src) trapped = H - to_chat(user, "You trap \the [H] inside the glass roulette ball.") - to_chat(H.held_mob, "\The [user] traps you inside a glass roulette ball!") + to_chat(user, span_notice("You trap \the [H] inside the glass roulette ball.")) + to_chat(H.held_mob, span_warning("\The [user] traps you inside a glass roulette ball!")) update_icon() /obj/item/roulette_ball/hollow/update_icon() @@ -248,13 +248,13 @@ /obj/item/roulette_ball/hollow/attack_self(mob/user as mob) if(!trapped) - to_chat(user, "\The [src] is empty!") + to_chat(user, span_notice("\The [src] is empty!")) return else user.put_in_hands(trapped) if(trapped.held_mob) - to_chat(user, "You take \the [trapped] out of the glass roulette ball.") - to_chat(trapped.held_mob, "\The [user] takes you out of a glass roulette ball.") + to_chat(user, span_notice("You take \the [trapped] out of the glass roulette ball.")) + to_chat(trapped.held_mob, span_notice("\The [user] takes you out of a glass roulette ball.")) trapped = null update_icon() @@ -264,7 +264,7 @@ /obj/item/roulette_ball/hollow/on_spin() if(trapped && trapped.held_mob) - to_chat(trapped.held_mob, "THE WHOLE WORLD IS SENT WHIRLING AS THE ROULETTE SPINS!!!") + to_chat(trapped.held_mob, span_critical("THE WHOLE WORLD IS SENT WHIRLING AS THE ROULETTE SPINS!!!")) /obj/item/roulette_ball/hollow/Destroy() if(trapped) @@ -407,10 +407,10 @@ if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) if(!check_access(W)) - to_chat(user, "Access Denied.") + to_chat(user, span_warning("Access Denied.")) return else - to_chat(user, "Proper access, allowed staff controls.") + to_chat(user, span_warning("Proper access, allowed staff controls.")) if(ishuman(usr) || istype(usr, /mob/living/silicon/robot)) switch(input(user,"Choose what to do (Management)","Wheel Of Fortune (Management)") in list("Spin the Lottery Wheel!", "Toggle Lottery Sales", "Toggle Public Spins", "Reset Lottery", "Cancel")) if("Cancel") @@ -438,18 +438,18 @@ if("Reset Lottery") var/confirm = tgui_alert(usr, "Are you sure you want to reset Lottery?", "Confirm Lottery Reset", list("Yes", "No")) if(confirm == "Yes") - to_chat(user, "Lottery has been Reset!") + to_chat(user, span_warning("Lottery has been Reset!")) lottery_entries = 0 lottery_tickets = list() lottery_tickets_ckeys = list() if(istype(W, /obj/item/spacecasinocash)) if(lottery_sale == "disabled") - to_chat(user, "Lottery sales are currently disabled.") + to_chat(user, span_warning("Lottery sales are currently disabled.")) return else if(user.client.ckey in lottery_tickets_ckeys) - to_chat(user, "The scanner beeps in an upset manner, you already have a ticket!") + to_chat(user, span_warning("The scanner beeps in an upset manner, you already have a ticket!")) return var/obj/item/spacecasinocash/C = W @@ -463,7 +463,7 @@ to_chat(user,"You dont have enough chips to buy a lottery ticket! ") return - to_chat(user,"You put [lottery_price] credits worth of chips into the Wheel of Fortune and it pings to notify of your lottery ticket registered!") + to_chat(user,span_notice("You put [lottery_price] credits worth of chips into the Wheel of Fortune and it pings to notify of your lottery ticket registered!")) cashmoney.worth -= lottery_price cashmoney.update_icon() @@ -485,7 +485,7 @@ result = rand(1,interval) spawn(5 SECONDS) - visible_message("The wheel of fortune stops spinning, the number is [result]!") + visible_message(span_notice("The wheel of fortune stops spinning, the number is [result]!")) src.confetti_spread = new /datum/effect/effect/system/confetti_spread() src.confetti_spread.attach(src) //If somehow people start dragging slot machine spawn(0) @@ -499,7 +499,7 @@ if(mode == "lottery") if(lottery_entries == 0) - visible_message("There are no tickets in the system!") + visible_message(span_notice("There are no tickets in the system!")) return busy = 1 @@ -507,7 +507,7 @@ result = pick(lottery_tickets) spawn(5 SECONDS) - visible_message("The wheel of fortune stops spinning, and the winner is [result]!") + visible_message(span_notice("The wheel of fortune stops spinning, and the winner is [result]!")) src.confetti_spread = new /datum/effect/effect/system/confetti_spread() src.confetti_spread.attach(src) //If somehow people start dragging slot machine spawn(0) @@ -569,35 +569,35 @@ collar_list -= selected_collar sentientprizes_ckeys_list -= selected_collar.sentientprizeckey selected_collar = null - to_chat(user, "No collar is currently selected or the currently selected one has been destroyed or disabled.") + to_chat(user, span_warning("No collar is currently selected or the currently selected one has been destroyed or disabled.")) return - to_chat(user, "Sentient Prize information") - to_chat(user, "Name: [selected_collar.sentientprizename]") - to_chat(user, "Description: [selected_collar.sentientprizeflavor]") - to_chat(user, "OOC: [selected_collar.sentientprizeooc]") + to_chat(user, span_warning("Sentient Prize information")) + to_chat(user, span_notice("Name: [selected_collar.sentientprizename]")) + to_chat(user, span_notice("Description: [selected_collar.sentientprizeflavor]")) + to_chat(user, span_notice("OOC: [selected_collar.sentientprizeooc]")) if(selected_collar.ownername != null) - to_chat(user, "This prize is already owned by [selected_collar.ownername]") + to_chat(user, span_warning("This prize is already owned by [selected_collar.ownername]")) if("Select Prize") selected_collar = tgui_input_list(user, "Select a prize", "Chose a collar", collar_list) if(QDELETED(selected_collar)) collar_list -= selected_collar sentientprizes_ckeys_list -= selected_collar.sentientprizeckey - to_chat(user, "No collars to chose, or selected collar has been destroyed or deactived, selection has been removed from list.") + to_chat(user, span_warning("No collars to chose, or selected collar has been destroyed or deactived, selection has been removed from list.")) selected_collar = null return if("Become Prize (Please examine yourself first)") //Its awkward, but no easy way to obtain flavor_text due to server not loading text of mob until its been examined at least once. var/safety_ckey = user.client.ckey if(safety_ckey in sentientprizes_ckeys_list) - to_chat(user, "The SPASM beeps in an upset manner, you already have a collar!") + to_chat(user, span_warning("The SPASM beeps in an upset manner, you already have a collar!")) return var/confirm = tgui_alert(usr, "Are you sure you want to become a sentient prize?", "Confirm Sentient Prize", list("Yes", "No")) if(confirm != "Yes") return - to_chat(user, "You are now a prize!") + to_chat(user, span_warning("You are now a prize!")) if(safety_ckey in sentientprizes_ckeys_list) - to_chat(user, "The SPASM beeps in an upset manner, you already have a collar!") + to_chat(user, span_warning("The SPASM beeps in an upset manner, you already have a collar!")) return sentientprizes_ckeys_list += user.ckey var/obj/item/clothing/accessory/collar/casinosentientprize/C = new(src.loc) @@ -619,10 +619,10 @@ if(istype(W, /obj/item/spacecasinocash)) if(casinosentientprize_sale == "disabled") - to_chat(user, "Sentient Prize sales are currently disabled.") + to_chat(user, span_warning("Sentient Prize sales are currently disabled.")) return if(!selected_collar) - to_chat(user, "Select a prize first.") + to_chat(user, span_warning("Select a prize first.")) return if(!selected_collar.ownername) var/obj/item/spacecasinocash/C = W @@ -633,13 +633,13 @@ insert_chip(C, user, "buy") return else - to_chat(user, "This Sentient Prize is already owned! If you are the owner you can release the prize by swiping the collar on the SPASM!") + to_chat(user, span_warning("This Sentient Prize is already owned! If you are the owner you can release the prize by swiping the collar on the SPASM!")) return if(istype(W, /obj/item/clothing/accessory/collar/casinosentientprize)) var/obj/item/clothing/accessory/collar/casinosentientprize/C = W if(user.name != C.sentientprizename && user.name != C.ownername) - to_chat(user, "This Sentient Prize collar isn't yours, please give it to the one it tagged for, belongs to, or a casino staff member!") + to_chat(user, span_warning("This Sentient Prize collar isn't yours, please give it to the one it tagged for, belongs to, or a casino staff member!")) return if(user.name == C.sentientprizename) if(!C.ownername) @@ -651,7 +651,7 @@ if(user.name == C.ownername) var/confirm = tgui_alert(usr, "Are you sure you want to wipe [C.sentientprizename] entry?", "Confirm Sentient Prize Release", list("Yes", "No")) if(confirm == "Yes") - to_chat(user, "[C.sentientprizename] collar has been deleted from registry!") + to_chat(user, span_warning("[C.sentientprizename] collar has been deleted from registry!")) C.icon_state = "casinoslave" C.update_icon() C.name = "disabled Sentient Prize Collar: [C.sentientprizename]" @@ -662,10 +662,10 @@ if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) if(!check_access(W)) - to_chat(user, "Access Denied.") + to_chat(user, span_warning("Access Denied.")) return else - to_chat(user, "Proper access, allowed staff controls.") + to_chat(user, span_warning("Proper access, allowed staff controls.")) if(ishuman(usr) || istype(usr, /mob/living/silicon/robot)) switch(input(user,"Choose what to do (Management)","SPASM (Management)") in list("Toggle Sentient Prize Sales", "Wipe Selected Prize Entry", "Change Prize Value", "Cancel")) if("Cancel") @@ -685,19 +685,19 @@ if("Wipe Selected Prize Entry") if(!selected_collar) - to_chat(user, "No collar selected!") + to_chat(user, span_warning("No collar selected!")) return if(QDELETED(selected_collar)) collar_list -= selected_collar sentientprizes_ckeys_list -= selected_collar.sentientprizeckey - to_chat(user, "Collar has been destroyed!") + to_chat(user, span_warning("Collar has been destroyed!")) selected_collar = null return var/safety_ckey = selected_collar.sentientprizeckey var/confirm = tgui_alert(usr, "Are you sure you want to wipe [selected_collar.sentientprizename] entry?", "Confirm Sentient Prize", list("Yes", "No")) if(confirm == "Yes") if(safety_ckey == selected_collar.sentientprizeckey) - to_chat(user, "[selected_collar.sentientprizename] collar has been deleted from registry!") + to_chat(user, span_warning("[selected_collar.sentientprizename] collar has been deleted from registry!")) selected_collar.icon_state = "casinoslave" selected_collar.update_icon() selected_collar.name = "disabled Sentient Prize Collar: [selected_collar.sentientprizename]" @@ -707,7 +707,7 @@ collar_list -= selected_collar selected_collar = null else - to_chat(user, "Registry deletion aborted! Changed collar selection!") + to_chat(user, span_warning("Registry deletion aborted! Changed collar selection!")) return if("Change Prize Value") diff --git a/code/modules/casino/casino_prize_vendor.dm b/code/modules/casino/casino_prize_vendor.dm index 8363e776fe..5d90f78418 100644 --- a/code/modules/casino/casino_prize_vendor.dm +++ b/code/modules/casino/casino_prize_vendor.dm @@ -198,7 +198,7 @@ /obj/machinery/casino_prize_dispenser/attackby(obj/item/W as obj, mob/user as mob) if(currently_vending) if(istype(W, /obj/item/spacecasinocash)) - to_chat(usr, "Please select prize on display with sufficient amount of chips.") + to_chat(usr, span_warning("Please select prize on display with sufficient amount of chips.")) else SStgui.update_uis(src) return // don't smack that machine with your 2 chips @@ -215,7 +215,7 @@ return 0 if(istype(cashmoney, /obj/item/spacecasinocash)) - visible_message("\The [usr] inserts some chips into \the [src].") + visible_message(span_info("\The [usr] inserts some chips into \the [src].")) cashmoney.worth -= price if(cashmoney.worth <= 0) @@ -283,11 +283,11 @@ if("event") restriction_check = category_event else - to_chat(usr, "Prize checkout error has occurred, purchase cancelled.") + to_chat(usr, span_warning("Prize checkout error has occurred, purchase cancelled.")) return FALSE if(restriction_check < 1) - to_chat(usr, "[name] is restricted, this prize can't be bought.") + to_chat(usr, span_warning("[name] is restricted, this prize can't be bought.")) return FALSE if(restriction_check > 1) item_given = TRUE @@ -302,7 +302,7 @@ var/obj/item/spacecasinocash/cash = usr.get_active_hand() paid = pay_with_chips(cash, usr, price) else - to_chat(usr, "Payment failure: Improper payment method, please provide chips.") + to_chat(usr, span_warning("Payment failure: Improper payment method, please provide chips.")) return TRUE // we set this because they shouldn't even be able to get this far, and we want the UI to update. if(paid) if(item_given == TRUE) @@ -312,7 +312,7 @@ do_logging(currently_vending, usr, bi) . = TRUE else - to_chat(usr, "Payment failure: unable to process payment.") + to_chat(usr, span_warning("Payment failure: unable to process payment.")) /obj/machinery/casino_prize_dispenser/proc/vend(datum/data/casino_prize/bi, mob/user) SStgui.update_uis(src) @@ -344,7 +344,7 @@ return for(var/mob/O in hearers(src, null)) - O.show_message("\The [src] beeps, \"[message]\"",2) + O.show_message(span_npcsay("\The [src] beeps, \"[message]\""),2) return /obj/machinery/casino_prize_dispenser/process() //Might not need this, but just to be safe for now diff --git a/code/modules/casino/slots.dm b/code/modules/casino/slots.dm index a15e7acb1e..c3d490580d 100644 --- a/code/modules/casino/slots.dm +++ b/code/modules/casino/slots.dm @@ -70,12 +70,12 @@ if(do_after(user, 20 * W.toolspeed)) if(!src) return - to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") + to_chat(user, span_notice("You [anchored? "un" : ""]secured \the [src]!")) anchored = !anchored return if(!anchored) - to_chat(user," The slot machine isn't secured.") + to_chat(user,span_notice(" The slot machine isn't secured.")) return var/handled = 0 @@ -110,7 +110,7 @@ to_chat(user,"You dont have enough chips to gamble! ") return - to_chat(user,"You puts 5 credits in the slot machine and presses start.") + to_chat(user,span_notice("You puts 5 credits in the slot machine and presses start.")) cashmoney.worth -= 5 cashmoney.update_icon() @@ -161,44 +161,44 @@ spawn(delaytime) - to_chat(user,"The slot machine flashes with bright colours as the slots lights up with a [symbol1], a [symbol2] and a [symbol3]!") + to_chat(user,span_notice("The slot machine flashes with bright colours as the slots lights up with a [symbol1], a [symbol2] and a [symbol3]!")) if (symbol1 == "cherry" && symbol2 == "cherry" && symbol3 == "cherry") - output = "Three cherries! The slot machine deposits chips worth 25 credits!" + output = span_notice("Three cherries! The slot machine deposits chips worth 25 credits!") winnings = 25 if ((symbol1 != "cherry" && symbol2 == "cherry" && symbol3 == "cherry") || (symbol1 == "cherry" && symbol2 != "cherry" && symbol3 == "cherry") ||(symbol1 == "cherry" && symbol2 == "cherry" && symbol3 != "cherry")) - output = "Two cherries! The slot machine deposits a 10 credit chip!" + output = span_notice("Two cherries! The slot machine deposits a 10 credit chip!") winnings = 10 if (symbol1 == "lemon" && symbol2 == "lemon" && symbol3 == "lemon") - output = "Three lemons! The slot machine deposits a 50 credit chip!" + output = span_notice("Three lemons! The slot machine deposits a 50 credit chip!") winnings = 50 if (symbol1 == "watermelon" && symbol2 == "watermelon" && symbol3 == "watermelon") - output = "Three watermelons! The slot machine deposits chips worth 75 credits!" + output = span_notice("Three watermelons! The slot machine deposits chips worth 75 credits!") winnings = 75 if (symbol1 == "bell" && symbol2 == "bell" && symbol3 == "bell") - output = "Three bells! The slot machine deposits chips a 100 credit chip!" + output = span_notice("Three bells! The slot machine deposits chips a 100 credit chip!") winnings = 100 if (symbol1 == "four leaf clover" && symbol2 == "four leaf clover" && symbol3 == "four leaf clover") - output = "Three four leaf clovers! The slot machine deposits a 200 credit chip!" + output = span_notice("Three four leaf clovers! The slot machine deposits a 200 credit chip!") winnings = 200 if (symbol1 == "seven" && symbol2 == "seven" && symbol3 == "seven") - output = "Three sevens! The slot machine deposits a 500 credit chip!" + output = span_notice("Three sevens! The slot machine deposits a 500 credit chip!") winnings = 500 celebrate = 1 if (symbol1 == "diamond" && symbol2 == "diamond" && symbol3 == "diamond") - output = "Three diamonds! The slot machine deposits a 1000 credit chip!" + output = span_notice("Three diamonds! The slot machine deposits a 1000 credit chip!") winnings = 1000 celebrate = 1 if (symbol1 == "platinum coin" && symbol2 == "platinum coin" && symbol3 == "platinum coin") - output = "Three platinum coins! The slot machine deposits a platinum chip!" + output = span_notice("Three platinum coins! The slot machine deposits a platinum chip!") platinumwin = TRUE celebrate = 1 @@ -300,12 +300,12 @@ if(do_after(user, 20 * W.toolspeed)) if(!src) return - to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") + to_chat(user, span_notice("You [anchored? "un" : ""]secured \the [src]!")) anchored = !anchored return if(!anchored) - to_chat(user," The slot machine isn't secured.") + to_chat(user,span_notice(" The slot machine isn't secured.")) return var/handled = 0 @@ -339,7 +339,7 @@ to_chat(user,"You dont have enough Thalers to gamble! ") return - to_chat(user,"You puts 5 Thalers in the slot machine and presses start.") + to_chat(user,span_notice("You puts 5 Thalers in the slot machine and presses start.")) cashmoney.worth -= 5 cashmoney.update_icon() @@ -390,44 +390,44 @@ spawn(delaytime) - to_chat(user,"The slot machine flashes with bright colours as the slots lights up with a [symbol1], a [symbol2] and a [symbol3]!") + to_chat(user,span_notice("The slot machine flashes with bright colours as the slots lights up with a [symbol1], a [symbol2] and a [symbol3]!")) if (symbol1 == "cherry" && symbol2 == "cherry" && symbol3 == "cherry") - output = "Three cherries! The slot machine deposits 25 Thalers!" + output = span_notice("Three cherries! The slot machine deposits 25 Thalers!") winnings = 25 if ((symbol1 != "cherry" && symbol2 == "cherry" && symbol3 == "cherry") || (symbol1 == "cherry" && symbol2 != "cherry" && symbol3 == "cherry") ||(symbol1 == "cherry" && symbol2 == "cherry" && symbol3 != "cherry")) - output = "Two cherries! The slot machine deposits 10 Thalers!" + output = span_notice("Two cherries! The slot machine deposits 10 Thalers!") winnings = 10 if (symbol1 == "lemon" && symbol2 == "lemon" && symbol3 == "lemon") - output = "Three lemons! The slot machine deposits 50 Thalers!" + output = span_notice("Three lemons! The slot machine deposits 50 Thalers!") winnings = 50 if (symbol1 == "watermelon" && symbol2 == "watermelon" && symbol3 == "watermelon") - output = "Three watermelons! The slot machine deposits 75 Thalers!" + output = span_notice("Three watermelons! The slot machine deposits 75 Thalers!") winnings = 75 if (symbol1 == "bell" && symbol2 == "bell" && symbol3 == "bell") - output = "Three bells! The slot machine deposits 100 Thalers!" + output = span_notice("Three bells! The slot machine deposits 100 Thalers!") winnings = 100 if (symbol1 == "four leaf clover" && symbol2 == "four leaf clover" && symbol3 == "four leaf clover") - output = "Three four leaf clovers! The slot machine deposits 200 Thalers!" + output = span_notice("Three four leaf clovers! The slot machine deposits 200 Thalers!") winnings = 200 if (symbol1 == "seven" && symbol2 == "seven" && symbol3 == "seven") - output = "Three sevens! The slot machine deposits 500 Thalers!" + output = span_notice("Three sevens! The slot machine deposits 500 Thalers!") winnings = 500 celebrate = 1 if (symbol1 == "diamond" && symbol2 == "diamond" && symbol3 == "diamond") - output = "Three diamonds! The slot machine deposits 1000 Thalers!" + output = span_notice("Three diamonds! The slot machine deposits 1000 Thalers!") winnings = 1000 celebrate = 1 if (symbol1 == "platinum coin" && symbol2 == "platinum coin" && symbol3 == "platinum coin") - output = "Three platinum coins! The slot machine deposits a platinum chip!" + output = span_notice("Three platinum coins! The slot machine deposits a platinum chip!") platinumwin = TRUE; celebrate = 1 diff --git a/code/modules/catalogue/cataloguer.dm b/code/modules/catalogue/cataloguer.dm index 322092f077..b4f4e5a45f 100644 --- a/code/modules/catalogue/cataloguer.dm +++ b/code/modules/catalogue/cataloguer.dm @@ -314,9 +314,9 @@ GLOBAL_LIST_EMPTY(all_cataloguers) if(points_stored) ID.survey_points += points_stored points_stored = 0 - to_chat(user, "You swipe the id over \the [src].") + to_chat(user, span_notice("You swipe the id over \the [src].")) else - to_chat(user, "\The [src] has no points available.") + to_chat(user, span_notice("\The [src] has no points available.")) busy = FALSE return ..() diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index da22c11f37..7cf370412b 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -70,7 +70,7 @@ if(href_list["irc_msg"]) if(!holder && received_irc_pm < world.time - 6000) //Worse they can do is spam IRC for 10 minutes - to_chat(usr, "You are no longer able to use this, it's been more than 10 minutes since an admin on IRC has responded to you") + to_chat(usr, span_warning("You are no longer able to use this, it's been more than 10 minutes since an admin on IRC has responded to you")) return if(mute_irc) to_chat(usr, "") @@ -90,26 +90,26 @@ GLOB.pending_discord_registrations -= list(L) var/time = L["time"] if((world.realtime - time) > 10 MINUTES) - to_chat(src, "Sorry, that link has expired. Please request another on Discord.") + to_chat(src, span_warning("Sorry, that link has expired. Please request another on Discord.")) return sane = TRUE break if(!sane) - to_chat(src, "Sorry, that link doesn't appear to be valid. Please try again.") + to_chat(src, span_warning("Sorry, that link doesn't appear to be valid. Please try again.")) return var/sql_discord = sql_sanitize_text(their_id) var/sql_ckey = sql_sanitize_text(ckey) var/DBQuery/query = dbcon.NewQuery("UPDATE erro_player SET discord_id = '[sql_discord]' WHERE ckey = '[sql_ckey]'") if(query.Execute()) - to_chat(src, "Registration complete! Thank you for taking the time to register your Discord ID.") + to_chat(src, span_notice("Registration complete! Thank you for taking the time to register your Discord ID.")) log_and_message_admins("[ckey] has registered their Discord ID to obtain the Crew Member role. Their Discord snowflake ID is: [their_id]") admin_chat_message(message = "[ckey] has registered their Discord ID to obtain the Crew Member role. Their Discord is: <@[their_id]>", color = "#4eff22") notes_add(ckey, "Discord ID: [their_id]") world.VgsAddMemberRole(their_id) else - to_chat(src, "There was an error registering your Discord ID in the database. Contact an administrator.") + to_chat(src, span_warning("There was an error registering your Discord ID in the database. Contact an administrator.")) log_and_message_admins("[ckey] failed to register their Discord ID. Their Discord snowflake ID is: [their_id]. Is the database connected?") return //VOREStation Add End @@ -120,7 +120,7 @@ //byond bug ID:2256651 if (asset_cache_job && (asset_cache_job in completed_asset_jobs)) - to_chat(src, "An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)") + to_chat(src, span_danger("An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)")) src << browse("...", "window=asset_cache_browser") return if (href_list["asset_cache_preload_data"]) @@ -229,11 +229,11 @@ if(custom_event_msg && custom_event_msg != "") to_chat(src, "

Custom Event

") to_chat(src, "

A custom event is taking place. OOC Info:

") - to_chat(src, "[custom_event_msg]") + to_chat(src, span_alert("[custom_event_msg]")) to_chat(src, "
") if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them. - to_chat(src, "Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.") + to_chat(src, span_warning("Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.")) if(holder) add_admin_verbs() @@ -258,7 +258,7 @@ //disabled because we don't use the ingame changelog system any more /* if((prefs.lastchangelog != changelog_hash) && isnewplayer(src.mob)) //bolds the changelog button on the interface so we know there are updates. - to_chat(src, "You have unread updates in the changelog.") + to_chat(src, span_info("You have unread updates in the changelog.")) winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold") if(config.aggressive_changelog) src.changes() @@ -393,7 +393,7 @@ if (isnum(player_age) && player_age == 0) //first connection if (config.panic_bunker && !holder && !deadmin_holder) log_adminwarn("Failed Login: [key] - New account attempting to connect during panic bunker") - message_admins("Failed Login: [key] - New account attempting to connect during panic bunker") + message_admins(span_adminnotice("Failed Login: [key] - New account attempting to connect during panic bunker")) disconnect_with_message("Sorry but the server is currently not accepting connections from never before seen players.") return 0 diff --git a/code/modules/client/preference_setup/general/01_basic.dm b/code/modules/client/preference_setup/general/01_basic.dm index fb7b5ed4eb..51239bf5ab 100644 --- a/code/modules/client/preference_setup/general/01_basic.dm +++ b/code/modules/client/preference_setup/general/01_basic.dm @@ -106,7 +106,7 @@ pref.real_name = new_name return TOPIC_REFRESH else - to_chat(user, "Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .") + to_chat(user, span_warning("Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .")) return TOPIC_NOACTION else if(href_list["random_name"]) @@ -125,7 +125,7 @@ pref.nickname = new_nickname return TOPIC_REFRESH else - to_chat(user, "Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .") + to_chat(user, span_warning("Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .")) return TOPIC_NOACTION else if(href_list["reset_nickname"]) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index a71049c51e..2dd12a5110 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -1155,7 +1155,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O organ = O_STOMACH if("Brain") if(pref.organ_data[BP_HEAD] != "cyborg") - to_chat(user, "You may only select a cybernetic or synthetic brain if you have a full prosthetic body.") + to_chat(user, span_warning("You may only select a cybernetic or synthetic brain if you have a full prosthetic body.")) return organ = "brain" diff --git a/code/modules/client/preference_setup/global/04_ooc.dm b/code/modules/client/preference_setup/global/04_ooc.dm index c375107754..bdc20e1aa6 100644 --- a/code/modules/client/preference_setup/global/04_ooc.dm +++ b/code/modules/client/preference_setup/global/04_ooc.dm @@ -33,7 +33,7 @@ if(player_to_ignore) player_to_ignore = sanitize(ckey(player_to_ignore)) if(player_to_ignore == user.ckey) - to_chat(user, "You can't ignore yourself.") + to_chat(user, span_notice("You can't ignore yourself.")) return TOPIC_REFRESH pref.ignored_players |= player_to_ignore return TOPIC_REFRESH diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index 71b42bcf97..ed7ba9242b 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -109,16 +109,16 @@ var/list/gear_datums = list() var/total_cost = 0 for(var/gear_name in pref.gear) if(!gear_datums[gear_name]) - to_chat(preference_mob, "You cannot have more than one of the \the [gear_name]") + to_chat(preference_mob, span_warning("You cannot have more than one of the \the [gear_name]")) pref.gear -= gear_name else if(!(gear_name in valid_gear_choices())) - to_chat(preference_mob, "You cannot take \the [gear_name] as you are not whitelisted for the species or item.") //Vorestation Edit + to_chat(preference_mob, span_warning("You cannot take \the [gear_name] as you are not whitelisted for the species or item.")) //Vorestation Edit pref.gear -= gear_name else var/datum/gear/G = gear_datums[gear_name] if(total_cost + G.cost > MAX_GEAR_COST) pref.gear -= gear_name - to_chat(preference_mob, "You cannot afford to take \the [gear_name]") + to_chat(preference_mob, span_warning("You cannot afford to take \the [gear_name]")) else total_cost += G.cost diff --git a/code/modules/client/preference_setup/traits/traits.dm b/code/modules/client/preference_setup/traits/traits.dm index 60369ff0c0..b0d2f4d963 100644 --- a/code/modules/client/preference_setup/traits/traits.dm +++ b/code/modules/client/preference_setup/traits/traits.dm @@ -107,19 +107,19 @@ var/list/trait_categories = list() // The categories available for the trait men for(var/trait_name in pref.traits) if(!trait_datums[trait_name]) - to_chat(preference_mob, "You cannot have more than one of trait: [trait_name]") + to_chat(preference_mob, span_warning("You cannot have more than one of trait: [trait_name]")) pref.traits -= trait_name else var/datum/trait/T = trait_datums[trait_name] var/invalidity = T.test_for_invalidity(src) if(invalidity) pref.traits -= trait_name - to_chat(preference_mob, "You cannot take the [trait_name] trait. Reason: [invalidity]") + to_chat(preference_mob, span_warning("You cannot take the [trait_name] trait. Reason: [invalidity]")) var/conflicts = T.test_for_trait_conflict(pref.traits) if(conflicts) pref.traits -= trait_name - to_chat(preference_mob, "The [trait_name] trait is mutually exclusive with [conflicts].") + to_chat(preference_mob, span_warning("The [trait_name] trait is mutually exclusive with [conflicts].")) /datum/category_item/player_setup_item/traits/OnTopic(href, href_list, user) if(href_list["toggle_trait"]) @@ -129,12 +129,12 @@ var/list/trait_categories = list() // The categories available for the trait men else var/invalidity = T.test_for_invalidity(src) if(invalidity) - to_chat(user, "You cannot take the [T.name] trait. Reason: [invalidity]") + to_chat(user, span_warning("You cannot take the [T.name] trait. Reason: [invalidity]")) return TOPIC_NOACTION var/conflicts = T.test_for_trait_conflict(pref.traits) if(conflicts) - to_chat(user, "The [T.name] trait is mutually exclusive with [conflicts].") + to_chat(user, span_warning("The [T.name] trait is mutually exclusive with [conflicts].")) return TOPIC_NOACTION pref.traits += T.name diff --git a/code/modules/client/preference_setup/vore/02_size.dm b/code/modules/client/preference_setup/vore/02_size.dm index 55590a2a4b..2cd0e603ab 100644 --- a/code/modules/client/preference_setup/vore/02_size.dm +++ b/code/modules/client/preference_setup/vore/02_size.dm @@ -118,7 +118,7 @@ var/new_size = tgui_input_number(user, "Choose your character's size, ranging from 25% to 200%", "Set Size", null, 200, 25) if (!ISINRANGE(new_size,25,200)) pref.size_multiplier = 1 - to_chat(user, "Invalid size.") + to_chat(user, span_notice("Invalid size.")) return TOPIC_REFRESH_UPDATE_PREVIEW else if(new_size) pref.size_multiplier = (new_size/100) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index f4591190c1..923ca25d3e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -284,7 +284,7 @@ var/list/preferences_datums = list() if(!user || !user.client) return if(!get_mob_by_key(client_ckey)) - to_chat(user, "No mob exists for the given client!") + to_chat(user, span_danger("No mob exists for the given client!")) return if(!char_render_holders) @@ -375,7 +375,7 @@ var/list/preferences_datums = list() if(config.forumurl) user << link(config.forumurl) else - to_chat(user, "The forum URL is not set in the server configuration.") + to_chat(user, span_danger("The forum URL is not set in the server configuration.")) return ShowChoices(usr) return 1 @@ -452,7 +452,7 @@ var/list/preferences_datums = list() /datum/preferences/proc/open_load_dialog(mob/user) if(selecting_slots) - to_chat(user, "You already have a slot selection dialog open!") + to_chat(user, span_warning("You already have a slot selection dialog open!")) return if(!savefile) return @@ -494,7 +494,7 @@ var/list/preferences_datums = list() /datum/preferences/proc/open_copy_dialog(mob/user) if(selecting_slots) - to_chat(user, "You already have a slot selection dialog open!") + to_chat(user, span_warning("You already have a slot selection dialog open!")) return if(!savefile) return diff --git a/code/modules/client/preferences_toggle_procs.dm b/code/modules/client/preferences_toggle_procs.dm index 6b34f88a59..73a3c1045d 100644 --- a/code/modules/client/preferences_toggle_procs.dm +++ b/code/modules/client/preferences_toggle_procs.dm @@ -34,13 +34,13 @@ prefs.examine_text_mode %= EXAMINE_MODE_MAX // This cycles through them because if you're already specifically being routed to the examine panel, you probably don't need to have the extra text printed to chat switch(prefs.examine_text_mode) // ... And I only wanted to add one verb if(EXAMINE_MODE_DEFAULT) - to_chat(src, "Examining things will only output the base examine text, and you will not be redirected to the examine panel automatically.") + to_chat(src, span_filter_system("Examining things will only output the base examine text, and you will not be redirected to the examine panel automatically.")) if(EXAMINE_MODE_INCLUDE_USAGE) - to_chat(src, "Examining things will also print any extra usage information normally included in the examine panel to the chat.") + to_chat(src, span_filter_system("Examining things will also print any extra usage information normally included in the examine panel to the chat.")) if(EXAMINE_MODE_SWITCH_TO_PANEL) - to_chat(src, "Examining things will direct you to the examine panel, where you can view extended information about the thing.") + to_chat(src, span_filter_system("Examining things will direct you to the examine panel, where you can view extended information about the thing.")) /client/verb/toggle_multilingual_mode() set name = "Toggle Multilingual Mode" @@ -51,10 +51,10 @@ prefs.multilingual_mode %= MULTILINGUAL_MODE_MAX // Cycles through the various options switch(prefs.multilingual_mode) if(MULTILINGUAL_DEFAULT) - to_chat(src, "Multilingual parsing will only check for the delimiter-key combination (,0galcom-2tradeband).") + to_chat(src, span_filter_system("Multilingual parsing will only check for the delimiter-key combination (,0galcom-2tradeband).")) if(MULTILINGUAL_SPACE) - to_chat(src, "Multilingual parsing will enforce a space after the delimiter-key combination (,0 galcom -2still galcom). The extra space will be consumed by the pattern-matching.") + to_chat(src, span_filter_system("Multilingual parsing will enforce a space after the delimiter-key combination (,0 galcom -2still galcom). The extra space will be consumed by the pattern-matching.")) if(MULTILINGUAL_DOUBLE_DELIMITER) - to_chat(src, "Multilingual parsing will enforce the a language delimiter after the delimiter-key combination (,0,galcom -2 still galcom). The extra delimiter will be consumed by the pattern-matching.") + to_chat(src, span_filter_system("Multilingual parsing will enforce the a language delimiter after the delimiter-key combination (,0,galcom -2 still galcom). The extra delimiter will be consumed by the pattern-matching.")) if(MULTILINGUAL_OFF) - to_chat(src, "Multilingual parsing is now disabled. Entire messages will be in the language specified at the start of the message.") + to_chat(src, span_filter_system("Multilingual parsing is now disabled. Entire messages will be in the language specified at the start of the message.")) diff --git a/code/modules/client/stored_item.dm b/code/modules/client/stored_item.dm index 104c1b1e22..06b8d0caf0 100644 --- a/code/modules/client/stored_item.dm +++ b/code/modules/client/stored_item.dm @@ -61,7 +61,7 @@ return if(istype(user) && Adjacent(user)) if(inoperable() || panel_open) - to_chat(user, "\The [src] seems to be nonfunctional...") + to_chat(user, span_warning("\The [src] seems to be nonfunctional...")) else start_using(user) @@ -69,7 +69,7 @@ if(!ishuman(user)) return if(busy_bank) - to_chat(user, "\The [src] is already in use.") + to_chat(user, span_warning("\The [src] is already in use.")) return busy_bank = TRUE var/I = persist_item_savefile_load(user, "type") @@ -79,15 +79,15 @@ busy_bank = FALSE return else if(choice == "Check contents" && I) - to_chat(user, "\The [src] has \the [Iname] for you!") + to_chat(user, span_notice("\The [src] has \the [Iname] for you!")) busy_bank = FALSE else if(choice == "Retrieve item" && I) if(user.hands_are_full()) - to_chat(user,"Your hands are full!") + to_chat(user,span_notice("Your hands are full!")) busy_bank = FALSE return if(user.ckey in item_takers) - to_chat(user, "You have already taken something out of \the [src] this shift.") + to_chat(user, span_warning("You have already taken something out of \the [src] this shift.")) busy_bank = FALSE return choice = tgui_alert(user, "If you remove this item from the bank, it will be unable to be stored again. Do you still want to remove it?", "[src]", list("No", "Yes"), timeout = 10 SECONDS) @@ -102,7 +102,7 @@ return var/obj/N = new I(get_turf(src)) log_admin("[key_name_admin(user)] retrieved [N] from the item bank.") - visible_message("\The [src] dispenses the [N] to \the [user].") + visible_message(span_notice("\The [src] dispenses the [N] to \the [user].")) user.put_in_hands(N) N.persist_storable = FALSE var/path = src.persist_item_savefile_path(user) @@ -114,24 +114,24 @@ busy_bank = FALSE icon_state = "item_bank" else if(choice == "Info") - to_chat(user, "\The [src] can store a single item for you between shifts! Anything that has been retrieved from the bank cannot be stored again in the same shift. Anyone can withdraw from the bank one time per shift. Some items are not able to be accepted by the bank.") + to_chat(user, span_notice("\The [src] can store a single item for you between shifts! Anything that has been retrieved from the bank cannot be stored again in the same shift. Anyone can withdraw from the bank one time per shift. Some items are not able to be accepted by the bank.")) busy_bank = FALSE return else if(!I) - to_chat(user, "\The [src] doesn't seem to have anything for you...") + to_chat(user, span_warning("\The [src] doesn't seem to have anything for you...")) busy_bank = FALSE /obj/machinery/item_bank/attackby(obj/item/O, mob/living/user) if(!ishuman(user)) return if(busy_bank) - to_chat(user, "\The [src] is already in use.") + to_chat(user, span_warning("\The [src] is already in use.")) return busy_bank = TRUE var/I = persist_item_savefile_load(user, "type") if(!istool(O) && O.persist_storable) if(ispath(I)) - to_chat(user, "You cannot store \the [O]. You already have something stored.") + to_chat(user, span_warning("You cannot store \the [O]. You already have something stored.")) busy_bank = FALSE return var/choice = tgui_alert(user, "If you store \the [O], anything it contains may be lost to \the [src]. Are you sure?", "[src]", list("Store", "Cancel"), timeout = 10 SECONDS) @@ -140,23 +140,23 @@ return for(var/obj/check in O.contents) if(!check.persist_storable) - to_chat(user, "\The [src] buzzes. \The [O] contains [check], which cannot be stored. Please remove this item before attempting to store \the [O]. As a reminder, any contents of \the [O] will be lost if you store it with contents.") + to_chat(user, span_warning("\The [src] buzzes. \The [O] contains [check], which cannot be stored. Please remove this item before attempting to store \the [O]. As a reminder, any contents of \the [O] will be lost if you store it with contents.")) busy_bank = FALSE return - user.visible_message("\The [user] begins storing \the [O] in \the [src].","You begin storing \the [O] in \the [src].") + user.visible_message(span_notice("\The [user] begins storing \the [O] in \the [src]."),span_notice("You begin storing \the [O] in \the [src].")) icon_state = "item_bank_o" if(!do_after(user, 10 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE) || inoperable()) busy_bank = FALSE icon_state = "item_bank" return src.persist_item_savefile_save(user, O) - user.visible_message("\The [user] stores \the [O] in \the [src].","You stored \the [O] in \the [src].") + user.visible_message(span_notice("\The [user] stores \the [O] in \the [src]."),span_notice("You stored \the [O] in \the [src].")) log_admin("[key_name_admin(user)] stored [O] in the item bank.") qdel(O) busy_bank = FALSE icon_state = "item_bank" else - to_chat(user, "You cannot store \the [O]. \The [src] either does not accept that, or it has already been retrieved from storage this shift.") + to_chat(user, span_warning("You cannot store \the [O]. \The [src] either does not accept that, or it has already been retrieved from storage this shift.")) busy_bank = FALSE /////STORABLE ITEMS AND ALL THAT JAZZ///// @@ -255,4 +255,4 @@ /obj/item/spacecasinocash persist_storable = FALSE /obj/item/personal_shield_generator - persist_storable = FALSE \ No newline at end of file + persist_storable = FALSE diff --git a/code/modules/client/ui_style.dm b/code/modules/client/ui_style.dm index eb6cc2ffdd..653242dabc 100644 --- a/code/modules/client/ui_style.dm +++ b/code/modules/client/ui_style.dm @@ -42,7 +42,7 @@ var/global/list/all_tooltip_styles = list( if(!ishuman(usr)) if(!isrobot(usr)) - to_chat(usr, "You must be a human or a robot to use this verb.") + to_chat(usr, span_warning("You must be a human or a robot to use this verb.")) return var/UI_style_new = tgui_input_list(usr, "Select a style. White is recommended for customization", "UI Style Choice", all_ui_styles) diff --git a/code/modules/client/verbs/advanced_who.dm b/code/modules/client/verbs/advanced_who.dm index 14fe2c3a04..2d4b2790ff 100644 --- a/code/modules/client/verbs/advanced_who.dm +++ b/code/modules/client/verbs/advanced_who.dm @@ -18,23 +18,23 @@ if(C.mob.real_name) switch(C.mob.stat) if(UNCONSCIOUS) - entry += "Unconscious" // these are literally all spans so I can apply .inverted to them because black on dark grey isn't legible + entry += span_darkgray("Unconscious") // these are literally all spans so I can apply .inverted to them because black on dark grey isn't legible if(DEAD) if(isobserver(C.mob)) var/mob/observer/dead/O = C.mob if(O.started_as_observer) - entry += "Observing" + entry += span_gray("Observing") else - entry += "Died" + entry += span_black("Died") else - entry += "Playing" + entry += span_green("Playing") entry += " as [C.mob.real_name]" else if(isnewplayer(C.mob)) - entry += "In lobby" + entry += span_blue("In lobby") entry += "
" @@ -45,9 +45,9 @@ age = 0 if(age <= 1) - age = "[age]" + age = span_red("[age]") else if(age < 10) - age = "[age]" + age = span_orange("[age]") entry += "Age: [age]" entry += "" @@ -93,5 +93,5 @@ msg += "[line]" msg += "
" msg += "Total Players: [length(Lines)]" - msg = "" + msg + "" + msg = span_filter_notice("" + msg + "") to_chat(src, msg) diff --git a/code/modules/client/verbs/character_directory.dm b/code/modules/client/verbs/character_directory.dm index ebc7f4da76..8155adab8d 100644 --- a/code/modules/client/verbs/character_directory.dm +++ b/code/modules/client/verbs/character_directory.dm @@ -7,7 +7,7 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) // This is primarily to stop malicious users from trying to lag the server by spamming this verb if(!usr.checkMoveCooldown()) - to_chat(usr, "Don't spam character directory refresh.") + to_chat(usr, span_warning("Don't spam character directory refresh.")) return usr.setMoveCooldown(10) @@ -137,7 +137,7 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) if(action == "refresh") // This is primarily to stop malicious users from trying to lag the server by spamming this verb if(!usr.checkMoveCooldown()) - to_chat(usr, "Don't spam character directory refresh.") + to_chat(usr, span_warning("Don't spam character directory refresh.")) return usr.setMoveCooldown(10) update_tgui_static_data(usr, ui) @@ -152,7 +152,7 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) var/can_set_mind = !!user.mind if (!can_set_prefs && !can_set_mind) if (!overwrite_prefs && !!user.client.prefs) - to_chat(user, "You cannot change these settings if you don't have a mind to save them to. Enable overwriting prefs and switch to a slot you're fine with overwriting.") + to_chat(user, span_warning("You cannot change these settings if you don't have a mind to save them to. Enable overwriting prefs and switch to a slot you're fine with overwriting.")) return switch(action) if ("setTag") @@ -171,7 +171,7 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) visible = user.mind.show_in_directory else if (can_set_prefs) visible = user.client.prefs.show_in_directory - to_chat(usr, "You are now [!visible ? "shown" : "not shown"] in the directory.") + to_chat(usr, span_notice("You are now [!visible ? "shown" : "not shown"] in the directory.")) return set_for_mind_or_prefs(user, action, !visible, can_set_prefs, can_set_mind) if ("editAd") var/current_ad = (can_set_mind ? usr.mind.directory_ad : null) || (can_set_prefs ? usr.client.prefs.directory_ad : null) @@ -184,7 +184,7 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) can_set_prefs &&= !!user.client.prefs can_set_mind &&= !!user.mind if (!can_set_prefs && !can_set_mind) - to_chat(user, "You seem to have lost either your mind, or your current preferences, while changing the values.[action == "editAd" ? " Here is your ad that you wrote. [new_value]" : null]") + to_chat(user, span_warning("You seem to have lost either your mind, or your current preferences, while changing the values.[action == "editAd" ? " Here is your ad that you wrote. [new_value]" : null]")) return switch(action) if ("setTag") diff --git a/code/modules/client/verbs/ignore.dm b/code/modules/client/verbs/ignore.dm index 416aa24606..1e5237d3b1 100644 --- a/code/modules/client/verbs/ignore.dm +++ b/code/modules/client/verbs/ignore.dm @@ -8,15 +8,15 @@ key_to_ignore = ckey(sanitize(key_to_ignore)) if(prefs && prefs.ignored_players) if(key_to_ignore in prefs.ignored_players) - to_chat(usr, "[key_to_ignore] is already being ignored.") + to_chat(usr, span_warning("[key_to_ignore] is already being ignored.")) return if(key_to_ignore == usr.ckey) - to_chat(usr, "You can't ignore yourself.") + to_chat(usr, span_notice("You can't ignore yourself.")) return prefs.ignored_players |= key_to_ignore SScharacter_setup.queue_preferences_save(prefs) - to_chat(usr, "Now ignoring [key_to_ignore].") + to_chat(usr, span_notice("Now ignoring [key_to_ignore].")) /client/verb/unignore() set name = "Unignore" @@ -24,11 +24,11 @@ set desc = "Reverts your ignoring of a specific player." if(!prefs) - to_chat(usr, "Preferences not found.") + to_chat(usr, span_warning("Preferences not found.")) return if(!prefs.ignored_players?.len) - to_chat(usr, "You aren't ignoring any players.") + to_chat(usr, span_warning("You aren't ignoring any players.")) return var/key_to_unignore = tgui_input_list(usr, "Ignored players", "Unignore", prefs.ignored_players) @@ -36,11 +36,11 @@ return key_to_unignore = ckey(sanitize(key_to_unignore)) if(!(key_to_unignore in prefs.ignored_players)) - to_chat(usr, "[key_to_unignore] isn't being ignored.") + to_chat(usr, span_warning("[key_to_unignore] isn't being ignored.")) return prefs.ignored_players -= key_to_unignore SScharacter_setup.queue_preferences_save(prefs) - to_chat(usr, "Reverted ignore on [key_to_unignore].") + to_chat(usr, span_notice("Reverted ignore on [key_to_unignore].")) /mob/proc/is_key_ignored(var/key_to_check) if(client) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 4291cf86b7..56460d2990 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -4,7 +4,7 @@ set category = "OOC" if(say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") + to_chat(usr, span_warning("Speech is currently admin-disabled.")) return if(!mob) return @@ -16,18 +16,18 @@ if(!msg) return if(!prefs?.read_preference(/datum/preference/toggle/show_ooc)) - to_chat(src, "You have OOC muted.") + to_chat(src, span_warning("You have OOC muted.")) return if(!holder) if(!config.ooc_allowed) - to_chat(src, "OOC is globally muted.") + to_chat(src, span_danger("OOC is globally muted.")) return if(!config.dooc_allowed && (mob.stat == DEAD)) - to_chat(usr, "OOC for dead mobs has been turned off.") + to_chat(usr, span_danger("OOC for dead mobs has been turned off.")) return if(prefs.muted & MUTE_OOC) - to_chat(src, "You cannot use OOC (muted).") + to_chat(src, span_danger("You cannot use OOC (muted).")) return if(findtext(msg, "byond://") && !config.allow_byond_links) to_chat(src, "Advertising other servers is not allowed.") @@ -63,7 +63,7 @@ if(holder.rights & R_ADMIN && holder.rights & R_BAN) //Admins ooc_style = "admin" - msg = GLOB.is_valid_url.Replace(msg,"$1") + msg = GLOB.is_valid_url.Replace(msg,span_linkify("$1")) for(var/client/target in GLOB.clients) if(target.prefs?.read_preference(/datum/preference/toggle/show_ooc)) @@ -77,9 +77,9 @@ else display_name = holder.fakekey if(holder && !holder.fakekey && (holder.rights & R_ADMIN|R_FUN|R_EVENT) && config.allow_admin_ooccolor && (src.prefs.ooccolor != initial(src.prefs.ooccolor))) // keeping this for the badmins - to_chat(target, "" + create_text_tag("ooc", "OOC:", target) + " [display_name]: [msg]") + to_chat(target, span_ooc("" + create_text_tag("ooc", "OOC:", target) + " [display_name]: [span_message(msg)]")) else - to_chat(target, "" + create_text_tag("ooc", "OOC:", target) + " [display_name]: [msg]") + to_chat(target, span_ooc("" + create_text_tag("ooc", "OOC:", target) + " [display_name]: " + span_message(msg))) /client/verb/looc(msg as text) set name = "LOOC" @@ -87,7 +87,7 @@ set category = "OOC" if(say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") + to_chat(usr, span_danger("Speech is currently admin-disabled.")) return if(!mob) @@ -102,18 +102,18 @@ return if(!prefs?.read_preference(/datum/preference/toggle/show_looc)) - to_chat(src, "You have LOOC muted.") + to_chat(src, span_danger("You have LOOC muted.")) return if(!holder) if(!config.looc_allowed) - to_chat(src, "LOOC is globally muted.") + to_chat(src, span_danger("LOOC is globally muted.")) return if(!config.dooc_allowed && (mob.stat == DEAD)) - to_chat(usr, "OOC for dead mobs has been turned off.") + to_chat(usr, span_danger("OOC for dead mobs has been turned off.")) return if(prefs.muted & MUTE_LOOC) - to_chat(src, "You cannot use OOC (muted).") + to_chat(src, span_danger("You cannot use OOC (muted).")) return if(findtext(msg, "byond://") && !config.allow_byond_links) to_chat(src, "Advertising other servers is not allowed.") @@ -172,7 +172,7 @@ if(check_rights(R_SERVER, FALSE, admin)) //Stop rLOOC showing for retired staff r_receivers |= admin - msg = GLOB.is_valid_url.Replace(msg,"$1") + msg = GLOB.is_valid_url.Replace(msg,span_linkify("$1")) // Send a message for(var/client/target in receivers) @@ -181,12 +181,12 @@ if(target in GLOB.admins) admin_stuff += "/([key])" - to_chat(target, "" + create_text_tag("looc", "LOOC:", target) + " [display_name][admin_stuff]: [msg]") + to_chat(target, span_looc("" + create_text_tag("looc", "LOOC:", target) + " [display_name][admin_stuff]: [msg]")) for(var/client/target in r_receivers) var/admin_stuff = "/([key])([admin_jump_link(mob, target.holder)])" - to_chat(target, "" + create_text_tag("looc", "LOOC:", target) + " (R)[display_name][admin_stuff]: [msg]") + to_chat(target, span_rlooc("" + create_text_tag("looc", "LOOC:", target) + " (R)[display_name][admin_stuff]: [msg]")) /mob/proc/get_looc_source() return src diff --git a/code/modules/client/verbs/ping.dm b/code/modules/client/verbs/ping.dm index 8213daa750..706edc02f6 100644 --- a/code/modules/client/verbs/ping.dm +++ b/code/modules/client/verbs/ping.dm @@ -4,9 +4,9 @@ /client/verb/display_ping(time as num) set instant = TRUE set name = ".display_ping" - to_chat(src, "Round trip ping took [round(pingfromtime(time),1)]ms") + to_chat(src, span_notice("Round trip ping took [round(pingfromtime(time),1)]ms")) /client/verb/ping() set name = "Ping" set category = "OOC" - winset(src, null, "command=.display_ping+[world.time+world.tick_lag*world.tick_usage/100]") \ No newline at end of file + winset(src, null, "command=.display_ping+[world.time+world.tick_lag*world.tick_usage/100]") diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm index ce4a729219..050d663787 100644 --- a/code/modules/client/verbs/suicide.dm +++ b/code/modules/client/verbs/suicide.dm @@ -10,8 +10,8 @@ if (!ticker) to_chat(src, "You can't commit suicide before the game starts!") return - - to_chat(src, "No. Adminhelp if there is a legitimate reason, and please review our server rules.") + + to_chat(src, span_warning("No. Adminhelp if there is a legitimate reason, and please review our server rules.")) message_admins("[ckey] has tried to trigger the suicide verb as human, but it is currently disabled.") /mob/living/carbon/brain/verb/suicide() @@ -33,7 +33,7 @@ if(confirm == "Yes") suiciding = 1 - to_chat(viewers(loc),"[src]'s brain is growing dull and lifeless. It looks like it's lost the will to live.") + to_chat(viewers(loc),span_danger("[src]'s brain is growing dull and lifeless. It looks like it's lost the will to live.")) spawn(50) death(0) suiciding = 0 @@ -53,7 +53,7 @@ if(confirm == "Yes") suiciding = 1 - to_chat(viewers(src),"[src] is powering down. It looks like they're trying to commit suicide.") + to_chat(viewers(src),span_danger("[src] is powering down. It looks like they're trying to commit suicide.")) //put em at -175 adjustOxyLoss(max(getMaxHealth() * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -73,7 +73,7 @@ if(confirm == "Yes") suiciding = 1 - to_chat(viewers(src),"[src] is powering down. It looks like they're trying to commit suicide.") + to_chat(viewers(src),span_danger("[src] is powering down. It looks like they're trying to commit suicide.")) //put em at -175 adjustOxyLoss(max(getMaxHealth() * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -89,8 +89,8 @@ card.removePersonality() var/turf/T = get_turf_or_move(card.loc) for (var/mob/M in viewers(T)) - M.show_message("[src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"", 3, "[src] bleeps electronically.", 2) + M.show_message(span_notice("[src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\""), 3, span_notice("[src] bleeps electronically."), 2) death(0) else to_chat(src, "Aborting suicide attempt.") -*/ \ No newline at end of file +*/ diff --git a/code/modules/client/verbs/who.dm b/code/modules/client/verbs/who.dm index b00d2bb896..f2b29a8540 100644 --- a/code/modules/client/verbs/who.dm +++ b/code/modules/client/verbs/who.dm @@ -51,7 +51,7 @@ msg += "[line]\n" msg += "Total Players: [length(Lines)]" - msg = "[jointext(msg, "
")]" + msg = span_filter_notice("[jointext(msg, "
")]") to_chat(src,msg) /client/verb/staffwho() @@ -146,4 +146,4 @@ msg += "\nAdminhelps are also sent to Discord. If no admins are available in game try anyway and an admin on Discord may see it and respond." - to_chat(src,"[jointext(msg, "
")]") + to_chat(src,span_filter_notice("[jointext(msg, "
")]")) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 56a3b1d017..af8fc6ecd2 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -90,7 +90,7 @@ wearable = 1 if(!wearable && !(slot in list(slot_l_store, slot_r_store, slot_s_store))) - to_chat(H, "Your species cannot wear [src].") + to_chat(H, span_danger("Your species cannot wear [src].")) return 0 return 1 @@ -348,7 +348,7 @@ /*/obj/item/clothing/gloves/attackby(obj/item/W, mob/user) if(W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/scalpel)) if (clipped) - to_chat(user, "The [src] have already been clipped!") + to_chat(user, span_notice("The [src] have already been clipped!")) update_icon() return @@ -517,9 +517,9 @@ if(!success) return 0 else if(success == 2) - to_chat(user, "You are already wearing a hat.") + to_chat(user, span_warning("You are already wearing a hat.")) else if(success == 1) - to_chat(user, "You crawl under \the [src].") + to_chat(user, span_notice("You crawl under \the [src].")) return 1 /obj/item/clothing/head/update_icon(var/mob/user) @@ -639,12 +639,12 @@ holding.forceMove(get_turf(usr)) if(usr.put_in_hands(holding)) - usr.visible_message("\The [usr] pulls a knife out of their boot!") + usr.visible_message(span_danger("\The [usr] pulls a knife out of their boot!")) playsound(src, 'sound/weapons/holster/sheathout.ogg', 25) holding = null cut_overlay("[icon_state]_knife") else - to_chat(usr, "Your need an empty, unbroken hand to do that.") + to_chat(usr, span_warning("Your need an empty, unbroken hand to do that.")) holding.forceMove(src) if(!holding) @@ -665,7 +665,7 @@ istype(I, /obj/item/material/kitchen/utensil) || \ istype(I, /obj/item/material/knife/tacknife))) if(holding) - to_chat(user, "\The [src] is already holding \a [holding].") + to_chat(user, span_warning("\The [src] is already holding \a [holding].")) return user.unEquip(I) I.forceMove(src) @@ -681,7 +681,7 @@ set category = "Object" if(shoes_under_pants == -1) - to_chat(usr, "\The [src] cannot be worn above your suit!") + to_chat(usr, span_notice("\The [src] cannot be worn above your suit!")) return shoes_under_pants = !shoes_under_pants update_icon() @@ -1003,7 +1003,7 @@ update_rolldown_status() if(rolled_down == -1) - to_chat(usr, "You cannot roll down [src]!") + to_chat(usr, span_notice("You cannot roll down [src]!")) return if((rolled_sleeves == 1) && !(rolled_down)) rolled_sleeves = 0 @@ -1018,13 +1018,13 @@ else LAZYSET(item_state_slots, slot_w_uniform_str, "[worn_state]_d") - to_chat(usr, "You roll down your [src].") + to_chat(usr, span_notice("You roll down your [src].")) else body_parts_covered = initial(body_parts_covered) if(icon_override == rolled_down_icon) icon_override = initial(icon_override) LAZYSET(item_state_slots, slot_w_uniform_str, worn_state) - to_chat(usr, "You roll up your [src].") + to_chat(usr, span_notice("You roll up your [src].")) update_clothing_icon() /obj/item/clothing/under/verb/rollsleeves() @@ -1036,10 +1036,10 @@ update_rollsleeves_status() if(rolled_sleeves == -1) - to_chat(usr, "You cannot roll up your [src]'s sleeves!") + to_chat(usr, span_notice("You cannot roll up your [src]'s sleeves!")) return if(rolled_down == 1) - to_chat(usr, "You must roll up your [src] first!") + to_chat(usr, span_notice("You must roll up your [src] first!")) return rolled_sleeves = !rolled_sleeves @@ -1050,13 +1050,13 @@ LAZYSET(item_state_slots, slot_w_uniform_str, worn_state) else LAZYSET(item_state_slots, slot_w_uniform_str, "[worn_state]_r") - to_chat(usr, "You roll up your [src]'s sleeves.") + to_chat(usr, span_notice("You roll up your [src]'s sleeves.")) else body_parts_covered = initial(body_parts_covered) if(icon_override == rolled_down_sleeves_icon) icon_override = initial(icon_override) LAZYSET(item_state_slots, slot_w_uniform_str, worn_state) - to_chat(usr, "You roll down your [src]'s sleeves.") + to_chat(usr, span_notice("You roll down your [src]'s sleeves.")) update_clothing_icon() /obj/item/clothing/under/rank/New() diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm index 5ecf2479d3..7c365caefc 100644 --- a/code/modules/clothing/clothing_accessories.dm +++ b/code/modules/clothing/clothing_accessories.dm @@ -79,7 +79,7 @@ /obj/item/clothing/proc/attempt_attach_accessory(obj/item/clothing/accessory/A, mob/user) if(!valid_accessory_slots) if(user) - to_chat(user, "You cannot attach accessories of any kind to \the [src].") + to_chat(user, span_warning("You cannot attach accessories of any kind to \the [src].")) return FALSE var/obj/item/clothing/accessory/acc = A @@ -90,7 +90,7 @@ return TRUE else if(user) - to_chat(user, "You cannot attach more accessories of this type to [src].") + to_chat(user, span_warning("You cannot attach more accessories of this type to [src].")) return FALSE @@ -145,4 +145,4 @@ if(LAZYLEN(accessories)) for(var/obj/item/clothing/accessory/A in accessories) A.emp_act(severity) - ..() \ No newline at end of file + ..() diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm index 2b52f977d8..e588b2767a 100644 --- a/code/modules/clothing/clothing_vr.dm +++ b/code/modules/clothing/clothing_vr.dm @@ -39,15 +39,15 @@ continue full++ if(full >= 2) - to_chat(user, "You can't fit anyone else into \the [src]!") + to_chat(user, span_warning("You can't fit anyone else into \the [src]!")) else var/obj/item/holder/micro/holder = I if(holder.held_mob && (holder.held_mob in holder)) var/mob/living/M = holder.held_mob holder.dump_mob() - to_chat(M, "[user] stuffs you into \the [src]!") + to_chat(M, span_warning("[user] stuffs you into \the [src]!")) M.forceMove(src) - to_chat(user, "You stuff \the [M] into \the [src]!") + to_chat(user, span_notice("You stuff \the [M] into \the [src]!")) else ..() @@ -56,8 +56,8 @@ if(istype(M,/mob/living/voice)) //Don't knock voices out! continue M.forceMove(get_turf(user)) - to_chat(M, "[user] shakes you out of \the [src]!") - to_chat(user, "You shake [M] out of \the [src]!") + to_chat(M, span_warning("[user] shakes you out of \the [src]!")) + to_chat(user, span_notice("You shake [M] out of \the [src]!")) ..() @@ -66,9 +66,9 @@ if(istype(micro,/mob/living/voice)) //Voices shouldn't be able to resist but we have this here just in case. return if(!istype(macro)) - to_chat(micro, "You start to climb out of [src]!") + to_chat(micro, span_notice("You start to climb out of [src]!")) if(do_after(micro, 50, src)) - to_chat(micro, "You climb out of [src]!") + to_chat(micro, span_notice("You climb out of [src]!")) micro.forceMove(loc) return @@ -80,15 +80,15 @@ escape_message_micro = "You start to climb around the larger creature's feet and ankles!" escape_time = 100 - to_chat(micro, "[escape_message_micro]") - to_chat(macro, "[escape_message_macro]") + to_chat(micro, span_notice("[escape_message_micro]")) + to_chat(macro, span_danger("[escape_message_macro]")) if(!do_after(micro, escape_time, macro)) - to_chat(micro, "You're pinned underfoot!") - to_chat(macro, "You pin the escapee underfoot!") + to_chat(micro, span_danger("You're pinned underfoot!")) + to_chat(macro, span_danger("You pin the escapee underfoot!")) return - to_chat(micro, "You manage to escape [src]!") - to_chat(macro, "Someone has climbed out of your [src]!") + to_chat(micro, span_notice("You manage to escape [src]!")) + to_chat(macro, span_danger("Someone has climbed out of your [src]!")) micro.forceMove(macro.loc) /obj/item/clothing/gloves diff --git a/code/modules/clothing/ears/ears.dm b/code/modules/clothing/ears/ears.dm index 82245b3158..c56d395d5c 100644 --- a/code/modules/clothing/ears/ears.dm +++ b/code/modules/clothing/ears/ears.dm @@ -30,11 +30,11 @@ if(headphones_on) icon_state = "[base_icon]_off" headphones_on = 0 - to_chat(usr, "You turn the music off.") + to_chat(usr, span_notice("You turn the music off.")) else icon_state = "[base_icon]_on" headphones_on = 1 - to_chat(usr, "You turn the music on.") + to_chat(usr, span_notice("You turn the music on.")) update_clothing_icon() diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index aa65dcdea0..3af787763e 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -355,7 +355,7 @@ BLIND // can't see anything /obj/item/clothing/glasses/sunglasses/bigshot/examine(mob/user as mob) . = ..() - . += to_chat(usr, "Alt-click to toggle modes.") + . += to_chat(usr, span_notice("Alt-click to toggle modes.")) /obj/item/clothing/glasses/sunglasses/bigshot/AltClick() set src in usr diff --git a/code/modules/clothing/glasses/glasses_vr.dm b/code/modules/clothing/glasses/glasses_vr.dm index 878fddeddc..88baa9bf12 100644 --- a/code/modules/clothing/glasses/glasses_vr.dm +++ b/code/modules/clothing/glasses/glasses_vr.dm @@ -27,14 +27,14 @@ //Too difficult if(target == user) - to_chat(user, "You can't use this on yourself. Get someone to help you.") + to_chat(user, span_warning("You can't use this on yourself. Get someone to help you.")) return //We're applying a prescription if(istype(target,/obj/item/clothing/glasses)) var/obj/item/clothing/glasses/G = target if(!scrip_loaded) - to_chat(user, "You need to build a prescription from someone first! Use the kit on someone.") + to_chat(user, span_warning("You need to build a prescription from someone first! Use the kit on someone.")) return if(do_after(user,5 SECONDS)) @@ -45,14 +45,14 @@ else if(ishuman(target)) var/mob/living/carbon/human/T = target if(T.glasses || (T.head && T.head.flags_inv & HIDEEYES)) - to_chat(user, "The person's eyes can't be covered!") + to_chat(user, span_warning("The person's eyes can't be covered!")) return T.visible_message("[user] begins making measurements for prescription lenses for [target].","[user] begins measuring your eyes. Hold still!") if(do_after(user,5 SECONDS,T)) T.flash_eyes() scrip_loaded = 1 - T.visible_message("[user] finishes making prescription lenses for [target].","Gah, that's bright!") + T.visible_message("[user] finishes making prescription lenses for [target].",span_warning("Gah, that's bright!")) else ..() @@ -108,7 +108,7 @@ icon_state = options[choice] user.update_inv_glasses() user.update_action_buttons() - to_chat(user, "Your [src] now displays [choice] .") + to_chat(user, span_notice("Your [src] now displays [choice] .")) return 1 /*---Tajaran-specific Eyewear---*/ diff --git a/code/modules/clothing/glasses/hud_vr.dm b/code/modules/clothing/glasses/hud_vr.dm index d5cb07ffee..06e8fbf72a 100644 --- a/code/modules/clothing/glasses/hud_vr.dm +++ b/code/modules/clothing/glasses/hud_vr.dm @@ -51,12 +51,12 @@ if(prob(10)) icon_state = "3d" if(ishuman(loc)) - to_chat(loc, "The lenses of your [src.name] malfunction!") + to_chat(loc, span_warning("The lenses of your [src.name] malfunction!")) ..() /obj/item/clothing/glasses/omnihud/proc/flashed() if(flash_prot && ishuman(loc)) - to_chat(loc, "Your [src.name] darken to try and protect your eyes!") + to_chat(loc, span_warning("Your [src.name] darken to try and protect your eyes!")) /obj/item/clothing/glasses/omnihud/prescribe(var/mob/user) prescription = !prescription @@ -76,10 +76,10 @@ var/mob/living/carbon/human/H = user if(!H.glasses || !(H.glasses == src)) - to_chat(user, "You must be wearing the [src] to see the display.") + to_chat(user, span_warning("You must be wearing the [src] to see the display.")) else if(!ar_interact(H)) - to_chat(user, "The [src] does not have any kind of special display.") + to_chat(user, span_warning("The [src] does not have any kind of special display.")) //cosmetic shading, doesn't enhance eye protection /obj/item/clothing/glasses/omnihud/verb/chromatize() diff --git a/code/modules/clothing/gloves/antagonist.dm b/code/modules/clothing/gloves/antagonist.dm index 23451d6ea2..83e595a0dd 100644 --- a/code/modules/clothing/gloves/antagonist.dm +++ b/code/modules/clothing/gloves/antagonist.dm @@ -25,7 +25,7 @@ return 0 if(user.a_intent != I_HURT && (turn(target.dir, 180) == get_dir(user, target))) - to_chat(target, "[user] rifles in your pockets!") + to_chat(target, span_warning("[user] rifles in your pockets!")) if(user.a_intent == I_HELP) if(istype(target.back,/obj/item/storage) && do_after(user, 3 SECONDS, target)) @@ -127,7 +127,7 @@ do_defib(H) - to_chat(L, "You feel a powerful shock!") + to_chat(L, span_warning("You feel a powerful shock!")) if(!.) playsound(L, 'sound/effects/sparks7.ogg', 40, 1) L.electrocute_act(battery.percent() * 0.25, src) diff --git a/code/modules/clothing/gloves/arm_guards.dm b/code/modules/clothing/gloves/arm_guards.dm index ea0c97187c..af3883ae74 100644 --- a/code/modules/clothing/gloves/arm_guards.dm +++ b/code/modules/clothing/gloves/arm_guards.dm @@ -12,11 +12,11 @@ if(..()) //This will only run if no other problems occured when equiping. if(H.wear_suit) if(H.wear_suit.body_parts_covered & ARMS) - to_chat(H, "You can't wear \the [src] with \the [H.wear_suit], it's in the way.") + to_chat(H, span_warning("You can't wear \the [src] with \the [H.wear_suit], it's in the way.")) return 0 for(var/obj/item/clothing/accessory/A in H.wear_suit) if(A.body_parts_covered & ARMS) - to_chat(H, "You can't wear \the [src] with \the [H.wear_suit]'s [A], it's in the way.") + to_chat(H, span_warning("You can't wear \the [src] with \the [H.wear_suit]'s [A], it's in the way.")) return 0 return 1 @@ -60,4 +60,4 @@ siemens_coefficient = 0.6 armor = list(melee = 40, bullet = 40, laser = 60, energy = 35, bomb = 30, bio = 0, rad = 0) min_cold_protection_temperature = T0C - 20 - cold_protection = ARMS \ No newline at end of file + cold_protection = ARMS diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm index ad4fd5d50e..3cb5ca5457 100644 --- a/code/modules/clothing/gloves/boxing.dm +++ b/code/modules/clothing/gloves/boxing.dm @@ -7,7 +7,7 @@ /* /obj/item/clothing/gloves/boxing/attackby(obj/item/W, mob/user) if(W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/surgical/scalpel)) - to_chat(user, "That won't work.") //Nope + to_chat(user, span_notice("That won't work.")) //Nope return ..() */ diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 54ed74483e..f65a9b0a12 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -184,7 +184,7 @@ . = ..() if(Adjacent(user)) - . += "The current station time is [stationtime2text()]." + . += span_notice("The current station time is [stationtime2text()].") /obj/item/clothing/gloves/watch/silver name = "silver wristwatch" @@ -208,19 +208,19 @@ . = ..() if(Adjacent(user) && src.loc == user) - . += "You are currently facing [dir2text(user.dir)]. The micro beacon is [gps.tracking ? "on" : "off"]." + . += span_notice("You are currently facing [dir2text(user.dir)]. The micro beacon is [gps.tracking ? "on" : "off"].") var/TB = src.loc.loc if(istype(TB, /turf/)) //no point returning light level if we're not on a turf (might be *in* someone!) var/turf/TL = TB var/light_level = TL.get_lumcount() if(light_level) - . += "Light Level: [TL.get_lumcount()]" + . += span_notice("Light Level: [TL.get_lumcount()]") else - . += "It's too dark to see the light level!" + . += span_notice("It's too dark to see the light level!") if(istype(TB, /turf/simulated)) //no point returning atmospheric data from unsimulated tiles (they don't track pressure anyway, only temperature) var/turf/simulated/T = TB var/datum/gas_mixture/env = T.return_air() - . += "Pressure: [env.return_pressure()]kPa / Temperature: [env.temperature]K " + . += span_notice("Pressure: [env.return_pressure()]kPa / Temperature: [env.temperature]K ") /obj/item/clothing/gloves/watch/survival/New() gps = new/obj/item/gps/watch(src) @@ -233,4 +233,4 @@ if(Adjacent(user)) gps.tracking = !gps.tracking - to_chat(user,"You turn the micro beacon [gps.tracking ? "on" : "off"].") + to_chat(user,span_notice("You turn the micro beacon [gps.tracking ? "on" : "off"].")) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 42cebdf0f0..b5fd02b17e 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -264,7 +264,7 @@ /obj/item/clothing/head/psy_crown/proc/activate_ability(var/mob/living/wearer) cooldown = world.time + cooldown_duration to_chat(wearer, flavor_activate) - to_chat(wearer, "The inside of your head hurts...") + to_chat(wearer, span_danger("The inside of your head hurts...")) wearer.adjustBrainLoss(brainloss_cost) /obj/item/clothing/head/psy_crown/equipped(var/mob/living/carbon/human/H) @@ -298,10 +298,10 @@ desc = "A crown-of-thorns set with a red gemstone that seems to glow unnaturally. It feels rather disturbing to touch." description_info = "This has a chance to cause the wearer to become extremely angry when in extreme danger." icon_state = "wrathcrown" - flavor_equip = "You feel a bit angrier after putting on this crown." - flavor_unequip = "You feel calmer after removing the crown." - flavor_drop = "You feel much calmer after letting go of the crown." - flavor_activate = "An otherworldly feeling seems to enter your mind, and it ignites your mind in fury!" + flavor_equip = span_warning("You feel a bit angrier after putting on this crown.") + flavor_unequip = span_notice("You feel calmer after removing the crown.") + flavor_drop = span_notice("You feel much calmer after letting go of the crown.") + flavor_activate = span_danger("An otherworldly feeling seems to enter your mind, and it ignites your mind in fury!") /obj/item/clothing/head/psy_crown/wrath/activate_ability(var/mob/living/wearer) ..() @@ -312,10 +312,10 @@ desc = "A crown-of-thorns set with a green gemstone that seems to glow unnaturally. It feels rather disturbing to touch." description_info = "This has a chance to cause the wearer to become extremely durable, but hungry when in extreme danger." icon_state = "gluttonycrown" - flavor_equip = "You feel a bit hungrier after putting on this crown." - flavor_unequip = "You feel sated after removing the crown." - flavor_drop = "You feel much more sated after letting go of the crown." - flavor_activate = "An otherworldly feeling seems to enter your mind, and it drives your mind into gluttony!" + flavor_equip = span_warning("You feel a bit hungrier after putting on this crown.") + flavor_unequip = span_notice("You feel sated after removing the crown.") + flavor_drop = span_notice("You feel much more sated after letting go of the crown.") + flavor_activate = span_danger("An otherworldly feeling seems to enter your mind, and it drives your mind into gluttony!") /obj/item/clothing/head/psy_crown/gluttony/activate_ability(var/mob/living/wearer) ..() diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm index c628e1c4a5..77ef4b8320 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -68,36 +68,36 @@ var/message = phrase_list[key] if (!safety) - to_chat(usr, "You set the restrictor to: FUCK YOUR CUNT YOU SHIT EATING COCKSUCKER MAN EAT A DONG FUCKING ASS RAMMING SHIT FUCK EAT PENISES IN YOUR FUCK FACE AND SHIT OUT ABORTIONS OF FUCK AND DO SHIT IN YOUR ASS YOU COCK FUCK SHIT MONKEY FUCK ASS WANKER FROM THE DEPTHS OF SHIT.") + to_chat(usr, span_notice("You set the restrictor to: FUCK YOUR CUNT YOU SHIT EATING COCKSUCKER MAN EAT A DONG FUCKING ASS RAMMING SHIT FUCK EAT PENISES IN YOUR FUCK FACE AND SHIT OUT ABORTIONS OF FUCK AND DO SHIT IN YOUR ASS YOU COCK FUCK SHIT MONKEY FUCK ASS WANKER FROM THE DEPTHS OF SHIT.")) return switch(aggressiveness) if(1) phrase = (phrase < 6) ? (phrase + 1) : 1 key = phrase_list[phrase] message = phrase_list[key] - to_chat(usr,"You set the restrictor to: [message]") + to_chat(usr,span_notice("You set the restrictor to: [message]")) if(2) phrase = (phrase < 11 && phrase >= 7) ? (phrase + 1) : 7 key = phrase_list[phrase] message = phrase_list[key] - to_chat(usr,"You set the restrictor to: [message]") + to_chat(usr,span_notice("You set the restrictor to: [message]")) if(3) phrase = (phrase < 18 && phrase >= 12 ) ? (phrase + 1) : 12 key = phrase_list[phrase] message = phrase_list[key] - to_chat(usr,"You set the restrictor to: [message]") + to_chat(usr,span_notice("You set the restrictor to: [message]")) if(4) phrase = (phrase < 18 && phrase >= 1 ) ? (phrase + 1) : 1 key = phrase_list[phrase] message = phrase_list[key] - to_chat(usr,"You set the restrictor to: [message]") + to_chat(usr,span_notice("You set the restrictor to: [message]")) else - to_chat(usr, "It's broken.") + to_chat(usr, span_notice("It's broken.")) /obj/item/clothing/mask/gas/sechailer/emag_act(mob/user) if(safety) safety = 0 - to_chat(user, "You silently fry [src]'s vocal circuit with the cryptographic sequencer.") + to_chat(user, span_warning("You silently fry [src]'s vocal circuit with the cryptographic sequencer.")) else return @@ -105,30 +105,30 @@ if(I.has_tool_quality(TOOL_SCREWDRIVER)) switch(aggressiveness) if(1) - to_chat(user, "You set the aggressiveness restrictor to the second position.") + to_chat(user, span_notice("You set the aggressiveness restrictor to the second position.")) aggressiveness = 2 phrase = 7 if(2) - to_chat(user, "You set the aggressiveness restrictor to the third position.") + to_chat(user, span_notice("You set the aggressiveness restrictor to the third position.")) aggressiveness = 3 phrase = 13 if(3) - to_chat(user, "You set the aggressiveness restrictor to the fourth position.") + to_chat(user, span_notice("You set the aggressiveness restrictor to the fourth position.")) aggressiveness = 4 phrase = 1 if(4) - to_chat(user, "You set the aggressiveness restrictor to the first position.") + to_chat(user, span_notice("You set the aggressiveness restrictor to the first position.")) aggressiveness = 1 phrase = 1 if(5) - to_chat(user, "You adjust the restrictor but nothing happens, probably because its broken.") + to_chat(user, span_warning("You adjust the restrictor but nothing happens, probably because its broken.")) if(I.has_tool_quality(TOOL_WIRECUTTER)) if(aggressiveness != 5) - to_chat(user, "You broke it!") + to_chat(user, span_warning("You broke it!")) aggressiveness = 5 if(I.has_tool_quality(TOOL_CROWBAR)) if(!hailer) - to_chat(user, "This mask has an integrated hailer, you can't remove it!") + to_chat(user, span_warning("This mask has an integrated hailer, you can't remove it!")) else var/obj/N = new /obj/item/clothing/mask/gas/half(src.loc) playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 9d7d9a693b..22b32e40f9 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -375,7 +375,7 @@ icon_state = options[choice] user.update_inv_wear_mask() user.update_action_buttons() - to_chat(user, "Your paper mask now is now [choice].") + to_chat(user, span_notice("Your paper mask now is now [choice].")) return 1 /obj/item/clothing/mask/emotions @@ -411,7 +411,7 @@ icon_state = options[choice] user.update_inv_wear_mask() user.update_action_buttons() - to_chat(user, "Your [src] now displays a [choice] emotion.") + to_chat(user, span_notice("Your [src] now displays a [choice] emotion.")) return 1 /obj/item/clothing/mask/mouthwheat diff --git a/code/modules/clothing/masks/monitor.dm b/code/modules/clothing/masks/monitor.dm index 0d577443be..9e25521dd9 100644 --- a/code/modules/clothing/masks/monitor.dm +++ b/code/modules/clothing/masks/monitor.dm @@ -27,7 +27,7 @@ if(robohead.monitor_styles) monitor_states = params2list(robohead.monitor_styles) icon_state = monitor_states[monitor_state_index] - to_chat(H, "\The [src] connects to your display output.") + to_chat(H, span_notice("\The [src] connects to your display output.")) /obj/item/clothing/mask/monitor/dropped() canremove = TRUE @@ -41,7 +41,7 @@ var/datum/robolimb/robohead = all_robolimbs[E.model] if(istype(E) && (E.robotic >= ORGAN_ROBOT) && robohead.monitor_styles) return 1 - to_chat(user, "You must have a compatible robotic head to install this upgrade.") + to_chat(user, span_warning("You must have a compatible robotic head to install this upgrade.")) return 0 /obj/item/clothing/mask/monitor/verb/set_monitor_state() @@ -54,7 +54,7 @@ if(!istype(H) || H != usr) return if(H.wear_mask != src) - to_chat(usr, "You have not installed \the [src] yet.") + to_chat(usr, span_warning("You have not installed \the [src] yet.")) return var/choice = tgui_input_list(usr, "Select a screen icon:", "Head Monitor Choice", monitor_states) if(choice) @@ -66,4 +66,4 @@ monitor_state_index = initial(monitor_state_index) icon_state = monitor_states[monitor_state_index] var/mob/living/carbon/human/H = loc - if(istype(H)) H.update_inv_wear_mask() \ No newline at end of file + if(istype(H)) H.update_inv_wear_mask() diff --git a/code/modules/clothing/masks/tesh_synth_facemask.dm b/code/modules/clothing/masks/tesh_synth_facemask.dm index a321eb9dca..e63002f3cc 100644 --- a/code/modules/clothing/masks/tesh_synth_facemask.dm +++ b/code/modules/clothing/masks/tesh_synth_facemask.dm @@ -38,7 +38,7 @@ var/obj/item/organ/external/E = user.organs_by_name[BP_HEAD] if(istype(E) && (E.robotic >= ORGAN_ROBOT)) return 1 - to_chat(user, "You must have a compatible robotic head to install this upgrade.") + to_chat(user, span_warning("You must have a compatible robotic head to install this upgrade.")) return 0 /obj/item/clothing/mask/synthfacemask/update_icon() diff --git a/code/modules/clothing/masks/voice.dm b/code/modules/clothing/masks/voice.dm index 7d214be9c3..122bcdb1c0 100644 --- a/code/modules/clothing/masks/voice.dm +++ b/code/modules/clothing/masks/voice.dm @@ -15,7 +15,7 @@ set src in usr changer.active = !changer.active - to_chat(usr, "You [changer.active ? "enable" : "disable"] the voice-changing module in \the [src].") + to_chat(usr, span_notice("You [changer.active ? "enable" : "disable"] the voice-changing module in \the [src].")) /obj/item/clothing/mask/gas/voice/verb/Set_Voice(name as text) set category = "Object" @@ -24,14 +24,14 @@ var/voice = sanitize(name, MAX_NAME_LEN) if(!voice || !length(voice)) return changer.voice = voice - to_chat(usr, "You are now mimicking [changer.voice].") + to_chat(usr, span_notice("You are now mimicking [changer.voice].")) /obj/item/clothing/mask/gas/voice/verb/Reset_Voice() set category = "Object" set src in usr changer.voice = null - to_chat(usr, "You have reset your voice changer's mimicry feature.") + to_chat(usr, span_notice("You have reset your voice changer's mimicry feature.")) /obj/item/clothing/mask/gas/voice/New() ..() diff --git a/code/modules/clothing/rings/rings.dm b/code/modules/clothing/rings/rings.dm index f07d0ae674..34678198e7 100644 --- a/code/modules/clothing/rings/rings.dm +++ b/code/modules/clothing/rings/rings.dm @@ -14,7 +14,7 @@ icon_state = "diamond" /obj/item/clothing/gloves/ring/engagement/attack_self(mob/user) - user.visible_message("\The [user] gets down on one knee, presenting \the [src].","You get down on one knee, presenting \the [src].") + user.visible_message(span_warning("\The [user] gets down on one knee, presenting \the [src]."),span_warning("You get down on one knee, presenting \the [src].")) /obj/item/clothing/gloves/ring/cti name = "CTI ring" @@ -43,7 +43,7 @@ if(istype(H) && H.gloves==src) if(reagents.total_volume) - to_chat(H, "You feel a prick as you slip on \the [src].") + to_chat(H, span_danger("You feel a prick as you slip on \the [src].")) if(H.reagents) var/contained = reagents.get_reagents() var/trans = reagents.trans_to_mob(H, 15, CHEM_BLOOD) @@ -84,10 +84,10 @@ /obj/item/clothing/gloves/ring/seal/signet/attack_self(mob/user) if(nameset) - to_chat(user, "The [src] has already been claimed!") + to_chat(user, span_notice("The [src] has already been claimed!")) return - to_chat(user, "You claim the [src] as your own!") + to_chat(user, span_notice("You claim the [src] as your own!")) change_name(user) nameset = TRUE diff --git a/code/modules/clothing/shoes/leg_guards.dm b/code/modules/clothing/shoes/leg_guards.dm index 3ef213e69d..01c8e95cdd 100644 --- a/code/modules/clothing/shoes/leg_guards.dm +++ b/code/modules/clothing/shoes/leg_guards.dm @@ -14,11 +14,11 @@ if(..()) //This will only run if no other problems occured when equiping. if(H.wear_suit) if(H.wear_suit.body_parts_covered & LEGS) - to_chat(H, "You can't wear \the [src] with \the [H.wear_suit], it's in the way.") + to_chat(H, span_warning("You can't wear \the [src] with \the [H.wear_suit], it's in the way.")) return 0 for(var/obj/item/clothing/accessory/A in H.wear_suit) if(A.body_parts_covered & LEGS) - to_chat(H, "You can't wear \the [src] with \the [H.wear_suit]'s [A], it's in the way.") + to_chat(H, span_warning("You can't wear \the [src] with \the [H.wear_suit]'s [A], it's in the way.")) return 0 return 1 @@ -63,4 +63,4 @@ slowdown = SHOES_SLOWDOWN+0.5 armor = list(melee = 40, bullet = 40, laser = 60, energy = 35, bomb = 30, bio = 0, rad = 0) min_cold_protection_temperature = T0C - 20 - cold_protection = LEGS \ No newline at end of file + cold_protection = LEGS diff --git a/code/modules/clothing/shoes/miscellaneous_vr.dm b/code/modules/clothing/shoes/miscellaneous_vr.dm index b2f714f5d8..1485517ff9 100644 --- a/code/modules/clothing/shoes/miscellaneous_vr.dm +++ b/code/modules/clothing/shoes/miscellaneous_vr.dm @@ -31,13 +31,13 @@ return // User is already being thrown if(recharging_time > world.time) - to_chat(user, "The boot's internal propulsion needs to recharge still!") + to_chat(user, span_warning("The boot's internal propulsion needs to recharge still!")) return var/atom/target = get_edge_target_turf(user, user.dir) //gets the user's direction playsound(src, 'sound/effects/stealthoff.ogg', 50, 1, 1) - user.visible_message("[user] dashes forward into the air!") + user.visible_message(span_warning("[user] dashes forward into the air!")) user.throw_at(target, jumpdistance, jumpspeed) recharging_time = world.time + recharging_rate diff --git a/code/modules/clothing/spacesuits/breaches.dm b/code/modules/clothing/spacesuits/breaches.dm index b993600383..836b297ea4 100644 --- a/code/modules/clothing/spacesuits/breaches.dm +++ b/code/modules/clothing/spacesuits/breaches.dm @@ -190,7 +190,7 @@ var/global/list/breach_burn_descriptors = list( return if(istype(src.loc,/mob/living)) - to_chat(user, "How do you intend to patch a hardsuit while someone is wearing it?") + to_chat(user, span_warning("How do you intend to patch a hardsuit while someone is wearing it?")) return if(!damage || !burn_damage) diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm index ef7e18b2fa..a031ba5e34 100644 --- a/code/modules/clothing/spacesuits/rig/modules/combat.dm +++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm @@ -51,7 +51,7 @@ return 0 if(accepted_item.charges >= 5) - to_chat(user, "Another grenade of that type will not fit into the module.") + to_chat(user, span_danger("Another grenade of that type will not fit into the module.")) return 0 to_chat(user, span_blue("You slot \the [input_device] into the suit module.")) @@ -71,7 +71,7 @@ var/mob/living/carbon/human/H = holder.wearer if(!charge_selected) - to_chat(H, "You have not selected a grenade type.") + to_chat(H, span_danger("You have not selected a grenade type.")) return 0 var/datum/rig_charge/charge = charges[charge_selected] @@ -80,12 +80,12 @@ return 0 if(charge.charges <= 0) - to_chat(H, "Insufficient grenades!") + to_chat(H, span_danger("Insufficient grenades!")) return 0 charge.charges-- var/obj/item/grenade/new_grenade = new charge.product_type(get_turf(H)) - H.visible_message("[H] launches \a [new_grenade]!") + H.visible_message(span_danger("[H] launches \a [new_grenade]!")) new_grenade.activate(H) new_grenade.throw_at(target,fire_force,fire_distance) @@ -199,7 +199,7 @@ var/mob/living/M = holder.wearer if(M.l_hand && M.r_hand) - to_chat(M, "Your hands are full.") + to_chat(M, span_danger("Your hands are full.")) deactivate() return @@ -248,11 +248,11 @@ if(target) var/obj/item/firing = new fabrication_type() firing.forceMove(get_turf(src)) - H.visible_message("[H] launches \a [firing]!") + H.visible_message(span_danger("[H] launches \a [firing]!")) firing.throw_at(target,fire_force,fire_distance) else if(H.l_hand && H.r_hand) - to_chat(H, "Your hands are full.") + to_chat(H, span_danger("Your hands are full.")) else var/obj/item/new_weapon = new fabrication_type() new_weapon.forceMove(H) diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index 72051ddb1e..77639a35f4 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -163,9 +163,9 @@ if(istype(ai_card, /obj/item/aicard)) if(integrated_ai && !integrated_ai.stat) if(user) - to_chat(user, "You cannot eject your currently stored AI. Purge it manually.") + to_chat(user, span_danger("You cannot eject your currently stored AI. Purge it manually.")) return 0 - to_chat(user, "You purge the previous AI from your Integrated Intelligence System, freeing it for use.") + to_chat(user, span_danger("You purge the previous AI from your Integrated Intelligence System, freeing it for use.")) if(integrated_ai) integrated_ai.ghostize() qdel(integrated_ai) @@ -217,9 +217,9 @@ integrated_ai = null eject_ai() else - to_chat(user, "There is no active AI within \the [ai].") + to_chat(user, span_warning("There is no active AI within \the [ai].")) else - to_chat(user, "There is no active AI within \the [ai].") + to_chat(user, span_warning("There is no active AI within \the [ai].")) update_verb_holder() return @@ -264,9 +264,9 @@ to_chat(user, span_blue"Download successful; disk erased.")) disk.stored = null else - to_chat(user, "The disk is corrupt. It is useless to you.") + to_chat(user, span_warning("The disk is corrupt. It is useless to you.")) else - to_chat(user, "The disk is blank. It is useless to you.") + to_chat(user, span_warning("The disk is blank. It is useless to you.")) return 1 // I fucking hate R&D code. This typecheck spam would be totally unnecessary in a sane setup. @@ -283,13 +283,13 @@ incoming_files = input_machine.files if(!incoming_files || !incoming_files.known_tech || !incoming_files.known_tech.len) - to_chat(user, "Memory failure. There is nothing accessible stored on this terminal.") + to_chat(user, span_warning("Memory failure. There is nothing accessible stored on this terminal.")) else // Maybe consider a way to drop all your data into a target repo in the future. if(load_data(incoming_files.known_tech)) to_chat(user, span_blue("Download successful; local and remote repositories synchronized.")) else - to_chat(user, "Scan complete. There is nothing useful stored on this terminal.") + to_chat(user, span_warning("Scan complete. There is nothing useful stored on this terminal.")) return 1 return 0 diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm index 8603df4564..128cc19a54 100644 --- a/code/modules/clothing/spacesuits/rig/modules/modules.dm +++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm @@ -149,27 +149,27 @@ /obj/item/rig_module/proc/engage() if(damage >= 2) - to_chat(usr, "The [interface_name] is damaged beyond use!") + to_chat(usr, span_warning("The [interface_name] is damaged beyond use!")) return 0 if(world.time < next_use) - to_chat(usr, "You cannot use the [interface_name] again so soon.") + to_chat(usr, span_warning("You cannot use the [interface_name] again so soon.")) return 0 if(!holder || holder.canremove) - to_chat(usr, "The suit is not initialized.") + to_chat(usr, span_warning("The suit is not initialized.")) return 0 if(usr.lying || usr.stat || usr.stunned || usr.paralysis || usr.weakened) - to_chat(usr, "You cannot use the suit in this state.") + to_chat(usr, span_warning("You cannot use the suit in this state.")) return 0 if(holder.wearer && holder.wearer.lying) - to_chat(usr, "The suit cannot function while the wearer is prone.") + to_chat(usr, span_warning("The suit cannot function while the wearer is prone.")) return 0 if(holder.security_check_enabled && !holder.check_suit_access(usr)) - to_chat(usr, "Access denied.") + to_chat(usr, span_danger("Access denied.")) return 0 if(!holder.check_power_cost(usr, use_power_cost, 0, src, (istype(usr,/mob/living/silicon ? 1 : 0) ) ) ) diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm index 4db0027c80..5c88aefc8c 100644 --- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm +++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm @@ -51,7 +51,7 @@ var/mob/living/carbon/human/H = holder.wearer - to_chat(H, "You are now visible.") + to_chat(H, span_danger("You are now visible.")) anim(get_turf(H), H,'icons/mob/mob.dmi',,"uncloak",,H.dir) anim(get_turf(H), H, 'icons/effects/effects.dmi', "electricity",null,20,null) @@ -100,7 +100,7 @@ var/mob/living/carbon/human/H = holder.wearer if(!istype(H.loc, /turf)) - to_chat(H, "You cannot teleport out of your current location.") + to_chat(H, span_warning("You cannot teleport out of your current location.")) return 0 var/turf/T @@ -110,23 +110,23 @@ T = get_teleport_loc(get_turf(H), H, 6, 1, 1, 1) if(!T) - to_chat(H, "No valid teleport target found.") + to_chat(H, span_warning("No valid teleport target found.")) return 0 if(T.density) - to_chat(H, "You cannot teleport into solid walls.") + to_chat(H, span_warning("You cannot teleport into solid walls.")) return 0 if(T.z in using_map.admin_levels) - to_chat(H, "You cannot use your teleporter on this Z-level.") + to_chat(H, span_warning("You cannot use your teleporter on this Z-level.")) return 0 if(T.contains_dense_objects()) - to_chat(H, "You cannot teleport to a location with solid objects.") + to_chat(H, span_warning("You cannot teleport to a location with solid objects.")) return 0 if(T.z != H.z || get_dist(T, get_turf(H)) > world.view) - to_chat(H, "You cannot teleport to such a distant object.") + to_chat(H, span_warning("You cannot teleport to such a distant object.")) return 0 if(!..()) return 0 diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/ai_container.dm b/code/modules/clothing/spacesuits/rig/modules/specific/ai_container.dm index 822d8245c8..e8fb600238 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/ai_container.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/ai_container.dm @@ -155,9 +155,9 @@ if(istype(ai_card, /obj/item/aicard)) if(integrated_ai && !integrated_ai.stat) if(user) - to_chat(user, "You cannot eject your currently stored AI. Purge it manually.") + to_chat(user, span_danger("You cannot eject your currently stored AI. Purge it manually.")) return 0 - to_chat(user, "You purge the previous AI from your Integrated Intelligence System, freeing it for use.") + to_chat(user, span_danger("You purge the previous AI from your Integrated Intelligence System, freeing it for use.")) if(integrated_ai) integrated_ai.ghostize() qdel(integrated_ai) @@ -209,8 +209,8 @@ integrated_ai = null eject_ai() else - to_chat(user, "There is no active AI within \the [ai].") + to_chat(user, span_warning("There is no active AI within \the [ai].")) else - to_chat(user, "There is no active AI within \the [ai].") + to_chat(user, span_warning("There is no active AI within \the [ai].")) update_verb_holder() return diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm b/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm index 7e1d40858b..4018b5cb53 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm @@ -73,7 +73,7 @@ if(total_transferred) to_chat(user, span_blue("You transfer [total_transferred] units into the suit reservoir.")) else - to_chat(user, "None of the reagents seem suitable.") + to_chat(user, span_danger("None of the reagents seem suitable.")) return 1 /obj/item/rig_module/chem_dispenser/engage(atom/target) @@ -84,7 +84,7 @@ var/mob/living/carbon/human/H = holder.wearer if(!charge_selected) - to_chat(H, "You have not selected a chemical type.") + to_chat(H, span_danger("You have not selected a chemical type.")) return 0 var/datum/rig_charge/charge = charges[charge_selected] @@ -94,7 +94,7 @@ var/chems_to_use = 10 if(charge.charges <= 0) - to_chat(H, "Insufficient chems!") + to_chat(H, span_danger("Insufficient chems!")) return 0 else if(charge.charges < chems_to_use) chems_to_use = charge.charges @@ -109,8 +109,8 @@ target_mob = H if(target_mob != H) - to_chat(H, "You inject [target_mob] with [chems_to_use] unit\s of [charge.display_name].") - to_chat(target_mob, "You feel a rushing in your veins as [chems_to_use] unit\s of [charge.display_name] [chems_to_use == 1 ? "is" : "are"] injected.") + to_chat(H, span_danger("You inject [target_mob] with [chems_to_use] unit\s of [charge.display_name].")) + to_chat(target_mob, span_danger("You feel a rushing in your veins as [chems_to_use] unit\s of [charge.display_name] [chems_to_use == 1 ? "is" : "are"] injected.")) target_mob.reagents.add_reagent(charge.display_name, chems_to_use) charge.charges -= chems_to_use diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/cleaner_launcher.dm b/code/modules/clothing/spacesuits/rig/modules/specific/cleaner_launcher.dm index 323cd75694..33e119ccaf 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/cleaner_launcher.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/cleaner_launcher.dm @@ -31,7 +31,7 @@ return 0 if(accepted_item.charges >= 5) - to_chat(user, "Another grenade of that type will not fit into the module.") + to_chat(user, span_danger("Another grenade of that type will not fit into the module.")) return 0 to_chat(user, span_blue("You slot \the [input_device] into the suit module.")) @@ -51,7 +51,7 @@ var/mob/living/carbon/human/H = holder.wearer if(!charge_selected) - to_chat(H, "You have not selected a grenade type.") + to_chat(H, span_danger("You have not selected a grenade type.")) return 0 var/datum/rig_charge/charge = charges[charge_selected] @@ -60,11 +60,11 @@ return 0 if(charge.charges <= 0) - to_chat(H, "Insufficient grenades!") + to_chat(H, span_danger("Insufficient grenades!")) return 0 charge.charges-- var/obj/item/grenade/new_grenade = new charge.product_type(get_turf(H)) - H.visible_message("[H] launches \a [new_grenade]!") + H.visible_message(span_danger("[H] launches \a [new_grenade]!")) new_grenade.activate(H) new_grenade.throw_at(target,fire_force,fire_distance) diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/cloak.dm b/code/modules/clothing/spacesuits/rig/modules/specific/cloak.dm index 2d27dd2ddb..8e10a86d81 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/cloak.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/cloak.dm @@ -43,7 +43,7 @@ var/mob/living/carbon/human/H = holder.wearer - to_chat(H, "You are now visible.") + to_chat(H, span_danger("You are now visible.")) anim(get_turf(H), H,'icons/mob/mob.dmi',,"uncloak",,H.dir) anim(get_turf(H), H, 'icons/effects/effects.dmi', "electricity",null,20,null) diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/crusher_gauntlets.dm b/code/modules/clothing/spacesuits/rig/modules/specific/crusher_gauntlets.dm index a4f2c86c7e..3ef1987ce1 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/crusher_gauntlets.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/crusher_gauntlets.dm @@ -28,20 +28,20 @@ var/datum/gender/TU = gender_datums[M.get_visible_gender()] if(M.l_hand && M.r_hand) - to_chat(M, "Your hands are full.") + to_chat(M, span_danger("Your hands are full.")) deactivate() return if(M.a_intent == I_HURT) M.visible_message( - "[M] throws [TU.his] arms out, extending [stored_gauntlets] from \the [holder] with a click!", - "You throw your arms out, extending [stored_gauntlets] from \the [holder] with a click!", - "You hear a threatening hiss and a click." + span_danger("[M] throws [TU.his] arms out, extending [stored_gauntlets] from \the [holder] with a click!"), + span_danger("You throw your arms out, extending [stored_gauntlets] from \the [holder] with a click!"), + span_notice("You hear a threatening hiss and a click.") ) else M.visible_message( - "[M] extends [stored_gauntlets] from \the [holder] with a click!", - "You extend [stored_gauntlets] from \the [holder] with a click!", - "You hear a hiss and a click.") + span_notice("[M] extends [stored_gauntlets] from \the [holder] with a click!"), + span_notice("You extend [stored_gauntlets] from \the [holder] with a click!"), + span_notice("You hear a hiss and a click.")) playsound(src, 'sound/items/helmetdeploy.ogg', 40, 1) M.put_in_hands(stored_gauntlets) @@ -52,4 +52,4 @@ if(!M) return for(var/obj/item/kinetic_crusher/machete/gauntlets/gaming in M.contents) - M.drop_from_inventory(gaming, src) \ No newline at end of file + M.drop_from_inventory(gaming, src) diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/datajack.dm b/code/modules/clothing/spacesuits/rig/modules/specific/datajack.dm index f9a7396db1..08b2e0ae10 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/datajack.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/datajack.dm @@ -39,9 +39,9 @@ to_chat(user, span_blue("Download successful; disk erased.")) disk.stored = null else - to_chat(user, "The disk is corrupt. It is useless to you.") + to_chat(user, span_warning("The disk is corrupt. It is useless to you.")) else - to_chat(user, "The disk is blank. It is useless to you.") + to_chat(user, span_warning("The disk is blank. It is useless to you.")) return 1 // I fucking hate R&D code. This typecheck spam would be totally unnecessary in a sane setup. Sanity? This is BYOND. @@ -54,13 +54,13 @@ incoming_files = input_device:files if(!incoming_files || !incoming_files.known_tech || !incoming_files.known_tech.len) - to_chat(user, "Memory failure. There is nothing accessible stored on this terminal.") + to_chat(user, span_warning("Memory failure. There is nothing accessible stored on this terminal.")) else // Maybe consider a way to drop all your data into a target repo in the future. if(load_data(incoming_files.known_tech)) to_chat(user, span_blue("Download successful; local and remote repositories synchronized.")) else - to_chat(user, "Scan complete. There is nothing useful stored on this terminal.") + to_chat(user, span_warning("Scan complete. There is nothing useful stored on this terminal.")) return 1 return 0 diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/device.dm b/code/modules/clothing/spacesuits/rig/modules/specific/device.dm index 8df730c90d..037ba31d4f 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/device.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/device.dm @@ -169,8 +169,8 @@ if(!target) if(device == iastamp) device = deniedstamp - to_chat(holder.wearer, "Switched to denied stamp.") + to_chat(holder.wearer, span_notice("Switched to denied stamp.")) else if(device == deniedstamp) device = iastamp - to_chat(holder.wearer, "Switched to internal affairs stamp.") + to_chat(holder.wearer, span_notice("Switched to internal affairs stamp.")) return 1 diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/grenade_launcher.dm b/code/modules/clothing/spacesuits/rig/modules/specific/grenade_launcher.dm index 125daba54f..1f0916487f 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/grenade_launcher.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/grenade_launcher.dm @@ -33,7 +33,7 @@ return 0 if(accepted_item.charges >= 5) - to_chat(user, "Another grenade of that type will not fit into the module.") + to_chat(user, span_danger("Another grenade of that type will not fit into the module.")) return 0 to_chat(user, span_blue("You slot \the [input_device] into the suit module.")) @@ -53,7 +53,7 @@ var/mob/living/carbon/human/H = holder.wearer if(!charge_selected) - to_chat(H, "You have not selected a grenade type.") + to_chat(H, span_danger("You have not selected a grenade type.")) return 0 var/datum/rig_charge/charge = charges[charge_selected] @@ -62,12 +62,12 @@ return 0 if(charge.charges <= 0) - to_chat(H, "Insufficient grenades!") + to_chat(H, span_danger("Insufficient grenades!")) return 0 charge.charges-- var/obj/item/grenade/new_grenade = new charge.product_type(get_turf(H)) - H.visible_message("[H] launches \a [new_grenade]!") + H.visible_message(span_danger("[H] launches \a [new_grenade]!")) new_grenade.activate(H) new_grenade.throw_at(target,fire_force,fire_distance) diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/inhand_fabricator.dm b/code/modules/clothing/spacesuits/rig/modules/specific/inhand_fabricator.dm index f3db446f54..90b96a1283 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/inhand_fabricator.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/inhand_fabricator.dm @@ -26,11 +26,11 @@ if(target) var/obj/item/firing = new fabrication_type() firing.forceMove(get_turf(src)) - H.visible_message("[H] launches \a [firing]!") + H.visible_message(span_danger("[H] launches \a [firing]!")) firing.throw_at(target,fire_force,fire_distance) else if(H.l_hand && H.r_hand) - to_chat(H, "Your hands are full.") + to_chat(H, span_danger("Your hands are full.")) else var/obj/item/new_weapon = new fabrication_type() new_weapon.forceMove(H) diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun.dm b/code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun.dm index 7ac3561c91..15acf1c9ec 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/mounted_gun.dm @@ -95,7 +95,7 @@ var/mob/living/M = holder.wearer if(M.l_hand && M.r_hand) - to_chat(M, "Your hands are full.") + to_chat(M, span_danger("Your hands are full.")) deactivate() return @@ -153,7 +153,7 @@ var/mob/living/M = holder.wearer if(M.l_hand && M.r_hand) - to_chat(M, "Your hands are full.") + to_chat(M, span_danger("Your hands are full.")) deactivate() return diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/passive_protection.dm b/code/modules/clothing/spacesuits/rig/modules/specific/passive_protection.dm index 27eb5f9b79..87c3de0576 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/passive_protection.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/passive_protection.dm @@ -57,7 +57,7 @@ var/obj/item/clothing/head/helmet/space/rig/helmet = holder.helmet var/obj/item/clothing/gloves/gauntlets/rig/gloves = holder.gloves - to_chat(H, "You deactivate your suit's powered radiation shielding.") + to_chat(H, span_danger("You deactivate your suit's powered radiation shielding.")) if(boots) boots.armor["rad"] = stored_rad_armor @@ -145,7 +145,7 @@ var/obj/item/clothing/head/helmet/space/rig/helmet = holder.helmet var/obj/item/clothing/gloves/gauntlets/rig/gloves = holder.gloves - to_chat(H, "You deactivate your suit's powered atmospheric shielding.") + to_chat(H, span_danger("You deactivate your suit's powered atmospheric shielding.")) if(boots) boots.max_pressure_protection = stored_max_pressure diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/pat_module_vr.dm b/code/modules/clothing/spacesuits/rig/modules/specific/pat_module_vr.dm index ba8fb9489f..1a329054a2 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/pat_module_vr.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/pat_module_vr.dm @@ -37,7 +37,7 @@ return 0 var/mob/living/carbon/human/H = holder.wearer - to_chat(H,"You activate the P.A.T. module.") + to_chat(H,span_notice("You activate the P.A.T. module.")) H.AddComponent(/datum/component/recursive_move) RegisterSignal(H, COMSIG_OBSERVER_MOVED, /obj/item/rig_module/pat_module/proc/boop) @@ -46,7 +46,7 @@ return 0 var/mob/living/carbon/human/H = holder.wearer - to_chat(H,"Your disable the P.A.T. module.") + to_chat(H,span_notice("Your disable the P.A.T. module.")) UnregisterSignal(H, COMSIG_OBSERVER_MOVED) /obj/item/rig_module/pat_module/proc/boop(var/mob/living/carbon/human/user,var/turf/To,var/turf/Tn) @@ -75,10 +75,10 @@ //Okay, we either found an airlock or we're about to give up. if(!A || !A.density || !A.can_open() || !..()) - to_chat(H,"Unable to comply! Energy too low, or not facing a working airlock!") + to_chat(H,span_warning("Unable to comply! Energy too low, or not facing a working airlock!")) return 0 - H.visible_message("[H] begins overriding the airlock!","You begin overriding the airlock!") + H.visible_message(span_warning("[H] begins overriding the airlock!"),span_notice("You begin overriding the airlock!")) if(do_after(H,6 SECONDS,A) && A.density) A.open() diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/rescue_pharm_vr.dm b/code/modules/clothing/spacesuits/rig/modules/specific/rescue_pharm_vr.dm index d3c840a12f..0b54dd879b 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/rescue_pharm_vr.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/rescue_pharm_vr.dm @@ -49,7 +49,7 @@ var/mob/living/carbon/human/H = holder.wearer if(!charge_selected) - to_chat(H,"You have not selected a chemical type.") + to_chat(H,span_danger("You have not selected a chemical type.")) return 0 var/datum/rig_charge/charge = charges[charge_selected] @@ -58,7 +58,7 @@ return 0 if(charge.charges <= 0) - to_chat(H,"Insufficient chems!") + to_chat(H,span_danger("Insufficient chems!")) return 0 else if(charge.charges < chems_to_use) @@ -70,8 +70,8 @@ else return 0 - to_chat(H,"You inject [target_mob == H ? "yourself" : target_mob] with [chems_to_use] unit\s of [charge.short_name].") - to_chat(target_mob,"You feel a rushing in your veins as you're injected by \the [src].") + to_chat(H,span_notice("You inject [target_mob == H ? "yourself" : target_mob] with [chems_to_use] unit\s of [charge.short_name].")) + to_chat(target_mob,span_notice("You feel a rushing in your veins as you're injected by \the [src].")) target_mob.reagents.add_reagent(charge.display_name, chems_to_use) charge.charges -= chems_to_use diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/sprinter.dm b/code/modules/clothing/spacesuits/rig/modules/specific/sprinter.dm index 2df47f575f..6fb036e186 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/sprinter.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/sprinter.dm @@ -38,6 +38,6 @@ var/mob/living/carbon/human/H = holder.wearer - to_chat(H, "Your hardsuit returns to normal speed.") + to_chat(H, span_danger("Your hardsuit returns to normal speed.")) holder.slowdown = initial(holder.slowdown) diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/teleporter.dm b/code/modules/clothing/spacesuits/rig/modules/specific/teleporter.dm index d1884b5366..373f525b3f 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/teleporter.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/teleporter.dm @@ -36,7 +36,7 @@ var/mob/living/carbon/human/H = holder.wearer if(!istype(H.loc, /turf)) - to_chat(H, "You cannot teleport out of your current location.") + to_chat(H, span_warning("You cannot teleport out of your current location.")) return 0 var/turf/T @@ -46,23 +46,23 @@ T = get_teleport_loc(get_turf(H), H, 6, 1, 1, 1) if(!T) - to_chat(H, "No valid teleport target found.") + to_chat(H, span_warning("No valid teleport target found.")) return 0 if(T.density) - to_chat(H, "You cannot teleport into solid walls.") + to_chat(H, span_warning("You cannot teleport into solid walls.")) return 0 if(T.z in using_map.admin_levels) - to_chat(H, "You cannot use your teleporter on this Z-level.") + to_chat(H, span_warning("You cannot use your teleporter on this Z-level.")) return 0 if(T.contains_dense_objects()) - to_chat(H, "You cannot teleport to a location with solid objects.") + to_chat(H, span_warning("You cannot teleport to a location with solid objects.")) return 0 if(T.z != H.z || get_dist(T, get_turf(H)) > world.view) - to_chat(H, "You cannot teleport to such a distant object.") + to_chat(H, span_warning("You cannot teleport to such a distant object.")) return 0 if(!..()) return 0 @@ -77,4 +77,4 @@ G.affecting.forceMove(locate(T.x+rand(-1,1),T.y+rand(-1,1),T.z)) phase_in(G.affecting,get_turf(G.affecting)) - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index 7dde2fd816..4ea1c598f7 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -203,7 +203,7 @@ if(total_transferred) to_chat(user, span_blue("You transfer [total_transferred] units into the suit reservoir.")) else - to_chat(user, "None of the reagents seem suitable.") + to_chat(user, span_danger("None of the reagents seem suitable.")) return 1 /obj/item/rig_module/chem_dispenser/engage(atom/target) @@ -214,7 +214,7 @@ var/mob/living/carbon/human/H = holder.wearer if(!charge_selected) - to_chat(H, "You have not selected a chemical type.") + to_chat(H, span_danger("You have not selected a chemical type.")) return 0 var/datum/rig_charge/charge = charges[charge_selected] @@ -224,7 +224,7 @@ var/chems_to_use = 10 if(charge.charges <= 0) - to_chat(H, "Insufficient chems!") + to_chat(H, span_danger("Insufficient chems!")) return 0 else if(charge.charges < chems_to_use) chems_to_use = charge.charges @@ -239,8 +239,8 @@ target_mob = H if(target_mob != H) - to_chat(H, "You inject [target_mob] with [chems_to_use] unit\s of [charge.display_name].") - to_chat(target_mob, "You feel a rushing in your veins as [chems_to_use] unit\s of [charge.display_name] [chems_to_use == 1 ? "is" : "are"] injected.") + to_chat(H, span_danger("You inject [target_mob] with [chems_to_use] unit\s of [charge.display_name].")) + to_chat(target_mob, span_danger("You feel a rushing in your veins as [chems_to_use] unit\s of [charge.display_name] [chems_to_use == 1 ? "is" : "are"] injected.")) target_mob.reagents.add_reagent(charge.display_name, chems_to_use) charge.charges -= chems_to_use @@ -448,7 +448,7 @@ var/mob/living/M = holder.wearer if(M.l_hand && M.r_hand) - to_chat(M, "Your hands are full.") + to_chat(M, span_danger("Your hands are full.")) deactivate() return @@ -505,7 +505,7 @@ return 0 if(accepted_item.charges >= 5) - to_chat(user, "Another grenade of that type will not fit into the module.") + to_chat(user, span_danger("Another grenade of that type will not fit into the module.")) return 0 to_chat(user, span_blue("You slot \the [input_device] into the suit module.")) @@ -525,7 +525,7 @@ var/mob/living/carbon/human/H = holder.wearer if(!charge_selected) - to_chat(H, "You have not selected a grenade type.") + to_chat(H, span_danger("You have not selected a grenade type.")) return 0 var/datum/rig_charge/charge = charges[charge_selected] @@ -534,12 +534,12 @@ return 0 if(charge.charges <= 0) - to_chat(H, "Insufficient grenades!") + to_chat(H, span_danger("Insufficient grenades!")) return 0 charge.charges-- var/obj/item/grenade/new_grenade = new charge.product_type(get_turf(H)) - H.visible_message("[H] launches \a [new_grenade]!") + H.visible_message(span_danger("[H] launches \a [new_grenade]!")) new_grenade.activate(H) new_grenade.throw_at(target,fire_force,fire_distance) @@ -597,10 +597,10 @@ if(!target) if(device == iastamp) device = deniedstamp - to_chat(holder.wearer, "Switched to denied stamp.") + to_chat(holder.wearer, span_notice("Switched to denied stamp.")) else if(device == deniedstamp) device = iastamp - to_chat(holder.wearer, "Switched to internal affairs stamp.") + to_chat(holder.wearer, span_notice("Switched to internal affairs stamp.")) return 1 /obj/item/rig_module/sprinter @@ -643,6 +643,6 @@ var/mob/living/carbon/human/H = holder.wearer - to_chat(H, "Your hardsuit returns to normal speed.") + to_chat(H, span_danger("Your hardsuit returns to normal speed.")) holder.slowdown = initial(holder.slowdown) diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index e7613d87a2..b98409fef6 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -188,7 +188,7 @@ if(src.loc == usr) . += "The access panel is [locked? "locked" : "unlocked"]." . += "The maintenance panel is [open ? "open" : "closed"]." - . += "Hardsuit systems are [offline ? "offline" : "online"]." + . += "Hardsuit systems are [offline ? span_warning("offline") : span_notice("online")]." . += "The cooling system is [cooling_on ? "active" : "inactive"]." if(open) @@ -294,17 +294,17 @@ sealing = 1 if(!seal_target && !suit_is_deployed()) - M.visible_message("[M]'s suit flashes an error light.","Your suit flashes an error light. It can't function properly without being fully deployed.") + M.visible_message(span_danger("[M]'s suit flashes an error light."),span_danger("Your suit flashes an error light. It can't function properly without being fully deployed.")) playsound(src, 'sound/machines/rig/rigerror.ogg', 20, FALSE) failed_to_seal = 1 if(!failed_to_seal) if(!instant) - M.visible_message("[M]'s suit emits a quiet hum as it begins to adjust its seals.","With a quiet hum, the suit begins running checks and adjusting components.") + M.visible_message(span_notice("[M]'s suit emits a quiet hum as it begins to adjust its seals."),span_notice("With a quiet hum, the suit begins running checks and adjusting components.")) if(seal_delay && !do_after(M,seal_delay)) if(M) - to_chat(M, "You must remain still while the suit is adjusting the components.") + to_chat(M, span_warning("You must remain still while the suit is adjusting the components.")) playsound(src, 'sound/machines/rig/rigerror.ogg', 20, FALSE) failed_to_seal = 1 if(!M) @@ -322,7 +322,7 @@ if(!istype(M) || !istype(piece) || !istype(compare_piece) || !msg_type) if(M) - to_chat(M, "You must remain still while the suit is adjusting the components.") + to_chat(M, span_warning("You must remain still while the suit is adjusting the components.")) failed_to_seal = 1 break @@ -334,16 +334,16 @@ piece.icon_state = "[suit_state][!seal_target ? "_sealed" : ""]" switch(msg_type) if("boots") - to_chat(M, "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"].") + to_chat(M, span_notice("\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"].")) M.update_inv_shoes() if("gloves") - to_chat(M, "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"].") + to_chat(M, span_notice("\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"].")) M.update_inv_gloves() if("chest") - to_chat(M, "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"].") + to_chat(M, span_notice("\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"].")) M.update_inv_wear_suit() if("helmet") - to_chat(M, "\The [piece] hisses [!seal_target ? "closed" : "open"].") + to_chat(M, span_notice("\The [piece] hisses [!seal_target ? "closed" : "open"].")) M.update_inv_head() if(helmet?.light_system == STATIC_LIGHT) helmet.update_light(wearer) @@ -384,7 +384,7 @@ QDEL_NULL(minihud) else minihud = new (M.hud_used, src) - to_chat(M, "Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"].") + to_chat(M, span_notice("Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"].")) playsound(src, 'sound/machines/rig/rigstarted.ogg', 10, FALSE) M.client?.screen -= booting_L qdel(booting_L) @@ -420,21 +420,21 @@ if(!cell) return if(cell.charge <= 0) - to_chat(user, "\The [src] has no power!") + to_chat(user, span_notice("\The [src] has no power!")) return if(!suit_is_deployed()) - to_chat(user, "The hardsuit needs to be deployed first!") + to_chat(user, span_notice("The hardsuit needs to be deployed first!")) return cooling_on = 1 - to_chat(usr, "You switch \the [src]'s cooling system on.") + to_chat(usr, span_notice("You switch \the [src]'s cooling system on.")) /obj/item/rig/proc/turn_cooling_off(var/mob/user, var/failed) if(failed) visible_message("\The [src]'s cooling system clicks and whines as it powers down.") else - to_chat(usr, "You switch \the [src]'s cooling system off.") + to_chat(usr, span_notice("You switch \the [src]'s cooling system off.")) cooling_on = 0 /obj/item/rig/proc/get_environment_temperature() @@ -526,14 +526,14 @@ if(istype(wearer)) if(!canremove) if (offline_slowdown < 1.5) - to_chat(wearer, "Your suit beeps stridently, and suddenly goes dead.") + to_chat(wearer, span_danger("Your suit beeps stridently, and suddenly goes dead.")) else - to_chat(wearer, "Your suit beeps stridently, and suddenly you're wearing a leaden mass of metal and plastic composites instead of a powered suit.") + to_chat(wearer, span_danger("Your suit beeps stridently, and suddenly you're wearing a leaden mass of metal and plastic composites instead of a powered suit.")) playsound(src, 'sound/machines/rig/rigdown.ogg', 60, FALSE) if(offline_vision_restriction == 1) - to_chat(wearer, "The suit optics flicker and die, leaving you with restricted vision.") + to_chat(wearer, span_danger("The suit optics flicker and die, leaving you with restricted vision.")) else if(offline_vision_restriction == 2) - to_chat(wearer, "The suit optics drop out completely, drowning you in darkness.") + to_chat(wearer, span_danger("The suit optics drop out completely, drowning you in darkness.")) if(!offline) offline = 1 else @@ -573,17 +573,17 @@ if(!user_is_ai) var/mob/living/carbon/human/H = user if(istype(H) && (H.back != src && H.belt != src)) - fail_msg = "You must be wearing \the [src] to do this." + fail_msg = span_warning("You must be wearing \the [src] to do this.") else if(user.incorporeal_move) - fail_msg = "You must be solid to do this." + fail_msg = span_warning("You must be solid to do this.") if(sealing) - fail_msg = "The hardsuit is in the process of adjusting seals and cannot be activated." + fail_msg = span_warning("The hardsuit is in the process of adjusting seals and cannot be activated.") else if(!fail_msg && ((use_unconcious && user.stat > 1) || (!use_unconcious && user.stat))) - fail_msg = "You are in no fit state to do that." + fail_msg = span_warning("You are in no fit state to do that.") else if(!cell) - fail_msg = "There is no cell installed in the suit." + fail_msg = span_warning("There is no cell installed in the suit.") else if(cost && cell.charge < cost * 10) //TODO: Cellrate? - fail_msg = "Not enough stored power." + fail_msg = span_warning("Not enough stored power.") if(fail_msg) to_chat(user, fail_msg) @@ -638,12 +638,12 @@ return 0 else if(!src.allowed(user)) if(do_message) - to_chat(user, "Unauthorized user. Access denied.") + to_chat(user, span_danger("Unauthorized user. Access denied.")) return 0 else if(!ai_override_enabled) if(do_message) - to_chat(user, "Synthetic access disabled. Please consult hardware provider.") + to_chat(user, span_danger("Synthetic access disabled. Please consult hardware provider.")) return 0 return 1 @@ -658,7 +658,7 @@ ..() if(istype(M.back, /obj/item/rig) && istype(M.belt, /obj/item/rig)) - to_chat(M, "You try to put on the [src], but it won't fit.") + to_chat(M, span_notice("You try to put on the [src], but it won't fit.")) if(M && (M.back == src || M.belt == src)) if(!M.unEquip(src)) return @@ -666,7 +666,7 @@ return if(seal_delay > 0 && istype(M) && (M.back == src || M.belt == src)) - M.visible_message("[M] starts putting on \the [src]...", "You start putting on \the [src]...") + M.visible_message(span_notice("[M] starts putting on \the [src]..."), span_notice("You start putting on \the [src]...")) if(!do_after(M,seal_delay)) if(M && (M.back == src || M.belt == src)) if(!M.unEquip(src)) @@ -675,7 +675,7 @@ return if(istype(M) && (M.back == src || M.belt == src)) - M.visible_message("[M] struggles into \the [src].", "You struggle into \the [src].") + M.visible_message(span_notice("[M] struggles into \the [src]."), span_notice("You struggle into \the [src].")) wearer = M wearer.wearing_rig = src update_icon() @@ -725,7 +725,7 @@ holder = use_obj.loc if(istype(holder)) if(use_obj && check_slot == use_obj) - to_chat(H, "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.") + to_chat(H, span_notice("Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.")) playsound(src, 'sound/machines/rig/rigservo.ogg', 10, FALSE) use_obj.canremove = TRUE holder.drop_from_inventory(use_obj) @@ -741,10 +741,10 @@ if(!H.equip_to_slot_if_possible(use_obj, equip_to, 0, 1)) use_obj.forceMove(src) if(check_slot) - to_chat(H, "You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.") + to_chat(H, span_danger("You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.")) return else - to_chat(H, "Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.") + to_chat(H, span_notice("Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.")) playsound(src, 'sound/machines/rig/rigservo.ogg', 10, FALSE) if(piece == "helmet" && helmet?.light_system == STATIC_LIGHT) @@ -860,17 +860,17 @@ if(wearer) if(dam_module.damage >= 2) - to_chat(wearer, "The [source] has disabled your [dam_module.interface_name]!") + to_chat(wearer, span_danger("The [source] has disabled your [dam_module.interface_name]!")) else - to_chat(wearer, "The [source] has damaged your [dam_module.interface_name]!") + to_chat(wearer, span_warning("The [source] has damaged your [dam_module.interface_name]!")) dam_module.deactivate() /obj/item/rig/proc/malfunction_check(var/mob/living/carbon/human/user) if(malfunction_delay) if(offline) - to_chat(user, "The suit is completely unresponsive.") + to_chat(user, span_danger("The suit is completely unresponsive.")) else - to_chat(user, "ERROR: Hardware fault. Rebooting interface...") + to_chat(user, span_danger("ERROR: Hardware fault. Rebooting interface...")) return 1 return 0 @@ -894,20 +894,20 @@ return 0 var/obj/item/rig_module/ai_container/module = user.loc.loc if(!istype(module) || module.damage >= 2) - to_chat(user, "Your host module is unable to interface with the suit.") + to_chat(user, span_warning("Your host module is unable to interface with the suit.")) return 0 if(offline || !cell || !cell.charge || locked_down) if(user) - to_chat(user, "Your host rig is unpowered and unresponsive.") + to_chat(user, span_warning("Your host rig is unpowered and unresponsive.")) return 0 if(!wearer || (wearer.back != src && wearer.belt != src)) if(user) - to_chat(user, "Your host rig is not being worn.") + to_chat(user, span_warning("Your host rig is not being worn.")) return 0 if(!wearer.stat && !control_overridden && !ai_override_enabled) if(user) - to_chat(user, "You are locked out of the suit servo controller.") + to_chat(user, span_warning("You are locked out of the suit servo controller.")) return 0 return 1 @@ -915,7 +915,7 @@ if(!ai_can_move_suit(user, check_user_module = 1)) return wearer.lay_down() - to_chat(user, "\The [wearer] is now [wearer.resting ? "resting" : "getting up"].") + to_chat(user, span_notice("\The [wearer] is now [wearer.resting ? "resting" : "getting up"].")) /obj/item/rig/proc/forced_move(var/direction, var/mob/user) @@ -947,7 +947,7 @@ for(var/mob/M in range(wearer, 1)) if(M.pulling == wearer) if(!M.restrained() && M.stat == 0 && M.canmove && wearer.Adjacent(M)) - to_chat(user, "Your host is restrained! They can't move!") + to_chat(user, span_notice("Your host is restrained! They can't move!")) return 0 else M.stop_pulling() diff --git a/code/modules/clothing/spacesuits/rig/rig_attackby.dm b/code/modules/clothing/spacesuits/rig/rig_attackby.dm index 2857ae5c47..e09db0ca75 100644 --- a/code/modules/clothing/spacesuits/rig/rig_attackby.dm +++ b/code/modules/clothing/spacesuits/rig/rig_attackby.dm @@ -14,16 +14,16 @@ if(W.GetID()) if(subverted) locked = 0 - to_chat(user, "It looks like the locking system has been shorted out.") + to_chat(user, span_danger("It looks like the locking system has been shorted out.")) return if(!LAZYLEN(req_access) && !LAZYLEN(req_one_access)) locked = 0 - to_chat(user, "\The [src] doesn't seem to have a locking mechanism.") + to_chat(user, span_danger("\The [src] doesn't seem to have a locking mechanism.")) return if(security_check_enabled && !src.allowed(user)) - to_chat(user, "Access denied.") + to_chat(user, span_danger("Access denied.")) return locked = !locked @@ -67,7 +67,7 @@ if(istype(src.loc,/mob/living/carbon/human)) var/mob/living/carbon/human/H = src.loc if(H.back == src || H.belt == src) - to_chat(user, "You can't install a hardsuit module while the suit is being worn.") + to_chat(user, span_danger("You can't install a hardsuit module while the suit is being worn.")) return 1 if(!installed_modules) @@ -194,5 +194,5 @@ LAZYCLEARLIST(req_one_access) locked = 0 subverted = 1 - to_chat(user, "You short out the access protocol for the suit.") + to_chat(user, span_danger("You short out the access protocol for the suit.")) return 1 diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index 5d36c194f5..056a1092ab 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -69,7 +69,7 @@ if(tacknife) tacknife.loc = get_turf(src) if(M.put_in_active_hand(tacknife)) - to_chat(M, "You slide \the [tacknife] out of [src].") + to_chat(M, span_notice("You slide \the [tacknife] out of [src].")) playsound(src, 'sound/weapons/flipblade.ogg', 40, 1) tacknife = null update_icon() @@ -83,7 +83,7 @@ M.drop_item() tacknife = I I.loc = src - to_chat(M, "You slide the [I] into [src].") + to_chat(M, span_notice("You slide the [I] into [src].")) playsound(src, 'sound/weapons/flipblade.ogg', 40, 1) update_icon() ..() diff --git a/code/modules/clothing/spacesuits/rig/rig_verbs.dm b/code/modules/clothing/spacesuits/rig/rig_verbs.dm index 44e51741a2..bbedbf082a 100644 --- a/code/modules/clothing/spacesuits/rig/rig_verbs.dm +++ b/code/modules/clothing/spacesuits/rig/rig_verbs.dm @@ -22,21 +22,21 @@ set src = usr.contents if(!istype(wearer) || (!wearer.back == src && !wearer.belt == src)) - to_chat(usr, "The hardsuit is not being worn.") + to_chat(usr, span_warning("The hardsuit is not being worn.")) return if(!check_power_cost(usr)) return if(canremove) - to_chat(usr, "The suit is not active.") + to_chat(usr, span_warning("The suit is not active.")) return if(!check_suit_access(usr)) return if(!visor) - to_chat(usr, "The hardsuit does not have a configurable visor.") + to_chat(usr, span_warning("The hardsuit does not have a configurable visor.")) return if(!visor.active) @@ -52,7 +52,7 @@ set src = usr.contents if(!istype(wearer) || (!wearer.back == src && !wearer.belt == src)) - to_chat(usr, "The hardsuit is not being worn.") + to_chat(usr, span_warning("The hardsuit is not being worn.")) return if(!check_suit_access(usr)) @@ -80,7 +80,7 @@ set src = usr.contents if(!istype(wearer) || (!wearer.back == src && !wearer.belt == src)) - to_chat(usr, "The hardsuit is not being worn.") + to_chat(usr, span_warning("The hardsuit is not being worn.")) return if(!check_suit_access(usr)) @@ -96,7 +96,7 @@ set src = usr.contents if(!istype(wearer) || (!wearer.back == src && !wearer.belt == src)) - to_chat(usr, "The hardsuit is not being worn.") + to_chat(usr, span_warning("The hardsuit is not being worn.")) return if(!check_suit_access(usr)) @@ -112,7 +112,7 @@ set src = usr.contents if(!istype(wearer) || (!wearer.back == src && !wearer.belt == src)) - to_chat(usr, "The hardsuit is not being worn.") + to_chat(usr, span_warning("The hardsuit is not being worn.")) return if(!check_suit_access(usr)) @@ -131,7 +131,7 @@ set src = usr.contents if(!istype(wearer) || (!wearer.back == src && !wearer.belt == src)) - to_chat(usr, "The hardsuit is not being worn.") + to_chat(usr, span_warning("The hardsuit is not being worn.")) return if(!check_suit_access(usr)) @@ -153,18 +153,18 @@ return if(canremove) - to_chat(usr, "The suit is not active.") + to_chat(usr, span_warning("The suit is not active.")) return if(!visor) - to_chat(usr, "The hardsuit does not have a configurable visor.") + to_chat(usr, span_warning("The hardsuit does not have a configurable visor.")) return if(!visor.active) visor.activate() if(!visor.active) - to_chat(usr, "The visor is suffering a hardware fault and cannot be configured.") + to_chat(usr, span_warning("The visor is suffering a hardware fault and cannot be configured.")) return visor.engage() @@ -180,15 +180,15 @@ return if(canremove) - to_chat(usr, "The suit is not active.") + to_chat(usr, span_warning("The suit is not active.")) return if(!istype(wearer) || (!wearer.back == src && !wearer.belt == src)) - to_chat(usr, "The hardsuit is not being worn.") + to_chat(usr, span_warning("The hardsuit is not being worn.")) return if(!speech) - to_chat(usr, "The hardsuit does not have a speech synthesiser.") + to_chat(usr, span_warning("The hardsuit does not have a speech synthesiser.")) return speech.engage() @@ -207,11 +207,11 @@ return if(canremove) - to_chat(usr, "The suit is not active.") + to_chat(usr, span_warning("The suit is not active.")) return if(!istype(wearer) || (!wearer.back == src && !wearer.belt == src)) - to_chat(usr, "The hardsuit is not being worn.") + to_chat(usr, span_warning("The hardsuit is not being worn.")) return var/list/selectable = list() @@ -243,11 +243,11 @@ return if(canremove) - to_chat(usr, "The suit is not active.") + to_chat(usr, span_warning("The suit is not active.")) return if(!istype(wearer) || (!wearer.back == src && !wearer.belt == src)) - to_chat(usr, "The hardsuit is not being worn.") + to_chat(usr, span_warning("The hardsuit is not being worn.")) return var/list/selectable = list() @@ -278,11 +278,11 @@ return if(canremove) - to_chat(usr, "The suit is not active.") + to_chat(usr, span_warning("The suit is not active.")) return if(!istype(wearer) || (!wearer.back == src && !wearer.belt == src)) - to_chat(usr, "The hardsuit is not being worn.") + to_chat(usr, span_warning("The hardsuit is not being worn.")) return if(!check_power_cost(usr, 0, 0, 0, 0)) diff --git a/code/modules/clothing/spacesuits/void/ert_vr.dm b/code/modules/clothing/spacesuits/void/ert_vr.dm index 5c3a6bd857..f165f11f82 100644 --- a/code/modules/clothing/spacesuits/void/ert_vr.dm +++ b/code/modules/clothing/spacesuits/void/ert_vr.dm @@ -74,7 +74,7 @@ return ..() if(user.get_inventory_slot(src) == slot_wear_suit) - to_chat(user, "You cannot modify \the [src] while it is being worn.") + to_chat(user, span_warning("You cannot modify \the [src] while it is being worn.")) return if(W.has_tool_quality(TOOL_SCREWDRIVER)) diff --git a/code/modules/clothing/spacesuits/void/event_vr.dm b/code/modules/clothing/spacesuits/void/event_vr.dm index 3b4fc97c6c..d9645b9488 100644 --- a/code/modules/clothing/spacesuits/void/event_vr.dm +++ b/code/modules/clothing/spacesuits/void/event_vr.dm @@ -206,7 +206,7 @@ return icon_state = "moebiushelm_[choice]" update_clothing_icon() - to_chat(usr, "[src] color changed to: [choice]") + to_chat(usr, span_notice("[src] color changed to: [choice]")) // Excelsior suit /obj/item/clothing/suit/space/void/excelsior diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 12e946aeb5..763ee110aa 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -63,11 +63,11 @@ /obj/item/clothing/suit/space/void/examine(user) . = ..() - . += to_chat(usr, "Alt-click to relase Tank/Cooling unit if installed.") + . += to_chat(usr, span_notice("Alt-click to relase Tank/Cooling unit if installed.")) for(var/obj/item/I in list(helmet,boots,tank,cooler)) . += "It has \a [I] installed." if(tank && in_range(src,user)) - . += "The wrist-mounted pressure gauge reads [max(round(tank.air_contents.return_pressure()),0)] kPa remaining in \the [tank]." + . += span_notice("The wrist-mounted pressure gauge reads [max(round(tank.air_contents.return_pressure()),0)] kPa remaining in \the [tank].") /obj/item/clothing/suit/space/void/refit_for_species(var/target_species) ..() @@ -195,7 +195,7 @@ return if(H.equip_to_slot_if_possible(helmet, slot_head)) helmet.canremove = FALSE - to_chat(H, "You deploy your suit helmet, sealing you off from the world.") + to_chat(H, span_info("You deploy your suit helmet, sealing you off from the world.")) playsound(src.loc, 'sound/machines/click2.ogg', 75, 1) /obj/item/clothing/suit/space/void/AltClick(mob/living/user) @@ -238,7 +238,7 @@ return ..() if(user.get_inventory_slot(src) == slot_wear_suit) - to_chat(user, "You cannot modify \the [src] while it is being worn.") + to_chat(user, span_warning("You cannot modify \the [src] while it is being worn.")) return if(W.has_tool_quality(TOOL_SCREWDRIVER)) diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm index 04aeaa6d7d..49d72e2222 100644 --- a/code/modules/clothing/spacesuits/void/void_vr.dm +++ b/code/modules/clothing/spacesuits/void/void_vr.dm @@ -111,7 +111,7 @@ return ..() if(user.get_inventory_slot(src) == slot_wear_suit) - to_chat(user, "You cannot modify \the [src] while it is being worn.") + to_chat(user, span_warning("You cannot modify \the [src] while it is being worn.")) return if(W.has_tool_quality(TOOL_SCREWDRIVER)) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 0f9d8d2ffe..d6847f2284 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -13,10 +13,10 @@ if(..()) //This will only run if no other problems occured when equiping. for(var/obj/item/clothing/I in list(H.gloves, H.shoes)) if(I && (src.body_parts_covered & ARMS && I.body_parts_covered & ARMS) ) - to_chat(H, "You can't wear \the [src] with \the [I], it's in the way.") + to_chat(H, span_warning("You can't wear \the [src] with \the [I], it's in the way.")) return 0 if(I && (src.body_parts_covered & LEGS && I.body_parts_covered & LEGS) ) - to_chat(H, "You can't wear \the [src] with \the [I], it's in the way.") + to_chat(H, span_warning("You can't wear \the [src] with \the [I], it's in the way.")) return 0 return 1 @@ -86,7 +86,7 @@ if(!(def_zone in list(BP_TORSO, BP_GROIN))) reflectchance /= 2 if(P.starting && prob(reflectchance)) - visible_message("\The [user]'s [src.name] reflects [attack_text]!") + visible_message(span_danger("\The [user]'s [src.name] reflects [attack_text]!")) // Find a turf near or on the original location to bounce to var/new_x = P.starting.x + pick(0, 0, 0, 0, 0, -1, 1, -2, 2) @@ -174,7 +174,7 @@ /obj/item/clothing/suit/armor/reactive/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(prob(50)) - user.visible_message("The reactive teleport system flings [user] clear of the attack!") + user.visible_message(span_danger("The reactive teleport system flings [user] clear of the attack!")) var/list/turfs = new/list() for(var/turf/T in orange(6, user)) if(istype(T,/turf/space)) continue @@ -237,7 +237,7 @@ /obj/item/clothing/suit/armor/alien/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(prob(block_chance)) - user.visible_message("\The [src] completely absorbs [attack_text]!") + user.visible_message(span_danger("\The [src] completely absorbs [attack_text]!")) return TRUE return FALSE @@ -529,13 +529,13 @@ if(H.gloves.body_parts_covered & ARMS) for(var/obj/item/clothing/accessory/A in src) if(A.body_parts_covered & ARMS) - to_chat(H, "You can't wear \the [A] with \the [H.gloves], they're in the way.") + to_chat(H, span_warning("You can't wear \the [A] with \the [H.gloves], they're in the way.")) return 0 if(H.shoes) if(H.shoes.body_parts_covered & LEGS) for(var/obj/item/clothing/accessory/A in src) if(A.body_parts_covered & LEGS) - to_chat(H, "You can't wear \the [A] with \the [H.shoes], they're in the way.") + to_chat(H, span_warning("You can't wear \the [A] with \the [H.shoes], they're in the way.")) return 0 return 1 diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index 9fed02a6ad..8d552774a4 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -24,7 +24,7 @@ if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf)) return ..() else - to_chat(H,"You need to have a wolf-taur half to wear this.") + to_chat(H,span_warning("You need to have a wolf-taur half to wear this.")) return 0 // HoS armor improved by Vorestation to be slightly better than normal security stuff. diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm index dca9507fb2..984629cee4 100644 --- a/code/modules/clothing/suits/hooded.dm +++ b/code/modules/clothing/suits/hooded.dm @@ -50,10 +50,10 @@ if(ishuman(loc)) var/mob/living/carbon/human/H = src.loc if(H.wear_suit != src) - to_chat(H, "You must be wearing [src] to put up the hood!") + to_chat(H, span_warning("You must be wearing [src] to put up the hood!")) return if(H.head) - to_chat(H, "You're already wearing something on your head!") + to_chat(H, span_warning("You're already wearing something on your head!")) return else if(color != hood.color) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 4350fba4c0..f4d2f9778e 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -306,7 +306,7 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user if(src == H.wear_suit) - to_chat(H, "You need help taking this off!") + to_chat(H, span_notice("You need help taking this off!")) return ..() @@ -953,11 +953,11 @@ if(rolled == 0) rolled = 1 body_parts_covered &= ~(ARMS) - to_chat(usr, "You roll up the sleeves of your [src].") + to_chat(usr, span_notice("You roll up the sleeves of your [src].")) else rolled = 0 body_parts_covered = initial(body_parts_covered) - to_chat(usr, "You roll down the sleeves of your [src].") + to_chat(usr, span_notice("You roll down the sleeves of your [src].")) update_icon() /obj/item/clothing/suit/storage/flannel/verb/tuck() @@ -969,10 +969,10 @@ if(tucked == 0) tucked = 1 - to_chat(usr, "You tuck in your your [src].") + to_chat(usr, span_notice("You tuck in your your [src].")) else tucked = 0 - to_chat(usr, "You untuck your [src].") + to_chat(usr, span_notice("You untuck your [src].")) update_icon() /obj/item/clothing/suit/storage/flannel/verb/button() @@ -985,11 +985,11 @@ if(buttoned == 0) buttoned = 1 flags_inv = HIDETIE|HIDEHOLSTER - to_chat(usr, "You button your [src].") + to_chat(usr, span_notice("You button your [src].")) else buttoned = 0 flags_inv = HIDEHOLSTER - to_chat(usr, "You unbutton your [src].") + to_chat(usr, span_notice("You unbutton your [src].")) update_icon() /obj/item/clothing/suit/storage/flannel/update_icon() diff --git a/code/modules/clothing/suits/miscellaneous_vr.dm b/code/modules/clothing/suits/miscellaneous_vr.dm index bdef2b3e0c..2de15c12a6 100644 --- a/code/modules/clothing/suits/miscellaneous_vr.dm +++ b/code/modules/clothing/suits/miscellaneous_vr.dm @@ -39,7 +39,7 @@ if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/drake)) return ..() else - to_chat(H, "You need to have a drake-taur half to wear this.") + to_chat(H, span_warning("You need to have a drake-taur half to wear this.")) return 0 /obj/item/clothing/suit/barding @@ -55,7 +55,7 @@ if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse)) return ..() else - to_chat(H, "You need to have a horse-taur half to wear this.") + to_chat(H, span_warning("You need to have a horse-taur half to wear this.")) return 0 //Bardings are medieval suits of armor. diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index e5edb58ef5..9039018a80 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -83,7 +83,7 @@ has_suit.add_overlay(get_inv_overlay()) if(user) - to_chat(user, "You attach \the [src] to \the [has_suit].") + to_chat(user, span_notice("You attach \the [src] to \the [has_suit].")) add_fingerprint(user) /obj/item/clothing/accessory/proc/on_removed(var/mob/user) diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index 0eee58a901..6fc3715abb 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -52,9 +52,9 @@ name = "[design] [material] [type]" desc = "A [type], made of [material]. It's rather [design]." customized = 1 - to_chat(usr,"[src] has now been customized.") + to_chat(usr,span_notice("[src] has now been customized.")) else - to_chat(usr,"[src] has already been customized!") + to_chat(usr,span_notice("[src] has already been customized!")) /obj/item/clothing/accessory/collar slot_flags = SLOT_TIE | SLOT_OCLOTHING @@ -169,11 +169,11 @@ if(href_list["tag"]) var/str = copytext(reject_bad_text(tgui_input_text(usr,"Tag text?","Set tag","",MAX_NAME_LEN)),1,MAX_NAME_LEN) if(!str || !length(str)) - to_chat(usr,"[name]'s tag set to be blank.") + to_chat(usr,span_notice("[name]'s tag set to be blank.")) name = initial(name) desc = initial(desc) else - to_chat(usr,"You set the [name]'s tag to '[str]'.") + to_chat(usr,span_notice("You set the [name]'s tag to '[str]'.")) name = initial(name) + " ([str])" desc = initial(desc) + " The tag says \"[str]\"." else @@ -215,7 +215,7 @@ M = loc if(ismob(loc.loc)) M = loc.loc // This is about as terse as I can make my solution to the whole 'collar won't work when attached as accessory' thing. - to_chat(M,"You feel a sharp shock!") + to_chat(M,span_danger("You feel a sharp shock!")) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, M) s.start() @@ -293,21 +293,21 @@ /obj/item/clothing/accessory/collar/attack_self(mob/user as mob) if(istype(src,/obj/item/clothing/accessory/collar/holo)) - to_chat(user,"[name]'s interface is projected onto your hand.") + to_chat(user,span_notice("[name]'s interface is projected onto your hand.")) else if(writtenon) - to_chat(user,"You need a pen or a screwdriver to edit the tag on this collar.") + to_chat(user,span_notice("You need a pen or a screwdriver to edit the tag on this collar.")) return - to_chat(user,"You adjust the [name]'s tag.") + to_chat(user,span_notice("You adjust the [name]'s tag.")) var/str = copytext(reject_bad_text(tgui_input_text(user,"Tag text?","Set tag","",MAX_NAME_LEN)),1,MAX_NAME_LEN) if(!str || !length(str)) - to_chat(user,"[name]'s tag set to be blank.") + to_chat(user,span_notice("[name]'s tag set to be blank.")) name = initial(name) desc = initial(desc) else - to_chat(user,"You set the [name]'s tag to '[str]'.") + to_chat(user,span_notice("You set the [name]'s tag to '[str]'.")) initialize_tag(str) /obj/item/clothing/accessory/collar/proc/initialize_tag(var/tag) @@ -331,7 +331,7 @@ update_collartag(user, I, "crossed out", "cross out", "written") return - to_chat(user,"You need a pen or a screwdriver to edit the tag on this collar.") + to_chat(user,span_notice("You need a pen or a screwdriver to edit the tag on this collar.")) /obj/item/clothing/accessory/collar/proc/update_collartag(mob/user, obj/item/I, var/erasemethod, var/erasing, var/writemethod) if(!(istype(user.get_active_hand(),I)) || !(istype(user.get_inactive_hand(),src)) || (user.stat)) @@ -341,19 +341,19 @@ if(!str || !length(str)) if(!writtenon) - to_chat(user,"You don't write anything.") + to_chat(user,span_notice("You don't write anything.")) else - to_chat(user,"You [erasing] the words with the [I].") + to_chat(user,span_notice("You [erasing] the words with the [I].")) name = initial(name) desc = initial(desc) + " The tag has had the words [erasemethod]." else if(!writtenon) - to_chat(user,"You write '[str]' on the tag with the [I].") + to_chat(user,span_notice("You write '[str]' on the tag with the [I].")) name = initial(name) + " ([str])" desc = initial(desc) + " \"[str]\" has been [writemethod] on the tag." writtenon = 1 else - to_chat(user,"You [erasing] the words on the tag with the [I], and write '[str]'.") + to_chat(user,span_notice("You [erasing] the words on the tag with the [I], and write '[str]'.")) name = initial(name) + " ([str])" desc = initial(desc) + " Something has been [erasemethod] on the tag, and it now has \"[str]\" [writemethod] on it." @@ -381,11 +381,11 @@ if(href_list["tag"]) var/str = copytext(reject_bad_text(tgui_input_text(usr,"Tag text?","Set tag","",MAX_NAME_LEN)),1,MAX_NAME_LEN) if(!str || !length(str)) - to_chat(usr,"[name]'s tag set to be blank.") + to_chat(usr,span_notice("[name]'s tag set to be blank.")) name = initial(name) desc = initial(desc) else - to_chat(usr,"You set the [name]'s tag to '[str]'.") + to_chat(usr,span_notice("You set the [name]'s tag to '[str]'.")) name = initial(name) + " ([str])" desc = initial(desc) + " The tag says \"[str]\"." else @@ -400,9 +400,9 @@ if(!size_select) return //cancelled target_size = clamp((size_select/100), RESIZE_MINIMUM_DORMS, RESIZE_MAXIMUM_DORMS) - to_chat(usr, "You set the size to [size_select]%") + to_chat(usr, span_notice("You set the size to [size_select]%")) if(target_size < RESIZE_MINIMUM || target_size > RESIZE_MAXIMUM) - to_chat(usr, "Note: Resizing limited to 25-200% automatically while outside dormatory areas.") //hint that we clamp it in resize + to_chat(usr, span_notice("Note: Resizing limited to 25-200% automatically while outside dormatory areas.")) //hint that we clamp it in resize if(!( master )) if(istype(loc, /mob)) attack_self(loc) @@ -463,7 +463,7 @@ var/mob/living/carbon/human/H = M var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread if(!H.resizable) - H.visible_message("The space around [H] compresses for a moment but then nothing happens.","The space around you distorts but nothing happens to you.") + H.visible_message(span_warning("The space around [H] compresses for a moment but then nothing happens."),span_notice("The space around you distorts but nothing happens to you.")) return if(H.size_multiplier != target_size) if(!(world.time - last_activated > 10 SECONDS)) @@ -472,18 +472,18 @@ last_activated = world.time original_size = H.size_multiplier H.resize(target_size, ignore_prefs = FALSE) //In case someone else tries to put it on you. - H.visible_message("The space around [H] distorts as they change size!","The space around you distorts as you change size!") + H.visible_message(span_warning("The space around [H] distorts as they change size!"),span_notice("The space around you distorts as you change size!")) log_admin("Admin [key_name(M)]'s size was altered by a bluespace collar.") s.set_up(3, 1, M) s.start() else if(H.size_multiplier == target_size) if(original_size == null) - H.visible_message("The space around [H] twists and turns for a moment but then nothing happens.","The space around you distorts but stay the same size.") + H.visible_message(span_warning("The space around [H] twists and turns for a moment but then nothing happens."),span_notice("The space around you distorts but stay the same size.")) return last_activated = world.time H.resize(original_size, ignore_prefs = FALSE) original_size = null - H.visible_message("The space around [H] distorts as they return to their original size!","The space around you distorts as you return to your original size!") + H.visible_message(span_warning("The space around [H] distorts as they return to their original size!"),span_notice("The space around you distorts as you return to your original size!")) log_admin("Admin [key_name(M)]'s size was altered by a bluespace collar.") to_chat(M, "\The [src] flickers. It is now recharging and will be ready again in ten seconds.") s.set_up(3, 1, M) @@ -495,7 +495,7 @@ /obj/item/clothing/accessory/collar/shock/bluespace/attackby(var/obj/item/component, mob/user as mob) if (component.has_tool_quality(TOOL_WRENCH)) - to_chat(user, "You crack the bluespace crystal [src].") + to_chat(user, span_notice("You crack the bluespace crystal [src].")) var/turf/T = get_turf(src) new /obj/item/clothing/accessory/collar/shock/bluespace/malfunctioning(T) user.drop_from_inventory(src) @@ -504,7 +504,7 @@ if (!istype(component,/obj/item/assembly/signaler)) ..() return - to_chat(user, "You wire the signaler into the [src].") + to_chat(user, span_notice("You wire the signaler into the [src].")) user.drop_item() qdel(component) var/turf/T = get_turf(src) @@ -526,7 +526,7 @@ /obj/item/clothing/accessory/collar/shock/bluespace/modified/attackby(var/obj/item/component, mob/user as mob) if (component.has_tool_quality(TOOL_WRENCH)) - to_chat(user, "You crack the bluespace crystal [src], the attached signaler disconnects.") + to_chat(user, span_notice("You crack the bluespace crystal [src], the attached signaler disconnects.")) var/turf/T = get_turf(src) new /obj/item/clothing/accessory/collar/shock/bluespace/malfunctioning(T) user.drop_from_inventory(src) @@ -535,7 +535,7 @@ if (!istype(component,/obj/item/assembly/signaler)) ..() return - to_chat(user, "There is already a signaler wired to the [src].") + to_chat(user, span_notice("There is already a signaler wired to the [src].")) return /obj/item/clothing/accessory/collar/shock/bluespace/modified/attack_self(mob/user as mob, flag1) @@ -570,11 +570,11 @@ if(href_list["tag"]) var/str = copytext(reject_bad_text(tgui_input_text(usr,"Tag text?","Set tag","",MAX_NAME_LEN)),1,MAX_NAME_LEN) if(!str || !length(str)) - to_chat(usr,"[name]'s tag set to be blank.") + to_chat(usr,span_notice("[name]'s tag set to be blank.")) name = initial(name) desc = initial(desc) else - to_chat(usr,"You set the [name]'s tag to '[str]'.") + to_chat(usr,span_notice("You set the [name]'s tag to '[str]'.")) name = initial(name) + " ([str])" desc = initial(desc) + " The tag says \"[str]\"." if(!( master )) @@ -609,10 +609,10 @@ var/mob/living/carbon/human/H = M var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread if(!H.resizable) - H.visible_message("The space around [H] compresses for a moment but then nothing happens.","The space around you distorts but nothing happens to you.") + H.visible_message(span_warning("The space around [H] compresses for a moment but then nothing happens."),span_notice("The space around you distorts but nothing happens to you.")) return if (target_size < 0.26) - H.visible_message("The collar on [H] flickers, but fizzles out.","Your collar flickers, but is not powerful enough to shrink you that small.") + H.visible_message(span_warning("The collar on [H] flickers, but fizzles out."),span_notice("Your collar flickers, but is not powerful enough to shrink you that small.")) return if(H.size_multiplier != target_size) if(!(world.time - last_activated > 10 SECONDS)) @@ -621,18 +621,18 @@ last_activated = world.time original_size = H.size_multiplier H.resize(target_size, ignore_prefs = FALSE) //In case someone else tries to put it on you. - H.visible_message("The space around [H] distorts as they change size!","The space around you distorts as you change size!") + H.visible_message(span_warning("The space around [H] distorts as they change size!"),span_notice("The space around you distorts as you change size!")) log_admin("Admin [key_name(M)]'s size was altered by a bluespace collar.") s.set_up(3, 1, M) s.start() else if(H.size_multiplier == target_size) if(original_size == null) - H.visible_message("The space around [H] twists and turns for a moment but then nothing happens.","The space around you distorts but stay the same size.") + H.visible_message(span_warning("The space around [H] twists and turns for a moment but then nothing happens."),span_notice("The space around you distorts but stay the same size.")) return last_activated = world.time H.resize(original_size, ignore_prefs = FALSE) original_size = null - H.visible_message("The space around [H] distorts as they return to their original size!","The space around you distorts as you return to your original size!") + H.visible_message(span_warning("The space around [H] distorts as they return to their original size!"),span_notice("The space around you distorts as you return to your original size!")) log_admin("Admin [key_name(M)]'s size was altered by a bluespace collar.") to_chat(M, "\The [src] flickers. It is now recharging and will be ready again in ten seconds.") s.set_up(3, 1, M) @@ -655,7 +655,7 @@ if (!istype(component,/obj/item/assembly/signaler)) ..() return - to_chat(user, "The signaler doesn't respond to the connection attempt [src].") + to_chat(user, span_notice("The signaler doesn't respond to the connection attempt [src].")) return /obj/item/clothing/accessory/collar/shock/bluespace/malfunctioning/attack_self(mob/user as mob, flag1) @@ -697,11 +697,11 @@ if(href_list["tag"]) var/str = copytext(reject_bad_text(tgui_input_text(usr,"Tag text?","Set tag","",MAX_NAME_LEN)),1,MAX_NAME_LEN) if(!str || !length(str)) - to_chat(usr,"[name]'s tag set to be blank.") + to_chat(usr,span_notice("[name]'s tag set to be blank.")) name = initial(name) desc = initial(desc) else - to_chat(usr,"You set the [name]'s tag to '[str]'.") + to_chat(usr,span_notice("You set the [name]'s tag to '[str]'.")) name = initial(name) + " ([str])" desc = initial(desc) + " The tag says \"[str]\"." else @@ -742,10 +742,10 @@ var/mob/living/carbon/human/H = M var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread if(!H.resizable) - H.visible_message("The space around [H] compresses for a moment but then nothing happens.","The space around you distorts but nothing happens to you.") + H.visible_message(span_warning("The space around [H] compresses for a moment but then nothing happens."),span_notice("The space around you distorts but nothing happens to you.")) return if (target_size < 0.25) - H.visible_message("The collar on [H] flickers, but fizzles out.","Your collar flickers, but is not powerful enough to shrink you that small.") + H.visible_message(span_warning("The collar on [H] flickers, but fizzles out."),span_notice("Your collar flickers, but is not powerful enough to shrink you that small.")) return if(currently_shrinking == 0) if(!(world.time - last_activated > 10 SECONDS)) @@ -755,19 +755,19 @@ original_size = H.size_multiplier currently_shrinking = 1 H.resize(target_size, ignore_prefs = FALSE) //In case someone else tries to put it on you. - H.visible_message("The space around [H] distorts as they change size!","The space around you distorts as you change size!") + H.visible_message(span_warning("The space around [H] distorts as they change size!"),span_notice("The space around you distorts as you change size!")) log_admin("Admin [key_name(M)]'s size was altered by a bluespace collar.") s.set_up(3, 1, M) s.start() else if(currently_shrinking == 1) if(original_size == null) - H.visible_message("The space around [H] twists and turns for a moment but then nothing happens.","The space around you distorts but stay the same size.") + H.visible_message(span_warning("The space around [H] twists and turns for a moment but then nothing happens."),span_notice("The space around you distorts but stay the same size.")) return last_activated = world.time H.resize(original_size, ignore_prefs = FALSE) original_size = null currently_shrinking = 0 - H.visible_message("The space around [H] distorts as they return to their original size!","The space around you distorts as you return to your original size!") + H.visible_message(span_warning("The space around [H] distorts as they return to their original size!"),span_notice("The space around you distorts as you return to your original size!")) log_admin("Admin [key_name(M)]'s size was altered by a bluespace collar.") to_chat(M, "\The [src] flickers. It is now recharging and will be ready again in ten seconds.") s.set_up(3, 1, M) diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index 96d6448fd2..2262cc4650 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -17,13 +17,13 @@ if((body_parts_covered & ARMS) && istype(H.gloves, /obj/item/clothing)) var/obj/item/clothing/G = H.gloves if(G.body_parts_covered & ARMS) - to_chat(H, "You can't wear \the [src] with \the [G], it's in the way.") + to_chat(H, span_warning("You can't wear \the [src] with \the [G], it's in the way.")) S.accessories -= src return else if((body_parts_covered & LEGS) && istype(H.shoes, /obj/item/clothing)) var/obj/item/clothing/Sh = H.shoes if(Sh.body_parts_covered & LEGS) - to_chat(H, "You can't wear \the [src] with \the [Sh], it's in the way.") + to_chat(H, span_warning("You can't wear \the [src] with \the [Sh], it's in the way.")) S.accessories -= src return ..() @@ -167,7 +167,7 @@ if(!(def_zone in list(BP_TORSO, BP_GROIN))) reflectchance /= 2 if(P.starting && prob(reflectchance)) - visible_message("\The [user]'s [src.name] reflects [attack_text]!") + visible_message(span_danger("\The [user]'s [src.name] reflects [attack_text]!")) var/new_x = P.starting.x + pick(0, 0, 0, 0, 0, -1, 1, -2, 2) @@ -435,4 +435,4 @@ /obj/item/clothing/accessory/armor/helmcover/saare name = "\improper SAARE helmet cover" desc = "A fabric cover for armored helmets. This one has SAARE's colors." - icon_state = "helmcover_saare" \ No newline at end of file + icon_state = "helmcover_saare" diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 4cfae8e745..3c8a6d2309 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -28,13 +28,13 @@ if(isliving(user)) if(stored_name) - user.visible_message("[user] displays their [src.name].\nIt reads: [stored_name], [badge_string].","You display your [src.name].\nIt reads: [stored_name], [badge_string].") + user.visible_message(span_notice("[user] displays their [src.name].\nIt reads: [stored_name], [badge_string]."),span_notice("You display your [src.name].\nIt reads: [stored_name], [badge_string].")) else - user.visible_message("[user] displays their [src.name].\nIt reads: [badge_string].","You display your [src.name]. It reads: [badge_string].") + user.visible_message(span_notice("[user] displays their [src.name].\nIt reads: [badge_string]."),span_notice("You display your [src.name]. It reads: [badge_string].")) /obj/item/clothing/accessory/badge/attack(mob/living/carbon/human/M, mob/living/user) if(isliving(user)) - user.visible_message("[user] invades [M]'s personal space, thrusting [src] into their face insistently.","You invade [M]'s personal space, thrusting [src] into their face insistently.") + user.visible_message(span_danger("[user] invades [M]'s personal space, thrusting [src] into their face insistently."),span_danger("You invade [M]'s personal space, thrusting [src] into their face insistently.")) user.do_attack_animation(M) user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //NO SPAM @@ -94,11 +94,11 @@ /obj/item/clothing/accessory/badge/holo/emag_act(var/remaining_charges, var/mob/user) if (emagged) - to_chat(user, "\The [src] is already cracked.") + to_chat(user, span_danger("\The [src] is already cracked.")) return else emagged = 1 - to_chat(user, "You crack the holobadge security checks.") + to_chat(user, span_danger("You crack the holobadge security checks.")) return 1 /obj/item/clothing/accessory/badge/holo/attackby(var/obj/item/O as obj, var/mob/user as mob) @@ -195,7 +195,7 @@ /obj/item/clothing/accessory/badge/sheriff/attack(mob/living/carbon/human/M, mob/living/user) if(isliving(user)) - user.visible_message("[user] invades [M]'s personal space, the sheriff badge into their face!.","You invade [M]'s personal space, thrusting the sheriff badge into their face insistently.") + user.visible_message(span_danger("[user] invades [M]'s personal space, the sheriff badge into their face!."),span_danger("You invade [M]'s personal space, thrusting the sheriff badge into their face insistently.")) user.do_attack_animation(M) user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //NO SPAM diff --git a/code/modules/clothing/under/accessories/badges_vr.dm b/code/modules/clothing/under/accessories/badges_vr.dm index 10f66c26ed..091b8eeb65 100644 --- a/code/modules/clothing/under/accessories/badges_vr.dm +++ b/code/modules/clothing/under/accessories/badges_vr.dm @@ -30,7 +30,7 @@ if(current_film) user.put_in_hands(current_film) current_film = null - to_chat(user, "You pulled out the film out of \the [src].") + to_chat(user, span_notice("You pulled out the film out of \the [src].")) desc = "This seems like a dosimeter, but there is no film inside." STOP_PROCESSING(SSobj, src) update_state(0) @@ -47,13 +47,13 @@ current_film = I update_state(current_film.state) - to_chat(user, "You inserted the film into \the [src].") + to_chat(user, span_notice("You inserted the film into \the [src].")) desc = "This seems like a dosimeter. It has a film inside." if(current_film.state < 2) START_PROCESSING(SSobj, src) else - to_chat(user, "\The [src] already has a film inside.") + to_chat(user, span_notice("\The [src] already has a film inside.")) else return ..() @@ -61,11 +61,11 @@ if(wearer) if(current_film && (wearer.radiation >= 25) && (current_film.state == 0)) update_state(1) - visible_message("The film of \the [src] starts to darken.") + visible_message(span_warning("The film of \the [src] starts to darken.")) desc = "This seems like a dosimeter, but the film has darkened." sleep(30) else if(current_film && (wearer.radiation >= 50) && (current_film.state == 1)) - visible_message("The film of \the [src] has turned black!") + visible_message(span_warning("The film of \the [src] has turned black!")) update_state(2) desc = "This seems like a dosimeter, but the film has turned black." @@ -124,4 +124,4 @@ new /obj/item/clothing/accessory/dosimeter(src) new /obj/item/dosimeter_film(src) new /obj/item/dosimeter_film(src) - new /obj/item/dosimeter_film(src) \ No newline at end of file + new /obj/item/dosimeter_film(src) diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index e848363954..b64261ef07 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -12,17 +12,17 @@ /obj/item/clothing/accessory/holster/proc/holster(var/obj/item/I, var/mob/living/user) if(holstered && istype(user)) - to_chat(user, "There is already \a [holstered] holstered here!") + to_chat(user, span_warning("There is already \a [holstered] holstered here!")) return //VOREStation Edit - Machete sheath support if (LAZYLEN(can_hold)) if(!is_type_in_list(I,can_hold)) - to_chat(user, "[I] won't fit in [src]!") + to_chat(user, span_warning("[I] won't fit in [src]!")) return else if (!(I.slot_flags & SLOT_HOLSTER)) //VOREStation Edit End - to_chat(user, "[I] won't fit in [src]!") + to_chat(user, span_warning("[I] won't fit in [src]!")) return if(holster_in) @@ -34,7 +34,7 @@ user.drop_from_inventory(holstered, target = src) holstered.add_fingerprint(user) w_class = max(w_class, holstered.w_class) - user.visible_message("[user] holsters \the [holstered].", "You holster \the [holstered].") + user.visible_message(span_notice("[user] holsters \the [holstered]."), span_notice("You holster \the [holstered].")) name = "occupied [initial(name)]" /obj/item/clothing/accessory/holster/proc/clear_holster() @@ -46,19 +46,19 @@ return if(istype(user.get_active_hand(),/obj) && istype(user.get_inactive_hand(),/obj)) - to_chat(user, "You need an empty hand to draw \the [holstered]!") + to_chat(user, span_warning("You need an empty hand to draw \the [holstered]!")) else var/sound_vol = 25 if(user.a_intent == I_HURT) sound_vol = 50 usr.visible_message( - "[user] draws \the [holstered], ready to go!", //VOREStation Edit - "You draw \the [holstered], ready to go!" //VOREStation Edit + span_danger("[user] draws \the [holstered], ready to go!"), //VOREStation Edit + span_warning("You draw \the [holstered], ready to go!") //VOREStation Edit ) else user.visible_message( - "[user] draws \the [holstered], pointing it at the ground.", - "You draw \the [holstered], pointing it at the ground." + span_notice("[user] draws \the [holstered], pointing it at the ground."), + span_notice("You draw \the [holstered], pointing it at the ground.") ) if(holster_out) @@ -120,12 +120,12 @@ H = locate() in S.accessories if (!H) - to_chat(usr, "Something is very wrong.") + to_chat(usr, span_warning("Something is very wrong.")) if(!H.holstered) var/obj/item/W = usr.get_active_hand() if(!istype(W, /obj/item)) - to_chat(usr, "You need your gun equipped to holster it.") + to_chat(usr, span_warning("You need your gun equipped to holster it.")) return H.holster(W, usr) else @@ -168,4 +168,4 @@ /obj/item/clothing/accessory/holster/leg/black desc = "A tacticool handgun holster. Worn on the upper leg." - icon_state = "holster_b_leg" \ No newline at end of file + icon_state = "holster_b_leg" diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index 45d5cb6ac5..de06731d6e 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -42,7 +42,7 @@ ..() /obj/item/clothing/accessory/storage/attack_self(mob/user as mob) - to_chat(user, "You empty [src].") + to_chat(user, span_notice("You empty [src].")) var/turf/T = get_turf(src) hold.hide_from(usr) for(var/obj/item/I in hold.contents) diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 0d5c64dfad..fe985023cc 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -102,7 +102,7 @@ item_state_slots[slot_w_uniform_str] = unrolled ? "[worn_state]_r" : initial(worn_state) var/mob/living/carbon/human/H = loc H.update_inv_w_uniform(1) - to_chat(H, "You roll the sleeves of your shirt [unrolled ? "up" : "down"]") + to_chat(H, span_notice("You roll the sleeves of your shirt [unrolled ? "up" : "down"]")) */ /obj/item/clothing/under/det/grey diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 80f32da015..312c186f73 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -73,7 +73,7 @@ return if (src != H.w_uniform) - to_chat(H,"You must be WEARING the uniform to change your size.") + to_chat(H,span_warning("You must be WEARING the uniform to change your size.")) return var/new_size = tgui_input_number(usr, "Put the desired size (25-200%), or (1-600%) in dormitory areas.", "Set Size", 200, 600, 1) @@ -82,20 +82,20 @@ //Check AGAIN because we accepted user input which is blocking. if (src != H.w_uniform) - to_chat(H,"You must be WEARING the uniform to change your size.") + to_chat(H,span_warning("You must be WEARING the uniform to change your size.")) return if (H.stat || H.restrained()) return if (isnull(H.size_multiplier)) // Why would this ever be the case? - to_chat(H,"The uniform panics and corrects your apparently microscopic size.") + to_chat(H,span_warning("The uniform panics and corrects your apparently microscopic size.")) H.resize(RESIZE_NORMAL, ignore_prefs = TRUE) H.update_icons() //Just want the matrix transform return if (!H.size_range_check(new_size)) - to_chat(H,"The safety features of the uniform prevent you from choosing this size.") + to_chat(H,span_notice("The safety features of the uniform prevent you from choosing this size.")) return else if(new_size) @@ -103,7 +103,7 @@ if(!original_size) original_size = H.size_multiplier H.resize(new_size/100, uncapped = H.has_large_resize_bounds(), ignore_prefs = TRUE) // Ignores prefs because you can only resize yourself - H.visible_message("The space around [H] distorts as they change size!","The space around you distorts as you change size!") + H.visible_message(span_warning("The space around [H] distorts as they change size!"),span_notice("The space around you distorts as you change size!")) else //They chose their current size. return @@ -113,7 +113,7 @@ var/mob/living/carbon/human/H = M H.resize(original_size, ignore_prefs = TRUE) original_size = null - H.visible_message("The space around [H] distorts as they return to their original size!","The space around you distorts as you return to your original size!") + H.visible_message(span_warning("The space around [H] distorts as they return to their original size!"),span_notice("The space around you distorts as you return to your original size!")) /obj/item/clothing/gloves/bluespace name = "size standardization bracelet" @@ -143,7 +143,7 @@ last_activated = world.time original_size = H.size_multiplier H.resize(target_size, uncapped = emagged, ignore_prefs = FALSE) //In case someone else tries to put it on you. - H.visible_message("The space around [H] distorts as they change size!","The space around you distorts as you change size!") + H.visible_message(span_warning("The space around [H] distorts as they change size!"),span_notice("The space around you distorts as you change size!")) log_admin("Admin [key_name(M)]'s size was altered by a bluespace bracelet.") /obj/item/clothing/gloves/bluespace/mob_can_unequip(mob/M, gloves, disable_warning = 0) @@ -155,7 +155,7 @@ last_activated = world.time H.resize(original_size, uncapped = emagged, ignore_prefs = FALSE) original_size = null - H.visible_message("The space around [H] distorts as they return to their original size!","The space around you distorts as you return to your original size!") + H.visible_message(span_warning("The space around [H] distorts as they return to their original size!"),span_notice("The space around you distorts as you return to your original size!")) log_admin("Admin [key_name(M)]'s size was altered by a bluespace bracelet.") to_chat(M, "\The [src] flickers. It is now recharging and will be ready again in thirty seconds.") @@ -164,9 +164,9 @@ var/cooldowntime = round((10 SECONDS - (world.time - last_activated)) * 0.1) if(Adjacent(user)) if(cooldowntime >= 0) - . += "It appears to be recharging." + . += span_notice("It appears to be recharging.") if(emagged) - . += "The crystal is flickering." + . += span_warning("The crystal is flickering.") /obj/item/clothing/gloves/bluespace/emag_act(R_charges, var/mob/user, emag_source) . = ..() @@ -175,7 +175,7 @@ target_size = (rand(1,300)) /100 if(target_size < 0.1) target_size = 0.1 - user.visible_message("\The [user] swipes the [emag_source] over the \the [src].","You swipes the [emag_source] over the \the [src].") + user.visible_message(span_notice("\The [user] swipes the [emag_source] over the \the [src]."),span_notice("You swipes the [emag_source] over the \the [src].")) return 1 /obj/item/clothing/gloves/bluespace/emagged diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm index 2833999aa5..5f6c252dfb 100644 --- a/code/modules/detectivework/microscope/dnascanner.dm +++ b/code/modules/detectivework/microscope/dnascanner.dm @@ -21,11 +21,11 @@ /obj/machinery/dnaforensics/attackby(obj/item/W, mob/user) if(bloodsamp) - to_chat(user, "There is a sample in the machine.") + to_chat(user, span_warning("There is a sample in the machine.")) return if(scanning) - to_chat(user, "[src] is busy scanning right now.") + to_chat(user, span_warning("[src] is busy scanning right now.")) return if(default_deconstruction_screwdriver(user, W)) @@ -38,10 +38,10 @@ user.unEquip(W) bloodsamp = swab swab.forceMove(src) - to_chat(user, "You insert [W] into [src].") + to_chat(user, span_notice("You insert [W] into [src].")) update_icon() else - to_chat(user, "\The [src] only accepts used swabs.") + to_chat(user, span_warning("\The [src] only accepts used swabs.")) return /obj/machinery/dnaforensics/tgui_interact(mob/user, datum/tgui/ui) @@ -77,10 +77,10 @@ if(bloodsamp) scanner_progress = 0 scanning = TRUE - to_chat(usr, "Scan initiated.") + to_chat(usr, span_notice("Scan initiated.")) update_icon() else - to_chat(usr, "Insert an item to scan.") + to_chat(usr, span_warning("Insert an item to scan.")) . = TRUE if("ejectItem") @@ -105,7 +105,7 @@ last_process_worldtime = world.time /obj/machinery/dnaforensics/proc/complete_scan() - visible_message("[icon2html(src,viewers(src))] makes an insistent chime.", 2) + visible_message(span_notice("[icon2html(src,viewers(src))] makes an insistent chime."), 2) update_icon() if(bloodsamp) var/obj/item/paper/P = new(src) diff --git a/code/modules/detectivework/microscope/microscope.dm b/code/modules/detectivework/microscope/microscope.dm index 760e61b60f..f5ba97ca0e 100644 --- a/code/modules/detectivework/microscope/microscope.dm +++ b/code/modules/detectivework/microscope/microscope.dm @@ -13,11 +13,11 @@ /obj/machinery/microscope/attackby(obj/item/W as obj, mob/user as mob) if(sample) - to_chat(user, "There is already a slide in the microscope.") + to_chat(user, span_warning("There is already a slide in the microscope.")) return if(istype(W, /obj/item/forensics/swab)|| istype(W, /obj/item/sample/fibers) || istype(W, /obj/item/sample/print)) - to_chat(user, "You insert \the [W] into the microscope.") + to_chat(user, span_notice("You insert \the [W] into the microscope.")) user.unEquip(W) W.forceMove(src) sample = W @@ -27,16 +27,16 @@ /obj/machinery/microscope/attack_hand(mob/user) if(!sample) - to_chat(user, "The microscope has no sample to examine.") + to_chat(user, span_warning("The microscope has no sample to examine.")) return - to_chat(user, "The microscope whirrs as you examine \the [sample].") + to_chat(user, span_notice("The microscope whirrs as you examine \the [sample].")) if(!do_after(user, 2 SECONDS) || !sample) - to_chat(user, "You stop examining \the [sample].") + to_chat(user, span_notice("You stop examining \the [sample].")) return - to_chat(user, "Printing findings now...") + to_chat(user, span_notice("Printing findings now...")) var/obj/item/paper/report = new(get_turf(src)) report.stamped = list(/obj/item/stamp) report.overlays = list("paper_stamped") @@ -70,7 +70,7 @@ if(card.evidence && card.evidence.len) report.info += "Surface analysis has determined unique fingerprint strings:

" for(var/prints in card.evidence) - report.info += "Fingerprint string: " + report.info += span_notice("Fingerprint string: ") if(!is_complete_print(card.evidence[prints])) report.info += "INCOMPLETE PRINT:[card.evidence[prints]]" else @@ -89,9 +89,9 @@ if(!istype(remover) || remover.incapacitated() || !Adjacent(remover)) return if(!sample) - to_chat(remover, "\The [src] does not have a sample in it.") + to_chat(remover, span_warning("\The [src] does not have a sample in it.")) return - to_chat(remover, "You remove \the [sample] from \the [src].") + to_chat(remover, span_notice("You remove \the [sample] from \the [src].")) sample.forceMove(get_turf(src)) remover.put_in_hands(sample) sample = null diff --git a/code/modules/detectivework/tools/evidencebag.dm b/code/modules/detectivework/tools/evidencebag.dm index c6a2faed87..d7100c6137 100644 --- a/code/modules/detectivework/tools/evidencebag.dm +++ b/code/modules/detectivework/tools/evidencebag.dm @@ -39,15 +39,15 @@ return if(istype(I, /obj/item/evidencebag)) - to_chat(user, "You find putting an evidence bag in another evidence bag to be slightly absurd.") + to_chat(user, span_notice("You find putting an evidence bag in another evidence bag to be slightly absurd.")) return if(I.w_class > 3) - to_chat(user, "[I] won't fit in [src].") + to_chat(user, span_notice("[I] won't fit in [src].")) return if(contents.len) - to_chat(user, "[src] already has something inside it.") + to_chat(user, span_notice("[src] already has something inside it.")) return user.visible_message("[user] puts [I] into [src]", "You put [I] inside [src].",\ diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index 75d303e0be..1522f4f5e8 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -41,7 +41,7 @@ /obj/item/reagent_containers/glass/rag/attack_self(mob/user as mob) if(on_fire) - user.visible_message("\The [user] stamps out [src].", "You stamp out [src].") + user.visible_message(span_warning("\The [user] stamps out [src]."), span_warning("You stamp out [src].")) user.unEquip(src) extinguish() else @@ -53,9 +53,9 @@ if(F.lit) src.ignite() if(on_fire) - visible_message("\The [user] lights [src] with [W].") + visible_message(span_warning("\The [user] lights [src] with [W].")) else - to_chat(user, "You manage to singe [src], but fail to light it.") + to_chat(user, span_warning("You manage to singe [src], but fail to light it.")) . = ..() update_name() @@ -84,19 +84,19 @@ if(reagents.total_volume) var/target_text = trans_dest? "\the [trans_dest]" : "\the [user.loc]" - user.visible_message("\The [user] begins to wring out [src] over [target_text].", "You begin to wring out [src] over [target_text].") + user.visible_message(span_danger("\The [user] begins to wring out [src] over [target_text]."), span_notice("You begin to wring out [src] over [target_text].")) if(do_after(user, reagents.total_volume*5)) //50 for a fully soaked rag if(trans_dest) reagents.trans_to(trans_dest, reagents.total_volume) else reagents.splash(user.loc, reagents.total_volume) - user.visible_message("\The [user] wrings out [src] over [target_text].", "You finish to wringing out [src].") + user.visible_message(span_danger("\The [user] wrings out [src] over [target_text]."), span_notice("You finish to wringing out [src].")) update_name() /obj/item/reagent_containers/glass/rag/proc/wipe_down(atom/A, mob/user) if(!reagents.total_volume) - to_chat(user, "The [initial(name)] is dry!") + to_chat(user, span_warning("The [initial(name)] is dry!")) else user.visible_message("[user] starts to wipe [A] with [src].") update_name() @@ -108,29 +108,29 @@ if(isliving(target)) //Leaving this as isliving. var/mob/living/M = target if(on_fire) //Check if rag is on fire, if so igniting them and stopping. - user.visible_message("\The [user] hits [target] with [src]!",) + user.visible_message(span_danger("\The [user] hits [target] with [src]!"),) user.do_attack_animation(src) M.IgniteMob() else if(user.zone_sel.selecting == O_MOUTH) //Check player target location, provided the rag is not on fire. Then check if mouth is exposed. if(ishuman(target)) //Added this since player species process reagents in majority of cases. var/mob/living/carbon/human/H = target if(H.head && (H.head.body_parts_covered & FACE)) //Check human head coverage. - to_chat(user, "Remove their [H.head] first.") + to_chat(user, span_warning("Remove their [H.head] first.")) return else if(reagents.total_volume) //Final check. If the rag is not on fire and their face is uncovered, smother target. user.do_attack_animation(src) user.visible_message( - "\The [user] smothers [target] with [src]!", - "You smother [target] with [src]!", + span_danger("\The [user] smothers [target] with [src]!"), + span_warning("You smother [target] with [src]!"), "You hear some struggling and muffled cries of surprise" ) //it's inhaled, so... maybe CHEM_BLOOD doesn't make a whole lot of sense but it's the best we can do for now reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_BLOOD) update_name() else - to_chat(user, "You can't smother this creature.") + to_chat(user, span_warning("You can't smother this creature.")) else - to_chat(user, "You can't smother this creature.") + to_chat(user, span_warning("You can't smother this creature.")) else wipe_down(target, user) else @@ -143,11 +143,11 @@ if(istype(A, /obj/structure/reagent_dispensers) || istype(A, /obj/item/reagent_containers/glass/bucket) || istype(A, /obj/structure/mopbucket)) //VOREStation Edit - "Allows rags to be used on buckets and mopbuckets" if(!reagents.get_free_space()) - to_chat(user, "\The [src] is already soaked.") + to_chat(user, span_warning("\The [src] is already soaked.")) return if(A.reagents && A.reagents.trans_to_obj(src, reagents.maximum_volume)) - user.visible_message("\The [user] soaks [src] using [A].", "You soak [src] using [A].") + user.visible_message("\The [user] soaks [src] using [A].", span_notice("You soak [src] using [A].")) update_name() return @@ -185,7 +185,7 @@ //also copied from matches if(reagents.get_reagent_amount("phoron")) // the phoron explodes when exposed to fire - visible_message("\The [src] conflagrates violently!") + visible_message(span_danger("\The [src] conflagrates violently!")) var/datum/effect/effect/system/reagents_explosion/e = new() e.set_up(round(reagents.get_reagent_amount("phoron") / 2.5, 1), get_turf(src), 0, 0) e.start() @@ -206,7 +206,7 @@ //rags sitting around with 1 second of burn time left is dumb. //ensures players always have a few seconds of burn time left when they light their rag if(burn_time <= 5) - visible_message("\The [src] falls apart!") + visible_message(span_warning("\The [src] falls apart!")) new /obj/effect/decal/cleanable/ash(get_turf(src)) qdel(src) update_name() @@ -214,7 +214,7 @@ /obj/item/reagent_containers/glass/rag/process() if(!can_ignite()) - visible_message("\The [src] burns out.") + visible_message(span_warning("\The [src] burns out.")) extinguish() //copied from matches diff --git a/code/modules/detectivework/tools/sample_kits.dm b/code/modules/detectivework/tools/sample_kits.dm index dd63a689e5..b08dfb0348 100644 --- a/code/modules/detectivework/tools/sample_kits.dm +++ b/code/modules/detectivework/tools/sample_kits.dm @@ -25,7 +25,7 @@ return 0 evidence |= supplied.evidence name = "[initial(name)] (combined)" - to_chat(user, "You transfer the contents of \the [supplied] into \the [src].") + to_chat(user, span_notice("You transfer the contents of \the [supplied] into \the [src].")) return 1 /obj/item/sample/print/merge_evidence(var/obj/item/sample/supplied, var/mob/user) @@ -37,7 +37,7 @@ else evidence[print] = supplied.evidence[print] name = "[initial(name)] (combined)" - to_chat(user, "You overlay \the [src] and \the [supplied], combining the print records.") + to_chat(user, span_notice("You overlay \the [src] and \the [supplied], combining the print records.")) return 1 /obj/item/sample/attackby(var/obj/O, var/mob/user) @@ -67,10 +67,10 @@ return var/mob/living/carbon/human/H = user if(H.gloves) - to_chat(user, "Take \the [H.gloves] off first.") + to_chat(user, span_warning("Take \the [H.gloves] off first.")) return - to_chat(user, "You firmly press your fingertips onto the card.") + to_chat(user, span_notice("You firmly press your fingertips onto the card.")) var/fullprint = H.get_full_print() evidence[fullprint] = fullprint name = "[initial(name)] (\the [H])" @@ -87,11 +87,11 @@ var/mob/living/carbon/human/H = M if(H.gloves) - to_chat(user, "\The [H] is wearing gloves.") + to_chat(user, span_warning("\The [H] is wearing gloves.")) return 1 if(user != H && H.a_intent != "help" && !H.lying) - user.visible_message("\The [user] tries to take prints from \the [H], but they move away.") + user.visible_message(span_danger("\The [user] tries to take prints from \the [H], but they move away.")) return 1 if(user.zone_sel.selecting == "r_hand" || user.zone_sel.selecting == "l_hand") @@ -104,7 +104,7 @@ if(istype(O) && !O.is_stump()) has_hand = 1 if(!has_hand) - to_chat(user, "They don't have any hands.") + to_chat(user, span_warning("They don't have any hands.")) return 1 user.visible_message("[user] takes a copy of \the [H]'s fingerprints.") var/fullprint = H.get_full_print() @@ -134,7 +134,7 @@ /obj/item/forensics/sample_kit/proc/take_sample(var/mob/user, var/atom/supplied) var/obj/item/sample/S = new evidence_path(get_turf(user), supplied) - to_chat(user, "You transfer [S.evidence.len] [S.evidence.len > 1 ? "[evidence_type]s" : "[evidence_type]"] to \the [S].") + to_chat(user, span_notice("You transfer [S.evidence.len] [S.evidence.len > 1 ? "[evidence_type]s" : "[evidence_type]"] to \the [S].")) /obj/item/forensics/sample_kit/afterattack(var/atom/A, var/mob/user, var/proximity) if(!proximity) @@ -144,7 +144,7 @@ take_sample(user,A) return 1 else - to_chat(user, "You are unable to locate any [evidence_type]s on \the [A].") + to_chat(user, span_warning("You are unable to locate any [evidence_type]s on \the [A].")) return ..() /obj/item/forensics/sample_kit/powder diff --git a/code/modules/detectivework/tools/scanner.dm b/code/modules/detectivework/tools/scanner.dm index 09d1c58182..6672d5ace9 100644 --- a/code/modules/detectivework/tools/scanner.dm +++ b/code/modules/detectivework/tools/scanner.dm @@ -15,26 +15,26 @@ /obj/item/detective_scanner/attack(mob/living/carbon/human/M as mob, mob/user as mob) if (!ishuman(M)) - to_chat(user, "\The [M] does not seem to be compatible with this device.") + to_chat(user, span_warning("\The [M] does not seem to be compatible with this device.")) flick("[icon_state]0",src) return 0 if(reveal_fingerprints) if((!( istype(M.dna, /datum/dna) ) || M.gloves)) - to_chat(user, "No fingerprints found on [M]") + to_chat(user, span_notice("No fingerprints found on [M]")) flick("[icon_state]0",src) return 0 else if(user.zone_sel.selecting == "r_hand" || user.zone_sel.selecting == "l_hand") var/obj/item/sample/print/P = new /obj/item/sample/print(user.loc) P.attack(M, user) - to_chat(user, "Done printing.") - // to_chat(user, "[M]'s Fingerprints: [md5(M.dna.uni_identity)]") + to_chat(user, span_notice("Done printing.")) + // to_chat(user, span_notice("[M]'s Fingerprints: [md5(M.dna.uni_identity)]")) if(reveal_blood && M.blood_DNA && M.blood_DNA.len) - to_chat(user, "Blood found on [M]. Analysing...") + to_chat(user, span_notice("Blood found on [M]. Analysing...")) spawn(15) for(var/blood in M.blood_DNA) - to_chat(user, "Blood type: [M.blood_DNA[blood]]\nDNA: [blood]") + to_chat(user, span_notice("Blood type: [M.blood_DNA[blood]]\nDNA: [blood]")) return /obj/item/detective_scanner/afterattack(atom/A as obj|turf, mob/user, proximity) @@ -45,7 +45,7 @@ /* if(istype(A,/obj/machinery/computer/forensic_scanning)) user.visible_message("[user] takes a cord out of [src] and hooks its end into [A]" ,\ - "You download data from [src] to [A]") + span_notice("You download data from [src] to [A]")) var/obj/machinery/computer/forensic_scanning/F = A F.sync_data(stored) return @@ -59,27 +59,27 @@ add_fingerprint(user) if(!(do_after(user, 1 SECOND))) - to_chat(user, "You must remain still for the device to complete its work.") + to_chat(user, span_warning("You must remain still for the device to complete its work.")) return 0 //General if ((!A.fingerprints || !A.fingerprints.len) && !A.suit_fibers && !A.blood_DNA) user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\ - "Unable to locate any fingerprints, materials, fibers, or blood on [A]!",\ + span_warning("Unable to locate any fingerprints, materials, fibers, or blood on [A]!"),\ "You hear a faint hum of electrical equipment.") flick("[icon_state]0",src) return 0 if(add_data(A)) - to_chat(user,"Object already in internal memory. Consolidating data...") + to_chat(user,span_notice("Object already in internal memory. Consolidating data...")) flick("[icon_state]1",src) return //PRINTS if(A.fingerprints && A.fingerprints.len) - to_chat(user, "Isolated [A.fingerprints.len] fingerprints:") + to_chat(user, span_notice("Isolated [A.fingerprints.len] fingerprints:")) if(!reveal_incompletes) - to_chat(user, "Rapid Analysis Imperfect: Scan samples with H.R.F.S. equipment to determine nature of incomplete prints.") + to_chat(user, span_warning("Rapid Analysis Imperfect: Scan samples with H.R.F.S. equipment to determine nature of incomplete prints.")) var/list/complete_prints = list() var/list/incomplete_prints = list() for(var/i in A.fingerprints) @@ -89,38 +89,38 @@ else incomplete_prints += print if(complete_prints.len < 1) - to_chat(user, "No intact prints found") + to_chat(user, span_notice("No intact prints found")) else - to_chat(user, "Found [complete_prints.len] intact prints") + to_chat(user, span_notice("Found [complete_prints.len] intact prints")) if(reveal_fingerprints) for(var/i in complete_prints) - to_chat(user, "    [i]") + to_chat(user, span_notice("    [i]")) - to_chat(user, "Found [incomplete_prints.len] incomplete prints") + to_chat(user, span_notice("Found [incomplete_prints.len] incomplete prints")) if(reveal_incompletes) for(var/i in incomplete_prints) - to_chat(user, "    [i]") + to_chat(user, span_notice("    [i]")) //FIBERS if(A.suit_fibers && A.suit_fibers.len) - to_chat(user,"Fibers/Materials detected.[reveal_fibers ? " Analysing..." : " Acquisition of fibers for H.R.F.S. analysis advised."]") + to_chat(user,span_notice("Fibers/Materials detected.[reveal_fibers ? " Analysing..." : " Acquisition of fibers for H.R.F.S. analysis advised."]")) flick("[icon_state]1",src) if(reveal_fibers && do_after(user, 5 SECONDS)) - to_chat(user, "Apparel samples scanned:") + to_chat(user, span_notice("Apparel samples scanned:")) for(var/sample in A.suit_fibers) to_chat(user, " - [sample]") //Blood if (A.blood_DNA && A.blood_DNA.len) - to_chat(user, "Blood detected.[reveal_blood ? " Analysing..." : " Acquisition of swab for H.R.F.S. analysis advised."]") + to_chat(user, span_notice("Blood detected.[reveal_blood ? " Analysing..." : " Acquisition of swab for H.R.F.S. analysis advised."]")) if(reveal_blood && do_after(user, 5 SECONDS)) flick("[icon_state]1",src) for(var/blood in A.blood_DNA) to_chat(user, "Blood type: [A.blood_DNA[blood]] DNA: [blood]") user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\ - "You finish scanning \the [A].",\ + span_notice("You finish scanning \the [A]."),\ "You hear a faint hum of electrical equipment.") flick("[icon_state]1",src) return 0 @@ -153,7 +153,7 @@ var/list/fibers = F.fields["fibers"] var/list/bloods = F.fields["blood"] - to_chat(user, "Data for: [F.fields["name"]]") + to_chat(user, span_notice("Data for: [F.fields["name"]]")) if(reveal_fingerprints) var/list/complete_prints = list() @@ -167,20 +167,20 @@ incomplete_prints += print if(complete_prints.len < 1) - to_chat(user, "No intact prints found.") + to_chat(user, span_notice("No intact prints found.")) if(reveal_incompletes) for(var/print in incomplete_prints) to_chat(user, " - [print]") if(fibers && fibers.len) - to_chat(user, "[fibers.len] samples of material were present.") + to_chat(user, span_notice("[fibers.len] samples of material were present.")) if(reveal_fibers) for(var/sample in fibers) to_chat(user, " - [sample]") if(bloods && bloods.len) - to_chat(user, "[bloods.len] samples of blood were present.") + to_chat(user, span_notice("[bloods.len] samples of blood were present.")) if(reveal_blood) for(var/bloodsample in bloods) to_chat(user, " - [bloodsample] Type: [bloods[bloodsample]]") @@ -192,7 +192,7 @@ if (tgui_alert(usr, "Are you sure you want to wipe all data from [src]?","Wipe Data",list("Yes","No")) == "Yes") stored = list() - to_chat(usr, "Forensic data erase complete.") + to_chat(usr, span_notice("Forensic data erase complete.")) /obj/item/detective_scanner/advanced name = "advanced forensic scanner" diff --git a/code/modules/detectivework/tools/swabs.dm b/code/modules/detectivework/tools/swabs.dm index 14c178766b..e841541c35 100644 --- a/code/modules/detectivework/tools/swabs.dm +++ b/code/modules/detectivework/tools/swabs.dm @@ -23,23 +23,23 @@ var/sample_type if(H.wear_mask) - to_chat(user, "\The [H] is wearing a mask.") + to_chat(user, span_warning("\The [H] is wearing a mask.")) return if(!H.dna || !H.dna.unique_enzymes) - to_chat(user, "They don't seem to have DNA!") + to_chat(user, span_warning("They don't seem to have DNA!")) return if(user != H && H.a_intent != "help" && !H.lying) - user.visible_message("\The [user] tries to take a swab sample from \the [H], but they move away.") + user.visible_message(span_danger("\The [user] tries to take a swab sample from \the [H], but they move away.")) return if(user.zone_sel.selecting == O_MOUTH) if(!H.organs_by_name[BP_HEAD]) - to_chat(user, "They don't have a head.") + to_chat(user, span_warning("They don't have a head.")) return if(!H.check_has_mouth()) - to_chat(user, "They don't have a mouth.") + to_chat(user, span_warning("They don't have a mouth.")) return user.visible_message("[user] swabs \the [H]'s mouth for a saliva sample.") dna = list(H.dna.unique_enzymes) @@ -55,7 +55,7 @@ if(istype(O) && !O.is_stump()) has_hand = 1 if(!has_hand) - to_chat(user, "They don't have any hands.") + to_chat(user, span_warning("They don't have any hands.")) return user.visible_message("[user] swabs [H]'s palm for a sample.") sample_type = "GSR" @@ -74,7 +74,7 @@ return if(is_used()) - to_chat(user, "This swab has already been used.") + to_chat(user, span_warning("This swab has already been used.")) return add_fingerprint(user) @@ -87,7 +87,7 @@ var/choice if(!choices.len) - to_chat(user, "There is no evidence on \the [A].") + to_chat(user, span_warning("There is no evidence on \the [A].")) return else if(choices.len == 1) choice = choices[1] @@ -106,7 +106,7 @@ else if(choice == "Gunshot Residue") var/obj/item/clothing/B = A if(!istype(B) || !B.gunshot_residue) - to_chat(user, "There is no residue on \the [A].") + to_chat(user, span_warning("There is no residue on \the [A].")) return gsr = B.gunshot_residue sample_type = "residue" diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 61828e0343..a3ae5cfb6d 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -76,7 +76,7 @@ log transactions //display a message to the user var/response = pick("Initiating withdraw. Have a nice day!", "CRITICAL ERROR: Activating cash chamber panic siphon.","PIN Code accepted! Emptying account balance.", "Jackpot!") - to_chat(user, "[icon2html(src, user.client)] The [src] beeps: \"[response]\"") + to_chat(user, span_warning("[icon2html(src, user.client)] The [src] beeps: \"[response]\"")) return 1 /obj/machinery/atm/attackby(obj/item/I as obj, mob/user as mob) @@ -117,7 +117,7 @@ log transactions T.time = stationtime2text() authenticated_account.transaction_log.Add(T) - to_chat(user, "You insert [I] into [src].") + to_chat(user, span_info("You insert [I] into [src].")) src.attack_hand(user) qdel(I) else @@ -125,7 +125,7 @@ log transactions /obj/machinery/atm/attack_hand(mob/user as mob) if(istype(user, /mob/living/silicon)) - to_chat (user, "A firewall prevents you from interfacing with this device!") + to_chat (user, span_warning("A firewall prevents you from interfacing with this device!")) return if(get_dist(src,user) <= 1) @@ -140,7 +140,7 @@ log transactions dat += "Card: [held_card ? held_card.name : "------"]

" if(ticks_left_locked_down > 0) - dat += "Maximum number of pin attempts exceeded! Access to this ATM has been temporarily disabled." + dat += span_alert("Maximum number of pin attempts exceeded! Access to this ATM has been temporarily disabled.") else if(authenticated_account) if(authenticated_account.suspended) dat += "Access to this account has been suspended, and the funds within frozen." diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index fbb2e136f3..3d3a044307 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -220,9 +220,9 @@ if (istype(I, /obj/item/card/id)) var/obj/item/card/id/C = I if(I==ID_container || ID_container == null) - usr.visible_message("\The [usr] swipes a card through \the [src].") + usr.visible_message(span_info("\The [usr] swipes a card through \the [src].")) else - usr.visible_message("\The [usr] swipes \the [ID_container] through \the [src].") + usr.visible_message(span_info("\The [usr] swipes \the [ID_container] through \the [src].")) if(transaction_locked && !transaction_paid) if(linked_account) if(!linked_account.suspended) @@ -281,7 +281,7 @@ transaction_locked = 0 transaction_paid = 0 else - usr.visible_message("\The [usr] swipes a card through \the [src].") + usr.visible_message(span_info("\The [usr] swipes a card through \the [src].")) playsound(src, 'sound/machines/chime.ogg', 50, 1) src.visible_message("[icon2html(src,viewers(src))] \The [src] chimes.") transaction_paid = 1 diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index db53d9be34..a536d08157 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -32,7 +32,7 @@ h_user.drop_from_inventory(src) h_user.drop_from_inventory(SC) h_user.put_in_hands(SC) - to_chat(user, "You combine the [initial_name]s to a bundle of [SC.worth] [initial_name]s.") + to_chat(user, span_notice("You combine the [initial_name]s to a bundle of [SC.worth] [initial_name]s.")) qdel(src) /obj/item/spacecash/update_icon() @@ -171,4 +171,4 @@ /obj/item/spacecash/ewallet/examine(mob/user) . = ..() if(Adjacent(user)) - . += "Charge card's owner: [src.owner_name]. Thalers remaining: [src.worth]." + . += span_notice("Charge card's owner: [src.owner_name]. Thalers remaining: [src.worth].") diff --git a/code/modules/economy/cash_register.dm b/code/modules/economy/cash_register.dm index d02305a6d0..0304c73d74 100644 --- a/code/modules/economy/cash_register.dm +++ b/code/modules/economy/cash_register.dm @@ -478,7 +478,7 @@ if(cash_stored) add_overlay("register_cash") else - to_chat(usr, "The cash box is locked.") + to_chat(usr, span_warning("The cash box is locked.")) /obj/machinery/cash_register/proc/toggle_anchors(obj/item/tool/wrench/W, mob/user) @@ -488,18 +488,18 @@ user.visible_message("\The [user] begins securing \the [src] to the floor.", "You begin securing \the [src] to the floor.") else - user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", + user.visible_message(span_warning("\The [user] begins unsecuring \the [src] from the floor."), "You begin unsecuring \the [src] from the floor.") playsound(src, W.usesound, 50, 1) if(!do_after(user, 20 * W.toolspeed)) manipulating = 0 return if(!anchored) - user.visible_message("\The [user] has secured \the [src] to the floor.", - "You have secured \the [src] to the floor.") + user.visible_message(span_notice("\The [user] has secured \the [src] to the floor."), + span_notice("You have secured \the [src] to the floor.")) else - user.visible_message("\The [user] has unsecured \the [src] from the floor.", - "You have unsecured \the [src] from the floor.") + user.visible_message(span_warning("\The [user] has unsecured \the [src] from the floor."), + span_notice("You have unsecured \the [src] from the floor.")) anchored = !anchored manipulating = 0 return @@ -508,7 +508,7 @@ /obj/machinery/cash_register/emag_act(var/remaining_charges, var/mob/user) if(!emagged) - src.visible_message("The [src]'s cash box springs open as [user] swipes the card through the scanner!") + src.visible_message(span_danger("The [src]'s cash box springs open as [user] swipes the card through the scanner!")) playsound(src, "sparks", 50, 1) req_access = list() emagged = 1 diff --git a/code/modules/economy/casinocash.dm b/code/modules/economy/casinocash.dm index 20b74fdfa4..3ae7383eb6 100644 --- a/code/modules/economy/casinocash.dm +++ b/code/modules/economy/casinocash.dm @@ -203,5 +203,5 @@ comment = "Ace" else if(result == 2) comment = "Joker" - user.visible_message("[user] has thrown \the [src]. It lands on [comment]! ", \ - "You throw \the [src]. It lands on [comment]! ") + user.visible_message(span_notice("[user] has thrown \the [src]. It lands on [comment]! "), \ + span_notice("You throw \the [src]. It lands on [comment]! ")) diff --git a/code/modules/economy/coins.dm b/code/modules/economy/coins.dm index 56a7feb626..63235dcd6c 100644 --- a/code/modules/economy/coins.dm +++ b/code/modules/economy/coins.dm @@ -72,14 +72,14 @@ if(istype(W,/obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W if(string_attached) - to_chat(user, "There already is a string attached to this coin.") + to_chat(user, span_notice("There already is a string attached to this coin.")) return if (CC.use(1)) add_overlay("coin_string_overlay") string_attached = 1 - to_chat(user, "You attach a string to the coin.") + to_chat(user, span_notice("You attach a string to the coin.")) else - to_chat(user, "This cable coil appears to be empty.") + to_chat(user, span_notice("This cable coil appears to be empty.")) return else if(W.has_tool_quality(TOOL_WIRECUTTER)) if(!string_attached) @@ -90,7 +90,7 @@ CC.update_icon() cut_overlays() string_attached = null - to_chat(user, "You detach the string from the coin.") + to_chat(user, span_notice("You detach the string from the coin.")) else ..() /obj/item/coin/attack_self(mob/user as mob) @@ -100,5 +100,5 @@ comment = "tails" else if(result == 2) comment = "heads" - user.visible_message("[user] has thrown \the [src]. It lands on [comment]! ", \ - "You throw \the [src]. It lands on [comment]! ") + user.visible_message(span_notice("[user] has thrown \the [src]. It lands on [comment]! "), \ + span_notice("You throw \the [src]. It lands on [comment]! ")) diff --git a/code/modules/economy/coins_vr.dm b/code/modules/economy/coins_vr.dm index 4e4a13917b..aef2ce4b31 100644 --- a/code/modules/economy/coins_vr.dm +++ b/code/modules/economy/coins_vr.dm @@ -46,12 +46,12 @@ comment = "tails" else if(result == 2) comment = "heads" - user.visible_message("[user] has thrown [src]. It lands on [comment]! ", runemessage = "[src] landed on [comment]") + user.visible_message(span_notice("[user] has thrown [src]. It lands on [comment]! "), runemessage = "[src] landed on [comment]") if(rand(1,20) == 1) - user.visible_message("[user] fumbled the [src]!", runemessage = "fumbles [src]") + user.visible_message(span_notice("[user] fumbled the [src]!"), runemessage = "fumbles [src]") user.remove_from_mob(src) /obj/item/aliencoin/examine(var/mob/user) . = ..() if(Adjacent(user)) - . += "It has some writing along its edge that seems to be some language that you are not familiar with. The face of the coin is very smooth, with what appears to be some kind of angular logo along the left side, and a couple of lines of the alien text along the opposite side. The reverse side is similarly smooth, the top of it features what appears to be some kind of vortex, surrounded by six stars, three on either side, with further swirls and intricate patterns along the bottom sections of this face. Looking closely, you can see that there is more text hidden among the swirls." + . += span_notice("It has some writing along its edge that seems to be some language that you are not familiar with. The face of the coin is very smooth, with what appears to be some kind of angular logo along the left side, and a couple of lines of the alien text along the opposite side. The reverse side is similarly smooth, the top of it features what appears to be some kind of vortex, surrounded by six stars, three on either side, with further swirls and intricate patterns along the bottom sections of this face. Looking closely, you can see that there is more text hidden among the swirls.") diff --git a/code/modules/economy/mint.dm b/code/modules/economy/mint.dm index 4e763d7779..179228a050 100644 --- a/code/modules/economy/mint.dm +++ b/code/modules/economy/mint.dm @@ -34,16 +34,16 @@ else if(M.default_type == "uranium") while(coinsToProduce-- > 0) new /obj/item/coin/uranium(user.loc) - src.visible_message("\The [src] rattles and dispenses several [M.default_type] coins!") + src.visible_message(span_notice("\The [src] rattles and dispenses several [M.default_type] coins!")) coinsToProduce = initial(coinsToProduce) if(M.amount == 0) icon_state = "coinpress0" qdel(M) //clean it up just to be sure - src.visible_message("\The [src] has run out of usable materials.") + src.visible_message(span_notice("\The [src] has run out of usable materials.")) break else - to_chat(usr,"\The [src] is hand-operated and requires your full attention!") + to_chat(usr,span_warning("\The [src] is hand-operated and requires your full attention!")) icon_state = "coinpress0" break else - src.visible_message("\The [src] doesn't look like it'll accept that material.") \ No newline at end of file + src.visible_message(span_notice("\The [src] doesn't look like it'll accept that material.")) diff --git a/code/modules/economy/retail_scanner.dm b/code/modules/economy/retail_scanner.dm index 3e952aade5..79155d0a4a 100644 --- a/code/modules/economy/retail_scanner.dm +++ b/code/modules/economy/retail_scanner.dm @@ -171,7 +171,7 @@ var/obj/item/spacecash/ewallet/E = O scan_wallet(E) else if (istype(O, /obj/item/spacecash)) - to_chat(usr, "This device does not accept cash.") + to_chat(usr, span_warning("This device does not accept cash.")) else if(istype(O, /obj/item/card/emag)) return ..() @@ -396,7 +396,7 @@ /obj/item/retail_scanner/emag_act(var/remaining_charges, var/mob/user) if(!emagged) - to_chat(user, "You stealthily swipe the cryptographic sequencer through \the [src].") + to_chat(user, span_danger("You stealthily swipe the cryptographic sequencer through \the [src].")) playsound(src, "sparks", 50, 1) req_access = list() emagged = 1 diff --git a/code/modules/economy/trader.dm b/code/modules/economy/trader.dm index b7e90178ae..bbc1807465 100644 --- a/code/modules/economy/trader.dm +++ b/code/modules/economy/trader.dm @@ -56,7 +56,7 @@ /obj/trader/attack_hand(mob/living/user) . = ..() if(trading) - to_chat(user, "\The [src] is busy with someone else at the moment...") + to_chat(user, span_notice("\The [src] is busy with someone else at the moment...")) return var/coin_value = get_value(accepts) if(products.len > 0) @@ -72,7 +72,7 @@ var/ask = tgui_alert(user, "[welcome_msg][welcome_accepts_name][welcome_msg_finish]", "[src]",list("Yes","No","Return banked funds"), timeout = 10 SECONDS) if (ask == "Return banked funds") if(!Adjacent(user)) - to_chat(user, "You aren't close enough.") + to_chat(user, span_notice("You aren't close enough.")) trading = FALSE return return_funds() @@ -82,7 +82,7 @@ trading = FALSE return if(!Adjacent(user)) - to_chat(user, "You decided not to get anything.") + to_chat(user, span_notice("You decided not to get anything.")) trading = FALSE return if(interact_sound.len > 0) @@ -92,7 +92,7 @@ sound_lastplayed = world.time var/obj/input = tgui_input_list(user, "What would you like? You have [coin_value] banked with this trader.", "Trader", products, timeout = 30 SECONDS) if(!input || !Adjacent(user)) - to_chat(user, "You decided not to get anything.") + to_chat(user, span_notice("You decided not to get anything.")) trading = FALSE return var/p = 0 @@ -101,15 +101,15 @@ p = prices[t] if(p > 0) if(tgui_alert(user, "Are you sure? This costs [p].", "Confirm",list("Yes","No")) != "Yes") - to_chat(user, "You decided not to.") + to_chat(user, span_notice("You decided not to.")) trading = FALSE return else if (coin_value < p) - to_chat(user, "You haven't provided enough funds!") + to_chat(user, span_warning("You haven't provided enough funds!")) trading = FALSE return if(!Adjacent(user)) - to_chat(user, "You decided not to get anything.") + to_chat(user, span_notice("You decided not to get anything.")) trading = FALSE return if(t in multiple) @@ -127,15 +127,15 @@ deduct_value(p) if(tgui_alert(user, "Would you like your change back, or would you like it to remain banked for later use? (Anyone can use banked funds)", "[src]",list("Keep it banked","I want my change"), timeout = 10 SECONDS) == "I want my change") if(!Adjacent(user)) - to_chat(user, "You aren't close enough.") + to_chat(user, span_notice("You aren't close enough.")) trading = FALSE return return_funds() else - to_chat(user, "You decided leave your change banked.") + to_chat(user, span_notice("You decided leave your change banked.")) trading = FALSE else - to_chat(user, "\The [src] hasn't got anything to sell.") + to_chat(user, span_notice("\The [src] hasn't got anything to sell.")) return /obj/trader/attackby(obj/item/O, mob/user) @@ -145,7 +145,7 @@ if(istype(O, /obj/item/aliencoin)) var/obj/item/aliencoin/a = O coinbalance += a.value - visible_message("\The [src] accepts \the [user]'s [O].") + visible_message(span_notice("\The [src] accepts \the [user]'s [O].")) qdel(a) if("money") if(istype(O, /obj/item/spacecash)) @@ -156,18 +156,18 @@ c.worth += loadsamoney c.update_icon() loadsamoney = null - visible_message("\The [src] accepts \the [user]'s [O].") + visible_message(span_notice("\The [src] accepts \the [user]'s [O].")) return user.drop_item() w.forceMove(src.contents) bank += w - visible_message("\The [src] accepts \the [user]'s [w].") + visible_message(span_notice("\The [src] accepts \the [user]'s [w].")) if("item") if(istype(O, /obj)) user.drop_item() O.forceMove(src.contents) bank += O - visible_message("\The [src] accepts \the [user]'s [O].") + visible_message(span_notice("\The [src] accepts \the [user]'s [O].")) /obj/trader/proc/get_value(kind) var/value = 0 @@ -181,14 +181,14 @@ value += a.worth else c.forceMove(get_turf(src)) - visible_message("\The [src] drops the worthless [c]...") + visible_message(span_warning("\The [src] drops the worthless [c]...")) if("item") for(var/obj/c in bank) if(istype(c, accepted_itemtype)) value += accepted_item_worth else c.forceMove(get_turf(src)) - visible_message("\The [src] drops the worthless [c]...") + visible_message(span_warning("\The [src] drops the worthless [c]...")) return value /obj/trader/proc/deduct_value(amount) @@ -243,9 +243,9 @@ c.forceMove(get_turf(loc)) bank -= c if(u_get_refund) - visible_message("\The [src] drops the banked [welcome_accepts_name].") + visible_message(span_notice("\The [src] drops the banked [welcome_accepts_name].")) else - visible_message("\The [src] doesn't have anything banked for you.") + visible_message(span_notice("\The [src] doesn't have anything banked for you.")) /obj/trader/proc/move_trader() var/list/pt = list() diff --git a/code/modules/economy/vending.dm b/code/modules/economy/vending.dm index d76bc8a4f7..7bf7aee1c6 100644 --- a/code/modules/economy/vending.dm +++ b/code/modules/economy/vending.dm @@ -184,7 +184,7 @@ GLOBAL_LIST_EMPTY(vending_products) /obj/machinery/vending/emag_act(var/remaining_charges, var/mob/user) if(!emagged) emagged = 1 - to_chat(user, "You short out \the [src]'s product lock.") + to_chat(user, span_filter_notice("You short out \the [src]'s product lock.")) return 1 /obj/machinery/vending/attackby(obj/item/W as obj, mob/user as mob) @@ -195,26 +195,26 @@ GLOBAL_LIST_EMPTY(vending_products) return else if(istype(W, /obj/item/refill_cartridge)) if(stat & (BROKEN|NOPOWER)) - to_chat(user, "You cannot refill [src] while it is not functioning.") + to_chat(user, span_notice("You cannot refill [src] while it is not functioning.")) return if(!anchored) - to_chat(user, "You cannot refill [src] while it is not secured.") + to_chat(user, span_notice("You cannot refill [src] while it is not secured.")) return if(panel_open) - to_chat(user, "You cannot refill [src] while it's panel is open.") + to_chat(user, span_notice("You cannot refill [src] while it's panel is open.")) return if(!refillable) - to_chat(user, "\the [src] does not have a refill port.") + to_chat(user, span_notice("\the [src] does not have a refill port.")) return var/obj/item/refill_cartridge/RC = W if(RC.can_refill(src)) - to_chat(user, "You refill [src] using [RC].") + to_chat(user, span_notice("You refill [src] using [RC].")) user.drop_from_inventory(RC) qdel(RC) refill_inventory() return else - to_chat(user, "You cannot refill [src] with [RC].") + to_chat(user, span_notice("You cannot refill [src] with [RC].")) return else if(W.has_tool_quality(TOOL_SCREWDRIVER)) panel_open = !panel_open @@ -237,19 +237,19 @@ GLOBAL_LIST_EMPTY(vending_products) W.forceMove(src) coin = W categories |= CAT_COIN - to_chat(user, "You insert \the [W] into \the [src].") + to_chat(user, span_notice("You insert \the [W] into \the [src].")) SStgui.update_uis(src) return else if(W.has_tool_quality(TOOL_WRENCH)) playsound(src, W.usesound, 100, 1) if(anchored) - user.visible_message("[user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.") + user.visible_message(span_filter_notice("[user] begins unsecuring \the [src] from the floor."), span_filter_notice("You start unsecuring \the [src] from the floor.")) else - user.visible_message("[user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.") + user.visible_message(span_filter_notice("[user] begins securing \the [src] to the floor."), span_filter_notice("You start securing \the [src] to the floor.")) if(do_after(user, 20 * W.toolspeed)) if(!src) return - to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") + to_chat(user, span_notice("You [anchored? "un" : ""]secured \the [src]!")) anchored = !anchored return else @@ -275,7 +275,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(istype(cashmoney, /obj/item/spacecash)) - visible_message("\The [usr] inserts some cash into \the [src].") + visible_message(span_info("\The [usr] inserts some cash into \the [src].")) cashmoney.worth -= currently_vending.price if(cashmoney.worth <= 0) @@ -295,10 +295,10 @@ GLOBAL_LIST_EMPTY(vending_products) * successful, 0 if failed. */ /obj/machinery/vending/proc/pay_with_ewallet(var/obj/item/spacecash/ewallet/wallet) - visible_message("\The [usr] swipes \the [wallet] through \the [src].") + visible_message(span_info("\The [usr] swipes \the [wallet] through \the [src].")) playsound(src, 'sound/machines/id_swipe.ogg', 50, 1) if(currently_vending.price > wallet.worth) - to_chat(usr, "Insufficient funds on chargecard.") + to_chat(usr, span_warning("Insufficient funds on chargecard.")) return 0 else wallet.worth -= currently_vending.price @@ -312,16 +312,16 @@ GLOBAL_LIST_EMPTY(vending_products) * successful, 0 if failed */ /obj/machinery/vending/proc/pay_with_card(obj/item/card/id/I, mob/M) - visible_message("[M] swipes a card through [src].") + visible_message(span_info("[M] swipes a card through [src].")) playsound(src, 'sound/machines/id_swipe.ogg', 50, 1) var/datum/money_account/customer_account = get_account(I.associated_account_number) if(!customer_account) - to_chat(M, "Error: Unable to access account. Please contact technical support if problem persists.") + to_chat(M, span_warning("Error: Unable to access account. Please contact technical support if problem persists.")) return FALSE if(customer_account.suspended) - to_chat(M, "Unable to access account: account suspended.") + to_chat(M, span_warning("Unable to access account: account suspended.")) return FALSE // Have the customer punch in the PIN before checking if there's enough money. Prevents people from figuring out acct is @@ -331,11 +331,11 @@ GLOBAL_LIST_EMPTY(vending_products) customer_account = attempt_account_access(I.associated_account_number, attempt_pin, 2) if(!customer_account) - to_chat(M, "Unable to access account: incorrect credentials.") + to_chat(M, span_warning("Unable to access account: incorrect credentials.")) return FALSE if(currently_vending.price > customer_account.money) - to_chat(M, "Insufficient funds in account.") + to_chat(M, span_warning("Insufficient funds in account.")) return FALSE // Okay to move the money at this point @@ -487,28 +487,28 @@ GLOBAL_LIST_EMPTY(vending_products) return FALSE if(!coin) - to_chat(usr, "There is no coin in this machine.") + to_chat(usr, span_filter_notice("There is no coin in this machine.")) return coin.forceMove(src.loc) if(!usr.get_active_hand()) usr.put_in_hands(coin) - to_chat(usr, "You remove \the [coin] from \the [src].") + to_chat(usr, span_notice("You remove \the [coin] from \the [src].")) coin = null categories &= ~CAT_COIN return TRUE if("vend") if(!vend_ready) - to_chat(usr, "[src] is busy!") + to_chat(usr, span_warning("[src] is busy!")) return if(!allowed(usr) && !emagged && scan_id) - to_chat(usr, "Access denied.") //Unless emagged of course + to_chat(usr, span_warning("Access denied.")) //Unless emagged of course flick("[icon_state]-deny",src) playsound(src, 'sound/machines/deniedbeep.ogg', 50, 0) return if(panel_open) - to_chat(usr, "[src] cannot dispense products while its service panel is open!") + to_chat(usr, span_warning("[src] cannot dispense products while its service panel is open!")) return var/key = text2num(params["vend"]) @@ -527,7 +527,7 @@ GLOBAL_LIST_EMPTY(vending_products) return TRUE if(issilicon(usr)) //If the item is not free, provide feedback if a synth is trying to buy something. - to_chat(usr, "Lawed unit recognized. Lawed units cannot complete this transaction. Purchase canceled.") + to_chat(usr, span_danger("Lawed unit recognized. Lawed units cannot complete this transaction. Purchase canceled.")) return if(!ishuman(usr)) return @@ -538,7 +538,7 @@ GLOBAL_LIST_EMPTY(vending_products) var/obj/item/card/id/C = H.GetIdCard() if(!vendor_account || vendor_account.suspended) - to_chat(usr, "Vendor account offline. Unable to process transaction.") + to_chat(usr, span_filter_notice("Vendor account offline. Unable to process transaction.")) flick("[icon_state]-deny",src) vend_ready = TRUE return @@ -556,10 +556,10 @@ GLOBAL_LIST_EMPTY(vending_products) else if(istype(C, /obj/item/card)) paid = pay_with_card(C, usr) /*else if(usr.can_advanced_admin_interact()) - to_chat(usr, "Vending object due to admin interaction.") + to_chat(usr, span_notice("Vending object due to admin interaction.")) paid = TRUE*/ else - to_chat(usr, "Payment failure: you have no ID or other method of payment.") + to_chat(usr, span_warning("Payment failure: you have no ID or other method of payment.")) vend_ready = TRUE flick("[icon_state]-deny",src) return TRUE // we set this because they shouldn't even be able to get this far, and we want the UI to update. @@ -567,7 +567,7 @@ GLOBAL_LIST_EMPTY(vending_products) vend(currently_vending, usr) // vend will handle vend_ready . = TRUE else - to_chat(usr, "Payment failure: unable to process payment.") + to_chat(usr, span_warning("Payment failure: unable to process payment.")) vend_ready = TRUE if("togglevoice") @@ -577,7 +577,7 @@ GLOBAL_LIST_EMPTY(vending_products) /obj/machinery/vending/proc/can_buy(datum/stored_item/vending_product/R, mob/user) if(!allowed(user) && !emagged && scan_id) - to_chat(user, "Access denied.") //Unless emagged of course + to_chat(user, span_warning("Access denied.")) //Unless emagged of course flick("[icon_state]-deny",src) playsound(src, 'sound/machines/deniedbeep.ogg', 50, 0) return FALSE @@ -588,7 +588,7 @@ GLOBAL_LIST_EMPTY(vending_products) return if(!R.amount) - to_chat(user, "[src] has ran out of that product.") + to_chat(user, span_warning("[src] has ran out of that product.")) vend_ready = TRUE return @@ -597,13 +597,13 @@ GLOBAL_LIST_EMPTY(vending_products) if(R.category & CAT_COIN) if(!coin) - to_chat(user, "You need to insert a coin to get this item.") + to_chat(user, span_notice("You need to insert a coin to get this item.")) return if(coin.string_attached) if(prob(50)) - to_chat(user, "You successfully pull the coin out before \the [src] could swallow it.") + to_chat(user, span_notice("You successfully pull the coin out before \the [src] could swallow it.")) else - to_chat(user, "You weren't able to pull the coin out fast enough, the machine ate it, string and all.") + to_chat(user, span_notice("You weren't able to pull the coin out fast enough, the machine ate it, string and all.")) qdel(coin) coin = null categories &= ~CAT_COIN @@ -666,7 +666,7 @@ GLOBAL_LIST_EMPTY(vending_products) popup.set_content(dat) popup.open() else - to_chat(user,"You do not have the required access to view the vending logs for this machine.") + to_chat(user,span_warning("You do not have the required access to view the vending logs for this machine.")) /obj/machinery/vending/verb/rotate_clockwise() @@ -675,11 +675,11 @@ GLOBAL_LIST_EMPTY(vending_products) set src in oview(1) if (src.can_rotate == 0) - to_chat(usr, "\The [src] cannot be rotated.") + to_chat(usr, span_warning("\The [src] cannot be rotated.")) return 0 if (src.anchored || usr:stat) - to_chat(usr, "It is bolted down!") + to_chat(usr, span_filter_notice("It is bolted down!")) return 0 src.set_dir(turn(src.dir, 270)) return 1 @@ -691,11 +691,11 @@ GLOBAL_LIST_EMPTY(vending_products) set src in oview(1) if (src.can_rotate == 0) - to_chat(usr, "\The [src] cannot be rotated.") + to_chat(usr, span_warning("\The [src] cannot be rotated.")) return 0 if (src.anchored || usr:stat) - to_chat(usr, "It is bolted down!") + to_chat(usr, span_filter_notice("It is bolted down!")) return 0 src.set_dir(turn(src.dir, 90)) return 1 @@ -718,7 +718,7 @@ GLOBAL_LIST_EMPTY(vending_products) if(!user.unEquip(W)) return - to_chat(user, "You insert \the [W] in the product receptor.") + to_chat(user, span_notice("You insert \the [W] in the product receptor.")) R.add_product(W) if(has_logs) do_logging(R, user) @@ -754,7 +754,7 @@ GLOBAL_LIST_EMPTY(vending_products) return for(var/mob/O in hearers(src, null)) - O.show_message("\The [src] beeps, \"[message]\"",2) + O.show_message(span_npcsay("\The [src] beeps, \"[message]\""),2) return /obj/machinery/vending/power_change() @@ -795,7 +795,7 @@ GLOBAL_LIST_EMPTY(vending_products) return FALSE throw_item.vendor_action(src) INVOKE_ASYNC(throw_item, TYPE_PROC_REF(/atom/movable, throw_at), target, rand(3, 10), rand(1, 3), src) - visible_message("\The [src] launches \a [throw_item] at \the [target]!") + visible_message(span_warning("\The [src] launches \a [throw_item] at \the [target]!")) return 1 //Actual machines are in vending_machines.dm diff --git a/code/modules/emotes/emote_define.dm b/code/modules/emotes/emote_define.dm index ff31fd2a3a..02c9590d84 100644 --- a/code/modules/emotes/emote_define.dm +++ b/code/modules/emotes/emote_define.dm @@ -113,7 +113,7 @@ var/global/list/emotes_by_key if(use_1p) if(target) use_1p = replace_target_tokens(use_1p, target) - use_1p = "[capitalize(replace_user_tokens(use_1p, user))]" + use_1p = span_emote("[capitalize(replace_user_tokens(use_1p, user))]") var/prefinal_3p var/use_3p var/raw_3p = get_emote_message_3p(user, target, extra_params) @@ -121,7 +121,7 @@ var/global/list/emotes_by_key if(target) raw_3p = replace_target_tokens(raw_3p, target) prefinal_3p = replace_user_tokens(raw_3p, user) - use_3p = "\The [user] [prefinal_3p]" + use_3p = span_emote("\The [user] [prefinal_3p]") var/use_radio = get_radio_message(user) if(use_radio) if(target) diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm index f93663886d..cda3d9d8bd 100644 --- a/code/modules/emotes/emote_mob.dm +++ b/code/modules/emotes/emote_mob.dm @@ -21,7 +21,7 @@ if(usr == src) //client-called emote if (client && (client.prefs.muted & MUTE_IC)) - to_chat(src, "You cannot send IC messages (muted).") + to_chat(src, span_warning("You cannot send IC messages (muted).")) return if(world.time < next_emote) @@ -189,9 +189,9 @@ if(input) log_emote(message,src) //Log before we add junk if(usr && usr.client) - message = "[src] [input]" + message = span_emote("[src] [input]") else - message = "[src] [input]" + message = span_npc_emote("[src] [input]") else return @@ -221,9 +221,9 @@ spawn(0) // It's possible that it could be deleted in the meantime, or that it runtimes. if(M) if(isobserver(M)) - message = "[src] ([ghost_follow_link(src, M)]) [input]" + message = span_emote("[src] ([ghost_follow_link(src, M)]) [input]") if(usr && usr.client && M && !(get_z(usr) == get_z(M))) - message = "[message]" + message = span_multizsay("[message]") M.show_message(message, m_type) M.create_chat_message(src, "[runemessage]", FALSE, list("emote"), (m_type == AUDIBLE_MESSAGE)) diff --git a/code/modules/entrepreneur/entrepreneur_items.dm b/code/modules/entrepreneur/entrepreneur_items.dm index bc81f49b9c..b365089cfb 100644 --- a/code/modules/entrepreneur/entrepreneur_items.dm +++ b/code/modules/entrepreneur/entrepreneur_items.dm @@ -190,29 +190,29 @@ if(zodiac) switch(zodiac) if("aries") - to_chat(user, "Today's reading for Aries: [aries]") + to_chat(user, span_notice("Today's reading for Aries: [aries]")) if("taurus") - to_chat(user, "Today's reading for Taurus: [taurus]") + to_chat(user, span_notice("Today's reading for Taurus: [taurus]")) if("gemini") - to_chat(user, "Today's reading for Gemini: [gemini]") + to_chat(user, span_notice("Today's reading for Gemini: [gemini]")) if("cancer") - to_chat(user, "Today's reading for Cancer: [cancer]") + to_chat(user, span_notice("Today's reading for Cancer: [cancer]")) if("leo") - to_chat(user, "Today's reading for Leo: [leo]") + to_chat(user, span_notice("Today's reading for Leo: [leo]")) if("virgo") - to_chat(user, "Today's reading for Virgo: [virgo]") + to_chat(user, span_notice("Today's reading for Virgo: [virgo]")) if("libra") - to_chat(user, "Today's reading for Libra: [libra]") + to_chat(user, span_notice("Today's reading for Libra: [libra]")) if("scorpio") - to_chat(user, "Today's reading for Scorpio: [scorpio]") + to_chat(user, span_notice("Today's reading for Scorpio: [scorpio]")) if("sagittarius") - to_chat(user, "Today's reading for Sagittarius: [sagittarius]") + to_chat(user, span_notice("Today's reading for Sagittarius: [sagittarius]")) if("capricorn") - to_chat(user, "Today's reading for Capricorn: [capricorn]") + to_chat(user, span_notice("Today's reading for Capricorn: [capricorn]")) if("aquarius") - to_chat(user, "Today's reading for Aquarius: [aquarius]") + to_chat(user, span_notice("Today's reading for Aquarius: [aquarius]")) if("pisces") - to_chat(user, "Today's reading for Pisces: [pisces]") + to_chat(user, span_notice("Today's reading for Pisces: [pisces]")) ///////Dentist tools, basically just fluff for RP @@ -225,8 +225,8 @@ /obj/item/entrepreneur/dentist_mirror/attack(mob/M, mob/user) if(user.a_intent == I_HELP) //A tad messy, but this should stop people from smacking their patients in surgery - to_chat(user, "You use the mirror to get a good look inside of [M]'s mouth.") - to_chat(M, "[user] uses a small mirror to look inside of your mouth.") + to_chat(user, span_notice("You use the mirror to get a good look inside of [M]'s mouth.")) + to_chat(M, span_notice("[user] uses a small mirror to look inside of your mouth.")) return 0 ..() @@ -239,8 +239,8 @@ /obj/item/entrepreneur/dentist_probe/attack(mob/M, mob/user) if(user.a_intent == I_HELP) //A tad messy, but this should stop people from smacking their patients in surgery - to_chat(user, "You use the probe to poke about inside of [M]'s mouth.") - to_chat(M, "[user] examines the inside of your mouth with a sharp probe, it hurts a little being prodded.") + to_chat(user, span_notice("You use the probe to poke about inside of [M]'s mouth.")) + to_chat(M, span_notice("[user] examines the inside of your mouth with a sharp probe, it hurts a little being prodded.")) return 0 ..() @@ -253,8 +253,8 @@ /obj/item/entrepreneur/dentist_sickle/attack(mob/M, mob/user) if(user.a_intent == I_HELP) //A tad messy, but this should stop people from smacking their patients in surgery - to_chat(user, "You loosen some stuck debris from [M]'s mouth with the hook.") - to_chat(M, "[user] uses a hook to scrape out something stuck in your mouth, it's pretty uncomfortable.") + to_chat(user, span_notice("You loosen some stuck debris from [M]'s mouth with the hook.")) + to_chat(M, span_notice("[user] uses a hook to scrape out something stuck in your mouth, it's pretty uncomfortable.")) return 0 ..() @@ -267,8 +267,8 @@ /obj/item/entrepreneur/dentist_scaler/attack(mob/M, mob/user) if(user.a_intent == I_HELP) //A tad messy, but this should stop people from smacking their patients in surgery - to_chat(user, "You scrape debris out from [M]'s mouth.") - to_chat(M, "[user] scrapes debris from out of your mouth.") + to_chat(user, span_notice("You scrape debris out from [M]'s mouth.")) + to_chat(M, span_notice("[user] scrapes debris from out of your mouth.")) return 0 ..() @@ -292,12 +292,12 @@ /obj/item/entrepreneur/dumbbell/attack_self(var/mob/user) var/mob/living/M = user if(M.nutrition <= 100) - to_chat(user, "You are too hungry to exercise right now.") + to_chat(user, span_notice("You are too hungry to exercise right now.")) return 0 if(!do_after(user, 3 SECONDS, src, exclusive = TASK_USER_EXCLUSIVE)) return 0 M.adjust_nutrition(-10) - to_chat(user, "You successfully perform a [src] exercise!") + to_chat(user, span_notice("You successfully perform a [src] exercise!")) if(M.weight > 50) M.weight -= 0.5 @@ -330,7 +330,7 @@ last_used = get_turf(user) emf = (emf + emf_change) update_icon() - to_chat(user, "You update the EMF scanner and check the reading. It reads [emf]mG!") + to_chat(user, span_notice("You update the EMF scanner and check the reading. It reads [emf]mG!")) /obj/item/entrepreneur/emf/update_icon() switch(emf) @@ -359,7 +359,7 @@ if(!istype(user)) return 0 if(!istype(W)) - to_chat(user, "You need some sort of glass, bottle or cup to contact the spirit world.") + to_chat(user, span_notice("You need some sort of glass, bottle or cup to contact the spirit world.")) return 0 var/result = 0 if(!do_after(user, 3 SECONDS, src, exclusive = TASK_USER_EXCLUSIVE)) @@ -368,7 +368,7 @@ result = next_result else result = pick(possible_results) - src.visible_message("[user] slides the [W] over to [result]!") + src.visible_message(span_notice("[user] slides the [W] over to [result]!")) next_result = 0 /obj/item/entrepreneur/spirit_board/AltClick(mob/living/carbon/user) @@ -380,7 +380,7 @@ if(!ghost_enabled) return if(jobban_isbanned(user, JOB_GHOSTROLES)) - to_chat(user, "You cannot interact with this board because you are banned from playing ghost roles.") + to_chat(user, span_warning("You cannot interact with this board because you are banned from playing ghost roles.")) return next_result = tgui_input_list(user, "What should it land on next?", "Next result", possible_results) if(!is_admin(user)) //admins can bypass this for event stuff @@ -430,10 +430,10 @@ /obj/structure/bed/roller/massage/AltClick(mob/living/carbon/user) if(anchored) anchored = 0 - src.visible_message("[user] turns the breaks off on the [src]!") + src.visible_message(span_notice("[user] turns the breaks off on the [src]!")) else if(!anchored) anchored = 1 - src.visible_message("[user] turns the breaks on for the [src]!") + src.visible_message(span_notice("[user] turns the breaks on for the [src]!")) /obj/structure/bed/roller/massage/buckle_mob(mob/living/M) ..() @@ -451,7 +451,7 @@ /obj/item/entrepreneur/magnifying_glass/afterattack(atom/T, mob/living/user as mob) if(!T.desc) return - user.visible_message("\The [user] examines the \the [T] with \the [src]!") + user.visible_message(span_notice("\The [user] examines the \the [T] with \the [src]!")) to_chat(user, "[T.desc]") // Streamer and influencer diff --git a/code/modules/env_message/env_message.dm b/code/modules/env_message/env_message.dm index 725e6d5da4..fc5ea527b3 100644 --- a/code/modules/env_message/env_message.dm +++ b/code/modules/env_message/env_message.dm @@ -130,7 +130,7 @@ var/global/list/env_messages = list() return if(isnewplayer(mob)) - to_chat(src, "You must spawn or observe to place messages.") + to_chat(src, span_warning("You must spawn or observe to place messages.")) return if(!get_turf(mob) || !src.ckey) @@ -167,7 +167,7 @@ var/global/list/env_messages = list() all_map_messages |= A.combined_message if(!all_map_messages.len) - to_chat(src, "There are no map or env messages.") + to_chat(src, span_warning("There are no map or env messages.")) return var/mob/chosen_message = tgui_input_list(src, "Which message do you want to remove?", "Make contact", all_map_messages) diff --git a/code/modules/eventkit/generic_objects/generic_item.dm b/code/modules/eventkit/generic_objects/generic_item.dm index 02fa8e264c..a3f7e84ec0 100644 --- a/code/modules/eventkit/generic_objects/generic_item.dm +++ b/code/modules/eventkit/generic_objects/generic_item.dm @@ -30,7 +30,7 @@ icon = 'icons/obj/props/items.dmi' icon_state = icon_state_on if(user) - user.visible_message("[text_activated]") + user.visible_message(span_notice("[text_activated]")) update_icon() if(effect == 1) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread @@ -71,7 +71,7 @@ O.Weaken(flash_time) if(effect == 4) var/atom/o = new object(get_turf(user)) - src.visible_message("[src] has produced [o]!") + src.visible_message(span_notice("[src] has produced [o]!")) if(sound_activated) playsound(src, sound_activated, 50, 1) else if(togglable) @@ -85,7 +85,7 @@ else icon = 'icons/obj/props/items.dmi' if(user) - user.visible_message("[text_deactivated]") + user.visible_message(span_notice("[text_deactivated]")) update_icon() return ..() diff --git a/code/modules/eventkit/generic_objects/generic_structure.dm b/code/modules/eventkit/generic_objects/generic_structure.dm index c83c4f28bf..7461079067 100644 --- a/code/modules/eventkit/generic_objects/generic_structure.dm +++ b/code/modules/eventkit/generic_objects/generic_structure.dm @@ -35,7 +35,7 @@ else icon = 'icons/obj/props/decor.dmi' icon_state = icon_state_on - src.visible_message("[text_activated]") + src.visible_message(span_notice("[text_activated]")) update_icon() if(effect == 1) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread @@ -76,7 +76,7 @@ O.Weaken(flash_time) if(effect == 4) var/atom/o = new object(get_turf(src)) - src.visible_message("[src] has produced [o]!") + src.visible_message(span_notice("[src] has produced [o]!")) if(effect == 5) for (var/mob/O in viewers(src, null)) if(get_dist(src, O) > 7) @@ -97,14 +97,14 @@ icon = icon_off else icon = 'icons/obj/props/decor.dmi' - src.visible_message("[text_deactivated]") + src.visible_message(span_notice("[text_deactivated]")) update_icon() return ..() /obj/structure/generic_structure/attackby(obj/item/W as obj, mob/user as mob) if(wrenchable && W.has_tool_quality(TOOL_WRENCH)) add_fingerprint(user) - to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") + to_chat(user, span_notice("You [anchored? "un" : ""]secured \the [src]!")) anchored = !anchored /client/proc/generic_structure() diff --git a/code/modules/eventkit/gm_interfaces/mob_spawner.dm b/code/modules/eventkit/gm_interfaces/mob_spawner.dm index 607606be57..8e6cc6e8c7 100644 --- a/code/modules/eventkit/gm_interfaces/mob_spawner.dm +++ b/code/modules/eventkit/gm_interfaces/mob_spawner.dm @@ -124,12 +124,12 @@ var/z = params["z"] if(!name) - to_chat(usr, "Name cannot be empty.") + to_chat(usr, span_warning("Name cannot be empty.")) return FALSE var/turf/T = locate(x, y, z) if(!T) - to_chat(usr, "Those coordinates are outside the boundaries of the map.") + to_chat(usr, span_warning("Those coordinates are outside the boundaries of the map.")) return FALSE for(var/i = 0, i < amount, i++) @@ -180,7 +180,7 @@ M.size_multiplier = size_mul M.update_icon() else - to_chat(usr, "Size Multiplier not applied: ([size_mul]) is not a valid input.") + to_chat(usr, span_warning("Size Multiplier not applied: ([size_mul]) is not a valid input.")) M.forceMove(T) diff --git a/code/modules/events/comms_blackout.dm b/code/modules/events/comms_blackout.dm index 8f54b71257..add62ee544 100644 --- a/code/modules/events/comms_blackout.dm +++ b/code/modules/events/comms_blackout.dm @@ -6,7 +6,7 @@ else // AIs will always know if there's a comm blackout, rogue AIs could then lie about comm blackouts in the future while they shutdown comms for(var/mob/living/silicon/ai/A in player_list) to_chat(A, "
") - to_chat(A, "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT") + to_chat(A, span_warning("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT")) to_chat(A, "
") for(var/obj/machinery/telecomms/T in telecomms_list) T.emp_act(1) diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm index 028f9d9b60..85464795d5 100644 --- a/code/modules/events/communications_blackout.dm +++ b/code/modules/events/communications_blackout.dm @@ -1,14 +1,14 @@ /datum/event/communications_blackout/announce() var/alert = pick( "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you*%fj00)`5vc-BZZT", \ - "Ionospheric anomalies detected. Temporary telecommunication failu*3mga;b4;'1v¬-BZZZT", \ + "Ionospheric anomalies detected. Temporary telecommunication failu*3mga;b4;'1v�-BZZZT", \ "Ionospheric anomalies detected. Temporary telec#MCi46:5.;@63-BZZZZT", \ "Ionospheric anomalies dete'fZ\\kg5_0-BZZZZZT", \ - "Ionospheri:%£ MCayj^j<.3-BZZZZZZT", \ - "#4nd%;f4y6,>£%-BZZZZZZZT") + "Ionospheri:%� MCayj^j<.3-BZZZZZZT", \ + "#4nd%;f4y6,>�%-BZZZZZZZT") for(var/mob/living/silicon/ai/A in player_list) //AIs are always aware of communication blackouts. to_chat(A, "
") - to_chat(A, "[alert]") + to_chat(A, span_warning("[alert]")) to_chat(A, "
") if(prob(30)) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts. diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index e351c7b623..9cc232a449 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -39,7 +39,7 @@ var/area/A = get_area(S) if(!A || A.flags & RAD_SHIELDED) // Rad shielding will protect from ions too continue - to_chat(S, "Your integrated sensors detect an ionospheric anomaly. Your systems will be impacted as you begin a partial restart.") + to_chat(S, span_warning("Your integrated sensors detect an ionospheric anomaly. Your systems will be impacted as you begin a partial restart.")) var/ionbug = rand(3, 9) S.confused += ionbug S.eye_blurry += (ionbug - 1) @@ -49,7 +49,7 @@ if(!(target.z in affecting_z)) continue var/law = target.generate_ion_law() - to_chat(target, "You have detected a change in your laws information:") + to_chat(target, span_danger("You have detected a change in your laws information:")) to_chat(target, law) target.add_ion_law(law) target.show_laws() diff --git a/code/modules/events/meteor_strike_vr.dm b/code/modules/events/meteor_strike_vr.dm index 52485dee68..ebd5c498f5 100644 --- a/code/modules/events/meteor_strike_vr.dm +++ b/code/modules/events/meteor_strike_vr.dm @@ -62,7 +62,7 @@ if(!mob_turf || !(mob_turf.z in impacted.expected_z_levels)) continue if(L.client) - to_chat(L, "The ground lurches beneath you!") + to_chat(L, span_danger("The ground lurches beneath you!")) shake_camera(L, 6, 1) if(!L.ear_deaf) L << 'sound/effects/explosionfar.ogg' @@ -98,7 +98,7 @@ /obj/structure/meteorite/attackby(var/obj/item/I, var/mob/M) if(istype(I, /obj/item/pickaxe)) var/obj/item/pickaxe/P = I - M.visible_message("[M] starts [P.drill_verb] \the [src].", "You start [P.drill_verb] \the [src].") + M.visible_message(span_warning("[M] starts [P.drill_verb] \the [src]."), span_warning("You start [P.drill_verb] \the [src].")) if(!do_after(M, P.digspeed*3)) return @@ -107,4 +107,4 @@ for(var/obj/O in src) O.forceMove(get_turf(src)) qdel(src) - return \ No newline at end of file + return diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm index 3f19f2dfcc..04cbf42d7b 100644 --- a/code/modules/events/prison_break.dm +++ b/code/modules/events/prison_break.dm @@ -51,7 +51,7 @@ for(var/obj/machinery/message_server/MS in machines) MS.send_rc_message("Engineering", my_department, rc_message, "", "", 2) for(var/mob/living/silicon/ai/A in player_list) - to_chat(A, "Malicious program detected in the [english_list(areaName)] lighting and airlock control systems by [my_department].") + to_chat(A, span_danger("Malicious program detected in the [english_list(areaName)] lighting and airlock control systems by [my_department].")) else to_world_log("ERROR: Could not initate grey-tide. Unable to find suitable containment area.") diff --git a/code/modules/examine/examine.dm b/code/modules/examine/examine.dm index 5f030d219a..7131536d73 100644 --- a/code/modules/examine/examine.dm +++ b/code/modules/examine/examine.dm @@ -101,7 +101,7 @@ set category = "IC" if((is_blind(src) || usr.stat) && !isobserver(src)) - to_chat(src, "Something is there but you can't see it.") + to_chat(src, span_notice("Something is there but you can't see it.")) return 1 //Could be gone by the time they finally pick something @@ -112,7 +112,7 @@ var/list/results = A.examine(src) if(!results || !results.len) results = list("You were unable to examine that. Tell a developer!") - var/final_string = "[jointext(results, "
")]" + var/final_string = span_infoplain("[jointext(results, "
")]") if(ismob(A)) // mob descriptions matter more than others final_string = examine_block(final_string) to_chat(src, final_string) @@ -131,7 +131,7 @@ set popup_menu = FALSE if((is_blind(src) || src.stat) && !isobserver(src)) - to_chat(src, "Something is there but you can't see it.") + to_chat(src, span_notice("Something is there but you can't see it.")) return 1 var/list/E = list() if(isAI(src)) diff --git a/code/modules/fireworks/firework_launcher.dm b/code/modules/fireworks/firework_launcher.dm index ee5f2e033b..7700d76424 100644 --- a/code/modules/fireworks/firework_launcher.dm +++ b/code/modules/fireworks/firework_launcher.dm @@ -51,7 +51,7 @@ return if(user.unEquip(O, 0, src)) loaded_star = O - to_chat(user, "You insert the firework star into \the [src].") + to_chat(user, span_notice("You insert the firework star into \the [src].")) add_fingerprint(user) update_icon() return @@ -67,7 +67,7 @@ if(!user || user.stat != 0) return if(!loaded_star) - to_chat(user, "There is no firework star loaded in \the [src].") + to_chat(user, span_notice("There is no firework star loaded in \the [src].")) return else loaded_star.forceMove(get_turf(src)) @@ -77,32 +77,32 @@ /obj/machinery/firework_launcher/attack_hand(mob/user) // Maybe this proc could be better as entirely its own proc, called from attack_hand, but also I don't really see the point if(panel_open) - to_chat(user, "Close the panel first!") + to_chat(user, span_warning("Close the panel first!")) return if(!loaded_star) - to_chat(user, "There is no firework star loaded in \the [src].") + to_chat(user, span_notice("There is no firework star loaded in \the [src].")) return if((world.time - last_launch) <= launch_cooldown) - to_chat(user, "\The [src] is still re-priming for launch.") + to_chat(user, span_notice("\The [src] is still re-priming for launch.")) return if(!anchored) - to_chat(user, "\The [src] must be firmly secured to the ground before firework can be launched!") + to_chat(user, span_warning("\The [src] must be firmly secured to the ground before firework can be launched!")) return var/datum/planet/P = get_planet() if(!P || !(P.weather_holder)) // There are potential cases of being outside but not on planet. And checking whether planet has weather at all is more sanity thing than anything. - to_chat(user, "\The [src] beeps as its safeties seem to prevent launch in the current location.") + to_chat(user, span_warning("\The [src] beeps as its safeties seem to prevent launch in the current location.")) return var/datum/weather_holder/WH = P.weather_holder if(WH.firework_override && istype(loaded_star, /obj/item/firework_star/weather)) // Enable weather-based events to not be ruined - to_chat(user, "\The [src] beeps as it seems some interference is preventing launch of this type of firework.") + to_chat(user, span_warning("\The [src] beeps as it seems some interference is preventing launch of this type of firework.")) return - to_chat(user, "You launch the firework!") + to_chat(user, span_notice("You launch the firework!")) playsound(get_turf(src), 'sound/weapons/rpg.ogg', 75, 1) loaded_star.trigger_firework(WH) qdel(loaded_star) diff --git a/code/modules/fishing/fishing.dm b/code/modules/fishing/fishing.dm index bf5857bed0..3496d8738c 100644 --- a/code/modules/fishing/fishing.dm +++ b/code/modules/fishing/fishing.dm @@ -124,10 +124,10 @@ GLOBAL_LIST_INIT(generic_fishing_chance_list, list(FISHING_RARE = 5, FISHING_UNC if(istype(P, /obj/item/material/fishing_rod) && !being_fished) var/obj/item/material/fishing_rod/R = P if(!R.strung) - to_chat(user, "It is hard to go fishing without any line!") + to_chat(user, span_notice("It is hard to go fishing without any line!")) return if(R.cast) - to_chat(user, "You can only cast one line at a time!") + to_chat(user, span_notice("You can only cast one line at a time!")) return playsound(src, 'sound/effects/slosh.ogg', 5, 1, 5) to_chat(user,"You cast \the [P.name] into \the [src].") @@ -136,7 +136,7 @@ GLOBAL_LIST_INIT(generic_fishing_chance_list, list(FISHING_RARE = 5, FISHING_UNC var/fishing_time = rand(min_fishing_time SECONDS,max_fishing_time SECONDS) * R.toolspeed if(do_after(user,fishing_time,user)) playsound(src, 'sound/effects/slosh.ogg', 5, 1, 5) - to_chat(user,"You feel a tug and begin pulling!") + to_chat(user,span_notice("You feel a tug and begin pulling!")) if(world.time >= last_fished + fishing_cooldown) pick_fish() last_fished = world.time @@ -146,7 +146,7 @@ GLOBAL_LIST_INIT(generic_fishing_chance_list, list(FISHING_RARE = 5, FISHING_UNC has_fish = FALSE //List of possible outcomes. if(!fish_type) - to_chat(user,"You caught... nothing. How sad.") + to_chat(user,span_filter_notice("You caught... nothing. How sad.")) else var/fished = new fish_type(get_turf(user)) if(isliving(fished)) @@ -155,10 +155,10 @@ GLOBAL_LIST_INIT(generic_fishing_chance_list, list(FISHING_RARE = 5, FISHING_UNC if(prob(rand(L.mob_size) + 10) && R.line_break) R.strung = FALSE R.update_icon() - user.visible_message("\The [R]'s string snaps!") + user.visible_message(span_danger("\The [R]'s string snaps!")) if(prob(33)) // Dead on hook. Good for food, not so much for live catch. L.death() - to_chat(user,"You fish out \the [fished] from the water with [P.name]!") + to_chat(user,span_notice("You fish out \the [fished] from the water with [P.name]!")) R.cast = FALSE being_fished = FALSE else ..() diff --git a/code/modules/fishing/fishing_net.dm b/code/modules/fishing/fishing_net.dm index 1318e3d9c6..da46ae0e3c 100644 --- a/code/modules/fishing/fishing_net.dm +++ b/code/modules/fishing/fishing_net.dm @@ -45,13 +45,13 @@ accept = TRUE for(var/atom/At in src.contents) if(isliving(At)) - to_chat(user, "Your net is already holding something!") + to_chat(user, span_notice("Your net is already holding something!")) accept = FALSE if(!accept) - to_chat(user, "[A] can't be trapped in \the [src].") + to_chat(user, span_filter_notice("[A] can't be trapped in \the [src].")) return var/mob/L = A - user.visible_message("[user] snatches [L] with \the [src].", "You snatch [L] with \the [src].") + user.visible_message(span_notice("[user] snatches [L] with \the [src]."), span_notice("You snatch [L] with \the [src].")) L.forceMove(src) update_icon() update_weight() @@ -61,10 +61,10 @@ /obj/item/material/fishing_net/attack_self(var/mob/user) for(var/mob/M in src) M.forceMove(get_turf(src)) - user.visible_message("[user] releases [M] from \the [src].", "You release [M] from \the [src].") + user.visible_message(span_notice("[user] releases [M] from \the [src]."), span_notice("You release [M] from \the [src].")) for(var/obj/item/I in src) I.forceMove(get_turf(src)) - user.visible_message("[user] dumps \the [I] out of \the [src].", "You dump \the [I] out of \the [src].") + user.visible_message(span_notice("[user] dumps \the [I] out of \the [src]."), span_notice("You dump \the [I] out of \the [src].")) update_icon() update_weight() return @@ -154,13 +154,13 @@ accept = TRUE for(var/atom/At in src.contents) if(isliving(At)) - to_chat(user, "Your net is already holding something!") + to_chat(user, span_notice("Your net is already holding something!")) accept = FALSE if(!accept) - to_chat(user, "[A] can't be trapped in \the [src].") + to_chat(user, span_filter_notice("[A] can't be trapped in \the [src].")) return var/mob/L = A - user.visible_message("[user] snatches [L] with \the [src].", "You snatch [L] with \the [src].") + user.visible_message(span_notice("[user] snatches [L] with \the [src]."), span_notice("You snatch [L] with \the [src].")) L.forceMove(src) playsound(src, 'sound/effects/plop.ogg', 50, 1) update_icon() @@ -173,13 +173,13 @@ if(!user.get_inactive_hand()) //Check if the inactive hand is empty M.forceMove(get_turf(src)) M.attempt_to_scoop(user) - user.visible_message("[user] scoops [M] out from \the [src].", "You pull [M] from \the [src].") + user.visible_message(span_notice("[user] scoops [M] out from \the [src]."), span_notice("You pull [M] from \the [src].")) else M.forceMove(get_turf(src)) - user.visible_message("[user] releases [M] from \the [src].", "You release [M] from \the [src].") + user.visible_message(span_notice("[user] releases [M] from \the [src]."), span_notice("You release [M] from \the [src].")) for(var/obj/item/I in src) I.forceMove(get_turf(src)) - user.visible_message("[user] dumps \the [I] out of \the [src].", "You dump \the [I] out of \the [src].") + user.visible_message(span_notice("[user] dumps \the [I] out of \the [src]."), span_notice("You dump \the [I] out of \the [src].")) update_icon() update_weight() return @@ -187,11 +187,11 @@ /obj/item/material/fishing_net/butterfly_net/container_resist(mob/living/M) if(prob(20)) M.forceMove(get_turf(src)) - to_chat(M, "You climb out of \the [src].") + to_chat(M, span_warning("You climb out of \the [src].")) update_icon() update_weight() else - to_chat(M, "You fail to escape \the [src].") + to_chat(M, span_warning("You fail to escape \the [src].")) /obj/item/material/fishing_net/butterfly_net/update_icon() // Also updates name and desc underlays.Cut() diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm index f08eb13c5d..6c3d6161d5 100644 --- a/code/modules/fishing/fishing_rod.dm +++ b/code/modules/fishing/fishing_rod.dm @@ -35,13 +35,13 @@ /obj/item/material/fishing_rod/examine(mob/user) . = ..() if(Bait) - . += "It has [Bait] hanging on its hook: " + . += span_notice("It has [Bait] hanging on its hook: ") . += Bait.examine(user) /obj/item/material/fishing_rod/CtrlClick(mob/user) if((src.loc == user || Adjacent(user)) && Bait) Bait.forceMove(get_turf(user)) - to_chat(user, "You remove the bait from \the [src].") + to_chat(user, span_notice("You remove the bait from \the [src].")) Bait = null else ..() @@ -53,24 +53,24 @@ /obj/item/material/fishing_rod/attackby(obj/item/I as obj, mob/user as mob) if(I.has_tool_quality(TOOL_WIRECUTTER) && strung) strung = FALSE - to_chat(user, "You cut \the [src]'s string!") + to_chat(user, span_notice("You cut \the [src]'s string!")) update_icon() return else if(istype(I, /obj/item/stack/cable_coil) && !strung) var/obj/item/stack/cable_coil/C = I if(C.get_amount() < 5) - to_chat(user, "You do not have enough length in \the [C] to string this!") + to_chat(user, span_warning("You do not have enough length in \the [C] to string this!")) return if(do_after(user, rand(10 SECONDS, 20 SECONDS))) C.use(5) strung = TRUE - to_chat(user, "You string \the [src]!") + to_chat(user, span_notice("You string \the [src]!")) update_icon() return else if(istype(I, bait_type)) if(Bait) Bait.forceMove(get_turf(user)) - to_chat(user, "You swap \the [Bait] with \the [I].") + to_chat(user, span_notice("You swap \the [Bait] with \the [I].")) Bait = I user.drop_from_inventory(Bait) Bait.forceMove(src) @@ -104,7 +104,7 @@ /obj/item/material/fishing_rod/attack(var/mob/M as mob, var/mob/user as mob, var/def_zone) if(cast) - to_chat(user, "You cannot cast \the [src] when it is already in use!") + to_chat(user, span_notice("You cannot cast \the [src] when it is already in use!")) return FALSE update_bait() return ..() @@ -128,4 +128,4 @@ desc = "Mass produced, but somewhat reliable." default_material = "plastic" - toolspeed = 0.9 \ No newline at end of file + toolspeed = 0.9 diff --git a/code/modules/food/drinkingglass/drinkingglass.dm b/code/modules/food/drinkingglass/drinkingglass.dm index 550eed7379..2e5b5035dd 100644 --- a/code/modules/food/drinkingglass/drinkingglass.dm +++ b/code/modules/food/drinkingglass/drinkingglass.dm @@ -152,7 +152,7 @@ if(standard_splash_mob(user, target)) return 1 if(reagents && reagents.total_volume) //They are on harm intent, aka wanting to spill it. - to_chat(user, "You splash the solution onto [target].") + to_chat(user, span_notice("You splash the solution onto [target].")) reagents.splash(target, reagents.total_volume) return 1 ..() diff --git a/code/modules/food/drinkingglass/extras.dm b/code/modules/food/drinkingglass/extras.dm index f9b47f7a5e..c565b98868 100644 --- a/code/modules/food/drinkingglass/extras.dm +++ b/code/modules/food/drinkingglass/extras.dm @@ -92,9 +92,9 @@ /obj/item/glass_extra/straw/proc/sipp_mob(mob/living/victim, mob/user, reagent_type = "nutriment") if(victim.health <= 0) - to_chat(user, "There's not enough of [victim] left to sip on!") + to_chat(user, span_warning("There's not enough of [victim] left to sip on!")) return - + user.visible_message("[user] starts sipping on [victim] with [src]!", "You start sipping on [victim] with [src].") if(!do_after(user, 3 SECONDS, victim, exclusive = TASK_ALL_EXCLUSIVE)) return @@ -102,9 +102,9 @@ user.visible_message("[user] sips some of [victim] with [src]!", "You take a sip of [victim] with [src]. Yum!") if(victim.vore_taste) to_chat(user, "[victim] tastes like... [victim.vore_taste]!") - + victim.apply_damage(5, used_weapon = "straw") - + // If you're human you get the reagent if(ishuman(user)) var/mob/living/carbon/human/H = user diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index faf2ad39e9..a4ad8d9930 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -59,7 +59,7 @@ if(food_inserted_micros) food_inserted_micros -= M M.forceMove(get_turf(src)) - to_chat(M, "You climb out of \the [src].") + to_chat(M, span_warning("You climb out of \the [src].")) #undef CELLS #undef CELLSIZE diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm index 1495dd35e5..0eb6cb0408 100644 --- a/code/modules/food/food/condiment.dm +++ b/code/modules/food/food/condiment.dm @@ -35,15 +35,15 @@ if(istype(target, /obj/item/reagent_containers/food/snacks)) // These are not opencontainers but we can transfer to them if(!reagents || !reagents.total_volume) - to_chat(user, "There is no condiment left in \the [src].") + to_chat(user, span_notice("There is no condiment left in \the [src].")) return if(!target.reagents.get_free_space()) - to_chat(user, "You can't add more condiment to \the [target].") + to_chat(user, span_notice("You can't add more condiment to \the [target].")) return var/trans = reagents.trans_to_obj(target, amount_per_transfer_from_this) - to_chat(user, "You add [trans] units of the condiment to \the [target].") + to_chat(user, span_notice("You add [trans] units of the condiment to \the [target].")) else ..() @@ -51,7 +51,7 @@ playsound(src, 'sound/items/drink.ogg', rand(10, 50), 1) /obj/item/reagent_containers/food/condiment/self_feed_message(var/mob/user) - to_chat(user, "You swallow some of contents of \the [src].") + to_chat(user, span_notice("You swallow some of contents of \the [src].")) /obj/item/reagent_containers/food/condiment/on_reagent_change() if(reagents.reagent_list.len > 0) @@ -570,4 +570,4 @@ /obj/item/reagent_containers/food/condiment/small/packet/protein_powder/strawberry/Initialize() . = ..() - reagents.add_reagent("strawberry_protein_powder", 5) \ No newline at end of file + reagents.add_reagent("strawberry_protein_powder", 5) diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index 317cb18e2a..368a89488c 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -49,7 +49,7 @@ return if(!is_open_container()) - to_chat(user, "You cannot drop anything into \the [src] without opening it first.") + to_chat(user, span_warning("You cannot drop anything into \the [src] without opening it first.")) return var/obj/item/holder/H = W @@ -66,8 +66,8 @@ food_inserted_micros += M - to_chat(user, "You drop [M] into \the [src].") - to_chat(M, "[user] drops you into \the [src].") + to_chat(user, span_warning("You drop [M] into \the [src].")) + to_chat(M, span_warning("[user] drops you into \the [src].")) return return ..() @@ -81,7 +81,7 @@ food_inserted_micros += M - to_chat(user, "You climb into \the [src].") + to_chat(user, span_warning("You climb into \the [src].")) return return ..() @@ -110,7 +110,7 @@ food_inserted_micros -= F if(!reagents.total_volume && changed) - M.visible_message("[M] finishes drinking \the [src].","You finish drinking \the [src].") + M.visible_message(span_notice("[M] finishes drinking \the [src]."),span_notice("You finish drinking \the [src].")) if(trash) user.drop_from_inventory(src) //so icons update :[ if(ispath(trash,/obj/item)) @@ -132,10 +132,10 @@ if(!cant_open) playsound(src,"canopen", rand(10,50), 1) GLOB.cans_opened_roundstat++ - to_chat(user, "You open [src] with an audible pop!") + to_chat(user, span_notice("You open [src] with an audible pop!")) flags |= OPENCONTAINER else - to_chat(user, "...wait a second, this one doesn't have a ring pull. It's not a can, it's a can't!") + to_chat(user, span_warning("...wait a second, this one doesn't have a ring pull. It's not a can, it's a can't!")) name = "\improper can't of [initial(name)]" //don't update the name until they try to open it /obj/item/reagent_containers/food/drinks/attack(mob/M as mob, mob/user as mob, def_zone) @@ -158,7 +158,7 @@ /obj/item/reagent_containers/food/drinks/standard_feed_mob(var/mob/user, var/mob/target) if(!is_open_container()) - to_chat(user, "You need to open [src]!") + to_chat(user, span_notice("You need to open [src]!")) return 1 var/original_volume = reagents.total_volume .=..() @@ -168,27 +168,27 @@ /obj/item/reagent_containers/food/drinks/standard_dispenser_refill(var/mob/user, var/obj/structure/reagent_dispensers/target) if(!is_open_container()) - to_chat(user, "You need to open [src]!") + to_chat(user, span_notice("You need to open [src]!")) return 1 return ..() /obj/item/reagent_containers/food/drinks/standard_pour_into(var/mob/user, var/atom/target) if(!is_open_container()) - to_chat(user, "You need to open [src]!") + to_chat(user, span_notice("You need to open [src]!")) return 1 return ..() /obj/item/reagent_containers/food/drinks/self_feed_message(var/mob/user) if(amount_per_transfer_from_this == volume) //I wanted to use a switch, but switch statements can't use vars and the maximum volume of containers varies - to_chat(user, "You knock back the entire [src] in one go!") + to_chat(user, span_notice("You knock back the entire [src] in one go!")) else if(amount_per_transfer_from_this <= 4) //below the standard 5 - to_chat(user, "You take a modest sip from \the [src].") + to_chat(user, span_notice("You take a modest sip from \the [src].")) else if(amount_per_transfer_from_this <= 10) //the standard five to a bit more - to_chat(user, "You swallow a gulp from \the [src].") + to_chat(user, span_notice("You swallow a gulp from \the [src].")) else if(amount_per_transfer_from_this <= 30) - to_chat(user, "You take a long drag from \the [src].") + to_chat(user, span_notice("You take a long drag from \the [src].")) else //default message as a fallback - to_chat(user, "You swallow a gulp from \the [src].") + to_chat(user, span_notice("You swallow a gulp from \the [src].")) /obj/item/reagent_containers/food/drinks/feed_sound(var/mob/user) playsound(src, 'sound/items/drink.ogg', rand(10, 50), 1) @@ -197,19 +197,19 @@ . = ..() if(Adjacent(user)) if(cant_open) - . += "It doesn't have a ring pull!" + . += span_warning("It doesn't have a ring pull!") if(food_inserted_micros && food_inserted_micros.len) - . += "It has [english_list(food_inserted_micros)] [!reagents?.total_volume ? "sitting" : "floating"] in it." + . += span_notice("It has [english_list(food_inserted_micros)] [!reagents?.total_volume ? "sitting" : "floating"] in it.") if(!reagents?.total_volume) - . += "It is empty!" + . += span_notice("It is empty!") else if (reagents.total_volume <= volume * 0.25) - . += "It is almost empty!" + . += span_notice("It is almost empty!") else if (reagents.total_volume <= volume * 0.66) - . += "It is half full!" + . += span_notice("It is half full!") else if (reagents.total_volume <= volume * 0.90) - . += "It is almost full!" + . += span_notice("It is almost full!") else - . += "It is full!" + . += span_notice("It is full!") //////////////////////////////////////////////////////////////////////////////// @@ -448,7 +448,7 @@ var/obj/structure/reagent_dispensers/water_cooler/W = over_object if(W.cupholder && W.cups < 10) W.cups++ - to_chat(usr, "You put the [src] in the cup dispenser.") + to_chat(usr, span_notice("You put the [src] in the cup dispenser.")) qdel(src) W.update_icon() else diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm index 2094222c63..1409d0d17a 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/food/drinks/bottle.dm @@ -43,7 +43,7 @@ var/throw_dist = get_dist(throw_source, loc) if(smash_check(throw_dist)) //not as reliable as smashing directly if(reagents) - hit_atom.visible_message("The contents of \the [src] splash all over [hit_atom]!") + hit_atom.visible_message(span_notice("The contents of \the [src] splash all over [hit_atom]!")) reagents.splash(hit_atom, reagents.total_volume) src.smash(loc, hit_atom) @@ -100,12 +100,12 @@ if(!choice) return if(!(choice.density && usr.Adjacent(choice))) - to_chat(usr, "You must stay close to your target! You moved away from \the [choice]") + to_chat(usr, span_warning("You must stay close to your target! You moved away from \the [choice]")) return usr.put_in_hands(src.smash(usr.loc, choice)) - usr.visible_message("\The [usr] smashed \the [src] on \the [choice]!") - to_chat(usr, "You smash \the [src] on \the [choice]!") + usr.visible_message(span_danger("\The [usr] smashed \the [src] on \the [choice]!")) + to_chat(usr, span_danger("You smash \the [src] on \the [choice]!")) /obj/item/reagent_containers/food/drinks/bottle/attackby(obj/item/W, mob/user) if(!rag && istype(W, /obj/item/reagent_containers/glass/rag)) @@ -125,7 +125,7 @@ /obj/item/reagent_containers/food/drinks/bottle/proc/insert_rag(obj/item/reagent_containers/glass/rag/R, mob/user) if(!isGlass || rag) return if(user.unEquip(R)) - to_chat(user, "You stuff [R] into [src].") + to_chat(user, span_notice("You stuff [R] into [src].")) rag = R rag.forceMove(src) flags &= ~OPENCONTAINER @@ -165,15 +165,15 @@ weaken_duration = smash_duration + min(0, force - target.getarmor(hit_zone, "melee") + 10) if(hit_zone == "head" && istype(target, /mob/living/carbon/)) - user.visible_message("\The [user] smashes [src] over [target]'s head!") + user.visible_message(span_danger("\The [user] smashes [src] over [target]'s head!")) if(weaken_duration) target.apply_effect(min(weaken_duration, 5), WEAKEN, blocked) // Never weaken more than a flash! else - user.visible_message("\The [user] smashes [src] into [target]!") + user.visible_message(span_danger("\The [user] smashes [src] into [target]!")) //The reagents in the bottle splash all over the target, thanks for the idea Nodrak if(reagents) - user.visible_message("The contents of \the [src] splash all over [target]!") + user.visible_message(span_notice("The contents of \the [src] splash all over [target]!")) reagents.splash(target, reagents.total_volume) //Finally, smash the bottle. This kills (qdel) the bottle. @@ -189,11 +189,11 @@ return if(!isturf(src.loc)) - to_chat(usr, "\The [src] needs to be on the floor to spin.") + to_chat(usr, span_notice("\The [src] needs to be on the floor to spin.")) return var/spin_rotation = (rand(0,359)) - usr.visible_message("\The [usr] spins \the [src]!","You spin \the [src]!") + usr.visible_message(span_warning("\The [usr] spins \the [src]!"),span_notice("You spin \the [src]!")) SpinAnimation(3,10) spawn(30) icon_rotation = spin_rotation diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 1cf8005722..787d331cec 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -80,7 +80,7 @@ food_inserted_micros -= F if(!reagents.total_volume) - M.visible_message("[M] finishes eating \the [src].","You finish eating \the [src].") + M.visible_message(span_notice("[M] finishes eating \the [src]."),span_notice("You finish eating \the [src].")) usr.drop_from_inventory(src) // Drop food from inventory so it doesn't end up staying on the hud after qdel, and so inhands go away @@ -98,17 +98,17 @@ /obj/item/reagent_containers/food/snacks/attack(mob/living/M as mob, mob/user as mob, def_zone) if(reagents && !reagents.total_volume) - to_chat(user, "None of [src] left!") + to_chat(user, span_danger("None of [src] left!")) user.drop_from_inventory(src) qdel(src) return 0 if(package) - to_chat(M, "How do you expect to eat this with the package still on?") + to_chat(M, span_warning("How do you expect to eat this with the package still on?")) return FALSE if(canned) - to_chat(M, "How do you expect to eat this without opening it?") + to_chat(M, span_warning("How do you expect to eat this without opening it?")) return FALSE if(istype(M, /mob/living/carbon)) @@ -129,30 +129,30 @@ else blocked = H.check_mouth_coverage() if(blocked) - to_chat(user, "\The [blocked] is in the way!") + to_chat(user, span_warning("\The [blocked] is in the way!")) return user.setClickCooldown(user.get_attack_speed(src)) //puts a limit on how fast people can eat/drink things if (fullness <= 50) - to_chat(M, "You hungrily chew out a piece of [src] and gobble it!") + to_chat(M, span_danger("You hungrily chew out a piece of [src] and gobble it!")) if (fullness > 50 && fullness <= 150) - to_chat(M, "You hungrily begin to eat [src].") + to_chat(M, span_notice("You hungrily begin to eat [src].")) if (fullness > 150 && fullness <= 350) - to_chat(M, "You take a bite of [src].") + to_chat(M, span_notice("You take a bite of [src].")) if (fullness > 350 && fullness <= 550) - to_chat(M, "You unwillingly chew a bit of [src].") + to_chat(M, span_notice("You unwillingly chew a bit of [src].")) if (fullness > 550 && fullness <= 650) - to_chat(M, "You swallow some more of the [src], causing your belly to swell out a little.") + to_chat(M, span_notice("You swallow some more of the [src], causing your belly to swell out a little.")) if (fullness > 650 && fullness <= 1000) - to_chat(M, "You stuff yourself with the [src]. Your stomach feels very heavy.") + to_chat(M, span_notice("You stuff yourself with the [src]. Your stomach feels very heavy.")) if (fullness > 1000 && fullness <= 3000) - to_chat(M, "You gluttonously swallow down the hunk of [src]. You're so gorged, it's hard to stand.") + to_chat(M, span_notice("You gluttonously swallow down the hunk of [src]. You're so gorged, it's hard to stand.")) if (fullness > 3000 && fullness <= 5500) - to_chat(M, "You force the piece of [src] down your throat. You can feel your stomach getting firm as it reaches its limits.") + to_chat(M, span_danger("You force the piece of [src] down your throat. You can feel your stomach getting firm as it reaches its limits.")) if (fullness > 5500 && fullness <= 6000) - to_chat(M, "You barely glug down the bite of [src], causing undigested food to force into your intestines. You can't take much more of this!") + to_chat(M, span_danger("You barely glug down the bite of [src], causing undigested food to force into your intestines. You can't take much more of this!")) if (fullness > 6000) // There has to be a limit eventually. - to_chat(M, "Your stomach blorts and aches, prompting you to stop. You literally cannot force any more of [src] to go down your throat.") + to_chat(M, span_danger("Your stomach blorts and aches, prompting you to stop. You literally cannot force any more of [src] to go down your throat.")) return 0 else if(user.a_intent == I_HURT) @@ -180,25 +180,25 @@ belly_target = M.vore_selected if(unconcious) - to_chat(user, "You can't feed [H] through \the [blocked] while they are unconcious!") + to_chat(user, span_warning("You can't feed [H] through \the [blocked] while they are unconcious!")) return if(blocked) - to_chat(user, "\The [blocked] is in the way!") + to_chat(user, span_warning("\The [blocked] is in the way!")) return if(swallow_whole) if(!(M.feeding)) - to_chat(user, "You can't feed [H] a whole [src] as they refuse to be fed whole things!") + to_chat(user, span_warning("You can't feed [H] a whole [src] as they refuse to be fed whole things!")) return if(!belly_target) - to_chat(user, "You can't feed [H] a whole [src] as they don't appear to have a belly to fit it!") + to_chat(user, span_warning("You can't feed [H] a whole [src] as they don't appear to have a belly to fit it!")) return if(swallow_whole) - user.visible_message("[user] attempts to make [M] consume [src] whole into their [belly_target].") + user.visible_message(span_danger("[user] attempts to make [M] consume [src] whole into their [belly_target].")) else - user.visible_message("[user] attempts to feed [M] [src].") + user.visible_message(span_danger("[user] attempts to feed [M] [src].")) var/feed_duration = 3 SECONDS if(swallow_whole) @@ -211,10 +211,10 @@ if(swallow_whole) add_attack_logs(user,M,"Whole-fed with [src.name] containing [reagentlist(src)] into [belly_target]", admin_notify = FALSE) - user.visible_message("[user] successfully forces [src] into [M]'s [belly_target].") + user.visible_message(span_danger("[user] successfully forces [src] into [M]'s [belly_target].")) else add_attack_logs(user,M,"Fed with [src.name] containing [reagentlist(src)]", admin_notify = FALSE) - user.visible_message("[user] feeds [M] [src].") + user.visible_message(span_danger("[user] feeds [M] [src].")) else to_chat(user, "This creature does not seem to have a mouth!") @@ -241,17 +241,17 @@ . = ..() if(Adjacent(user)) if(food_inserted_micros && food_inserted_micros.len) - . += "It has [english_list(food_inserted_micros)] stuck in it." + . += span_notice("It has [english_list(food_inserted_micros)] stuck in it.") if(coating) - . += "It's coated in [coating.name]!" + . += span_notice("It's coated in [coating.name]!") if(bitecount==0) return . else if (bitecount==1) - . += "It was bitten by someone!" + . += span_notice("It was bitten by someone!") else if (bitecount<=3) - . += "It was bitten [bitecount] times!" + . += span_notice("It was bitten [bitecount] times!") else - . += "It was bitten multiple times!" + . += span_notice("It was bitten multiple times!") /obj/item/reagent_containers/food/snacks/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/storage)) @@ -270,7 +270,7 @@ return if(package || canned) - to_chat(user, "You cannot stuff anything into \the [src] without opening it first.") + to_chat(user, span_warning("You cannot stuff anything into \the [src] without opening it first.")) return var/obj/item/holder/H = W @@ -287,8 +287,8 @@ food_inserted_micros += M - to_chat(user, "You stuff [M] into \the [src].") - to_chat(M, "[user] stuffs you into \the [src].") + to_chat(user, span_warning("You stuff [M] into \the [src].")) + to_chat(M, span_warning("[user] stuffs you into \the [src].")) return if (is_sliceable()) @@ -301,10 +301,10 @@ return if(tgui_alert(user,"You can't slice \the [src] here. Would you like to hide \the [W] inside it instead?","No Cutting Surface!",list("Yes","No")) != "Yes") - to_chat(user, "You cannot slice \the [src] here! You need a table or at least a tray to do it.") + to_chat(user, span_warning("You cannot slice \the [src] here! You need a table or at least a tray to do it.")) return else - to_chat(user, "You slip \the [W] inside \the [src].") + to_chat(user, span_warning("You slip \the [W] inside \the [src].")) user.drop_from_inventory(W, src) add_fingerprint(user) contents += W @@ -312,15 +312,15 @@ if (has_edge(W)) if (!can_slice_here) - to_chat(user, "You cannot slice \the [src] here! You need a table or at least a tray to do it.") + to_chat(user, span_warning("You cannot slice \the [src] here! You need a table or at least a tray to do it.")) return var/slices_lost = 0 if (W.w_class > 3) - user.visible_message("\The [user] crudely slices \the [src] with [W]!", "You crudely slice \the [src] with your [W]!") + user.visible_message(span_notice("\The [user] crudely slices \the [src] with [W]!"), span_notice("You crudely slice \the [src] with your [W]!")) slices_lost = rand(1,min(1,round(slices_num/2))) else - user.visible_message("\The [user] slices \the [src]!", "You slice \the [src]!") + user.visible_message("\The [user] slices \the [src]!", span_notice("You slice \the [src]!")) var/reagents_per_slice = reagents.total_volume/slices_num for(var/i=1 to (slices_num-slices_lost)) @@ -347,7 +347,7 @@ food_inserted_micros += M - to_chat(user, "You climb into \the [src].") + to_chat(user, span_warning("You climb into \the [src].")) return return ..() @@ -367,7 +367,7 @@ /obj/item/reagent_containers/food/snacks/proc/unpackage(mob/user) package = FALSE - to_chat(user, "You unwrap [src].") + to_chat(user, span_notice("You unwrap [src].")) playsound(user,opening_sound, 15, 1) if(package_trash) var/obj/item/T = new package_trash @@ -379,7 +379,7 @@ /obj/item/reagent_containers/food/snacks/proc/uncan(mob/user) canned = FALSE - to_chat(user, "You unseal \the [src] with a crack of metal.") + to_chat(user, span_notice("You unseal \the [src] with a crack of metal.")) playsound(loc,opening_sound, rand(10,50), 1) if(canned_open_state) icon_state = canned_open_state @@ -1219,10 +1219,10 @@ /obj/item/reagent_containers/food/snacks/donkpocket/sinpocket/attack_self(mob/user) if(has_been_heated) - to_chat(user, "The heating chemicals have already been spent.") + to_chat(user, span_notice("The heating chemicals have already been spent.")) return has_been_heated = 1 - user.visible_message("[user] crushes \the [src] package.", "You crush \the [src] package and feel a comfortable heat build up. Now just to wait for it to be ready.") + user.visible_message(span_notice("[user] crushes \the [src] package."), "You crush \the [src] package and feel a comfortable heat build up. Now just to wait for it to be ready.") spawn(200) if(!QDELETED(src)) if(src.loc == user) @@ -1410,7 +1410,7 @@ /obj/item/reagent_containers/food/snacks/pie/throw_impact(atom/hit_atom) . = ..() new/obj/effect/decal/cleanable/pie_smudge(src.loc) - src.visible_message("\The [src.name] splats.","You hear a splat.") + src.visible_message(span_danger("\The [src.name] splats."),span_danger("You hear a splat.")) qdel(src) /obj/item/reagent_containers/food/snacks/berryclafoutis @@ -1885,7 +1885,7 @@ /obj/item/reagent_containers/food/snacks/monkeycube/On_Consume(var/mob/M) if(ishuman(M)) var/mob/living/carbon/human/H = M - H.visible_message("A screeching creature bursts out of [M]'s chest!") + H.visible_message(span_warning("A screeching creature bursts out of [M]'s chest!")) var/obj/item/organ/external/organ = H.get_organ(BP_TORSO) organ.take_damage(50, 0, 0, "Animal escaping the ribcage") Expand() @@ -3854,7 +3854,7 @@ if( open && pizza ) user.put_in_hands( pizza ) - to_chat(user, "You take \the [src.pizza] out of \the [src].") + to_chat(user, span_warning("You take \the [src.pizza] out of \the [src].")) src.pizza = null update_icon() return @@ -3868,7 +3868,7 @@ boxes -= box user.put_in_hands( box ) - to_chat(user, "You remove the topmost [src] from your hand.") + to_chat(user, span_warning("You remove the topmost [src] from your hand.")) box.update_icon() update_icon() return @@ -3907,11 +3907,11 @@ box.update_icon() update_icon() - to_chat(user, "You put \the [box] ontop of \the [src]!") + to_chat(user, span_warning("You put \the [box] ontop of \the [src]!")) else - to_chat(user, "The stack is too high!") + to_chat(user, span_warning("The stack is too high!")) else - to_chat(user, "Close \the [box] first!") + to_chat(user, span_warning("Close \the [box] first!")) return @@ -3924,9 +3924,9 @@ update_icon() - to_chat(user, "You put \the [I] in \the [src]!") + to_chat(user, span_warning("You put \the [I] in \the [src]!")) else - to_chat(user, "You try to push \the [I] through the lid but it doesn't work!") + to_chat(user, span_warning("You try to push \the [I] through the lid but it doesn't work!")) return if( istype(I, /obj/item/pen/) ) @@ -4185,11 +4185,11 @@ /obj/item/reagent_containers/food/snacks/grown/attackby(obj/item/W, mob/user) if(seed && seed.kitchen_tag && seed.kitchen_tag == "potato" && istype(W,/obj/item/material/knife)) new /obj/item/reagent_containers/food/snacks/rawsticks(get_turf(src)) - to_chat(user, "You cut the potato.") + to_chat(user, span_notice("You cut the potato.")) qdel(src) else if(seed && seed.kitchen_tag && seed.kitchen_tag == "sunflower" && istype(W,/obj/item/material/knife)) new /obj/item/reagent_containers/food/snacks/rawsunflower(get_turf(src)) - to_chat(user, "You remove the seeds from the flower, slightly damaging them.") + to_chat(user, span_notice("You remove the seeds from the flower, slightly damaging them.")) qdel(src) else . = ..() @@ -4639,7 +4639,7 @@ return ..() if(!(proximity && O.is_open_container())) return - to_chat(user, "You tear \the [src]'s sac open, pouring it into \the [O].") + to_chat(user, span_notice("You tear \the [src]'s sac open, pouring it into \the [O].")) reagents.trans_to(O, reagents.total_volume) user.drop_from_inventory(src) qdel(src) @@ -4764,7 +4764,7 @@ return 0 if (C.volume < req) - to_chat(user, "There's not enough [C.name] to coat the [src]!") + to_chat(user, span_warning("There's not enough [C.name] to coat the [src]!")) return 0 var/id = C.id @@ -4841,7 +4841,7 @@ /obj/item/reagent_containers/food/snacks/proc/on_consume(var/mob/eater, var/mob/feeder = null) if(!reagents.total_volume) - eater.visible_message("[eater] finishes eating \the [src].","You finish eating \the [src].") + eater.visible_message(span_notice("[eater] finishes eating \the [src]."),span_notice("You finish eating \the [src].")) if (!feeder) feeder = eater diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm index e51a2ae0a9..1cd1671a5f 100644 --- a/code/modules/food/food/snacks/meat.dm +++ b/code/modules/food/food/snacks/meat.dm @@ -183,8 +183,8 @@ new to_spawn(get_turf(src)) if(prob(20)) - user.visible_message("Something oozes out of \the [src] as it is cut.") + user.visible_message(span_alien("Something oozes out of \the [src] as it is cut.")) - to_chat(user, "You cut the tissue holding the chunks together.") + to_chat(user, span_alien("You cut the tissue holding the chunks together.")) ..() diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm index 3a3d873f28..c121e4a97a 100644 --- a/code/modules/food/food/superfoods.dm +++ b/code/modules/food/food/superfoods.dm @@ -254,7 +254,7 @@ new /obj/item/reagent_containers/food/snacks/chaoscakeslice(src.loc) else - to_chat(user, "It looks so good... But it feels so wrong to eat it before it's finished...") + to_chat(user, span_notice("It looks so good... But it feels so wrong to eat it before it's finished...")) return if(istype(W,/obj/item/chaoscake_layer)) var/obj/item/chaoscake_layer/C = W @@ -299,11 +299,11 @@ /obj/structure/theonepizza/attackby(var/obj/item/W, var/mob/living/user) if(istype(W,/obj/item/material/knife)) - user.visible_message("\The [user] starts to slowly cut through The One Pizza.", "You start to slowly cut through The One Pizza.") + user.visible_message("\The [user] starts to slowly cut through The One Pizza.", span_notice("You start to slowly cut through The One Pizza.")) if(do_after(user, slicetime, exclusive = TASK_USER_EXCLUSIVE)) if(!src) return // We got disappeared already - user.visible_message("\The [user] successfully cuts The One Pizza.", "You successfully cut The One Pizza.") + user.visible_message("\The [user] successfully cuts The One Pizza.", span_notice("You successfully cut The One Pizza.")) for(var/slicetype in slicelist) new slicetype(src.loc) qdel(src) @@ -355,4 +355,4 @@ /obj/item/reagent_containers/food/snacks/pineapple_ring, /obj/item/reagent_containers/food/snacks/pineapple_ring ) - result = /obj/structure/theonepizza \ No newline at end of file + result = /obj/structure/theonepizza diff --git a/code/modules/food/food/z_custom_food_vr.dm b/code/modules/food/food/z_custom_food_vr.dm index 0470bd6756..50c87dcb4e 100644 --- a/code/modules/food/food/z_custom_food_vr.dm +++ b/code/modules/food/food/z_custom_food_vr.dm @@ -29,21 +29,21 @@ var/global/ingredientLimit = 20 /obj/item/reagent_containers/food/snacks/customizable/attackby(obj/item/I, mob/user) if(istype(I,/obj/item/reagent_containers/food/snacks)) if((contents.len >= ingMax) || (contents.len >= ingredientLimit)) - to_chat(user, "That's already looking pretty stuffed.") + to_chat(user, span_warning("That's already looking pretty stuffed.")) return var/obj/item/reagent_containers/food/snacks/S = I if(istype(S,/obj/item/reagent_containers/food/snacks/customizable)) var/obj/item/reagent_containers/food/snacks/customizable/SC = S if(fullyCustom && SC.fullyCustom) - to_chat(user, "You slap yourself on the back of the head for thinking that stacking plates is an interesting dish.") + to_chat(user, span_warning("You slap yourself on the back of the head for thinking that stacking plates is an interesting dish.")) return if(!recursiveFood && istype(I, /obj/item/reagent_containers/food/snacks/customizable)) - //to_chat(user, "[pick("As uniquely original as that idea is, you can't figure out how to perform it.","That would be a straining topological exercise.","This world just isn't ready for your cooking genius.","It's possible that you may have a problem.","It won't fit.","You don't think that would taste very good.","Quit goofin' around.")]") - to_chat(user, "As uniquely original as that idea is, you can't figure out how to perform it.") + //to_chat(user, span_warning("[pick("As uniquely original as that idea is, you can't figure out how to perform it.","That would be a straining topological exercise.","This world just isn't ready for your cooking genius.","It's possible that you may have a problem.","It won't fit.","You don't think that would taste very good.","Quit goofin' around.")]")) + to_chat(user, span_warning("As uniquely original as that idea is, you can't figure out how to perform it.")) return /*if(!user.drop_item()) - to_chat(user, "\The [I] is stuck to your hands!") + to_chat(user, span_warning("\The [I] is stuck to your hands!")) return*/ user.drop_item() I.forceMove(src) @@ -66,7 +66,7 @@ var/global/ingredientLimit = 20 drawTopping() updateName() - to_chat(user, "You add the [I.name] to the [src.name].") + to_chat(user, span_notice("You add the [I.name] to the [src.name].")) else . = ..() return @@ -186,7 +186,7 @@ var/global/ingredientLimit = 20 /obj/item/reagent_containers/food/snacks/slice/bread/attackby(obj/item/I,mob/user,params) if(istype(I,/obj/item/reagent_containers/food/snacks)) if(!recursiveFood && istype(I, /obj/item/reagent_containers/food/snacks/customizable)) - to_chat(user, "Sorry, no recursive food.") + to_chat(user, span_warning("Sorry, no recursive food.")) return var/obj/F = new/obj/item/reagent_containers/food/snacks/customizable/sandwich(get_turf(src),I) //boy ain't this a mouthful F.attackby(I, user) @@ -218,7 +218,7 @@ var/global/ingredientLimit = 20 if(istype(I,/obj/item/reagent_containers/food/snacks)) if(!recursiveFood && istype(I, /obj/item/reagent_containers/food/snacks/customizable)) - to_chat(user, "Sorry, no recursive food.") + to_chat(user, span_warning("Sorry, no recursive food.")) return var/obj/F = new/obj/item/reagent_containers/food/snacks/customizable/burger(get_turf(src),I) F.attackby(I, user) @@ -229,7 +229,7 @@ var/global/ingredientLimit = 20 /obj/item/reagent_containers/food/snacks/sliceable/flatdough/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/reagent_containers/food/snacks)) if(!recursiveFood && istype(I, /obj/item/reagent_containers/food/snacks/customizable)) - to_chat(user, "Sorry, no recursive food.") + to_chat(user, span_warning("Sorry, no recursive food.")) return var/obj/F = new/obj/item/reagent_containers/food/snacks/customizable/pizza(get_turf(src),I) F.attackby(I, user) @@ -240,7 +240,7 @@ var/global/ingredientLimit = 20 /obj/item/reagent_containers/food/snacks/spagetti/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/reagent_containers/food/snacks)) if(!recursiveFood && istype(I, /obj/item/reagent_containers/food/snacks/customizable)) - to_chat(user, "Sorry, no recursive food.") + to_chat(user, span_warning("Sorry, no recursive food.")) return var/obj/F = new/obj/item/reagent_containers/food/snacks/customizable/pasta(get_turf(src),I) F.attackby(I, user) @@ -253,7 +253,7 @@ var/global/ingredientLimit = 20 /obj/item/trash/plate/attackby(obj/item/I, mob/user) if(istype(I,/obj/item/reagent_containers/food/snacks)) if(istype(I,/obj/item/reagent_containers/food/snacks/customizable/fullycustom)) //no platestacking even with recursive food, for now - to_chat(user, "That's already got a plate!") + to_chat(user, span_warning("That's already got a plate!")) return var/obj/F = new/obj/item/reagent_containers/food/snacks/customizable/fullycustom(get_turf(src),I) F.attackby(I, user) @@ -271,7 +271,7 @@ var/global/ingredientLimit = 20 /obj/item/trash/bowl/attackby(obj/item/I, mob/user) if(istype(I,/obj/item/reagent_containers/food/snacks)) if(!recursiveFood && istype(I, /obj/item/reagent_containers/food/snacks/customizable)) - to_chat(user, "Sorry, no recursive food.") + to_chat(user, span_warning("Sorry, no recursive food.")) return var/obj/F = new/obj/item/reagent_containers/food/snacks/customizable/soup(get_turf(src),I) F.attackby(I, user) diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/kitchen/cooking_machines/_appliance.dm index 0b31b08304..c16788de46 100644 --- a/code/modules/food/kitchen/cooking_machines/_appliance.dm +++ b/code/modules/food/kitchen/cooking_machines/_appliance.dm @@ -77,7 +77,7 @@ string += "-\a [CI.container.label(null, CI.combine_target)], [report_progress(CI)]
" return string else - to_chat(user, "It is empty.") + to_chat(user, span_notice("It is empty.")) /obj/machinery/appliance/proc/report_progress_tgui(datum/cooking_item/CI) if(!CI || !CI.max_cookwork) @@ -114,17 +114,17 @@ if (progress < 0.25) return "It's barely started cooking." if (progress < 0.75) - return "It's cooking away nicely." + return span_notice("It's cooking away nicely.") if (progress < 1) - return "It's almost ready!" + return span_notice("It's almost ready!") var/half_overcook = (CI.overcook_mult - 1)*0.5 if (progress < 1+half_overcook) - return "It is done !" + return span_soghun("It is done !") if (progress < CI.overcook_mult) - return "It looks overcooked, get it out!" + return span_warning("It looks overcooked, get it out!") else - return "It is burning!" + return span_danger("It is burning!") /obj/machinery/appliance/update_icon() if (!stat && cooking_objs.len) @@ -145,25 +145,25 @@ return if (!user.IsAdvancedToolUser()) - to_chat(user, "You lack the dexterity to do that!") + to_chat(user, span_warning("You lack the dexterity to do that!")) return if (user.stat || user.restrained() || user.incapacitated()) return if (!Adjacent(user) && !issilicon(user)) - to_chat(user, "You can't reach [src] from here!") + to_chat(user, span_warning("You can't reach [src] from here!")) return if (stat & POWEROFF)//Its turned off stat &= ~POWEROFF use_power = 1 - user.visible_message("[user] turns [src] on.", "You turn on [src].") + user.visible_message(span_filter_notice("[user] turns [src] on."), span_filter_notice("You turn on [src].")) else //Its on, turn it off stat |= POWEROFF use_power = 0 - user.visible_message("[user] turns [src] off.", "You turn off [src].") + user.visible_message(span_filter_notice("[user] turns [src] off."), span_filter_notice("You turn off [src].")) cooking = FALSE // Stop cooking here, too, just in case. playsound(src, 'sound/machines/click.ogg', 40, 1) @@ -181,14 +181,14 @@ return if (!usr.IsAdvancedToolUser()) - to_chat(usr, "You lack the dexterity to do that!") + to_chat(usr, span_filter_notice("You lack the dexterity to do that!")) return if (usr.stat || usr.restrained() || usr.incapacitated()) return if (!Adjacent(usr) && !issilicon(usr)) - to_chat(usr, "You can't adjust the [src] from this distance, get closer!") + to_chat(usr, span_filter_notice("You can't adjust the [src] from this distance, get closer!")) return if(output_options.len) @@ -197,10 +197,10 @@ return if(choice == "Default") selected_option = null - to_chat(usr, "You decide not to make anything specific with \the [src].") + to_chat(usr, span_notice("You decide not to make anything specific with \the [src].")) else selected_option = choice - to_chat(usr, "You prepare \the [src] to make \a [selected_option] with the next thing you put in. Try putting several ingredients in a container!") + to_chat(usr, span_notice("You prepare \the [src] to make \a [selected_option] with the next thing you put in. Try putting several ingredients in a container!")) //Handles all validity checking and error messages for inserting things /obj/machinery/appliance/proc/can_insert(var/obj/item/I, var/mob/user) @@ -214,18 +214,18 @@ if(istype(G)) if(!can_cook_mobs) - to_chat(user, "That's not going to fit.") + to_chat(user, span_warning("That's not going to fit.")) return 0 if(!isliving(G.affecting)) - to_chat(user, "You can't cook that.") + to_chat(user, span_warning("You can't cook that.")) return 0 return 2 if (!has_space(I)) - to_chat(user, "There's no room in [src] for that!") + to_chat(user, span_warning("There's no room in [src] for that!")) return 0 @@ -235,18 +235,18 @@ // We're trying to cook something else. Check if it's valid. var/obj/item/reagent_containers/food/snacks/check = I if(istype(check) && islist(check.cooked) && (cook_type in check.cooked)) - to_chat(user, "\The [check] has already been [cook_type].") + to_chat(user, span_warning("\The [check] has already been [cook_type].")) return 0 else if(istype(check, /obj/item/reagent_containers/glass)) - to_chat(user, "That would probably break [src].") + to_chat(user, span_warning("That would probably break [src].")) return 0 else if(istype(check, /obj/item/disk/nuclear)) - to_chat(user, "You can't cook that.") + to_chat(user, span_warning("You can't cook that.")) return 0 else if(I.has_tool_quality(TOOL_CROWBAR) || I.has_tool_quality(TOOL_SCREWDRIVER) || istype(I, /obj/item/storage/part_replacer)) // You can't cook tools, dummy. return 0 else if(!istype(check) && !istype(check, /obj/item/holder)) - to_chat(user, "That's not edible.") + to_chat(user, span_warning("That's not edible.")) return 0 return 1 @@ -261,7 +261,7 @@ /obj/machinery/appliance/attackby(var/obj/item/I, var/mob/user) if(!cook_type || (stat & (BROKEN))) - to_chat(user, "\The [src] is not working.") + to_chat(user, span_warning("\The [src] is not working.")) return FALSE var/obj/item/ToCook = I @@ -595,7 +595,7 @@ new /obj/item/reagent_containers/food/snacks/badrecipe(CI.container) // Produce nasty smoke. - visible_message("\The [src] vomits a gout of rancid smoke!") + visible_message(span_danger("\The [src] vomits a gout of rancid smoke!")) var/datum/effect/effect/system/smoke_spread/bad/burntfood/smoke = new /datum/effect/effect/system/smoke_spread/bad/burntfood playsound(src, 'sound/effects/smoke.ogg', 20, 1) smoke.attach(src) @@ -666,7 +666,7 @@ CI.reset()//reset instead of deleting if the container is left inside if(user) - user.visible_message("\The [user] remove \the [thing] from \the [src].") + user.visible_message(span_notice("\The [user] remove \the [thing] from \the [src].")) else src.visible_message("\The [src] pings as it automatically ejects its contents!") if(cooked_sound) diff --git a/code/modules/food/kitchen/cooking_machines/_cooker.dm b/code/modules/food/kitchen/cooking_machines/_cooker.dm index 6ce05e70e3..a8c1c25080 100644 --- a/code/modules/food/kitchen/cooking_machines/_cooker.dm +++ b/code/modules/food/kitchen/cooking_machines/_cooker.dm @@ -76,12 +76,12 @@ if(.) //no need to duplicate adjacency check if(!stat) if (temperature < min_temp) - . += "\The [src] is still heating up and is too cold to cook anything yet." + . += span_warning("\The [src] is still heating up and is too cold to cook anything yet.") else - . += "It is running at [round(get_efficiency(), 0.1)]% efficiency!" + . += span_notice("It is running at [round(get_efficiency(), 0.1)]% efficiency!") . += "Temperature: [round(temperature - T0C, 0.1)]C / [round(optimal_temp - T0C, 0.1)]C" else - . += "It is switched off." + . += span_warning("It is switched off.") /obj/machinery/appliance/cooker/list_contents(var/mob/user) if (cooking_objs.len) @@ -94,7 +94,7 @@ string += "- [CI.container.label(num)], [report_progress(CI)]
" to_chat(user, string) else - to_chat(user, "It's empty.") + to_chat(user, span_notice("It's empty.")) /obj/machinery/appliance/cooker/proc/get_efficiency() // to_world("Our cooking_power is [cooking_power] and our efficiency is [(cooking_power / optimal_power) * 100].") // Debug lines, uncomment if you need to test. @@ -199,5 +199,5 @@ /obj/machinery/appliance/cooker/add_content(var/obj/item/I, var/mob/user) var/datum/cooking_item/CI = ..() if(istype(CI) && CI.combine_target) - to_chat(user, "\The [I] will be used to make a [selected_option]. Output selection is returned to default for future items.") - selected_option = null \ No newline at end of file + to_chat(user, span_filter_notice("\The [I] will be used to make a [selected_option]. Output selection is returned to default for future items.")) + selected_option = null diff --git a/code/modules/food/kitchen/cooking_machines/_mixer.dm b/code/modules/food/kitchen/cooking_machines/_mixer.dm index 64ca7c6b8c..504a80ab89 100644 --- a/code/modules/food/kitchen/cooking_machines/_mixer.dm +++ b/code/modules/food/kitchen/cooking_machines/_mixer.dm @@ -18,7 +18,7 @@ fundamental differences /obj/machinery/appliance/mixer/examine(var/mob/user) . = ..() if(Adjacent(user)) - . += "It is currently set to make a [selected_option]" + . += span_notice("It is currently set to make a [selected_option]") /obj/machinery/appliance/mixer/Initialize() . = ..() @@ -43,7 +43,7 @@ fundamental differences return if (!usr.IsAdvancedToolUser()) - to_chat(usr, "You can't operate [src].") + to_chat(usr, span_notice("You can't operate [src].")) return if(output_options.len) @@ -52,7 +52,7 @@ fundamental differences return else selected_option = choice - to_chat(usr, "You prepare \the [src] to make \a [selected_option].") + to_chat(usr, span_notice("You prepare \the [src] to make \a [selected_option].")) var/datum/cooking_item/CI = cooking_objs[1] CI.combine_target = selected_option @@ -73,7 +73,7 @@ fundamental differences return 1 else if(show_warning) - to_chat(user, "You can't remove ingredients while it's turned on! Turn it off first or wait for it to finish.") + to_chat(user, span_warning("You can't remove ingredients while it's turned on! Turn it off first or wait for it to finish.")) return 0 //Container is not removable @@ -83,7 +83,7 @@ fundamental differences for(var/datum/cooking_item/CI as anything in cooking_objs) if (CI.container) if (!CI.container.check_contents()) - to_chat(user, "There's nothing in [src] you can remove!") + to_chat(user, span_filter_notice("There's nothing in [src] you can remove!")) return for (var/obj/item/I in CI.container) @@ -106,26 +106,26 @@ fundamental differences var/datum/cooking_item/CI = cooking_objs[1] if(!CI.container.check_contents()) - to_chat(usr, "There's nothing in it! Add ingredients before turning [src] on!") + to_chat(usr, span_filter_notice("There's nothing in it! Add ingredients before turning [src] on!")) return if(stat & POWEROFF)//Its turned off stat &= ~POWEROFF if(usr) - usr.visible_message("[usr] turns the [src] on.", "You turn on \the [src].") + usr.visible_message(span_filter_notice("[usr] turns the [src] on."), span_filter_notice("You turn on \the [src].")) get_cooking_work(CI) use_power = 2 else //Its on, turn it off stat |= POWEROFF use_power = 0 if(usr) - usr.visible_message("[usr] turns the [src] off.", "You turn off \the [src].") + usr.visible_message(span_filter_notice("[usr] turns the [src] off."), span_filter_notice("You turn off \the [src].")) playsound(src, 'sound/machines/click.ogg', 40, 1) update_icon() /obj/machinery/appliance/mixer/can_insert(var/obj/item/I, var/mob/user) if(!stat) - to_chat(user, ",You can't add items while \the [src] is running. Wait for it to finish or turn the power off to abort.") + to_chat(user, span_warning(",You can't add items while \the [src] is running. Wait for it to finish or turn the power off to abort.")) return 0 else return ..() diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/kitchen/cooking_machines/container.dm index d577fa859b..2d519d75f9 100644 --- a/code/modules/food/kitchen/cooking_machines/container.dm +++ b/code/modules/food/kitchen/cooking_machines/container.dm @@ -31,9 +31,9 @@ var/string = "It contains....
" for (var/atom/movable/A in contents) string += "[A.name]
" - . += "[string]" + . += span_notice("[string]") if (reagents.total_volume) - . += "It contains [reagents.total_volume]u of reagents." + . += span_notice("It contains [reagents.total_volume]u of reagents.") /obj/item/reagent_containers/cooking_container/attackby(var/obj/item/I as obj, var/mob/user as mob) @@ -53,13 +53,13 @@ for (var/possible_type in insertable) if (istype(I, possible_type)) if (!can_fit(I)) - to_chat(user, "There's no more space in the [src] for that!") + to_chat(user, span_warning("There's no more space in the [src] for that!")) return 0 if(!user.unEquip(I) && !isturf(I.loc)) return I.forceMove(src) - to_chat(user, "You put the [I] into the [src].") + to_chat(user, span_notice("You put the [I] into the [src].")) food_items += 1 update_icon() return @@ -78,21 +78,21 @@ return if (user.stat || user.restrained()) - to_chat(user, "You are in no fit state to do this.") + to_chat(user, span_notice("You are in no fit state to do this.")) return if (!Adjacent(user)) - to_chat(user, "You can't reach [src] from here.") + to_chat(user, span_filter_notice("You can't reach [src] from here.")) return if (!contents.len) - to_chat(user, "There's nothing in the [src] you can remove!") + to_chat(user, span_warning("There's nothing in the [src] you can remove!")) return for (var/atom/movable/A in contents) A.forceMove(get_turf(src)) - to_chat(user, "You remove all the solid items from the [src].") + to_chat(user, span_notice("You remove all the solid items from the [src].")) /obj/item/reagent_containers/cooking_container/proc/check_contents() if (contents.len == 0) diff --git a/code/modules/food/kitchen/cooking_machines/fryer.dm b/code/modules/food/kitchen/cooking_machines/fryer.dm index e7ffbce2f6..57ed1bb7d5 100644 --- a/code/modules/food/kitchen/cooking_machines/fryer.dm +++ b/code/modules/food/kitchen/cooking_machines/fryer.dm @@ -176,7 +176,7 @@ if(!istype(victim)) return - // user.visible_message("\The [user] starts pushing \the [victim] into \the [src]!") + // user.visible_message(span_danger("\The [user] starts pushing \the [victim] into \the [src]!")) //Removed delay on this action in favour of a cooldown after it //If you can lure someone close to the fryer and grab them then you deserve success. @@ -193,7 +193,7 @@ return if(!victim || !victim.Adjacent(user)) - to_chat(user, "Your victim slipped free!") + to_chat(user, span_danger("Your victim slipped free!")) cooking = FALSE icon_state = off_icon fry_loop.stop(src) @@ -214,7 +214,7 @@ else if(E.robotic >= ORGAN_ROBOT) nopain = 1 - user.visible_message("\The [user] shoves \the [victim][E ? "'s [E.name]" : ""] into \the [src]!") + user.visible_message(span_danger("\The [user] shoves \the [victim][E ? "'s [E.name]" : ""] into \the [src]!")) if (damage > 0) if(E) if(E.children && E.children.len) @@ -228,10 +228,10 @@ victim.apply_damage(damage, BURN, user.zone_sel.selecting) if(!nopain) - to_chat(victim, "Agony consumes you as searing hot oil scorches your [E ? E.name : "flesh"] horribly!") + to_chat(victim, span_danger("Agony consumes you as searing hot oil scorches your [E ? E.name : "flesh"] horribly!")) victim.emote("scream") else - to_chat(victim, "Searing hot oil scorches your [E ? E.name : "flesh"]!") + to_chat(victim, span_danger("Searing hot oil scorches your [E ? E.name : "flesh"]!")) user.attack_log += text("\[[time_stamp()]\] [span_red("Has [cook_type] \the [victim] ([victim.ckey]) in \a [src]")]") victim.attack_log += text("\[[time_stamp()]\] [span_orange("Has been [cook_type] in \a [src] by [user.name] ([user.ckey])")]") @@ -247,7 +247,7 @@ if (I.reagents.total_volume <= 0 && oil) //Its empty, handle scooping some hot oil out of the fryer oil.trans_to(I, I.reagents.maximum_volume) - user.visible_message("[user] scoops some oil out of \the [src].", span_notice("You scoop some oil out of \the [src].")) + user.visible_message(span_filter_notice("[user] scoops some oil out of \the [src]."), span_notice("You scoop some oil out of \the [src].")) return 1 else //It contains stuff, handle pouring any oil into the fryer @@ -263,7 +263,7 @@ I.reagents.remove_reagent(R.id, delta) amount += delta if (amount > 0) - user.visible_message("[user] pours some oil into \the [src].", "You pour [amount]u of oil into \the [src].", "You hear something viscous being poured into a metal container.") + user.visible_message(span_filter_notice("[user] pours some oil into \the [src]."), span_notice("You pour [amount]u of oil into \the [src]."), span_notice("You hear something viscous being poured into a metal container.")) return 1 //If neither of the above returned, then call parent as normal ..() diff --git a/code/modules/food/kitchen/cooking_machines/oven.dm b/code/modules/food/kitchen/cooking_machines/oven.dm index d4e041e76e..6efbf8afc7 100644 --- a/code/modules/food/kitchen/cooking_machines/oven.dm +++ b/code/modules/food/kitchen/cooking_machines/oven.dm @@ -86,11 +86,11 @@ return if(!usr.IsAdvancedToolUser()) - to_chat(user, "You lack the dexterity to do that.") + to_chat(user, span_notice("You lack the dexterity to do that.")) return if(!Adjacent(usr)) - to_chat(user, "You can't reach the [src] from there, get closer!") + to_chat(user, span_notice("You can't reach the [src] from there, get closer!")) return if(open) @@ -104,7 +104,7 @@ cooking = FALSE playsound(src, 'sound/machines/hatch_open.ogg', 20, 1) - to_chat(user, "You [open? "open":"close"] the oven door") + to_chat(user, span_notice("You [open? "open":"close"] the oven door")) update_icon() /obj/machinery/appliance/cooker/oven/proc/manip(var/obj/item/I) @@ -117,7 +117,7 @@ /obj/machinery/appliance/cooker/oven/can_insert(var/obj/item/I, var/mob/user) if(!open && !manip(I)) - to_chat(user, "You can't put anything in while the door is closed!") + to_chat(user, span_warning("You can't put anything in while the door is closed!")) return 0 else @@ -136,7 +136,7 @@ /obj/machinery/appliance/cooker/oven/can_remove_items(var/mob/user, show_warning = TRUE) if(!open) if(show_warning) - to_chat(user, "You can't take anything out while the door is closed!") + to_chat(user, span_warning("You can't take anything out while the door is closed!")) return 0 else diff --git a/code/modules/food/kitchen/gibber.dm b/code/modules/food/kitchen/gibber.dm index 88498b371a..bd9379bf52 100644 --- a/code/modules/food/kitchen/gibber.dm +++ b/code/modules/food/kitchen/gibber.dm @@ -82,18 +82,18 @@ if(stat & (NOPOWER|BROKEN)) return if(operating) - to_chat(user, "The gibber is locked and running, wait for it to finish.") + to_chat(user, span_danger("The gibber is locked and running, wait for it to finish.")) return else src.startgibbing(user) /obj/machinery/gibber/examine() . = ..() - . += "The safety guard is [emagged ? "disabled" : "enabled"]." + . += "The safety guard is [emagged ? span_danger("disabled") : "enabled"]." /obj/machinery/gibber/emag_act(var/remaining_charges, var/mob/user) emagged = !emagged - to_chat(user, "You [emagged ? "disable" : "enable"] the gibber safety guard.") + to_chat(user, span_danger("You [emagged ? "disable" : "enable"] the gibber safety guard.")) return 1 /obj/machinery/gibber/attackby(var/obj/item/W, var/mob/user) @@ -106,7 +106,7 @@ return ..() if(G.state < 2) - to_chat(user, "You need a better grip to do that!") + to_chat(user, span_danger("You need a better grip to do that!")) return move_into_gibber(user,G.affecting) @@ -120,30 +120,30 @@ /obj/machinery/gibber/proc/move_into_gibber(var/mob/user,var/mob/living/victim) if(src.occupant) - to_chat(user, "The gibber is full, empty it first!") + to_chat(user, span_danger("The gibber is full, empty it first!")) return if(operating) - to_chat(user, "The gibber is locked and running, wait for it to finish.") + to_chat(user, span_danger("The gibber is locked and running, wait for it to finish.")) return if(!(istype(victim, /mob/living/carbon)) && !(istype(victim, /mob/living/simple_mob)) ) - to_chat(user, "This is not suitable for the gibber!") + to_chat(user, span_danger("This is not suitable for the gibber!")) return if(istype(victim,/mob/living/carbon/human) && !emagged) - to_chat(user, "The gibber safety guard is engaged!") + to_chat(user, span_danger("The gibber safety guard is engaged!")) return if(victim.abiotic(1)) - to_chat(user, "Subject may not have abiotic items on.") + to_chat(user, span_danger("Subject may not have abiotic items on.")) return - user.visible_message("[user] starts to put [victim] into the gibber!") + user.visible_message(span_danger("[user] starts to put [victim] into the gibber!")) src.add_fingerprint(user) if(do_after(user, 30) && victim.Adjacent(src) && user.Adjacent(src) && victim.Adjacent(user) && !occupant) - user.visible_message("[user] stuffs [victim] into the gibber!") + user.visible_message(span_danger("[user] stuffs [victim] into the gibber!")) if(victim.client) victim.client.perspective = EYE_PERSPECTIVE victim.client.eye = src @@ -180,11 +180,11 @@ if(src.operating) return if(!src.occupant) - visible_message("You hear a loud metallic grinding sound.") + visible_message(span_danger("You hear a loud metallic grinding sound.")) return use_power(1000) - visible_message("You hear a loud [occupant.isSynthetic() ? "metallic" : "squelchy"] grinding sound.") + visible_message(span_danger("You hear a loud [occupant.isSynthetic() ? "metallic" : "squelchy"] grinding sound.")) src.operating = 1 update_icon() @@ -243,5 +243,3 @@ thing.throw_at(get_edge_target_turf(src,gib_throw_dir),rand(0,3),emagged ? 100 : 50) // Being pelted with bits of meat and bone would hurt. update_icon() - - diff --git a/code/modules/food/kitchen/icecream.dm b/code/modules/food/kitchen/icecream.dm index 35084411a5..a80d8b76ca 100644 --- a/code/modules/food/kitchen/icecream.dm +++ b/code/modules/food/kitchen/icecream.dm @@ -100,9 +100,9 @@ if(I.reagents.total_volume < 10) I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume) else - to_chat(user, "There is not enough icecream left!") + to_chat(user, span_warning("There is not enough icecream left!")) else - to_chat(user, "[O] already has icecream in it.") + to_chat(user, span_notice("[O] already has icecream in it.")) return 1 else if(O.is_open_container()) return @@ -121,11 +121,11 @@ product_types[make_type] += amount var/flavour = get_flavour_name(make_type) if(make_type > 4) - src.visible_message("[user] cooks up some [flavour] cones.") + src.visible_message(span_info("[user] cooks up some [flavour] cones.")) else - src.visible_message("[user] whips up some [flavour] icecream.") + src.visible_message(span_info("[user] whips up some [flavour] icecream.")) else - to_chat(user, "You don't have the ingredients to make this.") + to_chat(user, span_warning("You don't have the ingredients to make this.")) /obj/machinery/icecream_vat/Topic(href, href_list) @@ -135,7 +135,7 @@ if(href_list["select"]) dispense_flavour = text2num(href_list["select"]) flavour_name = get_flavour_name(dispense_flavour) - src.visible_message("[usr] sets [src] to dispense [flavour_name] flavoured icecream.") + src.visible_message(span_notice("[usr] sets [src] to dispense [flavour_name] flavoured icecream.")) if(href_list["cone"]) var/dispense_cone = text2num(href_list["cone"]) @@ -146,9 +146,9 @@ I.cone_type = cone_name I.icon_state = "icecream_cone_[cone_name]" I.desc = "Delicious [cone_name] cone, but no ice cream." - src.visible_message("[usr] dispenses a crunchy [cone_name] cone from [src].") + src.visible_message(span_info("[usr] dispenses a crunchy [cone_name] cone from [src].")) else - to_chat(usr, "There are no [cone_name] cones left!") + to_chat(usr, span_warning("There are no [cone_name] cones left!")) if(href_list["make"]) var/amount = (text2num(href_list["amount"])) diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index 76eea3574e..9eeed7816a 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -80,43 +80,43 @@ if(src.broken == 2 && O.has_tool_quality(TOOL_SCREWDRIVER)) // If it's broken and they're using a screwdriver user.visible_message( \ "\The [user] starts to fix part of the microwave.", \ - "You start to fix part of the microwave." \ + span_notice("You start to fix part of the microwave.") \ ) playsound(src, O.usesound, 50, 1) if (do_after(user,20 * O.toolspeed)) user.visible_message( \ "\The [user] fixes part of the microwave.", \ - "You have fixed part of the microwave." \ + span_notice("You have fixed part of the microwave.") \ ) src.broken = 1 // Fix it a bit else if(src.broken == 1 && O.has_tool_quality(TOOL_WRENCH)) // If it's broken and they're doing the wrench user.visible_message( \ "\The [user] starts to fix part of the microwave.", \ - "You start to fix part of the microwave." \ + span_notice("You start to fix part of the microwave.") \ ) if (do_after(user,20 * O.toolspeed)) user.visible_message( \ "\The [user] fixes the microwave.", \ - "You have fixed the microwave." \ + span_notice("You have fixed the microwave.") \ ) src.icon_state = "mw" src.broken = 0 // Fix it! src.dirty = 0 // just to be sure src.flags = OPENCONTAINER | NOREACT else - to_chat(user, "It's broken!") + to_chat(user, span_warning("It's broken!")) return 1 else if(src.dirty==100) // The microwave is all dirty so can't be used! if(istype(O, /obj/item/reagent_containers/spray/cleaner) || istype(O, /obj/item/soap)) // If they're trying to clean it then let them user.visible_message( \ "\The [user] starts to clean the microwave.", \ - "You start to clean the microwave." \ + span_notice("You start to clean the microwave.") \ ) if (do_after(user,20)) user.visible_message( \ - "\The [user] has cleaned the microwave.", \ - "You have cleaned the microwave." \ + span_notice("\The [user] has cleaned the microwave."), \ + span_notice("You have cleaned the microwave.") \ ) src.dirty = 0 // It's clean! src.broken = 0 // just to be sure @@ -124,27 +124,27 @@ src.flags = OPENCONTAINER | NOREACT SStgui.update_uis(src) else //Otherwise bad luck!! - to_chat(user, "It's dirty!") + to_chat(user, span_warning("It's dirty!")) return 1 else if(is_type_in_list(O,acceptable_items)) var/list/workingList = cookingContents() if(workingList.len>=(max_n_of_items + circuit_item_capacity)) //Adds component_parts to the maximum number of items. changed 1 to actually just be the circuit item capacity var. - to_chat(user, "This [src] is full of ingredients, you cannot put more.") + to_chat(user, span_warning("This [src] is full of ingredients, you cannot put more.")) return 1 if(istype(O, /obj/item/stack) && O:get_amount() > 1) // This is bad, but I can't think of how to change it var/obj/item/stack/S = O new O.type (src) S.use(1) user.visible_message( \ - "\The [user] has added one of [O] to \the [src].", \ - "You add one of [O] to \the [src].") + span_notice("\The [user] has added one of [O] to \the [src]."), \ + span_notice("You add one of [O] to \the [src].")) return else // user.remove_from_mob(O) //This just causes problems so far as I can tell. -Pete - Man whoever you are, it's been years. o7 user.drop_from_inventory(O,src) user.visible_message( \ - "\The [user] has added \the [O] to \the [src].", \ - "You add \the [O] to \the [src].") + span_notice("\The [user] has added \the [O] to \the [src]."), \ + span_notice("You add \the [O] to \the [src].")) SStgui.update_uis(src) return else if (istype(O,/obj/item/storage/bag/plants)) // There might be a better way about making plant bags dump their contents into a microwave, but it works. @@ -155,7 +155,7 @@ continue failed = 0 if(contents.len>=(max_n_of_items + component_parts.len + circuit_item_capacity)) - to_chat(user, "This [src] is full of ingredients, you cannot put more.") + to_chat(user, span_warning("This [src] is full of ingredients, you cannot put more.")) return 0 else bag.remove_from_storage(G, src) @@ -183,12 +183,12 @@ return 1 for (var/datum/reagent/R in O.reagents.reagent_list) if (!(R.id in acceptable_reagents)) - to_chat(user, "Your [O] contains components unsuitable for cookery.") + to_chat(user, span_warning("Your [O] contains components unsuitable for cookery.")) return 1 return else if(istype(O,/obj/item/grab)) var/obj/item/grab/G = O - to_chat(user, "This is ridiculous. You can not fit \the [G.affecting] in this [src].") + to_chat(user, span_warning("This is ridiculous. You can not fit \the [G.affecting] in this [src].")) return 1 else if(O.has_tool_quality(TOOL_SCREWDRIVER)) default_deconstruction_screwdriver(user, O) @@ -198,24 +198,24 @@ return else user.visible_message( \ - "\The [user] begins [src.anchored ? "unsecuring" : "securing"] the microwave.", \ - "You attempt to [src.anchored ? "unsecure" : "secure"] the microwave." + span_notice("\The [user] begins [src.anchored ? "unsecuring" : "securing"] the microwave."), \ + span_notice("You attempt to [src.anchored ? "unsecure" : "secure"] the microwave.") ) if (do_after(user,20/O.toolspeed)) user.visible_message( \ - "\The [user] [src.anchored ? "unsecures" : "secures"] the microwave.", \ - "You [src.anchored ? "unsecure" : "secure"] the microwave." + span_notice("\The [user] [src.anchored ? "unsecures" : "secures"] the microwave."), \ + span_notice("You [src.anchored ? "unsecure" : "secure"] the microwave.") ) src.anchored = !src.anchored else - to_chat(user, "You decide not to do that.") + to_chat(user, span_notice("You decide not to do that.")) else if(default_part_replacement(user, O)) return else if(istype(O, /obj/item/paicard)) if(!paicard) insertpai(user, O) else - to_chat(user, "You have no idea what you can cook with this [O].") + to_chat(user, span_warning("You have no idea what you can cook with this [O].")) ..() SStgui.update_uis(src) @@ -510,7 +510,7 @@ return 0 /obj/machinery/microwave/proc/start() - src.visible_message("The microwave turns on.", "You hear a microwave.") + src.visible_message(span_notice("The microwave turns on."), span_notice("You hear a microwave.")) soundloop.start() src.operating = TRUE src.icon_state = "mw1" @@ -538,7 +538,7 @@ src.dirty++ src.reagents.clear_reagents() if(message) - to_chat(usr, "You dispose of the microwave contents.") + to_chat(usr, span_notice("You dispose of the microwave contents.")) SStgui.update_uis(src) /obj/machinery/microwave/proc/muck_start() @@ -546,7 +546,7 @@ src.icon_state = "mwbloody1" // Make it look dirty!! /obj/machinery/microwave/proc/muck_finish() - src.visible_message("The microwave gets covered in muck!") + src.visible_message(span_warning("The microwave gets covered in muck!")) src.dirty = 100 // Make it dirty so it can't be used util cleaned src.flags = null //So you can't add condiments src.icon_state = "mwbloody0" // Make it look dirty too @@ -560,7 +560,7 @@ s.set_up(2, 1, src) s.start() src.icon_state = "mwb" // Make it look all busted up and shit - src.visible_message("The microwave breaks!") //Let them know they're stupid + src.visible_message(span_warning("The microwave breaks!")) //Let them know they're stupid src.broken = 2 // Make it broken so it can't be used util fixed src.flags = null //So you can't add condiments src.operating = 0 // Turn it off again aferwards @@ -592,20 +592,20 @@ set category = "Object" set name = "Eject content" usr.visible_message( - "[usr] tries to open [src] and remove its contents." , - "You try to open [src] and remove its contents." + span_notice("[usr] tries to open [src] and remove its contents.") , + span_notice("You try to open [src] and remove its contents.") ) if(!do_after(usr, 1 SECONDS, target = src)) return if(operating) - to_chat(usr, "You can't do that, [src] door is locked!") + to_chat(usr, span_warning("You can't do that, [src] door is locked!")) return usr.visible_message( - "[usr] opened [src] and has taken out [english_list(cookingContents())]." , - "You have opened [src] and taken out [english_list(cookingContents())]." + span_notice("[usr] opened [src] and has taken out [english_list(cookingContents())].") , + span_notice("You have opened [src] and taken out [english_list(cookingContents())].") ) dispose() @@ -645,7 +645,7 @@ /datum/recipe/splat/make_food(obj/container) for(var/obj/item/holder/H in container) if(H.held_mob) - to_chat(H.held_mob, "You hear an earsplitting humming and your head aches!") + to_chat(H.held_mob, span_danger("You hear an earsplitting humming and your head aches!")) qdel(H.held_mob) H.held_mob = null qdel(H) @@ -668,4 +668,3 @@ if(istype(M, circuit)) // Yes, we remove circuit twice. Yes, it's necessary. Yes, it's stupid. workingList -= M return workingList - diff --git a/code/modules/food/kitchen/smartfridge/smartfridge.dm b/code/modules/food/kitchen/smartfridge/smartfridge.dm index 29eedbfca3..86d3cabe8d 100644 --- a/code/modules/food/kitchen/smartfridge/smartfridge.dm +++ b/code/modules/food/kitchen/smartfridge/smartfridge.dm @@ -98,7 +98,7 @@ /obj/machinery/smartfridge/attackby(var/obj/item/O as obj, var/mob/user as mob) if(O.has_tool_quality(TOOL_SCREWDRIVER)) panel_open = !panel_open - user.visible_message("[user] [panel_open ? "opens" : "closes"] the maintenance panel of \the [src].", "You [panel_open ? "open" : "close"] the maintenance panel of \the [src].") + user.visible_message(span_filter_notice("[user] [panel_open ? "opens" : "closes"] the maintenance panel of \the [src]."), span_filter_notice("You [panel_open ? "open" : "close"] the maintenance panel of \the [src].")) playsound(src, O.usesound, 50, 1) update_icon() return @@ -112,13 +112,13 @@ return if(stat & NOPOWER) - to_chat(user, "\The [src] is unpowered and useless.") + to_chat(user, span_notice("\The [src] is unpowered and useless.")) return if(accept_check(O)) user.remove_from_mob(O) stock(O) - user.visible_message("[user] has added \the [O] to \the [src].", "You add \the [O] to \the [src].") + user.visible_message(span_notice("[user] has added \the [O] to \the [src]."), span_notice("You add \the [O] to \the [src].")) sortTim(item_records, GLOBAL_PROC_REF(cmp_stored_item_name)) else if(istype(O, /obj/item/storage/bag)) @@ -130,29 +130,29 @@ stock(G) plants_loaded = 1 if(plants_loaded) - user.visible_message("[user] loads \the [src] with \the [P].", "You load \the [src] with \the [P].") + user.visible_message(span_notice("[user] loads \the [src] with \the [P]."), span_notice("You load \the [src] with \the [P].")) if(P.contents.len > 0) - to_chat(user, "Some items are refused.") + to_chat(user, span_notice("Some items are refused.")) else if(istype(O, /obj/item/gripper)) // Grippers. ~Mechoid. var/obj/item/gripper/B = O //B, for Borg. if(!B.wrapped) - to_chat(user, "\The [B] is not holding anything.") + to_chat(user, span_filter_notice("\The [B] is not holding anything.")) return else var/B_held = B.wrapped - to_chat(user, "You use \the [B] to put \the [B_held] into \the [src].") + to_chat(user, span_filter_notice("You use \the [B] to put \the [B_held] into \the [src].")) return else - to_chat(user, "\The [src] smartly refuses [O].") + to_chat(user, span_notice("\The [src] smartly refuses [O].")) return 1 /obj/machinery/smartfridge/secure/emag_act(var/remaining_charges, var/mob/user) if(!emagged) emagged = 1 locked = -1 - to_chat(user, "You short out the product lock on [src].") + to_chat(user, span_filter_notice("You short out the product lock on [src].")) return 1 /obj/machinery/smartfridge/proc/find_record(var/obj/item/O) @@ -253,7 +253,7 @@ return FALSE spawn(0) throw_item.throw_at(target,16,3,src) - src.visible_message("[src] launches [throw_item.name] at [target.name]!") + src.visible_message(span_warning("[src] launches [throw_item.name] at [target.name]!")) SStgui.update_uis(src) update_icon() return TRUE @@ -266,6 +266,6 @@ return TRUE if(usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) if((!allowed(usr) && scan_id) && !emagged && locked != -1 && action == "Release") - to_chat(usr, "Access denied.") + to_chat(usr, span_warning("Access denied.")) return TRUE return ..() diff --git a/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm b/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm index 8a9f3921b2..c9f412e6a3 100644 --- a/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm +++ b/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm @@ -65,4 +65,4 @@ attached = above item_records = attached.item_records else - to_chat(world,"[src] at [x],[y],[z] cannot find the unit above it!") + to_chat(world,span_danger("[src] at [x],[y],[z] cannot find the unit above it!")) diff --git a/code/modules/food/recipe.dm b/code/modules/food/recipe.dm index 2394441f14..2cacad6cbe 100644 --- a/code/modules/food/recipe.dm +++ b/code/modules/food/recipe.dm @@ -182,7 +182,7 @@ // This proc is called under the assumption that the container has already been checked and found to contain the necessary ingredients /datum/recipe/proc/make_food(var/obj/container as obj) if(!result) - log_runtime(EXCEPTION("Recipe [type] is defined without a result, please bug report this.")) + log_runtime(EXCEPTION(span_danger("Recipe [type] is defined without a result, please bug report this."))) if(istype(container, /obj/machinery/microwave)) var/obj/machinery/microwave/M = container M.dispose(FALSE) diff --git a/code/modules/food/recipe_dump.dm b/code/modules/food/recipe_dump.dm index 7fe62bf3fb..8e1ac10571 100644 --- a/code/modules/food/recipe_dump.dm +++ b/code/modules/food/recipe_dump.dm @@ -110,7 +110,7 @@ var/amt = drink_recipes[Rp]["Catalysts"][rid] drink_recipes[Rp]["Catalysts"] -= rid drink_recipes[Rp]["Catalysts"][R_name] = amt - + //We can also change the appliance to its proper name. for(var/Rp in food_recipes) switch(food_recipes[Rp]["Appliance"]) @@ -181,7 +181,7 @@ //Name html += "[food_recipes[Rp]["Result"]]" - + //Appliance html += "[food_recipes[Rp]["Appliance"]]" @@ -199,9 +199,9 @@ //Coating if(!food_recipes[Rp]["has_coatable_items"]) - html += "
  • Coating: N/A, no coatable items
    • " + html += "
  • Coating: N/A, no coatable items
    • " // css can be used to style or hide these depending on the class. This has two classes - // coating and coating_not_applicable, which can each have styles applied. + // coating and coating_not_applicable, which can each have styles applied. else if(food_recipes[Rp]["Coating"] == -1) html += "
  • Coating: Optionally, any coating
    • " else if(isnull(food_recipes[Rp]["Coating"])) @@ -295,4 +295,4 @@ html += "" src << browse(html, "window=recipes;file=recipes_drinks.html;display=0") - to_chat(src, "In your byond cache, recipe-xxx.png files and recipes_drinks.html and recipes_food.html now exist. Place recipe-xxx.png files in a subfolder named 'imgrecipes' wherever you put them. The file will take a food.css or drinks.css file if in the same path.") + to_chat(src, span_notice("In your byond cache, recipe-xxx.png files and recipes_drinks.html and recipes_food.html now exist. Place recipe-xxx.png files in a subfolder named 'imgrecipes' wherever you put them. The file will take a food.css or drinks.css file if in the same path.")) diff --git a/code/modules/gamemaster/event2/events/everyone/comms_blackout.dm b/code/modules/gamemaster/event2/events/everyone/comms_blackout.dm index d3d60d4876..2a11e1172d 100644 --- a/code/modules/gamemaster/event2/events/everyone/comms_blackout.dm +++ b/code/modules/gamemaster/event2/events/everyone/comms_blackout.dm @@ -23,7 +23,7 @@ // AIs will always know if there's a comm blackout, rogue AIs could then lie about comm blackouts in the future while they shutdown comms for(var/mob/living/silicon/ai/A in player_list) to_chat(A, "
    ") - to_chat(A, "[alert]") + to_chat(A, span_warning("[alert]")) to_chat(A, "
    ") /datum/event2/event/comms_blackout/start() diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 8fa30114a7..66c0cd0379 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -62,7 +62,7 @@ to_chat(user,"You place your cards on the bottom of \the [src].") return else - to_chat(user,"You can't mix cards from other decks!") + to_chat(user,span_warning("You can't mix cards from other decks!")) return ..() @@ -85,19 +85,19 @@ if(usr.stat || !Adjacent(usr)) return if(user.hands_are_full()) // Safety check lest the card disappear into oblivion - to_chat(user,"Your hands are full!") + to_chat(user,span_notice("Your hands are full!")) return if(!istype(usr,/mob/living/carbon)) return if(!cards.len) - to_chat(user,"There are no cards in the deck.") + to_chat(user,span_notice("There are no cards in the deck.")) return var/obj/item/hand/H = user.get_type_in_hands(/obj/item/hand) if(H && !(H.parentdeck == src)) - to_chat(user,"You can't mix cards from different decks!") + to_chat(user,span_warning("You can't mix cards from different decks!")) return if(!H) @@ -112,7 +112,7 @@ H.parentdeck = src H.update_icon() user.visible_message("\The [user] draws a card.") - to_chat(user,"It's the [P].") + to_chat(user,span_notice("It's the [P].")) /obj/item/deck/verb/deal_card() @@ -124,7 +124,7 @@ if(usr.stat || !Adjacent(usr)) return if(!cards.len) - to_chat(usr,"There are no cards in the deck.") + to_chat(usr,span_notice("There are no cards in the deck.")) return var/list/players = list() @@ -148,7 +148,7 @@ if(usr.stat || !Adjacent(usr)) return if(!cards.len) - to_chat(usr,"There are no cards in the deck.") + to_chat(usr,span_notice("There are no cards in the deck.")) return var/list/players = list() @@ -248,10 +248,10 @@ if (H.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - to_chat(user,"You try to move your [temp.name], but cannot!") + to_chat(user,span_notice("You try to move your [temp.name], but cannot!")) return - to_chat(user,"You pick up [src].") + to_chat(user,span_notice("You pick up [src].")) user.put_in_hands(src) return @@ -267,10 +267,10 @@ if (H.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - to_chat(user,"You try to move your [temp.name], but cannot!") + to_chat(user,span_notice("You try to move your [temp.name], but cannot!")) return - to_chat(user,"You pick up [src].") + to_chat(user,span_notice("You pick up [src].")) user.put_in_hands(src) return @@ -373,7 +373,7 @@ if(user.stat || !Adjacent(user)) return if(user.hands_are_full()) // Safety check lest the card disappear into oblivion - to_chat(usr,"Your hands are full!") + to_chat(usr,span_danger("Your hands are full!")) return var/pickablecards = list() diff --git a/code/modules/games/dice.dm b/code/modules/games/dice.dm index 9abe2c2a1f..fddae8306f 100644 --- a/code/modules/games/dice.dm +++ b/code/modules/games/dice.dm @@ -18,9 +18,9 @@ ..() if(W.has_tool_quality(TOOL_WELDER) || istype(W, /obj/item/flame/lighter)) if(cheater) - to_chat(user, "Wait, this [name] is already weighted!") + to_chat(user, span_warning("Wait, this [name] is already weighted!")) else if(tamper_proof) - to_chat(user, "This [name] is proofed against tampering!") + to_chat(user, span_warning("This [name] is proofed against tampering!")) else var/to_weight = input("What should the [name] be weighted towards? You can't undo this later, only change the number!","Set the desired result") as null|num if(isnull(to_weight) || (to_weight < 1) || (to_weight > sides)) //You must input a number higher than 0 and no greater than the number of sides @@ -110,9 +110,9 @@ else if(sides == 20 && result == 1) comment = "Ouch, bad luck." - user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \ - "You throw [src]. It lands on a [result]. [comment]", \ - "You hear [src] landing on a [result]. [comment]") + user.visible_message(span_notice("[user] has thrown [src]. It lands on [result]. [comment]"), \ + span_notice("You throw [src]. It lands on a [result]. [comment]"), \ + span_notice("You hear [src] landing on a [result]. [comment]")) /* * Dice packs @@ -165,9 +165,9 @@ ) /obj/item/storage/dicecup/attack_self(mob/user as mob) - user.visible_message("[user] shakes [src].", \ - "You shake [src].", \ - "You hear dice rolling.") + user.visible_message(span_notice("[user] shakes [src]."), \ + span_notice("You shake [src]."), \ + span_notice("You hear dice rolling.")) rollCup(user) /obj/item/storage/dicecup/proc/rollCup(mob/user as mob) diff --git a/code/modules/ghosttrap/trap.dm b/code/modules/ghosttrap/trap.dm index 50b432a1bd..71697ac5f6 100644 --- a/code/modules/ghosttrap/trap.dm +++ b/code/modules/ghosttrap/trap.dm @@ -107,7 +107,7 @@ var/list/ghost_traps ghost_trap_role = "Plant" /datum/ghosttrap/plant/welcome_candidate(var/mob/target) - to_chat(target, "You awaken slowly, stirring into sluggish motion as the air caresses you.") + to_chat(target, span_alium("You awaken slowly, stirring into sluggish motion as the air caresses you.")) // This is a hack, replace with some kind of species blurb proc. if(istype(target,/mob/living/carbon/alien/diona)) to_chat(target, "You are \a [target], one of a race of drifting interstellar plantlike creatures that sometimes share their seeds with human traders.") diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm index 2d51caeb34..05b08ec4f4 100644 --- a/code/modules/holodeck/HolodeckControl.dm +++ b/code/modules/holodeck/HolodeckControl.dm @@ -166,7 +166,7 @@ emagged = 1 safety_disabled = 1 update_projections() - to_chat(user, "You vastly increase projector power and override the safety and security protocols.") + to_chat(user, span_notice("You vastly increase projector power and override the safety and security protocols.")) to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call [using_map.company_name] maintenance and do not use the simulator.") log_game("[key_name(usr)] emagged the Holodeck Control Computer") return 1 @@ -192,7 +192,7 @@ current_program = powerdown_program linkedholodeck = locate(projection_area) if(!linkedholodeck) - to_world("Holodeck computer at [x],[y],[z] failed to locate projection area.") + to_world(span_danger("Holodeck computer at [x],[y],[z] failed to locate projection area.")) //This could all be done better, but it works for now. /obj/machinery/computer/HolodeckControl/Destroy() diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index c34d3f05f8..282992d7b2 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -188,17 +188,17 @@ qdel(W) //gotta delete it here because if window breaks, it won't get deleted switch (state) if(1) - M.visible_message("[user] slams [M] against \the [src]!") + M.visible_message(span_warning("[user] slams [M] against \the [src]!")) M.apply_damage(7) hit(10) if(2) - M.visible_message("[user] bashes [M] against \the [src]!") + M.visible_message(span_danger("[user] bashes [M] against \the [src]!")) if (prob(50)) M.Weaken(1) M.apply_damage(10) hit(25) if(3) - M.visible_message("[user] crushes [M] against \the [src]!") + M.visible_message(span_danger("[user] crushes [M] against \the [src]!")) M.Weaken(5) M.apply_damage(20) hit(50) @@ -207,11 +207,11 @@ if(W.flags & NOBLUDGEON) return if(W.has_tool_quality(TOOL_SCREWDRIVER)) - to_chat(user, "It's a holowindow, you can't unfasten it!") + to_chat(user, span_notice("It's a holowindow, you can't unfasten it!")) else if(W.has_tool_quality(TOOL_CROWBAR) && reinf && state <= 1) - to_chat(user, "It's a holowindow, you can't pry it!") + to_chat(user, span_notice("It's a holowindow, you can't pry it!")) else if(W.has_tool_quality(TOOL_WRENCH) && !anchored && (!state || !reinf)) - to_chat(user, "It's a holowindow, you can't dismantle it!") + to_chat(user, span_notice("It's a holowindow, you can't dismantle it!")) else if(W.damtype == BRUTE || W.damtype == BURN) hit(W.force) @@ -268,12 +268,12 @@ /obj/structure/bed/chair/holochair/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) - to_chat(user, "It's a holochair, you can't dismantle it!") + to_chat(user, span_notice("It's a holochair, you can't dismantle it!")) return //VOREStation Add /obj/structure/bed/holobed/attackby(obj/item/W as obj, mob/user as mob) if(W.has_tool_quality(TOOL_WRENCH)) - to_chat(user, "It's a holochair, you can't dismantle it!") + to_chat(user, span_notice("It's a holochair, you can't dismantle it!")) return //VOREStation Add End /obj/item/holo @@ -308,7 +308,7 @@ /obj/item/holo/esword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(active && default_parry_check(user, attacker, damage_source) && prob(50)) - user.visible_message("\The [user] parries [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!")) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, user.loc) @@ -324,13 +324,13 @@ item_state = "[icon_state]_blade" w_class = ITEMSIZE_LARGE playsound(src, 'sound/weapons/saberon.ogg', 50, 1) - to_chat(user, "[src] is now active.") + to_chat(user, span_notice("[src] is now active.")) else force = 3 item_state = "[icon_state]" w_class = ITEMSIZE_SMALL playsound(src, 'sound/weapons/saberoff.ogg', 50, 1) - to_chat(user, "[src] can now be concealed.") + to_chat(user, span_notice("[src] can now be concealed.")) update_icon() add_fingerprint(user) @@ -342,7 +342,7 @@ rainbow = TRUE else rainbow = FALSE - to_chat(user, "You manipulate the color controller in [src].") + to_chat(user, span_notice("You manipulate the color controller in [src].")) update_icon() return ..() @@ -384,16 +384,16 @@ if (istype(W, /obj/item/grab) && get_dist(src,user)<2) var/obj/item/grab/G = W if(G.state<2) - to_chat(user, "You need a better grip to do that!") + to_chat(user, span_warning("You need a better grip to do that!")) return G.affecting.loc = src.loc G.affecting.Weaken(5) - visible_message("[G.assailant] dunks [G.affecting] into the [src]!", 3) + visible_message(span_warning("[G.assailant] dunks [G.affecting] into the [src]!"), 3) qdel(W) return else if (istype(W, /obj/item) && get_dist(src,user)<2) user.drop_item(src.loc) - visible_message("[user] dunks [W] into the [src]!", 3) + visible_message(span_notice("[user] dunks [W] into the [src]!"), 3) return /obj/structure/holohoop/CanPass(atom/movable/mover, turf/target) diff --git a/code/modules/holomap/generate_holomap.dm b/code/modules/holomap/generate_holomap.dm index 99396bd542..9238ff9c79 100644 --- a/code/modules/holomap/generate_holomap.dm +++ b/code/modules/holomap/generate_holomap.dm @@ -26,7 +26,7 @@ /// Generates all the holo minimaps, initializing it all nicely, probably. /datum/controller/subsystem/holomaps/proc/generateHoloMinimaps() var/start_time = world.timeofday - + // Starting over if we're running midround (it runs real fast, so that's possible) holoMiniMaps.Cut() extraMiniMaps.Cut() @@ -45,7 +45,7 @@ smooshTetherHolomaps(smoosh_list) holomaps_initialized = TRUE - admin_notice("Holomaps initialized in [round(0.1*(world.timeofday-start_time),0.1)] seconds.", R_DEBUG) + admin_notice(span_notice("Holomaps initialized in [round(0.1*(world.timeofday-start_time),0.1)] seconds."), R_DEBUG) // TODO - Check - They had a delayed init perhaps? for (var/obj/machinery/station_map/S in station_holomaps) @@ -133,7 +133,7 @@ z_terrain.Blend(HOLOMAP_HOLOFIER, ICON_MULTIPLY, offset_x, offset_y) big_map.Blend(z_terrain, ICON_OVERLAY, offset_x, offset_y) small_map.Blend(z_terrain, ICON_OVERLAY, offset_x, offset_y) - + var/icon/z_areas = extraMiniMaps["[HOLOMAP_EXTRA_STATIONMAPAREAS]_[zLevel]"] big_map.Blend(z_areas, ICON_OVERLAY, offset_x, offset_y) small_map.Blend(z_areas, ICON_OVERLAY, offset_x, offset_y) diff --git a/code/modules/holomap/mapper.dm b/code/modules/holomap/mapper.dm index 3967bb861c..367db60346 100644 --- a/code/modules/holomap/mapper.dm +++ b/code/modules/holomap/mapper.dm @@ -125,24 +125,24 @@ return if(!ishuman(user)) - to_chat(user, "Only humanoids can use this device.") + to_chat(user, span_warning("Only humanoids can use this device.")) return var/mob/living/carbon/human/H = user if(!ishuman(loc) || user != loc) - to_chat(H, "This device needs to be on your person.") + to_chat(H, span_warning("This device needs to be on your person.")) if(hud_datum?.main_hud) hide_device() - to_chat(H, "You put \the [src] away.") + to_chat(H, span_notice("You put \the [src] away.")) else show_device(H) - to_chat(H, "You hold \the [src] where you can see it.") + to_chat(H, span_notice("You hold \the [src] where you can see it.")) /obj/item/mapping_unit/attack_hand(mob/user) if(cell && user.get_inactive_hand() == src) // click with empty off hand - to_chat(user,"You eject \the [cell] from \the [src].") + to_chat(user,span_notice("You eject \the [cell] from \the [src].")) user.put_in_hands(cell) cell = null if(updating) @@ -156,7 +156,7 @@ cell.update_icon() //Why doesn't a cell do this already? :| user.unEquip(cell) cell.forceMove(src) - to_chat(user,"You insert \the [cell] into \the [src].") + to_chat(user,span_notice("You insert \the [cell] into \the [src].")) /obj/item/mapping_unit/proc/first_run(mob/user) @@ -203,7 +203,7 @@ if(uses_power) var/power_to_use = pinging ? power_usage*2 : power_usage if(cell.use(power_to_use) != power_to_use) // we weren't able to use our full power_usage amount! - visible_message("\The [src] flickers before going dull.") + visible_message(span_warning("\The [src] flickers before going dull.")) stop_updates() return diff --git a/code/modules/holomap/station_holomap.dm b/code/modules/holomap/station_holomap.dm index d37f37b041..030ea9578d 100644 --- a/code/modules/holomap/station_holomap.dm +++ b/code/modules/holomap/station_holomap.dm @@ -70,10 +70,10 @@ /obj/machinery/station_map/attack_hand(var/mob/user) if(watching_mob && (watching_mob != user)) - to_chat(user, "Someone else is currently watching the holomap.") + to_chat(user, span_warning("Someone else is currently watching the holomap.")) return if(user.loc != loc) - to_chat(user, "You need to stand in front of \the [src].") + to_chat(user, span_warning("You need to stand in front of \the [src].")) return startWatching(user) @@ -119,9 +119,9 @@ update_use_power(USE_POWER_ACTIVE) if(bogus) - to_chat(user, "The holomap failed to initialize. This area of space cannot be mapped.") + to_chat(user, span_warning("The holomap failed to initialize. This area of space cannot be mapped.")) else - to_chat(user, "A hologram of the station appears before your eyes.") + to_chat(user, span_notice("A hologram of the station appears before your eyes.")) /obj/machinery/station_map/attack_ai(var/mob/living/silicon/robot/user) return // TODO - Implement for AI ~Leshana diff --git a/code/modules/hydroponics/backtank.dm b/code/modules/hydroponics/backtank.dm index 1b13e9e905..2326f5e2e2 100644 --- a/code/modules/hydroponics/backtank.dm +++ b/code/modules/hydroponics/backtank.dm @@ -78,16 +78,16 @@ var/mob/living/carbon/human/user = usr if(!noz) - to_chat(user, "The mister is missing!") + to_chat(user, span_warning("The mister is missing!")) return if(noz.loc != src) remove_noz(user) //Remove from their hands and back onto the defib unit return if(!slot_check()) - to_chat(user, "You need to equip [src] before taking out [noz].") + to_chat(user, span_warning("You need to equip [src] before taking out [noz].")) else if(!usr.put_in_hands(noz)) //Detach the handset into the user's hands - to_chat(user, "You need a free hand to hold the handset!") + to_chat(user, span_warning("You need a free hand to hold the handset!")) update_icon() //success /obj/item/watertank/proc/make_noz() @@ -104,7 +104,7 @@ if(ismob(noz.loc)) var/mob/M = noz.loc if(M.drop_from_inventory(noz, src)) - to_chat(user, "\The [noz] snaps back into the main unit.") + to_chat(user, span_notice("\The [noz] snaps back into the main unit.")) else noz.forceMove(src) @@ -304,4 +304,4 @@ reagents.trans_to_obj(D, amount_per_transfer_from_this) D.set_color() D.set_up(my_target, rand(6, 8), 2) - return \ No newline at end of file + return diff --git a/code/modules/hydroponics/beekeeping/beehive.dm b/code/modules/hydroponics/beekeeping/beehive.dm index 4c09219c9b..af43ffd97b 100644 --- a/code/modules/hydroponics/beekeeping/beehive.dm +++ b/code/modules/hydroponics/beekeeping/beehive.dm @@ -96,7 +96,7 @@ update_icon() return else if(istype(I, /obj/item/analyzer/plant_analyzer)) - to_chat(user, "Scan result of \the [src]...") + to_chat(user, span_notice("Scan result of \the [src]...")) to_chat(user, "Beehive is [bee_count ? "[round(bee_count)]% full" : "empty"].[bee_count > 90 ? " Colony is ready to split." : ""]") if(length(frames)) to_chat(user, "[length(frames)] frames installed, [round(honeycombs / 100)] filled.") diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 961563932a..e42d0ff0cb 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -157,7 +157,7 @@ return M.stop_pulling() - to_chat(M, "You slipped on the [name]!") + to_chat(M, span_notice("You slipped on the [name]!")) playsound(src, 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(8) M.Weaken(5) @@ -177,7 +177,7 @@ var/obj/item/stack/cable_coil/C = W if(C.use(5)) //TODO: generalize this. - to_chat(user, "You add some cable to the [src.name] and slide it inside the battery casing.") + to_chat(user, span_notice("You add some cable to the [src.name] and slide it inside the battery casing.")) var/obj/item/cell/potato/pocell = new /obj/item/cell/potato(get_turf(user)) if(src.loc == user && istype(user,/mob/living/carbon/human)) user.put_in_hands(pocell) @@ -189,7 +189,7 @@ if(W.sharp) if(seed.kitchen_tag == "pumpkin") // Ugggh these checks are awful. - user.show_message("You carve a face into [src]!", 1) + user.show_message(span_notice("You carve a face into [src]!"), 1) new /obj/item/clothing/head/pumpkinhead (user.loc) qdel(src) return @@ -197,7 +197,7 @@ if(seed.chems) if(W.sharp && W.edge && !isnull(seed.chems["woodpulp"])) - user.show_message("You make planks out of \the [src]!", 1) + user.show_message(span_notice("You make planks out of \the [src]!"), 1) playsound(src, 'sound/effects/woodcutting.ogg', 50, 1) var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR) if(!flesh_colour) flesh_colour = seed.get_trait(TRAIT_PRODUCT_COLOUR) @@ -210,7 +210,7 @@ if(G.get_amount() >= G.max_amount) continue G.attackby(NG, user) - to_chat(user, "You add the newly-formed wood to the stack. It now contains [NG.get_amount()] planks.") + to_chat(user, span_filter_notice("You add the newly-formed wood to the stack. It now contains [NG.get_amount()] planks.")) qdel(src) return @@ -221,31 +221,31 @@ return if(seed.kitchen_tag == "potato" || !isnull(seed.chems["potato"])) - to_chat(user, "You slice \the [src] into sticks.") + to_chat(user, span_filter_notice("You slice \the [src] into sticks.")) new /obj/item/reagent_containers/food/snacks/rawsticks(get_turf(src)) qdel(src) return if(!isnull(seed.chems["carrotjuice"])) - to_chat(user, "You slice \the [src] into sticks.") + to_chat(user, span_filter_notice("You slice \the [src] into sticks.")) new /obj/item/reagent_containers/food/snacks/carrotfries(get_turf(src)) qdel(src) return if(!isnull(seed.chems["pineapplejuice"])) - to_chat(user, "You slice \the [src] into rings.") + to_chat(user, span_filter_notice("You slice \the [src] into rings.")) new /obj/item/reagent_containers/food/snacks/pineapple_ring(get_turf(src)) qdel(src) return if(!isnull(seed.chems["soymilk"])) - to_chat(user, "You roughly chop up \the [src].") + to_chat(user, span_filter_notice("You roughly chop up \the [src].")) new /obj/item/reagent_containers/food/snacks/soydope(get_turf(src)) qdel(src) return if(seed.get_trait(TRAIT_FLESH_COLOUR)) - to_chat(user, "You slice up \the [src].") + to_chat(user, span_filter_notice("You slice up \the [src].")) var/slices = rand(3,5) var/reagents_to_transfer = round(reagents.total_volume/slices) for(var/i=1; i<=slices; i++) @@ -270,7 +270,7 @@ return if(prob(35)) if(user) - to_chat(user, "\The [src] has fallen to bits.") + to_chat(user, span_danger("\The [src] has fallen to bits.")) user.drop_from_inventory(src) qdel(src) @@ -283,14 +283,14 @@ return if(user.a_intent == I_HURT) - user.visible_message("\The [user] squashes \the [src]!") + user.visible_message(span_danger("\The [user] squashes \the [src]!")) seed.thrown_at(src,user) sleep(-1) if(src) qdel(src) return if(seed.kitchen_tag == "grass") - user.show_message("You make a grass tile out of \the [src]!", 1) + user.show_message(span_notice("You make a grass tile out of \the [src]!"), 1) var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR) if(!flesh_colour) flesh_colour = seed.get_trait(TRAIT_PRODUCT_COLOUR) for(var/i=0,i<2,i++) @@ -307,7 +307,7 @@ return if(seed.kitchen_tag == "carpet") - user.show_message("You shape some carpet squares out of \the [src] fibers!", 1) + user.show_message(span_notice("You shape some carpet squares out of \the [src] fibers!"), 1) for(var/i=0,i<2,i++) var/obj/item/stack/tile/carpet/G = new (user.loc) for (var/obj/item/stack/tile/carpet/NG in user.loc) @@ -316,12 +316,12 @@ if(NG.get_amount() >= NG.max_amount) continue NG.attackby(G, user) - to_chat(user, "You add the newly-formed carpet to the stack. It now contains [G.get_amount()] tiles.") + to_chat(user, span_filter_notice("You add the newly-formed carpet to the stack. It now contains [G.get_amount()] tiles.")) qdel(src) return if(seed.get_trait(TRAIT_SPREAD) > 0) - to_chat(user, "You plant the [src.name].") + to_chat(user, span_notice("You plant the [src.name].")) new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(get_turf(user),src.seed) GLOB.seed_planted_shift_roundstat++ qdel(src) @@ -333,13 +333,13 @@ if("shand") var/obj/item/stack/medical/bruise_pack/tajaran/poultice = new /obj/item/stack/medical/bruise_pack/tajaran(user.loc) poultice.heal_brute = potency - to_chat(user, "You mash the leaves into a poultice.") + to_chat(user, span_notice("You mash the leaves into a poultice.")) qdel(src) return if("mtear") var/obj/item/stack/medical/ointment/tajaran/poultice = new /obj/item/stack/medical/ointment/tajaran(user.loc) poultice.heal_burn = potency - to_chat(user, "You mash the petals into a poultice.") + to_chat(user, span_notice("You mash the petals into a poultice.")) qdel(src) return */ diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm index ba6bc6e6fe..aea5c30147 100644 --- a/code/modules/hydroponics/grown_inedible.dm +++ b/code/modules/hydroponics/grown_inedible.dm @@ -44,7 +44,7 @@ /obj/item/corncob/attackby(obj/item/W as obj, mob/user as mob) ..() if(istype(W, /obj/item/surgical/circular_saw) || istype(W, /obj/item/material/knife/machete/hatchet) || istype(W, /obj/item/material/knife)) - to_chat(user, "You use [W] to fashion a pipe out of the corn cob!") + to_chat(user, span_notice("You use [W] to fashion a pipe out of the corn cob!")) new /obj/item/clothing/mask/smokable/pipe/cobpipe (user.loc) qdel(src) return diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 0cb71a0b1d..3f0c440693 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -139,19 +139,19 @@ has_edge = prob(get_trait(TRAIT_POTENCY)/2) if(affecting) - to_chat(target, "\The [fruit]'s thorns pierce your [affecting.name] greedily!") + to_chat(target, span_danger("\The [fruit]'s thorns pierce your [affecting.name] greedily!")) target.apply_damage(damage, BRUTE, target_limb, blocked, soaked, TRUE, has_edge, "Thorns") else - to_chat(target, "\The [fruit]'s thorns pierce your flesh greedily!") + to_chat(target, span_danger("\The [fruit]'s thorns pierce your flesh greedily!")) target.adjustBruteLoss(damage) else damage = max(1, round(5*get_trait(TRAIT_POTENCY)/100, 1)) has_edge = prob(get_trait(TRAIT_POTENCY)/5) if(affecting) - to_chat(target, "\The [fruit]'s thorns dig deeply into your [affecting.name]!") + to_chat(target, span_danger("\The [fruit]'s thorns dig deeply into your [affecting.name]!")) target.apply_damage(damage, BRUTE, target_limb, blocked, soaked, TRUE, has_edge, "Thorns") else - to_chat(target, "\The [fruit]'s thorns dig deeply into your flesh!") + to_chat(target, span_danger("\The [fruit]'s thorns dig deeply into your flesh!")) target.adjustBruteLoss(damage) // Adds reagents to a target. @@ -270,7 +270,7 @@ apply_special_effect(M) splatter(T,thrown) if(origin_turf) - origin_turf.visible_message("The [thrown.name] explodes!") + origin_turf.visible_message(span_danger("The [thrown.name] explodes!")) qdel(thrown) return @@ -284,7 +284,7 @@ if(get_trait(TRAIT_JUICY) && splatted) splatter(origin_turf,thrown) if(origin_turf) - origin_turf.visible_message("The [thrown.name] splatters against [target]!") + origin_turf.visible_message(span_danger("The [thrown.name] splatters against [target]!")) qdel(thrown) /datum/seed/proc/handle_environment(var/turf/current_turf, var/datum/gas_mixture/environment, var/light_supplied, var/check_only) @@ -584,7 +584,7 @@ switch(rand(0,11)) if(0) //Plant cancer! set_trait(TRAIT_ENDURANCE,get_trait(TRAIT_ENDURANCE)-rand(10,20),null,0) - source_turf.visible_message("\The [display_name] withers rapidly!") + source_turf.visible_message(span_danger("\The [display_name] withers rapidly!")) if(1) set_trait(TRAIT_NUTRIENT_CONSUMPTION,get_trait(TRAIT_NUTRIENT_CONSUMPTION)+rand(-(degree*0.1),(degree*0.1)),5,0) set_trait(TRAIT_WATER_CONSUMPTION, get_trait(TRAIT_WATER_CONSUMPTION) +rand(-degree,degree),50,0) @@ -657,7 +657,7 @@ set_trait(TRAIT_BIOLUM_COLOUR,get_random_colour(0,75,190)) source_turf.visible_message("\The [display_name]'s glow changes colour!") else - source_turf.visible_message("\The [display_name]'s glow dims...") + source_turf.visible_message(span_notice("\The [display_name]'s glow dims...")) if(11) set_trait(TRAIT_TELEPORTING,1) @@ -789,10 +789,10 @@ if(!force_amount && get_trait(TRAIT_YIELD) == 0 && !harvest_sample) if(istype(user)) - to_chat(user, "You fail to harvest anything useful.") + to_chat(user, span_danger("You fail to harvest anything useful.")) else if(istype(user)) - to_chat(user, "You [harvest_sample ? "take a sample" : "harvest"] from the [display_name].") + to_chat(user, span_filter_notice("You [harvest_sample ? "take a sample" : "harvest"] from the [display_name].")) //This may be a new line. Update the global if it is. if(name == "new line" || !(name in SSplants.seeds)) @@ -850,7 +850,7 @@ //Handle spawning in living, mobile products (like dionaea). if(istype(product,/mob/living)) - product.visible_message("The pod disgorges [product]!") + product.visible_message(span_notice("The pod disgorges [product]!")) handle_living_product(product) // When the seed in this machine mutates/is modified, the tray seed value diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index f795a8df9c..f7073d13a1 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -17,7 +17,7 @@ if(genes.len) var/choice = tgui_alert(user, "Are you sure you want to wipe the disk?", "Xenobotany Data", list("No", "Yes")) if(src && user && genes && choice && choice == "Yes" && user.Adjacent(get_turf(src))) - to_chat(user, "You wipe the disk data.") + to_chat(user, span_filter_notice("You wipe the disk data.")) name = initial(name) desc = initial(name) genes = list() @@ -68,61 +68,61 @@ active = 0 if(failed_task) failed_task = 0 - visible_message("[icon2html(src,viewers(src))] [src] pings unhappily, flashing a red warning light.") + visible_message(span_filter_notice("[icon2html(src,viewers(src))] [src] pings unhappily, flashing a red warning light.")) else - visible_message("[icon2html(src,viewers(src))] [src] pings happily.") + visible_message(span_filter_notice("[icon2html(src,viewers(src))] [src] pings happily.")) if(eject_disk) eject_disk = 0 if(loaded_disk) loaded_disk.loc = get_turf(src) - visible_message("[icon2html(src,viewers(src))] [src] beeps and spits out [loaded_disk].") + visible_message(span_filter_notice("[icon2html(src,viewers(src))] [src] beeps and spits out [loaded_disk].")) loaded_disk = null /obj/machinery/botany/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/seeds)) if(seed) - to_chat(user, "There is already a seed loaded.") + to_chat(user, span_filter_notice("There is already a seed loaded.")) return var/obj/item/seeds/S =W if(S.seed && S.seed.get_trait(TRAIT_IMMUTABLE) > 0) - to_chat(user, "That seed is not compatible with our genetics technology.") + to_chat(user, span_filter_notice("That seed is not compatible with our genetics technology.")) else user.drop_from_inventory(W) W.loc = src seed = W - to_chat(user, "You load [W] into [src].") + to_chat(user, span_filter_notice("You load [W] into [src].")) return if(default_deconstruction_screwdriver(user, W)) return if(W.has_tool_quality(TOOL_WRENCH)) playsound(src, W.usesound, 100, 1) - to_chat(user, "You [anchored ? "un" : ""]secure \the [src].") + to_chat(user, span_notice("You [anchored ? "un" : ""]secure \the [src].")) anchored = !anchored return // if(default_deconstruction_crowbar(user, W)) //No circuit boards to give. // return if(istype(W,/obj/item/disk/botany)) if(loaded_disk) - to_chat(user, "There is already a data disk loaded.") + to_chat(user, span_filter_notice("There is already a data disk loaded.")) return else var/obj/item/disk/botany/B = W if(B.genes && B.genes.len) if(!disk_needs_genes) - to_chat(user, "That disk already has gene data loaded.") + to_chat(user, span_filter_notice("That disk already has gene data loaded.")) return else if(disk_needs_genes) - to_chat(user, "That disk does not have any gene data loaded.") + to_chat(user, span_filter_notice("That disk does not have any gene data loaded.")) return user.drop_from_inventory(W) W.loc = src loaded_disk = W - to_chat(user, "You load [W] into [src].") + to_chat(user, span_filter_notice("You load [W] into [src].")) return ..() diff --git a/code/modules/hydroponics/seed_mobs.dm b/code/modules/hydroponics/seed_mobs.dm index 8b5c4a56a1..83bcf938d8 100644 --- a/code/modules/hydroponics/seed_mobs.dm +++ b/code/modules/hydroponics/seed_mobs.dm @@ -13,7 +13,7 @@ if(!host.ckey && !host.client) host.death() // This seems redundant, but a lot of mobs don't host.set_stat(DEAD) // handle death() properly. Better safe than etc. - host.visible_message("[host] is malformed and unable to survive. It expires pitifully, leaving behind some seeds.") + host.visible_message(span_danger("[host] is malformed and unable to survive. It expires pitifully, leaving behind some seeds.")) var/total_yield = rand(1,3) for(var/j = 0;j<=total_yield;j++) diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index 1865297581..3bbd59a7d1 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -400,7 +400,7 @@ if (loaded) user.visible_message("[user] puts the seeds from \the [O.name] into \the [src].", "You put the seeds from \the [O.name] into \the [src].") else - to_chat(user, "There are no seeds in \the [O.name].") + to_chat(user, span_notice("There are no seeds in \the [O.name].")) return else if(O.has_tool_quality(TOOL_WRENCH)) playsound(src, O.usesound, 50, 1) @@ -420,16 +420,16 @@ if(!src.emagged) emagged = 1 if(lockdown) - to_chat(user, "\The [src]'s control panel thunks, as its cover retracts.") + to_chat(user, span_notice("\The [src]'s control panel thunks, as its cover retracts.")) lockdown = 0 if(LAZYLEN(req_access) || LAZYLEN(req_one_access)) req_access = list() req_one_access = list() - to_chat(user, "\The [src]'s access mechanism shorts out.") + to_chat(user, span_warning("\The [src]'s access mechanism shorts out.")) var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(3, 0, get_turf(src)) sparks.start() - visible_message("\The [src]'s panel sparks!") + visible_message(span_warning("\The [src]'s panel sparks!")) qdel(sparks) return 1 diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index 0d5fa36095..00f6e4dbb2 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -17,9 +17,9 @@ vine.mature_time = 0 vine.process() - message_admins("Event: Spacevines spawned at [T.loc] ([T.x],[T.y],[T.z])") + message_admins(span_notice("Event: Spacevines spawned at [T.loc] ([T.x],[T.y],[T.z])")) return - message_admins("Event: Spacevines failed to find a viable turf.") + message_admins(span_notice("Event: Spacevines failed to find a viable turf.")) /obj/effect/dead_plant anchored = TRUE @@ -91,7 +91,7 @@ if(!SSplants) sleep(250) // ugly hack, should mean roundstart plants are fine. TODO initialize perhaps? if(!SSplants) - to_world("Plant controller does not exist and [src] requires it. Aborting.") + to_world(span_danger("Plant controller does not exist and [src] requires it. Aborting.")) qdel(src) return @@ -247,16 +247,16 @@ if(W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/surgical/scalpel)) if(sampled) - to_chat(user, "\The [src] has already been sampled recently.") + to_chat(user, span_warning("\The [src] has already been sampled recently.")) return if(!is_mature()) - to_chat(user, "\The [src] is not mature enough to yield a sample yet.") + to_chat(user, span_warning("\The [src] is not mature enough to yield a sample yet.")) return if(!seed) - to_chat(user, "There is nothing to take a sample from.") + to_chat(user, span_warning("There is nothing to take a sample from.")) return if(sampled) - to_chat(user, "You cannot take another sample from \the [src].") + to_chat(user, span_danger("You cannot take another sample from \the [src].")) return if(prob(70)) sampled = 1 diff --git a/code/modules/hydroponics/spreading/spreading_response.dm b/code/modules/hydroponics/spreading/spreading_response.dm index b9e64b8d32..3237f09813 100644 --- a/code/modules/hydroponics/spreading/spreading_response.dm +++ b/code/modules/hydroponics/spreading/spreading_response.dm @@ -68,21 +68,21 @@ L.visible_message(\ "\The [user] frees \the [L] from \the [src].",\ "\The [user] frees you from \the [src].",\ - "You hear shredding and ripping.") + span_warning("You hear shredding and ripping.")) else L.visible_message(\ "\The [L] struggles free of \the [src].",\ - "You untangle \the [src] from around yourself.",\ - "You hear shredding and ripping.") + span_notice("You untangle \the [src] from around yourself."),\ + span_warning("You hear shredding and ripping.")) unbuckle() else user.setClickCooldown(user.get_attack_speed()) health -= rand(1,5) var/text = pick("rip","tear","pull", "bite", "tug") user.visible_message(\ - "\The [user] [text]s at \the [src].",\ - "You [text] at \the [src].",\ - "You hear shredding and ripping.") + span_warning("\The [user] [text]s at \the [src]."),\ + span_warning("You [text] at \the [src]."),\ + span_warning("You hear shredding and ripping.")) check_health() return @@ -102,10 +102,10 @@ if(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.item_flags & NOSLIP)) can_grab = 0 if(can_grab) - src.visible_message("Tendrils lash out from \the [src] and drag \the [victim] in!") + src.visible_message(span_danger("Tendrils lash out from \the [src] and drag \the [victim] in!")) victim.forceMove(src.loc) buckle_mob(victim) victim.set_dir(pick(cardinal)) - to_chat(victim, "Tendrils [pick("wind", "tangle", "tighten")] around you!") + to_chat(victim, span_danger("Tendrils [pick("wind", "tangle", "tighten")] around you!")) victim.Weaken(0.5) seed.do_thorns(victim,src) diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index b0d7bebd2c..58704c5f17 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -166,13 +166,13 @@ if(weedlevel > 0) nymph.reagents.add_reagent("glucose", weedlevel) weedlevel = 0 - nymph.visible_message("[nymph] begins rooting through [src], ripping out weeds and eating them noisily.","You begin rooting through [src], ripping out weeds and eating them noisily.") + nymph.visible_message(span_notice("[nymph] begins rooting through [src], ripping out weeds and eating them noisily."),span_notice("You begin rooting through [src], ripping out weeds and eating them noisily.")) else if(nymph.nutrition > 100 && nutrilevel < 10) nymph.nutrition -= ((10-nutrilevel)*5) nutrilevel = 10 - nymph.visible_message("[nymph] secretes a trickle of green liquid, refilling [src].","You secrete a trickle of green liquid, refilling [src].") + nymph.visible_message(span_notice("[nymph] secretes a trickle of green liquid, refilling [src]."),span_notice("You secrete a trickle of green liquid, refilling [src].")) else - nymph.visible_message("[nymph] rolls around in [src] for a bit.","You roll around in [src] for a bit.") + nymph.visible_message(span_notice("[nymph] rolls around in [src] for a bit."),span_notice("You roll around in [src] for a bit.")) return /obj/machinery/portable_atmospherics/hydroponics/Initialize() @@ -330,7 +330,7 @@ if(closed_system) if(user) - to_chat(user, "You can't harvest from the plant while the lid is shut.") + to_chat(user, span_filter_notice("You can't harvest from the plant while the lid is shut.")) return if(user) @@ -357,7 +357,7 @@ if(!user || !dead) return if(closed_system) - to_chat(user, "You can't remove the dead plant while the lid is shut.") + to_chat(user, span_filter_notice("You can't remove the dead plant while the lid is shut.")) return seed = null @@ -367,7 +367,7 @@ yield_mod = 0 mutation_mod = 0 - to_chat(user, "You remove the dead plant.") + to_chat(user, span_filter_notice("You remove the dead plant.")) lastproduce = 0 check_health() return @@ -392,7 +392,7 @@ pestlevel = 0 sampled = 0 update_icon() - visible_message("\The [previous_plant ? previous_plant : initial(name)] has been overtaken by [seed.display_name].") + visible_message(span_notice("\The [previous_plant ? previous_plant : initial(name)] has been overtaken by [seed.display_name].")) return @@ -426,11 +426,11 @@ return if(ishuman(usr) || istype(usr, /mob/living/silicon/robot)) if(labelled) - to_chat(usr, "You remove the label.") + to_chat(usr, span_filter_notice("You remove the label.")) labelled = null update_icon() else - to_chat(usr, "There is no label to remove.") + to_chat(usr, span_filter_notice("There is no label to remove.")) return /obj/machinery/portable_atmospherics/hydroponics/verb/setlight() @@ -444,7 +444,7 @@ var/new_light = tgui_input_list(usr, "Specify a light level.", "Light Level", list(0,1,2,3,4,5,6,7,8,9,10)) if(new_light) tray_light = new_light - to_chat(usr, "You set the tray to a light level of [tray_light] lumens.") + to_chat(usr, span_filter_notice("You set the tray to a light level of [tray_light] lumens.")) return /obj/machinery/portable_atmospherics/hydroponics/proc/check_level_sanity() @@ -480,7 +480,7 @@ weedlevel = 0 update_icon() - visible_message("The [previous_plant] has suddenly mutated into [seed.display_name]!") + visible_message(span_danger("The [previous_plant] has suddenly mutated into [seed.display_name]!")) return @@ -492,15 +492,15 @@ if(O.has_tool_quality(TOOL_WIRECUTTER) || istype(O, /obj/item/surgical/scalpel)) if(!seed) - to_chat(user, "There is nothing to take a sample from in \the [src].") + to_chat(user, span_filter_notice("There is nothing to take a sample from in \the [src].")) return if(sampled) - to_chat(user, "You have already sampled from this plant.") + to_chat(user, span_filter_notice("You have already sampled from this plant.")) return if(dead) - to_chat(user, "The plant is dead.") + to_chat(user, span_filter_notice("The plant is dead.")) return // Create a sample. @@ -525,14 +525,14 @@ if(seed) return ..() else - to_chat(user, "There's no plant to inject.") + to_chat(user, span_filter_notice("There's no plant to inject.")) return 1 else if(seed) //Leaving this in in case we want to extract from plants later. - to_chat(user, "You can't get any extract out of this plant.") + to_chat(user, span_filter_notice("You can't get any extract out of this plant.")) else - to_chat(user, "There's nothing to draw something from.") + to_chat(user, span_filter_notice("There's nothing to draw something from.")) return 1 else if (istype(O, /obj/item/seeds)) @@ -543,24 +543,24 @@ user.remove_from_mob(O) if(!S.seed) - to_chat(user, "The packet seems to be empty. You throw it away.") + to_chat(user, span_filter_notice("The packet seems to be empty. You throw it away.")) qdel(O) return - to_chat(user, "You plant the [S.seed.seed_name] [S.seed.seed_noun].") + to_chat(user, span_filter_notice("You plant the [S.seed.seed_name] [S.seed.seed_noun].")) plant_seeds(S) else - to_chat(user, "\The [src] already has seeds in it!") + to_chat(user, span_danger("\The [src] already has seeds in it!")) else if (istype(O, /obj/item/material/minihoe)) // The minihoe if(weedlevel > 0) - user.visible_message("[user] starts uprooting the weeds.", "You remove the weeds from the [src].") + user.visible_message(span_danger("[user] starts uprooting the weeds."), span_danger("You remove the weeds from the [src].")) weedlevel = 0 update_icon() else - to_chat(user, "This plot is completely devoid of weeds. It doesn't need uprooting.") + to_chat(user, span_danger("This plot is completely devoid of weeds. It doesn't need uprooting.")) else if (istype(O, /obj/item/storage/bag/plants)) @@ -579,7 +579,7 @@ toxins += spray.toxicity pestlevel -= spray.pest_kill_str weedlevel -= spray.weed_kill_str - to_chat(user, "You spray [src] with [O].") + to_chat(user, span_filter_notice("You spray [src] with [O].")) playsound(src, 'sound/effects/spray3.ogg', 50, 1, -6) qdel(O) check_health() @@ -592,23 +592,23 @@ playsound(src, O.usesound, 50, 1) anchored = !anchored - to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + to_chat(user, span_filter_notice("You [anchored ? "wrench" : "unwrench"] \the [src].")) else if(istype(O,/obj/item/multitool)) if(!anchored) - to_chat(user, "Anchor it first!") + to_chat(user, span_warning("Anchor it first!")) return if(frozen == -1) - to_chat(user, "You see no way to use \the [O] on [src].") + to_chat(user, span_warning("You see no way to use \the [O] on [src].")) return - to_chat(user, "You [frozen ? "disable" : "enable"] the cryogenic freezing.") + to_chat(user, span_notice("You [frozen ? "disable" : "enable"] the cryogenic freezing.")) frozen = !frozen update_icon() return else if(O.force && seed) user.setClickCooldown(user.get_attack_speed(O)) - user.visible_message("\The [seed.display_name] has been attacked by [user] with \the [O]!") + user.visible_message(span_danger("\The [seed.display_name] has been attacked by [user] with \the [O]!")) if(!dead) health -= O.force check_health() @@ -626,7 +626,7 @@ if(istype(usr,/mob/living/silicon)) return if(frozen == 1) - to_chat(user, "Disable the cryogenic freezing first!") + to_chat(user, span_warning("Disable the cryogenic freezing first!")) if(harvest) harvest(user) else if(dead) @@ -636,7 +636,7 @@ . = ..() if(seed) - . += "[seed.display_name] are growing here." + . += span_notice("[seed.display_name] are growing here.") else . += "It is empty." @@ -656,7 +656,7 @@ else if(health <= (seed.get_trait(TRAIT_ENDURANCE)/ 2)) . += "It has an unhealthy plant!" if(frozen == 1) - . += "It is cryogenically frozen." + . += span_notice("It is cryogenically frozen.") if(mechanical) var/turf/T = loc var/datum/gas_mixture/environment @@ -694,5 +694,5 @@ /obj/machinery/portable_atmospherics/hydroponics/proc/close_lid(var/mob/living/user) closed_system = !closed_system - to_chat(user, "You [closed_system ? "close" : "open"] the tray's lid.") + to_chat(user, span_filter_notice("You [closed_system ? "close" : "open"] the tray's lid.")) update_icon() diff --git a/code/modules/hydroponics/trays/tray_soil.dm b/code/modules/hydroponics/trays/tray_soil.dm index d6c471b028..b275836046 100644 --- a/code/modules/hydroponics/trays/tray_soil.dm +++ b/code/modules/hydroponics/trays/tray_soil.dm @@ -19,7 +19,7 @@ if(do_after(user, 5 SECONDS, exclusive = TASK_USER_EXCLUSIVE)) qdel(src) else - to_chat(user, "There is something growing here.") + to_chat(user, span_notice("There is something growing here.")) else return ..() diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm index f75f341685..b9b26a85f2 100644 --- a/code/modules/hydroponics/trays/tray_tools.dm +++ b/code/modules/hydroponics/trays/tray_tools.dm @@ -100,20 +100,20 @@ var/obj/machinery/portable_atmospherics/hydroponics/H = target if(H.frozen == 1) - to_chat(user, "Disable the cryogenic freezing first!") + to_chat(user, span_warning("Disable the cryogenic freezing first!")) return grown_seed = H.seed grown_reagents = H.reagents if(!grown_seed) - to_chat(user, "[src] can tell you nothing about \the [target].") + to_chat(user, span_danger("[src] can tell you nothing about \the [target].")) return last_seed = grown_seed.diverge() if(!istype(last_seed)) last_seed = grown_seed // TRAIT_IMMUTABLE makes diverge() return null - user.visible_message("[user] runs the scanner over \the [target].") + user.visible_message(span_notice("[user] runs the scanner over \the [target].")) last_reagents = list() if(grown_reagents && grown_reagents.reagent_list && grown_reagents.reagent_list.len) @@ -137,7 +137,7 @@ /obj/item/analyzer/plant_analyzer/proc/print_report(var/mob/living/user) var/datum/seed/grown_seed = last_seed if(!istype(grown_seed)) - to_chat(user, "There is no scan data to print.") + to_chat(user, span_warning("There is no scan data to print.")) return var/form_title = "[grown_seed.seed_name] (#[grown_seed.uid])" @@ -306,4 +306,4 @@ amount = "small amounts of " data["trait_info"] += "It will consume [amount][gas_data.name[gas]] from the environment." - return data \ No newline at end of file + return data diff --git a/code/modules/hydroponics/trays/tray_update_icons.dm b/code/modules/hydroponics/trays/tray_update_icons.dm index 0b3cf11231..0add60b1f1 100644 --- a/code/modules/hydroponics/trays/tray_update_icons.dm +++ b/code/modules/hydroponics/trays/tray_update_icons.dm @@ -44,7 +44,7 @@ if(!seed.growth_stages) seed.update_growth_stages() if(!seed.growth_stages) - to_world("Seed type [seed.get_trait(TRAIT_PLANT_ICON)] cannot find a growth stage value.") + to_world(span_danger("Seed type [seed.get_trait(TRAIT_PLANT_ICON)] cannot find a growth stage value.")) return var/overlay_stage = 1 if(age >= seed.get_trait(TRAIT_MATURATION)) diff --git a/code/modules/identification/identification.dm b/code/modules/identification/identification.dm index ab0d852aef..12078d8ea9 100644 --- a/code/modules/identification/identification.dm +++ b/code/modules/identification/identification.dm @@ -50,11 +50,11 @@ if(user) switch(identified) if(IDENTITY_QUALITY) - to_chat(user, "You've identified \the [holder]'s quality.") + to_chat(user, span_notice("You've identified \the [holder]'s quality.")) if(IDENTITY_PROPERTIES) - to_chat(user, "You've identified \the [holder]'s functionality as a [true_name].") + to_chat(user, span_notice("You've identified \the [holder]'s functionality as a [true_name].")) if(IDENTITY_FULL) - to_chat(user, "You've identified \the [holder] as a [true_name], and its quality.") + to_chat(user, span_notice("You've identified \the [holder] as a [true_name], and its quality.")) update_name() holder.update_icon() diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm index 4d6725f8f1..44f5faa56f 100644 --- a/code/modules/instruments/items.dm +++ b/code/modules/instruments/items.dm @@ -31,7 +31,7 @@ /obj/item/instrument/attack_self(mob/user) if(!user.IsAdvancedToolUser()) - to_chat(user, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You don't have the dexterity to do this!")) return TRUE interact(user) @@ -247,7 +247,7 @@ /obj/item/instrument/harmonica/proc/handle_speech(datum/source, list/speech_args) SIGNAL_HANDLER if(song.playing && ismob(loc)) - to_chat(loc, "You stop playing the harmonica to talk...") + to_chat(loc, span_warning("You stop playing the harmonica to talk...")) song.playing = FALSE /obj/item/instrument/harmonica/equipped(mob/M, slot) diff --git a/code/modules/instruments/songs/_song.dm b/code/modules/instruments/songs/_song.dm index 15f4a9f204..53ce5c02de 100644 --- a/code/modules/instruments/songs/_song.dm +++ b/code/modules/instruments/songs/_song.dm @@ -206,11 +206,11 @@ if(playing) return if(!using_instrument?.ready()) - to_chat(user, "An error has occurred with [src]. Please reset the instrument.") + to_chat(user, span_warning("An error has occurred with [src]. Please reset the instrument.")) return compile_chords() if(!length(compiled_chords)) - to_chat(user, "Song is empty.") + to_chat(user, span_warning("Song is empty.")) return playing = TRUE updateDialog(user_playing) diff --git a/code/modules/instruments/songs/editor.dm b/code/modules/instruments/songs/editor.dm index 7069cbbadb..2d422e12bb 100644 --- a/code/modules/instruments/songs/editor.dm +++ b/code/modules/instruments/songs/editor.dm @@ -40,9 +40,9 @@ if(!playing) dat += "Play Stop

    " dat += "Repeat Song: " - dat += repeat > 0 ? "--" : "--" + dat += repeat > 0 ? "--" : span_linkOff("-    -") dat += " [repeat] times " - dat += repeat < max_repeats ? "++" : "++" + dat += repeat < max_repeats ? "++" : span_linkOff("++") dat += "
    " else dat += "Play Stop
    " diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index 6426774085..fadb6de891 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -108,12 +108,12 @@ if("remove_cell") if(!battery) - to_chat(usr, "There's no power cell to remove from \the [src].") + to_chat(usr, span_warning("There's no power cell to remove from \the [src].")) return FALSE var/turf/T = get_turf(src) battery.forceMove(T) playsound(T, 'sound/items/Crowbar.ogg', 50, 1) - to_chat(usr, "You pull \the [battery] out of \the [src]'s power supplier.") + to_chat(usr, span_notice("You pull \the [battery] out of \the [src]'s power supplier.")) battery = null return TRUE @@ -141,9 +141,9 @@ if(D.accepting_refs) D.afterattack(C, usr, TRUE) else - to_chat(usr, "The Debugger's 'ref scanner' needs to be on.") + to_chat(usr, span_warning("The Debugger's 'ref scanner' needs to be on.")) else - to_chat(usr, "You need a multitool/debugger set to 'ref' mode to do that.") + to_chat(usr, span_warning("You need a multitool/debugger set to 'ref' mode to do that.")) return TRUE if("remove_circuit") @@ -175,7 +175,7 @@ var/input = sanitizeSafe(tgui_input_text(usr, "What do you want to name this?", "Rename", src.name, MAX_NAME_LEN), MAX_NAME_LEN) if(src && input) - to_chat(M, "The machine now has a label reading '[input]'.") + to_chat(M, span_notice("The machine now has a label reading '[input]'.")) name = input /obj/item/electronic_assembly/proc/can_move() @@ -227,21 +227,21 @@ // Returns true if the circuit made it inside. /obj/item/electronic_assembly/proc/add_circuit(var/obj/item/integrated_circuit/IC, var/mob/user) if(!opened) - to_chat(user, "\The [src] isn't opened, so you can't put anything inside. Try using a crowbar.") + to_chat(user, span_warning("\The [src] isn't opened, so you can't put anything inside. Try using a crowbar.")) return FALSE if(IC.w_class > src.w_class) - to_chat(user, "\The [IC] is way too big to fit into \the [src].") + to_chat(user, span_warning("\The [IC] is way too big to fit into \the [src].")) return FALSE var/total_part_size = get_part_size() var/total_complexity = get_part_complexity() if((total_part_size + IC.size) > max_components) - to_chat(user, "You can't seem to add the '[IC.name]', as there's insufficient space.") + to_chat(user, span_warning("You can't seem to add the '[IC.name]', as there's insufficient space.")) return FALSE if((total_complexity + IC.complexity) > max_complexity) - to_chat(user, "You can't seem to add the '[IC.name]', since this setup's too complicated for the case.") + to_chat(user, span_warning("You can't seem to add the '[IC.name]', since this setup's too complicated for the case.")) return FALSE if(!IC.forceMove(src)) @@ -282,7 +282,7 @@ if(!user.unEquip(I) && !istype(user, /mob/living/silicon/robot)) //Robots cannot de-equip items in grippers. return FALSE if(add_circuit(I, user)) - to_chat(user, "You slide \the [I] inside \the [src].") + to_chat(user, span_notice("You slide \the [I] inside \the [src].")) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) tgui_interact(user) return TRUE @@ -290,7 +290,7 @@ else if(I.has_tool_quality(TOOL_CROWBAR)) playsound(src, 'sound/items/Crowbar.ogg', 50, 1) opened = !opened - to_chat(user, "You [opened ? "opened" : "closed"] \the [src].") + to_chat(user, span_notice("You [opened ? "opened" : "closed"] \the [src].")) update_icon() return TRUE @@ -310,17 +310,17 @@ else if(istype(I, /obj/item/cell/device)) if(!opened) - to_chat(user, "\The [src] isn't opened, so you can't put anything inside. Try using a crowbar.") + to_chat(user, span_warning("\The [src] isn't opened, so you can't put anything inside. Try using a crowbar.")) return FALSE if(battery) - to_chat(user, "\The [src] already has \a [battery] inside. Remove it first if you want to replace it.") + to_chat(user, span_warning("\The [src] already has \a [battery] inside. Remove it first if you want to replace it.")) return FALSE var/obj/item/cell/device/cell = I user.drop_item(cell) cell.forceMove(src) battery = cell playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - to_chat(user, "You slot \the [cell] inside \the [src]'s power supplier.") + to_chat(user, span_notice("You slot \the [cell] inside \the [src]'s power supplier.")) tgui_interact(user) return TRUE diff --git a/code/modules/integrated_electronics/core/assemblies/device.dm b/code/modules/integrated_electronics/core/assemblies/device.dm index a3d5daeb8b..b901f52dbe 100644 --- a/code/modules/integrated_electronics/core/assemblies/device.dm +++ b/code/modules/integrated_electronics/core/assemblies/device.dm @@ -23,7 +23,7 @@ playsound(src, 'sound/items/Crowbar.ogg', 50, 1) opened = !opened EA.opened = opened - to_chat(user, "You [opened ? "opened" : "closed"] \the [src].") + to_chat(user, span_notice("You [opened ? "opened" : "closed"] \the [src].")) secured = 1 update_icon() @@ -81,4 +81,3 @@ if(!CanInteract(user, state = GLOB.tgui_deep_inventory_state)) return 0 return 1 - diff --git a/code/modules/integrated_electronics/core/assemblies/generic.dm b/code/modules/integrated_electronics/core/assemblies/generic.dm index e67790a4e6..f3e2fa2ea4 100644 --- a/code/modules/integrated_electronics/core/assemblies/generic.dm +++ b/code/modules/integrated_electronics/core/assemblies/generic.dm @@ -209,12 +209,12 @@ return var/turf/T = get_turf(user) if(!istype(T, /turf/simulated/floor)) - to_chat(user, "You cannot place \the [src] on this spot!") + to_chat(user, span_warning("You cannot place \the [src] on this spot!")) return playsound(src, 'sound/machines/click.ogg', 75, 1) user.visible_message("\The [user] attaches \the [src] to the wall.", - "You attach \the [src] to the wall.", - "You hear clicking.") + span_notice("You attach \the [src] to the wall."), + span_italics("You hear clicking.")) if(istype(user, /mob/living/silicon/robot)) //Robots cannot unequip/drop items, for Safety Reasons. forceMove(T) user.drop_item(T) @@ -260,4 +260,4 @@ to allow it to stick to walls." w_class = ITEMSIZE_TINY max_components = IC_COMPONENTS_BASE / 2 - max_complexity = IC_COMPLEXITY_BASE / 2 \ No newline at end of file + max_complexity = IC_COMPLEXITY_BASE / 2 diff --git a/code/modules/integrated_electronics/core/integrated_circuit.dm b/code/modules/integrated_electronics/core/integrated_circuit.dm index 7edaf922b6..b9e67b7607 100644 --- a/code/modules/integrated_electronics/core/integrated_circuit.dm +++ b/code/modules/integrated_electronics/core/integrated_circuit.dm @@ -70,7 +70,7 @@ a creative player the means to solve many problems. Circuits are held inside an var/input = sanitizeSafe(tgui_input_text(usr, "What do you want to name the circuit?", "Rename", src.name, MAX_NAME_LEN), MAX_NAME_LEN) if(src && input && assembly.check_interactivity(M)) - to_chat(M, "The circuit '[src.name]' is now labeled '[input]'.") + to_chat(M, span_notice("The circuit '[src.name]' is now labeled '[input]'.")) displayed_name = input /obj/item/integrated_circuit/tgui_state(mob/user) @@ -193,7 +193,7 @@ a creative player the means to solve many problems. Circuits are held inside an if(pin) debugger.write_data(pin, usr) else - to_chat(usr, "You can't do a whole lot without the proper tools.") + to_chat(usr, span_warning("You can't do a whole lot without the proper tools.")) return if("scan") @@ -202,9 +202,9 @@ a creative player the means to solve many problems. Circuits are held inside an if(D.accepting_refs) D.afterattack(src, usr, TRUE) else - to_chat(usr, "The Debugger's 'ref scanner' needs to be on.") + to_chat(usr, span_warning("The Debugger's 'ref scanner' needs to be on.")) else - to_chat(usr, "You need a multitool/debugger set to 'ref' mode to do that.") + to_chat(usr, span_warning("You need a multitool/debugger set to 'ref' mode to do that.")) return @@ -224,10 +224,10 @@ a creative player the means to solve many problems. Circuits are held inside an /obj/item/integrated_circuit/proc/remove(mob/user) var/obj/item/electronic_assembly/A = assembly if(!A) - to_chat(user, "This circuit is not in an assembly!") + to_chat(user, span_warning("This circuit is not in an assembly!")) return if(!removable) - to_chat(user, "\The [src] seems to be permanently attached to the case.") + to_chat(user, span_warning("\The [src] seems to be permanently attached to the case.")) return var/obj/item/electronic_assembly/ea = loc @@ -237,7 +237,7 @@ a creative player the means to solve many problems. Circuits are held inside an forceMove(T) assembly = null playsound(T, 'sound/items/Crowbar.ogg', 50, 1) - to_chat(user, "You pop \the [src] out of the case, and slide it out.") + to_chat(user, span_notice("You pop \the [src] out of the case, and slide it out.")) if(istype(ea)) ea.tgui_interact(user) @@ -291,4 +291,4 @@ a creative player the means to solve many problems. Circuits are held inside an return /obj/item/integrated_circuit/proc/on_unanchored() - return \ No newline at end of file + return diff --git a/code/modules/integrated_electronics/core/pins.dm b/code/modules/integrated_electronics/core/pins.dm index cc5cee7672..91ea361523 100644 --- a/code/modules/integrated_electronics/core/pins.dm +++ b/code/modules/integrated_electronics/core/pins.dm @@ -157,16 +157,16 @@ list[]( new_data = tgui_input_text(usr, "Now type in a string.","[src] string writing", istext(default) ? default : null, MAX_NAME_LEN) new_data = sanitize(new_data,MAX_NAME_LEN) if(istext(new_data) && holder.check_interactivity(user) ) - to_chat(user, "You input [new_data] into the pin.") + to_chat(user, span_notice("You input [new_data] into the pin.")) return new_data if("number") new_data = tgui_input_number(usr, "Now type in a number.","[src] number writing", isnum(default) ? default : null, MAX_NAME_LEN) if(isnum(new_data) && holder.check_interactivity(user) ) - to_chat(user, "You input [new_data] into the pin.") + to_chat(user, span_notice("You input [new_data] into the pin.")) return new_data if("null") if(holder.check_interactivity(user)) - to_chat(user, "You clear the pin's memory.") + to_chat(user, span_notice("You clear the pin's memory.")) return new_data // Basically a null check @@ -180,7 +180,7 @@ list[]( /datum/integrated_io/activate/ask_for_pin_data(mob/user) // This just pulses the pin. holder.check_then_do_work(ignore_power = TRUE) - to_chat(user, "You pulse \the [holder]'s [src] pin.") + to_chat(user, span_notice("You pulse \the [holder]'s [src] pin.")) /datum/integrated_io/activate name = "activation pin" diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm index b5c5d06fe1..d9ba4ec9be 100644 --- a/code/modules/integrated_electronics/core/printer.dm +++ b/code/modules/integrated_electronics/core/printer.dm @@ -210,14 +210,14 @@ if(!debug) if(!Adjacent(usr)) - to_chat(usr, "You are too far away from \the [src].") + to_chat(usr, span_notice("You are too far away from \the [src].")) if(metal - cost < 0) - to_chat(usr, "You need [cost] metal to build that!.") + to_chat(usr, span_warning("You need [cost] metal to build that!.")) return 1 metal -= cost var/obj/item/built = new build_type(get_turf(loc)) usr.put_in_hands(built) - to_chat(usr, "[capitalize(built.name)] printed.") + to_chat(usr, span_notice("[capitalize(built.name)] printed.")) playsound(src, 'sound/items/jaws_pry.ogg', 50, TRUE) return TRUE diff --git a/code/modules/integrated_electronics/core/special_pins/char_pin.dm b/code/modules/integrated_electronics/core/special_pins/char_pin.dm index 734d4515be..730318009f 100644 --- a/code/modules/integrated_electronics/core/special_pins/char_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/char_pin.dm @@ -5,7 +5,7 @@ /datum/integrated_io/char/ask_for_pin_data(mob/user) var/new_data = tgui_input_text(usr, "Please type in one character.","[src] char writing") if(holder.check_interactivity(user) ) - to_chat(user, "You input [new_data ? "new_data" : "NULL"] into the pin.") + to_chat(user, span_notice("You input [new_data ? "new_data" : "NULL"] into the pin.")) write_data_to_pin(new_data) /datum/integrated_io/char/write_data_to_pin(var/new_data) @@ -24,4 +24,4 @@ push_data() /datum/integrated_io/char/display_pin_type() - return IC_FORMAT_CHAR \ No newline at end of file + return IC_FORMAT_CHAR diff --git a/code/modules/integrated_electronics/core/special_pins/color_pin.dm b/code/modules/integrated_electronics/core/special_pins/color_pin.dm index 8f9a3b1a7a..8442ac8a51 100644 --- a/code/modules/integrated_electronics/core/special_pins/color_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/color_pin.dm @@ -5,7 +5,7 @@ /datum/integrated_io/color/ask_for_pin_data(mob/user) var/new_data = input(usr, "Please select a color.","[src] color writing", data ? data : "#000000") as null|color if(holder.check_interactivity(user) ) - to_chat(user, "You input a new color into the pin.") + to_chat(user, span_notice("You input a new color into the pin.")) write_data_to_pin(new_data) /datum/integrated_io/color/write_data_to_pin(var/new_data) @@ -41,4 +41,4 @@ /datum/integrated_io/color/display_data(var/input) if(!isnull(data)) return "([data])" - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/integrated_electronics/core/special_pins/dir_pin.dm b/code/modules/integrated_electronics/core/special_pins/dir_pin.dm index 368eb27b93..41ead57403 100644 --- a/code/modules/integrated_electronics/core/special_pins/dir_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/dir_pin.dm @@ -16,7 +16,7 @@ Up = [UP],\n\ Down = [DOWN]","[src] dir writing") if(isnum(new_data) && holder.check_interactivity(user) ) - to_chat(user, "You input [new_data] into the pin.") + to_chat(user, span_notice("You input [new_data] into the pin.")) write_data_to_pin(new_data) /datum/integrated_io/dir/write_data_to_pin(var/new_data) @@ -30,4 +30,4 @@ /datum/integrated_io/dir/display_data(var/input) if(!isnull(data)) return "([dir2text(data)])" - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/integrated_electronics/core/special_pins/list_pin.dm b/code/modules/integrated_electronics/core/special_pins/list_pin.dm index b5c3d39ebb..7f7c836d84 100644 --- a/code/modules/integrated_electronics/core/special_pins/list_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/list_pin.dm @@ -39,7 +39,7 @@ /datum/integrated_io/list/proc/remove_from_list_by_position(mob/user, var/position) var/list/my_list = data if(!my_list.len) - to_chat(user, "The list is empty, there's nothing to remove.") + to_chat(user, span_warning("The list is empty, there's nothing to remove.")) return if(!position) return @@ -50,7 +50,7 @@ /datum/integrated_io/list/proc/remove_from_list(mob/user, var/target_entry) var/list/my_list = data if(!my_list.len) - to_chat(user, "The list is empty, there's nothing to remove.") + to_chat(user, span_warning("The list is empty, there's nothing to remove.")) return if(!target_entry) target_entry = tgui_input_list(usr, "Which piece of data do you want to remove?", "Remove", my_list) @@ -60,7 +60,7 @@ /datum/integrated_io/list/proc/edit_in_list(mob/user, var/target_entry) var/list/my_list = data if(!my_list.len) - to_chat(user, "The list is empty, there's nothing to modify.") + to_chat(user, span_warning("The list is empty, there's nothing to modify.")) return if(!target_entry) target_entry = tgui_input_list(usr, "Which piece of data do you want to edit?", "Edit", my_list) @@ -72,7 +72,7 @@ /datum/integrated_io/list/proc/edit_in_list_by_position(mob/user, var/position) var/list/my_list = data if(!my_list.len) - to_chat(user, "The list is empty, there's nothing to modify.") + to_chat(user, span_warning("The list is empty, there's nothing to modify.")) return if(!position) return @@ -85,7 +85,7 @@ /datum/integrated_io/list/proc/swap_inside_list(mob/user, var/first_target, var/second_target) var/list/my_list = data if(my_list.len <= 1) - to_chat(user, "The list is empty, or too small to do any meaningful swapping.") + to_chat(user, span_warning("The list is empty, or too small to do any meaningful swapping.")) return if(!first_target) first_target = tgui_input_list(usr, "Which piece of data do you want to swap? (1)", "Swap", my_list) @@ -146,4 +146,3 @@ holder.interact(usr) // Refresh the main UI, interact(usr) // and the list UI. - diff --git a/code/modules/integrated_electronics/core/special_pins/number_pin.dm b/code/modules/integrated_electronics/core/special_pins/number_pin.dm index 07fe8f089a..15e9675b0c 100644 --- a/code/modules/integrated_electronics/core/special_pins/number_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/number_pin.dm @@ -6,7 +6,7 @@ /datum/integrated_io/number/ask_for_pin_data(mob/user) var/new_data = tgui_input_number(usr, "Please type in a number.","[src] number writing") if(isnum(new_data) && holder.check_interactivity(user) ) - to_chat(user, "You input [new_data] into the pin.") + to_chat(user, span_notice("You input [new_data] into the pin.")) write_data_to_pin(new_data) /datum/integrated_io/number/write_data_to_pin(var/new_data) @@ -15,4 +15,4 @@ holder.on_data_written() /datum/integrated_io/number/display_pin_type() - return IC_FORMAT_NUMBER \ No newline at end of file + return IC_FORMAT_NUMBER diff --git a/code/modules/integrated_electronics/core/special_pins/string_pin.dm b/code/modules/integrated_electronics/core/special_pins/string_pin.dm index db9bc31944..41efee9332 100644 --- a/code/modules/integrated_electronics/core/special_pins/string_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/string_pin.dm @@ -7,7 +7,7 @@ new_data = sanitizeSafe(new_data, MAX_MESSAGE_LEN, 0, 0) if(new_data && holder.check_interactivity(user) ) - to_chat(user, "You input [new_data ? "new_data" : "NULL"] into the pin.") + to_chat(user, span_notice("You input [new_data ? "new_data" : "NULL"] into the pin.")) write_data_to_pin(new_data) /datum/integrated_io/string/write_data_to_pin(var/new_data) diff --git a/code/modules/integrated_electronics/core/tools.dm b/code/modules/integrated_electronics/core/tools.dm index cf25f80f67..0466e5302b 100644 --- a/code/modules/integrated_electronics/core/tools.dm +++ b/code/modules/integrated_electronics/core/tools.dm @@ -21,28 +21,28 @@ /obj/item/integrated_electronics/wirer/proc/wire(var/datum/integrated_io/io, mob/user) if(!io.holder.assembly) - to_chat(user, "\The [io.holder] needs to be secured inside an assembly first.") + to_chat(user, span_warning("\The [io.holder] needs to be secured inside an assembly first.")) return if(mode == WIRE) selected_io = io - to_chat(user, "You attach a data wire to \the [selected_io.holder]'s [selected_io.name] data channel.") + to_chat(user, span_notice("You attach a data wire to \the [selected_io.holder]'s [selected_io.name] data channel.")) mode = WIRING update_icon() else if(mode == WIRING) if(io == selected_io) - to_chat(user, "Wiring \the [selected_io.holder]'s [selected_io.name] into itself is rather pointless.") + to_chat(user, span_warning("Wiring \the [selected_io.holder]'s [selected_io.name] into itself is rather pointless.")) return if(io.io_type != selected_io.io_type) to_chat(user, "Those two types of channels are incompatible. The first is a [selected_io.io_type], \ while the second is a [io.io_type].") return if(io.holder.assembly && io.holder.assembly != selected_io.holder.assembly) - to_chat(user, "Both \the [io.holder] and \the [selected_io.holder] need to be inside the same assembly.") + to_chat(user, span_warning("Both \the [io.holder] and \the [selected_io.holder] need to be inside the same assembly.")) return selected_io.linked |= io io.linked |= selected_io - to_chat(user, "You connect \the [selected_io.holder]'s [selected_io.name] to \the [io.holder]'s [io.name].") + to_chat(user, span_notice("You connect \the [selected_io.holder]'s [selected_io.name] to \the [io.holder]'s [io.name].")) mode = WIRE update_icon() selected_io.holder.interact(user) // This is to update the UI. @@ -51,10 +51,10 @@ else if(mode == UNWIRE) selected_io = io if(!io.linked.len) - to_chat(user, "There is nothing connected to \the [selected_io] data channel.") + to_chat(user, span_warning("There is nothing connected to \the [selected_io] data channel.")) selected_io = null return - to_chat(user, "You prepare to detach a data wire from \the [selected_io.holder]'s [selected_io.name] data channel.") + to_chat(user, span_notice("You prepare to detach a data wire from \the [selected_io.holder]'s [selected_io.name] data channel.")) mode = UNWIRING update_icon() return @@ -85,18 +85,18 @@ mode = UNWIRE if(WIRING) if(selected_io) - to_chat(user, "You decide not to wire the data channel.") + to_chat(user, span_notice("You decide not to wire the data channel.")) selected_io = null mode = WIRE if(UNWIRE) mode = WIRE if(UNWIRING) if(selected_io) - to_chat(user, "You decide not to disconnect the data channel.") + to_chat(user, span_notice("You decide not to disconnect the data channel.")) selected_io = null mode = UNWIRE update_icon() - to_chat(user, "You set \the [src] to [mode].") + to_chat(user, span_notice("You set \the [src] to [mode].")) #undef WIRE #undef WIRING @@ -126,25 +126,25 @@ new_data = sanitizeSafe(new_data, MAX_MESSAGE_LEN, 0, 0) if(istext(new_data) && CanInteract(user, GLOB.tgui_physical_state)) data_to_write = new_data - to_chat(user, "You set \the [src]'s memory to \"[new_data]\".") + to_chat(user, span_notice("You set \the [src]'s memory to \"[new_data]\".")) if("number") accepting_refs = 0 new_data = tgui_input_number(usr, "Now type in a number.","[src] number writing", min_value=-INFINITY, round_value=FALSE) if(isnum(new_data) && CanInteract(user, GLOB.tgui_physical_state)) data_to_write = new_data - to_chat(user, "You set \the [src]'s memory to [new_data].") + to_chat(user, span_notice("You set \the [src]'s memory to [new_data].")) if("ref") accepting_refs = 1 to_chat(user, "You turn \the [src]'s ref scanner on. Slide it across \ an object for a ref of that object to save it in memory.") if("null") data_to_write = null - to_chat(user, "You set \the [src]'s memory to absolutely nothing.") + to_chat(user, span_notice("You set \the [src]'s memory to absolutely nothing.")) /obj/item/integrated_electronics/debugger/afterattack(atom/target, mob/living/user, proximity) if(accepting_refs && proximity) data_to_write = WEAKREF(target) - visible_message("[user] slides \a [src]'s over \the [target].") + visible_message(span_notice("[user] slides \a [src]'s over \the [target].")) to_chat(user, "You set \the [src]'s memory to a reference to [target.name] \[Ref\]. The ref scanner is \ now off.") accepting_refs = 0 @@ -157,10 +157,10 @@ var/datum/weakref/w = data_to_write var/atom/A = w.resolve() data_to_show = A.name - to_chat(user, "You write '[data_to_write ? data_to_show : "NULL"]' to the '[io]' pin of \the [io.holder].") + to_chat(user, span_notice("You write '[data_to_write ? data_to_show : "NULL"]' to the '[io]' pin of \the [io.holder].")) else if(io.io_type == PULSE_CHANNEL) io.holder.check_then_do_work(ignore_power = TRUE) - to_chat(user, "You pulse \the [io.holder]'s [io].") + to_chat(user, span_notice("You pulse \the [io.holder]'s [io].")) io.holder.interact(user) // This is to update the UI. @@ -175,7 +175,7 @@ /obj/item/multitool/attack_self(mob/user) if(selected_io) selected_io = null - to_chat(user, "You clear the wired connection from the multitool.") + to_chat(user, span_notice("You clear the wired connection from the multitool.")) else ..() update_icon() @@ -198,41 +198,41 @@ /obj/item/multitool/proc/wire(var/datum/integrated_io/io, mob/user) if(!io.holder.assembly) - to_chat(user, "\The [io.holder] needs to be secured inside an assembly first.") + to_chat(user, span_warning("\The [io.holder] needs to be secured inside an assembly first.")) return if(selected_io) if(io == selected_io) - to_chat(user, "Wiring \the [selected_io.holder]'s [selected_io.name] into itself is rather pointless.") + to_chat(user, span_warning("Wiring \the [selected_io.holder]'s [selected_io.name] into itself is rather pointless.")) return if(io.io_type != selected_io.io_type) to_chat(user, "Those two types of channels are incompatible. The first is a [selected_io.io_type], \ while the second is a [io.io_type].") return if(io.holder.assembly && io.holder.assembly != selected_io.holder.assembly) - to_chat(user, "Both \the [io.holder] and \the [selected_io.holder] need to be inside the same assembly.") + to_chat(user, span_warning("Both \the [io.holder] and \the [selected_io.holder] need to be inside the same assembly.")) return selected_io.linked |= io io.linked |= selected_io - to_chat(user, "You connect \the [selected_io.holder]'s [selected_io.name] to \the [io.holder]'s [io.name].") + to_chat(user, span_notice("You connect \the [selected_io.holder]'s [selected_io.name] to \the [io.holder]'s [io.name].")) selected_io.holder.interact(user) // This is to update the UI. selected_io = null else selected_io = io - to_chat(user, "You link \the multitool to \the [selected_io.holder]'s [selected_io.name] data channel.") + to_chat(user, span_notice("You link \the multitool to \the [selected_io.holder]'s [selected_io.name] data channel.")) update_icon() /obj/item/multitool/proc/unwire(var/datum/integrated_io/io1, var/datum/integrated_io/io2, mob/user) if(!io1.linked.len || !io2.linked.len) - to_chat(user, "There is nothing connected to the data channel.") + to_chat(user, span_warning("There is nothing connected to the data channel.")) return if(!(io1 in io2.linked) || !(io2 in io1.linked) ) - to_chat(user, "These data pins aren't connected!") + to_chat(user, span_warning("These data pins aren't connected!")) return else io1.linked.Remove(io2) @@ -245,7 +245,7 @@ /obj/item/multitool/afterattack(atom/target, mob/living/user, proximity) if(accepting_refs && toolmode == MULTITOOL_MODE_INTCIRCUITS && proximity) weakref_wiring = WEAKREF(target) - visible_message("[user] slides \a [src]'s over \the [target].") + visible_message(span_notice("[user] slides \a [src]'s over \the [target].")) to_chat(user, "You set \the [src]'s memory to a reference to [target.name] \[Ref\]. The ref scanner is \ now off.") accepting_refs = 0 diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index dba7b9623c..741b3b48dd 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -20,7 +20,7 @@ /obj/item/integrated_circuit/input/button/ask_for_input(mob/user) //Bit misleading name for this specific use. - to_chat(user, "You press the button labeled '[src.displayed_name]'.") + to_chat(user, span_notice("You press the button labeled '[src.displayed_name]'.")) activate_pin(1) /obj/item/integrated_circuit/input/toggle_button @@ -38,7 +38,7 @@ set_pin_data(IC_OUTPUT, 1, !get_pin_data(IC_OUTPUT, 1)) push_data() activate_pin(1) - to_chat(user, "You toggle the button labeled '[src.displayed_name]' [get_pin_data(IC_OUTPUT, 1) ? "on" : "off"].") + to_chat(user, span_notice("You toggle the button labeled '[src.displayed_name]' [get_pin_data(IC_OUTPUT, 1) ? "on" : "off"].")) /obj/item/integrated_circuit/input/numberpad name = "number pad" diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm index 2211fcfa66..37eaf44b56 100644 --- a/code/modules/integrated_electronics/subtypes/manipulation.dm +++ b/code/modules/integrated_electronics/subtypes/manipulation.dm @@ -32,13 +32,13 @@ if(istype(O, /obj/item/gun)) var/obj/item/gun/gun = O if(installed_gun) - to_chat(user, "There's already a weapon installed.") + to_chat(user, span_warning("There's already a weapon installed.")) return user.drop_from_inventory(gun) installed_gun = gun size += gun.w_class gun.forceMove(src) - to_chat(user, "You slide \the [gun] into the firing mechanism.") + to_chat(user, span_notice("You slide \the [gun] into the firing mechanism.")) playsound(src, 'sound/items/Crowbar.ogg', 50, 1) else ..() @@ -46,12 +46,12 @@ /obj/item/integrated_circuit/manipulation/weapon_firing/attack_self(var/mob/user) if(installed_gun) installed_gun.forceMove(get_turf(src)) - to_chat(user, "You slide \the [installed_gun] out of the firing mechanism.") + to_chat(user, span_notice("You slide \the [installed_gun] out of the firing mechanism.")) size = initial(size) playsound(src, 'sound/items/Crowbar.ogg', 50, 1) installed_gun = null else - to_chat(user, "There's no weapon to remove from the mechanism.") + to_chat(user, span_notice("There's no weapon to remove from the mechanism.")) /obj/item/integrated_circuit/manipulation/weapon_firing/do_work() if(!installed_gun) @@ -160,9 +160,9 @@ /obj/item/integrated_circuit/manipulation/grenade/attackby(var/obj/item/grenade/G, var/mob/user) if(istype(G)) if(attached_grenade) - to_chat(user, "There is already a grenade attached!") + to_chat(user, span_warning("There is already a grenade attached!")) else if(user.unEquip(G, force=1)) - user.visible_message("\The [user] attaches \a [G] to \the [src]!", "You attach \the [G] to \the [src].") + user.visible_message(span_warning("\The [user] attaches \a [G] to \the [src]!"), span_notice("You attach \the [G] to \the [src].")) attach_grenade(G) G.forceMove(src) else @@ -170,7 +170,7 @@ /obj/item/integrated_circuit/manipulation/grenade/attack_self(var/mob/user) if(attached_grenade) - user.visible_message("\The [user] removes \an [attached_grenade] from \the [src]!", "You remove \the [attached_grenade] from \the [src].") + user.visible_message(span_warning("\The [user] removes \an [attached_grenade] from \the [src]!"), span_notice("You remove \the [attached_grenade] from \the [src].")) user.put_in_any_hand_if_possible(attached_grenade) || attached_grenade.dropInto(loc) detach_grenade() else diff --git a/code/modules/integrated_electronics/subtypes/memory.dm b/code/modules/integrated_electronics/subtypes/memory.dm index ea9e083a65..a6f4b9a1a5 100644 --- a/code/modules/integrated_electronics/subtypes/memory.dm +++ b/code/modules/integrated_electronics/subtypes/memory.dm @@ -100,26 +100,26 @@ new_data = sanitize(new_data,MAX_NAME_LEN) if(istext(new_data) && CanInteract(user, GLOB.tgui_physical_state)) O.data = new_data - to_chat(user, "You set \the [src]'s memory to [O.display_data(O.data)].") + to_chat(user, span_notice("You set \the [src]'s memory to [O.display_data(O.data)].")) if("number") accepting_refs = 0 new_data = tgui_input_number(usr, "Now type in a number.","[src] number writing", MAX_NAME_LEN) if(isnum(new_data) && CanInteract(user, GLOB.tgui_physical_state)) O.data = new_data - to_chat(user, "You set \the [src]'s memory to [O.display_data(O.data)].") + to_chat(user, span_notice("You set \the [src]'s memory to [O.display_data(O.data)].")) if("ref") accepting_refs = 1 to_chat(user, "You turn \the [src]'s ref scanner on. Slide it across \ an object for a ref of that object to save it in memory.") if("null") O.data = null - to_chat(user, "You set \the [src]'s memory to absolutely nothing.") + to_chat(user, span_notice("You set \the [src]'s memory to absolutely nothing.")) /obj/item/integrated_circuit/memory/constant/afterattack(atom/target, mob/living/user, proximity) if(accepting_refs && proximity) var/datum/integrated_io/O = outputs[1] O.data = WEAKREF(target) - visible_message("[user] slides \a [src]'s over \the [target].") + visible_message(span_notice("[user] slides \a [src]'s over \the [target].")) to_chat(user, "You set \the [src]'s memory to a reference to [O.display_data(O.data)]. The ref scanner is \ now off.") accepting_refs = 0 diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm index 06e03856a3..6d67cbd0ec 100644 --- a/code/modules/integrated_electronics/subtypes/output.dm +++ b/code/modules/integrated_electronics/subtypes/output.dm @@ -43,7 +43,7 @@ var/list/nearby_things = range(0, get_turf(src)) for(var/mob/M in nearby_things) var/obj/O = assembly ? assembly : src - to_chat(M, "[icon2html(O,M.client)] [stuff_to_display]") + to_chat(M, span_notice("[icon2html(O,M.client)] [stuff_to_display]")) /obj/item/integrated_circuit/output/screen/large name = "large screen" @@ -56,7 +56,7 @@ /obj/item/integrated_circuit/output/screen/large/do_work() ..() var/obj/O = assembly ? loc : assembly - O.visible_message("[icon2html(O,viewers(O))] [stuff_to_display]") + O.visible_message(span_notice("[icon2html(O,viewers(O))] [stuff_to_display]")) /obj/item/integrated_circuit/output/light name = "light" diff --git a/code/modules/integrated_electronics/subtypes/power.dm b/code/modules/integrated_electronics/subtypes/power.dm index d3609c62e3..043e7a68c2 100644 --- a/code/modules/integrated_electronics/subtypes/power.dm +++ b/code/modules/integrated_electronics/subtypes/power.dm @@ -87,5 +87,5 @@ var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(3, 0, get_turf(src)) sparks.start() - visible_message("\The [assembly] makes some sparks!") - qdel(sparks) \ No newline at end of file + visible_message(span_warning("\The [assembly] makes some sparks!")) + qdel(sparks) diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index fb74ae9eb9..9510a228f6 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -106,7 +106,7 @@ if(isliving(AM)) var/mob/living/L = AM var/turf/T = get_turf(AM) - T.visible_message("[src] is trying to inject [L]!") + T.visible_message(span_warning("[src] is trying to inject [L]!")) sleep(3 SECONDS) if(!L.can_be_injected_by(src)) activate_pin(3) @@ -114,8 +114,8 @@ var/contained = reagents.get_reagents() var/trans = reagents.trans_to_mob(L, transfer_amount, CHEM_BLOOD) message_admins("[src] injected \the [L] with [trans]u of [contained].") - to_chat(AM, "You feel a tiny prick!") - visible_message("[src] injects [L]!") + to_chat(AM, span_notice("You feel a tiny prick!")) + visible_message(span_warning("[src] injects [L]!")) else reagents.trans_to(AM, transfer_amount) else @@ -163,14 +163,14 @@ on_reagent_change() reagents.handle_reactions() B = null - visible_message( "Machine takes a blood sample from [target].") + visible_message( span_notice("Machine takes a blood sample from [target].")) else activate_pin(3) return else //if not mob if(!target.reagents.total_volume) - visible_message( "[target] is empty.") + visible_message( span_notice("[target] is empty.")) activate_pin(3) return target.reagents.trans_to_obj(src, tramount) diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index a958c84a68..769dbc5233 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -40,13 +40,13 @@ name = ("bookcase ([newname])") else if(O.has_tool_quality(TOOL_WRENCH)) playsound(src, O.usesound, 100, 1) - to_chat(user, (anchored ? "You unfasten \the [src] from the floor." : "You secure \the [src] to the floor.")) + to_chat(user, (anchored ? span_notice("You unfasten \the [src] from the floor.") : span_notice("You secure \the [src] to the floor."))) anchored = !anchored else if(O.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, O.usesound, 75, 1) - to_chat(user, "You begin dismantling \the [src].") + to_chat(user, span_notice("You begin dismantling \the [src].")) if(do_after(user,25 * O.toolspeed)) - to_chat(user, "You dismantle \the [src].") + to_chat(user, span_notice("You dismantle \the [src].")) new /obj/item/stack/material/wood(get_turf(src), 3) for(var/obj/item/book/b in contents) b.loc = (get_turf(src)) @@ -191,12 +191,12 @@ Book Cart End /obj/item/book/attack_self(var/mob/user as mob) if(carved) if(store) - to_chat(user, "[store] falls out of [title]!") + to_chat(user, span_notice("[store] falls out of [title]!")) store.loc = get_turf(src.loc) store = null return else - to_chat(user, "The pages of [title] have been cut out!") + to_chat(user, span_notice("The pages of [title] have been cut out!")) return if(src.dat) user << browse("Penned by [author].
    " + "[dat]", "window=book") @@ -214,13 +214,13 @@ Book Cart End user.drop_item() W.loc = src store = W - to_chat(user, "You put [W] in [title].") + to_chat(user, span_notice("You put [W] in [title].")) return else - to_chat(user, "[W] won't fit in [title].") + to_chat(user, span_notice("[W] won't fit in [title].")) return else - to_chat(user, "There's already something in [title]!") + to_chat(user, span_notice("There's already something in [title]!")) return if(istype(W, /obj/item/pen)) if(unique) @@ -283,9 +283,9 @@ Book Cart End to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'") else if(istype(W, /obj/item/material/knife) || W.has_tool_quality(TOOL_WIRECUTTER)) if(carved) return - to_chat(user, "You begin to carve out [title].") + to_chat(user, span_notice("You begin to carve out [title].")) if(do_after(user, 30)) - to_chat(user, "You carve out the pages from [title]! You didn't want to read it anyway.") + to_chat(user, span_notice("You carve out the pages from [title]! You didn't want to read it anyway.")) playsound(src, 'sound/bureaucracy/papercrumple.ogg', 50, 1) new /obj/item/shreddedp(get_turf(src)) carved = 1 @@ -295,8 +295,8 @@ Book Cart End /obj/item/book/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(user.zone_sel.selecting == O_EYES) - user.visible_message("You open up the book and show it to [M]. ", \ - " [user] opens up a book and shows it to [M]. ") + user.visible_message(span_notice("You open up the book and show it to [M]. "), \ + span_notice(" [user] opens up a book and shows it to [M]. ")) M << browse("Penned by [author].
    " + "[dat]", "window=book") user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //to prevent spam @@ -369,7 +369,7 @@ Book Cart End src.attack_self(usr) updateUsrDialog() else - to_chat(usr, "You need to hold it in your hands!") + to_chat(usr, span_notice("You need to hold it in your hands!")) /* * Barcode Scanner diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index dc31ac239c..a4bf02de8d 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -186,7 +186,7 @@ if(src.arcanecheckout) new /obj/item/book/tome(src.loc) var/datum/gender/T = gender_datums[user.get_visible_gender()] - to_chat(user, "Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a dusty old tome sitting on the desk. You don't really remember printing it.") + to_chat(user, span_warning("Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a dusty old tome sitting on the desk. You don't really remember printing it.")) user.visible_message("\The [user] stares at the blank screen for a few moments, [T.his] expression frozen in fear. When [T.he] finally awakens from it, [T.he] looks a lot older.", 2) src.arcanecheckout = 0 if(1) diff --git a/code/modules/looking_glass/lg_console.dm b/code/modules/looking_glass/lg_console.dm index 3a151fa94a..a5ff493c81 100644 --- a/code/modules/looking_glass/lg_console.dm +++ b/code/modules/looking_glass/lg_console.dm @@ -66,7 +66,7 @@ /obj/machinery/computer/looking_glass/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() - + var/list/program_list = list() for(var/P in supported_programs) program_list.Add(P) @@ -88,7 +88,7 @@ /obj/machinery/computer/looking_glass/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) if(..()) return TRUE - + switch(action) if("program") if(ready) @@ -100,7 +100,7 @@ current_program = prog load_program(prog) else - visible_message("ERROR. Recalibrating displays.") + visible_message(span_warning("ERROR. Recalibrating displays.")) return TRUE if("gravity") @@ -118,7 +118,7 @@ if (!emagged) playsound(src, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - to_chat(user, "You unlock several programs that were hidden somewhere in memory.") + to_chat(user, span_notice("You unlock several programs that were hidden somewhere in memory.")) log_game("[key_name(usr)] emagged the [name]") return 1 return @@ -142,7 +142,7 @@ if(world.time < (last_gravity_change + 3 SECONDS)) if(world.time < (last_gravity_change + 1 SECOND)) return - visible_message("ERROR. Recalibrating gravity field.") + visible_message(span_warning("ERROR. Recalibrating gravity field.")) return last_gravity_change = world.time @@ -165,4 +165,4 @@ var/oldstat = stat ..() if (stat != oldstat && (stat & NOPOWER)) - unload_program() \ No newline at end of file + unload_program() diff --git a/code/modules/maps/tg/map_template.dm b/code/modules/maps/tg/map_template.dm index 17f43d1029..3ae7d05855 100644 --- a/code/modules/maps/tg/map_template.dm +++ b/code/modules/maps/tg/map_template.dm @@ -60,13 +60,13 @@ atmos_machines += A atoms |= areas - admin_notice("Initializing newly created atom(s) in submap.", R_DEBUG) + admin_notice(span_danger("Initializing newly created atom(s) in submap."), R_DEBUG) SSatoms.InitializeAtoms(atoms) - admin_notice("Initializing atmos pipenets and machinery in submap.", R_DEBUG) + admin_notice(span_danger("Initializing atmos pipenets and machinery in submap."), R_DEBUG) SSmachines.setup_atmos_machinery(atmos_machines) - admin_notice("Rebuilding powernets due to submap creation.", R_DEBUG) + admin_notice(span_danger("Rebuilding powernets due to submap creation."), R_DEBUG) SSmachines.setup_powernets_for_cables(cables) // Ensure all machines in loaded areas get notified of power status @@ -78,7 +78,7 @@ SSshuttles.block_init_queue = prev_shuttle_queue_state SSshuttles.process_init_queues() // We will flush the queue unless there were other blockers, in which case they will do it. - admin_notice("Submap initializations finished.", R_DEBUG) + admin_notice(span_danger("Submap initializations finished."), R_DEBUG) /datum/map_template/proc/load_new_z(var/centered = FALSE, var/orientation = 0) var/x = 1 @@ -138,14 +138,14 @@ /datum/map_template/proc/annihilate_bounds(turf/origin, centered = FALSE, orientation = 0) var/deleted_atoms = 0 - admin_notice("Annihilating objects in submap loading locatation.", R_DEBUG) + admin_notice(span_danger("Annihilating objects in submap loading locatation."), R_DEBUG) var/list/turfs_to_clean = get_affected_turfs(origin, centered, orientation) if(turfs_to_clean.len) for(var/turf/T in turfs_to_clean) for(var/atom/movable/AM in T) ++deleted_atoms qdel(AM) - admin_notice("Annihilated [deleted_atoms] objects.", R_DEBUG) + admin_notice(span_danger("Annihilated [deleted_atoms] objects."), R_DEBUG) //for your ever biggening badminnery kevinz000 diff --git a/code/modules/materials/materials/_materials.dm b/code/modules/materials/materials/_materials.dm index a550582147..ca710cb04f 100644 --- a/code/modules/materials/materials/_materials.dm +++ b/code/modules/materials/materials/_materials.dm @@ -238,10 +238,10 @@ var/list/name_to_material // Placeholders for light tiles and rglass. /datum/material/proc/build_rod_product(var/mob/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack) if(!rod_product) - to_chat(user, "You cannot make anything out of \the [target_stack]") + to_chat(user, span_warning("You cannot make anything out of \the [target_stack]")) return if(used_stack.get_amount() < 1 || target_stack.get_amount() < 1) - to_chat(user, "You need one rod and one sheet of [display_name] to make anything useful.") + to_chat(user, span_warning("You need one rod and one sheet of [display_name] to make anything useful.")) return used_stack.use(1) target_stack.use(1) @@ -251,15 +251,15 @@ var/list/name_to_material /datum/material/proc/build_wired_product(var/mob/living/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack) if(!wire_product) - to_chat(user, "You cannot make anything out of \the [target_stack]") + to_chat(user, span_warning("You cannot make anything out of \the [target_stack]")) return if(used_stack.get_amount() < 5 || target_stack.get_amount() < 1) - to_chat(user, "You need five wires and one sheet of [display_name] to make anything useful.") + to_chat(user, span_warning("You need five wires and one sheet of [display_name] to make anything useful.")) return used_stack.use(5) target_stack.use(1) - to_chat(user, "You attach wire to the [name].") + to_chat(user, span_notice("You attach wire to the [name].")) var/obj/item/product = new wire_product(get_turf(user)) user.put_in_hands(product) diff --git a/code/modules/materials/materials/glass.dm b/code/modules/materials/materials/glass.dm index 940ac15eb1..7563f8a0fe 100644 --- a/code/modules/materials/materials/glass.dm +++ b/code/modules/materials/materials/glass.dm @@ -25,12 +25,12 @@ return 0 if(!user.IsAdvancedToolUser()) - to_chat(user, "This task is too complex for your clumsy hands.") + to_chat(user, span_warning("This task is too complex for your clumsy hands.")) return 1 var/turf/T = user.loc if(!istype(T)) - to_chat(user, "You must be standing on open flooring to build a window.") + to_chat(user, span_warning("You must be standing on open flooring to build a window.")) return 1 var/message = "Sheet-[used_stack.name] ([used_stack.get_amount()] sheet\s left)" @@ -68,7 +68,7 @@ else failed_to_build = 1 if(failed_to_build) - to_chat(user, "There is no room in this location.") + to_chat(user, span_warning("There is no room in this location.")) return 1 var/build_path = /obj/structure/windoor_assembly @@ -82,7 +82,7 @@ build_path = created_window if(used_stack.get_amount() < sheets_needed) - to_chat(user, "You need at least [sheets_needed] sheets to build this.") + to_chat(user, span_warning("You need at least [sheets_needed] sheets to build this.")) return 1 // Build the structure and update sheet count etc. diff --git a/code/modules/materials/sheets/metals/rods.dm b/code/modules/materials/sheets/metals/rods.dm index 958855e178..427290b31d 100644 --- a/code/modules/materials/sheets/metals/rods.dm +++ b/code/modules/materials/sheets/metals/rods.dm @@ -47,14 +47,14 @@ var/global/list/datum/stack_recipe/rods_recipes = list( \ var/obj/item/weldingtool/WT = W.get_welder() if(get_amount() < 2) - to_chat(user, "You need at least two rods to do this.") + to_chat(user, span_warning("You need at least two rods to do this.")) return if(WT.remove_fuel(0,user)) var/obj/item/stack/material/steel/new_item = new(usr.loc) new_item.add_to_stacks(usr) for (var/mob/M in viewers(src)) - M.show_message("[src] is shaped into metal by [user.name] with the weldingtool.", 3, "You hear welding.", 2) + M.show_message(span_notice("[src] is shaped into metal by [user.name] with the weldingtool."), 3, span_notice("You hear welding."), 2) var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_hand()==R) @@ -68,7 +68,7 @@ var/global/list/datum/stack_recipe/rods_recipes = list( \ new_splint.add_fingerprint(user) user.visible_message("\The [user] constructs \a [new_splint] out of a [singular_name].", \ - "You use make \a [new_splint] out of a [singular_name].") + span_notice("You use make \a [new_splint] out of a [singular_name].")) src.use(1) return @@ -93,17 +93,17 @@ var/global/list/datum/stack_recipe/rods_recipes = list( \ else if(!in_use) if(get_amount() < 2) - to_chat(user, "You need at least two rods to do this.") + to_chat(user, span_warning("You need at least two rods to do this.")) return - to_chat(usr, "Assembling grille...") + to_chat(usr, span_notice("Assembling grille...")) in_use = 1 if (!do_after(usr, 10)) in_use = 0 return var/obj/structure/grille/F = new /obj/structure/grille/ ( usr.loc ) - to_chat(usr, "You assemble a grille") + to_chat(usr, span_notice("You assemble a grille")) in_use = 0 F.add_fingerprint(usr) use(2) return -*/ \ No newline at end of file +*/ diff --git a/code/modules/materials/sheets/organic/tanning/hide.dm b/code/modules/materials/sheets/organic/tanning/hide.dm index 424e5941e1..bbac90c234 100644 --- a/code/modules/materials/sheets/organic/tanning/hide.dm +++ b/code/modules/materials/sheets/organic/tanning/hide.dm @@ -18,7 +18,7 @@ /obj/item/stack/animalhide/attackby(obj/item/W as obj, mob/user as mob) if(has_edge(W) || is_sharp(W)) //visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message) - user.visible_message("\The [user] starts cutting hair off \the [src]", "You start cutting the hair off \the [src]", "You hear the sound of a knife rubbing against flesh") + user.visible_message("\The [user] starts cutting hair off \the [src]", span_notice("You start cutting the hair off \the [src]"), "You hear the sound of a knife rubbing against flesh") var/scraped = 0 while(amount > 0 && do_after(user, 2.5 SECONDS, user)) //Try locating an exisitng stack on the tile and add to there if possible diff --git a/code/modules/materials/sheets/organic/wood.dm b/code/modules/materials/sheets/organic/wood.dm index f41fa64439..73961df185 100644 --- a/code/modules/materials/sheets/organic/wood.dm +++ b/code/modules/materials/sheets/organic/wood.dm @@ -51,7 +51,7 @@ var/time = (3 SECONDS / max(W.force / 10, 1)) * W.toolspeed user.setClickCooldown(time) if(do_after(user, time, src) && use(1)) - to_chat(user, "You cut up a log into planks.") + to_chat(user, span_notice("You cut up a log into planks.")) playsound(src, 'sound/effects/woodcutting.ogg', 50, 1) var/obj/item/stack/material/wood/existing_wood = null for(var/obj/item/stack/material/wood/M in user.loc) @@ -61,7 +61,7 @@ var/obj/item/stack/material/wood/new_wood = new plank_type(user.loc, 2) if(existing_wood && new_wood.transfer_to(existing_wood)) - to_chat(user, "You add the newly-formed wood to the stack. It now contains [existing_wood.get_amount()] planks.") + to_chat(user, span_notice("You add the newly-formed wood to the stack. It now contains [existing_wood.get_amount()] planks.")) else return ..() @@ -79,4 +79,4 @@ /obj/item/stack/material/stick/fivestack amount = 5 - color = "#824B28" \ No newline at end of file + color = "#824B28" diff --git a/code/modules/materials/sheets/supermatter.dm b/code/modules/materials/sheets/supermatter.dm index c56f298088..03da2643ad 100644 --- a/code/modules/materials/sheets/supermatter.dm +++ b/code/modules/materials/sheets/supermatter.dm @@ -33,7 +33,7 @@ burn_user = FALSE if(burn_user) - H.visible_message("\The [src] flashes as it scorches [H]'s hands!") + H.visible_message(span_danger("\The [src] flashes as it scorches [H]'s hands!")) H.apply_damage(amount / 2 + 5, BURN, "r_hand", used_weapon="Supermatter Chunk") H.apply_damage(amount / 2 + 5, BURN, "l_hand", used_weapon="Supermatter Chunk") H.drop_from_inventory(src, get_turf(H)) @@ -52,4 +52,4 @@ qdel(src) return SSradiation.radiate(get_turf(src), amount * 2) - ..() \ No newline at end of file + ..() diff --git a/code/modules/media/juke_remote.dm b/code/modules/media/juke_remote.dm index 41c550aec4..4091c0c5aa 100644 --- a/code/modules/media/juke_remote.dm +++ b/code/modules/media/juke_remote.dm @@ -19,23 +19,23 @@ // Pairing /obj/item/juke_remote/proc/pair_juke(obj/machinery/media/jukebox/juke, mob/user) if(paired_juke) - to_chat(user, "The [src] is already paired to [paired_juke == juke ? "that" : "a different"] jukebox.") + to_chat(user, span_warning("The [src] is already paired to [paired_juke == juke ? "that" : "a different"] jukebox.")) return paired_juke = juke LAZYDISTINCTADD(paired_juke.remotes, src) - to_chat(user, "You pair the [src] to the [juke].") + to_chat(user, span_notice("You pair the [src] to the [juke].")) icon_state = "[initial(icon_state)]_ready" /obj/item/juke_remote/proc/unpair_juke(mob/user) if(!paired_juke) - to_chat(user, "The [src] isn't paired to anything.") + to_chat(user, span_warning("The [src] isn't paired to anything.")) return LAZYREMOVE(paired_juke.remotes, src) paired_juke = null icon_state = initial(icon_state) unanchor() detach_area() - to_chat(user, "You unpair the [src].") + to_chat(user, span_notice("You unpair the [src].")) icon_state = "[initial(icon_state)]" /obj/item/juke_remote/afterattack(atom/target, mob/user, proximity_flag, click_parameters) @@ -93,7 +93,7 @@ A.media_source = paired_juke update_music() return TRUE - + /obj/item/juke_remote/proc/detach_area() if(!our_area || (paired_juke && our_area.media_source != paired_juke)) return @@ -108,4 +108,4 @@ // Send update to clients. for(var/mob/M in mobs_in_area(our_area)) if(M?.client) - M.update_music() \ No newline at end of file + M.update_music() diff --git a/code/modules/media/mediamanager.dm b/code/modules/media/mediamanager.dm index 7ab12e909e..f9a24ac630 100644 --- a/code/modules/media/mediamanager.dm +++ b/code/modules/media/mediamanager.dm @@ -60,7 +60,7 @@ /client/proc/set_new_volume(var/mob/user) if(QDELETED(src.media) || !istype(src.media)) - to_chat(user, "You have no media datum to change, if you're not in the lobby tell an admin.") + to_chat(user, span_warning("You have no media datum to change, if you're not in the lobby tell an admin.")) return var/value = input(usr, "Choose your Jukebox volume.", "Jukebox volume", media.volume) value = round(max(0, min(100, value))) @@ -141,7 +141,7 @@ return if(!owner.prefs.read_preference(/datum/preference/toggle/play_jukebox) && url != "") return // Don't send anything other than a cancel to people with SOUND_STREAMING pref disabled - MP_DEBUG("Sending update to mediapanel ([url], [(world.time - start_time) / 10], [volume * source_volume])...") + MP_DEBUG(span_good("Sending update to mediapanel ([url], [(world.time - start_time) / 10], [volume * source_volume])...")) owner << output(list2params(list(url, (world.time - start_time) / 10, volume * source_volume)), "[WINDOW_ID]:SetMusic") /datum/media_manager/proc/push_music(var/targetURL, var/targetStartTime, var/targetVolume) diff --git a/code/modules/media/walkpod.dm b/code/modules/media/walkpod.dm index 6704fe7a9e..6ea3552d64 100644 --- a/code/modules/media/walkpod.dm +++ b/code/modules/media/walkpod.dm @@ -54,7 +54,7 @@ STOP_PROCESSING(SSobj, src) if(deployed_headpods) restore_headpods() - to_chat(listener, "You are no longer wearing the [src]'s headphones.") + to_chat(listener, span_notice("You are no longer wearing the [src]'s headphones.")) listener = null update_icon() @@ -63,7 +63,7 @@ remove_listener() listener = L START_PROCESSING(SSobj, src) - to_chat(L, "You put the [src]'s headphones on and power it up, preparing to listen to some sick tunes.") + to_chat(L, span_notice("You put the [src]'s headphones on and power it up, preparing to listen to some sick tunes.")) update_icon() /obj/item/walkpod/proc/update_music() @@ -73,7 +73,7 @@ if(L == listener && check_listener()) tgui_interact(L) else if(loc == L) // at least they're holding it - to_chat(L, "Turn on the [src] first.") + to_chat(L, span_warning("Turn on the [src] first.")) /obj/item/walkpod/attack_self(mob/living/L) if(!istype(L) || loc != L) @@ -230,7 +230,7 @@ if(!istype(L)) return if(deployed_headpods) - to_chat(usr, "The HeadPods are already deployed!") + to_chat(usr, span_warning("The HeadPods are already deployed!")) return deployed_headpods = new () L.put_in_any_hand_if_possible(deployed_headpods) @@ -247,7 +247,7 @@ return if(listener) - to_chat(listener, "The headphone cable reunites the [deployed_headpods] with the [src] by retracting inwards.") + to_chat(listener, span_notice("The headphone cable reunites the [deployed_headpods] with the [src] by retracting inwards.")) if(istype(potential_holder)) potential_holder.unEquip(deployed_headpods, force = TRUE) diff --git a/code/modules/mentor/mentor.dm b/code/modules/mentor/mentor.dm index a226b7a318..60cb7da532 100644 --- a/code/modules/mentor/mentor.dm +++ b/code/modules/mentor/mentor.dm @@ -46,7 +46,7 @@ var/list/mentor_verbs_default = list( set category = "Special Verbs" set name = "Make Mentor" if(!holder) - to_chat(src, "Error: Only administrators may use this command.") + to_chat(src, span_pm(span_warning("Error: Only administrators may use this command."))) return var/list/client/targets[0] for(var/client/T in GLOB.clients) @@ -56,12 +56,12 @@ var/list/mentor_verbs_default = list( return var/client/C = targets[target] if(has_mentor_powers(C) || C.deadmin_holder) // If an admin is deadminned you could mentor them and that will cause fuckery if they readmin - to_chat(src, "Error: They already have mentor powers.") + to_chat(src, span_pm(span_warning("Error: They already have mentor powers."))) return var/datum/mentor/M = new /datum/mentor(C.ckey) M.associate(C) - to_chat(C, "You have been granted mentorship.") - to_chat(src, "You have made [C] a mentor.") + to_chat(C, span_pm(span_notice("You have been granted mentorship."))) + to_chat(src, span_pm(span_notice("You have made [C] a mentor."))) log_admin("[key_name(src)] made [key_name(C)] a mentor.") feedback_add_details("admin_verb","Make Mentor") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -69,7 +69,7 @@ var/list/mentor_verbs_default = list( set category = "Special Verbs" set name = "Unmake Mentor" if(!holder) - to_chat(src, "Error: Only administrators may use this command.") + to_chat(src, span_pm(span_warning("Error: Only administrators may use this command."))) return var/list/client/targets[0] for(var/client/T in GLOB.mentors) @@ -79,8 +79,8 @@ var/list/mentor_verbs_default = list( return var/client/C = targets[target] C.mentorholder.disassociate() - to_chat(C, "Your mentorship has been revoked.") - to_chat(src, "You have revoked [C]'s mentorship.") + to_chat(C, span_pm(span_warning("Your mentorship has been revoked."))) + to_chat(src, span_pm(span_notice("You have revoked [C]'s mentorship."))) log_admin("[key_name(src)] revoked [key_name(C)]'s mentorship.") feedback_add_details("admin_verb","Unmake Mentor") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -134,7 +134,7 @@ var/list/mentor_verbs_default = list( /client/proc/cmd_mhelp_reply(whom) if(prefs.muted & MUTE_ADMINHELP) - to_chat(src, "Error: Mentor-PM: You are unable to use admin PM-s (muted).") + to_chat(src, span_pm(span_warning("Error: Mentor-PM: You are unable to use admin PM-s (muted)."))) return var/client/C if(istext(whom)) @@ -143,16 +143,16 @@ var/list/mentor_verbs_default = list( C = whom if(!C) if(has_mentor_powers(src)) - to_chat(src, "Error: Mentor-PM: Client not found.") + to_chat(src, span_pm(span_warning("Error: Mentor-PM: Client not found."))) return var/datum/mentor_help/MH = C.current_mentorhelp if(MH) - message_mentors("[src] has started replying to [C]'s mentor help.") + message_mentors(span_mentor_channel("[src] has started replying to [C]'s mentor help.")) var/msg = tgui_input_text(src,"Message:", "Private message to [C]", multiline = TRUE) if (!msg) - message_mentors("[src] has cancelled their reply to [C]'s mentor help.") + message_mentors(span_mentor_channel("[src] has cancelled their reply to [C]'s mentor help.")) return cmd_mentor_pm(whom, msg, MH) @@ -185,13 +185,13 @@ var/list/mentor_verbs_default = list( set hidden = 1 if(prefs.muted & MUTE_ADMINHELP) - to_chat(src, "Error: Mentor-PM: You are unable to use admin PM-s (muted).") + to_chat(src, span_pm(span_warning("Error: Mentor-PM: You are unable to use admin PM-s (muted)."))) return //Not a mentor and no open ticket if(!has_mentor_powers(src) && !current_mentorhelp) - to_chat(src, "You can no longer reply to this ticket, please open another one by using the Mentorhelp verb if need be.") - to_chat(src, "Message: [msg]") + to_chat(src, span_pm(span_warning("You can no longer reply to this ticket, please open another one by using the Mentorhelp verb if need be."))) + to_chat(src, span_pm(span_notice("Message: [msg]"))) return var/client/recipient @@ -210,12 +210,12 @@ var/list/mentor_verbs_default = list( return if(prefs.muted & MUTE_ADMINHELP) - to_chat(src, "Error: Mentor-PM: You are unable to use admin PM-s (muted).") + to_chat(src, span_pm(span_warning("Error: Mentor-PM: You are unable to use admin PM-s (muted)."))) return if(!recipient) if(has_mentor_powers(src)) - to_chat(src, "Error:Mentor-PM: Client not found.") + to_chat(src, span_pm(span_warning("Error:Mentor-PM: Client not found."))) to_chat(src, msg) else log_admin("Mentorhelp: [key_name(src)]: [msg]") @@ -224,8 +224,8 @@ var/list/mentor_verbs_default = list( //Has mentor powers but the recipient no longer has an open ticket if(has_mentor_powers(src) && !recipient.current_mentorhelp) - to_chat(src, "You can no longer reply to this ticket.") - to_chat(src, "Message: [msg]") + to_chat(src, span_pm(span_warning("You can no longer reply to this ticket."))) + to_chat(src, span_pm(span_notice("Message: [msg]"))) return if (src.handle_spam_prevention(msg,MUTE_ADMINHELP)) @@ -235,7 +235,7 @@ var/list/mentor_verbs_default = list( if(!msg) return - var/interaction_message = "Mentor-PM from-[src] to-[recipient]: [msg]" + var/interaction_message = span_pm(span_notice("Mentor-PM from-[src] to-[recipient]: [msg]")) if (recipient.current_mentorhelp && !has_mentor_powers(recipient)) recipient.current_mentorhelp.AddInteraction(interaction_message) @@ -249,8 +249,8 @@ var/list/mentor_verbs_default = list( if (src.current_mentorhelp) src.current_mentorhelp.AddInteraction(interaction_message) - to_chat(recipient, "Mentor-PM from-[src]: [msg]") - to_chat(src, "Mentor-PM to-[recipient]: [msg]") + to_chat(recipient, span_mentor(span_italics("Mentor-PM from-[src]: [msg]"))) + to_chat(src, span_mentor(span_italics("Mentor-PM to-[recipient]: [msg]"))) log_admin("[key_name(src)]->[key_name(recipient)]: [msg]") diff --git a/code/modules/mentor/mentorhelp.dm b/code/modules/mentor/mentorhelp.dm index 4dd282fd18..c29c35413e 100644 --- a/code/modules/mentor/mentorhelp.dm +++ b/code/modules/mentor/mentorhelp.dm @@ -191,7 +191,7 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new) //message from the initiator without a target, all people with mentor powers will see this /datum/mentor_help/proc/MessageNoRecipient(msg) var/ref_src = "\ref[src]" - var/chat_msg = "(ESCALATE) Ticket [TicketHref("#[id]", ref_src)]: [LinkedReplyName(ref_src)]: [msg]" + var/chat_msg = span_notice("(ESCALATE) Ticket [TicketHref("#[id]", ref_src)]: [LinkedReplyName(ref_src)]: [msg]") AddInteraction("[LinkedReplyName(ref_src)]: [msg]") for (var/client/C in GLOB.mentors) if (C.prefs?.read_preference(/datum/preference/toggle/play_mentorhelp_ping)) @@ -204,11 +204,11 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new) //Reopen a closed ticket /datum/mentor_help/proc/Reopen() if(state == AHELP_ACTIVE) - to_chat(usr, "This ticket is already open.") + to_chat(usr, span_warning("This ticket is already open.")) return if(GLOB.mhelp_tickets.CKey2ActiveTicket(initiator_ckey)) - to_chat(usr, "This user already has an active ticket, cannot reopen this one.") + to_chat(usr, span_warning("This user already has an active ticket, cannot reopen this one.")) return statclick = new(null, src) @@ -224,8 +224,8 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new) AddInteraction("Reopened by [usr.ckey]") if(initiator) - to_chat(initiator, "[span_purple("Ticket [TicketHref("#[id]")] was reopened by [usr.ckey].")]") - var/msg = "Ticket [TicketHref("#[id]")] reopened by [usr.ckey]." + to_chat(initiator, span_filter_adminlog("[span_purple("Ticket [TicketHref("#[id]")] was reopened by [usr.ckey].")]")) + var/msg = span_adminhelp("Ticket [TicketHref("#[id]")] reopened by [usr.ckey].") message_mentors(msg) log_admin(msg) feedback_inc("mhelp_reopen") @@ -249,9 +249,9 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new) state = AHELP_RESOLVED GLOB.mhelp_tickets.ListInsert(src) - AddInteraction("[span_green("Resolved by [usr.ckey].")]") + AddInteraction(span_filter_adminlog("[span_green("Resolved by [usr.ckey].")]")) if(initiator) - to_chat(initiator, "[span_green("Ticket [TicketHref("#[id]")] was marked resolved by [usr.ckey].")]") + to_chat(initiator, span_filter_adminlog("[span_green("Ticket [TicketHref("#[id]")] was marked resolved by [usr.ckey].")]")) if(!silent) feedback_inc("mhelp_resolve") var/msg = "Ticket [TicketHref("#[id]")] resolved by [usr.ckey]" @@ -353,12 +353,12 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new) if(tgui_alert(usr, "Really escalate this ticket to admins? No mentors will ever be able to interact with it again if you do.","Escalate",list("Yes","No")) != "Yes") return if (src.initiator == null) // You can't escalate a mentorhelp of someone who's logged out because it won't create the adminhelp properly - to_chat(usr, "Error: client not found, unable to escalate.") + to_chat(usr, span_pm(span_warning("Error: client not found, unable to escalate."))) return var/datum/admin_help/AH = new /datum/admin_help(src.name, src.initiator, FALSE) message_mentors("[usr.ckey] escalated Ticket [TicketHref("#[id]")]") log_admin("[key_name(usr)] escalated mentorhelp [src.name]") - to_chat(src.initiator, "[usr.ckey] escalated your mentorhelp to admins.") + to_chat(src.initiator, span_mentor("[usr.ckey] escalated your mentorhelp to admins.")) AH._interactions = src._interactions GLOB.mhelp_tickets.active_tickets -= src GLOB.mhelp_tickets.resolved_tickets -= src @@ -416,12 +416,12 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new) set name = "Mentorhelp" if(say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") + to_chat(usr, span_danger("Speech is currently admin-disabled.")) return //handle muting and automuting if(prefs.muted & MUTE_ADMINHELP) - to_chat(src, "Error: Mentor-PM: You cannot send adminhelps (Muted).") + to_chat(src, span_danger("Error: Mentor-PM: You cannot send adminhelps (Muted).")) return if(handle_spam_prevention(msg,MUTE_ADMINHELP)) return @@ -462,10 +462,10 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new) if(current_mentorhelp) log_admin("Mentorhelp: [key_name(src)]: [msg]") current_mentorhelp.MessageNoRecipient(msg) - to_chat(usr, "Mentor-PM to-Mentors: [msg]") + to_chat(usr, span_adminnotice(span_mentor("Mentor-PM to-Mentors: [msg]"))) return else - to_chat(usr, "Ticket not found, creating new one...") + to_chat(usr, span_warning("Ticket not found, creating new one...")) else current_mentorhelp.AddInteraction("[usr.ckey] opened a new ticket.") current_mentorhelp.Resolve() @@ -490,7 +490,7 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new) GLOB.mhelp_tickets.BrowseTickets(browse_to) /proc/message_mentors(var/msg) - msg = "Mentor: [msg]" + msg = span_mentor_channel(span_prefix("Mentor: " + span_message(msg))) for(var/client/C in GLOB.mentors) to_chat(C, msg) diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index f8e88dd8a5..953aef9b81 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -152,7 +152,7 @@ vorestation edit end */ if(!locked) return - to_chat(user, "The crate is locked with a Deca-code lock.") + to_chat(user, span_notice("The crate is locked with a Deca-code lock.")) var/input = tgui_input_text(usr, "Enter [codelen] digits. All digits must be unique.", "Deca-Code Lock", "") if(!Adjacent(user)) return @@ -166,23 +166,23 @@ vorestation edit end */ sanitycheck = null //if a digit is repeated, reject the input if(input == null || sanitycheck == null || length(input) != codelen) - to_chat(user, "You leave the crate alone.") + to_chat(user, span_notice("You leave the crate alone.")) else if(check_input(input)) - to_chat(user, "The crate unlocks!") + to_chat(user, span_notice("The crate unlocks!")) playsound(src, 'sound/machines/lockreset.ogg', 50, 1) set_locked(0) else - visible_message("A red light on \the [src]'s control panel flashes briefly.") + visible_message(span_warning("A red light on \the [src]'s control panel flashes briefly.")) attempts-- if (attempts == 0) - to_chat(user, "The crate's anti-tamper system activates!") + to_chat(user, span_danger("The crate's anti-tamper system activates!")) var/turf/T = get_turf(src.loc) explosion(T, 0, 0, 1, 2) qdel(src) /obj/structure/closet/crate/secure/loot/emag_act(var/remaining_charges, var/mob/user) if (locked) - to_chat(user, "The crate unlocks!") + to_chat(user, span_notice("The crate unlocks!")) locked = 0 /obj/structure/closet/crate/secure/loot/proc/check_input(var/input) @@ -200,11 +200,11 @@ vorestation edit end */ /obj/structure/closet/crate/secure/loot/attackby(obj/item/W as obj, mob/user as mob) if(locked) if (istype(W, /obj/item/multitool)) // Greetings Urist McProfessor, how about a nice game of cows and bulls? - to_chat(user, "DECA-CODE LOCK ANALYSIS:") + to_chat(user, span_notice("DECA-CODE LOCK ANALYSIS:")) if (attempts == 1) - to_chat(user, "* Anti-Tamper system will activate on the next failed access attempt.") + to_chat(user, span_warning("* Anti-Tamper system will activate on the next failed access attempt.")) else - to_chat(user, "* Anti-Tamper system will activate after [src.attempts] failed access attempts.") + to_chat(user, span_notice("* Anti-Tamper system will activate after [src.attempts] failed access attempts.")) if(lastattempt.len) var/bulls = 0 var/cows = 0 @@ -219,6 +219,6 @@ vorestation edit end */ var/previousattempt = null //convert back to string for readback for(var/i in 1 to codelen) previousattempt = addtext(previousattempt, lastattempt[i]) - to_chat(user, "Last code attempt, [previousattempt], had [bulls] correct digits at correct positions and [cows] correct digits at incorrect positions.") + to_chat(user, span_notice("Last code attempt, [previousattempt], had [bulls] correct digits at correct positions and [cows] correct digits at incorrect positions.")) return - ..() \ No newline at end of file + ..() diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index cbf9349b50..3b28e39323 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -227,7 +227,7 @@ var/newtag = text2num(sanitizeSafe(tgui_input_text(user, "Enter new ID number or leave empty to cancel.", "Assign ID number", null, 4), 4)) if(newtag) name = "[initial(name)] #[newtag]" - to_chat(user, "You changed the drill ID to: [newtag]") + to_chat(user, span_notice("You changed the drill ID to: [newtag]")) else name = "[initial(name)]" to_chat(user, span_notice("You removed the drill's ID and any extraneous labels.")) @@ -280,9 +280,9 @@ else visible_message("\The [src] shudders to a grinding halt.") else - to_chat(user, "The drill is unpowered.") + to_chat(user, span_notice("The drill is unpowered.")) else - to_chat(user, "Turning on a piece of industrial machinery without sufficient bracing or wires exposed is a bad idea.") + to_chat(user, span_notice("Turning on a piece of industrial machinery without sufficient bracing or wires exposed is a bad idea.")) update_icon() @@ -405,9 +405,9 @@ B.stored_ore[ore] += ore_amount // Add the ore to the machine. stored_ore[ore] = 0 // Set the value of the ore in the satchel to 0. current_capacity = 0 // Set the amount of ore in the drill to 0. - to_chat(usr, "You unload the drill's storage cache into the ore box.") + to_chat(usr, span_notice("You unload the drill's storage cache into the ore box.")) else - to_chat(usr, "You must move an ore box up to the drill before you can unload it.") + to_chat(usr, span_notice("You must move an ore box up to the drill before you can unload it.")) /obj/machinery/mining/brace @@ -435,7 +435,7 @@ /obj/machinery/mining/brace/attackby(obj/item/W as obj, mob/user as mob) if(connected && connected.active) - to_chat(user, "You can't work with the brace of a running drill!") + to_chat(user, span_notice("You can't work with the brace of a running drill!")) return if(default_deconstruction_screwdriver(user, W)) @@ -448,11 +448,11 @@ if(W.has_tool_quality(TOOL_WRENCH)) if(istype(get_turf(src), /turf/space)) - to_chat(user, "You can't anchor something to empty space. Idiot.") + to_chat(user, span_notice("You can't anchor something to empty space. Idiot.")) return playsound(src, W.usesound, 100, 1) - to_chat(user, "You [anchored ? "un" : ""]anchor the brace.") + to_chat(user, span_notice("You [anchored ? "un" : ""]anchor the brace.")) anchored = !anchored if(anchored) diff --git a/code/modules/mining/drilling/scanner.dm b/code/modules/mining/drilling/scanner.dm index c981cd5c4d..203f72861a 100644 --- a/code/modules/mining/drilling/scanner.dm +++ b/code/modules/mining/drilling/scanner.dm @@ -11,7 +11,7 @@ var/exact = FALSE /obj/item/mining_scanner/attack_self(mob/user as mob) - to_chat(user, "You begin sweeping \the [src] about, scanning for metal deposits.") + to_chat(user, span_notice("You begin sweeping \the [src] about, scanning for metal deposits.")) playsound(src, 'sound/items/goggles_charge.ogg', 50, 1, -6) if(!do_after(user, scan_time)) @@ -87,4 +87,4 @@ var/custom_range = tgui_input_list(usr, "Scanner Range","Pick a range to scan. ", list(0,1,2,3,4,5,6,7)) if(custom_range) range = custom_range - to_chat(usr, "Scanner will now look up to [range] tile(s) away.") + to_chat(usr, span_notice("Scanner will now look up to [range] tile(s) away.")) diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index 65911e98ae..abad46ed3e 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -57,9 +57,9 @@ var/global/list/total_extraction_beacons = list() return if(A.anchored) return - to_chat(user, "You start attaching the pack to [A]...") + to_chat(user, span_notice("You start attaching the pack to [A]...")) if(do_after(user,50,target=A)) - to_chat(user, "You attach the pack to [A] and activate it.") + to_chat(user, span_notice("You attach the pack to [A] and activate it.")) /* No components, sorry. No convienence for you! if(loc == user && istype(user.back, /obj/item/storage/backpack)) var/obj/item/storage/backpack/B = user.back diff --git a/code/modules/mining/kinetic_crusher.dm b/code/modules/mining/kinetic_crusher.dm index 0bbc1a3e08..4fe6d9607b 100644 --- a/code/modules/mining/kinetic_crusher.dm +++ b/code/modules/mining/kinetic_crusher.dm @@ -105,25 +105,25 @@ /obj/item/kinetic_crusher/examine(mob/living/user) . = ..() - . += "Mark a[emagged ? "nything": " creature"] with the destabilizing force, then hit them in melee to do [force + detonation_damage] damage." - . += "Does [force + detonation_damage + backstab_bonus] damage if the target is backstabbed, instead of [force + detonation_damage]." + . += span_notice("Mark a[emagged ? "nything": " creature"] with the destabilizing force, then hit them in melee to do [force + detonation_damage] damage.") + . += span_notice("Does [force + detonation_damage + backstab_bonus] damage if the target is backstabbed, instead of [force + detonation_damage].") /* for(var/t in trophies) var/obj/item/crusher_trophy/T = t - . += "It has \a [T] attached, which causes [T.effect_desc()]." + . += span_notice("It has \a [T] attached, which causes [T.effect_desc()].") */ /* /obj/item/kinetic_crusher/attackby(obj/item/I, mob/living/user) if(I.tool_behaviour == TOOL_CROWBAR) if(LAZYLEN(trophies)) - to_chat(user, "You remove [src]'s trophies.") + to_chat(user, span_notice("You remove [src]'s trophies.")) I.play_tool_sound(src) for(var/t in trophies) var/obj/item/crusher_trophy/T = t T.remove_from(src, user) else - to_chat(user, "There are no trophies on [src].") + to_chat(user, span_warning("There are no trophies on [src].")) else if(istype(I, /obj/item/crusher_trophy)) var/obj/item/crusher_trophy/T = I T.add_to(src, user) @@ -133,7 +133,7 @@ /obj/item/kinetic_crusher/attack(mob/living/target, mob/living/carbon/user) if(!wielded && requires_wield) - to_chat(user, "[src] is too heavy to use with one hand.") + to_chat(user, span_warning("[src] is too heavy to use with one hand.")) return ..() @@ -355,9 +355,9 @@ src.forceMove(storing_module) storing_module.stored_gauntlets = src user.visible_message( - "[user] retracts [src] with a click and a hiss.", - "You retract [src] with a click and a hiss.", - "You hear a click and a hiss." + span_notice("[user] retracts [src] with a click and a hiss."), + span_notice("You retract [src] with a click and a hiss."), + span_notice("You hear a click and a hiss.") ) playsound(src, 'sound/items/helmetdeploy.ogg', 40, 1) storing_module.active = FALSE diff --git a/code/modules/mining/machinery/machine_processing.dm b/code/modules/mining/machinery/machine_processing.dm index 133034508c..4d03ae6a72 100644 --- a/code/modules/mining/machinery/machine_processing.dm +++ b/code/modules/mining/machinery/machine_processing.dm @@ -35,7 +35,7 @@ if(..()) return if(!allowed(user)) - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) return tgui_interact(user) @@ -128,7 +128,7 @@ inserted_id.mining_points += machine.points machine.points = 0 else - to_chat(usr, "Required access not found.") + to_chat(usr, span_warning("Required access not found.")) . = TRUE if("insert") var/obj/item/card/id/I = usr.get_active_hand() @@ -137,7 +137,7 @@ I.forceMove(src) inserted_id = I else - to_chat(usr, "No valid ID.") + to_chat(usr, span_warning("No valid ID.")) . = TRUE if("speed_toggle") machine.toggle_speed() diff --git a/code/modules/mining/machinery/machine_stacking.dm b/code/modules/mining/machinery/machine_stacking.dm index 6567625b54..c01007c636 100644 --- a/code/modules/mining/machinery/machine_stacking.dm +++ b/code/modules/mining/machinery/machine_stacking.dm @@ -21,7 +21,7 @@ machine.console = src else //Silently failing and causing mappers to scratch their heads while runtiming isn't ideal. - to_world("Warning: Stacking machine console at [src.x], [src.y], [src.z] could not find its machine!") + to_world(span_danger("Warning: Stacking machine console at [src.x], [src.y], [src.z] could not find its machine!")) qdel(src) /obj/machinery/mineral/stacking_unit_console/attack_hand(mob/user) @@ -37,7 +37,7 @@ /obj/machinery/mineral/stacking_unit_console/tgui_data(mob/user) var/list/data = ..() - + var/list/stacktypes = list() for(var/stacktype in machine.stack_storage) if(machine.stack_storage[stacktype] > 0) @@ -136,8 +136,7 @@ var/stacktype = stack_paths[sheet] new stacktype (get_turf(output), stack_amt) stack_storage[sheet] -= stack_amt - + if(console) console.updateUsrDialog() return - diff --git a/code/modules/mining/mine_outcrops.dm b/code/modules/mining/mine_outcrops.dm index 7897305efa..2130ce68e9 100644 --- a/code/modules/mining/mine_outcrops.dm +++ b/code/modules/mining/mine_outcrops.dm @@ -90,9 +90,9 @@ /obj/structure/outcrop/attackby(obj/item/W as obj, mob/user as mob) if (istype(W, /obj/item/pickaxe)) - to_chat(user, "[user] begins to hack away at \the [src].") + to_chat(user, span_notice("[user] begins to hack away at \the [src].")) if(do_after(user,40)) - to_chat(user, "You have finished digging!") + to_chat(user, span_notice("You have finished digging!")) for(var/i=0;i<(rand(mindrop,upperdrop));i++) new outcropdrop(get_turf(src)) qdel(src) @@ -100,13 +100,13 @@ if (istype(W, /obj/item/melee/shock_maul)) var/obj/item/melee/shock_maul/S = W if(!S.wielded || !S.status) - to_chat(user, "\The [src] must be wielded in two hands and powered on to be used for mining!") + to_chat(user, span_warning("\The [src] must be wielded in two hands and powered on to be used for mining!")) return - to_chat(user, "You pulverize \the [src]!") + to_chat(user, span_notice("You pulverize \the [src]!")) for(var/i=0;i<(rand(mindrop,upperdrop));i++) new outcropdrop(get_turf(src)) playsound(src, 'sound/weapons/resonator_blast.ogg', 100, 1, -1) - user.visible_message("\The [S] discharges with a thunderous, hair-raising crackle!") + user.visible_message(span_warning("\The [S] discharges with a thunderous, hair-raising crackle!")) S.deductcharge() S.status = 0 S.update_held_icon() @@ -129,4 +129,4 @@ prob(30);/obj/structure/outcrop/phoron, prob(7);/obj/structure/outcrop/diamond, prob(15);/obj/structure/outcrop/platinum, - prob(15);/obj/structure/outcrop/lead) \ No newline at end of file + prob(15);/obj/structure/outcrop/lead) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index ed016584c4..a427121551 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -353,7 +353,7 @@ var/list/mining_overlay_cache = list() /turf/simulated/mineral/attackby(obj/item/W as obj, mob/user as mob) if (!user.IsAdvancedToolUser()) - to_chat(user, "You don't have the dexterity to do this!") + to_chat(user, span_warning("You don't have the dexterity to do this!")) return if(!density) @@ -373,19 +373,19 @@ var/list/mining_overlay_cache = list() if(valid_tool) if (sand_dug) - to_chat(user, "This area has already been dug.") + to_chat(user, span_warning("This area has already been dug.")) return var/turf/T = user.loc if (!(istype(T))) return - to_chat(user, "You start digging.") + to_chat(user, span_notice("You start digging.")) playsound(user, 'sound/effects/rustle1.ogg', 50, 1) if(!do_after(user,digspeed)) return - to_chat(user, "You dug a hole.") + to_chat(user, span_notice("You dug a hole.")) GetDrilled() else if(istype(W,/obj/item/storage/bag/ore)) @@ -426,9 +426,9 @@ var/list/mining_overlay_cache = list() if (istype(W, /obj/item/measuring_tape)) var/obj/item/measuring_tape/P = W - user.visible_message("\The [user] extends \a [P] towards \the [src].","You extend \the [P] towards \the [src].") + user.visible_message("\The [user] extends \a [P] towards \the [src].",span_notice("You extend \the [P] towards \the [src].")) if(do_after(user, 15)) - to_chat(user, "\The [src] has been excavated to a depth of [excavation_level]cm.") + to_chat(user, span_notice("\The [src] has been excavated to a depth of [excavation_level]cm.")) return if(istype(W, /obj/item/xenoarch_multi_tool)) @@ -436,9 +436,9 @@ var/list/mining_overlay_cache = list() if(C.mode) //Mode means scanning C.depth_scanner.scan_atom(user, src) else - user.visible_message("\The [user] extends \the [C] over \the [src], a flurry of red beams scanning \the [src]'s surface!", "You extend \the [C] over \the [src], a flurry of red beams scanning \the [src]'s surface!") + user.visible_message("\The [user] extends \the [C] over \the [src], a flurry of red beams scanning \the [src]'s surface!", span_notice("You extend \the [C] over \the [src], a flurry of red beams scanning \the [src]'s surface!")) if(do_after(user, 15)) - to_chat(user, "\The [src] has been excavated to a depth of [excavation_level]cm.") + to_chat(user, span_notice("\The [src] has been excavated to a depth of [excavation_level]cm.")) return if (istype(W, /obj/item/melee/shock_maul)) @@ -447,7 +447,7 @@ var/list/mining_overlay_cache = list() var/obj/item/melee/shock_maul/S = W if(!S.wielded || !S.status) //if we're not wielded OR not powered up, do nothing - to_chat(user, "\The [src] must be wielded in two hands and powered on to be used for mining!") + to_chat(user, span_warning("\The [src] must be wielded in two hands and powered on to be used for mining!")) return var/newDepth = excavation_level + S.excavation_amount // Used commonly below @@ -460,7 +460,7 @@ var/list/mining_overlay_cache = list() fail_message = ". [pick("There is a crunching noise","[S] collides with some different rock","Part of the rock face crumbles away","Something breaks under [S]")]" wreckfinds(S.destroy_artefacts) - to_chat(user, "You smash through \the [src][fail_message].") + to_chat(user, span_notice("You smash through \the [src][fail_message].")) if(newDepth >= 200) // This means the rock is mined out fully if(S.destroy_artefacts) @@ -480,7 +480,7 @@ var/list/mining_overlay_cache = list() geologic_data.UpdateNearbyArtifactInfo(src) O.geologic_data = geologic_data - user.visible_message("\The [src] discharges with a thunderous, hair-raising crackle!") + user.visible_message(span_warning("\The [src] discharges with a thunderous, hair-raising crackle!")) playsound(src, 'sound/weapons/resonator_blast.ogg', 100, 1, -1) S.deductcharge() S.status = 0 @@ -505,7 +505,7 @@ var/list/mining_overlay_cache = list() if(newDepth > F.excavation_required) // Digging too deep can break the item. At least you won't summon a Balrog (probably) fail_message = ". [pick("There is a crunching noise","[W] collides with some different rock","Part of the rock face crumbles away","Something breaks under [W]")]" wreckfinds(P.destroy_artefacts) - to_chat(user, "You start [P.drill_verb][fail_message].") + to_chat(user, span_notice("You start [P.drill_verb][fail_message].")) if(do_after(user,P.digspeed)) @@ -516,7 +516,7 @@ var/list/mining_overlay_cache = list() else if(newDepth > F.excavation_required - F.clearance_range) // Not quite right but you still extract your find, the closer to the bottom the better, but not above 80% excavate_find(prob(80 * (F.excavation_required - newDepth) / F.clearance_range), F) - to_chat(user, "You finish [P.drill_verb] \the [src].") + to_chat(user, span_notice("You finish [P.drill_verb] \the [src].")) if(newDepth >= 200) // This means the rock is mined out fully if(P.destroy_artefacts) @@ -646,7 +646,7 @@ var/list/mining_overlay_cache = list() if(prob(50)) pain = 1 for(var/mob/living/M in range(src, 200)) - to_chat(M, "[pick("A high-pitched [pick("keening","wailing","whistle")]","A rumbling noise like [pick("thunder","heavy machinery")]")] somehow penetrates your mind before fading away!") + to_chat(M, span_danger("[pick("A high-pitched [pick("keening","wailing","whistle")]","A rumbling noise like [pick("thunder","heavy machinery")]")] somehow penetrates your mind before fading away!")) if(pain) flick("pain",M.pain) if(prob(50)) @@ -659,7 +659,7 @@ var/list/mining_overlay_cache = list() if(prob(25)) excavate_find(prob(5), finds[1]) else if(rand(1,500) == 1) - visible_message("An old dusty crate was buried within!") + visible_message(span_notice("An old dusty crate was buried within!")) new /obj/structure/closet/crate/secure/loot(src) make_floor() @@ -690,7 +690,7 @@ var/list/mining_overlay_cache = list() var/obj/effect/suspension_field/S = locate() in src if(!S) if(X) - visible_message("\The [pick("[display_name] crumbles away into dust","[display_name] breaks apart")].") + visible_message(span_danger("\The [pick("[display_name] crumbles away into dust","[display_name] breaks apart")].")) qdel(X) finds.Remove(F) diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index b419794af7..08a1c5a2da 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -43,7 +43,7 @@ ..() var/mob/living/carbon/human/H = hit_atom if(istype(H) && H.has_eyes() && prob(85)) - to_chat(H, "Some of \the [src] gets in your eyes!") + to_chat(H, span_danger("Some of \the [src] gets in your eyes!")) H.Blind(5) H.eye_blurry += 10 spawn(1) @@ -95,7 +95,7 @@ ..() var/mob/living/carbon/human/H = hit_atom if(istype(H) && H.has_eyes() && prob(85)) - to_chat(H, "Some of \the [src] gets in your eyes!") + to_chat(H, span_danger("Some of \the [src] gets in your eyes!")) H.Blind(10) H.eye_blurry += 15 spawn(1) @@ -215,4 +215,4 @@ . += "- [stored_ore[ore]] [ore]" has_ore = 1 if(!has_ore) - . += "Nothing. You should contact a developer." \ No newline at end of file + . += "Nothing. You should contact a developer." diff --git a/code/modules/mining/ore_box.dm b/code/modules/mining/ore_box.dm index ad236de2a9..35dac00347 100644 --- a/code/modules/mining/ore_box.dm +++ b/code/modules/mining/ore_box.dm @@ -46,7 +46,7 @@ stored_ore[ore] += ore_amount // Add the ore to the machine. S.stored_ore[ore] = 0 // Set the value of the ore in the satchel to 0. S.current_capacity = 0 // Set the amount of ore in the satchel to 0. - to_chat(user, "You empty the satchel into the box.") + to_chat(user, span_notice("You empty the satchel into the box.")) return @@ -85,7 +85,7 @@ // set src in view(1) // // if(!ishuman(usr) && !isrobot(usr)) //Only living, intelligent creatures with gripping aparatti can empty ore boxes. -// to_chat(usr, "You are physically incapable of emptying the ore box.") +// to_chat(usr, span_warning("You are physically incapable of emptying the ore box.")) // return // if(usr.stat || usr.restrained()) // return @@ -97,13 +97,13 @@ // add_fingerprint(usr) // // if(contents.len < 1) -// to_chat(usr, "The ore box is empty.") +// to_chat(usr, span_warning("The ore box is empty.")) // return // // for (var/obj/item/ore/O in contents) // contents -= O // O.loc = src.loc -// to_chat(usr, "You empty the ore box.") +// to_chat(usr, span_notice("You empty the ore box.")) // // return diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm index dc07d5933d..ab46d4df93 100644 --- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm @@ -177,7 +177,7 @@ if(old_stat != stat) update_icon() if(inserted_id && !powered()) - visible_message("The ID slot indicator light flickers on \the [src] as it spits out a card before powering down.") + visible_message(span_notice("The ID slot indicator light flickers on \the [src] as it spits out a card before powering down.")) inserted_id.forceMove(get_turf(src)) /obj/machinery/mineral/equipment_vendor/update_icon() @@ -279,7 +279,7 @@ return var/datum/data/mining_equipment/prize = prize_list[category][name] if(prize.cost > get_points(inserted_id)) // shouldn't be able to access this since the button is greyed out, but.. - to_chat(usr, "You have insufficient points.") + to_chat(usr, span_danger("You have insufficient points.")) flick(icon_deny, src) //VOREStation Add return diff --git a/code/modules/mining/ore_redemption_machine/mine_point_items.dm b/code/modules/mining/ore_redemption_machine/mine_point_items.dm index 42886cdd15..fac3c5d1ad 100644 --- a/code/modules/mining/ore_redemption_machine/mine_point_items.dm +++ b/code/modules/mining/ore_redemption_machine/mine_point_items.dm @@ -23,17 +23,17 @@ var/obj/item/card/id/C = I if(mine_points) C.mining_points += mine_points - to_chat(user, "You transfer [mine_points] excavation points to [C].") + to_chat(user, span_info("You transfer [mine_points] excavation points to [C].")) mine_points = 0 else - to_chat(user, "There's no excavation points left on [src].") + to_chat(user, span_info("There's no excavation points left on [src].")) if(survey_points) C.survey_points += survey_points - to_chat(user, "You transfer [survey_points] survey points to [C].") + to_chat(user, span_info("You transfer [survey_points] survey points to [C].")) survey_points = 0 else - to_chat(user, "There's no survey points left on [src].") + to_chat(user, span_info("There's no survey points left on [src].")) ..() diff --git a/code/modules/mining/resonator.dm b/code/modules/mining/resonator.dm index dbee1668b2..9a7ffa48eb 100644 --- a/code/modules/mining/resonator.dm +++ b/code/modules/mining/resonator.dm @@ -36,10 +36,10 @@ /obj/item/resonator/attack_self(mob/user) if(burst_time == 50) burst_time = 30 - to_chat(user, "You set the resonator's fields to detonate after 3 seconds.") + to_chat(user, span_info("You set the resonator's fields to detonate after 3 seconds.")) else burst_time = 50 - to_chat(user, "You set the resonator's fields to detonate after 5 seconds.") + to_chat(user, span_info("You set the resonator's fields to detonate after 5 seconds.")) /obj/item/resonator/afterattack(atom/target, mob/user, proximity_flag) if(proximity_flag) @@ -88,7 +88,7 @@ for(var/mob/living/L in src.loc) if(creator) add_attack_logs(creator, L, "used a resonator field on") - to_chat(L, "\The [src] ruptured with you in it!") + to_chat(L, span_danger("\The [src] ruptured with you in it!")) L.apply_damage(resonance_damage, BRUTE) qdel(src) diff --git a/code/modules/mining/resonator_vr.dm b/code/modules/mining/resonator_vr.dm index 796a2a12fd..e1e5e4ae1b 100644 --- a/code/modules/mining/resonator_vr.dm +++ b/code/modules/mining/resonator_vr.dm @@ -94,10 +94,10 @@ if("Resonance Time") if(burst_time == 50) burst_time = 30 - to_chat(user, "You set the resonator's fields to detonate after 3 seconds.") + to_chat(user, span_info("You set the resonator's fields to detonate after 3 seconds.")) else burst_time = 50 - to_chat(user, "You set the resonator's fields to detonate after 5 seconds.") + to_chat(user, span_info("You set the resonator's fields to detonate after 5 seconds.")) if("Toggle Cascade") spreadmode = !spreadmode to_chat(user, span_info("You have [(spreadmode ? "enabled" : "disabled")] the resonance cascade mode.")) @@ -152,7 +152,7 @@ for(var/mob/living/L in src.loc) if(creator) add_attack_logs(creator, L, "used a resonator field on") - to_chat(L, "\The [src] ruptured with you in it!") + to_chat(L, span_danger("\The [src] ruptured with you in it!")) L.apply_damage(resonance_damage, BRUTE) qdel(src) diff --git a/code/modules/mining/shelter_atoms_vr.dm b/code/modules/mining/shelter_atoms_vr.dm index 1458bbd535..e36e992ce4 100644 --- a/code/modules/mining/shelter_atoms_vr.dm +++ b/code/modules/mining/shelter_atoms_vr.dm @@ -46,7 +46,7 @@ GLOBAL_LIST_EMPTY(unique_deployable) //Can't grab when capsule is New() because templates aren't loaded then get_template() if(!used) - loc.visible_message("\The [src] begins to shake. Stand back!") + loc.visible_message(span_warning("\The [src] begins to shake. Stand back!")) used = TRUE sleep(5 SECONDS) @@ -58,16 +58,16 @@ GLOBAL_LIST_EMPTY(unique_deployable) switch(status) //Not allowed due to /area technical reasons if(SHELTER_DEPLOY_BAD_AREA) - src.loc.visible_message("\The [src] will not function in this area.") + src.loc.visible_message(span_warning("\The [src] will not function in this area.")) //Anchored objects or no space if(SHELTER_DEPLOY_BAD_TURFS, SHELTER_DEPLOY_ANCHORED_OBJECTS) var/width = template.width var/height = template.height - src.loc.visible_message("\The [src] doesn't have room to deploy! You need to clear a [width]x[height] area!") + src.loc.visible_message(span_warning("\The [src] doesn't have room to deploy! You need to clear a [width]x[height] area!")) if(SHELTER_DEPLOY_SHIP_SPACE) - src.loc.visible_message("\The [src] can only be deployed in space.") + src.loc.visible_message(span_warning("\The [src] can only be deployed in space.")) if(status != SHELTER_DEPLOY_ALLOWED) used = FALSE @@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(unique_deployable) if(unique_id) if(unique_id in GLOB.unique_deployable) - loc.visible_message("There can only be one [src] deployed at a time.") + loc.visible_message(span_warning("There can only be one [src] deployed at a time.")) used = FALSE return GLOB.unique_deployable += unique_id @@ -200,7 +200,7 @@ GLOBAL_LIST_EMPTY(unique_deployable) ..() /obj/structure/table/survival_pod/dismantle(obj/item/tool/wrench/W, mob/user) - to_chat(user, "You cannot dismantle \the [src].") + to_chat(user, span_warning("You cannot dismantle \the [src].")) return //Sleeper @@ -227,8 +227,8 @@ GLOBAL_LIST_EMPTY(unique_deployable) /obj/item/gps/computer/attackby(obj/item/I, mob/living/user) if(I.has_tool_quality(TOOL_WRENCH)) - user.visible_message("[user] disassembles [src].", - "You start to disassemble [src]...", "You hear clanking and banging noises.") + user.visible_message(span_warning("[user] disassembles [src]."), + span_notice("You start to disassemble [src]..."), "You hear clanking and banging noises.") if(do_after(user,4 SECONDS,src)) new /obj/item/gps(loc) qdel(src) @@ -293,8 +293,8 @@ GLOBAL_LIST_EMPTY(unique_deployable) /obj/structure/fans/attackby(obj/item/I, mob/living/user) if(I.has_tool_quality(TOOL_WRENCH)) - user.visible_message("[user] disassembles [src].", - "You start to disassemble [src]...", "You hear clanking and banging noises.") + user.visible_message(span_warning("[user] disassembles [src]."), + span_notice("You start to disassemble [src]..."), "You hear clanking and banging noises.") if(do_after(user,4 SECONDS,src)) deconstruct() return TRUE diff --git a/code/modules/mining/shelters_vr.dm b/code/modules/mining/shelters_vr.dm index b5e6419240..cb0a185173 100644 --- a/code/modules/mining/shelters_vr.dm +++ b/code/modules/mining/shelters_vr.dm @@ -43,7 +43,7 @@ for(var/obj/structure/flora/AM in T) ++deleted_atoms qdel(AM) - admin_notice("Annihilated [deleted_atoms] plants.", R_DEBUG) + admin_notice(span_danger("Annihilated [deleted_atoms] plants."), R_DEBUG) /datum/map_template/shelter/proc/update_lighting(turf/deploy_location) var/affected = get_affected_turfs(deploy_location, centered=TRUE) diff --git a/code/modules/mob/_modifiers/changeling.dm b/code/modules/mob/_modifiers/changeling.dm index 7e83c45461..739e29c8bd 100644 --- a/code/modules/mob/_modifiers/changeling.dm +++ b/code/modules/mob/_modifiers/changeling.dm @@ -47,7 +47,7 @@ desc = "Our eyes are capable of seeing into the infrared spectrum to accurately identify prey through walls." vision_flags = SEE_MOBS - on_expired_text = "Your sight returns to what it once was." + on_expired_text = span_alien("Your sight returns to what it once was.") stacks = MODIFIER_STACK_EXTEND /datum/modifier/changeling/thermal_sight/check_if_valid() diff --git a/code/modules/mob/_modifiers/cloning.dm b/code/modules/mob/_modifiers/cloning.dm index 958ecd4ecd..029a82c86c 100644 --- a/code/modules/mob/_modifiers/cloning.dm +++ b/code/modules/mob/_modifiers/cloning.dm @@ -7,8 +7,8 @@ name = "cloning sickness" desc = "You feel rather weak, having been cloned not so long ago." - on_created_text = "You feel really weak." - on_expired_text = "You feel your strength returning to you." + on_created_text = span_warning("You feel really weak.") + on_expired_text = span_notice("You feel your strength returning to you.") max_health_percent = 0.6 // -40% max health. incoming_damage_percent = 1.1 // 10% more incoming damage. @@ -31,8 +31,8 @@ desc = "For whatever reason, you cannot be cloned." //WIP, but these may never be seen anyway, so *shrug - on_created_text = "Life suddenly feels more precious." - on_expired_text = "Death is cheap again." + on_created_text = span_warning("Life suddenly feels more precious.") + on_expired_text = span_notice("Death is cheap again.") flags = MODIFIER_GENETIC @@ -52,8 +52,8 @@ name = "reformation sickness" desc = "Your core feels damaged, as you were reformed with the improper machinery." - on_created_text = "Your core aches." - on_expired_text = "You feel your core's strength returning to normal." + on_created_text = span_warning("Your core aches.") + on_expired_text = span_notice("You feel your core's strength returning to normal.") incoming_damage_percent = 1 //Level the incoming damage from the parent modifier. They already take 200% burn. incoming_brute_damage_percent = 1.5 //150% incoming brute damage. Decreases the effectiveness of their 0.75 modifier. @@ -70,8 +70,8 @@ name = "surgically attached brain" desc = "You feel weak, as your central nervous system is still recovering from being repaired." - on_created_text = "You feel... off, and your head hurts." - on_expired_text = "You feel some strength returning to you." + on_created_text = span_warning("You feel... off, and your head hurts.") + on_expired_text = span_notice("You feel some strength returning to you.") max_health_percent = 0.9 // -10% max health. incoming_damage_percent = 1.1 // 10% more incoming damage. @@ -107,8 +107,8 @@ name = "neural recovery" desc = "You feel out of touch, as your central nervous system is still recovering from being repaired." - on_created_text = "You feel... off. Everything is fuzzy." - on_expired_text = "You feel your senses returning to you." + on_created_text = span_warning("You feel... off. Everything is fuzzy.") + on_expired_text = span_notice("You feel your senses returning to you.") incoming_hal_damage_percent = 1.5 // 50% more halloss damage. disable_duration_percent = 1.25 // Stuns last 25% longer. diff --git a/code/modules/mob/_modifiers/crusher_mark.dm b/code/modules/mob/_modifiers/crusher_mark.dm index 501b505baf..e0dc2dc12d 100644 --- a/code/modules/mob/_modifiers/crusher_mark.dm +++ b/code/modules/mob/_modifiers/crusher_mark.dm @@ -2,8 +2,8 @@ name = "destabilized" desc = "You've been struck by a destabilizing bolt. By all accounts, this is probably a bad thing." stacks = MODIFIER_STACK_EXTEND - on_created_text = "You feel physically unstable." - on_expired_text = "You feel physically stable again." + on_created_text = span_warning("You feel physically unstable.") + on_expired_text = span_notice("You feel physically stable again.") var/mutable_appearance/marked_underlay var/obj/item/kinetic_crusher/hammer_synced @@ -35,4 +35,4 @@ /datum/modifier/crusher_mark/on_expire() holder.underlays -= marked_underlay //if this is being called, we should have a holder at this point. - ..() \ No newline at end of file + ..() diff --git a/code/modules/mob/_modifiers/feysight.dm b/code/modules/mob/_modifiers/feysight.dm index af391ed51c..5ff99307b9 100644 --- a/code/modules/mob/_modifiers/feysight.dm +++ b/code/modules/mob/_modifiers/feysight.dm @@ -3,8 +3,8 @@ desc = "You are filled with an inner peace, and widened sight." client_color = "#42e6ca" - on_created_text = "You feel an inner peace as your mind's eye expands!" - on_expired_text = "Your sight returns to what it once was." + on_created_text = span_alien("You feel an inner peace as your mind's eye expands!") + on_expired_text = span_notice("Your sight returns to what it once was.") stacks = MODIFIER_STACK_EXTEND accuracy = -15 @@ -20,7 +20,7 @@ /datum/modifier/feysight/can_apply(var/mob/living/L) if(L.stat) - to_chat(L, "You can't be unconscious or dead to experience tranquility.") + to_chat(L, span_warning("You can't be unconscious or dead to experience tranquility.")) return FALSE if(!L.is_sentient()) @@ -29,7 +29,7 @@ if(ishuman(L)) var/mob/living/carbon/human/H = L if(H.species.name == "Diona") - to_chat(L, "You feel strange for a moment, but it passes.") + to_chat(L, span_warning("You feel strange for a moment, but it passes.")) return FALSE // Happy trees aren't affected by tranquility. return ..() diff --git a/code/modules/mob/_modifiers/fire.dm b/code/modules/mob/_modifiers/fire.dm index 3a3c53a9dc..31f6a4f820 100644 --- a/code/modules/mob/_modifiers/fire.dm +++ b/code/modules/mob/_modifiers/fire.dm @@ -5,8 +5,8 @@ desc = "You are on fire! You will be harmed until the fire goes out or you extinguish it with water." mob_overlay_state = "on_fire" - on_created_text = "You burst into flames!" - on_expired_text = "The fire starts to fade." + on_created_text = span_danger("You burst into flames!") + on_expired_text = span_warning("The fire starts to fade.") stacks = MODIFIER_STACK_ALLOWED // Multiple instances will hurt a lot. var/damage_per_tick = 5 diff --git a/code/modules/mob/_modifiers/medical.dm b/code/modules/mob/_modifiers/medical.dm index 3d17071903..dabcd60d86 100644 --- a/code/modules/mob/_modifiers/medical.dm +++ b/code/modules/mob/_modifiers/medical.dm @@ -7,8 +7,8 @@ name = "external blood pumping" desc = "Your blood flows thanks to the wonderful power of science." - on_created_text = "You feel alive." - on_expired_text = "You feel.. less alive." + on_created_text = span_notice("You feel alive.") + on_expired_text = span_notice("You feel.. less alive.") stacks = MODIFIER_STACK_EXTEND pulse_set_level = PULSE_NORM @@ -22,8 +22,8 @@ name = "forced blood pumping" desc = "Your blood flows thanks to the wonderful power of science." - on_created_text = "You feel alive." - on_expired_text = "You feel.. less alive." + on_created_text = span_notice("You feel alive.") + on_expired_text = span_notice("You feel.. less alive.") stacks = MODIFIER_STACK_EXTEND pulse_set_level = PULSE_SLOW @@ -42,8 +42,8 @@ desc = "Your body begins to freeze." mob_overlay_state = "chilled" - on_created_text = "You feel like you're going to freeze! It's hard to move." - on_expired_text = "You feel somewhat warmer and more mobile now." + on_created_text = span_danger("You feel like you're going to freeze! It's hard to move.") + on_expired_text = span_warning("You feel somewhat warmer and more mobile now.") stacks = MODIFIER_STACK_ALLOWED slowdown = 0.1 @@ -55,8 +55,8 @@ name = "clone stabilized" desc = "Your body's regeneration is highly restricted." - on_created_text = "You feel nauseous." - on_expired_text = "You feel healthier." + on_created_text = span_danger("You feel nauseous.") + on_expired_text = span_warning("You feel healthier.") stacks = MODIFIER_STACK_EXTEND incoming_healing_percent = 0.1 diff --git a/code/modules/mob/_modifiers/modifiers_misc.dm b/code/modules/mob/_modifiers/modifiers_misc.dm index fee761cf30..642dc22214 100644 --- a/code/modules/mob/_modifiers/modifiers_misc.dm +++ b/code/modules/mob/_modifiers/modifiers_misc.dm @@ -46,8 +46,8 @@ the artifact triggers the rage. client_color = "#FF5555" // Make everything red! mob_overlay_state = "berserk" - on_created_text = "You feel an intense and overwhelming rage overtake you as you go berserk!" - on_expired_text = "The blaze of rage inside you has ran out." + on_created_text = span_critical("You feel an intense and overwhelming rage overtake you as you go berserk!") + on_expired_text = span_notice("The blaze of rage inside you has ran out.") stacks = MODIFIER_STACK_EXTEND // The good stuff. @@ -72,8 +72,8 @@ the artifact triggers the rage. // For changelings. /datum/modifier/berserk/changeling - on_created_text = "We feel an intense and overwhelming rage overtake us as we go berserk!" - on_expired_text = "The blaze of rage inside us has ran out." + on_created_text = span_critical("We feel an intense and overwhelming rage overtake us as we go berserk!") + on_expired_text = span_notice("The blaze of rage inside us has ran out.") // For changelings who bought the Recursive Enhancement evolution. /datum/modifier/berserk/changeling/recursive @@ -84,7 +84,7 @@ the artifact triggers the rage. /datum/modifier/berserk/on_applied() if(ishuman(holder)) // Most other mobs don't really use nutrition and can't get it back. holder.adjust_nutrition(-nutrition_cost) - holder.visible_message("\The [holder] descends into an all consuming rage!") + holder.visible_message(span_critical("\The [holder] descends into an all consuming rage!")) // End all stuns. holder.SetParalysis(0) @@ -105,7 +105,7 @@ the artifact triggers the rage. holder.add_modifier(/datum/modifier/berserk_exhaustion, exhaustion_duration) if(prob(last_shock_stage)) - to_chat(holder, "You pass out from the pain you were suppressing.") + to_chat(holder, span_warning("You pass out from the pain you were suppressing.")) holder.Paralyse(5) if(ishuman(holder)) @@ -115,7 +115,7 @@ the artifact triggers the rage. /datum/modifier/berserk/can_apply(var/mob/living/L, var/suppress_failure = FALSE) if(L.stat) if(!suppress_failure) - to_chat(L, "You can't be unconscious or dead to berserk.") + to_chat(L, span_warning("You can't be unconscious or dead to berserk.")) return FALSE // It would be weird to see a dead body get angry all of a sudden. if(!L.is_sentient()) @@ -123,7 +123,7 @@ the artifact triggers the rage. if(L.has_modifier_of_type(/datum/modifier/berserk_exhaustion)) if(!suppress_failure) - to_chat(L, "You recently berserked, and cannot do so again while exhausted.") + to_chat(L, span_warning("You recently berserked, and cannot do so again while exhausted.")) return FALSE // On cooldown. if(L.isSynthetic()) @@ -133,12 +133,12 @@ the artifact triggers the rage. if(ishuman(L)) var/mob/living/carbon/human/H = L if(H.species.name == "Diona") - to_chat(L, "You feel strange for a moment, but it passes.") + to_chat(L, span_warning("You feel strange for a moment, but it passes.")) return FALSE // Happy trees aren't affected by blood rages. if(L.nutrition < nutrition_cost) if(!suppress_failure) - to_chat(L, "You are too hungry to berserk.") + to_chat(L, span_warning("You are too hungry to berserk.")) return FALSE // Too hungry to enrage. return ..() @@ -153,8 +153,8 @@ the artifact triggers the rage. name = "exhaustion" desc = "You recently exerted yourself extremely hard, and need a rest." - on_created_text = "You feel extremely exhausted." - on_expired_text = "You feel less exhausted now." + on_created_text = span_warning("You feel extremely exhausted.") + on_expired_text = span_notice("You feel less exhausted now.") stacks = MODIFIER_STACK_EXTEND slowdown = 2 @@ -164,7 +164,7 @@ the artifact triggers the rage. evasion = -30 /datum/modifier/berserk_exhaustion/on_applied() - holder.visible_message("\The [holder] looks exhausted.") + holder.visible_message(span_warning("\The [holder] looks exhausted.")) // Synth version with no benefits due to a loss of focus inside a metal shell, which can't be pushed harder just be being mad. @@ -177,7 +177,7 @@ the artifact triggers the rage. on_created_text = "You feel an intense and overwhelming rage overtake you as you go berserk! \ Unfortunately, your lifeless body cannot benefit from this. You feel reckless..." - on_expired_text = "The blaze of rage inside your mind has ran out." + on_expired_text = span_notice("The blaze of rage inside your mind has ran out.") stacks = MODIFIER_STACK_EXTEND // Just being mad isn't gonna overclock your body when you're a beepboop. @@ -190,8 +190,8 @@ the artifact triggers the rage. name = "sprinting" desc = "You are filled with energy!" - on_created_text = "You feel a surge of energy!" - on_expired_text = "The energy high dies out." + on_created_text = span_warning("You feel a surge of energy!") + on_expired_text = span_notice("The energy high dies out.") stacks = MODIFIER_STACK_EXTEND slowdown = -1 @@ -202,8 +202,8 @@ the artifact triggers the rage. name = "melee surge" desc = "You are filled with energy!" - on_created_text = "You feel a surge of energy!" - on_expired_text = "The energy high dies out." + on_created_text = span_warning("You feel a surge of energy!") + on_expired_text = span_notice("The energy high dies out.") stacks = MODIFIER_STACK_ALLOWED attack_speed_percent = 0.8 @@ -216,8 +216,8 @@ the artifact triggers the rage. name = "grievous wounds" desc = "Your wounds are not easily mended." - on_created_text = "Your wounds pain you greatly." - on_expired_text = "The pain lulls." + on_created_text = span_critical("Your wounds pain you greatly.") + on_expired_text = span_notice("The pain lulls.") stacks = MODIFIER_STACK_EXTEND @@ -234,8 +234,8 @@ the artifact triggers the rage. desc = "You feel yourself freezing up. Its hard to move." mob_overlay_state = "chilled" - on_created_text = "You feel like you're going to freeze! It's hard to move." - on_expired_text = "You feel somewhat warmer and more mobile now." + on_created_text = span_danger("You feel like you're going to freeze! It's hard to move.") + on_expired_text = span_warning("You feel somewhat warmer and more mobile now.") stacks = MODIFIER_STACK_EXTEND slowdown = 2 @@ -252,8 +252,8 @@ the artifact triggers the rage. desc = "You have poison inside of you. It will cause harm over a long span of time if not cured." mob_overlay_state = "poisoned" - on_created_text = "You feel sick..." - on_expired_text = "You feel a bit better." + on_created_text = span_warning("You feel sick...") + on_expired_text = span_notice("You feel a bit better.") stacks = MODIFIER_STACK_ALLOWED // Multiple instances will hurt a lot. var/damage_per_tick = 1 @@ -277,7 +277,7 @@ the artifact triggers the rage. /datum/modifier/poisoned/paralysis desc = "You have poison inside of you. It will cause harm over a long span of time if not cured, and may cause temporary paralysis." - on_created_text = "You feel incredibly weak..." + on_created_text = span_warning("You feel incredibly weak...") damage_per_tick = 0.75 /datum/modifier/poisoned/paralysis/tick() @@ -294,8 +294,8 @@ the artifact triggers the rage. name = "false pulse" desc = "Your blood flows, despite all other factors." - on_created_text = "You feel alive." - on_expired_text = "You feel.. different." + on_created_text = span_notice("You feel alive.") + on_expired_text = span_notice("You feel.. different.") stacks = MODIFIER_STACK_EXTEND pulse_set_level = PULSE_NORM @@ -304,8 +304,8 @@ the artifact triggers the rage. name = "slow pulse" desc = "Your blood flows slower." - on_created_text = "You feel sluggish." - on_expired_text = "You feel energized." + on_created_text = span_notice("You feel sluggish.") + on_expired_text = span_notice("You feel energized.") stacks = MODIFIER_STACK_EXTEND bleeding_rate_percent = 0.8 @@ -317,8 +317,8 @@ the artifact triggers the rage. name = "temperature resistance" desc = "Your body normalizes to room temperature." - on_created_text = "You feel comfortable." - on_expired_text = "You feel.. still probably comfortable." + on_created_text = span_notice("You feel comfortable.") + on_expired_text = span_notice("You feel.. still probably comfortable.") stacks = MODIFIER_STACK_EXTEND /datum/modifier/homeothermic/tick() @@ -329,8 +329,8 @@ the artifact triggers the rage. name = "heat resistance" desc = "Your body lowers to room temperature." - on_created_text = "You feel comfortable." - on_expired_text = "You feel.. still probably comfortable." + on_created_text = span_notice("You feel comfortable.") + on_expired_text = span_notice("You feel.. still probably comfortable.") stacks = MODIFIER_STACK_EXTEND /datum/modifier/exothermic/tick() @@ -342,8 +342,8 @@ the artifact triggers the rage. name = "cold resistance" desc = "Your body rises to room temperature." - on_created_text = "You feel comfortable." - on_expired_text = "You feel.. still probably comfortable." + on_created_text = span_notice("You feel comfortable.") + on_expired_text = span_notice("You feel.. still probably comfortable.") stacks = MODIFIER_STACK_EXTEND /datum/modifier/endothermic/tick() @@ -357,8 +357,8 @@ the artifact triggers the rage. desc = "You are covered in some form of faraday shielding. EMPs have no effect." mob_overlay_state = "electricity" - on_created_text = "You feel a surge of energy, that fades to a calm tide." - on_expired_text = "You feel a longing for the flow of energy." + on_created_text = span_notice("You feel a surge of energy, that fades to a calm tide.") + on_expired_text = span_warning("You feel a longing for the flow of energy.") stacks = MODIFIER_STACK_EXTEND emp_modifier = 5 @@ -369,8 +369,8 @@ the artifact triggers the rage. desc = "You are protected from explosions somehow." mob_overlay_state = "electricity" - on_created_text = "You feel a surge of energy, that fades to a stalwart hum." - on_expired_text = "You feel a longing for the flow of energy." + on_created_text = span_notice("You feel a surge of energy, that fades to a stalwart hum.") + on_expired_text = span_warning("You feel a longing for the flow of energy.") stacks = MODIFIER_STACK_EXTEND explosion_modifier = 3 @@ -380,13 +380,13 @@ the artifact triggers the rage. name = "Doomed" desc = "You are doomed." - on_created_text = "You feel an overwhelming sense of dread." - on_expired_text = "You feel the life drain from your body." + on_created_text = span_notice("You feel an overwhelming sense of dread.") + on_expired_text = span_warning("You feel the life drain from your body.") stacks = MODIFIER_STACK_EXTEND /datum/modifier/doomed/on_expire() if(holder.stat != DEAD) - holder.visible_message("\The [holder] collapses, the life draining from their body.") + holder.visible_message(span_alien("\The [holder] collapses, the life draining from their body.")) holder.death() /datum/modifier/outline_test @@ -432,8 +432,8 @@ the artifact triggers the rage. name = "entangled" desc = "Its hard to move." - on_created_text = "You're caught in something! It's hard to move." - on_expired_text = "Your movement is freed." + on_created_text = span_danger("You're caught in something! It's hard to move.") + on_expired_text = span_warning("Your movement is freed.") stacks = MODIFIER_STACK_EXTEND slowdown = 2 diff --git a/code/modules/mob/_modifiers/modifiers_vr.dm b/code/modules/mob/_modifiers/modifiers_vr.dm index 700455bb3b..18eb5fb0c9 100644 --- a/code/modules/mob/_modifiers/modifiers_vr.dm +++ b/code/modules/mob/_modifiers/modifiers_vr.dm @@ -50,8 +50,8 @@ name = "underwater stealth" desc = "You are currently underwater, rendering it more difficult to see you and enabling you to move quicker, thanks to your aquatic nature." - on_created_text = "You sink under the water." - on_expired_text = "You come out from the water." + on_created_text = span_warning("You sink under the water.") + on_expired_text = span_notice("You come out from the water.") stacks = MODIFIER_STACK_FORBID @@ -92,8 +92,8 @@ name = "Shield Projection" desc = "You are currently protected by a shield, rendering nigh impossible to hit you through conventional means." - on_created_text = "Your shield generator buzzes on." - on_expired_text = "Your shield generator buzzes off." + on_created_text = span_notice("Your shield generator buzzes on.") + on_expired_text = span_warning("Your shield generator buzzes off.") stacks = MODIFIER_STACK_FORBID //No stacking shields. If you put one one your belt and backpack it won't work. icon_override = 1 @@ -277,8 +277,8 @@ effective_clone_resistance = 1 /datum/modifier/shield_projection/admin // Adminbus. - on_created_text = "Your shield generator activates and you feel the power of the tesla buzzing around you." - on_expired_text = "Your shield generator deactivates, leaving you feeling weak and vulnerable." + on_created_text = span_notice("Your shield generator activates and you feel the power of the tesla buzzing around you.") + on_expired_text = span_warning("Your shield generator deactivates, leaving you feeling weak and vulnerable.") siemens_coefficient = 0 disable_duration_percent = 0 min_damage_resistance = 0 @@ -332,4 +332,4 @@ max_hal_resistance = 0 min_hal_resistance = 0 - effective_hal_resistance = 1 \ No newline at end of file + effective_hal_resistance = 1 diff --git a/code/modules/mob/_modifiers/traits.dm b/code/modules/mob/_modifiers/traits.dm index ea21ae007b..0d44e8fdde 100644 --- a/code/modules/mob/_modifiers/traits.dm +++ b/code/modules/mob/_modifiers/traits.dm @@ -6,8 +6,8 @@ name = "flimsy" desc = "You're more fragile than most, and have less of an ability to endure harm." - on_created_text = "You feel rather weak." - on_expired_text = "You feel your strength returning to you." + on_created_text = span_warning("You feel rather weak.") + on_expired_text = span_notice("You feel your strength returning to you.") max_health_percent = 0.8 @@ -15,8 +15,8 @@ name = "frail" desc = "Your body is very fragile, and has even less of an ability to endure harm." - on_created_text = "You feel really weak." - on_expired_text = "You feel your strength returning to you." + on_created_text = span_warning("You feel really weak.") + on_expired_text = span_notice("You feel your strength returning to you.") max_health_percent = 0.6 @@ -162,4 +162,4 @@ desc = "You are fully colorblind. Your condition is rare, but you can see no colors at all." client_color = MATRIX_Monochromia - wire_colors_replace = GREYSCALE_COLOR_REPLACE \ No newline at end of file + wire_colors_replace = GREYSCALE_COLOR_REPLACE diff --git a/code/modules/mob/_modifiers/traits_phobias.dm b/code/modules/mob/_modifiers/traits_phobias.dm index cf87918c64..7a5e1de53b 100644 --- a/code/modules/mob/_modifiers/traits_phobias.dm +++ b/code/modules/mob/_modifiers/traits_phobias.dm @@ -60,36 +60,36 @@ desc = "Seeing a bunch of blood isn't really pleasant for most people, but for you, it is very distressing." fear_decay_rate = 4 - on_created_text = "You are terrified of seeing blood." - on_expired_text = "You feel that blood doesn't bother you, at least, as much as it used to." + on_created_text = span_warning("You are terrified of seeing blood.") + on_expired_text = span_notice("You feel that blood doesn't bother you, at least, as much as it used to.") zero_fear_up = list( - "You see some blood nearby...", - "You try to avoid looking at the blood nearby." + span_warning("You see some blood nearby..."), + span_warning("You try to avoid looking at the blood nearby.") ) zero_fear_down = list( - "You feel better now, with no blood in sight.", - "At last, the blood is gone.", - "Hopefully you won't see anymore blood today." + span_notice("You feel better now, with no blood in sight."), + span_notice("At last, the blood is gone."), + span_notice("Hopefully you won't see anymore blood today.") ) half_fear_up = list( - "You're still near the blood!", - "So much blood... You can't stand it." + span_danger("You're still near the blood!"), + span_danger("So much blood... You can't stand it.") ) half_fear_down = list( - "The blood is gone now, but you're still worked up.", - "You can't see the blood now, but you're still anxious." + span_warning("The blood is gone now, but you're still worked up."), + span_warning("You can't see the blood now, but you're still anxious.") ) full_fear_up = list( - "The blood is too much!", - "There is so much blood here, you need to leave!", - "You gotta get away from the blood!" + span_danger("The blood is too much!"), + span_danger("There is so much blood here, you need to leave!"), + span_danger("You gotta get away from the blood!") ) full_fear_down = list( - "The blood is gone, but you're still very anxious.", - "No more blood... Please." + span_danger("The blood is gone, but you're still very anxious."), + span_danger("No more blood... Please.") ) /datum/modifier/trait/phobia/haemophobia/check_if_valid() @@ -161,37 +161,37 @@ desc = "Spiders are quite creepy to most people, however for you, those chitters of pure evil inspire pure dread and fear." fear_decay_rate = 1 - on_created_text = "You are terrified of seeing spiders." - on_expired_text = "You feel that your fear of spiders has gone from 'crippling' to 'nope nope nope', which is still an improvement." + on_created_text = span_warning("You are terrified of seeing spiders.") + on_expired_text = span_notice("You feel that your fear of spiders has gone from 'crippling' to 'nope nope nope', which is still an improvement.") zero_fear_up = list( - "You see a spider!", - "Spider!" + span_warning("You see a spider!"), + span_warning("Spider!") ) zero_fear_down = list( - "Those evil spiders are finally gone.", - "At last, the chitters are gone.", - "The spiders are gone, at last." + span_notice("Those evil spiders are finally gone."), + span_notice("At last, the chitters are gone."), + span_notice("The spiders are gone, at last.") ) half_fear_up = list( - "The spiders are gonna eat you!", - "The spiders are still here!", - "The spiders will lay eggs inside you if you don't run!", + span_danger("The spiders are gonna eat you!"), + span_danger("The spiders are still here!"), + span_danger("The spiders will lay eggs inside you if you don't run!"), ) half_fear_down = list( - "The spiders are gone... right?", - "You can't see any spiders now, but you're still anxious." + span_warning("The spiders are gone... right?"), + span_warning("You can't see any spiders now, but you're still anxious.") ) full_fear_up = list( - "The chittering is driving you mad!", - "You're gonna be spider-food if you don't run!", - "The spiders are gonna feast on your eyes!" + span_danger("The chittering is driving you mad!"), + span_danger("You're gonna be spider-food if you don't run!"), + span_danger("The spiders are gonna feast on your eyes!") ) full_fear_down = list( - "The spiders must surely be hiding somewhere...", - "No more spiders... Please." + span_danger("The spiders must surely be hiding somewhere..."), + span_danger("No more spiders... Please.") ) /datum/modifier/trait/phobia/arachnophobe/should_fear() @@ -232,38 +232,38 @@ desc = "More commonly known as the fear of darkness. The shadows can hide many dangers, which makes the prospect of going into the depths of Maintenance rather worrisome." fear_decay_rate = 5 - on_created_text = "You are terrified of the dark." - on_expired_text = "You feel that darkness isn't quite as scary anymore." + on_created_text = span_warning("You are terrified of the dark.") + on_expired_text = span_notice("You feel that darkness isn't quite as scary anymore.") var/fear_threshold = 0.5 // Average lighting needs to be below this to start increasing fear. zero_fear_up = list( - "It's so dark here!", - "It's too dark!" + span_warning("It's so dark here!"), + span_warning("It's too dark!") ) zero_fear_down = list( - "You feel calmer, now that you're in the light.", - "At last, no more darkness.", - "The light makes you feel calmer." + span_notice("You feel calmer, now that you're in the light."), + span_notice("At last, no more darkness."), + span_notice("The light makes you feel calmer.") ) half_fear_up = list( - "You need to escape this darkness!", - "Something might be lurking near you, but you can't see in this darkness.", - "You need to find a light!", + span_danger("You need to escape this darkness!"), + span_danger("Something might be lurking near you, but you can't see in this darkness."), + span_danger("You need to find a light!"), ) half_fear_down = list( - "The darkness is gone, for now...", - "You're not in the dark anymore, but you're still anxious." + span_warning("The darkness is gone, for now..."), + span_warning("You're not in the dark anymore, but you're still anxious.") ) full_fear_up = list( - "What was that?", - "Something is nearby..." + span_danger("What was that?"), + span_danger("Something is nearby...") ) full_fear_down = list( - "Light, at last!", - "The darkness is finally gone!" + span_danger("Light, at last!"), + span_danger("The darkness is finally gone!") ) /datum/modifier/trait/phobia/nyctophobe/should_fear() @@ -311,36 +311,36 @@ var/open_tiles_needed = 15 // Tends to be just right, as maint triggers this but hallways don't. - on_created_text = "You are terrified of tight spaces. Why did you come to space?" - on_expired_text = "Small rooms aren't so bad now." + on_created_text = span_warning("You are terrified of tight spaces. Why did you come to space?") + on_expired_text = span_notice("Small rooms aren't so bad now.") zero_fear_up = list( - "This room is too small...", - "The walls are too close together..." + span_warning("This room is too small..."), + span_warning("The walls are too close together...") ) zero_fear_down = list( - "You feel calmer, now that you're in a larger room.", - "At last, the walls are far apart.", - "The relatively open area makes you feel calmer." + span_notice("You feel calmer, now that you're in a larger room."), + span_notice("At last, the walls are far apart."), + span_notice("The relatively open area makes you feel calmer.") ) half_fear_up = list( - "Your surroundings look like they are closing in.", - "Is the room getting smaller?", - "You need to get out of here!", + span_danger("Your surroundings look like they are closing in."), + span_danger("Is the room getting smaller?"), + span_danger("You need to get out of here!"), ) half_fear_down = list( - "Your surroundings seem to have stopped closing in.", - "You're not in a tight space anymore, but you're still anxious." + span_warning("Your surroundings seem to have stopped closing in."), + span_warning("You're not in a tight space anymore, but you're still anxious.") ) full_fear_up = list( - "You need to escape!", - "There's barely any room to move around!" + span_danger("You need to escape!"), + span_danger("There's barely any room to move around!") ) full_fear_down = list( - "The surroundings stop shrinking.", - "The walls seem to have stopped." + span_danger("The surroundings stop shrinking."), + span_danger("The walls seem to have stopped.") ) /datum/modifier/trait/phobia/claustrophobe/should_fear() @@ -376,34 +376,34 @@ desc = "Slimes are quite dangerous, but just the aspect of something being slimey is uncomfortable." fear_decay_rate = 1 - on_created_text = "You are disgusted and horrified by slime." - on_expired_text = "You feel more... okay with slime." + on_created_text = span_warning("You are disgusted and horrified by slime.") + on_expired_text = span_notice("You feel more... okay with slime.") zero_fear_up = list( - "That's some slime!", - "There's slime right there!" + span_warning("That's some slime!"), + span_warning("There's slime right there!") ) zero_fear_down = list( - "The slime is out of sight and out of mind.", - "Clean. No more slime." + span_notice("The slime is out of sight and out of mind."), + span_notice("Clean. No more slime.") ) half_fear_up = list( - "The slimes might strike at any point!", - "The slime is still there!" + span_danger("The slimes might strike at any point!"), + span_danger("The slime is still there!") ) half_fear_down = list( - "The slime is gone... right?", - "You can't see any slime right now, but you're still anxious." + span_warning("The slime is gone... right?"), + span_warning("You can't see any slime right now, but you're still anxious.") ) full_fear_up = list( - "The slime is everywhere!", - "You're gonna get absorbed if you don't get out!" + span_danger("The slime is everywhere!"), + span_danger("You're gonna get absorbed if you don't get out!") ) full_fear_down = list( - "There must be more of that slime somewhere...", - "No more of this slime, please...." + span_danger("There must be more of that slime somewhere..."), + span_danger("No more of this slime, please....") ) /datum/modifier/trait/phobia/blennophobe/should_fear() @@ -470,35 +470,35 @@ desc = "Syringes and needles make you very distressed. You really don't want to get sick..." fear_decay_rate = 100 - on_created_text = "You are terrified by needles." - on_expired_text = "You feel better about being near needles.." + on_created_text = span_warning("You are terrified by needles.") + on_expired_text = span_notice("You feel better about being near needles..") zero_fear_up = list( - "That's a needle!", - "There's a needle right there!" + span_warning("That's a needle!"), + span_warning("There's a needle right there!") ) zero_fear_down = list( - "The needle is gone, no need to worry.", - "No more needle." + span_notice("The needle is gone, no need to worry."), + span_notice("No more needle.") ) half_fear_up = list( - "The needle could get you at any time!", - "The needle is still there!" + span_danger("The needle could get you at any time!"), + span_danger("The needle is still there!") ) half_fear_down = list( - "There are no more needles... right?", - "You don't see any more needles... But you can never be sure." + span_warning("There are no more needles... right?"), + span_warning("You don't see any more needles... But you can never be sure.") ) full_fear_up = list( - "The needles are going to pierce you!", - "They could get you any second!" + span_danger("The needles are going to pierce you!"), + span_danger("They could get you any second!") ) full_fear_down = list( - "There are more needles around, you can feel it...", - "No more needles, please..." + span_danger("There are more needles around, you can feel it..."), + span_danger("No more needles, please...") ) /datum/modifier/trait/phobia/trypanophobe/should_fear() @@ -568,8 +568,8 @@ desc = "The mind of the Alien is unknowable, and as such, their intentions cannot be known. You always watch the xenos closely, as they most certainly are watching you \ closely, waiting to strike." - on_created_text = "You remain vigilant against the Alien." - on_expired_text = "Aliens aren't so bad after all." + on_created_text = span_warning("You remain vigilant against the Alien.") + on_expired_text = span_notice("Aliens aren't so bad after all.") var/last_message = null // world.time we last did a message. var/message_cooldown = 1 MINUTE @@ -586,7 +586,7 @@ if(xenos.len) var/chosen_xeno = pick(xenos) - to_chat(holder, "[make_message(chosen_xeno)]") + to_chat(holder, span_warning("[make_message(chosen_xeno)]")) return TRUE else return FALSE // No xenos in sight, so don't apply the cooldown. @@ -605,8 +605,8 @@ desc = "The mind of the Alien is unknowable, and as such, their intentions cannot be known. You always watch the xenos closely, as they most certainly are watching you \ closely, waiting to strike." - on_created_text = "You remain vigilant against the Alien." - on_expired_text = "Aliens aren't so bad afterall." + on_created_text = span_warning("You remain vigilant against the Alien.") + on_expired_text = span_notice("Aliens aren't so bad afterall.") /datum/modifier/trait/phobia/xenophobia/generic/get_xenos() var/list/xenos = list() @@ -643,8 +643,8 @@ name = "anti-human sentiment" desc = "Humans are bound to get us all killed with their reckless use of technology..." - on_created_text = "You unfortunately are likely to have to deal with humans today." - on_expired_text = "Humans aren't so bad after all." + on_created_text = span_warning("You unfortunately are likely to have to deal with humans today.") + on_expired_text = span_notice("Humans aren't so bad after all.") /datum/modifier/trait/phobia/xenophobia/human/get_xenos() var/list/humans = list() @@ -672,8 +672,8 @@ name = "anti-skrell sentiment" desc = "The Skrell pretend that they are Humanity's enlightened allies, but you can see past that." - on_created_text = "Hopefully no Skrell show up today." - on_expired_text = "Skrell aren't so bad after all." + on_created_text = span_warning("Hopefully no Skrell show up today.") + on_expired_text = span_notice("Skrell aren't so bad after all.") /datum/modifier/trait/phobia/xenophobia/skrell/get_xenos() var/list/skrell = list() @@ -692,4 +692,3 @@ "WetSkrell was a mistake." ) return pick(generic_responses) - diff --git a/code/modules/mob/_modifiers/unholy.dm b/code/modules/mob/_modifiers/unholy.dm index 034c3b455b..925d57b945 100644 --- a/code/modules/mob/_modifiers/unholy.dm +++ b/code/modules/mob/_modifiers/unholy.dm @@ -8,8 +8,8 @@ name = "fortified body" desc = "You are taking less damage from outside sources." - on_created_text = "Your body becomes a mountain to your enemies' storm." - on_expired_text = "Your body softens, returning to its regular durability." + on_created_text = span_critical("Your body becomes a mountain to your enemies' storm.") + on_expired_text = span_notice("Your body softens, returning to its regular durability.") stacks = MODIFIER_STACK_EXTEND disable_duration_percent = 0.25 // Disables only last 25% as long. @@ -25,8 +25,8 @@ name = "phased" desc = "You are partially shifted from the material plane." - on_created_text = "Your body pulses, before partially dematerializing." - on_expired_text = "Your body rematerializes fully." + on_created_text = span_critical("Your body pulses, before partially dematerializing.") + on_expired_text = span_notice("Your body rematerializes fully.") stacks = MODIFIER_STACK_FORBID @@ -50,8 +50,8 @@ name = "deep wounds" desc = "Your wounds are mysteriously harder to mend." - on_created_text = "Your wounds pain you greatly." - on_expired_text = "Your wounds numb for a moment." + on_created_text = span_cult("Your wounds pain you greatly.") + on_expired_text = span_notice("Your wounds numb for a moment.") stacks = MODIFIER_STACK_EXTEND @@ -64,8 +64,8 @@ name = "aura of repair (cult)" desc = "You are emitting a field of strange energy, capable of repairing occult constructs." - on_created_text = "You begin emitting an occult repair aura." - on_expired_text = "The occult repair aura fades." + on_created_text = span_cult("You begin emitting an occult repair aura.") + on_expired_text = span_notice("The occult repair aura fades.") stacks = MODIFIER_STACK_EXTEND mob_overlay_state = "cult_aura" @@ -80,8 +80,8 @@ name = "agonize" desc = "Your body is wracked with pain." - on_created_text = "A red lightning quickly covers your body. The pain is horrendous." - on_expired_text = "The lightning fades, and so too does the ongoing pain." + on_created_text = span_cult("A red lightning quickly covers your body. The pain is horrendous.") + on_expired_text = span_notice("The lightning fades, and so too does the ongoing pain.") stacks = MODIFIER_STACK_EXTEND @@ -93,15 +93,15 @@ var/mob/living/carbon/human/H = holder H.apply_effect(20, AGONY) if(prob(10)) - to_chat(H, "Just make it stop!") + to_chat(H, span_warning("Just make it stop!")) ////////// Target Modifier /datum/modifier/mend_occult name = "occult mending" desc = "Your body is mending, though at what cost?" - on_created_text = "Something haunting envelops your body as it begins to mend." - on_expired_text = "The cloak of unease dissipates." + on_created_text = span_cult("Something haunting envelops your body as it begins to mend.") + on_expired_text = span_notice("The cloak of unease dissipates.") stacks = MODIFIER_STACK_EXTEND @@ -144,7 +144,7 @@ if(!iscultist(H)) H.apply_effect(2, AGONY) if(prob(10)) - to_chat(H, "It feels as though your body is being torn apart!") + to_chat(H, span_danger("It feels as though your body is being torn apart!")) L.updatehealth() /datum/modifier/gluttonyregeneration @@ -152,20 +152,20 @@ desc = "You are filled with an overwhelming hunger." mob_overlay_state = "electricity" - on_created_text = "You feel an intense and overwhelming hunger overtake you as your body regenerates!" - on_expired_text = "The blaze of hunger inside you has been snuffed." + on_created_text = span_critical("You feel an intense and overwhelming hunger overtake you as your body regenerates!") + on_expired_text = span_notice("The blaze of hunger inside you has been snuffed.") stacks = MODIFIER_STACK_EXTEND /datum/modifier/gluttonyregeneration/can_apply(var/mob/living/L) if(L.stat == DEAD) - to_chat(L, "You can't be dead to consume.") + to_chat(L, span_warning("You can't be dead to consume.")) return FALSE if(!L.is_sentient()) return FALSE // Drones don't feel anything, not even hunger. if(L.has_modifier_of_type(/datum/modifier/berserk_exhaustion)) - to_chat(L, "You recently berserked, so you are too tired to consume.") + to_chat(L, span_warning("You recently berserked, so you are too tired to consume.")) return FALSE if(!ishuman(L)) // Only humanoids feel hunger. Totally. @@ -174,7 +174,7 @@ else var/mob/living/carbon/human/H = L if(H.species.name == "Diona") - to_chat(L, "You feel strange for a moment, but it passes.") + to_chat(L, span_warning("You feel strange for a moment, but it passes.")) return FALSE // Happy trees aren't affected by incredible hunger. return ..() @@ -195,4 +195,4 @@ H.adjustToxLoss(-healing_amount * 0.25) - ..() \ No newline at end of file + ..() diff --git a/code/modules/mob/autowhisper.dm b/code/modules/mob/autowhisper.dm index 88e07df7a4..03584e93ea 100644 --- a/code/modules/mob/autowhisper.dm +++ b/code/modules/mob/autowhisper.dm @@ -12,14 +12,14 @@ var/obj/belly/b = loc if(b.mode_flags & DM_FLAG_FORCEPSAY) var/mes = "but you are affected by forced psay right now, so you will automatically use psay/pme instead of any other option." - to_chat(src, "Autowhisper has been [autowhisper ? "enabled, [mes]" : "disabled, [mes]"].") + to_chat(src, span_notice("Autowhisper has been [autowhisper ? "enabled, [mes]" : "disabled, [mes]"].")) return else forced_psay = autowhisper - to_chat(src, "Autowhisper has been [autowhisper ? "enabled. You will now automatically psay/pme when using say/me. As a note, this option will only work if you are in a situation where you can send psay/pme messages! Otherwise it will work as default whisper/subtle" : "disabled"].") + to_chat(src, span_notice("Autowhisper has been [autowhisper ? "enabled. You will now automatically psay/pme when using say/me. As a note, this option will only work if you are in a situation where you can send psay/pme messages! Otherwise it will work as default whisper/subtle" : "disabled"].")) else - to_chat(src, "Autowhisper has been [autowhisper ? "enabled. You will now automatically whisper/subtle when using say/me" : "disabled"].") + to_chat(src, span_notice("Autowhisper has been [autowhisper ? "enabled. You will now automatically whisper/subtle when using say/me" : "disabled"].")) /mob/living/verb/autowhisper_mode() set name = "Autowhisper Mode" @@ -30,16 +30,16 @@ var/choice = tgui_input_list(src, "Select Custom Subtle Mode", "Custom Subtle Mode", list("Adjacent Turfs (Default)", "My Turf", "My Table", "Current Belly (Prey)", "Specific Belly (Pred)", "Specific Person", "Psay/Pme")) if(!choice || choice == "Adjacent Turfs (Default)") autowhisper_mode = null - to_chat(src, "Your subtles have returned to the default setting.") + to_chat(src, span_notice("Your subtles have returned to the default setting.")) return if(choice == "Psay/Pme") if(autowhisper) if(isbelly(loc) && absorbed) var/obj/belly/b = loc if(b.mode_flags & DM_FLAG_FORCEPSAY) - to_chat(src, "You can't set that mode right now, as you appear to be absorbed in a belly using forced psay!") + to_chat(src, span_warning("You can't set that mode right now, as you appear to be absorbed in a belly using forced psay!")) return forced_psay = TRUE - to_chat(src, "As a note, this option will only work if you are in a situation where you can send psay/pme messages! Otherwise it will work as default whisper/subtle.") + to_chat(src, span_notice("As a note, this option will only work if you are in a situation where you can send psay/pme messages! Otherwise it will work as default whisper/subtle.")) autowhisper_mode = choice - to_chat(src, "Your subtles have been set to [autowhisper_mode].") + to_chat(src, span_notice("Your subtles have been set to [autowhisper_mode].")) diff --git a/code/modules/mob/dead/observer/free_vr.dm b/code/modules/mob/dead/observer/free_vr.dm index a3c63de197..e57bfd3678 100644 --- a/code/modules/mob/dead/observer/free_vr.dm +++ b/code/modules/mob/dead/observer/free_vr.dm @@ -2,7 +2,7 @@ var/global/list/prevent_respawns = list() /hook/death/proc/quit_notify(mob/dead) if(ishuman(dead)) - to_chat(dead,"You're dead! If you don't intend to continue playing this round as this character, please use the Quit This Round verb in the OOC tab to free your job slot. Otherwise, you can use the Notify Transcore verb to let medical know you need resleeving, or Find Auto Resleever verb to be taken to an auto resleever, which you can click on to be resleeved automatically after a time.") + to_chat(dead,span_notice("You're dead! If you don't intend to continue playing this round as this character, please use the Quit This Round verb in the OOC tab to free your job slot. Otherwise, you can use the Notify Transcore verb to let medical know you need resleeving, or Find Auto Resleever verb to be taken to an auto resleever, which you can click on to be resleeved automatically after a time.")) return TRUE @@ -18,7 +18,7 @@ var/global/list/prevent_respawns = list() //Why are you clicking this button? if(!mind || !mind.assigned_role) - to_chat(src,"Either you haven't played this round, you already used this verb or you left round properly already.") + to_chat(src,span_warning("Either you haven't played this round, you already used this verb or you left round properly already.")) return //Add them to the nope list @@ -28,7 +28,7 @@ var/global/list/prevent_respawns = list() for(var/datum/objective/O in all_objectives) if(O.target == src.mind) if(O.owner && O.owner.current) - to_chat(O.owner.current,"You get the feeling your target is no longer within your reach...") + to_chat(O.owner.current,span_warning("You get the feeling your target is no longer within your reach...")) qdel(O) //Resleeving cleanup @@ -61,4 +61,4 @@ var/global/list/prevent_respawns = list() src.mind.assigned_role = null //Feedback - to_chat(src,"Your job has been free'd up, and you can rejoin as another character or quit. Thanks for using this verb, it helps the server!") + to_chat(src,span_notice("Your job has been free'd up, and you can rejoin as another character or quit. Thanks for using this verb, it helps the server!")) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 5c6d70707f..e87c3bd797 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -131,7 +131,7 @@ forceMove(T) else moveToNullspace() - to_chat(src, "Could not locate an observer spawn point. Use the Teleport verb to jump to the station map.") + to_chat(src, span_danger("Could not locate an observer spawn point. Use the Teleport verb to jump to the station map.")) if(!name) //To prevent nameless ghosts name = capitalize(pick(first_names_male)) + " " + capitalize(pick(last_names)) @@ -262,14 +262,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set name = "Re-enter Corpse" if(!client) return if(!(mind && mind.current && can_reenter_corpse)) - to_chat(src, "You have no body.") + to_chat(src, span_warning("You have no body.")) return if(mind.current.key && copytext(mind.current.key,1,2)!="@") //makes sure we don't accidentally kick any clients - to_chat(usr, "Another consciousness is in your body... it is resisting you.") + to_chat(usr, span_warning("Another consciousness is in your body... it is resisting you.")) return //VOREStation Add if(prevent_respawns.Find(mind.name)) - to_chat(usr, "You already quit this round as this character, sorry!") + to_chat(usr, span_warning("You already quit this round as this character, sorry!")) return //VOREStation Add End if(mind.current.ajourn && mind.current.stat != DEAD) //check if the corpse is astral-journeying (it's client ghosted using a cultist rune). @@ -279,7 +279,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp found_rune = 1 break if(!found_rune) - to_chat(usr, "The astral cord that ties your body and your spirit has been severed. You are likely to wander the realm beyond until your body is finally dead and thus reunited with you.") + to_chat(usr, span_warning("The astral cord that ties your body and your spirit has been severed. You are likely to wander the realm beyond until your body is finally dead and thus reunited with you.")) return mind.current.ajourn=0 mind.current.key = key @@ -302,7 +302,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp medHUD = !medHUD plane_holder.set_vis(VIS_CH_HEALTH, medHUD) plane_holder.set_vis(VIS_CH_STATUS_OOC, medHUD) - to_chat(src, "Medical HUD [medHUD ? "Enabled" : "Disabled"]") + to_chat(src, span_notice("Medical HUD [medHUD ? "Enabled" : "Disabled"]")) /mob/observer/dead/verb/toggle_secHUD() set category = "Ghost" @@ -315,7 +315,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp plane_holder.set_vis(VIS_CH_IMPTRACK, secHUD) plane_holder.set_vis(VIS_CH_IMPLOYAL, secHUD) plane_holder.set_vis(VIS_CH_IMPCHEM, secHUD) - to_chat(src, "Security HUD [secHUD ? "Enabled" : "Disabled"]") + to_chat(src, span_notice("Security HUD [secHUD ? "Enabled" : "Disabled"]")) /mob/observer/dead/verb/toggle_antagHUD() set category = "Ghost" @@ -323,10 +323,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set desc = "Toggles AntagHUD allowing you to see who is the antagonist" if(!config.antag_hud_allowed && !client.holder) - to_chat(src, "[span_red("Admins have disabled this for this round.")]") + to_chat(src, span_filter_notice("[span_red("Admins have disabled this for this round.")]")) return if(jobban_isbanned(src, JOB_ANTAGHUD)) - to_chat(src, "[span_red("You have been banned from using this feature")]") + to_chat(src, span_filter_notice("[span_red("You have been banned from using this feature")]")) return if(config.antag_hud_restricted && !has_enabled_antagHUD && !client.holder) var/response = tgui_alert(src, "If you turn this on, you will not be able to take any part in the round.","Are you sure you want to turn this feature on?",list("Yes","No")) @@ -338,7 +338,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp antagHUD = !antagHUD plane_holder.set_vis(VIS_CH_SPECIAL, antagHUD) - to_chat(src, "AntagHUD [antagHUD ? "Enabled" : "Disabled"]") + to_chat(src, span_notice("AntagHUD [antagHUD ? "Enabled" : "Disabled"]")) /mob/observer/dead/proc/jumpable_areas() var/list/areas = return_sorted_areas() @@ -374,7 +374,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set desc = "Teleport to a location." if(!istype(usr, /mob/observer/dead)) - to_chat(usr, "Not when you're not dead!") + to_chat(usr, span_filter_notice("Not when you're not dead!")) return var/area/A @@ -452,10 +452,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/turf/targetloc = get_turf(target) if(check_holy(targetloc)) - to_chat(usr, "You cannot follow a mob standing on holy grounds!") + to_chat(usr, span_warning("You cannot follow a mob standing on holy grounds!")) return if(get_z(target) in using_map?.secret_levels) - to_chat(src, "Sorry, that target is in an area that ghosts aren't allowed to go.") + to_chat(src, span_warning("Sorry, that target is in an area that ghosts aren't allowed to go.")) return if(target != src) if(following && following == target) @@ -463,11 +463,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(following) src.stop_following() following = target - to_chat(src, "Now following [target]") + to_chat(src, span_notice("Now following [target]")) if(ismob(target)) var/target_turf = get_turf(target) if(!target_turf) - to_chat(usr, "This mob does not seem to exist in the tangible world.") + to_chat(usr, span_warning("This mob does not seem to exist in the tangible world.")) return forceMove(target_turf) var/mob/M = target @@ -595,15 +595,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp forceMove(T) stop_following() else - to_chat(src, "This mob is not located in the game world.") + to_chat(src, span_filter_notice("This mob is not located in the game world.")) /mob/observer/dead/memory() set hidden = 1 - to_chat(src, "[span_red("You are dead! You have no mind to store memory!")]") + to_chat(src, span_filter_notice("[span_red("You are dead! You have no mind to store memory!")]")) /mob/observer/dead/add_memory() set hidden = 1 - to_chat(src, "[span_red("You are dead! You have no mind to store memory!")]") + to_chat(src, span_filter_notice("[span_red("You are dead! You have no mind to store memory!")]")) /mob/observer/dead/Post_Incorpmove() stop_following() @@ -633,7 +633,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp gas_analyzing += "[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)" gas_analyzing += "Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)" gas_analyzing += "Heat Capacity: [round(environment.heat_capacity(),0.1)]" - to_chat(src, "[jointext(gas_analyzing, "
    ")]    ") + to_chat(src, span_notice("[jointext(gas_analyzing, "
    ")]")) /mob/observer/dead/verb/check_radiation() set name = "Check Radiation" @@ -642,7 +642,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/turf/t = get_turf(src) if(t) var/rads = SSradiation.get_rads_at_turf(t) - to_chat(src, "Radiation level: [rads ? rads : "0"] Bq.") + to_chat(src, span_notice("Radiation level: [rads ? rads : "0"] Bq.")) /mob/observer/dead/verb/become_mouse() @@ -650,12 +650,12 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set category = "Ghost" if(config.disable_player_mice) - to_chat(src, "Spawning as a mouse is currently disabled.") + to_chat(src, span_warning("Spawning as a mouse is currently disabled.")) return //VOREStation Add Start if(jobban_isbanned(src, JOB_GHOSTROLES)) - to_chat(src, "You cannot become a mouse because you are banned from playing ghost roles.") + to_chat(src, span_warning("You cannot become a mouse because you are banned from playing ghost roles.")) return //VOREStation Add End @@ -664,14 +664,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/turf/T = get_turf(src) if(!T || (T.z in using_map.admin_levels)) - to_chat(src, "You may not spawn as a mouse on this Z-level.") + to_chat(src, span_warning("You may not spawn as a mouse on this Z-level.")) return var/timedifference = world.time - client.time_died_as_mouse if(client.time_died_as_mouse && timedifference <= mouse_respawn_time * 600) var/timedifference_text timedifference_text = time2text(mouse_respawn_time * 600 - timedifference,"mm:ss") - to_chat(src, "You may only spawn again as a mouse more than [mouse_respawn_time] minutes after your death. You have [timedifference_text] left.") + to_chat(src, span_warning("You may only spawn again as a mouse more than [mouse_respawn_time] minutes after your death. You have [timedifference_text] left.")) return var/response = tgui_alert(src, "Are you -sure- you want to become a mouse?","Are you sure you want to squeek?",list("Squeek!","Nope!")) @@ -689,7 +689,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp vent_found = pick(found_vents) host = new /mob/living/simple_mob/animal/passive/mouse(vent_found) else - to_chat(src, "Unable to find any unwelded vents to spawn mice at.") + to_chat(src, span_warning("Unable to find any unwelded vents to spawn mice at.")) if(host) if(config.uneducated_mice) @@ -697,7 +697,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp announce_ghost_joinleave(src, 0, "They are now a mouse.") host.ckey = src.ckey host.add_ventcrawl(vent_found) - to_chat(host, "You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.") + to_chat(host, span_info("You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.")) /mob/observer/dead/verb/view_manfiest() set name = "Show Crew Manifest" @@ -726,7 +726,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set desc = "If the round is sufficiently spooky, write a short message in blood on the floor or a wall. Remember, no IC in OOC or OOC in IC." if(!(config.cult_ghostwriter)) - to_chat(src, "[span_red("That verb is not currently permitted.")]") + to_chat(src, span_filter_notice("[span_red("That verb is not currently permitted.")]")) return if (!src.stat) @@ -741,7 +741,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp ghosts_can_write = 1 if(!ghosts_can_write && !check_rights(R_ADMIN|R_EVENT|R_FUN, 0)) //Let's allow for admins to write in blood for events and the such. - to_chat(src, "[span_red("The veil is not thin enough for you to do that.")]") + to_chat(src, span_filter_notice("[span_red("The veil is not thin enough for you to do that.")]")) return var/list/choices = list() @@ -761,7 +761,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp T = get_step(T,text2dir(direction)) if (!istype(T)) - to_chat(src, "You cannot doodle there.") + to_chat(src, span_warning("You cannot doodle there.")) return if(!choice || choice.amount == 0 || !(src.Adjacent(choice))) @@ -773,7 +773,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp for (var/obj/effect/decal/cleanable/blood/writing/W in T) num_doodles++ if (num_doodles > 4) - to_chat(src, "There is no space to write on!") + to_chat(src, span_warning("There is no space to write on!")) return var/max_length = 50 @@ -784,37 +784,37 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if (length(message) > max_length) message += "-" - to_chat(src, "You ran out of blood to write with!") + to_chat(src, span_warning("You ran out of blood to write with!")) var/obj/effect/decal/cleanable/blood/writing/W = new(T) W.basecolor = doodle_color W.update_icon() W.message = message W.add_hiddenprint(src) - W.visible_message("[span_red("Invisible fingers crudely paint something in blood on [T]...")]") + W.visible_message(span_filter_notice("[span_red("Invisible fingers crudely paint something in blood on [T]...")]")) /mob/observer/dead/pointed(atom/A as mob|obj|turf in view()) if(!..()) return 0 - usr.visible_message("[src] points to [A].") + usr.visible_message(span_deadsay("[src] points to [A].")) return 1 /mob/observer/dead/proc/manifest(mob/user) is_manifest = TRUE verbs |= /mob/observer/dead/proc/toggle_visibility verbs |= /mob/observer/dead/proc/ghost_whisper - to_chat(src, "[span_purple("As you are now in the realm of the living, you can whisper to the living with the Spectral Whisper verb, inside the IC tab.")]") + to_chat(src, span_filter_notice("[span_purple("As you are now in the realm of the living, you can whisper to the living with the Spectral Whisper verb, inside the IC tab.")]")) if(plane != PLANE_WORLD) user.visible_message( \ - "\The [user] drags ghost, [src], to our plane of reality!", \ - "You drag [src] to our plane of reality!" \ + span_warning("\The [user] drags ghost, [src], to our plane of reality!"), \ + span_warning("You drag [src] to our plane of reality!") \ ) toggle_visibility(TRUE) else var/datum/gender/T = gender_datums[user.get_visible_gender()] user.visible_message ( \ - "\The [user] just tried to smash [T.his] book into that ghost! It's not very effective.", \ - "You get the feeling that the ghost can't become any more visible." \ + span_warning("\The [user] just tried to smash [T.his] book into that ghost! It's not very effective."), \ + span_warning("You get the feeling that the ghost can't become any more visible.") \ ) /mob/observer/dead/proc/toggle_icon(var/icon) @@ -838,14 +838,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/toggled_invisible if(!forced && plane == PLANE_GHOSTS && world.time < toggled_invisible + 600) - to_chat(src, "You must gather strength before you can turn visible again...") + to_chat(src, span_filter_notice("You must gather strength before you can turn visible again...")) return if(plane == PLANE_WORLD) toggled_invisible = world.time - visible_message("It fades from sight...", "You are now invisible.") + visible_message(span_emote("It fades from sight..."), span_info("You are now invisible.")) else - to_chat(src, "You are now visible!") + to_chat(src, span_info("You are now visible!")) plane = (plane == PLANE_GHOSTS) ? PLANE_WORLD : PLANE_GHOSTS invisibility = (plane == PLANE_WORLD) ? 0 : INVISIBILITY_OBSERVER @@ -860,9 +860,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp src.anonsay = !src.anonsay if(anonsay) - to_chat(src, "Your key won't be shown when you speak in dead chat.") + to_chat(src, span_info("Your key won't be shown when you speak in dead chat.")) else - to_chat(src, "Your key will be publicly visible again.") + to_chat(src, span_info("Your key will be publicly visible again.")) /mob/observer/dead/canface() return 1 @@ -876,7 +876,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set category = "Ghost" ghostvision = !ghostvision updateghostsight() - to_chat(src, "You [ghostvision ? "now" : "no longer"] have ghost vision.") + to_chat(src, span_filter_notice("You [ghostvision ? "now" : "no longer"] have ghost vision.")) /mob/observer/dead/verb/toggle_darkness() set name = "Toggle Darkness" @@ -894,7 +894,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp lighting_alpha = darkness_levels[index] updateghostsight() - to_chat(src, "Your vision now has [darkness_names[index]].") + to_chat(src, span_filter_notice("Your vision now has [darkness_names[index]].")) /mob/observer/dead/proc/updateghostsight() plane_holder.set_desired_alpha(VIS_LIGHTING, lighting_alpha) @@ -906,11 +906,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return 0 if(mind && mind.current && mind.current.stat != DEAD && can_reenter_corpse) if(feedback) - to_chat(src, "Your non-dead body prevent you from respawning.") + to_chat(src, span_warning("Your non-dead body prevent you from respawning.")) return 0 if(config.antag_hud_restricted && has_enabled_antagHUD == 1) if(feedback) - to_chat(src, "antagHUD restrictions prevent you from respawning.") + to_chat(src, span_warning("antagHUD restrictions prevent you from respawning.")) return 0 return 1 @@ -946,13 +946,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/msg = sanitize(tgui_input_text(src, "Message:", "Spectral Whisper")) if(msg) log_say("(SPECWHISP to [key_name(M)]): [msg]", src) - to_chat(M, " You hear a strange, unidentifiable voice in your head... [span_purple("[msg]")]") - to_chat(src, " You said: '[msg]' to [M].") + to_chat(M, span_warning(" You hear a strange, unidentifiable voice in your head... [span_purple("[msg]")]")) + to_chat(src, span_warning(" You said: '[msg]' to [M].")) else return return 1 else - to_chat(src, "You have not been pulled past the veil!") + to_chat(src, span_danger("You have not been pulled past the veil!")) /mob/observer/dead/verb/choose_ghost_sprite() set category = "Ghost" @@ -995,13 +995,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/time_till_respawn = time_till_respawn() if(time_till_respawn == -1) // Special case, never allowed to respawn - to_chat(usr, "Respawning is not allowed!") + to_chat(usr, span_warning("Respawning is not allowed!")) else if(time_till_respawn) // Nonzero time to respawn - to_chat(usr, "You can't do that yet! You died too recently. You need to wait another [round(time_till_respawn/10/60, 0.1)] minutes.") + to_chat(usr, span_warning("You can't do that yet! You died too recently. You need to wait another [round(time_till_respawn/10/60, 0.1)] minutes.")) return if(jobban_isbanned(usr, "pAI")) - to_chat(usr,"You cannot alert pAI cards when you are banned from playing as a pAI.") + to_chat(usr,span_warning("You cannot alert pAI cards when you are banned from playing as a pAI.")) return if(usr.client.prefs?.be_special & BE_PAI) @@ -1019,9 +1019,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp PP.alertUpdate() spawn(54) PP.cut_overlays() - to_chat(usr,"Flashing the displays of [count] unoccupied PAIs.") + to_chat(usr,span_notice("Flashing the displays of [count] unoccupied PAIs.")) else - to_chat(usr,"You have 'Be pAI' disabled in your character prefs, so we can't help you.") + to_chat(usr,span_warning("You have 'Be pAI' disabled in your character prefs, so we can't help you.")) /mob/observer/dead/speech_bubble_appearance() return "ghost" @@ -1036,10 +1036,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(flashwindow) window_flash(client) if(message) - to_chat(src, "[message]") + to_chat(src, span_ghostalert("[message]")) if(source) throw_alert("\ref[source]_notify_revive", /obj/screen/alert/notify_cloning, new_master = source) - to_chat(src, "(Click to re-enter)") + to_chat(src, span_ghostalert("(Click to re-enter)")) if(sound) SEND_SOUND(src, sound(sound)) diff --git a/code/modules/mob/dead/observer/observer_vr.dm b/code/modules/mob/dead/observer/observer_vr.dm index 5ca73089e0..078ea96cdd 100644 --- a/code/modules/mob/dead/observer/observer_vr.dm +++ b/code/modules/mob/dead/observer/observer_vr.dm @@ -11,27 +11,27 @@ //Good choice testing and some instance-grabbing if(!ishuman(picked)) - to_chat(src,"[picked] isn't in a humanoid mob at the moment.") + to_chat(src,span_warning("[picked] isn't in a humanoid mob at the moment.")) return var/mob/living/carbon/human/H = picked if(H.stat || !H.client) - to_chat(src,"[H] isn't awake/alive at the moment.") + to_chat(src,span_warning("[H] isn't awake/alive at the moment.")) return if(!H.nif) - to_chat(src,"[H] doesn't have a NIF installed.") + to_chat(src,span_warning("[H] doesn't have a NIF installed.")) return var/datum/nifsoft/soulcatcher/SC = H.nif.imp_check(NIF_SOULCATCHER) if(!SC) - to_chat(src,"[H] doesn't have the Soulcatcher NIFSoft installed, or their NIF is unpowered.") + to_chat(src,span_warning("[H] doesn't have the Soulcatcher NIFSoft installed, or their NIF is unpowered.")) return //Fine fine, we can ask. var/obj/item/nif/nif = H.nif - to_chat(src,"Request sent to [H].") + to_chat(src,span_notice("Request sent to [H].")) var/req_time = world.time nif.notify("Transient mindstate detected, analyzing...") @@ -39,11 +39,11 @@ var/response = tgui_alert(H,"[src] ([src.key]) wants to join into your Soulcatcher.","Soulcatcher Request",list("Deny","Allow")) if(!response || response == "Deny") - to_chat(src,"[H] denied your request.") + to_chat(src,span_warning("[H] denied your request.")) return if((world.time - req_time) > 1 MINUTES) - to_chat(H,"The request had already expired. (1 minute waiting max)") + to_chat(H,span_warning("The request had already expired. (1 minute waiting max)")) return //Final check since we waited for input a couple times. @@ -63,7 +63,7 @@ set desc = "If your past-due backup notification was missed or ignored, you can use this to send a new one." if(!mind) - to_chat(src,"Your ghost is missing game values that allow this functionality, sorry.") + to_chat(src,span_warning("Your ghost is missing game values that allow this functionality, sorry.")) return var/datum/transcore_db/db = SStranscore.db_by_mind_name(mind.name) if(db) @@ -73,17 +73,17 @@ record.dead_state = MR_DEAD //Such as if you got scanned but didn't take an implant. It's a little funky, but I mean, you got scanned db.notify(record) //So you probably will want to let someone know if you die. record.last_notification = world.time - to_chat(src, "New notification has been sent.") + to_chat(src, span_notice("New notification has been sent.")) else - to_chat(src, "Your backup is not past-due yet.") + to_chat(src, span_warning("Your backup is not past-due yet.")) else if((world.time - record.last_notification) < 5 MINUTES) - to_chat(src, "Too little time has passed since your last notification.") + to_chat(src, span_warning("Too little time has passed since your last notification.")) else db.notify(record) record.last_notification = world.time - to_chat(src, "New notification has been sent.") + to_chat(src, span_notice("New notification has been sent.")) else - to_chat(src,"No backup record could be found, sorry.") + to_chat(src,span_warning("No backup record could be found, sorry.")) /* /mob/observer/dead/verb/backup_delay() set category = "Ghost" @@ -91,18 +91,18 @@ set desc = "You can use this to avoid automatic backup notification happening. Manual notification can still be used." if(!mind) - to_chat(src,"Your ghost is missing game values that allow this functionality, sorry.") + to_chat(src,span_warning("Your ghost is missing game values that allow this functionality, sorry.")) return var/datum/transcore_db/db = SStranscore.db_by_mind_name(mind.name) if(db) var/datum/transhuman/mind_record/record = db.backed_up[src.mind.name] if(record.dead_state == MR_DEAD || !(record.do_notify)) - to_chat(src, "The notification has already happened or been delayed.") + to_chat(src, span_warning("The notification has already happened or been delayed.")) else record.do_notify = FALSE - to_chat(src, "Overdue mind backup notification delayed successfully.") + to_chat(src, span_notice("Overdue mind backup notification delayed successfully.")) else - to_chat(src,"No backup record could be found, sorry.") + to_chat(src,span_warning("No backup record could be found, sorry.")) */ /mob/observer/dead/verb/findghostpod() //Moves the ghost instead of just changing the ghosts's eye -Nodrak set category = "Ghost" @@ -115,7 +115,7 @@ var/input = tgui_input_list(usr, "Select a ghost pod:", "Ghost Jump", observe_list_format(active_ghost_pods)) if(!input) - to_chat(src, "No active ghost pods detected.") + to_chat(src, span_filter_notice("No active ghost pods detected.")) return var/target = observe_list_format(active_ghost_pods)[input] @@ -129,7 +129,7 @@ forceMove(T) stop_following() else - to_chat(src, "This ghost pod is not located in the game world.") + to_chat(src, span_filter_notice("This ghost pod is not located in the game world.")) /mob/observer/dead/verb/findautoresleever() set category = "Ghost" @@ -150,11 +150,11 @@ var/obj/machinery/transhuman/autoresleever/thisone = pick(ar) if(!thisone) - to_chat(src, "There appears to be no auto-resleevers available.") + to_chat(src, span_warning("There appears to be no auto-resleevers available.")) return var/L = get_turf(thisone) if(!L) - to_chat(src, "There appears to be something wrong with this auto-resleever, try again.") + to_chat(src, span_warning("There appears to be something wrong with this auto-resleever, try again.")) return forceMove(L) diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index fa26cc707c..0f0a2efaf9 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -10,7 +10,7 @@ if(message) client.handle_spam_prevention(MUTE_DEADCHAT) if(client.prefs.muted & MUTE_DEADCHAT) - to_chat(src, "[span_red("You cannot talk in deadchat (muted).")]") + to_chat(src, span_filter_notice("[span_red("You cannot talk in deadchat (muted).")]")) return . = say_dead(message) @@ -26,7 +26,7 @@ if(message) client.handle_spam_prevention(MUTE_DEADCHAT) if(client.prefs.muted & MUTE_DEADCHAT) - to_chat(src, "[span_red("You cannot emote in deadchat (muted).")]") + to_chat(src, span_filter_notice("[span_red("You cannot emote in deadchat (muted).")]")) return . = emote_dead(message) diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index 0325ccf80f..4826fe0698 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -8,16 +8,16 @@ /mob/proc/emote_dead(var/message) if(client.prefs.muted & MUTE_DEADCHAT) - to_chat(src, "You cannot send deadchat emotes (muted).") + to_chat(src, span_danger("You cannot send deadchat emotes (muted).")) return if(!client?.prefs?.read_preference(/datum/preference/toggle/show_dsay)) - to_chat(src, "You have deadchat muted.") + to_chat(src, span_danger("You have deadchat muted.")) return if(!src.client.holder) if(!config.dsay_allowed) - to_chat(src, "Deadchat is globally muted.") + to_chat(src, span_danger("Deadchat is globally muted.")) return @@ -32,6 +32,6 @@ if(input) log_ghostemote(input, src) if(!invisibility) //If the ghost is made visible by admins or cult. And to see if the ghost has toggled its own visibility, as well. -Mech - visible_message("[src] [input]") + visible_message(span_deadsay("[src] [input]")) else say_dead_direct(input, src) diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index cd861a63f8..a24e875045 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -40,7 +40,7 @@ //HTML formatting if(!SP.speaking) // Catch the most generic case first - piece = "[piece]" + piece = span_message(span_body(piece)) else if(radio) // SP.speaking == TRUE enforced by previous !SP.speaking piece = SP.speaking.format_message_radio(piece) else // SP.speaking == TRUE && radio == FALSE @@ -113,14 +113,14 @@ if(is_deaf()) if(speaker == src) - to_chat(src, "You cannot hear yourself speak!") + to_chat(src, span_filter_say(span_warning("You cannot hear yourself speak!"))) else - to_chat(src, "[speaker_name][speaker.GetAltName()] makes a noise, possibly speech, but you cannot hear them.") + to_chat(src, span_filter_say(span_name(speaker_name) + "[speaker.GetAltName()] makes a noise, possibly speech, but you cannot hear them.")) else var/message_to_send = null - message_to_send = "[speaker_name][speaker.GetAltName()] [track][message]" + message_to_send = span_name(speaker_name) + "[speaker.GetAltName()] [track][message]" if(check_mentioned(multilingual_to_message(message_pieces)) && client?.prefs?.read_preference(/datum/preference/toggle/check_mention)) - message_to_send = "[message_to_send]" + message_to_send = span_large(span_bold(message_to_send)) on_hear_say(message_to_send, speaker) create_chat_message(speaker, combined["raw"], italics, list()) @@ -142,32 +142,32 @@ if(client) if(client.prefs.chat_timestamp) message = "[time] [message]" - message = "[message]" + message = span_game(span_say(message)) if(speaker && !speaker.client) - message = "[message]" + message = span_npcsay(message) else if(speaker && !(get_z(src) == get_z(speaker))) - message = "[message]" + message = span_multizsay(message) to_chat(src, message) else if(teleop) - to_chat(teleop, "[create_text_tag("body", "BODY:", teleop.client)][message]") + to_chat(teleop, span_game(span_say("[create_text_tag("body", "BODY:", teleop.client)][message]"))) else - to_chat(src, "[message]") + to_chat(src, span_game(span_say(message))) /mob/living/silicon/on_hear_say(var/message, var/mob/speaker = null) var/time = say_timestamp() if(client) if(client.prefs.chat_timestamp) message = "[time] [message]" - message = "[message]" + message = span_game(span_say(message)) if(speaker && !speaker.client) - message = "[message]" + message = span_npcsay(message) else if(speaker && !(get_z(src) == get_z(speaker))) - message = "[message]" + message = span_multizsay(message) to_chat(src, message) else if(teleop) - to_chat(teleop, "[create_text_tag("body", "BODY:", teleop.client)][message]") + to_chat(teleop, span_game(span_say("[create_text_tag("body", "BODY:", teleop.client)][message]"))) else - to_chat(src, "[message]") + to_chat(src, span_game(span_say(message))) // Checks if the mob's own name is included inside message. Handles both first and last names. /mob/proc/check_mentioned(var/message) @@ -215,12 +215,12 @@ if((sdisabilities & DEAF) || ear_deaf) if(prob(20)) - to_chat(src, "You feel your headset vibrate but can hear nothing from it!") + to_chat(src, span_warning("You feel your headset vibrate but can hear nothing from it!")) else on_hear_radio(part_a, part_b, speaker_name, track, part_c, message, part_d, part_e) /proc/say_timestamp() - return "\[[time2text(world.timeofday, "hh:mm")]\]" + return span_say_quote("\[[time2text(world.timeofday, "hh:mm")]\]") /mob/proc/on_hear_radio(part_a, part_b, speaker_name, track, part_c, formatted, part_d, part_e) var/time = "" @@ -271,7 +271,7 @@ return if(say_understands(speaker, language)) - message = "[speaker] [verb_understood], \"[message]\"" + message = span_game(span_say("[speaker] [verb_understood], \"[message]\"")) else if(!(language.ignore_adverb)) var/adverb var/length = length(message) * pick(0.8, 0.9, 1.0, 1.1, 1.2) //Adds a little bit of fuzziness @@ -281,9 +281,9 @@ if(30 to 48) adverb = " a message" if(48 to 90) adverb = " a lengthy message" else adverb = " a very lengthy message" - message = "[speaker] [verb][adverb]." + message = span_game(span_say("[speaker] [verb][adverb].")) else - message = "[speaker] [verb]." + message = span_game(span_say("[speaker] [verb].")) show_message(message, type = speech_type) // Type 1 is visual message @@ -298,10 +298,10 @@ heardword = copytext(heardword,2) if(copytext(heardword,-1) in punctuation) heardword = copytext(heardword,1,length(heardword)) - heard = "...You hear something about...[heardword]" + heard = span_game(span_say("...You hear something about...[heardword]")) else - heard = "...You almost hear someone talking..." + heard = span_game(span_say("...You almost hear someone talking...")) to_chat(src, heard) @@ -334,14 +334,14 @@ if(!say_understands(speaker)) name = speaker.voice_name - var/rendered = "[name] [message]" + var/rendered = span_game(span_say(span_name(name) + " [message]")) if(!speaker.client) - rendered = "[rendered]" + rendered = span_npcsay(rendered) else if(istype(speaker, /mob/living/silicon/ai)) var/mob/living/silicon/ai/source = speaker if(!(get_z(src) == get_z(source.holo))) - rendered = "[rendered]" + rendered = span_multizsay(rendered) else if(!(get_z(src) == get_z(speaker))) - rendered = "[rendered]" + rendered = span_multizsay(rendered) to_chat(src, rendered) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 64c459b464..7e59c103de 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -102,18 +102,18 @@ var/list/holder_mob_icon_cache = list() if(ismob(loc)) var/mob/M = loc M.drop_from_inventory(src) // If it's another item, we can just continue existing, or if it's a turf we'll qdel() in Moved() - to_chat(M, "\The [held] wriggles out of your grip!") - to_chat(held, "You wiggle out of [M]'s grip!") + to_chat(M, span_warning("\The [held] wriggles out of your grip!")) + to_chat(held, span_warning("You wiggle out of [M]'s grip!")) else if(istype(loc, /obj/item/clothing/accessory/holster)) var/obj/item/clothing/accessory/holster/holster = loc if(holster.holstered == src) holster.clear_holster() - to_chat(held, "You extricate yourself from [holster].") + to_chat(held, span_warning("You extricate yourself from [holster].")) forceMove(get_turf(src)) held.reset_view(null) else if(isitem(loc)) var/obj/item/I = loc - to_chat(held, "You struggle free of [loc].") + to_chat(held, span_warning("You struggle free of [loc].")) forceMove(get_turf(src)) held.reset_view(null) if(istype(I)) @@ -324,12 +324,12 @@ var/list/holder_mob_icon_cache = list() grabber.put_in_hands(H) if(self_grab) - to_chat(grabber, "\The [src] clambers onto you!") - to_chat(src, "You climb up onto \the [grabber]!") + to_chat(grabber, span_notice("\The [src] clambers onto you!")) + to_chat(src, span_notice("You climb up onto \the [grabber]!")) grabber.equip_to_slot_if_possible(H, slot_back, 0, 1) else - to_chat(grabber, "You scoop up \the [src]!") - to_chat(src, "\The [grabber] scoops you up!") + to_chat(grabber, span_notice("You scoop up \the [src]!")) + to_chat(src, span_notice("\The [grabber] scoops you up!")) add_attack_logs(grabber, H.held_mob, "Scooped up", FALSE) // Not important enough to notify admins, but still helpful. return H diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm index d7a8d11481..ca21339f8e 100644 --- a/code/modules/mob/language/language.dm +++ b/code/modules/mob/language/language.dm @@ -115,7 +115,7 @@ return scrambled_text /datum/language/proc/format_message(message, verb) - return "[message]" + return span_message("[message]") /datum/language/proc/format_message_plain(message, verb) return "[capitalize(message)]" diff --git a/code/modules/mob/language/synthetic.dm b/code/modules/mob/language/synthetic.dm index 0d301117bb..bdf8a05bc3 100644 --- a/code/modules/mob/language/synthetic.dm +++ b/code/modules/mob/language/synthetic.dm @@ -21,11 +21,11 @@ message = encode_html_emphasis(message) var/message_start = "[name], [speaker.name]" - var/message_body = "[speaker.say_quote(message)], \"[message]\"" + var/message_body = span_message("[speaker.say_quote(message)], \"[message]\"") for (var/mob/M in dead_mob_list) if(!istype(M,/mob/new_player) && !istype(M,/mob/living/carbon/brain)) //No meta-evesdropping - var/message_to_send = span_binary("[message_start] ([ghost_follow_link(speaker, M)]) [message_body]") + var/message_to_send = span_binarysay("[message_start] ([ghost_follow_link(speaker, M)]) [message_body]") if(M.check_mentioned(message) && M.client?.prefs?.read_preference(/datum/preference/toggle/check_mention)) message_to_send = "[message_to_send]" M.show_message(message_to_send, 2) @@ -34,11 +34,11 @@ if(drone_only && !istype(S,/mob/living/silicon/robot/drone)) continue else if(istype(S , /mob/living/silicon/ai)) - message_start = span_binary("[name], [speaker.name]") + message_start = span_binarysay("[name], [speaker.name]") else if (!S.binarycheck()) continue - var/message_to_send = span_binary("[message_start] [message_body]") + var/message_to_send = span_binarysay("[message_start] [message_body]") if(S.check_mentioned(message) && S.client?.prefs?.read_preference(/datum/preference/toggle/check_mention)) message_to_send = "[message_to_send]" S.show_message(message_to_send, 2) @@ -49,7 +49,7 @@ for (var/mob/living/M in listening) if(istype(M, /mob/living/silicon) || M.binarycheck()) continue - M.show_message("synthesised voice beeps, \"beep beep beep\"",2) + M.show_message(span_binarysay(span_name("synthesised voice") + " " + span_message("beeps, \"beep beep beep\"")),2) //robot binary xmitter component power usage if (isrobot(speaker)) diff --git a/code/modules/mob/living/bot/SLed209bot.dm b/code/modules/mob/living/bot/SLed209bot.dm index 263db2eaca..2c1a8c9a55 100644 --- a/code/modules/mob/living/bot/SLed209bot.dm +++ b/code/modules/mob/living/bot/SLed209bot.dm @@ -81,7 +81,7 @@ user.drop_item() qdel(W) build_step++ - to_chat(user, "You add the robot leg to [src].") + to_chat(user, span_notice("You add the robot leg to [src].")) name = "legs/frame assembly" if(build_step == 1) icon_state = "ed209_leg" @@ -93,7 +93,7 @@ user.drop_item() qdel(W) build_step++ - to_chat(user, "You add the armor to [src].") + to_chat(user, span_notice("You add the armor to [src].")) name = "vest/legs/frame assembly" item_state = "ed209_shell" icon_state = "ed209_shell" @@ -104,13 +104,13 @@ if(WT.remove_fuel(0, user)) build_step++ name = "shielded frame assembly" - to_chat(user, "You welded the vest to [src].") + to_chat(user, span_notice("You welded the vest to [src].")) if(4) if(istype(W, /obj/item/clothing/head/helmet)) user.drop_item() qdel(W) build_step++ - to_chat(user, "You add the helmet to [src].") + to_chat(user, span_notice("You add the helmet to [src].")) name = "covered and shielded frame assembly" item_state = "ed209_hat" icon_state = "ed209_hat" @@ -120,7 +120,7 @@ user.drop_item() qdel(W) build_step++ - to_chat(user, "You add the prox sensor to [src].") + to_chat(user, span_notice("You add the prox sensor to [src].")) name = "covered, shielded and sensored frame assembly" item_state = "ed209_prox" icon_state = "ed209_prox" @@ -129,13 +129,13 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W if (C.get_amount() < 1) - to_chat(user, "You need one coil of wire to wire [src].") + to_chat(user, span_warning("You need one coil of wire to wire [src].")) return - to_chat(user, "You start to wire [src].") + to_chat(user, span_notice("You start to wire [src].")) if(do_after(user, 40) && build_step == 6) if(C.use(1)) build_step++ - to_chat(user, "You wire the ED-209 assembly.") + to_chat(user, span_notice("You wire the ED-209 assembly.")) name = "wired ED-209 assembly" return @@ -145,7 +145,7 @@ item_state = "sled209_taser" icon_state = "sled209_taser" build_step++ - to_chat(user, "You add [W] to [src].") + to_chat(user, span_notice("You add [W] to [src].")) user.drop_item() qdel(W) @@ -153,21 +153,20 @@ if(W.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, W.usesound, 100, 1) var/turf/T = get_turf(user) - to_chat(user, "Now attaching the gun to the frame...") + to_chat(user, span_notice("Now attaching the gun to the frame...")) sleep(40) if(get_turf(user) == T && build_step == 8) build_step++ name = "armed [name]" - to_chat(user, "Taser gun attached.") + to_chat(user, span_notice("Taser gun attached.")) if(9) if(istype(W, /obj/item/cell)) build_step++ - to_chat(user, "You complete the ED-209.") + to_chat(user, span_notice("You complete the ED-209.")) var/turf/T = get_turf(src) new /mob/living/bot/secbot/ed209/slime(T,created_name,lasercolor) user.drop_item() qdel(W) user.drop_from_inventory(src) qdel(src) - diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm index 043c73c6f1..c8acdb6759 100644 --- a/code/modules/mob/living/bot/bot.dm +++ b/code/modules/mob/living/bot/bot.dm @@ -115,23 +115,23 @@ if(O.GetID()) if(access_scanner.allowed(user) && !open) locked = !locked - to_chat(user, "Controls are now [locked ? "locked." : "unlocked."]") + to_chat(user, span_notice("Controls are now [locked ? "locked." : "unlocked."]")) attack_hand(user) if(emagged) - to_chat(user, "ERROR! SYSTEMS COMPROMISED!") + to_chat(user, span_warning("ERROR! SYSTEMS COMPROMISED!")) else if(open) - to_chat(user, "Please close the access panel before locking it.") + to_chat(user, span_warning("Please close the access panel before locking it.")) else - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) return else if(O.has_tool_quality(TOOL_SCREWDRIVER)) if(!locked) open = !open - to_chat(user, "Maintenance panel is now [open ? "opened" : "closed"].") + to_chat(user, span_notice("Maintenance panel is now [open ? "opened" : "closed"].")) playsound(src, O.usesound, 50, 1) else - to_chat(user, "You need to unlock the controls first.") + to_chat(user, span_notice("You need to unlock the controls first.")) return else if(O.has_tool_quality(TOOL_WELDER)) if(health < getMaxHealth()) @@ -145,20 +145,20 @@ else fireloss = fireloss - 10 updatehealth() - user.visible_message("[user] repairs [src].","You repair [src].") + user.visible_message(span_notice("[user] repairs [src]."),span_notice("You repair [src].")) playsound(src, O.usesound, 50, 1) else - to_chat(user, "Unable to repair with the maintenance panel closed.") + to_chat(user, span_notice("Unable to repair with the maintenance panel closed.")) else - to_chat(user, "[src] does not need a repair.") + to_chat(user, span_notice("[src] does not need a repair.")) return else if(istype(O, /obj/item/assembly/prox_sensor) && emagged) if(open) - to_chat(user, "You repair the bot's systems.") + to_chat(user, span_notice("You repair the bot's systems.")) emagged = 0 qdel(O) else - to_chat(user, "Unable to repair with the maintenance panel closed.") + to_chat(user, span_notice("Unable to repair with the maintenance panel closed.")) else if(istype(O, /obj/item/paicard)) if(open) insertpai(user, O) diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm index aca5deb224..f5bcb70f4e 100644 --- a/code/modules/mob/living/bot/cleanbot.dm +++ b/code/modules/mob/living/bot/cleanbot.dm @@ -154,7 +154,7 @@ /mob/living/bot/cleanbot/explode() on = 0 - visible_message("[src] blows apart!") + visible_message(span_danger("[src] blows apart!")) var/turf/Tsec = get_turf(src) new /obj/item/reagent_containers/glass/bucket(Tsec) @@ -222,18 +222,18 @@ . = TRUE if("wet_floors") wet_floors = !wet_floors - to_chat(usr, "You twiddle the screw.") + to_chat(usr, span_notice("You twiddle the screw.")) . = TRUE if("spray_blood") spray_blood = !spray_blood - to_chat(usr, "You press the weird button.") + to_chat(usr, span_notice("You press the weird button.")) . = TRUE /mob/living/bot/cleanbot/emag_act(var/remaining_uses, var/mob/user) . = ..() if(!wet_floors || !spray_blood) if(user) - to_chat(user, "The [src] buzzes and beeps.") + to_chat(user, span_notice("The [src] buzzes and beeps.")) playsound(src, 'sound/machines/buzzbeep.ogg', 50, 0) spray_blood = 1 wet_floors = 1 @@ -264,7 +264,7 @@ var/turf/T = get_turf(loc) var/mob/living/bot/cleanbot/A = new /mob/living/bot/cleanbot(T) A.name = created_name - to_chat(user, "You add the robot arm to the bucket and sensor assembly. Beep boop!") + to_chat(user, span_notice("You add the robot arm to the bucket and sensor assembly. Beep boop!")) user.drop_from_inventory(src) qdel(src) diff --git a/code/modules/mob/living/bot/ed209bot.dm b/code/modules/mob/living/bot/ed209bot.dm index 0f2a32d5ea..fcf683aff0 100644 --- a/code/modules/mob/living/bot/ed209bot.dm +++ b/code/modules/mob/living/bot/ed209bot.dm @@ -27,7 +27,7 @@ icon_state = "ed209[on]" /mob/living/bot/secbot/ed209/explode() - visible_message("[src] blows apart!") + visible_message(span_warning("[src] blows apart!")) var/turf/Tsec = get_turf(src) new /obj/item/secbot_assembly/ed209_assembly(Tsec) @@ -101,7 +101,7 @@ user.drop_item() qdel(W) build_step++ - to_chat(user, "You add the robot leg to [src].") + to_chat(user, span_notice("You add the robot leg to [src].")) name = "legs/frame assembly" if(build_step == 1) icon_state = "ed209_leg" @@ -113,7 +113,7 @@ user.drop_item() qdel(W) build_step++ - to_chat(user, "You add the armor to [src].") + to_chat(user, span_notice("You add the armor to [src].")) name = "vest/legs/frame assembly" item_state = "ed209_shell" icon_state = "ed209_shell" @@ -124,13 +124,13 @@ if(WT.remove_fuel(0, user)) build_step++ name = "shielded frame assembly" - to_chat(user, "You welded the vest to [src].") + to_chat(user, span_notice("You welded the vest to [src].")) if(4) if(istype(W, /obj/item/clothing/head/helmet)) user.drop_item() qdel(W) build_step++ - to_chat(user, "You add the helmet to [src].") + to_chat(user, span_notice("You add the helmet to [src].")) name = "covered and shielded frame assembly" item_state = "ed209_hat" icon_state = "ed209_hat" @@ -140,7 +140,7 @@ user.drop_item() qdel(W) build_step++ - to_chat(user, "You add the prox sensor to [src].") + to_chat(user, span_notice("You add the prox sensor to [src].")) name = "covered, shielded and sensored frame assembly" item_state = "ed209_prox" icon_state = "ed209_prox" @@ -149,13 +149,13 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W if (C.get_amount() < 1) - to_chat(user, "You need one coil of wire to wire [src].") + to_chat(user, span_warning("You need one coil of wire to wire [src].")) return - to_chat(user, "You start to wire [src].") + to_chat(user, span_notice("You start to wire [src].")) if(do_after(user, 40) && build_step == 6) if(C.use(1)) build_step++ - to_chat(user, "You wire the ED-209 assembly.") + to_chat(user, span_notice("You wire the ED-209 assembly.")) name = "wired ED-209 assembly" return @@ -165,7 +165,7 @@ item_state = "sled209_taser" icon_state = "sled209_taser" build_step++ - to_chat(user, "You add [W] to [src].") + to_chat(user, span_notice("You add [W] to [src].")) user.drop_item() qdel(W) var/turf/T = get_turf(src) @@ -183,7 +183,7 @@ item_state = "ed209_taser" icon_state = "ed209_taser" build_step++ - to_chat(user, "You add [W] to [src].") + to_chat(user, span_notice("You add [W] to [src].")) user.drop_item() qdel(W) @@ -191,17 +191,17 @@ if(W.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, W.usesound, 100, 1) var/turf/T = get_turf(user) - to_chat(user, "Now attaching the gun to the frame...") + to_chat(user, span_notice("Now attaching the gun to the frame...")) sleep(40) if(get_turf(user) == T && build_step == 8) build_step++ name = "armed [name]" - to_chat(user, "Taser gun attached.") + to_chat(user, span_notice("Taser gun attached.")) if(9) if(istype(W, /obj/item/cell)) build_step++ - to_chat(user, "You complete the ED-209.") + to_chat(user, span_notice("You complete the ED-209.")) var/turf/T = get_turf(src) var/mob/living/bot/secbot/ed209/S = new /mob/living/bot/secbot/ed209(T) S.name = created_name diff --git a/code/modules/mob/living/bot/edCLNbot.dm b/code/modules/mob/living/bot/edCLNbot.dm index 0498699271..e2ce4b846f 100644 --- a/code/modules/mob/living/bot/edCLNbot.dm +++ b/code/modules/mob/living/bot/edCLNbot.dm @@ -44,7 +44,7 @@ if(!red_switch && !blue_switch && green_switch && prob(10) || src.emagged) if(istype(loc, /turf/simulated)) var/turf/simulated/T = loc - visible_message("\The [src] stomps on \the [T], breaking it!") + visible_message(span_warning("\The [src] stomps on \the [T], breaking it!")) qdel(T) if(red_switch && blue_switch && green_switch && prob(1)) @@ -52,7 +52,7 @@ /mob/living/bot/cleanbot/edCLN/explode() on = 0 - visible_message("[src] blows apart!") + visible_message(span_danger("[src] blows apart!")) var/turf/Tsec = get_turf(src) new /obj/item/secbot_assembly/ed209_assembly(Tsec) @@ -87,22 +87,22 @@ switch(action) if("red_switch") red_switch = !red_switch - to_chat(usr, "You flip the red switch [red_switch ? "on" : "off"].") + to_chat(usr, span_notice("You flip the red switch [red_switch ? "on" : "off"].")) . = TRUE if("green_switch") green_switch = !green_switch - to_chat(usr, "You flip the green switch [green_switch ? "on" : "off"].") + to_chat(usr, span_notice("You flip the green switch [green_switch ? "on" : "off"].")) . = TRUE if("blue_switch") blue_switch = !blue_switch - to_chat(usr, "You flip the blue switch [blue_switch ? "on" : "off"].") + to_chat(usr, span_notice("You flip the blue switch [blue_switch ? "on" : "off"].")) . = TRUE /mob/living/bot/cleanbot/edCLN/emag_act(var/remaining_uses, var/mob/user) . = ..() if(!emagged) if(user) - to_chat(user, "The [src] buzzes and beeps.") + to_chat(user, span_notice("The [src] buzzes and beeps.")) playsound(src, 'sound/machines/buzzbeep.ogg', 50, 0) emagged = 1 return 1 @@ -135,7 +135,7 @@ user.drop_item() qdel(W) build_step++ - to_chat(user, "You add \the [W] to \the [src].") + to_chat(user, span_notice("You add \the [W] to \the [src].")) name = "legs/frame assembly" if(build_step == 1) icon_state = "ed209_leg" @@ -147,7 +147,7 @@ user.drop_item() qdel(W) build_step++ - to_chat(user, "You add \the [W] to \the [src].") + to_chat(user, span_notice("You add \the [W] to \the [src].")) name = "bucket/legs/frame assembly" item_state = "edCLN_bucket" icon_state = "edCLN_bucket" @@ -158,13 +158,13 @@ if(WT.remove_fuel(0, user)) build_step++ name = "bucketed frame assembly" - to_chat(user, "You welded the bucket to \the [src].") + to_chat(user, span_notice("You welded the bucket to \the [src].")) if(4) if(isprox(W)) user.drop_item() qdel(W) build_step++ - to_chat(user, "You add \the [W] to \the [src].") + to_chat(user, span_notice("You add \the [W] to \the [src].")) name = "proximity bucket ED assembly" item_state = "edCLN_prox" icon_state = "edCLN_prox" @@ -173,13 +173,13 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W if (C.get_amount() < 1) - to_chat(user, "You need one coil of wire to wire \the [src].") + to_chat(user, span_warning("You need one coil of wire to wire \the [src].")) return - to_chat(user, "You start to wire \the [src].") + to_chat(user, span_notice("You start to wire \the [src].")) if(do_after(user, 40)) if(C.use(1)) build_step++ - to_chat(user, "You wire the ED-CLN assembly.") + to_chat(user, span_notice("You wire the ED-CLN assembly.")) name = "wired ED-CLN assembly" return @@ -187,7 +187,7 @@ if(istype(W, /obj/item/mop)) name = "mop ED-CLN assembly" build_step++ - to_chat(user, "You add \the [W] to \the [src].") + to_chat(user, span_notice("You add \the [W] to \the [src].")) item_state = "edCLN_mop" icon_state = "edCLN_mop" user.drop_item() @@ -197,16 +197,16 @@ if(W.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, W.usesound, 100, 1) var/turf/T = get_turf(user) - to_chat(user, "Attatching the mop to the frame...") + to_chat(user, span_notice("Attatching the mop to the frame...")) if(do_after(user, 40) && get_turf(user) == T) build_step++ name = "mopped ED-CLN assembly" - to_chat(user, "Mop attached.") + to_chat(user, span_notice("Mop attached.")) if(8) if(istype(W, /obj/item/cell)) build_step++ - to_chat(user, "You complete the ED-CLN.") + to_chat(user, span_notice("You complete the ED-CLN.")) var/turf/T = get_turf(src) var/mob/living/bot/cleanbot/edCLN/S = new /mob/living/bot/cleanbot/edCLN(T) S.name = created_name diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 633f2a5121..af68009361 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -74,9 +74,9 @@ . = ..() if(!emagged) if(user) - to_chat(user, "You short out [src]'s plant identifier circuits.") + to_chat(user, span_notice("You short out [src]'s plant identifier circuits.")) spawn(rand(30, 50)) - visible_message("[src] buzzes oddly.") + visible_message(span_warning("[src] buzzes oddly.")) emagged = 1 return 1 @@ -189,40 +189,40 @@ if(FARMBOT_COLLECT) action = "water" // Needs a better one update_icons() - visible_message("[src] starts [T.dead? "removing the plant from" : "harvesting"] \the [A].") + visible_message(span_notice("[src] starts [T.dead? "removing the plant from" : "harvesting"] \the [A].")) busy = 1 if(do_after(src, 30, A)) - visible_message("[src] [T.dead? "removes the plant from" : "harvests"] \the [A].") + visible_message(span_notice("[src] [T.dead? "removes the plant from" : "harvests"] \the [A].")) T.attack_hand(src) if(FARMBOT_WATER) action = "water" update_icons() - visible_message("[src] starts watering \the [A].") + visible_message(span_notice("[src] starts watering \the [A].")) busy = 1 if(do_after(src, 30, A)) playsound(src, 'sound/effects/slosh.ogg', 25, 1) - visible_message("[src] waters \the [A].") + visible_message(span_notice("[src] waters \the [A].")) tank.reagents.trans_to(T, 100 - T.waterlevel) if(FARMBOT_UPROOT) action = "hoe" update_icons() - visible_message("[src] starts uprooting the weeds in \the [A].") + visible_message(span_notice("[src] starts uprooting the weeds in \the [A].")) busy = 1 if(do_after(src, 30)) - visible_message("[src] uproots the weeds in \the [A].") + visible_message(span_notice("[src] uproots the weeds in \the [A].")) T.weedlevel = 0 if(FARMBOT_NUTRIMENT) action = "fertile" update_icons() - visible_message("[src] starts fertilizing \the [A].") + visible_message(span_notice("[src] starts fertilizing \the [A].")) busy = 1 if(do_after(src, 30, A)) - visible_message("[src] fertilizes \the [A].") + visible_message(span_notice("[src] fertilizes \the [A].")) T.reagents.add_reagent("ammonia", 10) busy = 0 @@ -234,7 +234,7 @@ return action = "water" update_icons() - visible_message("[src] starts refilling its tank from \the [A].") + visible_message(span_notice("[src] starts refilling its tank from \the [A].")) busy = 1 while(do_after(src, 10) && tank.reagents.total_volume < tank.reagents.maximum_volume) @@ -245,7 +245,7 @@ busy = 0 action = "" update_icons() - visible_message("[src] finishes refilling its tank.") + visible_message(span_notice("[src] finishes refilling its tank.")) else if(emagged && ishuman(A)) var/action = pick("weed", "water") @@ -258,18 +258,18 @@ flick("farmbot_hoe", src) do_attack_animation(A) if(prob(50)) - visible_message("[src] swings wildly at [A] with a minihoe, missing completely!") + visible_message(span_danger("[src] swings wildly at [A] with a minihoe, missing completely!")) return var/t = pick("slashed", "sliced", "cut", "clawed") A.attack_generic(src, 5, t) if("water") flick("farmbot_water", src) - visible_message("[src] splashes [A] with water!") + visible_message(span_danger("[src] splashes [A] with water!")) tank.reagents.splash(A, 100) /mob/living/bot/farmbot/explode() - visible_message("[src] blows apart!") + visible_message(span_danger("[src] blows apart!")) var/turf/Tsec = get_turf(src) new /obj/item/material/minihoe(Tsec) diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm index 1a42019df6..2a97b3f08b 100644 --- a/code/modules/mob/living/bot/floorbot.dm +++ b/code/modules/mob/living/bot/floorbot.dm @@ -68,7 +68,7 @@ if(!emagged) emagged = 1 if(user) - to_chat(user, "The [src] buzzes and beeps.") + to_chat(user, span_notice("The [src] buzzes and beeps.")) playsound(src, 'sound/machines/buzzbeep.ogg', 50, 0) return 1 @@ -208,12 +208,12 @@ busy = 1 update_icons() if(F.flooring) - visible_message("\The [src] begins to tear the floor tile from the floor!") + visible_message(span_warning("\The [src] begins to tear the floor tile from the floor!")) if(do_after(src, 50)) F.break_tile_to_plating() addTiles(1) else - visible_message("\The [src] begins to tear through the floor!") + visible_message(span_danger("\The [src] begins to tear through the floor!")) if(do_after(src, 150)) // Extra time because this can and will kill. F.ReplaceWithLattice() addTiles(1) @@ -289,7 +289,7 @@ /mob/living/bot/floorbot/explode() turn_off() - visible_message("\The [src] blows apart!") + visible_message(span_danger("\The [src] blows apart!")) playsound(src, "sparks", 50, 1) var/turf/Tsec = get_turf(src) @@ -345,18 +345,18 @@ ..() return if(contents.len >= 1) - to_chat(user, "They wont fit in as there is already stuff inside.") + to_chat(user, span_notice("They wont fit in as there is already stuff inside.")) return if(user.s_active) user.s_active.close(user) if(T.use(10)) var/obj/item/toolbox_tiles/B = new /obj/item/toolbox_tiles user.put_in_hands(B) - to_chat(user, "You add the tiles into the empty toolbox. They protrude from the top.") + to_chat(user, span_notice("You add the tiles into the empty toolbox. They protrude from the top.")) user.drop_from_inventory(src) qdel(src) else - to_chat(user, "You need 10 floor tiles for a floorbot.") + to_chat(user, span_warning("You need 10 floor tiles for a floorbot.")) return /obj/item/toolbox_tiles @@ -378,7 +378,7 @@ var/obj/item/toolbox_tiles_sensor/B = new /obj/item/toolbox_tiles_sensor() B.created_name = created_name user.put_in_hands(B) - to_chat(user, "You add the sensor to the toolbox and tiles!") + to_chat(user, span_notice("You add the sensor to the toolbox and tiles!")) user.drop_from_inventory(src) qdel(src) else if (istype(W, /obj/item/pen)) @@ -408,7 +408,7 @@ var/turf/T = get_turf(user.loc) var/mob/living/bot/floorbot/A = new /mob/living/bot/floorbot(T) A.name = created_name - to_chat(user, "You add the robot arm to the odd looking toolbox assembly! Boop beep!") + to_chat(user, span_notice("You add the robot arm to the odd looking toolbox assembly! Boop beep!")) user.drop_from_inventory(src) qdel(src) else if(istype(W, /obj/item/pen)) diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm index 7d3a6e9302..de25a334fb 100644 --- a/code/modules/mob/living/bot/medbot.dm +++ b/code/modules/mob/living/bot/medbot.dm @@ -143,7 +143,7 @@ if(!t) return - visible_message("[src] is trying to inject [H]!") + visible_message(span_warning("[src] is trying to inject [H]!")) if(declare_treatment) var/area/location = get_area(src) global_announcer.autosay("[src] is treating [H] in [location]", "[src]", "Medical") @@ -154,7 +154,7 @@ reagent_glass.reagents.trans_to_mob(H, injection_amount, CHEM_BLOOD) else H.reagents.add_reagent(t, injection_amount) - visible_message("[src] injects [H] with the syringe!") + visible_message(span_warning("[src] injects [H] with the syringe!")) if(H.stat == DEAD) // This is down here because this proc won't be called again due to losing a target because of parent AI loop. target = null @@ -197,7 +197,7 @@ /mob/living/bot/medbot/attack_hand(mob/living/carbon/human/H) if(istype(H) && H.a_intent == I_DISARM && !is_tipped) - H.visible_message("[H] begins tipping over [src].", "You begin tipping over [src]...") + H.visible_message(span_danger("[H] begins tipping over [src]."), span_warning("You begin tipping over [src]...")) if(world.time > last_tipping_action_voice + 15 SECONDS) last_tipping_action_voice = world.time // message for tipping happens when we start interacting, message for righting comes after finishing @@ -210,7 +210,7 @@ tip_over(H) else if(istype(H) && H.a_intent == I_HELP && is_tipped) - H.visible_message("[H] begins righting [src].", "You begin righting [src]...") + H.visible_message(span_notice("[H] begins righting [src]."), span_notice("You begin righting [src]...")) if(do_after(H, 3 SECONDS, target=src)) set_right(H) else @@ -251,16 +251,16 @@ /mob/living/bot/medbot/attackby(var/obj/item/O, var/mob/user) if(istype(O, /obj/item/reagent_containers/glass)) if(locked) - to_chat(user, "You cannot insert a beaker because the panel is locked.") + to_chat(user, span_notice("You cannot insert a beaker because the panel is locked.")) return if(!isnull(reagent_glass)) - to_chat(user, "There is already a beaker loaded.") + to_chat(user, span_notice("There is already a beaker loaded.")) return user.drop_item() O.loc = src reagent_glass = O - to_chat(user, "You insert [O].") + to_chat(user, span_notice("You insert [O].")) return else ..() @@ -316,8 +316,8 @@ . = ..() if(!emagged) if(user) - to_chat(user, "You short out [src]'s reagent synthesis circuits.") - visible_message("[src] buzzes oddly!") + to_chat(user, span_warning("You short out [src]'s reagent synthesis circuits.")) + visible_message(span_warning("[src] buzzes oddly!")) flick("medibot_spark", src) target = null busy = 0 @@ -329,7 +329,7 @@ /mob/living/bot/medbot/explode() on = 0 - visible_message("[src] blows apart!") + visible_message(span_danger("[src] blows apart!")) var/turf/Tsec = get_turf(src) new /obj/item/storage/firstaid(Tsec) @@ -360,7 +360,7 @@ /mob/living/bot/medbot/proc/tip_over(mob/user) playsound(src, 'sound/machines/warning-buzzer.ogg', 50) - user.visible_message("[user] tips over [src]!", "You tip [src] over!") + user.visible_message(span_danger("[user] tips over [src]!"), span_danger("You tip [src] over!")) is_tipped = TRUE tipper_name = user.name var/matrix/mat = transform @@ -369,13 +369,13 @@ /mob/living/bot/medbot/proc/set_right(mob/user) var/list/messagevoice if(user) - user.visible_message("[user] sets [src] right-side up!", "You set [src] right-side up!") + user.visible_message(span_notice("[user] sets [src] right-side up!"), span_green("You set [src] right-side up!")) if(user.name == tipper_name) messagevoice = list("I forgive you." = 'sound/voice/medbot/forgive.ogg') else messagevoice = list("Thank you!" = 'sound/voice/medbot/thank_you.ogg', "You are a good person." = 'sound/voice/medbot/youre_good.ogg') else - visible_message("[src] manages to [pick("writhe", "wriggle", "wiggle")] enough to right itself.") + visible_message(span_notice("[src] manages to [pick("writhe", "wriggle", "wiggle")] enough to right itself.")) messagevoice = list("Fuck you." = 'sound/voice/medbot/fuck_you.ogg', "Your behavior has been reported, have a nice day." = 'sound/voice/medbot/reported.ogg') tipper_name = null @@ -430,9 +430,9 @@ if(MEDBOT_PANIC_MED to MEDBOT_PANIC_HIGH) . += "They are tipped over and appear visibly distressed." // now we humanize the medbot as a they, not an it if(MEDBOT_PANIC_HIGH to MEDBOT_PANIC_FUCK) - . += "They are tipped over and visibly panicking!" + . += span_warning("They are tipped over and visibly panicking!") if(MEDBOT_PANIC_FUCK to INFINITY) - . += "They are freaking out from being tipped over!" + . += span_warning("They are freaking out from being tipped over!") /mob/living/bot/medbot/confirmTarget(var/mob/living/carbon/human/H) if(!..()) @@ -477,7 +477,7 @@ return if(contents.len >= 1) - to_chat(user, "You need to empty [src] out first.") + to_chat(user, span_notice("You need to empty [src] out first.")) return var/obj/item/firstaid_arm_assembly/A = new /obj/item/firstaid_arm_assembly @@ -490,7 +490,7 @@ qdel(S) user.put_in_hands(A) - to_chat(user, "You add the robot arm to the first aid kit.") + to_chat(user, span_notice("You add the robot arm to the first aid kit.")) user.drop_from_inventory(src) qdel(src) @@ -500,7 +500,7 @@ return if(contents.len >= 1) - to_chat(user, "You need to empty [src] out first.") + to_chat(user, span_notice("You need to empty [src] out first.")) return var/obj/item/firstaid_arm_assembly/A = new /obj/item/firstaid_arm_assembly @@ -513,7 +513,7 @@ qdel(S) user.put_in_hands(A) - to_chat(user, "You add the robot arm to the first aid kit.") + to_chat(user, span_notice("You add the robot arm to the first aid kit.")) user.drop_from_inventory(src) qdel(src) @@ -548,7 +548,7 @@ user.drop_item() qdel(W) build_step++ - to_chat(user, "You add the health sensor to [src].") + to_chat(user, span_notice("You add the health sensor to [src].")) name = "First aid/robot arm/health analyzer assembly" add_overlay("na_scanner") @@ -556,7 +556,7 @@ if(isprox(W)) user.drop_item() qdel(W) - to_chat(user, "You complete the Medibot! Beep boop.") + to_chat(user, span_notice("You complete the Medibot! Beep boop.")) var/turf/T = get_turf(src) var/mob/living/bot/medbot/S = new /mob/living/bot/medbot(T) S.skin = skin diff --git a/code/modules/mob/living/bot/mulebot.dm b/code/modules/mob/living/bot/mulebot.dm index 54bb140ac7..89fc3a8706 100644 --- a/code/modules/mob/living/bot/mulebot.dm +++ b/code/modules/mob/living/bot/mulebot.dm @@ -168,7 +168,7 @@ /mob/living/bot/mulebot/emag_act(var/remaining_charges, var/user) locked = !locked - to_chat(user, "You [locked ? "lock" : "unlock"] the mulebot's controls!") + to_chat(user, span_notice("You [locked ? "lock" : "unlock"] the mulebot's controls!")) flick("mulebot-emagged", src) playsound(src, 'sound/effects/sparks1.ogg', 100, 0) return 1 @@ -223,14 +223,14 @@ /mob/living/bot/mulebot/Bump(var/mob/living/M) if(!safety && istype(M)) - visible_message("[src] knocks over [M]!") + visible_message(span_warning("[src] knocks over [M]!")) M.Stun(8) M.Weaken(5) ..() /mob/living/bot/mulebot/proc/runOver(var/mob/living/M) if(istype(M)) // At this point, MULEBot has somehow crossed over onto your tile with you still on it. CRRRNCH. - visible_message("[src] drives over [M]!") + visible_message(span_warning("[src] drives over [M]!")) playsound(src, 'sound/effects/splat.ogg', 50, 1) var/damage = rand(5, 7) @@ -250,7 +250,7 @@ /mob/living/bot/mulebot/explode() unload(pick(0, 1, 2, 4, 8)) - visible_message("[src] blows apart!") + visible_message(span_danger("[src] blows apart!")) var/turf/Tsec = get_turf(src) new /obj/item/assembly/prox_sensor(Tsec) diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index 3dc8ac88b8..aa5fcfc873 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -168,13 +168,13 @@ . = ..() if(!emagged) if(user) - to_chat(user, "\The [src] buzzes and beeps.") + to_chat(user, span_notice("\The [src] buzzes and beeps.")) emagged = TRUE patrol_speed = 3 target_speed = 4 return TRUE else - to_chat(user, "\The [src] is already corrupt.") + to_chat(user, span_notice("\The [src] is already corrupt.")) /mob/living/bot/secbot/attackby(var/obj/item/O, var/mob/user) var/curhealth = health @@ -328,11 +328,11 @@ spawn(2) busy = FALSE update_icons() - visible_message("\The [H] was prodded by \the [src] with a stun baton!") + visible_message(span_warning("\The [H] was prodded by \the [src] with a stun baton!")) insult(H) else playsound(src, 'sound/weapons/handcuffs.ogg', 30, 1, -2) - visible_message("\The [src] is trying to put handcuffs on \the [H]!") + visible_message(span_warning("\The [src] is trying to put handcuffs on \the [H]!")) busy = TRUE if(do_mob(src, H, 60)) if(!H.handcuffed) @@ -352,7 +352,7 @@ spawn(2) busy = FALSE update_icons() - visible_message("\The [M] was beaten by \the [src] with a stun baton!") + visible_message(span_warning("\The [M] was beaten by \the [src] with a stun baton!")) insult(L) /mob/living/bot/secbot/slime/UnarmedAttack(var/mob/living/L, var/proximity) @@ -363,7 +363,7 @@ S.slimebatoned(src, xeno_stun_strength) /mob/living/bot/secbot/explode() - visible_message("[src] blows apart!") + visible_message(span_warning("[src] blows apart!")) var/turf/Tsec = get_turf(src) var/obj/item/secbot_assembly/Sa = new /obj/item/secbot_assembly(Tsec) diff --git a/code/modules/mob/living/butchering.dm b/code/modules/mob/living/butchering.dm index eb61334151..05e064acbe 100644 --- a/code/modules/mob/living/butchering.dm +++ b/code/modules/mob/living/butchering.dm @@ -86,11 +86,11 @@ if(!ckey) if(issmall(src)) - user?.visible_message("[user] chops up \the [src]!") + user?.visible_message(span_danger("[user] chops up \the [src]!")) new /obj/effect/decal/cleanable/blood/splatter(get_turf(src)) if(gib_on_butchery) qdel(src) else - user?.visible_message("[user] butchers \the [src] messily!") + user?.visible_message(span_danger("[user] butchers \the [src] messily!")) if(gib_on_butchery) gib() diff --git a/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm b/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm index 2a7f93f74f..d50f9a48ac 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm @@ -5,7 +5,7 @@ if(H.a_intent == "grab" && hat && !H.hands_are_full()) hat.loc = get_turf(src) H.put_in_hands(hat) - H.visible_message("\The [H] removes \the [src]'s [hat].") + H.visible_message(span_danger("\The [H] removes \the [src]'s [hat].")) hat = null update_icon() else @@ -14,7 +14,7 @@ /mob/living/carbon/alien/diona/attackby(var/obj/item/W, var/mob/user) if(user.a_intent == "help" && istype(W, /obj/item/clothing/head)) if(hat) - to_chat(user, "\The [src] is already wearing \the [hat].") + to_chat(user, span_warning("\The [src] is already wearing \the [hat].")) return user.unEquip(W) wear_hat(W) diff --git a/code/modules/mob/living/carbon/alien/larva/progression.dm b/code/modules/mob/living/carbon/alien/larva/progression.dm index 6bff3e8a84..e671ac3aac 100644 --- a/code/modules/mob/living/carbon/alien/larva/progression.dm +++ b/code/modules/mob/living/carbon/alien/larva/progression.dm @@ -5,8 +5,8 @@ /mob/living/carbon/alien/larva/confirm_evolution() - to_chat(src, "You are growing into a beautiful alien! It is time to choose a caste.") - to_chat(src, "There are three to choose from:") + to_chat(src, span_notice("You are growing into a beautiful alien! It is time to choose a caste.")) + to_chat(src, span_notice("There are three to choose from:")) to_chat(src, "Hunters are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves.") to_chat(src, "Sentinels are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters.") to_chat(src, "Drones are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded alien queen.") diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index e81fb74f4d..ae4d6c1a50 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -47,15 +47,15 @@ var/obj/item/organ/internal/brain/B = O if(B.health <= 0) - to_chat(user, "That brain is well and truly dead.") + to_chat(user, span_warning("That brain is well and truly dead.")) return else if(!B.brainmob) - to_chat(user, "You aren't sure where this brain came from, but you're pretty sure it's useless.") + to_chat(user, span_warning("You aren't sure where this brain came from, but you're pretty sure it's useless.")) return for(var/modifier_type in B.brainmob.modifiers) //Can't be shoved in an MMI. if(istype(modifier_type, /datum/modifier/no_borg)) - to_chat(user, "\The [src] appears to reject this brain. It is incompatible.") + to_chat(user, span_warning("\The [src] appears to reject this brain. It is incompatible.")) return user.visible_message("\The [user] sticks \a [O] into \the [src].") @@ -86,9 +86,9 @@ if((istype(O,/obj/item/card/id)||istype(O,/obj/item/pda)) && brainmob) if(allowed(user)) locked = !locked - to_chat(user, "You [locked ? "lock" : "unlock"] the brain holder.") + to_chat(user, span_notice("You [locked ? "lock" : "unlock"] the brain holder.")) else - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) return if(brainmob) O.attack(brainmob, user)//Oh noooeeeee @@ -98,11 +98,11 @@ //TODO: ORGAN REMOVAL UPDATE. Make the brain remain in the MMI so it doesn't lose organ data. /obj/item/mmi/attack_self(mob/user as mob) if(!brainmob) - to_chat(user, "You upend the MMI, but there's nothing in it.") + to_chat(user, span_warning("You upend the MMI, but there's nothing in it.")) else if(locked) - to_chat(user, "You upend the MMI, but the brain is clamped into place.") + to_chat(user, span_warning("You upend the MMI, but the brain is clamped into place.")) else - to_chat(user, "You upend the MMI, spilling the brain onto the floor.") + to_chat(user, span_notice("You upend the MMI, spilling the brain onto the floor.")) var/obj/item/organ/internal/brain/brain if (brainobj) //Pull brain organ out of MMI. brainobj.loc = user.loc @@ -203,13 +203,13 @@ switch(src.brainmob.stat) if(CONSCIOUS) if(!src.brainmob.client) - . += "It appears to be in stand-by mode." //afk + . += span_warning("It appears to be in stand-by mode.") //afk if(UNCONSCIOUS) - . += "It doesn't seem to be responsive." + . += span_warning("It doesn't seem to be responsive.") if(DEAD) - . += "It appears to be completely inactive." + . += span_deadsay("It appears to be completely inactive.") else - . += "It appears to be completely inactive." + . += span_deadsay("It appears to be completely inactive.") /obj/item/mmi/digital/emp_act(severity) if(!src.brainmob) @@ -300,7 +300,7 @@ ..() if(brainmob.mind) brainmob.mind.assigned_role = JOB_ROBOTIC_INTELLIGENCE - to_chat(brainmob, "You feel slightly disoriented. That's normal when you're little more than a complex circuit.") + to_chat(brainmob, span_notify("You feel slightly disoriented. That's normal when you're little more than a complex circuit.")) return /obj/item/mmi/digital/posibrain @@ -322,7 +322,7 @@ ..() if(brainmob.mind) brainmob.mind.assigned_role = JOB_POSITRONIC_BRAIN - to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just a metal cube.") + to_chat(brainmob, span_notify("You feel slightly disoriented. That's normal when you're just a metal cube.")) icon_state = "posibrain-occupied" return diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index d10aca34f1..f25f41cc7a 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -65,16 +65,16 @@ record.dead_state = MR_DEAD //Such as if you got scanned but didn't take an implant. It's a little funky, but I mean, you got scanned db.notify(record) //So you probably will want to let someone know if you die. record.last_notification = world.time - to_chat(src, "New notification has been sent.") + to_chat(src, span_notice("New notification has been sent.")) else - to_chat(src, "Your backup is not past-due yet.") + to_chat(src, span_warning("Your backup is not past-due yet.")) else if((world.time - record.last_notification) < 5 MINUTES) - to_chat(src, "Too little time has passed since your last notification.") + to_chat(src, span_warning("Too little time has passed since your last notification.")) else db.notify(record) record.last_notification = world.time - to_chat(src, "New notification has been sent.") + to_chat(src, span_notice("New notification has been sent.")) else - to_chat(src,"No backup record could be found, sorry.") + to_chat(src,span_warning("No backup record could be found, sorry.")) // VS edit ends diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index 6195fe3cac..5ea47dc4a0 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -49,7 +49,7 @@ ..() if(brainmob.mind) brainmob.mind.assigned_role = JOB_POSITRONIC_BRAIN - to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just a metal cube.") + to_chat(brainmob, span_notify("You feel slightly disoriented. That's normal when you're just a metal cube.")) icon_state = "posibrain-occupied" return diff --git a/code/modules/mob/living/carbon/brain/robot.dm b/code/modules/mob/living/carbon/brain/robot.dm index 0ca5d2fcf0..ee235d4a1d 100644 --- a/code/modules/mob/living/carbon/brain/robot.dm +++ b/code/modules/mob/living/carbon/brain/robot.dm @@ -16,7 +16,7 @@ ..() if(brainmob.mind) brainmob.mind.assigned_role = JOB_ROBOTIC_INTELLIGENCE - to_chat(brainmob, "You feel slightly disoriented. That's normal when you're little more than a complex circuit.") + to_chat(brainmob, span_notify("You feel slightly disoriented. That's normal when you're little more than a complex circuit.")) return /obj/item/mmi/digital/robot/attack_self(mob/user as mob) diff --git a/code/modules/mob/living/carbon/brain/say.dm b/code/modules/mob/living/carbon/brain/say.dm index f7a47f74dd..ee246e4dbd 100644 --- a/code/modules/mob/living/carbon/brain/say.dm +++ b/code/modules/mob/living/carbon/brain/say.dm @@ -25,5 +25,5 @@ message_mode = null return R.radio.talk_into(src, message, message_mode, verb, speaking) else - to_chat(src, "Your radio is disabled.") + to_chat(src, span_danger("Your radio is disabled.")) return 0 diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 0969e6137a..c0aa2fb26e 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -49,7 +49,7 @@ if((user in src.stomach_contents) && istype(user)) if(user.last_special <= world.time) user.last_special = world.time + 50 - src.visible_message("You hear something rumbling inside [src]'s stomach...") + src.visible_message(span_danger("You hear something rumbling inside [src]'s stomach...")) var/obj/item/I = user.get_active_hand() if(I && I.force) var/d = rand(round(I.force / 4), I.force) @@ -62,7 +62,7 @@ H.updatehealth() else src.take_organ_damage(d) - user.visible_message("[user] attacks [src]'s stomach wall with the [I.name]!") + user.visible_message(span_danger("[user] attacks [src]'s stomach wall with the [I.name]!")) playsound(user, 'sound/effects/attackblob.ogg', 50, 1) if(prob(src.getBruteLoss() - 50)) @@ -106,21 +106,21 @@ var/weaken_dur = (rand(2,4)-severity)*species.emp_stun_mod //0-3 knockdown, on par with.. you get the idea var/blind_dur = (rand(3,6)-severity)*species.emp_stun_mod //0-5 blind if(species.emp_sensitivity) //receive warning message and basic effects - to_chat(src, "*BZZZT*") + to_chat(src, span_danger("*BZZZT*")) switch(severity) if(1) - to_chat(src, "DANGER: Extreme EM flux detected!") + to_chat(src, span_danger("DANGER: Extreme EM flux detected!")) if(2) - to_chat(src, "Danger: High EM flux detected!") + to_chat(src, span_danger("Danger: High EM flux detected!")) if(3) - to_chat(src, "Warning: Moderate EM flux detected!") + to_chat(src, span_danger("Warning: Moderate EM flux detected!")) if(4) - to_chat(src, "Warning: Minor EM flux detected!") + to_chat(src, span_danger("Warning: Minor EM flux detected!")) if(prob(90-(10*severity))) //50-80% chance to fire an emote. most are harmless, but vomit might reduce your nutrition level which could suck (so the whole thing is padded out with extras) src.emote(pick("twitch", "twitch_v", "choke", "pale", "blink", "blink_r", "shiver", "sneeze", "vomit", "gasp", "cough", "drool")) //stun effects block, effects vary wildly if(species.emp_sensitivity & EMP_PAIN) - to_chat(src, "A wave of intense pain washes over you.") + to_chat(src, span_danger("A wave of intense pain washes over you.")) src.adjustHalLoss(agony_str) if(species.emp_sensitivity & EMP_BLIND) if(blind_dur >= 1) //don't flash them unless they actually roll a positive blind duration @@ -131,11 +131,11 @@ src.ear_deaf = max(src.ear_deaf,deafen_dur) if(species.emp_sensitivity & EMP_CONFUSE) if(confuse_dur >= 1) - to_chat(src, "Oh god, everything's spinning!") + to_chat(src, span_danger("Oh god, everything's spinning!")) Confuse(max(0,confuse_dur)) if(species.emp_sensitivity & EMP_WEAKEN) if(weaken_dur >= 1) - to_chat(src, "Your limbs go slack!") + to_chat(src, span_danger("Your limbs go slack!")) Weaken(max(0,weaken_dur)) //physical damage block, deals (minor-4) 5-15, 10-20, 15-25, 20-30 (extreme-1) of *each* type if(species.emp_sensitivity & EMP_BRUTE_DMG) @@ -165,15 +165,15 @@ playsound(src, "sparks", 50, 1, -1) if (shock_damage > 15) src.visible_message( - "[src] was electrocuted[source ? " by the [source]" : ""]!", \ - "You feel a powerful shock course through your body!", \ - "You hear a heavy electrical crack." \ + span_warning("[src] was electrocuted[source ? " by the [source]" : ""]!"), \ + span_danger("You feel a powerful shock course through your body!"), \ + span_warning("You hear a heavy electrical crack.") \ ) else src.visible_message( - "[src] was shocked[source ? " by the [source]" : ""].", \ - "You feel a shock course through your body.", \ - "You hear a zapping sound." \ + span_warning("[src] was shocked[source ? " by the [source]" : ""]."), \ + span_warning("You feel a shock course through your body."), \ + span_warning("You hear a zapping sound.") \ ) if(stun) @@ -199,8 +199,8 @@ var/mob/living/carbon/human/H = src var/datum/gender/T = gender_datums[H.get_visible_gender()] src.visible_message( \ - "[src] examines [T.himself].", \ - "You check yourself for injuries." \ + span_notice("[src] examines [T.himself]."), \ + span_notice("You check yourself for injuries.") \ ) for(var/obj/item/organ/external/org in H.organs) @@ -252,24 +252,24 @@ else if (on_fire) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if (M.on_fire) - M.visible_message("[M] tries to pat out [src]'s flames, but to no avail!", - "You try to pat out [src]'s flames, but to no avail! Put yourself out first!") + M.visible_message(span_warning("[M] tries to pat out [src]'s flames, but to no avail!"), + span_warning("You try to pat out [src]'s flames, but to no avail! Put yourself out first!")) else - M.visible_message("[M] tries to pat out [src]'s flames!", - "You try to pat out [src]'s flames! Hot!") + M.visible_message(span_warning("[M] tries to pat out [src]'s flames!"), + span_warning("You try to pat out [src]'s flames! Hot!")) if(do_mob(M, src, 15)) src.adjust_fire_stacks(-0.5) if (prob(10) && (M.fire_stacks <= 0)) M.adjust_fire_stacks(1) M.IgniteMob() if (M.on_fire) - M.visible_message("The fire spreads from [src] to [M]!", - "The fire spreads to you as well!") + M.visible_message(span_danger("The fire spreads from [src] to [M]!"), + span_danger("The fire spreads to you as well!")) else src.adjust_fire_stacks(-0.5) //Less effective than stop, drop, and roll - also accounting for the fact that it takes half as long. if (src.fire_stacks <= 0) - M.visible_message("[M] successfully pats out [src]'s flames.", - "You successfully pat out [src]'s flames.") + M.visible_message(span_warning("[M] successfully pats out [src]'s flames."), + span_warning("You successfully pat out [src]'s flames.")) src.ExtinguishMob() src.fire_stacks = 0 else @@ -282,21 +282,21 @@ var/datum/gender/T = gender_datums[H.get_visible_gender()] // make sure to cast to human before using get_gender() or get_visible_gender()! if(istype(H)) show_ssd = H.species.show_ssd if(show_ssd && !client && !teleop) - M.visible_message("[M] shakes [src] trying to wake [T.him] up!", \ - "You shake [src], but [T.he] [T.does] not respond... Maybe [T.he] [T.has] S.S.D?") + M.visible_message(span_notice("[M] shakes [src] trying to wake [T.him] up!"), \ + span_notice("You shake [src], but [T.he] [T.does] not respond... Maybe [T.he] [T.has] S.S.D?")) else if(lying || src.sleeping) AdjustSleeping(-5) if(src.sleeping == 0) src.resting = 0 if(H) H.in_stasis = 0 //VOREStation Add - Just In Case - M.visible_message("[M] shakes [src] trying to wake [T.him] up!", \ - "You shake [src] trying to wake [T.him] up!") + M.visible_message(span_notice("[M] shakes [src] trying to wake [T.him] up!"), \ + span_notice("You shake [src] trying to wake [T.him] up!")) else var/mob/living/carbon/human/hugger = M var/datum/gender/TM = gender_datums[M.get_visible_gender()] if(M.resting == 1) //Are they resting on the ground? - M.visible_message("[M] grabs onto [src] and pulls [TM.himself] up", \ - "You grip onto [src] and pull yourself up off the ground!") + M.visible_message(span_notice("[M] grabs onto [src] and pulls [TM.himself] up"), \ + span_notice("You grip onto [src] and pull yourself up off the ground!")) if(M.fire_stacks >= (src.fire_stacks + 3)) //Fire checks. src.adjust_fire_stacks(1) M.adjust_fire_stacks(-1) @@ -307,8 +307,8 @@ else if(istype(hugger)) hugger.species.hug(hugger,src) else - M.visible_message("[M] hugs [src] to make [T.him] feel better!", \ - "You hug [src] to make [T.him] feel better!") + M.visible_message(span_notice("[M] hugs [src] to make [T.him] feel better!"), \ + span_notice("You hug [src] to make [T.him] feel better!")) if(M.fire_stacks >= (src.fire_stacks + 3)) src.adjust_fire_stacks(1) M.adjust_fire_stacks(-1) @@ -407,7 +407,7 @@ if(buckled) return 0 stop_pulling() - to_chat(src, "You slipped on [slipped_on]!") + to_chat(src, span_warning("You slipped on [slipped_on]!")) playsound(src, 'sound/misc/slip.ogg', 50, 1, -3) Weaken(FLOOR(stun_duration/2, 1)) return 1 diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 0684acad70..921ff6996c 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -58,7 +58,7 @@ if(!W.edge || !W.force || W.damtype != BRUTE) return 0 //unsuitable weapon - user.visible_message("\The [user] begins to slit [src]'s throat with \the [W]!") + user.visible_message(span_danger("\The [user] begins to slit [src]'s throat with \the [W]!")) user.next_move = world.time + 20 //also should prevent user from triggering this repeatedly if(!do_after(user, 20)) @@ -87,9 +87,9 @@ if(total_damage) if(oxyloss >= 40) - user.visible_message("\The [user] slit [src]'s throat open with \the [W]!") + user.visible_message(span_danger("\The [user] slit [src]'s throat open with \the [W]!")) else - user.visible_message("\The [user] cut [src]'s neck with \the [W]!") + user.visible_message(span_danger("\The [user] cut [src]'s neck with \the [W]!")) if(W.hitsound) playsound(src, W.hitsound, 50, 1, -1) @@ -106,7 +106,7 @@ if(!W.sharp || !W.force || W.damtype != BRUTE) return 0 //unsuitable weapon - user.visible_message("\The [user] plunges \the [W] into \the [src]!") + user.visible_message(span_danger("\The [user] plunges \the [W] into \the [src]!")) var/damage = shank_armor_helper(W, G, user) apply_damage(damage, W.damtype, "torso", 0, sharp=W.sharp, edge=W.edge) @@ -152,4 +152,4 @@ damage = damage * damage_mod - return damage \ No newline at end of file + return damage diff --git a/code/modules/mob/living/carbon/carbon_powers.dm b/code/modules/mob/living/carbon/carbon_powers.dm index e6e7e06e5c..04b85db770 100644 --- a/code/modules/mob/living/carbon/carbon_powers.dm +++ b/code/modules/mob/living/carbon/carbon_powers.dm @@ -8,7 +8,7 @@ var/mob/living/simple_mob/animal/borer/B = has_brain_worms() if(B && B.host_brain) - to_chat(src, "You withdraw your probosci, releasing control of [B.host_brain]") + to_chat(src, span_danger("You withdraw your probosci, releasing control of [B.host_brain]")) B.detatch() @@ -17,7 +17,7 @@ verbs -= /mob/living/carbon/proc/spawn_larvae else - to_chat(src, "ERROR NO BORER OR BRAINMOB DETECTED IN THIS MOB, THIS IS A BUG !") + to_chat(src, span_danger("ERROR NO BORER OR BRAINMOB DETECTED IN THIS MOB, THIS IS A BUG !")) //Brain slug proc for tormenting the host. /mob/living/carbon/proc/punish_host() @@ -31,12 +31,12 @@ return if(B.host_brain.ckey) - to_chat(src, "You send a punishing spike of psychic agony lancing into your host's brain.") + to_chat(src, span_danger("You send a punishing spike of psychic agony lancing into your host's brain.")) if (!can_feel_pain()) - to_chat(B.host_brain, "You feel a strange sensation as a foreign influence prods your mind.") - to_chat(src, "It doesn't seem to be as effective as you hoped.") + to_chat(B.host_brain, span_warning("You feel a strange sensation as a foreign influence prods your mind.")) + to_chat(src, span_danger("It doesn't seem to be as effective as you hoped.")) else - to_chat(B.host_brain, "Horrific, burning agony lances through you, ripping a soundless scream from your trapped mind!") + to_chat(B.host_brain, span_danger("Horrific, burning agony lances through you, ripping a soundless scream from your trapped mind!")) /mob/living/carbon/proc/spawn_larvae() set category = "Abilities" @@ -49,8 +49,8 @@ return if(B.chemicals >= 100) - to_chat(src, "Your host twitches and quivers as you rapidly excrete a larva from your sluglike body.") - visible_message("\The [src] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!") + to_chat(src, span_danger("Your host twitches and quivers as you rapidly excrete a larva from your sluglike body.")) + visible_message(span_danger("\The [src] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!")) B.chemicals -= 100 B.has_reproduced = 1 @@ -58,5 +58,5 @@ new /mob/living/simple_mob/animal/borer(get_turf(src)) else - to_chat(src, "You do not have enough chemicals stored to reproduce.") - return \ No newline at end of file + to_chat(src, span_warning("You do not have enough chemicals stored to reproduce.")) + return diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 095d3815d4..038b5f6cf8 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -85,7 +85,7 @@ // SSgame_master.adjust_danger(gibbed ? 40 : 20) // VOREStation Edit - We don't use SSgame_master yet. for(var/mob/observer/dead/O in mob_list) if(O.client?.prefs?.read_preference(/datum/preference/toggle/show_dsay)) - to_chat(O, "[src] has died in [get_area(src)]. [ghost_follow_link(src, O)] ") + to_chat(O, span_deadsay("[src] has died in [get_area(src)]. [ghost_follow_link(src, O)] ")) if(!gibbed && species.death_sound) playsound(src, species.death_sound, 80, 1, 1) @@ -95,7 +95,7 @@ ticker.mode.check_win() if(wearing_rig) - wearing_rig.notify_ai("Warning: user death event. Mobility control passed to integrated intelligence system.") + wearing_rig.notify_ai(span_danger("Warning: user death event. Mobility control passed to integrated intelligence system.")) // If the body is in VR, move the mind back to the real world if(vr_holder) @@ -109,7 +109,7 @@ vr_link.exit_vr() vr_link.vr_holder = null vr_link = null - to_chat(src, "Everything abruptly stops.") + to_chat(src, span_danger("Everything abruptly stops.")) return ..(gibbed,species.get_death_message(src)) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 76bb592abc..9bd963c817 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -381,7 +381,7 @@ var/list/_simple_mob_default_emotes = list( /mob/living/carbon/human/proc/toggle_tail(var/setting,var/message = 0) if(!tail_style || !tail_style.ani_state) if(message) - to_chat(src, "You don't have a tail that supports this.") + to_chat(src, span_warning("You don't have a tail that supports this.")) return 0 var/new_wagging = isnull(setting) ? !wagging : setting @@ -393,7 +393,7 @@ var/list/_simple_mob_default_emotes = list( /mob/living/carbon/human/proc/toggle_wing(var/setting,var/message = 0) if(!wing_style || !wing_style.ani_state) if(message) - to_chat(src, "You don't have a wingtype that supports this.") + to_chat(src, span_warning("You don't have a wingtype that supports this.")) return 0 var/new_flapping = isnull(setting) ? !flapping : setting diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 7c2a2b520d..7339a35cdd 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -4,7 +4,7 @@ set category = "IC" resizable = !resizable - to_chat(src, "You are now [resizable ? "susceptible" : "immune"] to being resized.") + to_chat(src, span_notice("You are now [resizable ? "susceptible" : "immune"] to being resized.")) /mob/living/carbon/human/proc/handle_flip_vr() @@ -60,19 +60,19 @@ message = "reveals their wings!" else message = "hides their wings." - visible_message("[src] [message]") + visible_message(span_filter_notice("[src] [message]")) /mob/living/carbon/human/verb/hide_tail_vr() set name = "Show/Hide tail" set category = "IC" set desc = "Hide your tail, or show it if you already hid it." if(!tail_style) //Just some checks. - to_chat(src,"You have no tail to hide!") + to_chat(src,span_notice("You have no tail to hide!")) return else //They got a tail. Let's make sure it ain't hiding stuff! var/datum/sprite_accessory/tail/current_tail = tail_style if((current_tail.hide_body_parts && current_tail.hide_body_parts.len) || current_tail.clip_mask_state || current_tail.clip_mask) - to_chat(src,"Your current tail is too considerable to hide!") + to_chat(src,span_notice("Your current tail is too considerable to hide!")) return if(species.tail) //If they're using this verb, they already have a custom tail. This prevents their species tail from showing. species.tail = null //Honestly, this should probably be done when a custom tail is chosen, but this is the only time it'd ever matter. @@ -83,4 +83,4 @@ message = "reveals their tail!" else message = "hides their tail." - visible_message("[src] [message]") \ No newline at end of file + visible_message(span_filter_notice("[src] [message]")) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 9dee978e7b..7ca315f240 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -125,14 +125,14 @@ tie_msg += " [lowertext(english_list(accessory_descs))]." if(w_uniform.blood_DNA) - msg += "[T.He] [T.is] wearing [icon2html(w_uniform,user.client)] [w_uniform.gender==PLURAL?"some":"a"] [(w_uniform.blood_color != "#030303") ? "blood" : "oil"]-stained [w_uniform.name]![tie_msg]" + msg += span_warning("[T.He] [T.is] wearing [icon2html(w_uniform,user.client)] [w_uniform.gender==PLURAL?"some":"a"] [(w_uniform.blood_color != "#030303") ? "blood" : "oil"]-stained [w_uniform.name]![tie_msg]") else msg += "[T.He] [T.is] wearing [icon2html(w_uniform,user.client)] \a [w_uniform].[tie_msg]" //head if(head && !(skip_gear & EXAMINE_SKIPHELMET) && head.show_examine) if(head.blood_DNA) - msg += "[T.He] [T.is] wearing [icon2html(head,user.client)] [head.gender==PLURAL?"some":"a"] [(head.blood_color != "#030303") ? "blood" : "oil"]-stained [head.name] on [T.his] head!" + msg += span_warning("[T.He] [T.is] wearing [icon2html(head,user.client)] [head.gender==PLURAL?"some":"a"] [(head.blood_color != "#030303") ? "blood" : "oil"]-stained [head.name] on [T.his] head!") else msg += "[T.He] [T.is] wearing [icon2html(head,user.client)] \a [head] on [T.his] head." @@ -151,73 +151,73 @@ tie_msg += " [lowertext(english_list(accessory_descs))]." if(wear_suit.blood_DNA) - msg += "[T.He] [T.is] wearing [icon2html(wear_suit,user.client)] [wear_suit.gender==PLURAL?"some":"a"] [(wear_suit.blood_color != "#030303") ? "blood" : "oil"]-stained [wear_suit.name]![tie_msg]" + msg += span_warning("[T.He] [T.is] wearing [icon2html(wear_suit,user.client)] [wear_suit.gender==PLURAL?"some":"a"] [(wear_suit.blood_color != "#030303") ? "blood" : "oil"]-stained [wear_suit.name]![tie_msg]") else msg += "[T.He] [T.is] wearing [icon2html(wear_suit,user.client)] \a [wear_suit].[tie_msg]" //suit/armour storage if(s_store && !(skip_gear & EXAMINE_SKIPSUITSTORAGE) && s_store.show_examine) if(s_store.blood_DNA) - msg += "[T.He] [T.is] carrying [icon2html(s_store,user.client)] [s_store.gender==PLURAL?"some":"a"] [(s_store.blood_color != "#030303") ? "blood" : "oil"]-stained [s_store.name] on [T.his] [wear_suit.name]!" + msg += span_warning("[T.He] [T.is] carrying [icon2html(s_store,user.client)] [s_store.gender==PLURAL?"some":"a"] [(s_store.blood_color != "#030303") ? "blood" : "oil"]-stained [s_store.name] on [T.his] [wear_suit.name]!") else msg += "[T.He] [T.is] carrying [icon2html(s_store,user.client)] \a [s_store] on [T.his] [wear_suit.name]." //back if(back && !(skip_gear & EXAMINE_SKIPBACKPACK) && back.show_examine) if(back.blood_DNA) - msg += "[T.He] [T.has] [icon2html(back,user.client)] [back.gender==PLURAL?"some":"a"] [(back.blood_color != "#030303") ? "blood" : "oil"]-stained [back] on [T.his] back." + msg += span_warning("[T.He] [T.has] [icon2html(back,user.client)] [back.gender==PLURAL?"some":"a"] [(back.blood_color != "#030303") ? "blood" : "oil"]-stained [back] on [T.his] back.") else msg += "[T.He] [T.has] [icon2html(back,user.client)] \a [back] on [T.his] back." //left hand if(l_hand && l_hand.show_examine) if(l_hand.blood_DNA) - msg += "[T.He] [T.is] holding [icon2html(l_hand,user.client)] [l_hand.gender==PLURAL?"some":"a"] [(l_hand.blood_color != "#030303") ? "blood" : "oil"]-stained [l_hand.name] in [T.his] left hand!" + msg += span_warning("[T.He] [T.is] holding [icon2html(l_hand,user.client)] [l_hand.gender==PLURAL?"some":"a"] [(l_hand.blood_color != "#030303") ? "blood" : "oil"]-stained [l_hand.name] in [T.his] left hand!") else msg += "[T.He] [T.is] holding [icon2html(l_hand,user.client)] \a [l_hand] in [T.his] left hand." //right hand if(r_hand && r_hand.show_examine) if(r_hand.blood_DNA) - msg += "[T.He] [T.is] holding [icon2html(r_hand,user.client)] [r_hand.gender==PLURAL?"some":"a"] [(r_hand.blood_color != "#030303") ? "blood" : "oil"]-stained [r_hand.name] in [T.his] right hand!" + msg += span_warning("[T.He] [T.is] holding [icon2html(r_hand,user.client)] [r_hand.gender==PLURAL?"some":"a"] [(r_hand.blood_color != "#030303") ? "blood" : "oil"]-stained [r_hand.name] in [T.his] right hand!") else msg += "[T.He] [T.is] holding [icon2html(r_hand,user.client)] \a [r_hand] in [T.his] right hand." //gloves if(gloves && !(skip_gear & EXAMINE_SKIPGLOVES) && gloves.show_examine) if(gloves.blood_DNA) - msg += "[T.He] [T.has] [icon2html(gloves,user.client)] [gloves.gender==PLURAL?"some":"a"] [(gloves.blood_color != "#030303") ? "blood" : "oil"]-stained [gloves.name] on [T.his] hands!" + msg += span_warning("[T.He] [T.has] [icon2html(gloves,user.client)] [gloves.gender==PLURAL?"some":"a"] [(gloves.blood_color != "#030303") ? "blood" : "oil"]-stained [gloves.name] on [T.his] hands!") else msg += "[T.He] [T.has] [icon2html(gloves,user.client)] \a [gloves] on [T.his] hands." else if(blood_DNA && !(skip_body & EXAMINE_SKIPHANDS)) - msg += "[T.He] [T.has] [(hand_blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained hands!" + msg += span_warning("[T.He] [T.has] [(hand_blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained hands!") //handcuffed? if(handcuffed && handcuffed.show_examine) if(istype(handcuffed, /obj/item/handcuffs/cable)) - msg += "[T.He] [T.is] [icon2html(handcuffed,user.client)] restrained with cable!" + msg += span_warning("[T.He] [T.is] [icon2html(handcuffed,user.client)] restrained with cable!") else - msg += "[T.He] [T.is] [icon2html(handcuffed,user.client)] handcuffed!" + msg += span_warning("[T.He] [T.is] [icon2html(handcuffed,user.client)] handcuffed!") //buckled if(buckled) - msg += "[T.He] [T.is] [icon2html(buckled,user.client)] buckled to [buckled]!" + msg += span_warning("[T.He] [T.is] [icon2html(buckled,user.client)] buckled to [buckled]!") //belt if(belt && !(skip_gear & EXAMINE_SKIPBELT) && belt.show_examine) if(belt.blood_DNA) - msg += "[T.He] [T.has] [icon2html(belt,user.client)] [belt.gender==PLURAL?"some":"a"] [(belt.blood_color != "#030303") ? "blood" : "oil"]-stained [belt.name] about [T.his] waist!" + msg += span_warning("[T.He] [T.has] [icon2html(belt,user.client)] [belt.gender==PLURAL?"some":"a"] [(belt.blood_color != "#030303") ? "blood" : "oil"]-stained [belt.name] about [T.his] waist!") else msg += "[T.He] [T.has] [icon2html(belt,user.client)] \a [belt] about [T.his] waist." //shoes if(shoes && !(skip_gear & EXAMINE_SKIPSHOES) && shoes.show_examine) if(shoes.blood_DNA) - msg += "[T.He] [T.is] wearing [icon2html(shoes,user.client)] [shoes.gender==PLURAL?"some":"a"] [(shoes.blood_color != "#030303") ? "blood" : "oil"]-stained [shoes.name] on [T.his] feet!" + msg += span_warning("[T.He] [T.is] wearing [icon2html(shoes,user.client)] [shoes.gender==PLURAL?"some":"a"] [(shoes.blood_color != "#030303") ? "blood" : "oil"]-stained [shoes.name] on [T.his] feet!") else msg += "[T.He] [T.is] wearing [icon2html(shoes,user.client)] \a [shoes] on [T.his] feet." else if(feet_blood_DNA && !(skip_body & EXAMINE_SKIPHANDS)) - msg += "[T.He] [T.has] [(feet_blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained feet!" + msg += span_warning("[T.He] [T.has] [(feet_blood_color != SYNTH_BLOOD_COLOUR) ? "blood" : "oil"]-stained feet!") //mask if(wear_mask && !(skip_gear & EXAMINE_SKIPMASK) && wear_mask.show_examine) @@ -226,14 +226,14 @@ descriptor = "in [T.his] mouth" if(wear_mask.blood_DNA) - msg += "[T.He] [T.has] [icon2html(wear_mask,user.client)] [wear_mask.gender==PLURAL?"some":"a"] [(wear_mask.blood_color != "#030303") ? "blood" : "oil"]-stained [wear_mask.name] [descriptor]!" + msg += span_warning("[T.He] [T.has] [icon2html(wear_mask,user.client)] [wear_mask.gender==PLURAL?"some":"a"] [(wear_mask.blood_color != "#030303") ? "blood" : "oil"]-stained [wear_mask.name] [descriptor]!") else msg += "[T.He] [T.has] [icon2html(wear_mask,user.client)] \a [wear_mask] [descriptor]." //eyes if(glasses && !(skip_gear & EXAMINE_SKIPEYEWEAR) && glasses.show_examine) if(glasses.blood_DNA) - msg += "[T.He] [T.has] [icon2html(glasses,user.client)] [glasses.gender==PLURAL?"some":"a"] [(glasses.blood_color != "#030303") ? "blood" : "oil"]-stained [glasses] covering [T.his] eyes!" + msg += span_warning("[T.He] [T.has] [icon2html(glasses,user.client)] [glasses.gender==PLURAL?"some":"a"] [(glasses.blood_color != "#030303") ? "blood" : "oil"]-stained [glasses] covering [T.his] eyes!") else msg += "[T.He] [T.has] [icon2html(glasses,user.client)] \a [glasses] covering [T.his] eyes." @@ -252,20 +252,20 @@ //Jitters if(is_jittery) if(jitteriness >= 300) - msg += "[T.He] [T.is] convulsing violently!" + msg += span_warning("[T.He] [T.is] convulsing violently!") else if(jitteriness >= 200) - msg += "[T.He] [T.is] extremely jittery." + msg += span_warning("[T.He] [T.is] extremely jittery.") else if(jitteriness >= 100) - msg += "[T.He] [T.is] twitching ever so slightly." + msg += span_warning("[T.He] [T.is] twitching ever so slightly.") //splints for(var/organ in BP_ALL) var/obj/item/organ/external/o = get_organ(organ) if(o && o.splinted && o.splinted.loc == o) - msg += "[T.He] [T.has] \a [o.splinted] on [T.his] [o.name]!" + msg += span_warning("[T.He] [T.has] \a [o.splinted] on [T.his] [o.name]!") if(suiciding) - msg += "[T.He] appears to have commited suicide... there is no hope of recovery." + msg += span_warning("[T.He] appears to have commited suicide... there is no hope of recovery.") //VOREStation Add var/list/vorestrings = list() @@ -286,29 +286,29 @@ msg += "[T.He] [T.is] very short!" if (src.stat) - msg += "[T.He] [T.is]n't responding to anything around [T.him] and seems to be asleep." + msg += span_warning("[T.He] [T.is]n't responding to anything around [T.him] and seems to be asleep.") if((stat == 2 || src.losebreath) && get_dist(user, src) <= 3) - msg += "[T.He] [T.does] not appear to be breathing." + msg += span_warning("[T.He] [T.does] not appear to be breathing.") if(istype(user, /mob/living/carbon/human) && !user.stat && Adjacent(user)) user.visible_message("[usr] checks [src]'s pulse.", "You check [src]'s pulse.") spawn(15) if(isobserver(user) || (Adjacent(user) && !user.stat)) // If you're a corpse then you can't exactly check their pulse, but ghosts can see anything if(pulse == PULSE_NONE) - to_chat(user, "[T.He] [T.has] no pulse[src.client ? "" : " and [T.his] soul has departed"]...") + to_chat(user, span_deadsay("[T.He] [T.has] no pulse[src.client ? "" : " and [T.his] soul has departed"]...")) else - to_chat(user, "[T.He] [T.has] a pulse!") + to_chat(user, span_deadsay("[T.He] [T.has] a pulse!")) if(fire_stacks) msg += "[T.He] [T.is] covered in some liquid." if(on_fire) - msg += "[T.He] [T.is] on fire!." + msg += span_warning("[T.He] [T.is] on fire!.") var/ssd_msg = species.get_ssd(src) if(ssd_msg && (!should_have_organ("brain") || has_brain()) && stat != DEAD) if(!key) - msg += "[T.He] [T.is] [ssd_msg]. It doesn't look like [T.he] [T.is] waking up anytime soon." + msg += span_deadsay("[T.He] [T.is] [ssd_msg]. It doesn't look like [T.he] [T.is] waking up anytime soon.") else if(!client) - msg += "[T.He] [T.is] [ssd_msg]." + msg += span_deadsay("[T.He] [T.is] [ssd_msg].") //VOREStation Add Start if(client && away_from_keyboard && manual_afk) msg += "\[Away From Keyboard for [round((client.inactivity/10)/60)] minutes\]" @@ -329,9 +329,9 @@ var/obj/item/organ/external/E = organs_by_name[organ_tag] if(!E) - wound_flavor_text["[organ_descriptor]"] = "[T.He] [T.is] missing [T.his] [organ_descriptor]." + wound_flavor_text["[organ_descriptor]"] = span_warning("[T.He] [T.is] missing [T.his] [organ_descriptor].") else if(E.is_stump()) - wound_flavor_text["[organ_descriptor]"] = "[T.He] [T.has] a stump where [T.his] [organ_descriptor] should be." + wound_flavor_text["[organ_descriptor]"] = span_warning("[T.He] [T.has] a stump where [T.his] [organ_descriptor] should be.") else continue @@ -340,38 +340,38 @@ if((temp.organ_tag in hidden) && hidden[temp.organ_tag]) continue //Organ is hidden, don't talk about it if(temp.status & ORGAN_DESTROYED) - wound_flavor_text["[temp.name]"] = "[T.He] [T.is] missing [T.his] [temp.name]." + wound_flavor_text["[temp.name]"] = span_warning("[T.He] [T.is] missing [T.his] [temp.name].") continue if(!looks_synth && temp.robotic == ORGAN_ROBOT) if(!(temp.brute_dam + temp.burn_dam)) wound_flavor_text["[temp.name]"] = "[T.He] [T.has] a [temp.name]." else - wound_flavor_text["[temp.name]"] = "[T.He] [T.has] a [temp.name] with [temp.get_wounds_desc()]!" + wound_flavor_text["[temp.name]"] = span_warning("[T.He] [T.has] a [temp.name] with [temp.get_wounds_desc()]!") continue else if(temp.wounds.len > 0 || temp.open) if(temp.is_stump() && temp.parent_organ && organs_by_name[temp.parent_organ]) var/obj/item/organ/external/parent = organs_by_name[temp.parent_organ] - wound_flavor_text["[temp.name]"] = "[T.He] [T.has] [temp.get_wounds_desc()] on [T.his] [parent.name]." + wound_flavor_text["[temp.name]"] = span_warning("[T.He] [T.has] [temp.get_wounds_desc()] on [T.his] [parent.name].") else - wound_flavor_text["[temp.name]"] = "[T.He] [T.has] [temp.get_wounds_desc()] on [T.his] [temp.name]." + wound_flavor_text["[temp.name]"] = span_warning("[T.He] [T.has] [temp.get_wounds_desc()] on [T.his] [temp.name].") else wound_flavor_text["[temp.name]"] = "" if(temp.dislocated == 1) //VOREStation Edit Bugfix - wound_flavor_text["[temp.name]"] += "[T.His] [temp.joint] is dislocated!" + wound_flavor_text["[temp.name]"] += span_warning("[T.His] [temp.joint] is dislocated!") if(temp.brute_dam > temp.min_broken_damage || (temp.status & (ORGAN_BROKEN | ORGAN_MUTATED))) - wound_flavor_text["[temp.name]"] += "[T.His] [temp.name] is dented and swollen!" + wound_flavor_text["[temp.name]"] += span_warning("[T.His] [temp.name] is dented and swollen!") if(temp.germ_level > INFECTION_LEVEL_TWO && !(temp.status & ORGAN_DEAD)) - wound_flavor_text["[temp.name]"] += "[T.His] [temp.name] looks very infected!" + wound_flavor_text["[temp.name]"] += span_warning("[T.His] [temp.name] looks very infected!") else if(temp.status & ORGAN_DEAD) - wound_flavor_text["[temp.name]"] += "[T.His] [temp.name] looks rotten!" + wound_flavor_text["[temp.name]"] += span_warning("[T.His] [temp.name] looks rotten!") if(temp.status & ORGAN_BLEEDING) - is_bleeding["[temp.name]"] += "[T.His] [temp.name] is bleeding!" + is_bleeding["[temp.name]"] += span_danger("[T.His] [temp.name] is bleeding!") if(temp.applied_pressure == src) - applying_pressure = "[T.He] is applying pressure to [T.his] [temp.name]." + applying_pressure = span_info("[T.He] is applying pressure to [T.his] [temp.name].") for(var/limb in wound_flavor_text) var/flavor = wound_flavor_text[limb] @@ -382,7 +382,7 @@ if(blood) msg += blood for(var/implant in get_visible_implants(0)) - msg += "[src] [T.has] \a [implant] sticking out of [T.his] flesh!" + msg += span_danger("[src] [T.has] \a [implant] sticking out of [T.his] flesh!") if(digitalcamo) msg += "[T.He] [T.is] repulsively uncanny!" @@ -446,7 +446,7 @@ var/show_descs = show_descriptors_to(user) if(show_descs) - msg += "[jointext(show_descs, "
    ")]    " + msg += span_notice("[jointext(show_descs, "
    ")]") if(pose) if(!findtext(pose, regex("\[.?!]$"))) // Will be zero if the last character is not a member of [.?!] diff --git a/code/modules/mob/living/carbon/human/examine_vr.dm b/code/modules/mob/living/carbon/human/examine_vr.dm index e1d52728f9..5ba8e1db19 100644 --- a/code/modules/mob/living/carbon/human/examine_vr.dm +++ b/code/modules/mob/living/carbon/human/examine_vr.dm @@ -25,7 +25,7 @@ else message = weight_messages[10] if(message) - message = "[message]" + message = span_notice("[message]") return message //Credit to Aronai for helping me actually get this working! /mob/living/carbon/human/proc/examine_nutrition() @@ -55,7 +55,7 @@ if(5125 to INFINITY) // More. message = nutrition_messages[10] if(message) - message = "[message]" + message = span_notice("[message]") return message //For OmniHUD records access for appropriate models @@ -98,7 +98,7 @@ /mob/living/carbon/human/proc/examine_nif(mob/living/carbon/human/H) if(nif && nif.examine_msg) //If you have one set, anyway. - return "[nif.examine_msg]" + return span_notice("[nif.examine_msg]") /mob/living/carbon/human/proc/examine_chimera(mob/living/carbon/human/H) var/t_He = "It" //capitalised for use at the start of each line. @@ -131,8 +131,8 @@ t_his = "hir" if(revive_ready == REVIVING_NOW || revive_ready == REVIVING_DONE) if(stat == DEAD) - return "[t_His] body is twitching subtly." + return span_warning("[t_His] body is twitching subtly.") else - return "[t_He] [t_appear] to be in some sort of torpor." + return span_notice("[t_He] [t_appear] to be in some sort of torpor.") if(feral) - return "[t_He] [t_has] a crazed, wild look in [t_his] eyes!" + return span_warning("[t_He] [t_has] a crazed, wild look in [t_his] eyes!") diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 2fe4527870..ec5b81e1b8 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -392,7 +392,7 @@ U.handle_regular_hud_updates() if(!modified) - to_chat(usr, "[span_red("Unable to locate a data core entry for this person.")]") + to_chat(usr, span_filter_notice("[span_red("Unable to locate a data core entry for this person.")]")) if (href_list["secrecord"]) if(hasHUD(usr,"security")) @@ -418,11 +418,11 @@ security_hud_text += "Details: [R.fields["ma_crim_d"]]" security_hud_text += "Notes: [R.fields["notes"]]" security_hud_text += "\[View Comment Log\]" - to_chat(usr, "[jointext(security_hud_text, "
    ")]    ") + to_chat(usr, span_filter_notice("[jointext(security_hud_text, "
    ")]")) read = 1 if(!read) - to_chat(usr, "[span_red("Unable to locate a data core entry for this person.")]") + to_chat(usr, span_filter_notice("[span_red("Unable to locate a data core entry for this person.")]")) if (href_list["secrecordComment"]) if(hasHUD(usr,"security")) @@ -445,11 +445,11 @@ to_chat(usr, "[R.fields[text("com_[]", counter)]]") counter++ if (counter == 1) - to_chat(usr, "No comment found.") - to_chat(usr, "\[Add comment\]") + to_chat(usr, span_filter_notice("No comment found.")) + to_chat(usr, span_filter_notice("\[Add comment\]")) if(!read) - to_chat(usr, "[span_red("Unable to locate a data core entry for this person.")]") + to_chat(usr, span_filter_notice("[span_red("Unable to locate a data core entry for this person.")]")) if (href_list["secrecordadd"]) if(hasHUD(usr,"security")) @@ -511,7 +511,7 @@ U.handle_regular_hud_updates() if(!modified) - to_chat(usr, "[span_red("Unable to locate a data core entry for this person.")]") + to_chat(usr, span_filter_notice("[span_red("Unable to locate a data core entry for this person.")]")) if (href_list["medrecord"]) if(hasHUD(usr,"medical")) @@ -538,11 +538,11 @@ medical_hud_text += "Details: [R.fields["ma_dis_d"]]" medical_hud_text += "Notes: [R.fields["notes"]]" medical_hud_text += "\[View Comment Log\]" - to_chat(usr, "[jointext(medical_hud_text, "
    ")]    ") + to_chat(usr, span_filter_notice("[jointext(medical_hud_text, "
    ")]")) read = 1 if(!read) - to_chat(usr, "[span_red("Unable to locate a data core entry for this person.")]") + to_chat(usr, span_filter_notice("[span_red("Unable to locate a data core entry for this person.")]")) if (href_list["medrecordComment"]) if(hasHUD(usr,"medical")) @@ -565,11 +565,11 @@ to_chat(usr, "[R.fields[text("com_[]", counter)]]") counter++ if (counter == 1) - to_chat(usr, "No comment found.") - to_chat(usr, "\[Add comment\]") + to_chat(usr, span_filter_notice("No comment found.")) + to_chat(usr, span_filter_notice("\[Add comment\]")) if(!read) - to_chat(usr, "[span_red("Unable to locate a data core entry for this person.")]") + to_chat(usr, span_filter_notice("[span_red("Unable to locate a data core entry for this person.")]")) if (href_list["medrecordadd"]) if(hasHUD(usr,"medical")) @@ -624,11 +624,11 @@ emp_hud_text += "Known Languages: [R.fields["languages"]]" emp_hud_text += "Notes: [R.fields["notes"]]" emp_hud_text += "\[View Comment Log\]" - to_chat(usr, "[jointext(emp_hud_text, "
    ")]    ") + to_chat(usr, span_filter_notice("[jointext(emp_hud_text, "
    ")]")) read = 1 if(!read) - to_chat(usr, "[span_red("Unable to locate a data core entry for this person.")]") + to_chat(usr, span_filter_notice("[span_red("Unable to locate a data core entry for this person.")]")) if (href_list["emprecordComment"]) if(hasHUD(usr,"best")) @@ -651,11 +651,11 @@ to_chat(usr, "[R.fields[text("com_[]", counter)]]") counter++ if (counter == 1) - to_chat(usr, "No comment found.") - to_chat(usr, "\[Add comment\]") + to_chat(usr, span_filter_notice("No comment found.")) + to_chat(usr, span_filter_notice("\[Add comment\]")) if(!read) - to_chat(usr, "[span_red("Unable to locate a data core entry for this person.")]") + to_chat(usr, span_filter_notice("[span_red("Unable to locate a data core entry for this person.")]")) if (href_list["emprecordadd"]) if(hasHUD(usr,"best")) @@ -788,13 +788,13 @@ /mob/living/carbon/human/IsAdvancedToolUser(var/silent) // VOREstation start if(feral) - to_chat(src, "Your primitive mind can't grasp the concept of that thing.") + to_chat(src, span_warning("Your primitive mind can't grasp the concept of that thing.")) return 0 // VOREstation end if(species.has_fine_manipulation) return 1 if(!silent) - to_chat(src, "You don't have the dexterity to use that!") + to_chat(src, span_warning("You don't have the dexterity to use that!")) return 0 /mob/living/carbon/human/abiotic(var/full_body = 0) @@ -819,7 +819,7 @@ /mob/living/carbon/human/proc/play_xylophone() if(!src.xylophone) var/datum/gender/T = gender_datums[get_visible_gender()] - visible_message("[span_red("\The [src] begins playing [T.his] ribcage like a xylophone. It's quite spooky.")]","You begin to play a spooky refrain on your ribcage.","[span_red("You hear a spooky xylophone melody.")]") + visible_message(span_filter_notice("[span_red("\The [src] begins playing [T.his] ribcage like a xylophone. It's quite spooky.")]"),span_notice("You begin to play a spooky refrain on your ribcage."),span_filter_notice("[span_red("You hear a spooky xylophone melody.")]")) var/song = pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg') playsound(src, song, 50, 1, -1) xylophone = 1 @@ -910,7 +910,7 @@ regenerate_icons() check_dna() var/datum/gender/T = gender_datums[get_visible_gender()] - visible_message("\The [src] morphs and changes [T.his] appearance!", "You change your appearance!", "[span_red("Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!")]") + visible_message(span_notice("\The [src] morphs and changes [T.his] appearance!"), span_notice("You change your appearance!"), span_filter_notice("[span_red("Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!")]")) /mob/living/carbon/human/proc/remotesay() set name = "Project mind" @@ -933,13 +933,13 @@ var/say = sanitize(tgui_input_text(usr, "What do you wish to say?")) if(mRemotetalk in target.mutations) - target.show_message("[span_blue("You hear [src.real_name]'s voice: [say]")]") + target.show_message(span_filter_say("[span_blue("You hear [src.real_name]'s voice: [say]")]")) else - target.show_message("[span_blue("You hear a voice that seems to echo around the room: [say]")]") - usr.show_message("[span_blue("You project your mind into [target.real_name]: [say]")]") + target.show_message(span_filter_say("[span_blue("You hear a voice that seems to echo around the room: [say]")]")) + usr.show_message(span_filter_say("[span_blue("You project your mind into [target.real_name]: [say]")]")) log_say("(TPATH to [key_name(target)]) [say]",src) for(var/mob/observer/dead/G in mob_list) - G.show_message("Telepathic message from [src] to [target]: [say]") + G.show_message(span_filter_say("Telepathic message from [src] to [target]: [say]")) /mob/living/carbon/human/proc/remoteobserve() set name = "Remote View" @@ -1148,12 +1148,12 @@ if(!istype(O,/obj/item/implant) && prob(5)) //Moving with things stuck in you could be bad. // All kinds of embedded objects cause bleeding. if(!can_feel_pain(organ.organ_tag)) - to_chat(src, "You feel [O] moving inside your [organ.name].") + to_chat(src, span_warning("You feel [O] moving inside your [organ.name].")) else var/msg = pick( \ - "A spike of pain jolts your [organ.name] as you bump [O] inside.", \ - "Your movement jostles [O] in your [organ.name] painfully.", \ - "Your movement jostles [O] in your [organ.name] painfully.") + span_warning("A spike of pain jolts your [organ.name] as you bump [O] inside."), \ + span_warning("Your movement jostles [O] in your [organ.name] painfully."), \ + span_warning("Your movement jostles [O] in your [organ.name] painfully.")) custom_pain(msg, 40) organ.take_damage(rand(1,3), 0, 0) @@ -1175,24 +1175,24 @@ if(usr == src) self = 1 if(!self) - usr.visible_message("[usr] kneels down, puts [TU.his] hand on [src]'s wrist and begins counting [T.his] pulse.",\ - "You begin counting [src]'s pulse.") + usr.visible_message(span_notice("[usr] kneels down, puts [TU.his] hand on [src]'s wrist and begins counting [T.his] pulse."),\ + span_filter_notice("You begin counting [src]'s pulse.")) else - usr.visible_message("[usr] begins counting [T.his] pulse.",\ - "You begin counting your pulse.") + usr.visible_message(span_notice("[usr] begins counting [T.his] pulse."),\ + span_filter_notice("You begin counting your pulse.")) if(src.pulse) - to_chat(usr, "[self ? "You have a" : "[src] has a"] pulse! Counting...") + to_chat(usr, span_notice("[self ? "You have a" : "[src] has a"] pulse! Counting...")) else - to_chat(usr, "[src] has no pulse!") //it is REALLY UNLIKELY that a dead person would check his own pulse + to_chat(usr, span_danger("[src] has no pulse!")) //it is REALLY UNLIKELY that a dead person would check his own pulse return - to_chat(usr, "You must[self ? "" : " both"] remain still until counting is finished.") + to_chat(usr, span_filter_notice("You must[self ? "" : " both"] remain still until counting is finished.")) if(do_mob(usr, src, 60)) - var/message = "[self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)]." + var/message = span_notice("[self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)].") to_chat(usr,message) else - to_chat(usr, "You failed to check the pulse. Try again.") + to_chat(usr, span_warning("You failed to check the pulse. Try again.")) /mob/living/carbon/human/proc/set_species(var/new_species, var/default_colour, var/regen_icons = TRUE, var/mob/living/carbon/human/example = null) //VOREStation Edit - send an example @@ -1320,26 +1320,26 @@ verbs -= /mob/living/carbon/human/proc/bloody_doodle if (src.gloves) - to_chat(src, "Your [src.gloves] are getting in the way.") + to_chat(src, span_warning("Your [src.gloves] are getting in the way.")) return var/turf/simulated/T = src.loc if (!istype(T)) //to prevent doodling out of mechs and lockers - to_chat(src, "You cannot reach the floor.") + to_chat(src, span_warning("You cannot reach the floor.")) return var/direction = tgui_input_list(src,"Which way?","Tile selection", list("Here","North","South","East","West")) if (direction != "Here") T = get_step(T,text2dir(direction)) if (!istype(T)) - to_chat(src, "You cannot doodle there.") + to_chat(src, span_warning("You cannot doodle there.")) return var/num_doodles = 0 for (var/obj/effect/decal/cleanable/blood/writing/W in T) num_doodles++ if (num_doodles > 4) - to_chat(src, "There is no space to write on!") + to_chat(src, span_warning("There is no space to write on!")) return var/max_length = bloody_hands * 30 //tweeter style @@ -1352,7 +1352,7 @@ if (length(message) > max_length) message += "-" - to_chat(src, "You ran out of blood to write with!") + to_chat(src, span_warning("You ran out of blood to write with!")) var/obj/effect/decal/cleanable/blood/writing/W = new(T) W.basecolor = (hand_blood_color) ? hand_blood_color : "#A10808" @@ -1394,7 +1394,7 @@ if(!. && error_msg && user) if(!fail_msg) fail_msg = "There is no exposed flesh or thin material [target_zone == BP_HEAD ? "on their head" : "on their body"] to inject into." - to_chat(user, "[fail_msg]") + to_chat(user, span_alert("[fail_msg]")) /mob/living/carbon/human/print_flavor_text(var/shrink = 1) var/list/equipment = list(src.head,src.wear_mask,src.glasses,src.w_uniform,src.wear_suit,src.gloves,src.shoes) @@ -1488,11 +1488,11 @@ usr.setClickCooldown(20) if(usr.stat > 0) - to_chat(usr, "You are unconcious and cannot do that!") + to_chat(usr, span_filter_notice("You are unconcious and cannot do that!")) return if(usr.restrained()) - to_chat(usr, "You are restrained and cannot do that!") + to_chat(usr, span_filter_notice("You are restrained and cannot do that!")) return var/mob/S = src @@ -1512,9 +1512,9 @@ return if(self) - to_chat(src, "You brace yourself to relocate your [current_limb.joint]...") + to_chat(src, span_warning("You brace yourself to relocate your [current_limb.joint]...")) else - to_chat(U, "You begin to relocate [S]'s [current_limb.joint]...") + to_chat(U, span_warning("You begin to relocate [S]'s [current_limb.joint]...")) if(!do_after(U, 30)) return @@ -1522,10 +1522,10 @@ return if(self) - to_chat(src, "You pop your [current_limb.joint] back in!") + to_chat(src, span_danger("You pop your [current_limb.joint] back in!")) else - to_chat(U, "You pop [S]'s [current_limb.joint] back in!") - to_chat(S, "[U] pops your [current_limb.joint] back in!") + to_chat(U, span_danger("You pop [S]'s [current_limb.joint] back in!")) + to_chat(S, span_danger("[U] pops your [current_limb.joint] back in!")) current_limb.relocate() /mob/living/carbon/human/drop_from_inventory(var/obj/item/W, var/atom/target = null) @@ -1605,11 +1605,11 @@ if(!UWC) return var/datum/category_item/underwear/UWI = all_underwear[UWC.name] if(!UWI || UWI.name == "None") - to_chat(src, "You do not have [UWC.gender==PLURAL ? "[UWC.display_name]" : "a [UWC.display_name]"].") + to_chat(src, span_notice("You do not have [UWC.gender==PLURAL ? "[UWC.display_name]" : "a [UWC.display_name]"].")) return hide_underwear[UWC.name] = !hide_underwear[UWC.name] update_underwear(1) - to_chat(src, "You [hide_underwear[UWC.name] ? "take off" : "put on"] your [UWC.display_name].") + to_chat(src, span_notice("You [hide_underwear[UWC.name] ? "take off" : "put on"] your [UWC.display_name].")) return /mob/living/carbon/human/verb/pull_punches() @@ -1619,7 +1619,7 @@ if(stat) return pulling_punches = !pulling_punches - to_chat(src, "You are now [pulling_punches ? "pulling your punches" : "not pulling your punches"].") + to_chat(src, span_notice("You are now [pulling_punches ? "pulling your punches" : "not pulling your punches"].")) return /mob/living/carbon/human/should_have_organ(var/organ_check) @@ -1814,7 +1814,7 @@ rest_dir = -1 resting = !resting - to_chat(src, "You are now [resting ? "resting" : "getting up"].") + to_chat(src, span_notice("You are now [resting ? "resting" : "getting up"].")) update_canmove() /mob/living/carbon/human/verb/lay_down_right() @@ -1822,5 +1822,5 @@ rest_dir = 1 resting = !resting - to_chat(src, "You are now [resting ? "resting" : "getting up"].") + to_chat(src, span_notice("You are now [resting ? "resting" : "getting up"].")) update_canmove() diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 40ab43af0f..987c2d504e 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -42,7 +42,7 @@ if(H.hand) temp = H.organs_by_name["l_hand"] if(!temp || !temp.is_usable()) - to_chat(H, "You can't use your hand.") + to_chat(H, span_warning("You can't use your hand.")) return if(H.lying) return @@ -57,7 +57,7 @@ if(!hit_zone) H.do_attack_animation(src) playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("[span_red("[H] reaches for [src], but misses!")]") + visible_message(span_filter_combat("[span_red("[H] reaches for [src], but misses!")]")) return FALSE if(H != src && check_shields(0, null, H, H.zone_sel.selecting, H.name)) @@ -77,16 +77,16 @@ // VOREStation Edit - End if(istype(H) && health < config.health_threshold_crit) if(!H.check_has_mouth()) - to_chat(H, "You don't have a mouth, you cannot perform CPR!") + to_chat(H, span_danger("You don't have a mouth, you cannot perform CPR!")) return if(!check_has_mouth()) - to_chat(H, "They don't have a mouth, you cannot perform CPR!") + to_chat(H, span_danger("They don't have a mouth, you cannot perform CPR!")) return if((H.head && (H.head.body_parts_covered & FACE)) || (H.wear_mask && (H.wear_mask.body_parts_covered & FACE))) - to_chat(H, "Remove your mask!") + to_chat(H, span_notice("Remove your mask!")) return 0 if((head && (head.body_parts_covered & FACE)) || (wear_mask && (wear_mask.body_parts_covered & FACE))) - to_chat(H, "Remove [src]'s mask!") + to_chat(H, span_notice("Remove [src]'s mask!")) return 0 if (!cpr_time) @@ -96,18 +96,18 @@ spawn(30) cpr_time = 1 - H.visible_message("\The [H] is trying to perform CPR on \the [src]!") + H.visible_message(span_danger("\The [H] is trying to perform CPR on \the [src]!")) if(!do_after(H, 30)) return - H.visible_message("\The [H] performs CPR on \the [src]!") - to_chat(H, "Repeat at least every 7 seconds.") + H.visible_message(span_danger("\The [H] performs CPR on \the [src]!")) + to_chat(H, span_warning("Repeat at least every 7 seconds.")) if(istype(H) && health > config.health_threshold_dead) adjustOxyLoss(-(min(getOxyLoss(), 5))) updatehealth() - to_chat(src, "You feel a breath of fresh air enter your lungs. It feels good.") + to_chat(src, span_notice("You feel a breath of fresh air enter your lungs. It feels good.")) else if(!(M == src && apply_pressure(M, M.zone_sel.selecting))) help_shake_act(M) @@ -118,14 +118,14 @@ return 0 for(var/obj/item/grab/G in src.grabbed_by) if(G.assailant == M) - to_chat(M, "You already grabbed [src].") + to_chat(M, span_notice("You already grabbed [src].")) return if(w_uniform) w_uniform.add_fingerprint(M) var/obj/item/grab/G = new /obj/item/grab(M, src) if(buckled) - to_chat(M, "You cannot grab [src], [TT.he] is buckled in!") + to_chat(M, span_notice("You cannot grab [src], [TT.he] is buckled in!")) return if(!G) //the grab will delete itself in New if affecting is anchored return @@ -136,7 +136,7 @@ H.do_attack_animation(src) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) //VORESTATION EDIT - visible_message("[M] has grabbed [src] [(M.zone_sel.selecting == BP_L_HAND || M.zone_sel.selecting == BP_R_HAND)? "by [(gender==FEMALE)? "her" : ((gender==MALE)? "his": "their")] hands": "passively"]!") + visible_message(span_warning("[M] has grabbed [src] [(M.zone_sel.selecting == BP_L_HAND || M.zone_sel.selecting == BP_R_HAND)? "by [(gender==FEMALE)? "her" : ((gender==MALE)? "his": "their")] hands": "passively"]!")) //VORESTATION END END return TRUE @@ -145,11 +145,11 @@ if(M.zone_sel.selecting == "mouth" && wear_mask && istype(wear_mask, /obj/item/grenade)) var/obj/item/grenade/G = wear_mask if(!G.active) - visible_message("\The [M] pulls the pin from \the [src]'s [G.name]!") + visible_message(span_danger("\The [M] pulls the pin from \the [src]'s [G.name]!")) G.activate(M) update_inv_wear_mask() else - to_chat(M, "\The [G] is already primed! Run!") + to_chat(M, span_warning("\The [G] is already primed! Run!")) return if(!istype(H)) @@ -163,7 +163,7 @@ var/obj/item/organ/external/affecting = get_organ(hit_zone) if(!affecting || affecting.is_stump()) - to_chat(M, "They are missing that limb!") + to_chat(M, span_danger("They are missing that limb!")) return TRUE switch(src.a_intent) @@ -243,7 +243,7 @@ if(!attack_message) attack.show_attack(H, src, hit_zone, rand_damage) else - H.visible_message("[attack_message]") + H.visible_message(span_danger("[attack_message]")) playsound(src, ((miss_type) ? (miss_type == 1 ? attack.miss_sound : 'sound/weapons/thudswoosh.ogg') : attack.attack_sound), 25, 1, -1) @@ -296,11 +296,11 @@ turfs += T if(turfs.len) var/turf/target = pick(turfs) - visible_message("[src]'s [W] goes off during the struggle!") + visible_message(span_danger("[src]'s [W] goes off during the struggle!")) return W.afterattack(target,src) if(last_push_time + 30 > world.time) - visible_message("[M] has weakly pushed [src]!") + visible_message(span_warning("[M] has weakly pushed [src]!")) return var/randn = rand(1, 100) @@ -313,9 +313,9 @@ apply_effect(3, WEAKEN, armor_check) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(armor_check < 60) - visible_message("[M] has pushed [src]!") + visible_message(span_danger("[M] has pushed [src]!")) else - visible_message("[M] attempted to push [src]!") + visible_message(span_warning("[M] attempted to push [src]!")) return if(randn <= 60) @@ -328,12 +328,12 @@ for(var/obj/item/I in holding) if(I) drop_from_inventory(I) - visible_message("[M] has disarmed [src]!") + visible_message(span_danger("[M] has disarmed [src]!")) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) return playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("[span_red("[M] attempted to disarm [src]!")]") + visible_message(span_filter_combat("[span_red("[M] attempted to disarm [src]!")]")) return /mob/living/carbon/human/proc/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, inrange, params) @@ -345,7 +345,7 @@ return add_attack_logs(user,src,"Melee attacked with fists (miss/block)",admin_notify = FALSE) //No admin notice since this is usually fighting simple animals - src.visible_message("[user] has [attack_message] [src]!") + src.visible_message(span_danger("[user] has [attack_message] [src]!")) user.do_attack_animation(src) var/dam_zone = pick(organs_by_name) @@ -375,10 +375,10 @@ if(!organ || organ.dislocated > 0 || organ.dislocated == -1) //don't use is_dislocated() here, that checks parent return FALSE - user.visible_message("[user] begins to dislocate [src]'s [organ.joint]!") + user.visible_message(span_warning("[user] begins to dislocate [src]'s [organ.joint]!")) if(do_after(user, 100)) organ.dislocate(1) - src.visible_message("[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!") + src.visible_message(span_danger("[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!")) return TRUE return FALSE @@ -386,21 +386,21 @@ /mob/living/carbon/human/proc/break_all_grabs(mob/living/carbon/user) var/success = FALSE if(pulling) - visible_message("[user] has broken [src]'s grip on [pulling]!") + visible_message(span_danger("[user] has broken [src]'s grip on [pulling]!")) success = TRUE stop_pulling() if(istype(l_hand, /obj/item/grab)) var/obj/item/grab/lgrab = l_hand if(lgrab.affecting) - visible_message("[user] has broken [src]'s grip on [lgrab.affecting]!") + visible_message(span_danger("[user] has broken [src]'s grip on [lgrab.affecting]!")) success = TRUE spawn(1) qdel(lgrab) if(istype(r_hand, /obj/item/grab)) var/obj/item/grab/rgrab = r_hand if(rgrab.affecting) - visible_message("[user] has broken [src]'s grip on [rgrab.affecting]!") + visible_message(span_danger("[user] has broken [src]'s grip on [rgrab.affecting]!")) success = TRUE spawn(1) qdel(rgrab) @@ -419,16 +419,16 @@ return FALSE if(organ.applied_pressure) - var/message = "Someone is already applying pressure to [user == src ? "your [organ.name]" : "[src]'s [organ.name]"]." + var/message = span_warning("Someone is already applying pressure to [user == src ? "your [organ.name]" : "[src]'s [organ.name]"].") to_chat(user,message) return FALSE var/datum/gender/TU = gender_datums[user.get_visible_gender()] if(user == src) - user.visible_message("\The [user] starts applying pressure to [TU.his] [organ.name]!", "You start applying pressure to your [organ.name]!") + user.visible_message(span_filter_notice("\The [user] starts applying pressure to [TU.his] [organ.name]!"), span_filter_notice("You start applying pressure to your [organ.name]!")) else - user.visible_message("\The [user] starts applying pressure to [src]'s [organ.name]!", "You start applying pressure to [src]'s [organ.name]!") + user.visible_message(span_filter_notice("\The [user] starts applying pressure to [src]'s [organ.name]!"), span_filter_notice("You start applying pressure to [src]'s [organ.name]!")) spawn(0) organ.applied_pressure = user @@ -438,9 +438,9 @@ organ.applied_pressure = null if(user == src) - user.visible_message("\The [user] stops applying pressure to [TU.his] [organ.name]!", "You stop applying pressure to your [organ]!") + user.visible_message(span_filter_notice("\The [user] stops applying pressure to [TU.his] [organ.name]!"), span_filter_notice("You stop applying pressure to your [organ]!")) else - user.visible_message("\The [user] stops applying pressure to [src]'s [organ.name]!", "You stop applying pressure to [src]'s [organ.name]!") + user.visible_message(span_filter_notice("\The [user] stops applying pressure to [src]'s [organ.name]!"), span_filter_notice("You stop applying pressure to [src]'s [organ.name]!")) return TRUE diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index b297e85ad0..9733256081 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -217,7 +217,7 @@ if(HULK in mutations) return // Notify our AI if they can now control the suit. if(wearing_rig && !stat && paralysis < amount) //We are passing out right this second. - wearing_rig.notify_ai("Warning: user consciousness failure. Mobility control passed to integrated intelligence system.") + wearing_rig.notify_ai(span_danger("Warning: user consciousness failure. Mobility control passed to integrated intelligence system.")) ..() /mob/living/carbon/human/proc/Stasis(amount) @@ -269,21 +269,21 @@ if (candidates.len) var/obj/item/organ/external/O = pick(candidates) O.mutate() - to_chat(src, "Something is not right with your [O.name]...") + to_chat(src, span_notice("Something is not right with your [O.name]...")) return else if (prob(heal_prob)) for (var/obj/item/organ/external/O in organs) if (O.status & ORGAN_MUTATED) O.unmutate() - to_chat(src, "Your [O.name] is shaped normally again.") + to_chat(src, span_notice("Your [O.name] is shaped normally again.")) return if (getCloneLoss() < 1) for (var/obj/item/organ/external/O in organs) if (O.status & ORGAN_MUTATED) O.unmutate() - to_chat(src, "Your [O.name] is shaped normally again.") + to_chat(src, span_notice("Your [O.name] is shaped normally again.")) BITSET(hud_updateflag, HEALTH_HUD) // Defined here solely to take species flags into account without having to recast at mob/living level. diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 9e917dbeac..2943d9b886 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -258,7 +258,7 @@ emp_act if(!hit_zone) user.do_attack_animation(src) playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("\The [user] misses [src] with \the [I]!") + visible_message(span_danger("\The [user] misses [src] with \the [I]!")) return null if(check_shields(I.force, I, user, target_zone, "the [I.name]")) @@ -266,7 +266,7 @@ emp_act var/obj/item/organ/external/affecting = get_organ(hit_zone) if (!affecting || affecting.is_stump()) - to_chat(user, "They are missing that limb!") + to_chat(user, span_danger("They are missing that limb!")) return null return hit_zone @@ -276,7 +276,7 @@ emp_act if(!affecting) return //should be prevented by attacked_with_item() but for sanity. - visible_message("[src] has been [LAZYLEN(I.attack_verb) ? pick(I.attack_verb) : "attacked"] in the [affecting.name] with [I.name] by [user]!") + visible_message(span_danger("[src] has been [LAZYLEN(I.attack_verb) ? pick(I.attack_verb) : "attacked"] in the [affecting.name] with [I.name] by [user]!")) var/soaked = get_armor_soak(hit_zone, "melee", I.armor_penetration) @@ -338,7 +338,7 @@ emp_act if(BP_HEAD)//Harder to score a stun but if you do it lasts a bit longer if(prob(effective_force)) apply_effect(20, PARALYZE, blocked, soaked) - visible_message("\The [src] has been knocked unconscious!") + visible_message(span_danger("\The [src] has been knocked unconscious!")) if(bloody)//Apply blood if(wear_mask) wear_mask.add_blood(src) @@ -352,7 +352,7 @@ emp_act if(BP_TORSO)//Easier to score a stun but lasts less time if(prob(effective_force + 10)) apply_effect(6, WEAKEN, blocked, soaked) - visible_message("\The [src] has been knocked down!") + visible_message(span_danger("\The [src] has been knocked down!")) if(bloody) bloody_body(src) @@ -371,7 +371,7 @@ emp_act //want the dislocation chance to be such that the limb is expected to dislocate after dealing a fraction of the damage needed to break the limb var/dislocate_chance = effective_force/(dislocate_mult * organ.min_broken_damage * config.organ_health_multiplier)*100 if(prob(dislocate_chance * (100 - blocked)/100)) - visible_message("[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!") + visible_message(span_danger("[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!")) organ.dislocate(1) return 1 return 0 @@ -379,12 +379,12 @@ emp_act /mob/living/carbon/human/emag_act(var/remaining_charges, mob/user, var/emag_source) var/obj/item/organ/external/affecting = get_organ(user.zone_sel.selecting) if(!affecting || !(affecting.robotic >= ORGAN_ROBOT)) - to_chat(user, "That limb isn't robotic.") + to_chat(user, span_warning("That limb isn't robotic.")) return -1 if(affecting.sabotaged) - to_chat(user, "[src]'s [affecting.name] is already sabotaged!") + to_chat(user, span_warning("[src]'s [affecting.name] is already sabotaged!")) return -1 - to_chat(user, "You sneakily slide [emag_source] into the dataport on [src]'s [affecting.name] and short out the safeties.") + to_chat(user, span_notice("You sneakily slide [emag_source] into the dataport on [src]'s [affecting.name] and short out the safeties.")) affecting.sabotaged = 1 return 1 @@ -404,7 +404,7 @@ emp_act // PERSON BEING THROWN: DEVOURABLE, ALLOWS THROW VORE, CAN BE DROP PREY. if((can_be_drop_pred && throw_vore && vore_selected) && (thrown_mob.devourable && thrown_mob.throw_vore && thrown_mob.can_be_drop_prey)) //Prey thrown into pred. vore_selected.nom_mob(thrown_mob) //Eat them!!! - visible_message("[thrown_mob] is thrown right into [src]'s [lowertext(vore_selected.name)]!") + visible_message(span_vwarning("[thrown_mob] is thrown right into [src]'s [lowertext(vore_selected.name)]!")) if(thrown_mob.loc != vore_selected) thrown_mob.forceMove(vore_selected) //Double check. Should never happen but...Weirder things have happened! add_attack_logs(thrown_mob.thrower,src,"Devoured [thrown_mob.name] via throw vore.") @@ -413,7 +413,7 @@ emp_act // PERSON BEING HIT: CAN BE DROP PREY, ALLOWS THROW VORE, AND IS DEVOURABLE. // PERSON BEING THROWN: CAN BE DROP PRED, ALLOWS THROW VORE. else if((can_be_drop_prey && throw_vore && devourable) && (thrown_mob.can_be_drop_pred && thrown_mob.throw_vore && thrown_mob.vore_selected)) //Pred thrown into prey. - visible_message("[src] suddenly slips inside of [thrown_mob]'s [lowertext(thrown_mob.vore_selected.name)] as [thrown_mob] flies into them!") + visible_message(span_vwarning("[src] suddenly slips inside of [thrown_mob]'s [lowertext(thrown_mob.vore_selected.name)] as [thrown_mob] flies into them!")) thrown_mob.vore_selected.nom_mob(src) //Eat them!!! if(src.loc != thrown_mob.vore_selected) src.forceMove(thrown_mob.vore_selected) //Double check. Should never happen but...Weirder things have happened! @@ -426,7 +426,7 @@ emp_act if(stat != DEAD && istype(O,/obj/item) && trash_catching && vore_selected) //Ported from chompstation var/obj/item/I = O if(adminbus_trash || is_type_in_list(I,edible_trash) && I.trash_eatable && !is_type_in_list(I,item_vore_blacklist)) - visible_message("[I] is thrown directly into [src]'s [lowertext(vore_selected.name)]!") + visible_message(span_warning("[I] is thrown directly into [src]'s [lowertext(vore_selected.name)]!")) I.throwing = 0 I.forceMove(vore_selected) return @@ -435,7 +435,7 @@ emp_act if(isturf(O.loc)) if(can_catch(O)) put_in_active_hand(O) - visible_message("[src] catches [O]!") + visible_message(span_warning("[src] catches [O]!")) throw_mode_off() return @@ -476,7 +476,7 @@ emp_act var/obj/item/organ/external/affecting = get_organ(zone) var/hit_area = affecting.name - src.visible_message("[span_red("[src] has been hit in the [hit_area] by [O].")]") + src.visible_message(span_filter_warning("[span_red("[src] has been hit in the [hit_area] by [O].")]")) if(ismob(O.thrower)) add_attack_logs(O.thrower,src,"Hit with thrown [O.name]") @@ -484,7 +484,7 @@ emp_act //If the armor absorbs all of the damage, skip the rest of the calculations var/soaked = get_armor_soak(affecting, "melee", O.armor_penetration) if(soaked >= throw_damage) - to_chat(src, "Your armor absorbs the force of [O.name]!") + to_chat(src, span_warning("Your armor absorbs the force of [O.name]!")) return var/armor = run_armor_check(affecting, "melee", O.armor_penetration, "Your armor has protected your [hit_area].", "Your armor has softened hit to your [hit_area].") //I guess "melee" is the best fit here @@ -522,7 +522,7 @@ emp_act if(O.throw_source && momentum >= THROWNOBJ_KNOCKBACK_SPEED && !buckled) var/dir = get_dir(O.throw_source, src) - visible_message("[span_red("[src] staggers under the impact!")]","[span_red("You stagger under the impact!")]") + visible_message(span_filter_warning("[span_red("[src] staggers under the impact!")]"),span_filter_warning("[span_red("You stagger under the impact!")]")) src.throw_at(get_edge_target_turf(src,dir),1,momentum) if(!O || !src) return @@ -532,7 +532,7 @@ emp_act if(T) src.loc = T - visible_message("[src] is pinned to the wall by [O]!","You are pinned to the wall by [O]!") + visible_message(span_warning("[src] is pinned to the wall by [O]!"),span_warning("You are pinned to the wall by [O]!")) src.anchored = TRUE src.pinned += O @@ -674,13 +674,13 @@ emp_act if(W.edge) organ_chance = 75 user.next_move = world.time + 20 - user.visible_message("\The [user] begins to twist \the [W] around inside [src]'s [chest]!") + user.visible_message(span_danger("\The [user] begins to twist \the [W] around inside [src]'s [chest]!")) if(!do_after(user, 20)) return 0 if(!(G && G.assailant == user && G.affecting == src)) //check that we still have a grab return 0 - user.visible_message("\The [user] twists \the [W] around inside [src]'s [chest]!") + user.visible_message(span_danger("\The [user] twists \the [W] around inside [src]'s [chest]!")) if(prob(organ_chance)) var/obj/item/organ/internal/selected_organ = pick(chest.internal_organs) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index e47687e038..23442c62cc 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -10,7 +10,7 @@ if(status[1] == HUMAN_EATING_NO_MOUTH) to_chat(src, "Where do you intend to put [food]? You don't have a mouth!") else if(status[1] == HUMAN_EATING_BLOCKED_MOUTH) - to_chat(src, "\The [status[2]] is in the way!") + to_chat(src, span_warning("\The [status[2]] is in the way!")) return 0 /mob/living/carbon/human/can_force_feed(var/feeder, var/food, var/feedback = 1) @@ -21,7 +21,7 @@ if(status[1] == HUMAN_EATING_NO_MOUTH) to_chat(feeder, "Where do you intend to put [food]? \The [src] doesn't have a mouth!") else if(status[1] == HUMAN_EATING_BLOCKED_MOUTH) - to_chat(feeder, "\The [status[2]] is in the way!") + to_chat(feeder, span_warning("\The [status[2]] is in the way!")) return 0 /mob/living/carbon/human/proc/can_eat_status() diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm index 6bdd7cc5b1..294cdc8648 100644 --- a/code/modules/mob/living/carbon/human/human_organs.dm +++ b/code/modules/mob/living/carbon/human/human_organs.dm @@ -132,7 +132,7 @@ for(var/limb_tag in list(BP_L_HAND, BP_L_ARM)) var/obj/item/organ/external/E = get_organ(limb_tag) if(!E) - visible_message("Lacking a functioning left hand, \the [src] drops \the [l_hand].") + visible_message(span_danger("Lacking a functioning left hand, \the [src] drops \the [l_hand].")) drop_from_inventory(l_hand) break @@ -140,7 +140,7 @@ for(var/limb_tag in list(BP_R_HAND, BP_R_ARM)) var/obj/item/organ/external/E = get_organ(limb_tag) if(!E) - visible_message("Lacking a functioning right hand, \the [src] drops \the [r_hand].") + visible_message(span_danger("Lacking a functioning right hand, \the [src] drops \the [r_hand].")) drop_from_inventory(r_hand) break @@ -203,7 +203,7 @@ /mob/living/carbon/human/proc/set_gender(var/g) if(g != gender) gender = g - + if(dna.GetUIState(DNA_UI_GENDER) ^ gender == FEMALE) // XOR will catch both cases where they do not match dna.SetUIState(DNA_UI_GENDER, gender == FEMALE) - sync_organ_dna(dna) \ No newline at end of file + sync_organ_dna(dna) diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 6e5f9eae6c..1391f47ca9 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -7,7 +7,7 @@ set category = "IC" if(incapacitated()) - to_chat(src, "You can't mess with your hair right now!") + to_chat(src, span_warning("You can't mess with your hair right now!")) return if(h_style) @@ -24,12 +24,12 @@ valid_hairstyles.Add(hair_string) selected_string = tgui_input_list(usr, "Select a new hairstyle", "Your hairstyle", valid_hairstyles) if(incapacitated()) - to_chat(src, "You can't mess with your hair right now!") + to_chat(src, span_warning("You can't mess with your hair right now!")) return else if(selected_string && h_style != selected_string) h_style = selected_string regenerate_icons() - visible_message("[src] pauses a moment to style their hair.") + visible_message(span_notice("[src] pauses a moment to style their hair.")) else to_chat(src, "You're already using that style.") @@ -61,7 +61,7 @@ return if(stat || paralysis || stunned || weakened || lying || restrained() || buckled) - to_chat(src, "You cannot tackle in your current state.") + to_chat(src, span_filter_notice("You cannot tackle in your current state.")) return last_special = world.time + 50 @@ -78,7 +78,7 @@ for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) - O.show_message("[span_red("[src] [failed ? "tried to tackle" : "has tackled"] down [T]!")]", 1) + O.show_message(span_filter_warning("[span_red("[src] [failed ? "tried to tackle" : "has tackled"] down [T]!")]"), 1) /mob/living/carbon/human/proc/commune() set category = "Abilities" @@ -103,17 +103,17 @@ var/mob/M = targets[target] if(istype(M, /mob/observer/dead) || M.stat == DEAD) - to_chat(src, "Not even a [src.species.name] can speak to the dead.") + to_chat(src, span_filter_notice("Not even a [src.species.name] can speak to the dead.")) return log_say("(COMMUNE to [key_name(M)]) [text]",src) - to_chat(M, "[span_blue("Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]")]") + to_chat(M, span_filter_say("[span_blue("Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]")]")) if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(H.species.name == src.species.name) return - to_chat(H, "[span_red("Your nose begins to bleed...")]") + to_chat(H, span_filter_notice("[span_red("Your nose begins to bleed...")]")) H.drip(1) /mob/living/carbon/human/proc/regurgitate() @@ -126,7 +126,7 @@ if(M in stomach_contents) stomach_contents.Remove(M) M.loc = loc - src.visible_message("[span_red("[src] hurls out the contents of their stomach!")]") + src.visible_message(span_filter_warning("[span_red("[src] hurls out the contents of their stomach!")]")) return /mob/living/carbon/human/proc/psychic_whisper(mob/M as mob in oview()) @@ -137,8 +137,8 @@ var/msg = sanitize(tgui_input_text(usr, "Message:", "Psychic Whisper")) if(msg) log_say("(PWHISPER to [key_name(M)]) [msg]", src) - to_chat(M, "[span_green("You hear a strange, alien voice in your head... [msg]")]") - to_chat(src, "[span_green("You said: \"[msg]\" to [M]")]") + to_chat(M, span_filter_say("[span_green("You hear a strange, alien voice in your head... [msg]")]")) + to_chat(src, span_filter_say("[span_green("You said: \"[msg]\" to [M]")]")) return /mob/living/carbon/human/proc/diona_split_nymph() @@ -181,7 +181,7 @@ var/obj/item/organ/external/Chest = organs_by_name[BP_TORSO] if(Chest.robotic >= 2) - visible_message("\The [src] shudders slightly, then ejects a cluster of nymphs with a wet slithering noise.") + visible_message(span_warning("\The [src] shudders slightly, then ejects a cluster of nymphs with a wet slithering noise.")) species = GLOB.all_species[SPECIES_HUMAN] // This is hard-set to default the body to a normal FBP, without changing anything. // Bust it @@ -198,7 +198,7 @@ E.droplimb(TRUE) else - visible_message("\The [src] quivers slightly, then splits apart with a wet slithering noise.") + visible_message(span_warning("\The [src] quivers slightly, then splits apart with a wet slithering noise.")) qdel(src) /mob/living/carbon/human/proc/self_diagnostics() @@ -208,10 +208,10 @@ if(stat == DEAD) return - to_chat(src, "Performing self-diagnostic, please wait...") + to_chat(src, span_notice("Performing self-diagnostic, please wait...")) spawn(50) - var/output = "Self-Diagnostic Results:\n" + var/output = span_filter_notice("Self-Diagnostic Results:\n") output += "Internal Temperature: [convert_k2c(bodytemperature)] Degrees Celsius\n" @@ -250,17 +250,17 @@ set category = "Abilities" if(incapacitated()) - to_chat(src, "You need to recover before you can use this ability.") + to_chat(src, span_warning("You need to recover before you can use this ability.")) return if(world.time < next_sonar_ping) - to_chat(src, "You need another moment to focus.") + to_chat(src, span_warning("You need another moment to focus.")) return if(is_deaf() || is_below_sound_pressure(get_turf(src))) - to_chat(src, "You are for all intents and purposes currently deaf!") + to_chat(src, span_warning("You are for all intents and purposes currently deaf!")) return next_sonar_ping += 10 SECONDS var/heard_something = FALSE - to_chat(src, "You take a moment to listen in to your environment...") + to_chat(src, span_notice("You take a moment to listen in to your environment...")) for(var/mob/living/L in range(client.view, src)) var/turf/T = get_turf(L) if(!T || L == src || L.stat == DEAD || is_below_sound_pressure(T)) @@ -287,7 +287,7 @@ feedback += "" to_chat(src,jointext(feedback,null)) if(!heard_something) - to_chat(src, "You hear no movement but your own.") + to_chat(src, span_notice("You hear no movement but your own.")) /mob/living/carbon/human/proc/regenerate() set name = "Regenerate" @@ -295,15 +295,15 @@ set category = "Abilities" if(nutrition < 250) - to_chat(src, "You lack the biomass to begin regeneration!") + to_chat(src, span_warning("You lack the biomass to begin regeneration!")) return if(active_regen) - to_chat(src, "You are already regenerating tissue!") + to_chat(src, span_warning("You are already regenerating tissue!")) return else active_regen = TRUE - src.visible_message("[src]'s flesh begins to mend...") + src.visible_message(span_filter_notice("[src]'s flesh begins to mend...")) var/delay_length = round(active_regen_delay * species.active_regen_mult) if(do_after(src,delay_length)) @@ -315,7 +315,7 @@ if(I.damage > 0) I.damage = max(I.damage - 30, 0) //Repair functionally half of a dead internal organ. I.status = 0 // Wipe status, as it's being regenerated from possibly dead. - to_chat(src, "You feel a soothing sensation within your [I.name]...") + to_chat(src, span_notice("You feel a soothing sensation within your [I.name]...")) // Replace completely missing limbs. for(var/limb_type in src.species.has_limbs) @@ -332,7 +332,7 @@ var/limb_path = organ_data["path"] var/obj/item/organ/O = new limb_path(src) organ_data["descriptor"] = O.name - to_chat(src, "You feel a slithering sensation as your [O.name] reform.") + to_chat(src, span_notice("You feel a slithering sensation as your [O.name] reform.")) var/agony_to_apply = round(0.66 * O.max_damage) // 66% of the limb's health is converted into pain. src.apply_damage(agony_to_apply, HALLOSS) @@ -349,7 +349,7 @@ update_icons_body() active_regen = FALSE else - to_chat(src, "Your regeneration is interrupted!") + to_chat(src, span_critical("Your regeneration is interrupted!")) adjust_nutrition(-75) active_regen = FALSE @@ -358,15 +358,15 @@ set desc = "Set your monitor display" set category = "IC" if(stat) - to_chat(src,"You must be awake and standing to perform this action!") + to_chat(src,span_warning("You must be awake and standing to perform this action!")) return var/obj/item/organ/external/head/E = organs_by_name[BP_HEAD] if(!E) - to_chat(src,"You don't seem to have a head!") + to_chat(src,span_warning("You don't seem to have a head!")) return var/datum/robolimb/robohead = all_robolimbs[E.model] if(!robohead.monitor_styles || !robohead.monitor_icon) - to_chat(src,"Your head doesn't have a monitor, or it doesn't support being changed!") + to_chat(src,span_warning("Your head doesn't have a monitor, or it doesn't support being changed!")) return var/list/states if(!states) @@ -376,5 +376,5 @@ E.eye_icon_location = robohead.monitor_icon E.eye_icon = states[choice] E.eye_icon_override = TRUE - to_chat(src,"You set your monitor to display [choice]!") + to_chat(src,span_warning("You set your monitor to display [choice]!")) update_icons_body() diff --git a/code/modules/mob/living/carbon/human/human_powers_vr.dm b/code/modules/mob/living/carbon/human/human_powers_vr.dm index 72eda2e609..a1a0c2b76a 100644 --- a/code/modules/mob/living/carbon/human/human_powers_vr.dm +++ b/code/modules/mob/living/carbon/human/human_powers_vr.dm @@ -5,12 +5,12 @@ if(stat == DEAD) return - to_chat(src, "Performing reagent purge, please wait...") + to_chat(src, span_notice("Performing reagent purge, please wait...")) sleep(50) src.bloodstr.clear_reagents() src.ingested.clear_reagents() src.touching.clear_reagents() - to_chat(src, "Reagents purged!") + to_chat(src, span_notice("Reagents purged!")) return TRUE @@ -20,11 +20,11 @@ set category = "IC" if(stat) - to_chat(src, "You must be awake and standing to perform this action!") + to_chat(src, span_warning("You must be awake and standing to perform this action!")) return var/obj/item/organ/external/head/H = organs_by_name[BP_HEAD] if(!H) - to_chat(src, "You don't seem to have a head!") + to_chat(src, span_warning("You don't seem to have a head!")) return H.eyes_over_markings = !H.eyes_over_markings @@ -33,6 +33,6 @@ if(H.robotic) var/datum/robolimb/robohead = all_robolimbs[H.model] if(robohead.monitor_styles && robohead.monitor_icon) - to_chat(src, "You reconfigure the rendering order of your facial display.") + to_chat(src, span_notice("You reconfigure the rendering order of your facial display.")) return TRUE diff --git a/code/modules/mob/living/carbon/human/human_resist.dm b/code/modules/mob/living/carbon/human/human_resist.dm index 0b09d169f0..ac135a5428 100644 --- a/code/modules/mob/living/carbon/human/human_resist.dm +++ b/code/modules/mob/living/carbon/human/human_resist.dm @@ -37,26 +37,26 @@ switch(attack_type) if(RESIST_ATTACK_DEFAULT) visible_message( - "\The [src] struggles to remove \the [SJ]!", - "You struggle to remove \the [SJ]. (This will take around [round(breakouttime / 600)] minutes and you need to stand still.)" + span_danger("\The [src] struggles to remove \the [SJ]!"), + span_warning("You struggle to remove \the [SJ]. (This will take around [round(breakouttime / 600)] minutes and you need to stand still.)") ) if(RESIST_ATTACK_CLAWS) visible_message( - "\The [src] starts clawing at \the [SJ]!", - "You claw at \the [SJ]. (This will take around [round(breakouttime / 600)] minutes and you need to stand still.)" + span_danger("\The [src] starts clawing at \the [SJ]!"), + span_warning("You claw at \the [SJ]. (This will take around [round(breakouttime / 600)] minutes and you need to stand still.)") ) if(RESIST_ATTACK_BITE) visible_message( - "\The [src] starts gnawing on \the [SJ]!", - "You gnaw on \the [SJ]. (This will take around [round(breakouttime / 600)] minutes and you need to stand still.)" + span_danger("\The [src] starts gnawing on \the [SJ]!"), + span_warning("You gnaw on \the [SJ]. (This will take around [round(breakouttime / 600)] minutes and you need to stand still.)") ) if(do_after(src, breakouttime, incapacitation_flags = INCAPACITATION_DISABLED & INCAPACITATION_KNOCKDOWN)) if(!wear_suit) return visible_message( - "\The [src] manages to remove \the [wear_suit]!", - "You successfully remove \the [wear_suit]." + span_danger("\The [src] manages to remove \the [wear_suit]!"), + span_notice("You successfully remove \the [wear_suit].") ) drop_from_inventory(wear_suit) @@ -70,8 +70,8 @@ /mob/living/carbon/human/proc/break_straight_jacket() visible_message( - "[src] is trying to rip \the [wear_suit]!", - "You attempt to rip your [wear_suit.name] apart. (This will take around 5 seconds and you need to stand still)" + span_danger("[src] is trying to rip \the [wear_suit]!"), + span_warning("You attempt to rip your [wear_suit.name] apart. (This will take around 5 seconds and you need to stand still)") ) if(do_after(src, 20 SECONDS, incapacitation_flags = INCAPACITATION_DEFAULT & ~INCAPACITATION_RESTRAINED)) // Same scaling as breaking cuffs, 5 seconds to 120 seconds, 20 seconds to 480 seconds. @@ -79,8 +79,8 @@ return visible_message( - "[src] manages to rip \the [wear_suit]!", - "You successfully rip your [wear_suit.name]." + span_danger("[src] manages to rip \the [wear_suit]!"), + span_warning("You successfully rip your [wear_suit.name].") ) say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!", "RAAAAAAAARGH!", "HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "AAAAAAARRRGH!" )) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 30bf17689b..92239e537b 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -14,7 +14,7 @@ This saves us from having to call add_fingerprint() any time something is put in var/mob/living/carbon/human/H = src var/obj/item/I = H.get_active_hand() if(!I) - to_chat(H, "You are not holding anything to equip.") + to_chat(H, span_notice("You are not holding anything to equip.")) return var/moved = FALSE @@ -29,7 +29,7 @@ This saves us from having to call add_fingerprint() any time something is put in // No?! Well, give up. if(!moved) - to_chat(H, "You are unable to equip that.") + to_chat(H, span_warning("You are unable to equip that.")) // Update hand icons else @@ -401,7 +401,7 @@ This saves us from having to call add_fingerprint() any time something is put in covering = src.wear_suit if(covering && (covering.body_parts_covered & (I.body_parts_covered|check_flags))) - to_chat(user, "\The [covering] is in the way.") + to_chat(user, span_warning("\The [covering] is in the way.")) return 0 return 1 diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 81d8a56609..49fa407eb7 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -187,19 +187,19 @@ for(var/mob/O in viewers(src, null)) if(O == src) continue - O.show_message(text("[src] starts having a seizure!"), 1) + O.show_message(span_danger("[src] starts having a seizure!"), 1) Paralyse(10) make_jittery(1000) if (disabilities & COUGHING) if ((prob(5) && paralysis <= 1)) drop_item() - spawn( 0 ) + spawn(0) emote("cough") return if (disabilities & TOURETTES) if ((prob(10) && paralysis <= 1)) Stun(10) - spawn( 0 ) + spawn(0) switch(rand(1, 3)) if(1) emote("twitch") @@ -217,19 +217,19 @@ custom_pain("Your head feels numb and painful.", 10) if(getBrainLoss() >= 15) if(4 <= rn && rn <= 6) if(eye_blurry <= 0) - to_chat(src, "It becomes hard to see for some reason.") + to_chat(src, span_warning("It becomes hard to see for some reason.")) eye_blurry = 10 if(getBrainLoss() >= 35) if(7 <= rn && rn <= 9) if(get_active_hand()) - to_chat(src, "Your hand won't respond properly, you drop what you're holding!") + to_chat(src, span_danger("Your hand won't respond properly, you drop what you're holding!")) drop_item() if(getBrainLoss() >= 45) if(10 <= rn && rn <= 12) if(prob(50)) - to_chat(src, "You suddenly black out!") + to_chat(src, span_danger("You suddenly black out!")) Paralyse(10) else if(!lying) - to_chat(src, "Your legs won't respond properly, you fall down!") + to_chat(src, span_danger("Your legs won't respond properly, you fall down!")) Weaken(10) // RADIATION! Everyone's favorite thing in the world! So let's get some numbers down off the bat. @@ -323,11 +323,11 @@ accumulated_rads += 10 * RADIATION_SPEED_COEFFICIENT if(!isSynthetic()) if(prob(5) && prob(100 * RADIATION_SPEED_COEFFICIENT) && !weakened) - to_chat(src, "You feel exhausted.") + to_chat(src, span_warning("You feel exhausted.")) AdjustWeakened(3) if(prob(5) && prob(100 * RADIATION_SPEED_COEFFICIENT) && species.get_bodytype() == SPECIES_HUMAN) //apes go bald if((h_style != "Bald" || f_style != "Shaved" )) - to_chat(src, "Your hair falls out.") + to_chat(src, span_warning("Your hair falls out.")) h_style = "Bald" f_style = "Shaved" update_hair() @@ -347,7 +347,7 @@ if(prob(5) && prob(100 * RADIATION_SPEED_COEFFICIENT)) spawn vomit() if(prob(10) && !weakened) - to_chat(src, "You feel sick.") + to_chat(src, span_warning("You feel sick.")) AdjustWeakened(3) else if (radiation >= 300 && radiation < 400) //Equivalent of 6.0 to 8.0 Gy. @@ -363,7 +363,7 @@ if(prob(10) && prob(100 * RADIATION_SPEED_COEFFICIENT)) spawn vomit() if(prob(15) && !weakened) - to_chat(src, "You feel horribly ill.") + to_chat(src, span_warning("You feel horribly ill.")) AdjustWeakened(3) if(prob(5) && internal_organs.len) I = pick(internal_organs) //Internal organ damage...Not good. Not good at all. @@ -383,7 +383,7 @@ if(I) if(istype(I)) I.add_autopsy_data("Radiation Burns", damage) I.take_damage(damage * species.radiation_mod * RADIATION_SPEED_COEFFICIENT) - to_chat(src, "Your eyes burn!") + to_chat(src, span_warning("Your eyes burn!")) eye_blurry += 10 if(prob(4)) adjustCloneLoss(5 * RADIATION_SPEED_COEFFICIENT) @@ -391,10 +391,10 @@ if(prob(25) && prob(100 * RADIATION_SPEED_COEFFICIENT)) spawn vomit() if(prob(20) && !weakened) - to_chat(src, "You feel like your insides are burning!") + to_chat(src, span_critical("You feel like your insides are burning!")) AdjustWeakened(5) if(prob(5)) - to_chat(src, "Your entire body feels like it's on fire!") + to_chat(src, span_critical("Your entire body feels like it's on fire!")) adjustHalLoss(5) if(prob(10) && internal_organs.len) I = pick(internal_organs) //Internal organ damage...Not good. Not good at all. @@ -419,13 +419,13 @@ if(prob(50) && prob(100 * RADIATION_SPEED_COEFFICIENT)) spawn vomit() if(!paralysis && prob(30) && prob(100 * RADIATION_SPEED_COEFFICIENT)) //CNS is shutting down. - to_chat(src, "You have a seizure!") + to_chat(src, span_critical("You have a seizure!")) Paralyse(10) make_jittery(1000) if(!lying) emote("collapse") if(get_active_hand() && prob(15)) //CNS is shutting down. - to_chat(src, "Your hand won't respond properly, you drop what you're holding!") + to_chat(src, span_danger("Your hand won't respond properly, you drop what you're holding!")) drop_item() if(internal_organs.len) I = pick(internal_organs) //Internal organ damage...Not good. Not good at all. @@ -457,29 +457,29 @@ I = internal_organs_by_name[O_EYES] if(I) //Eye stuff if(prob(5) && prob(accumulated_rads * RADIATION_SPEED_COEFFICIENT)) - to_chat(src, "Your eyes water.") + to_chat(src, span_warning("Your eyes water.")) eye_blurry += 5 if(accumulated_rads > 300) // (6Gy) if(prob(2) && prob(accumulated_rads * RADIATION_SPEED_COEFFICIENT)) - to_chat(src, "Your eyes burn.") + to_chat(src, span_warning("Your eyes burn.")) I.add_autopsy_data("Radiation Burns", 1 * species.radiation_mod * RADIATION_SPEED_COEFFICIENT) I.take_damage(1 * species.radiation_mod * RADIATION_SPEED_COEFFICIENT) //0.1 damage. Not a lot, but enough to tell you to get to medical. eye_blurry += 10 if(accumulated_rads > 200) // (4Gy) if(prob(5) && prob(accumulated_rads * RADIATION_SPEED_COEFFICIENT)) - to_chat(src, "Your feel nauseated.") + to_chat(src, span_warning("Your feel nauseated.")) spawn vomit() if(!weakened && prob(2) && prob(accumulated_rads * RADIATION_SPEED_COEFFICIENT)) - to_chat(src, "Your feel exhausted.") + to_chat(src, span_warning("Your feel exhausted.")) AdjustWeakened(3) if(accumulated_rads > 300) // (6Gy) if(get_active_hand() && prob(15) && prob(100 * RADIATION_SPEED_COEFFICIENT)) //CNS is shutting down. - to_chat(src, "Your hand won't respond properly, you drop what you're holding!") + to_chat(src, span_danger("Your hand won't respond properly, you drop what you're holding!")) drop_item() if(accumulated_rads > 700) // (12Gy) if(!paralysis && prob(1) && prob(100 * RADIATION_SPEED_COEFFICIENT)) //1 in 1000 chance per tick. - to_chat(src, "You have a seizure!") + to_chat(src, span_critical("You have a seizure!")) Paralyse(10) make_jittery(1000) if(!lying) @@ -665,7 +665,7 @@ if(exhaled_pp > safe_exhaled_max) if (prob(15)) var/word = pick("extremely dizzy","short of breath","faint","confused") - to_chat(src, "You feel [word].") + to_chat(src, span_danger("You feel [word].")) adjustOxyLoss(HUMAN_MAX_OXYLOSS) failed_exhale = 1 @@ -673,7 +673,7 @@ else if(exhaled_pp > safe_exhaled_max * 0.7) if (!prob(1)) var/word = pick("dizzy","short of breath","faint","momentarily confused") - to_chat(src, "You feel [word].") + to_chat(src, span_warning("You feel [word].")) //scale linearly from 0 to 1 between safe_exhaled_max and safe_exhaled_max*0.7 var/ratio = 1.0 - (safe_exhaled_max - exhaled_pp)/(safe_exhaled_max*0.3) @@ -686,7 +686,7 @@ else if(exhaled_pp > safe_exhaled_max * 0.6) if(prob(0.3)) var/word = pick("a little dizzy","short of breath") - to_chat(src, "You feel [word].") + to_chat(src, span_warning("You feel [word].")) // Too much poison in the air. if(toxins_pp > safe_toxins_max) @@ -731,10 +731,10 @@ if(breath.temperature <= species.breath_cold_level_1) if(prob(20)) - to_chat(src, "You feel your face freezing and icicles forming in your lungs!") + to_chat(src, span_danger("You feel your face freezing and icicles forming in your lungs!")) else if(breath.temperature >= species.breath_heat_level_1) if(prob(20)) - to_chat(src, "You feel your face burning and a searing heat in your lungs!") + to_chat(src, span_danger("You feel your face burning and a searing heat in your lungs!")) if(breath.temperature >= species.heat_discomfort_level) @@ -1236,7 +1236,7 @@ adjustBrainLoss(brainOxPercent * oxyloss) if(halloss >= species.total_health) - to_chat(src, "You're in too much pain to keep going...") + to_chat(src, span_notice("You're in too much pain to keep going...")) src.visible_message("[src] slumps to the ground, too weak to continue fighting.") Paralyse(10) setHalLoss(species.total_health - 1) @@ -1256,16 +1256,16 @@ if(prob(1) && get_active_hand()) var/stuff_to_drop = get_active_hand() drop_item() - visible_message("\The [src] suddenly drops their [stuff_to_drop].","You drop your [stuff_to_drop]!") + visible_message(span_notice("\The [src] suddenly drops their [stuff_to_drop]."),span_warning("You drop your [stuff_to_drop]!")) if(prob(5)) var/fear_self = pick(fear_message_self) var/fear_other = pick(fear_message_other) - visible_message("\The [src][fear_other]","[fear_self]") + visible_message(span_notice("\The [src][fear_other]"),span_warning("[fear_self]")) else if(fear >= 30 && !isSynthetic()) if(prob(2)) var/fear_self = pick(fear_message_self) var/fear_other = pick(fear_message_other) - visible_message("\The [src][fear_other]","[fear_self]") + visible_message(span_notice("\The [src][fear_other]"),span_warning("[fear_self]")) if(paralysis || sleeping) blinded = 1 @@ -1747,7 +1747,7 @@ if (getToxLoss() >= 30 && isSynthetic()) if(!confused) if(prob(5)) - to_chat(src, "You lose directional control!") + to_chat(src, span_danger("You lose directional control!")) Confuse(10) if (getToxLoss() >= 45 && !isSynthetic()) spawn vomit() @@ -1860,26 +1860,26 @@ if(shock_stage == 40) if(traumatic_shock >= 80) - to_chat(src, "[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!") + to_chat(src, span_danger("[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!")) if (shock_stage >= 60) if(shock_stage == 60 && !isbelly(loc)) //VOREStation Edit custom_emote(VISIBLE_MESSAGE, "'s body becomes limp.") if (prob(2)) if(traumatic_shock >= 80) - to_chat(src, "[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!") + to_chat(src, span_danger("[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!")) Weaken(20) if(shock_stage >= 80) if (prob(5)) if(traumatic_shock >= 80) - to_chat(src, "[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!") + to_chat(src, span_danger("[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!")) Weaken(20) if(shock_stage >= 120) if (prob(2)) if(traumatic_shock >= 80) - to_chat(src, "[pick("You black out", "You feel like you could die any moment now", "You are about to lose consciousness")]!") + to_chat(src, span_danger("[pick("You black out", "You feel like you could die any moment now", "You are about to lose consciousness")]!")) Paralyse(5) if(shock_stage == 150) diff --git a/code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm b/code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm index 8321d1ef66..5e68449f25 100644 --- a/code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm +++ b/code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm @@ -17,23 +17,23 @@ var/energy_cost = 75 if(stat) - to_chat(src, "You can't go invisible when weakened like this.") + to_chat(src, span_warning("You can't go invisible when weakened like this.")) return if(!cloaked) if(species.lleill_energy < energy_cost) - to_chat(src, "You do not have enough energy to do that! You currently have [species.lleill_energy] energy.") + to_chat(src, span_warning("You do not have enough energy to do that! You currently have [species.lleill_energy] energy.")) return cloak() block_hud = 1 hud_updateflag = 1 - to_chat(src, "Your fur shimmers and shifts around you, hiding you from the naked eye.") + to_chat(src, span_warning("Your fur shimmers and shifts around you, hiding you from the naked eye.")) species.lleill_energy -= energy_cost else uncloak() block_hud = 0 hud_updateflag = 1 - to_chat(src, "The brustling of your fur settles down and you become visible once again.") + to_chat(src, span_warning("The brustling of your fur settles down and you become visible once again.")) species.update_lleill_hud(src) /mob/living/carbon/human/proc/lleill_select_shape() @@ -118,16 +118,16 @@ var/energy_cost = 50 if(species.lleill_energy < energy_cost) - to_chat(src, "You do not have enough energy to do that! You currently have [species.lleill_energy] energy.") + to_chat(src, span_warning("You do not have enough energy to do that! You currently have [species.lleill_energy] energy.")) return if(stat) - to_chat(src, "You can't go do that when weakened like this.") + to_chat(src, span_warning("You can't go do that when weakened like this.")) return var/obj/item/I = get_active_hand() if(!I) - to_chat(src, "You have no item in your active hand.") + to_chat(src, span_warning("You have no item in your active hand.")) return var/choice = tgui_input_list(src, "Choose a glamour to transmute the item into:", "Transmutation", transmute_list) @@ -138,7 +138,7 @@ if(!get_active_hand(I)) - to_chat(src, "The item is no longer in your hands.") + to_chat(src, span_warning("The item is no longer in your hands.")) return else visible_message("\The [src] begins to change the form of \the [I].") @@ -170,22 +170,22 @@ var/energy_cost_tele = 50 if(stat) - to_chat(src, "You can't go do that when weakened like this.") + to_chat(src, span_warning("You can't go do that when weakened like this.")) return if(buckled) - to_chat(src,"You can't do that when restrained.") + to_chat(src,span_warning("You can't do that when restrained.")) var/r_action = tgui_alert(src, "What would you like to do with your rings? You currently have [species.lleill_energy] energy remaining.", "Actions", list("Spawn New Ring ([energy_cost_spawn])", "Teleport to Ring ([energy_cost_tele])", "Cancel")) if(!r_action || r_action == "Cancel") return if(findtext(r_action,"Spawn New Ring")) if(species.lleill_energy < energy_cost_spawn) - to_chat(src, "You do not have enough energy to do that!") + to_chat(src, span_warning("You do not have enough energy to do that!")) return if(!do_after(src, 10 SECONDS, src, exclusive = TASK_USER_EXCLUSIVE)) src.visible_message("\The [src] begins to form white rings on the ground.") return 0 - to_chat(src, "You place a new glamour ring at your feet.") + to_chat(src, span_warning("You place a new glamour ring at your feet.")) var/spawnloc = get_turf(src) var/obj/structure/glamour_ring/R = new(spawnloc) R.connected_mob = src @@ -193,10 +193,10 @@ species.lleill_energy -= energy_cost_spawn if(findtext(r_action,"Teleport to Ring")) if(species.lleill_energy < energy_cost_tele) - to_chat(src, "You do not have enough energy to do that!") + to_chat(src, span_warning("You do not have enough energy to do that!")) return if(!src.teleporters.len) - to_chat(src, "You need to place rings to teleport to them.") + to_chat(src, span_warning("You need to place rings to teleport to them.")) return else var/obj/structure/glamour_ring/R = tgui_input_list(src, "Where do you wish to teleport?", "Teleport", src.teleporters) @@ -228,7 +228,7 @@ for(var/mob/living/M in target_list) if(M.devourable && M.can_be_drop_prey) M.forceMove(vore_selected) - to_chat(M,"In a bright flash of white light, you suddenly find yourself trapped in \the [src]'s [vore_selected.name]!") + to_chat(M,span_vwarning("In a bright flash of white light, you suddenly find yourself trapped in \the [src]'s [vore_selected.name]!")) species.update_lleill_hud(src) /datum/power/lleill/contact @@ -257,7 +257,7 @@ ) if(stat) - to_chat(src, "You can't go do that when weakened like this.") + to_chat(src, span_warning("You can't go do that when weakened like this.")) return var/list/targets = list() @@ -269,7 +269,7 @@ targets |= M if(!targets) - to_chat(src, "There is nobody next to you.") + to_chat(src, span_warning("There is nobody next to you.")) return var/mob/living/carbon/human/chosen_target = tgui_input_list(src, "Who do you wish to take energy from?", "Make contact", targets) if(!chosen_target) @@ -285,10 +285,10 @@ var/accepted = tgui_alert(chosen_target, "Do you accept the [contact_type] physical contact from \the [src]?", "Actions", list("Yes", "No")) if(get_dist(src,chosen_target) > 1) - to_chat(src, "You need to be standing next to [chosen_target].") + to_chat(src, span_warning("You need to be standing next to [chosen_target].")) return if(!accepted || accepted == "No") - to_chat(src, "\The [chosen_target] refuses the contact.") + to_chat(src, span_warning("\The [chosen_target] refuses the contact.")) return if(accepted == "Yes") if(contact_type == "Kiss (lips)") @@ -316,12 +316,12 @@ src.visible_message("\The [src] and \the [chosen_target] complete their contact.") species.lleill_energy = species.lleill_energy_max nutrition += (chosen_target.nutrition / 2) - to_chat(src, "You feel revitalised.") + to_chat(src, span_warning("You feel revitalised.")) chosen_target.tiredness += 70 chosen_target.nutrition = max((chosen_target.nutrition / 2),75) chosen_target.remove_blood(40) //removes enough blood to make them feel a bit woozy, mostly just for flavour chosen_target.eye_blurry += 20 - to_chat(chosen_target, "You feel considerably weakened for the moment.") + to_chat(chosen_target, span_warning("You feel considerably weakened for the moment.")) species.update_lleill_hud(src) /datum/power/lleill/alchemy @@ -339,25 +339,25 @@ if(species.lleill_energy < energy_cost) - to_chat(src, "You do not have enough energy to do that! You currently have [species.lleill_energy] energy.") + to_chat(src, span_warning("You do not have enough energy to do that! You currently have [species.lleill_energy] energy.")) return if(stat) - to_chat(src, "You can't go do that when weakened like this.") + to_chat(src, span_warning("You can't go do that when weakened like this.")) return var/obj/item/potion_material/I = get_active_hand() if(!I) - to_chat(src, "You have no item in your active hand.") + to_chat(src, span_warning("You have no item in your active hand.")) return if(!istype(I)) - to_chat(src, "\The [I] is not a potion material.") + to_chat(src, span_warning("\The [I] is not a potion material.")) return var/obj/item/reagent_containers/glass/bottle/potion/transmute_product = I.product_potion if(!get_active_hand(I)) - to_chat(src, "The item is no longer in your hands.") + to_chat(src, span_warning("The item is no longer in your hands.")) return else visible_message("\The [src] begins to change the form of \the [I].") @@ -389,7 +389,7 @@ var/energy_cost = 100 if(species.lleill_energy < energy_cost) - to_chat(src, "You do not have enough energy to do that! You currently have [species.lleill_energy] energy.") + to_chat(src, span_warning("You do not have enough energy to do that! You currently have [species.lleill_energy] energy.")) return var/list/beast_options = list("Rabbit" = /mob/living/simple_mob/vore/rabbit, @@ -432,7 +432,7 @@ return if(species.lleill_energy < energy_cost) - to_chat(src, "You do not have enough energy to do that! You currently have [species.lleill_energy] energy.") + to_chat(src, span_warning("You do not have enough energy to do that! You currently have [species.lleill_energy] energy.")) return var/mob/living/M = src @@ -443,12 +443,12 @@ if(M.stat) //We can let it undo the TF, because the person will be dead, but otherwise things get weird. log_debug("polymorph stat") - to_chat(src, "You can't do that in your condition.") + to_chat(src, span_warning("You can't do that in your condition.")) return if(M.health <= 10) //We can let it undo the TF, because the person will be dead, but otherwise things get weird. log_debug("polymorph injured") - to_chat(src, "You are too injured to transform into a beast.") + to_chat(src, span_warning("You are too injured to transform into a beast.")) return visible_message("\The [src] begins significantly shifting their form.") @@ -538,7 +538,7 @@ set category = "Abilities" if(stat) - to_chat(src, "You can't do that in your condition.") + to_chat(src, span_warning("You can't do that in your condition.")) return visible_message("\The [src] begins significantly shifting their form.") @@ -567,7 +567,7 @@ var/energy_cost = 100 if(species.lleill_energy < energy_cost) - to_chat(src, "You do not have enough energy to do that! You currently have [species.lleill_energy] energy.") + to_chat(src, span_warning("You do not have enough energy to do that! You currently have [species.lleill_energy] energy.")) return var/list/beast_options = list("Rabbit" = /mob/living/simple_mob/vore/rabbit, @@ -610,7 +610,7 @@ return if(species.lleill_energy < energy_cost) - to_chat(src, "You do not have enough energy to do that! You currently have [species.lleill_energy] energy.") + to_chat(src, span_warning("You do not have enough energy to do that! You currently have [species.lleill_energy] energy.")) return var/mob/living/M = src @@ -621,12 +621,12 @@ if(M.stat) //We can let it undo the TF, because the person will be dead, but otherwise things get weird. log_debug("polymorph stat") - to_chat(src, "You can't do that in your condition.") + to_chat(src, span_warning("You can't do that in your condition.")) return if(M.health <= 10) //We can let it undo the TF, because the person will be dead, but otherwise things get weird. log_debug("polymorph injured") - to_chat(src, "You are too injured to transform into a beast.") + to_chat(src, span_warning("You are too injured to transform into a beast.")) return visible_message("\The [src] begins significantly shifting their form.") diff --git a/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm b/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm index 11e549bbad..5121d8c842 100644 --- a/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm +++ b/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm @@ -60,7 +60,7 @@ /datum/reagent/glamour_scaling/affect_blood(var/mob/living/carbon/target, var/removed) if(!(/mob/living/proc/set_size in target.verbs)) - to_chat(target, "You feel as though you could change size at any moment.") + to_chat(target, span_warning("You feel as though you could change size at any moment.")) target.verbs |= /mob/living/proc/set_size target.bloodstr.clear_reagents() //instantly clears reagents afterwards target.ingested.clear_reagents() @@ -92,11 +92,11 @@ /datum/reagent/glamour_twinkling/affect_blood(var/mob/living/carbon/human/target, var/removed) if(target.species.darksight < 10) - to_chat(target, "You can suddenly see much better than before.") + to_chat(target, span_warning("You can suddenly see much better than before.")) target.species.darksight = 10 if(target.disabilities & NEARSIGHTED) target.disabilities &= ~NEARSIGHTED - to_chat(target, "Everything is much less blurry.") + to_chat(target, span_warning("Everything is much less blurry.")) target.bloodstr.clear_reagents() //instantly clears reagents afterwards target.ingested.clear_reagents() target.touching.clear_reagents() @@ -135,7 +135,7 @@ targets |= M if(!targets) - to_chat(user, "There are no appropriate targets in range.") + to_chat(user, span_warning("There are no appropriate targets in range.")) return var/mob/living/carbon/human/chosen_target = tgui_input_list(user, "Which target do you wish to create a homunculus of?", "homunculus", targets) @@ -212,7 +212,7 @@ if(!L.say_understands(null, langset)) new_message = langset.scramble(new_message) - to_chat(L, "[src] translates, \"[new_message]\"") + to_chat(L, span_filter_say("[src] translates, \"[new_message]\"")) //Teleporter ring @@ -248,24 +248,24 @@ return if(m_action == "Yes") - to_chat(M, "You begin to break the lines of the glamour ring.") + to_chat(M, span_warning("You begin to break the lines of the glamour ring.")) if(!do_after(M, 10 SECONDS, src, exclusive = TASK_USER_EXCLUSIVE)) - to_chat(M, "You leave the glamour ring alone.") + to_chat(M, span_warning("You leave the glamour ring alone.")) return - to_chat(M, "You have destroyed \the [src].") + to_chat(M, span_warning("You have destroyed \the [src].")) src.visible_message("\The [M] has broken apart \the [src].") if(M != connected_mob && connected_mob) - to_chat(connected_mob, "\The [src] has been destroyed by \the [M].") + to_chat(connected_mob, span_warning("\The [src] has been destroyed by \the [M].")) if(istype(LL)) L.teleporters -= src qdel(src) if(m_action == "Restore Energy") if(LL.ring_cooldown + 10 MINUTES > world.time) - to_chat(M, "You must wait a while before drawing energy from the glamour again.") + to_chat(M, span_warning("You must wait a while before drawing energy from the glamour again.")) return if(!do_after(M, 10 SECONDS, src, exclusive = TASK_USER_EXCLUSIVE)) - to_chat(M, "You stop drawing energy.") + to_chat(M, span_warning("You stop drawing energy.")) return LL.lleill_energy = min((LL.lleill_energy + 75),LL.lleill_energy_max) diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm index cd0f0570e6..696af416c4 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm @@ -36,7 +36,7 @@ var/darkness = 1 var/turf/T = get_turf(src) if(!T) - to_chat(src,"You can't use that here!") + to_chat(src,span_warning("You can't use that here!")) return FALSE if(ability_flags & AB_PHASE_SHIFTING) @@ -59,13 +59,13 @@ var/datum/species/shadekin/SK = species if(!istype(SK)) - to_chat(src, "Only a shadekin can use that!") + to_chat(src, span_warning("Only a shadekin can use that!")) return FALSE else if(stat) - to_chat(src, "Can't use that ability in your state!") + to_chat(src, span_warning("Can't use that ability in your state!")) return FALSE else if(shadekin_get_energy() < ability_cost && !(ability_flags & AB_PHASE_SHIFTED)) - to_chat(src, "Not enough energy for that ability!") + to_chat(src, span_warning("Not enough energy for that ability!")) return FALSE if(!(ability_flags & AB_PHASE_SHIFTED)) @@ -73,7 +73,7 @@ playsound(src, 'sound/effects/stealthoff.ogg', 75, 1) if(!T.CanPass(src,T) || loc != T) - to_chat(src,"You can't use that here!") + to_chat(src,span_warning("You can't use that here!")) return FALSE forceMove(T) @@ -121,7 +121,7 @@ var/mob/living/target = pick(potentials) if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected) target.forceMove(vore_selected) - to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") + to_chat(target,span_vwarning("\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!")) ability_flags &= ~AB_PHASE_SHIFTING @@ -187,16 +187,16 @@ var/datum/species/shadekin/SK = species if(!istype(SK)) - to_chat(src, "Only a shadekin can use that!") + to_chat(src, span_warning("Only a shadekin can use that!")) return FALSE else if(stat) - to_chat(src, "Can't use that ability in your state!") + to_chat(src, span_warning("Can't use that ability in your state!")) return FALSE else if(shadekin_get_energy() < ability_cost) - to_chat(src, "Not enough energy for that ability!") + to_chat(src, span_warning("Not enough energy for that ability!")) return FALSE else if(ability_flags & AB_PHASE_SHIFTED) - to_chat(src, "You can't use that while phase shifted!") + to_chat(src, span_warning("You can't use that while phase shifted!")) return FALSE var/list/viewed = oview(1) @@ -204,7 +204,7 @@ for(var/mob/living/L in viewed) targets += L if(!targets.len) - to_chat(src,"Nobody nearby to mend!") + to_chat(src,span_warning("Nobody nearby to mend!")) return FALSE var/mob/living/target = tgui_input_list(src,"Pick someone to mend:","Mend Other", targets) @@ -214,7 +214,7 @@ target.add_modifier(/datum/modifier/shadekin/heal_boop,1 MINUTE) playsound(src, 'sound/effects/EMPulse.ogg', 75, 1) shadekin_adjust_energy(-ability_cost) - visible_message("\The [src] gently places a hand on \the [target]...") + visible_message(span_notice("\The [src] gently places a hand on \the [target]...")) face_atom(target) return TRUE @@ -223,8 +223,8 @@ desc = "You feel serene and well rested." mob_overlay_state = "green_sparkles" - on_created_text = "Sparkles begin to appear around you, and all your ills seem to fade away." - on_expired_text = "The sparkles have faded, although you feel much healthier than before." + on_created_text = span_notice("Sparkles begin to appear around you, and all your ills seem to fade away.") + on_expired_text = span_notice("The sparkles have faded, although you feel much healthier than before.") stacks = MODIFIER_STACK_EXTEND /datum/modifier/shadekin/heal_boop/tick() @@ -256,16 +256,16 @@ var/datum/species/shadekin/SK = species if(!istype(SK)) - to_chat(src, "Only a shadekin can use that!") + to_chat(src, span_warning("Only a shadekin can use that!")) return FALSE else if(stat) - to_chat(src, "Can't use that ability in your state!") + to_chat(src, span_warning("Can't use that ability in your state!")) return FALSE else if(shadekin_get_energy() < ability_cost) - to_chat(src, "Not enough energy for that ability!") + to_chat(src, span_warning("Not enough energy for that ability!")) return FALSE else if(ability_flags & AB_PHASE_SHIFTED) - to_chat(src, "You can't use that while phase shifted!") + to_chat(src, span_warning("You can't use that while phase shifted!")) return FALSE playsound(src, 'sound/effects/bamf.ogg', 75, 1) @@ -279,8 +279,8 @@ desc = "Darkness envelops you." mob_overlay_state = "" - on_created_text = "You drag part of The Dark into realspace, enveloping yourself." - on_expired_text = "You lose your grasp on The Dark and realspace reasserts itself." + on_created_text = span_notice("You drag part of The Dark into realspace, enveloping yourself.") + on_expired_text = span_warning("You lose your grasp on The Dark and realspace reasserts itself.") stacks = MODIFIER_STACK_EXTEND var/mob/living/simple_mob/shadekin/my_kin diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 6adaa514af..296b9e386c 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -440,20 +440,20 @@ //VOREStation Edit Start - Headpats and Handshakes. if(H.zone_sel.selecting == "head") H.visible_message( \ - "[H] pats [target] on the head.", \ - "You pat [target] on the head.", ) + span_notice("[H] pats [target] on the head."), \ + span_notice("You pat [target] on the head."), ) else if(H.zone_sel.selecting == "r_hand" || H.zone_sel.selecting == "l_hand") H.visible_message( \ - "[H] shakes [target]'s hand.", \ - "You shake [target]'s hand.", ) + span_notice("[H] shakes [target]'s hand."), \ + span_notice("You shake [target]'s hand."), ) else if(H.zone_sel.selecting == "mouth") H.visible_message( \ - "[H] boops [target]'s nose.", \ - "You boop [target] on the nose.", ) + span_notice("[H] boops [target]'s nose."), \ + span_notice("You boop [target] on the nose."), ) //VOREStation Edit End else - H.visible_message("[H] hugs [target] to make [t_him] feel better!", \ - "You hug [target] to make [t_him] feel better!") + H.visible_message(span_notice("[H] hugs [target] to make [t_him] feel better!"), \ + span_notice("You hug [target] to make [t_him] feel better!")) /datum/species/proc/remove_inherent_verbs(var/mob/living/carbon/human/H) if(inherent_verbs) diff --git a/code/modules/mob/living/carbon/human/species/species_attack.dm b/code/modules/mob/living/carbon/human/species/species_attack.dm index 5e2aaafb8e..cc02a1f64a 100644 --- a/code/modules/mob/living/carbon/human/species/species_attack.dm +++ b/code/modules/mob/living/carbon/human/species/species_attack.dm @@ -33,7 +33,7 @@ attack_damage = CLAMP(attack_damage, 1, 5) if(target == user) - user.visible_message("[user] [pick(attack_verb)] [T.himself] in the [affecting.name]!") + user.visible_message(span_danger("[user] [pick(attack_verb)] [T.himself] in the [affecting.name]!")) return 0 switch(zone) @@ -41,20 +41,20 @@ // ----- HEAD ----- // switch(attack_damage) if(1 to 2) - user.visible_message("[user] scratched [target] across [TT.his] cheek!") + user.visible_message(span_danger("[user] scratched [target] across [TT.his] cheek!")) if(3 to 4) - user.visible_message("[user] [pick(attack_verb)] [target]'s [pick("head", "neck")]!") //'with spread claws' sounds a little bit odd, just enough that conciseness is better here I think + user.visible_message(span_danger("[user] [pick(attack_verb)] [target]'s [pick("head", "neck")]!")) //'with spread claws' sounds a little bit odd, just enough that conciseness is better here I think if(5) user.visible_message(pick( - "[user] rakes [T.his] [pick(attack_noun)] across [target]'s face!", - "[user] tears [T.his] [pick(attack_noun)] into [target]'s face!", + span_danger("[user] rakes [T.his] [pick(attack_noun)] across [target]'s face!"), + span_danger("[user] tears [T.his] [pick(attack_noun)] into [target]'s face!"), )) else // ----- BODY ----- // switch(attack_damage) - if(1 to 2) user.visible_message("[user] scratched [target]'s [affecting.name]!") - if(3 to 4) user.visible_message("[user] [pick(attack_verb)] [pick("", "", "the side of")] [target]'s [affecting.name]!") - if(5) user.visible_message("[user] tears [T.his] [pick(attack_noun)] [pick("deep into", "into", "across")] [target]'s [affecting.name]!") + if(1 to 2) user.visible_message(span_danger("[user] scratched [target]'s [affecting.name]!")) + if(3 to 4) user.visible_message(span_danger("[user] [pick(attack_verb)] [pick("", "", "the side of")] [target]'s [affecting.name]!")) + if(5) user.visible_message(span_danger("[user] tears [T.his] [pick(attack_noun)] [pick("deep into", "into", "across")] [target]'s [affecting.name]!")) /datum/unarmed_attack/claws/strong attack_name = "strong claws" @@ -98,5 +98,5 @@ /datum/unarmed_attack/stomp/weak/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) var/obj/item/organ/external/affecting = target.get_organ(zone) - user.visible_message("[user] jumped up and down on \the [target]'s [affecting.name]!") - playsound(user, attack_sound, 25, 1, -1) \ No newline at end of file + user.visible_message(span_warning("[user] jumped up and down on \the [target]'s [affecting.name]!")) + playsound(user, attack_sound, 25, 1, -1) diff --git a/code/modules/mob/living/carbon/human/species/species_attack_vr.dm b/code/modules/mob/living/carbon/human/species/species_attack_vr.dm index 35fa472345..3027ae0b33 100644 --- a/code/modules/mob/living/carbon/human/species/species_attack_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_attack_vr.dm @@ -11,38 +11,38 @@ attack_damage = CLAMP(attack_damage, 1, 5) if(target == user) - user.visible_message("[user] [pick(attack_verb)] \himself in the [affecting.name]!") + user.visible_message(span_danger("[user] [pick(attack_verb)] \himself in the [affecting.name]!")) return 0 //No venom for you. switch(zone) if(BP_HEAD, O_MOUTH, O_EYES) // ----- HEAD ----- // switch(attack_damage) if(1 to 2) - user.visible_message("[user]'s fangs scrape across [target]'s cheek!") - to_chat(target, "Your face feels tingly!") + user.visible_message(span_danger("[user]'s fangs scrape across [target]'s cheek!")) + to_chat(target, span_danger("Your face feels tingly!")) target.bloodstr.add_reagent("numbenzyme",attack_damage) //Have to add this here, otherwise the swtich fails. if(3 to 4) - user.visible_message("[user]'s fangs pierce into [target]'s neck at an odd, awkward angle!") - to_chat(target, "Your neck feels like it's on fire before going numb!") + user.visible_message(span_danger("[user]'s fangs pierce into [target]'s neck at an odd, awkward angle!")) + to_chat(target, span_danger("Your neck feels like it's on fire before going numb!")) target.bloodstr.add_reagent("numbenzyme",attack_damage) if(5) - user.visible_message("[user] sinks \his [pick(attack_noun)] deep into [target]'s neck, causing the vein to bulge outwards at some type of chemical is pumped into it!") - to_chat(target, "Your neck feels like it's going to burst! Moments later, you simply can't feel your neck any longer, the numbness beginning to spread throughout your body!") + user.visible_message(span_danger("[user] sinks \his [pick(attack_noun)] deep into [target]'s neck, causing the vein to bulge outwards at some type of chemical is pumped into it!")) + to_chat(target, span_danger("Your neck feels like it's going to burst! Moments later, you simply can't feel your neck any longer, the numbness beginning to spread throughout your body!")) target.bloodstr.add_reagent("numbenzyme",attack_damage) else // ----- BODY ----- // switch(attack_damage) if(1 to 2) - user.visible_message("[user]'s fangs scrape across [target]'s [affecting.name]!") - to_chat(target, "Your [affecting.name] feels tingly!") + user.visible_message(span_danger("[user]'s fangs scrape across [target]'s [affecting.name]!")) + to_chat(target, span_danger("Your [affecting.name] feels tingly!")) target.bloodstr.add_reagent("numbenzyme",attack_damage) if(3 to 4) - user.visible_message("[user]'s fangs pierce [pick("", "", "the side of")] [target]'s [affecting.name]!") - to_chat(target, "Your [affecting.name] feels like it's on fire before going numb!") + user.visible_message(span_danger("[user]'s fangs pierce [pick("", "", "the side of")] [target]'s [affecting.name]!")) + to_chat(target, span_danger("Your [affecting.name] feels like it's on fire before going numb!")) target.bloodstr.add_reagent("numbenzyme",attack_damage) if(5) - user.visible_message("[user]'s fangs sink deep into [target]'s [affecting.name], one of their veins bulging outwards from the sudden fluid pumped into it!") - to_chat(target, "Your [affecting.name] feels like it's going to burst! Moments later, you simply can't feel your [affecting.name] any longer, the numbness slowly spreading throughout your body!") + user.visible_message(span_danger("[user]'s fangs sink deep into [target]'s [affecting.name], one of their veins bulging outwards from the sudden fluid pumped into it!")) + to_chat(target, span_danger("Your [affecting.name] feels like it's going to burst! Moments later, you simply can't feel your [affecting.name] any longer, the numbness slowly spreading throughout your body!")) target.bloodstr.add_reagent("numbenzyme",attack_damage) /datum/unarmed_attack/claws/shadekin @@ -74,4 +74,4 @@ selfdamagezone=pick(BP_L_ARM, BP_L_HAND) else selfdamagezone=pick(BP_R_ARM, BP_R_HAND) - user.apply_damage(selfdamage, BRUTE, selfdamagezone, 0, 0, sharp=FALSE, edge=FALSE) \ No newline at end of file + user.apply_damage(selfdamage, BRUTE, selfdamagezone, 0, 0, sharp=FALSE, edge=FALSE) diff --git a/code/modules/mob/living/carbon/human/species/species_shapeshift.dm b/code/modules/mob/living/carbon/human/species/species_shapeshift.dm index e10176a5c7..20b0c26a14 100644 --- a/code/modules/mob/living/carbon/human/species/species_shapeshift.dm +++ b/code/modules/mob/living/carbon/human/species/species_shapeshift.dm @@ -109,7 +109,7 @@ var/list/wrapped_species_by_ref = list() valid_facialhairstyles += facialhairstyle - visible_message("\The [src]'s form contorts subtly.") + visible_message(span_notice("\The [src]'s form contorts subtly.")) if(valid_hairstyles.len) var/new_hair = tgui_input_list(usr, "Select a hairstyle.", "Shapeshifter Hair", valid_hairstyles) change_hair(new_hair ? new_hair : "Bald") @@ -138,7 +138,7 @@ var/list/wrapped_species_by_ref = list() if(!new_gender_identity) return - visible_message("\The [src]'s form contorts subtly.") + visible_message(span_notice("\The [src]'s form contorts subtly.")) change_gender(new_gender) change_gender_identity(new_gender_identity) diff --git a/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm b/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm index 1b7e3386da..8f497f40c4 100644 --- a/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm @@ -177,7 +177,7 @@ for(var/obj/item/organ/external/L as anything in src.organs) L.transparent = !L.transparent - visible_message("\The [src]'s internal composition seems to change.") + visible_message(span_notice("\The [src]'s internal composition seems to change.")) update_icons_body() update_hair() @@ -189,5 +189,5 @@ species.base_species = new_species wrapped_species_by_ref["\ref[src]"] = new_species if (visible) - visible_message("\The [src] shifts and contorts, taking the form of \a [new_species]!") - regenerate_icons() \ No newline at end of file + visible_message(span_filter_notice("\The [src] shifts and contorts, taking the form of \a [new_species]!")) + regenerate_icons() diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm index e4bfbc5b5e..2c2089e57b 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -260,10 +260,10 @@ if(breath.temperature <= breath_cold_level_1) if(prob(20)) - to_chat(H, "You feel icicles forming on your skin!") + to_chat(H, span_danger("You feel icicles forming on your skin!")) else if(breath.temperature >= breath_heat_level_1) if(prob(20)) - to_chat(H, "You feel yourself smouldering in the heat!") + to_chat(H, span_danger("You feel yourself smouldering in the heat!")) var/bodypart = pick(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN,BP_HEAD) if(breath.temperature >= breath_heat_level_1) @@ -369,9 +369,9 @@ if(reagents) if(reagents.total_volume == reagents.maximum_volume * 0.05) - to_chat(organ_owner, "[pick(empty_message)]") + to_chat(organ_owner, span_notice("[pick(empty_message)]")) else if(reagents.total_volume == reagents.maximum_volume && before_gen < reagents.maximum_volume) - to_chat(organ_owner, "[pick(full_message)]") + to_chat(organ_owner, span_warning("[pick(full_message)]")) /obj/item/organ/internal/fruitgland/proc/do_generation() organ_owner.adjust_nutrition(-gen_cost) @@ -399,7 +399,7 @@ fruit_gland.emote_descriptor = list("fruit right off of [fruit_gland.organ_owner]!", "a fruit from [fruit_gland.organ_owner]!") else - to_chat(src, "You lack the organ required to produce fruit.") + to_chat(src, span_notice("You lack the organ required to produce fruit.")) return /mob/living/carbon/human/proc/alraune_fruit_pick() @@ -422,7 +422,7 @@ break if (fruit_gland) //Do they have the gland? if(fruit_gland.reagents.total_volume < fruit_gland.transfer_amount) - to_chat(src, "[pick(fruit_gland.empty_message)]") + to_chat(src, span_notice("[pick(fruit_gland.empty_message)]")) return var/datum/seed/S = SSplants.seeds["[fruit_gland.fruit_type]"] @@ -434,11 +434,11 @@ var/emote = fruit_gland.emote_descriptor[index] var/verb_desc = fruit_gland.verb_descriptor[index] var/self_verb_desc = fruit_gland.self_verb_descriptor[index] - usr.visible_message("[usr] [verb_desc] [emote]", - "You [self_verb_desc] [emote]") + usr.visible_message(span_notice("[usr] [verb_desc] [emote]"), + span_notice("You [self_verb_desc] [emote]")) else - visible_message("[src] [pick(fruit_gland.short_emote_descriptor)] a fruit.", - "You [pick(fruit_gland.self_emote_descriptor)] a fruit.") + visible_message(span_notice("[src] [pick(fruit_gland.short_emote_descriptor)] a fruit."), + span_notice("You [pick(fruit_gland.self_emote_descriptor)] a fruit.")) fruit_gland.reagents.remove_any(fruit_gland.transfer_amount) diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm index 0b6457a9d5..1163aa41f6 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm @@ -176,7 +176,7 @@ var/datum/species/shapeshifter/promethean/prometheans t_him = "her" H.visible_message("\The [H] glomps [target] to make [t_him] feel better!", \ - "You glomp [target] to make [t_him] feel better!") + span_notice("You glomp [target] to make [t_him] feel better!")) H.apply_stored_shock_to(target) /datum/species/shapeshifter/promethean/handle_death(var/mob/living/carbon/human/H) @@ -364,6 +364,6 @@ var/datum/species/shapeshifter/promethean/prometheans if(11 to 20) return "[t_she] glowing gently with moderate levels of electrical activity.\n" if(21 to 35) - return "[t_she] glowing brightly with high levels of electrical activity." + return span_warning("[t_she] glowing brightly with high levels of electrical activity.") if(35 to INFINITY) - return "[t_she] radiating massive levels of electrical activity!" + return span_danger("[t_she] radiating massive levels of electrical activity!") diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm b/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm index fd040e64dd..eb6fe5fd7b 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm @@ -44,19 +44,19 @@ var/atom/movable/to_locate = temporary_form || src if(!isturf(to_locate.loc)) - to_chat(to_locate,"You need more space to perform this action!") + to_chat(to_locate,span_warning("You need more space to perform this action!")) return /* //Blob form if(temporary_form) if(temporary_form.stat) - to_chat(temporary_form,"You can only do this while not stunned.") + to_chat(temporary_form,span_warning("You can only do this while not stunned.")) else prommie_outofblob(temporary_form) */ //Human form else if(stat || paralysis || stunned || weakened || restrained()) - to_chat(src,"You can only do this while not stunned.") + to_chat(src,span_warning("You can only do this while not stunned.")) return else prommie_intoblob() @@ -75,4 +75,4 @@ spawn(1) if(H) - H.gib() \ No newline at end of file + H.gib() diff --git a/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm b/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm index ce68197264..9bdf64f4f2 100644 --- a/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm @@ -241,13 +241,13 @@ var/atom/movable/to_locate = src if(!isturf(to_locate.loc)) - to_chat(src,"You need more space to perform this action!") + to_chat(src,span_warning("You need more space to perform this action!")) return //Blob form if(!ishuman(src)) if(humanform.temporary_form.stat || paralysis || stunned || weakened || restrained()) - to_chat(src,"You can only do this while not stunned.") + to_chat(src,span_warning("You can only do this while not stunned.")) else humanform.prommie_outofblob(src) @@ -326,7 +326,7 @@ // Helpers - Unsafe, WILL perform change. /mob/living/carbon/human/proc/prommie_intoblob(force) if(!force && !isturf(loc)) - to_chat(src,"You can't change forms while inside something.") + to_chat(src,span_warning("You can't change forms while inside something.")) return handle_grasp() //It's possible to blob out before some key parts of the life loop. This results in things getting dropped at null. TODO: Fix the code so this can be done better. @@ -436,7 +436,7 @@ return if(!force && !isturf(blob.loc)) - to_chat(blob,"You can't change forms while inside something.") + to_chat(blob,span_warning("You can't change forms while inside something.")) return if(buckled) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm index 1ebb8a1d1a..fb1b1366e4 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm @@ -276,7 +276,7 @@ if(target.buckled) target.buckled.unbuckle_mob(target, force = TRUE) target.forceMove(vore_selected) - to_chat(target,"\The [src] quickly engulfs you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") + to_chat(target,span_vwarning("\The [src] quickly engulfs you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!")) /mob/living/simple_mob/protean_blob/attack_target(var/atom/A) if(refactory && istype(A,/obj/item/stack/material)) @@ -320,7 +320,7 @@ var/global/list/disallowed_protean_accessories = list( // Helpers - Unsafe, WILL perform change. /mob/living/carbon/human/proc/nano_intoblob(force) if(!force && !isturf(loc)) - to_chat(src,"You can't change forms while inside something.") + to_chat(src,span_warning("You can't change forms while inside something.")) return var/panel_was_up = FALSE @@ -424,7 +424,7 @@ var/global/list/disallowed_protean_accessories = list( return if(!force && !isturf(blob.loc)) - to_chat(blob,"You can't change forms while inside something.") + to_chat(blob,span_warning("You can't change forms while inside something.")) return var/panel_was_up = FALSE diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm index 6b8485c5d5..397d5943ba 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm @@ -9,17 +9,17 @@ set hidden = TRUE if(stat) - to_chat(src,"You must be awake and standing to perform this action!") + to_chat(src,span_warning("You must be awake and standing to perform this action!")) return if(!isturf(loc)) - to_chat(src,"You need more space to perform this action!") + to_chat(src,span_warning("You need more space to perform this action!")) return var/obj/item/organ/internal/nano/refactory/refactory = nano_get_refactory() //Missing the organ that does this if(!istype(refactory)) - to_chat(src,"You don't have a working refactory module!") + to_chat(src,span_warning("You don't have a working refactory module!")) return var/choice = tgui_input_list(src,"Pick the bodypart to change:", "Refactor - One Bodypart", species.has_limbs) @@ -29,7 +29,7 @@ //Organ is missing, needs restoring if(!organs_by_name[choice] || istype(organs_by_name[choice], /obj/item/organ/external/stump)) //allows limb stumps to regenerate like removed limbs. if(refactory.get_stored_material(MAT_STEEL) < PER_LIMB_STEEL_COST) - to_chat(src,"You're missing that limb, and need to store at least [PER_LIMB_STEEL_COST] steel to regenerate it.") + to_chat(src,span_warning("You're missing that limb, and need to store at least [PER_LIMB_STEEL_COST] steel to regenerate it.")) return var/regen = tgui_alert(src,"That limb is missing, do you want to regenerate it in exchange for [PER_LIMB_STEEL_COST] steel?","Regenerate limb?",list("Yes","No")) if(regen != "Yes") @@ -91,22 +91,22 @@ set hidden = TRUE if(stat) - to_chat(src,"You must be awake and standing to perform this action!") + to_chat(src,span_warning("You must be awake and standing to perform this action!")) return if(!isturf(loc)) - to_chat(src,"You need more space to perform this action!") + to_chat(src,span_warning("You need more space to perform this action!")) return var/obj/item/organ/internal/nano/refactory/refactory = nano_get_refactory() //Missing the organ that does this if(!istype(refactory)) - to_chat(src,"You don't have a working refactory module!") + to_chat(src,span_warning("You don't have a working refactory module!")) return //Already regenerating if(active_regen) - to_chat(src, "You are already refactoring!") + to_chat(src, span_warning("You are already refactoring!")) return var/swap_not_rebuild = tgui_alert(src,"Do you want to rebuild, or reshape?","Rebuild or Reshape",list("Reshape","Cancel","Rebuild")) @@ -133,7 +133,7 @@ return //Ain't got a torso! var/obj/item/organ/external/torso = organs_by_name[BP_TORSO] - to_chat(src, "Remain still while the process takes place! It will take 5 seconds.") + to_chat(src, span_danger("Remain still while the process takes place! It will take 5 seconds.")) visible_message("[src]'s form collapses into an amorphous blob of black ichor...") var/mob/living/simple_mob/protean_blob/blob = nano_intoblob() @@ -149,11 +149,11 @@ //Not enough resources (AND spends the resources, should be the last check) if(!refactory.use_stored_material(MAT_STEEL,refactory.max_storage)) - to_chat(src, "You need to be maxed out on normal metal to do this!") + to_chat(src, span_warning("You need to be maxed out on normal metal to do this!")) return var/delay_length = round(active_regen_delay * species.active_regen_mult) - to_chat(src, "Remain still while the process takes place! It will take [delay_length/10] seconds.") + to_chat(src, span_danger("Remain still while the process takes place! It will take [delay_length/10] seconds.")) visible_message("[src]'s form begins to shift and ripple as if made of oil...") active_regen = TRUE @@ -174,14 +174,14 @@ log_debug("[src] protean-regen'd but lacked a refactory when done.") else new_refactory.materials = holder - to_chat(src, "Your refactoring is complete.") //Guarantees the message shows no matter how bad the timing. - to_chat(blob, "Your refactoring is complete!") + to_chat(src, span_notice("Your refactoring is complete.")) //Guarantees the message shows no matter how bad the timing. + to_chat(blob, span_notice("Your refactoring is complete!")) else - to_chat(src, "Your refactoring has failed.") - to_chat(blob, "Your refactoring has failed!") + to_chat(src, span_critical("Your refactoring has failed.")) + to_chat(blob, span_critical("Your refactoring has failed!")) else - to_chat(src, "Your refactoring is interrupted.") - to_chat(blob, "Your refactoring is interrupted!") + to_chat(src, span_critical("Your refactoring is interrupted.")) + to_chat(blob, span_critical("Your refactoring is interrupted!")) active_regen = FALSE nano_outofblob(blob) @@ -198,12 +198,12 @@ var/obj/item/organ/internal/nano/refactory/refactory = nano_get_refactory() //Missing the organ that does this if(!istype(refactory)) - to_chat(src,"You don't have a working refactory module!") + to_chat(src,span_warning("You don't have a working refactory module!")) return var/held = get_active_hand() if(!istype(held,/obj/item/stack/material)) - to_chat(src,"You aren't holding a stack of materials in your active hand...!") + to_chat(src,span_warning("You aren't holding a stack of materials in your active hand...!")) return var/obj/item/stack/material/matstack = held @@ -212,7 +212,7 @@ for(var/material in PROTEAN_EDIBLE_MATERIALS) if(material == substance) allowed = TRUE if(!allowed) - to_chat(src,"You can't process [substance]!") + to_chat(src,span_warning("You can't process [substance]!")) return //Only a few things matter, the rest are best not cluttering the lists. var/howmuch = tgui_input_number(src,"How much do you want to store? (0-[matstack.get_amount()])","Select amount",null,matstack.get_amount(),0) @@ -222,13 +222,13 @@ var/actually_added = refactory.add_stored_material(substance,howmuch*matstack.perunit) matstack.use(CEILING((actually_added/matstack.perunit), 1)) if(actually_added && actually_added < howmuch) - to_chat(src,"Your refactory module is now full, so only [actually_added] units were stored.") - visible_message("[src] nibbles some of the [substance] right off the stack!") + to_chat(src,span_warning("Your refactory module is now full, so only [actually_added] units were stored.")) + visible_message(span_notice("[src] nibbles some of the [substance] right off the stack!")) else if(actually_added) - to_chat(src,"You store [actually_added] units of [substance].") - visible_message("[src] devours some of the [substance] right off the stack!") + to_chat(src,span_notice("You store [actually_added] units of [substance].")) + visible_message(span_notice("[src] devours some of the [substance] right off the stack!")) else - to_chat(src,"You're completely capped out on [substance]!") + to_chat(src,span_notice("You're completely capped out on [substance]!")) //// // Blob Form @@ -241,21 +241,21 @@ var/atom/movable/to_locate = temporary_form || src if(!isturf(to_locate.loc)) - to_chat(to_locate,"You need more space to perform this action!") + to_chat(to_locate,span_warning("You need more space to perform this action!")) return //Blob form if(temporary_form) if(health < maxHealth*0.5) - to_chat(temporary_form,"You need to regenerate more nanites first!") + to_chat(temporary_form,span_warning("You need to regenerate more nanites first!")) else if(temporary_form.stat) - to_chat(temporary_form,"You can only do this while not stunned.") + to_chat(temporary_form,span_warning("You can only do this while not stunned.")) else nano_outofblob(temporary_form) //Human form else if(stat) - to_chat(src,"You can only do this while not stunned.") + to_chat(src,span_warning("You can only do this while not stunned.")) return else nano_intoblob() @@ -269,7 +269,7 @@ set category = "Abilities" if(stat) - to_chat(src,"You must be awake and standing to perform this action!") + to_chat(src,span_warning("You must be awake and standing to perform this action!")) return var/new_species = tgui_input_list(usr, "Please select a species to emulate.", "Shapeshifter Body", GLOB.playable_species) @@ -290,7 +290,7 @@ var/obj/item/organ/internal/nano/refactory/refactory = nano_get_refactory() //Missing the organ that does this if(!istype(refactory)) - to_chat(user,"You don't have a working refactory module!") + to_chat(user,span_warning("You don't have a working refactory module!")) return var/nagmessage = "Adjust your mass to be a size between 25 to 200% (or between 1 to 600% in dorms area). Up-sizing consumes metal, downsizing returns metal." @@ -313,16 +313,16 @@ if(refactory.use_stored_material(MAT_STEEL,cost)) user.resize(size_factor, ignore_prefs = TRUE) else - to_chat(user,"That size change would cost [cost] steel, which you don't have.") + to_chat(user,span_warning("That size change would cost [cost] steel, which you don't have.")) //Sizing down (or not at all) else if(cost <= 0) cost = abs(cost) var/actually_added = refactory.add_stored_material(MAT_STEEL,cost) user.resize(size_factor, ignore_prefs = TRUE) if(actually_added != cost) - to_chat(user,"Unfortunately, [cost-actually_added] steel was lost due to lack of storage space.") + to_chat(user,span_warning("Unfortunately, [cost-actually_added] steel was lost due to lack of storage space.")) - user.visible_message("Black mist swirls around [user] as they change size.") + user.visible_message(span_notice("Black mist swirls around [user] as they change size.")) /// /// /// A helper to reuse /mob/living/proc/nano_get_refactory(obj/item/organ/internal/nano/refactory/R) @@ -358,7 +358,7 @@ var/opts = clickprops["shift"] if(opts) - to_chat(usr,"[ability_name] - [desc]") + to_chat(usr,span_notice("[ability_name] - [desc]")) else //Humanform using it if(ishuman(usr)) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm index b26c1eda0c..d106ec4eb4 100755 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm @@ -178,7 +178,7 @@ H.ckey = H.temporary_form.ckey QDEL_NULL(H.temporary_form) - to_chat(H, "You died as a Protean. Please sit out of the round for at least 60 minutes before respawning, to represent the time it would take to ship a new-you to the station.") + to_chat(H, span_warning("You died as a Protean. Please sit out of the round for at least 60 minutes before respawning, to represent the time it would take to ship a new-you to the station.")) spawn(1) if(H) @@ -263,8 +263,8 @@ name = "Protean Effect - M.Hydrogen" desc = "You're affected by the presence of metallic hydrogen." - on_created_text = "You feel yourself accelerate, the metallic hydrogen increasing your speed temporarily." - on_expired_text = "Your refactory finishes consuming the metallic hydrogen, and you return to normal speed." + on_created_text = span_notice("You feel yourself accelerate, the metallic hydrogen increasing your speed temporarily.") + on_expired_text = span_notice("Your refactory finishes consuming the metallic hydrogen, and you return to normal speed.") material_name = MAT_METALHYDROGEN @@ -274,8 +274,8 @@ name = "Protean Effect - Uranium" desc = "You're affected by the presence of uranium." - on_created_text = "You feel yourself become nearly impervious to physical attacks as uranium is incorporated in your nanites." - on_expired_text = "Your refactory finishes consuming the uranium, and you return to your normal nanites." + on_created_text = span_notice("You feel yourself become nearly impervious to physical attacks as uranium is incorporated in your nanites.") + on_expired_text = span_notice("Your refactory finishes consuming the uranium, and you return to your normal nanites.") material_name = MAT_URANIUM @@ -285,8 +285,8 @@ name = "Protean Effect - Gold" desc = "You're affected by the presence of gold." - on_created_text = "You feel yourself become more reflective, able to resist heat and fire better for a time." - on_expired_text = "Your refactory finishes consuming the gold, and you return to your normal nanites." + on_created_text = span_notice("You feel yourself become more reflective, able to resist heat and fire better for a time.") + on_expired_text = span_notice("Your refactory finishes consuming the gold, and you return to your normal nanites.") material_name = MAT_GOLD @@ -296,8 +296,8 @@ name = "Protean Effect - Silver" desc = "You're affected by the presence of silver." - on_created_text = "Your physical control is improved for a time, making it easier to hit targets, and avoid being hit." - on_expired_text = "Your refactory finishes consuming the silver, and your motor control returns to normal." + on_created_text = span_notice("Your physical control is improved for a time, making it easier to hit targets, and avoid being hit.") + on_expired_text = span_notice("Your refactory finishes consuming the silver, and your motor control returns to normal.") material_name = MAT_SILVER @@ -308,8 +308,8 @@ name = "Protean Effect - Steel" desc = "You're affected by the presence of steel." - on_created_text = "You feel new nanites being produced from your stockpile of steel, healing you slowly." - on_expired_text = "Your steel supply has either run out, or is no longer needed, and your healing stops." + on_created_text = span_notice("You feel new nanites being produced from your stockpile of steel, healing you slowly.") + on_expired_text = span_notice("Your steel supply has either run out, or is no longer needed, and your healing stops.") material_name = MAT_STEEL @@ -348,4 +348,4 @@ . += registring #undef DAM_SCALE_FACTOR -#undef METAL_PER_TICK \ No newline at end of file +#undef METAL_PER_TICK diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index 6663c8f130..fda555edd8 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -625,7 +625,7 @@ H.mind.transfer_to(S) if(H.isSynthetic()) - H.visible_message("\The [H] collapses into parts, revealing a solitary diona nymph at the core.") + H.visible_message(span_danger("\The [H] collapses into parts, revealing a solitary diona nymph at the core.")) H.species = GLOB.all_species[SPECIES_HUMAN] // This is hard-set to default the body to a normal FBP, without changing anything. @@ -644,7 +644,7 @@ else qdel(D) - H.visible_message("\The [H] splits apart with a wet slithering noise!") + H.visible_message(span_danger("\The [H] splits apart with a wet slithering noise!")) /datum/species/diona/handle_environment_special(var/mob/living/carbon/human/H) if(H.inStasisNow()) diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm index 2e609a780f..4c7b12a130 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm @@ -49,14 +49,14 @@ spawn(time SECONDS) // check to see if they've been fixed by outside forces in the meantime such as defibbing if(stat != DEAD) - to_chat(src, "Your body has recovered from its ordeal, ready to regenerate itself again.") + to_chat(src, span_notice("Your body has recovered from its ordeal, ready to regenerate itself again.")) revive_ready = REVIVING_READY //reset their cooldown clear_alert("regen") throw_alert("hatch", /obj/screen/alert/xenochimera/readytohatch) // Was dead, still dead. else - to_chat(src, "Consciousness begins to stir as your new body awakens, ready to hatch.") + to_chat(src, span_notice("Consciousness begins to stir as your new body awakens, ready to hatch.")) verbs |= /mob/living/carbon/human/proc/hatch revive_ready = REVIVING_DONE src << sound('sound/effects/mob_effects/xenochimera/hatch_notification.ogg',0,0,0,30) @@ -76,9 +76,9 @@ //Slightly different flavour messages if(stat != DEAD || hasnutriment()) - to_chat(src, "Consciousness begins to stir as your new body awakens, ready to hatch..") + to_chat(src, span_notice("Consciousness begins to stir as your new body awakens, ready to hatch..")) else - to_chat(src, "Consciousness begins to stir as your battered body struggles to recover from its ordeal..") + to_chat(src, span_warning("Consciousness begins to stir as your battered body struggles to recover from its ordeal..")) verbs |= /mob/living/carbon/human/proc/hatch revive_ready = REVIVING_DONE src << sound('sound/effects/mob_effects/xenochimera/hatch_notification.ogg',0,0,0,30) @@ -126,7 +126,7 @@ chimera_hatch() add_modifier(/datum/modifier/resleeving_sickness/chimera, sickness_duration) adjustBrainLoss(5) // if they're reviving from dead, they come back with 5 brainloss on top of whatever's unhealed. - visible_message("

    The former corpse staggers to its feet, all its former wounds having vanished...

    ") //Bloody hell... + visible_message(span_warning("

    The former corpse staggers to its feet, all its former wounds having vanished...

    ")) //Bloody hell... clear_alert("hatch") return @@ -134,12 +134,12 @@ else chimera_hatch() - visible_message("

    [src] rises to \his feet.

    ") //Bloody hell... + visible_message(span_warning("

    [src] rises to \his feet.

    ")) //Bloody hell... clear_alert("hatch") /mob/living/carbon/human/proc/chimera_hatch() verbs -= /mob/living/carbon/human/proc/hatch - to_chat(src, "Your new body awakens, bursting free from your old skin.") + to_chat(src, span_notice("Your new body awakens, bursting free from your old skin.")) //Modify and record values (half nutrition and braindamage) var/old_nutrition = nutrition var/braindamage = min(5, max(0, (brainloss-1) * 0.5)) //brainloss is tricky to heal and might take a couple of goes to get rid of completely. @@ -160,7 +160,7 @@ var/blood_color = species.blood_color var/flesh_color = species.flesh_color new /obj/effect/gibspawner/human/xenochimera(T, null, flesh_color, blood_color) - visible_message("

    The lifeless husk of [src] bursts open, revealing a new, intact copy in the pool of viscera.

    ") //Bloody hell... + visible_message(span_danger("

    The lifeless husk of [src] bursts open, revealing a new, intact copy in the pool of viscera.

    ")) //Bloody hell... playsound(T, 'sound/effects/mob_effects/xenochimera/hatch.ogg', 50) else //lower cost for doing a quick cosmetic revive nutrition = old_nutrition * 0.9 @@ -176,8 +176,8 @@ name = "imperfect regeneration" desc = "You feel rather weak and unfocused, having just regrown your body not so long ago." - on_created_text = "You feel weak and unsteady, that regeneration having been rougher than most." - on_expired_text = "You feel your strength and focus return to you." + on_created_text = span_warning("You feel weak and unsteady, that regeneration having been rougher than most.") + on_expired_text = span_notice("You feel your strength and focus return to you.") /mob/living/carbon/human/proc/revivingreset() // keep this as a debug proc or potential future use revive_ready = REVIVING_READY @@ -378,7 +378,7 @@ var/list/hiddenspeakers = list("Someone distant", "A voice nearby","A familiar voice", "An echoing voice", "A cautious voice", "A scared voice", "Someone around the corner", "Someone", "Something", "Something scary", "An urgent voice", "An angry voice") var/list/speakerverbs = list("calls out", "yells", "screams", "exclaims", "shrieks", "shouts", "hisses", "snarls") var/list/spookyphrases = list("It's over here!","Stop it!", "Hunt it down!", "Get it!", "Quick, over here!", "Anyone there?", "Who's there?", "Catch that thing!", "Stop it! Kill it!", "Anyone there?", "Where is it?", "Find it!", "There it is!") - to_chat(src, "[pick(hiddenspeakers)] [pick(speakerverbs)], \"[pick(spookyphrases)]\"") + to_chat(src, span_game(span_say(span_name(pick(hiddenspeakers)) + " [pick(speakerverbs)], \"[pick(spookyphrases)]\""))) handling_hal = 0 @@ -516,34 +516,34 @@ var/mob/living/carbon/human/C = src var/obj/item/grab/G = src.get_active_hand() if(!istype(G)) - to_chat(C, "You must be grabbing a creature in your active hand to absorb them.") + to_chat(C, span_warning("You must be grabbing a creature in your active hand to absorb them.")) return var/mob/living/carbon/human/T = G.affecting // I must say, this is a quite ingenious way of doing it. Props to the original coders. if(!istype(T) || T.isSynthetic()) - to_chat(src, "\The [T] is not able to be drained.") + to_chat(src, span_warning("\The [T] is not able to be drained.")) return if(G.state != GRAB_NECK) - to_chat(C, "You must have a tighter grip to drain this creature.") + to_chat(C, span_warning("You must have a tighter grip to drain this creature.")) return if(C.absorbing_prey) - to_chat(C, "You are already draining someone!") + to_chat(C, span_warning("You are already draining someone!")) return C.absorbing_prey = 1 for(var/stage = 1, stage<=100, stage++) //100 stages. switch(stage) if(1) - to_chat(C, "You begin to drain [T]...") - to_chat(T, "An odd sensation flows through your body as [C] begins to drain you!") + to_chat(C, span_notice("You begin to drain [T]...")) + to_chat(T, span_danger("An odd sensation flows through your body as [C] begins to drain you!")) C.nutrition = (C.nutrition + (T.nutrition*0.05)) //Drain a small bit at first. 5% of the prey's nutrition. T.nutrition = T.nutrition*0.95 if(2) - to_chat(C, "You feel stronger with every passing moment of draining [T].") - src.visible_message("[C] seems to be doing something to [T], resulting in [T]'s body looking weaker with every passing moment!") - to_chat(T, "You feel weaker with every passing moment as [C] drains you!") + to_chat(C, span_notice("You feel stronger with every passing moment of draining [T].")) + src.visible_message(span_danger("[C] seems to be doing something to [T], resulting in [T]'s body looking weaker with every passing moment!")) + to_chat(T, span_danger("You feel weaker with every passing moment as [C] drains you!")) C.nutrition = (C.nutrition + (T.nutrition*0.1)) T.nutrition = T.nutrition*0.9 if(3 to 99) @@ -560,13 +560,13 @@ var/damage_to_be_applied = T.species.total_health //Get their max health. T.apply_damage(damage_to_be_applied, HALLOSS) //Knock em out. C.absorbing_prey = 0 - to_chat(C, "You have completely drained [T], causing them to pass out.") - to_chat(T, "You feel weak, as if you have no control over your body whatsoever as [C] finishes draining you.!") + to_chat(C, span_notice("You have completely drained [T], causing them to pass out.")) + to_chat(T, span_danger("You feel weak, as if you have no control over your body whatsoever as [C] finishes draining you.!")) add_attack_logs(C,T,"Succubus drained") return if(!do_mob(src, T, 50) || G.state != GRAB_NECK) //One drain tick every 5 seconds. - to_chat(src, "Your draining of [T] has been interrupted!") + to_chat(src, span_warning("Your draining of [T] has been interrupted!")) C.absorbing_prey = 0 return @@ -579,20 +579,20 @@ var/obj/item/grab/G = src.get_active_hand() if(!istype(G)) - to_chat(src, "You must be grabbing a creature in your active hand to drain them.") + to_chat(src, span_warning("You must be grabbing a creature in your active hand to drain them.")) return var/mob/living/carbon/human/T = G.affecting // I must say, this is a quite ingenious way of doing it. Props to the original coders. if(!istype(T) || T.isSynthetic()) - to_chat(src, "\The [T] is not able to be drained.") + to_chat(src, span_warning("\The [T] is not able to be drained.")) return if(G.state != GRAB_NECK) - to_chat(src, "You must have a tighter grip to drain this creature.") + to_chat(src, span_warning("You must have a tighter grip to drain this creature.")) return if(absorbing_prey) - to_chat(src, "You are already draining someone!") + to_chat(src, span_warning("You are already draining someone!")) return absorbing_prey = 1 @@ -600,16 +600,16 @@ switch(stage) if(1) if(T.stat == DEAD) - to_chat(src, "[T] is dead and can not be drained..") + to_chat(src, span_warning("[T] is dead and can not be drained..")) return - to_chat(src, "You begin to drain [T]...") - to_chat(T, "An odd sensation flows through your body as [src] begins to drain you!") + to_chat(src, span_notice("You begin to drain [T]...")) + to_chat(T, span_danger("An odd sensation flows through your body as [src] begins to drain you!")) nutrition = (nutrition + (T.nutrition*0.05)) //Drain a small bit at first. 5% of the prey's nutrition. T.nutrition = T.nutrition*0.95 if(2) - to_chat(src, "You feel stronger with every passing moment as you drain [T].") - visible_message("[src] seems to be doing something to [T], resulting in [T]'s body looking weaker with every passing moment!") - to_chat(T, "You feel weaker with every passing moment as [src] drains you!") + to_chat(src, span_notice("You feel stronger with every passing moment as you drain [T].")) + visible_message(span_danger("[src] seems to be doing something to [T], resulting in [T]'s body looking weaker with every passing moment!")) + to_chat(T, span_danger("You feel weaker with every passing moment as [src] drains you!")) nutrition = (nutrition + (T.nutrition*0.1)) T.nutrition = T.nutrition*0.9 if(3 to 48) //Should be more than enough to get under 100. @@ -623,22 +623,22 @@ stage = 3 //Otherwise, advance to stage 50 (Lethal draining.) if(50) if(!T.digestable) - to_chat(src, "You feel invigorated as you completely drain [T] and begin to move onto draining them lethally before realizing they are too strong for you to do so!") - to_chat(T, "You feel completely drained as [src] finishes draining you and begins to move onto draining you lethally, but you are too strong for them to do so!") + to_chat(src, span_danger("You feel invigorated as you completely drain [T] and begin to move onto draining them lethally before realizing they are too strong for you to do so!")) + to_chat(T, span_danger("You feel completely drained as [src] finishes draining you and begins to move onto draining you lethally, but you are too strong for them to do so!")) nutrition = (nutrition + T.nutrition) T.nutrition = 0 //Completely drained of everything. var/damage_to_be_applied = T.species.total_health //Get their max health. T.apply_damage(damage_to_be_applied, HALLOSS) //Knock em out. absorbing_prey = 0 //Clean this up before we return return - to_chat(src, "You begin to drain [T] completely...") - to_chat(T, "An odd sensation flows through your body as you as [src] begins to drain you to dangerous levels!") + to_chat(src, span_notice("You begin to drain [T] completely...")) + to_chat(T, span_danger("An odd sensation flows through your body as you as [src] begins to drain you to dangerous levels!")) if(51 to 98) if(T.stat == DEAD) T.apply_damage(500, OXY) //Bit of fluff. absorbing_prey = 0 - to_chat(src, "You have completely drained [T], killing them.") - to_chat(T, "You feel... So... Weak...") + to_chat(src, span_notice("You have completely drained [T], killing them.")) + to_chat(T, span_danger(span_giant("You feel... So... Weak..."))) add_attack_logs(src,T,"Succubus drained (almost lethal)") return if(drain_finalized == 1 || T.getBrainLoss() < 55) //Let's not kill them with this unless the drain is finalized. This will still stack up to 55, since 60 is lethal. @@ -651,14 +651,14 @@ if(100) //They shouldn't survive long enough to get here, but just in case. T.apply_damage(500, OXY) //Kill them. absorbing_prey = 0 - to_chat(src, "You have completely drained [T], killing them in the process.") - to_chat(T, "You... Feel... So... Weak...") - visible_message("[src] seems to finish whatever they were doing to [T].") + to_chat(src, span_notice("You have completely drained [T], killing them in the process.")) + to_chat(T, span_danger("You... Feel... So... Weak...")) + visible_message(span_danger("[src] seems to finish whatever they were doing to [T].")) add_attack_logs(src,T,"Succubus drained (lethal)") return if(!do_mob(src, T, 50) || G.state != GRAB_NECK) //One drain tick every 5 seconds. - to_chat(src, "Your draining of [T] has been interrupted!") + to_chat(src, span_warning("Your draining of [T] has been interrupted!")) absorbing_prey = 0 return @@ -671,33 +671,33 @@ var/mob/living/carbon/human/C = src var/obj/item/grab/G = src.get_active_hand() if(!istype(G)) - to_chat(C, "You must be grabbing a creature in your active hand to feed them.") + to_chat(C, span_warning("You must be grabbing a creature in your active hand to feed them.")) return var/mob/living/carbon/human/T = G.affecting // I must say, this is a quite ingenious way of doing it. Props to the original coders. if(!istype(T)) - to_chat(src, "\The [T] is not able to be fed.") + to_chat(src, span_warning("\The [T] is not able to be fed.")) return if(!G.state) //This should never occur. But alright return if(C.absorbing_prey) - to_chat(C, "You are already feeding someone!") + to_chat(C, span_warning("You are already feeding someone!")) return C.absorbing_prey = 1 for(var/stage = 1, stage<=100, stage++) //100 stages. switch(stage) if(1) - to_chat(C, "You begin to feed [T]...") - to_chat(T, "An odd sensation flows through your body as [C] begins to feed you!") + to_chat(C, span_notice("You begin to feed [T]...")) + to_chat(T, span_notice("An odd sensation flows through your body as [C] begins to feed you!")) T.nutrition = (T.nutrition + (C.nutrition*0.05)) //Drain a small bit at first. 5% of the prey's nutrition. C.nutrition = C.nutrition*0.95 if(2) - to_chat(C, "You feel weaker with every passing moment of feeding [T].") - src.visible_message("[C] seems to be doing something to [T], resulting in [T]'s body looking stronger with every passing moment!") - to_chat(T, "You feel stronger with every passing moment as [C] feeds you!") + to_chat(C, span_notice("You feel weaker with every passing moment of feeding [T].")) + src.visible_message(span_notice("[C] seems to be doing something to [T], resulting in [T]'s body looking stronger with every passing moment!")) + to_chat(T, span_notice("You feel stronger with every passing moment as [C] feeds you!")) T.nutrition = (T.nutrition + (C.nutrition*0.1)) C.nutrition = C.nutrition*0.90 if(3 to 99) @@ -712,14 +712,14 @@ T.nutrition = (T.nutrition + C.nutrition) C.nutrition = 0 //Completely drained of everything. C.absorbing_prey = 0 - to_chat(C, "You have completely fed [T] every part of your body!") - to_chat(T, "You feel quite strong and well fed, as [C] finishes feeding \himself to you!") + to_chat(C, span_danger("You have completely fed [T] every part of your body!")) + to_chat(T, span_notice("You feel quite strong and well fed, as [C] finishes feeding \himself to you!")) add_attack_logs(C,T,"Slime fed") C.feed_grabbed_to_self_falling_nom(T,C) //Reused this proc instead of making a new one to cut down on code usage. return if(!do_mob(src, T, 50) || !G.state) //One drain tick every 5 seconds. - to_chat(src, "Your feeding of [T] has been interrupted!") + to_chat(src, span_warning("Your feeding of [T] has been interrupted!")) C.absorbing_prey = 0 return @@ -730,7 +730,7 @@ var/mob/living/carbon/human/C = src C.drain_finalized = !C.drain_finalized - to_chat(C, "You will [C.drain_finalized?"now":"not"] finalize draining/feeding.") + to_chat(C, span_notice("You will [C.drain_finalized?"now":"not"] finalize draining/feeding.")) //Test to see if we can shred a mob. Some child override needs to pass us a target. We'll return it if you can. @@ -738,19 +738,19 @@ /mob/living/proc/can_shred(var/mob/living/carbon/human/target) //Needs to have organs to be able to shred them. if(!istype(target)) - to_chat(src,"You can't shred that type of creature.") + to_chat(src,span_warning("You can't shred that type of creature.")) return FALSE //Needs to be capable (replace with incapacitated call?) if(stat || paralysis || stunned || weakened || lying || restrained() || buckled) - to_chat(src,"You cannot do that in your current state!") + to_chat(src,span_warning("You cannot do that in your current state!")) return FALSE //Needs to be adjacent, at the very least. if(!Adjacent(target)) - to_chat(src,"You must be next to your target.") + to_chat(src,span_warning("You must be next to your target.")) return FALSE //Cooldown on abilities if(last_special > world.time) - to_chat(src,"You can't perform an ability again so soon!") + to_chat(src,span_warning("You can't perform an ability again so soon!")) return FALSE return target @@ -761,10 +761,10 @@ //Humans need a grab var/obj/item/grab/G = get_active_hand() if(!istype(G)) - to_chat(src,"You have to have a very strong grip on someone first!") + to_chat(src,span_warning("You have to have a very strong grip on someone first!")) return FALSE if(G.state != GRAB_NECK) - to_chat(src,"You must have a tighter grip to severely damage this creature!") + to_chat(src,span_warning("You must have a tighter grip to severely damage this creature!")) return FALSE return ..(G.affecting) @@ -777,7 +777,7 @@ choices += M if(!choices.len) - to_chat(src,"There's nobody nearby to use this on.") + to_chat(src,span_warning("There's nobody nearby to use this on.")) target = tgui_input_list(src,"Who do you wish to target?","Damage/Remove Prey's Organ", choices) if(!istype(target)) @@ -792,7 +792,7 @@ choices += M if(!choices.len) - to_chat(src,"There's nobody nearby to use this on.") + to_chat(src,span_warning("There's nobody nearby to use this on.")) target = tgui_input_list(src,"Who do you wish to target?","Damage/Remove Prey's Organ", choices) if(!istype(target)) @@ -807,7 +807,7 @@ choices += M if(!choices.len) - to_chat(src,"There's nobody nearby to use this on.") + to_chat(src,span_warning("There's nobody nearby to use this on.")) target = tgui_input_list(src,"Who do you wish to target?","Damage/Remove Prey's Organ", choices) if(!istype(target)) @@ -843,15 +843,15 @@ var/obj/belly/B = tgui_input_list(src,"To where do you wish to swallow the organ if you tear if out? If not at all, click 'cancel'", "Organ Choice", vore_organs) if(can_shred(T) != T) - to_chat(src,"Looks like you lost your chance...") + to_chat(src,span_warning("Looks like you lost your chance...")) return last_special = world.time + vore_shred_time - visible_message("[src] appears to be preparing to do something to [T]!") //Let everyone know that bad times are ahead + visible_message(span_danger("[src] appears to be preparing to do something to [T]!")) //Let everyone know that bad times are ahead if(do_after(src, vore_shred_time, T)) //Ten seconds. You have to be in a neckgrab for this, so you're already in a bad position. if(can_shred(T) != T) - to_chat(src,"Looks like you lost your chance...") + to_chat(src,span_warning("Looks like you lost your chance...")) return T.add_modifier(/datum/modifier/gory_devourment, 10 SECONDS) @@ -862,10 +862,10 @@ T_int.removed() if(B) T_int.forceMove(B) //Move to pred's gut - visible_message("[src] severely damages [T_int.name] of [T]!") + visible_message(span_danger("[src] severely damages [T_int.name] of [T]!")) else T_int.forceMove(T.loc) - visible_message("[src] severely damages [T_ext.name] of [T], resulting in their [T_int.name] coming out!","You tear out [T]'s [T_int.name]!") + visible_message(span_danger("[src] severely damages [T_ext.name] of [T], resulting in their [T_int.name] coming out!"),span_warning("You tear out [T]'s [T_int.name]!")) //Removing an external organ else if(!T_int && (T_ext.damage >= 25 || T_ext.brute_dam >= 25)) @@ -874,20 +874,20 @@ //Is it groin/chest? You can't remove those. if(T_ext.cannot_amputate) T.apply_damage(25, BRUTE, T_ext) - visible_message("[src] severely damages [T]'s [T_ext.name]!") + visible_message(span_danger("[src] severely damages [T]'s [T_ext.name]!")) else if(B) T_ext.forceMove(B) - visible_message("[src] swallows [T]'s [T_ext.name] into their [lowertext(B.name)]!") + visible_message(span_warning("[src] swallows [T]'s [T_ext.name] into their [lowertext(B.name)]!")) else T_ext.forceMove(T.loc) - visible_message("[src] tears off [T]'s [T_ext.name]!","You tear off [T]'s [T_ext.name]!") + visible_message(span_warning("[src] tears off [T]'s [T_ext.name]!"),span_warning("You tear off [T]'s [T_ext.name]!")) //Not targeting an internal organ w/ > 25 damage , and the limb doesn't have < 25 damage. else if(T_int) T_int.damage = 25 //Internal organs can only take damage, not brute damage. T.apply_damage(25, BRUTE, T_ext) - visible_message("[src] severely damages [T]'s [T_ext.name]!") + visible_message(span_danger("[src] severely damages [T]'s [T_ext.name]!")) add_attack_logs(src,T,"Shredded (hardvore)") @@ -910,12 +910,12 @@ to_chat(src, "You cannot fly in this state!") return if(C.nutrition < 25 && !C.flying) //Don't have any food in you?" You can't fly. - to_chat(C, "You lack the nutrition to fly.") + to_chat(C, span_notice("You lack the nutrition to fly.")) return C.flying = !C.flying update_floating() - to_chat(C, "You have [C.flying?"started":"stopped"] flying.") + to_chat(C, span_notice("You have [C.flying?"started":"stopped"] flying.")) /mob/living/ var/flight_vore = FALSE @@ -948,17 +948,17 @@ to_chat(src, "You cannot hover in your current state!") return if(C.nutrition < 50 && !C.flying) //Don't have any food in you?" You can't hover, since it takes up 25 nutrition. And it's not 25 since we don't want them to immediately fall. - to_chat(C, "You lack the nutrition to fly.") + to_chat(C, span_notice("You lack the nutrition to fly.")) return if(C.anchored) - to_chat(C, "You are already hovering and/or anchored in place!") + to_chat(C, span_notice("You are already hovering and/or anchored in place!")) return if(!C.anchored && !C.pulledby) //Not currently anchored, and not pulled by anyone. C.anchored = TRUE //This is the only way to stop the inertial_drift. C.adjust_nutrition(-25) update_floating() - to_chat(C, "You hover in place.") + to_chat(C, span_notice("You hover in place.")) spawn(6) //.6 seconds. C.anchored = FALSE else @@ -978,7 +978,7 @@ if(species.is_weaver) to_chat(src, "Your silk reserves are at [species.silk_reserve]/[species.silk_max_reserve].") else - to_chat(src, "You are not a weaver! How are you doing this? Tell a developer!") + to_chat(src, span_warning("You are not a weaver! How are you doing this? Tell a developer!")) /mob/living/carbon/human/proc/toggle_silk_production() set name = "Toggle Silk Production" @@ -988,14 +988,14 @@ species.silk_production = !(species.silk_production) to_chat(src, "You are [species.silk_production ? "now" : "no longer"] producing silk.") else - to_chat(src, "You are not a weaver! How are you doing this? Tell a developer!") + to_chat(src, span_warning("You are not a weaver! How are you doing this? Tell a developer!")) /mob/living/carbon/human/proc/weave_structure() set name = "Weave Structure" set category = "Abilities" if(!(species.is_weaver)) - to_chat(src, "You are not a weaver! How are you doing this? Tell a developer!") + to_chat(src, span_warning("You are not a weaver! How are you doing this? Tell a developer!")) return var/choice @@ -1015,32 +1015,32 @@ return if(desired_result.cost > species.silk_reserve) - to_chat(src, "You don't have enough silk to weave that!") + to_chat(src, span_warning("You don't have enough silk to weave that!")) return if(stat) - to_chat(src, "You can't do that in your current state!") + to_chat(src, span_warning("You can't do that in your current state!")) return if(locate(desired_result.result_type) in src.loc) - to_chat(src, "You can't create another weaversilk [desired_result.title] here!") + to_chat(src, span_warning("You can't create another weaversilk [desired_result.title] here!")) return if(!isturf(src.loc)) - to_chat(src, "You can't weave here!") + to_chat(src, span_warning("You can't weave here!")) return if(do_after(src, desired_result.time, exclusive = TASK_USER_EXCLUSIVE)) if(desired_result.cost > species.silk_reserve) - to_chat(src, "You don't have enough silk to weave that!") + to_chat(src, span_warning("You don't have enough silk to weave that!")) return if(locate(desired_result.result_type) in src.loc) - to_chat(src, "You can't create another weaversilk [desired_result.title] here!") + to_chat(src, span_warning("You can't create another weaversilk [desired_result.title] here!")) return if(!isturf(src.loc)) - to_chat(src, "You can't weave here!") + to_chat(src, span_warning("You can't weave here!")) return species.silk_reserve = max(species.silk_reserve - desired_result.cost, 0) @@ -1074,28 +1074,28 @@ return if(!(species.is_weaver)) - to_chat(src, "You are not a weaver! How are you doing this? Tell a developer!") + to_chat(src, span_warning("You are not a weaver! How are you doing this? Tell a developer!")) return if(desired_result.cost > species.silk_reserve) - to_chat(src, "You don't have enough silk to weave that!") + to_chat(src, span_warning("You don't have enough silk to weave that!")) return if(stat) - to_chat(src, "You can't do that in your current state!") + to_chat(src, span_warning("You can't do that in your current state!")) return if(!isturf(src.loc)) - to_chat(src, "You can't weave here!") + to_chat(src, span_warning("You can't weave here!")) return if(do_after(src, desired_result.time, exclusive = TASK_USER_EXCLUSIVE)) if(desired_result.cost > species.silk_reserve) - to_chat(src, "You don't have enough silk to weave that!") + to_chat(src, span_warning("You don't have enough silk to weave that!")) return if(!isturf(src.loc)) - to_chat(src, "You can't weave here!") + to_chat(src, span_warning("You can't weave here!")) return species.silk_reserve = max(species.silk_reserve - desired_result.cost, 0) @@ -1109,7 +1109,7 @@ set category = "Abilities" if(!(species.is_weaver)) - to_chat(src, "You are not a weaver! How are you doing this? Tell a developer!") + to_chat(src, span_warning("You are not a weaver! How are you doing this? Tell a developer!")) return var/new_silk_color = input(usr, "Pick a color for your woven products:","Silk Color", species.silk_color) as null|color @@ -1192,11 +1192,11 @@ last_special = world.time + 50 //No spamming! if(stat == DEAD || paralysis || weakened || stunned) - to_chat(src, "You cannot do that while in your current state.") + to_chat(src, span_notice("You cannot do that while in your current state.")) return if(!(src.vore_selected)) - to_chat(src, "No selected belly found.") + to_chat(src, span_notice("No selected belly found.")) return @@ -1215,7 +1215,7 @@ targets += L if(!(targets.len)) - to_chat(src, "No eligible targets found.") + to_chat(src, span_notice("No eligible targets found.")) return var/mob/living/target = tgui_input_list(src, "Please select a target.", "Victim", targets) @@ -1223,19 +1223,19 @@ if(!target) return - to_chat(target, "Something begins to circle around you in the water!") //Dun dun... + to_chat(target, span_critical("Something begins to circle around you in the water!")) //Dun dun... var/starting_loc = target.loc if(do_after(src, 50)) if(target.loc != starting_loc) - to_chat(target, "You got away from whatever that was...") - to_chat(src, "They got away.") + to_chat(target, span_warning("You got away from whatever that was...")) + to_chat(src, span_notice("They got away.")) return if(target.buckled) //how are you buckled in the water?! target.buckled.unbuckle_mob() - target.visible_message("\The [target] suddenly disappears, being dragged into the water!",\ - "You are dragged below the water and feel yourself slipping directly into \the [src]'s [vore_selected]!") - to_chat(src, "You successfully drag \the [target] into the water, slipping them into your [vore_selected].") + target.visible_message(span_vwarning("\The [target] suddenly disappears, being dragged into the water!"),\ + span_vdanger("You are dragged below the water and feel yourself slipping directly into \the [src]'s [vore_selected]!")) + to_chat(src, span_vnotice("You successfully drag \the [target] into the water, slipping them into your [vore_selected].")) target.forceMove(src.vore_selected) /mob/living/carbon/human/proc/toggle_pain_module() @@ -1244,9 +1244,9 @@ set category = "Abilities" if(synth_cosmetic_pain) - to_chat(src, " You turn off your pain simulators.") + to_chat(src, span_notice(" You turn off your pain simulators.")) else - to_chat(src, " You turn on your pain simulators ") + to_chat(src, span_danger(" You turn on your pain simulators ")) synth_cosmetic_pain = !synth_cosmetic_pain @@ -1260,13 +1260,13 @@ set desc = "Grab a target with any of your appendages!" if(stat || paralysis || weakened || stunned || world.time < last_special) //No tongue flicking while stunned. - to_chat(src, "You can't do that in your current state.") + to_chat(src, span_warning("You can't do that in your current state.")) return last_special = world.time + 10 //Anti-spam. if (!istype(src, /mob/living)) - to_chat(src, "It doesn't work that way.") + to_chat(src, span_warning("It doesn't work that way.")) return var/choice = tgui_alert(src, "Do you wish to change the color of your appendage, use it, or change its functionality?", "Selection List", list("Use it", "Color", "Functionality")) @@ -1297,7 +1297,7 @@ targets += L if(!(targets.len)) - to_chat(src, "No eligible targets found.") + to_chat(src, span_notice("No eligible targets found.")) return var/mob/living/target = tgui_input_list(src, "Please select a target.", "Victim", targets) @@ -1306,15 +1306,15 @@ return if(!istype(target, /mob/living)) //Safety. - to_chat(src, "You need to select a living target!") + to_chat(src, span_warning("You need to select a living target!")) return if (get_dist(src,target) >= 6) - to_chat(src, "You need to be closer to do that.") + to_chat(src, span_warning("You need to be closer to do that.")) return - visible_message("\The [src] attempts to snatch up [target]!", \ - "You attempt to snatch up [target]!" ) + visible_message(span_vnotice("\The [src] attempts to snatch up [target]!"), \ + span_vnotice("You attempt to snatch up [target]!") ) playsound(src, 'sound/vore/sunesound/pred/schlorp.ogg', 25) //Code to shoot the beam here. @@ -1384,8 +1384,8 @@ if(istype(firer, /mob/living)) var/mob/living/originator = firer originator.Weaken(2) //If you hit something dense or anchored, fall flat on your face. - originator.visible_message("\The [originator] trips over their self and falls flat on their face!", \ - "You trip over yourself and fall flat on your face!" ) + originator.visible_message(span_warning("\The [originator] trips over their self and falls flat on their face!"), \ + span_warning("You trip over yourself and fall flat on your face!") ) playsound(originator, "punch", 25, 1, -1) return else @@ -1394,8 +1394,8 @@ if(istype(firer, /mob/living)) var/mob/living/originator = firer originator.Weaken(2) //Hit a wall? Whoops! - originator.visible_message("\The [originator] trips over their self and falls flat on their face!", \ - "You trip over yourself and fall flat on your face!" ) + originator.visible_message(span_warning("\The [originator] trips over their self and falls flat on their face!"), \ + span_warning("You trip over yourself and fall flat on your face!") ) playsound(originator, "punch", 25, 1, -1) return else @@ -1475,13 +1475,13 @@ var/leap_sound = 'sound/weapons/spiderlunge.ogg' if(stat || paralysis || weakened || stunned || world.time < last_special) //No tongue flicking while stunned. - to_chat(src, "You can't do that in your current state.") + to_chat(src, span_warning("You can't do that in your current state.")) return last_special = world.time + 10 //Anti-spam. if (!istype(src, /mob/living)) - to_chat(src, "It doesn't work that way.") + to_chat(src, span_warning("It doesn't work that way.")) return else @@ -1496,7 +1496,7 @@ targets += L if(!(targets.len)) - to_chat(src, "No eligible targets found.") + to_chat(src, span_notice("No eligible targets found.")) return var/mob/living/target = tgui_input_list(src, "Please select a target.", "Victim", targets) @@ -1505,11 +1505,11 @@ return if(!istype(target, /mob/living)) //Safety. - to_chat(src, "You need to select a living target!") + to_chat(src, span_warning("You need to select a living target!")) return if (get_dist(src,target) >= 6) - to_chat(src, "You need to be closer to do that.") + to_chat(src, span_warning("You need to be closer to do that.")) return visible_message(span_warning("\The [src] rears back, ready to lunge!")) @@ -1542,7 +1542,7 @@ set desc = "Inject another being with something!" if(stat || paralysis || weakened || stunned || world.time < last_special) //Epic copypasta from tongue grabbing. - to_chat(src, "You can't do that in your current state.") + to_chat(src, span_warning("You can't do that in your current state.")) return last_special = world.time + 10 //Anti-spam. @@ -1567,19 +1567,19 @@ var/reagent_choice = tgui_input_list(usr, "Choose which reagent to inject!", "Select reagent", trait_injection_reagents) if(reagent_choice) trait_injection_selected = reagent_choice - to_chat(src, "You prepare to inject [trait_injection_amount] units of [trait_injection_selected ? "[trait_injection_selected]" : "...nothing. Select a reagent before trying to inject anything."]") + to_chat(src, span_notice("You prepare to inject [trait_injection_amount] units of [trait_injection_selected ? "[trait_injection_selected]" : "...nothing. Select a reagent before trying to inject anything."]")) return if(choice == "Change amount") var/amount_choice = tgui_input_number(usr, "How much of the reagent do you want to inject? (Up to 5 units) (Can select 0 for a bite that doesn't inject venom!)", "How much?", trait_injection_amount, 5, 0, round_value = FALSE) if(amount_choice >= 0) trait_injection_amount = amount_choice - to_chat(src, "You prepare to inject [trait_injection_amount] units of [trait_injection_selected ? "[trait_injection_selected]" : "...nothing. Select a reagent before trying to inject anything."]") + to_chat(src, span_notice("You prepare to inject [trait_injection_amount] units of [trait_injection_selected ? "[trait_injection_selected]" : "...nothing. Select a reagent before trying to inject anything."]")) return if(choice == "Change verb") var/verb_choice = tgui_input_text(usr, "Choose the percieved manner of injection, such as 'bites' or 'stings', don't be misleading or abusive. This will show up in game as ('X' 'Verb' 'Y'. Example: X bites Y.)", "How are you injecting?", trait_injection_verb, max_length = 60) //Whoaa there cowboy don't put a novel in there. if(verb_choice) trait_injection_verb = verb_choice - to_chat(src, "You will [trait_injection_verb] your targets.") + to_chat(src, span_notice("You will [trait_injection_verb] your targets.")) return if(choice == "Chemical Refresher") var/output = {"Chemical Refresher!
    @@ -1628,7 +1628,7 @@ targets += L if(!(targets.len)) - to_chat(src, "No eligible targets found.") + to_chat(src, span_notice("No eligible targets found.")) return var/mob/living/target = tgui_input_list(src, "Please select a target.", "Victim", targets) @@ -1637,7 +1637,7 @@ return if(!istype(target, /mob/living/carbon)) //Safety. - to_chat(src, "That won't work on that kind of creature! (Only works on crew/monkeys)") + to_chat(src, span_warning("That won't work on that kind of creature! (Only works on crew/monkeys)")) return @@ -1646,11 +1646,11 @@ synth = 1 if(!trait_injection_selected) - to_chat(src, "You need to select a reagent.") + to_chat(src, span_notice("You need to select a reagent.")) return if(!trait_injection_verb) - to_chat(src, "Somehow, you forgot your means of injecting. (Select a verb!)") + to_chat(src, span_notice("Somehow, you forgot your means of injecting. (Select a verb!)")) return if(do_after(src, 50, target)) //A decent enough timer. diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm index c66a48b175..e2a346158a 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm @@ -85,7 +85,7 @@ var/regen_sounds = H.regen_sounds if(prob(2)) // 2% chance of playing squelchy noise while reviving, which is run roughly every 2 seconds/tick while regenerating. playsound(H, pick(regen_sounds), 30) - H.visible_message("

    [H.name]'s motionless form shudders grotesquely, rippling unnaturally.

    ") + H.visible_message(span_danger("

    [H.name]'s motionless form shudders grotesquely, rippling unnaturally.

    ")) //Cold/pressure effects when not regenerating else @@ -154,9 +154,9 @@ else if(H.nutrition <= 200 && prob(0.5)) switch(H.nutrition) if(150 to 200) - to_chat(H,"You feel rather hungry. It might be a good idea to find some some food...") + to_chat(H,span_info("You feel rather hungry. It might be a good idea to find some some food...")) if(100 to 150) - to_chat(H,"You feel like you're going to snap and give in to your hunger soon... It would be for the best to find some [pick("food","prey")] to eat...") + to_chat(H,span_warning("You feel like you're going to snap and give in to your hunger soon... It would be for the best to find some [pick("food","prey")] to eat...")) danger = TRUE //now the check's done, update their brain so it remembers how stressed they were @@ -187,7 +187,7 @@ //Did we just finish being feral? if(!feral) feral_state = FALSE - to_chat(H,"Your thoughts start clearing, your feral urges having passed - for the time being, at least.") + to_chat(H,span_info("Your thoughts start clearing, your feral urges having passed - for the time being, at least.")) log_and_message_admins("is no longer feral.", H) update_xenochimera_hud(H, danger, feral_state) return @@ -227,19 +227,19 @@ if(darkish || !isturf(H.loc) || isbelly(H.loc)) // Specific check for if in belly. !isturf should do this, but JUST in case. // If hurt, tell 'em to heal up if (cause == "shock") - to_chat(H,"This place seems safe, secure, hidden, a place to lick your wounds and recover...") + to_chat(H,span_info("This place seems safe, secure, hidden, a place to lick your wounds and recover...")) //If hungry, nag them to go and find someone or something to eat. else if(cause == "hunger") - to_chat(H,"Secure in your hiding place, your hunger still gnaws at you. You need to catch some food...") + to_chat(H,span_info("Secure in your hiding place, your hunger still gnaws at you. You need to catch some food...")) //If jittery, etc else if(cause == "jittery") - to_chat(H,"sneakysneakyyesyesyescleverhidingfindthingsyessssss") + to_chat(H,span_info("sneakysneakyyesyesyescleverhidingfindthingsyessssss")) //Otherwise, just tell them to keep hiding. else - to_chat(H,"...safe...") + to_chat(H,span_info("...safe...")) // NOT in the darkness else @@ -254,18 +254,18 @@ if(nearby.len) var/M = pick(nearby) if(cause == "shock") - to_chat(H,"You're hurt, in danger, exposed, and [M] looks to be a little too close for comfort...") + to_chat(H,span_danger("You're hurt, in danger, exposed, and [M] looks to be a little too close for comfort...")) else - to_chat(H,"Every movement, every flick, every sight and sound has your full attention, your hunting instincts on high alert... In fact, [M] looks extremely appetizing...") + to_chat(H,span_danger("Every movement, every flick, every sight and sound has your full attention, your hunting instincts on high alert... In fact, [M] looks extremely appetizing...")) // Nobody around else if(cause == "hunger") - to_chat(H,"Confusing sights and sounds and smells surround you - scary and disorienting it may be, but the drive to hunt, to feed, to survive, compels you.") + to_chat(H,span_danger("Confusing sights and sounds and smells surround you - scary and disorienting it may be, but the drive to hunt, to feed, to survive, compels you.")) else if(cause == "jittery") - to_chat(H,"yesyesyesyesyesyesgetthethingGETTHETHINGfindfoodsfindpreypounceyesyesyes") + to_chat(H,span_danger("yesyesyesyesyesyesgetthethingGETTHETHINGfindfoodsfindpreypounceyesyesyes")) else - to_chat(H,"Confusing sights and sounds and smells surround you, this place is wrong, confusing, frightening. You need to hide, go to ground...") + to_chat(H,span_danger("Confusing sights and sounds and smells surround you, this place is wrong, confusing, frightening. You need to hide, go to ground...")) // HUD update time update_xenochimera_hud(H, danger, feral_state) @@ -273,28 +273,28 @@ /datum/species/xenochimera/proc/go_feral(var/mob/living/carbon/human/H, var/stress, var/cause) // Going feral due to hunger if(cause == "hunger") - to_chat(H,"Something in your mind flips, your instincts taking over, no longer able to fully comprehend your surroundings as survival becomes your primary concern - you must feed, survive, there is nothing else. Hunt. Eat. Hide. Repeat.") + to_chat(H,span_danger("Something in your mind flips, your instincts taking over, no longer able to fully comprehend your surroundings as survival becomes your primary concern - you must feed, survive, there is nothing else. Hunt. Eat. Hide. Repeat.")) log_and_message_admins("has gone feral due to hunger.", H) // If they're hurt, chance of snapping. else if(cause == "shock") //If the majority of their shock is due to halloss, give them a different message (3x multiplier on check as halloss is 2x - meaning t_s must be at least 3x for other damage sources to be the greater part) if(3*H.halloss >= H.traumatic_shock) - to_chat(H,"The pain! It stings! Got to get away! Your instincts take over, urging you to flee, to hide, to go to ground, get away from here...") + to_chat(H,span_danger("The pain! It stings! Got to get away! Your instincts take over, urging you to flee, to hide, to go to ground, get away from here...")) log_and_message_admins("has gone feral due to halloss.", H) //Majority due to other damage sources else - to_chat(H,"Your fight-or-flight response kicks in, your injuries too much to simply ignore - you need to flee, to hide, survive at all costs - or destroy whatever is threatening you.") + to_chat(H,span_danger("Your fight-or-flight response kicks in, your injuries too much to simply ignore - you need to flee, to hide, survive at all costs - or destroy whatever is threatening you.")) log_and_message_admins("has gone feral due to injury.", H) //No hungry or shock, but jittery else if(cause == "jittery") - to_chat(H,"Suddenly, something flips - everything that moves is... potential prey. A plaything. This is great! Time to hunt!") + to_chat(H,span_warning("Suddenly, something flips - everything that moves is... potential prey. A plaything. This is great! Time to hunt!")) log_and_message_admins("has gone feral due to jitteriness.", H) else // catch-all just in case something weird happens - to_chat(H,"The stress of your situation is too much for you, and your survival instincts kick in!") + to_chat(H,span_warning("The stress of your situation is too much for you, and your survival instincts kick in!")) log_and_message_admins("has gone feral for unknown reasons.", H) //finally, set their feral var H.feral = stress diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm index 9d687ee872..e209bca826 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm @@ -15,7 +15,7 @@ user.setClickCooldown(user.get_attack_speed(W)) if(W.force) - visible_message("\The [src] has been [LAZYLEN(W.attack_verb) ? pick(W.attack_verb) : "attacked"] with \the [W][(user ? " by [user]." : ".")]") + visible_message(span_warning("\The [src] has been [LAZYLEN(W.attack_verb) ? pick(W.attack_verb) : "attacked"] with \the [W][(user ? " by [user]." : ".")]")) qdel(src) /obj/effect/weaversilk/bullet_act(var/obj/item/projectile/Proj) @@ -33,7 +33,7 @@ /obj/effect/weaversilk/attack_hand(mob/user as mob) ..() if(user.a_intent == I_HURT) - to_chat(user,"You easily tear down [name].") + to_chat(user,span_warning("You easily tear down [name].")) qdel(src) /obj/effect/weaversilk/floor @@ -81,7 +81,7 @@ /obj/structure/bed/double/weaversilk_nest/attack_hand(mob/user as mob) ..() if(user.a_intent == I_HURT && !has_buckled_mobs()) - to_chat(user,"You easily tear down [name].") + to_chat(user,span_warning("You easily tear down [name].")) qdel(src) /obj/effect/weaversilk/trap @@ -102,14 +102,14 @@ var/mob/living/L = AM if(L.m_intent == "run") L.visible_message( - "[L] steps on \the [src].", - "You step on \the [src]!", + span_danger("[L] steps on \the [src]."), + span_danger("You step on \the [src]!"), "You hear a squishy noise!" ) set_dir(L.dir) buckle_mob(L) L.Stun(1) - to_chat(L, "The sticky fibers of \the [src] ensnare, trapping you in place!") + to_chat(L, span_danger("The sticky fibers of \the [src] ensnare, trapping you in place!")) trap_active = FALSE desc += " Actually, it looks like it's been all spent." ..() @@ -131,4 +131,4 @@ icon_state = "web_bindings" item_state = "web_bindings_mob" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL \ No newline at end of file + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL diff --git a/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm b/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm index 87c71c5296..ee8b5f7edf 100644 --- a/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm +++ b/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm @@ -82,7 +82,7 @@ avatar.Sleeping(1) src.mind.transfer_to(avatar) to_chat(avatar, "You have enterred Virtual Reality!\nAll normal gameplay rules still apply.\nWounds you suffer here won't persist when you leave VR, but some of the pain will.\nYou can leave VR at any time by using the \"Exit Virtual Reality\" verb in the Abilities tab, or by ghosting.") //No more prommie VR thing, so removed tidbit about changing appearance - to_chat(avatar, " You black out for a moment, and wake to find yourself in a new body in virtual reality.") // So this is what VR feels like? + to_chat(avatar, span_notice(" You black out for a moment, and wake to find yourself in a new body in virtual reality.")) // So this is what VR feels like? // exit_vr is called on the vr mob, and puts the mind back into the original mob /mob/living/carbon/human/proc/exit_vr() @@ -103,13 +103,13 @@ // Move the mind back to the original mob // vr_holder.Sleeping(1) src.mind.transfer_to(vr_holder) - to_chat(vr_holder, "You black out for a moment, and wake to find yourself back in your own body.") + to_chat(vr_holder, span_notice("You black out for a moment, and wake to find yourself back in your own body.")) // Two-thirds damage is transferred as agony for /humans // Getting hurt in VR doesn't damage the physical body, but you still got hurt. if(ishuman(vr_holder) && total_damage) var/mob/living/carbon/human/V = vr_holder V.stun_effect_act(0, total_damage*2/3, null) // 200 damage leaves the user in paincrit for several seconds, agony reaches 0 after around 2m. - to_chat(vr_holder, "Pain from your time in VR lingers.") // 250 damage leaves the user unconscious for several seconds in addition to paincrit + to_chat(vr_holder, span_warning("Pain from your time in VR lingers.")) // 250 damage leaves the user unconscious for several seconds in addition to paincrit // Maintain a link with the mob, but don't use teleop vr_holder.vr_link = src @@ -117,4 +117,4 @@ if(istype(vr_holder.loc, /obj/machinery/vr_sleeper)) var/obj/machinery/vr_sleeper/V = vr_holder.loc - V.go_out() \ No newline at end of file + V.go_out() diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm index ae7f7bcc9b..9f87c39208 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm @@ -22,20 +22,20 @@ var/obj/item/organ/internal/xenos/plasmavessel/P = internal_organs_by_name[O_PLASMA] if(!istype(P)) - to_chat(src, "Your plasma vessel has been removed!") + to_chat(src, span_danger("Your plasma vessel has been removed!")) return if(needs_organ) var/obj/item/organ/internal/I = internal_organs_by_name[needs_organ] if(!I) - to_chat(src, "Your [needs_organ] has been removed!") + to_chat(src, span_danger("Your [needs_organ] has been removed!")) return else if((I.status & ORGAN_CUT_AWAY) || I.is_broken()) - to_chat(src, "Your [needs_organ] is too damaged to function!") + to_chat(src, span_danger("Your [needs_organ] is too damaged to function!")) return if(P.stored_plasma < cost) - to_chat(src, "You don't have enough phoron stored to do that.") + to_chat(src, span_danger("You don't have enough phoron stored to do that.")) return 0 if(needs_foundation) @@ -46,7 +46,7 @@ if(!(istype(T,/turf/space))) has_foundation = 1 if(!has_foundation) - to_chat(src, "You need a solid foundation to do that on.") + to_chat(src, span_danger("You need a solid foundation to do that on.")) return 0 P.stored_plasma -= cost @@ -59,12 +59,12 @@ set category = "Abilities" if (get_dist(src,M) <= 1) - to_chat(src, "You need to be closer.") + to_chat(src, span_alium("You need to be closer.")) return var/obj/item/organ/internal/xenos/plasmavessel/I = M.internal_organs_by_name[O_PLASMA] if(!istype(I)) - to_chat(src, "Their plasma vessel is missing.") + to_chat(src, span_alium("Their plasma vessel is missing.")) return var/amount = tgui_input_number(usr, "Amount:", "Transfer Plasma to [M]") @@ -72,8 +72,8 @@ amount = abs(round(amount)) if(check_alien_ability(amount,0,O_PLASMA)) M.gain_plasma(amount) - to_chat(M, "[src] has transfered [amount] plasma to you.") - to_chat(src, "You have transferred [amount] plasma to [M].") + to_chat(M, span_alium("[src] has transfered [amount] plasma to you.")) + to_chat(src, span_alium("You have transferred [amount] plasma to [M].")) return // Queen verbs. @@ -93,7 +93,7 @@ return if(check_alien_ability(500,1,O_EGG)) - visible_message("[src] has laid an egg!") + visible_message(span_alium("[src] has laid an egg!")) new /obj/structure/ghost_pod/automatic/xenomorph_egg(loc) return @@ -105,11 +105,11 @@ set category = "Abilities" if(alien_queen_exists()) - to_chat(src, "We already have an active queen.") + to_chat(src, span_notice("We already have an active queen.")) return if(check_alien_ability(500)) - visible_message("[src] begins to twist and contort!", "You begin to evolve!") + visible_message(span_alium("[src] begins to twist and contort!"), span_alium("You begin to evolve!")) src.set_species("Xenomorph Queen") return @@ -120,13 +120,13 @@ set category = "Abilities" if(check_alien_ability(50,1,O_RESIN)) - visible_message("[src] has planted some alien weeds!") + visible_message(span_alium("[src] has planted some alien weeds!")) new /obj/effect/alien/weeds/node(get_turf(src), null, "#321D37") return /mob/living/carbon/human/proc/Spit(var/atom/A) if((last_spit + 1 SECONDS) > world.time) //To prevent YATATATATATAT spitting. - to_chat(src, "You have not yet prepared your chemical glands. You must wait before spitting again.") + to_chat(src, span_warning("You have not yet prepared your chemical glands. You must wait before spitting again.")) return else last_spit = world.time @@ -139,7 +139,7 @@ if(!check_alien_ability(20,0,O_ACID)) spitting = 0 return - visible_message("[src] spits [spit_name] at \the [A]!", "You spit [spit_name] at \the [A].") + visible_message(span_warning("[src] spits [spit_name] at \the [A]!"), span_alium("You spit [spit_name] at \the [A].")) var/obj/item/projectile/P = new spit_projectile(get_turf(src)) P.firer = src P.old_style_target(A) @@ -152,7 +152,7 @@ set category = "Abilities" if(!(O in oview(1))) - to_chat(src, "[O] is too far away.") + to_chat(src, span_alium("[O] is too far away.")) return // OBJ CHECK @@ -174,12 +174,12 @@ cannot_melt = 1 //Gurgs : Everything that isn't a object, simulated wall, or simulated floor is assumed to be acid immune. Includes weird things like unsimulated floors and space. if(cannot_melt) - to_chat(src, "You cannot dissolve this object.") + to_chat(src, span_alium("You cannot dissolve this object.")) return if(check_alien_ability(200,0,O_ACID)) new /obj/effect/alien/acid(get_turf(O), O) - visible_message("[src] vomits globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!") + visible_message(span_alium("[src] vomits globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!")) return @@ -189,7 +189,7 @@ set category = "Abilities" if(spitting) - to_chat(src, "You stop preparing to spit.") + to_chat(src, span_alium("You stop preparing to spit.")) spitting = 0 return @@ -202,7 +202,7 @@ spitting = 1 spit_projectile = /obj/item/projectile/energy/neurotoxin spit_name = "neurotoxin" - to_chat(src, "You prepare to spit neurotoxin.") + to_chat(src, span_alium("You prepare to spit neurotoxin.")) /mob/living/carbon/human/proc/acidspit() set name = "Toggle Acid Spit (50)" @@ -210,7 +210,7 @@ set category = "Abilities" if(spitting) - to_chat(src, "You stop preparing to spit.") + to_chat(src, span_alium("You stop preparing to spit.")) spitting = 0 return @@ -223,7 +223,7 @@ spitting = 1 spit_projectile = /obj/item/projectile/energy/acid spit_name = "acid" - to_chat(src, "You prepare to spit acid.") + to_chat(src, span_alium("You prepare to spit acid.")) /mob/living/carbon/human/proc/resin() //Gurgs : Refactored resin ability, big thanks to Jon. set name = "Secrete Resin (75)" @@ -269,7 +269,7 @@ else O = new /obj/item/stack/material/resin(targetLoc) if(O) - visible_message("[src] vomits up a thick purple substance and begins to shape it!", "You shape a [choice].") + visible_message(span_warning("[src] vomits up a thick purple substance and begins to shape it!"), span_alium("You shape a [choice].")) O.color = "#321D37" playsound(src, 'sound/effects/blobattack.ogg', 40, 1) @@ -309,7 +309,7 @@ last_special = world.time + 75 status_flags |= LEAPING - src.visible_message("\The [src] leaps at [T]!") + src.visible_message(span_danger("\The [src] leaps at [T]!")) src.throw_at(get_step(get_turf(T),get_turf(src)), 4, 1, src) playsound(src, 'sound/voice/hiss5.ogg', 50, 1) @@ -318,7 +318,7 @@ if(status_flags & LEAPING) status_flags &= ~LEAPING if(!src.Adjacent(T)) - to_chat(src, "You miss!") + to_chat(src, span_warning("You miss!")) return T.Weaken(3) @@ -326,12 +326,12 @@ var/use_hand = "left" if(l_hand) if(r_hand) - to_chat(src, "You need to have one hand free to grab someone.") + to_chat(src, span_danger("You need to have one hand free to grab someone.")) return else use_hand = "right" - src.visible_message("\The [src] seizes [T] aggressively!") + src.visible_message(span_warning("\The [src] seizes [T] aggressively!")) var/obj/item/grab/G = new(src,T) if(use_hand == "left") @@ -352,21 +352,21 @@ return if(stat || paralysis || stunned || weakened || lying) - to_chat(src, "You cannot do that in your current state.") + to_chat(src, span_danger("You cannot do that in your current state.")) return var/obj/item/grab/G = locate() in src if(!G || !istype(G)) - to_chat(src, "You are not grabbing anyone.") + to_chat(src, span_danger("You are not grabbing anyone.")) return if(G.state < GRAB_AGGRESSIVE) - to_chat(src, "You must have an aggressive grab to slaughter your prey!") + to_chat(src, span_danger("You must have an aggressive grab to slaughter your prey!")) return last_special = world.time + 50 - visible_message("\The [src] rips viciously at \the [G.affecting]'s body with its claws!") + visible_message(span_warning("\The [src] rips viciously at \the [G.affecting]'s body with its claws!")) if(istype(G.affecting,/mob/living/carbon/human)) var/mob/living/carbon/human/H = G.affecting diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm index 861384cf02..1e9143cc15 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm @@ -92,8 +92,8 @@ return FALSE /datum/species/xenos/hug(var/mob/living/carbon/human/H,var/mob/living/target) - H.visible_message("[H] caresses [target] with its scythe-like arm.", \ - "You caress [target] with your scythe-like arm.") + H.visible_message(span_notice("[H] caresses [target] with its scythe-like arm."), \ + span_notice("You caress [target] with your scythe-like arm.")) /datum/species/xenos/handle_post_spawn(var/mob/living/carbon/human/H) @@ -135,7 +135,7 @@ H.adjustOxyLoss(-heal_rate) H.adjustToxLoss(-heal_rate) if (prob(5)) - to_chat(H, "You feel a soothing sensation come over you...") + to_chat(H, span_alien("You feel a soothing sensation come over you...")) return 1 //next internal organs @@ -143,7 +143,7 @@ if(I.damage > 0) I.damage = max(I.damage - heal_rate, 0) if (prob(5)) - to_chat(H, "You feel a soothing sensation within your [I.parent_organ]...") + to_chat(H, span_alien("You feel a soothing sensation within your [I.parent_organ]...")) return 1 //next mend broken bones, approx 10 ticks each @@ -151,7 +151,7 @@ if (E.status & ORGAN_BROKEN) if (prob(mend_prob)) if (E.mend_fracture()) - to_chat(H, "You feel something mend itself inside your [E.name].") + to_chat(H, span_alien("You feel something mend itself inside your [E.name].")) return 1 return 0 diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm index 91996b0898..388600f076 100644 --- a/code/modules/mob/living/carbon/human/stripping.dm +++ b/code/modules/mob/living/carbon/human/stripping.dm @@ -12,22 +12,22 @@ switch(slot_to_strip) // Handle things that are part of this interface but not removing/replacing a given item. if("pockets") - visible_message("\The [user] is trying to empty \the [src]'s pockets!") + visible_message(span_danger("\The [user] is trying to empty \the [src]'s pockets!")) if(do_after(user,HUMAN_STRIP_DELAY,src)) empty_pockets(user) return if("splints") - visible_message("\The [user] is trying to remove \the [src]'s splints!") + visible_message(span_danger("\The [user] is trying to remove \the [src]'s splints!")) if(do_after(user,HUMAN_STRIP_DELAY,src)) remove_splints(user) return if("sensors") - visible_message("\The [user] is trying to set \the [src]'s sensors!") + visible_message(span_danger("\The [user] is trying to set \the [src]'s sensors!")) if(do_after(user,HUMAN_STRIP_DELAY,src)) toggle_sensors(user) return if("internals") - visible_message("\The [usr] is trying to set \the [src]'s internals!") + visible_message(span_danger("\The [usr] is trying to set \the [src]'s internals!")) if(do_after(user,HUMAN_STRIP_DELAY,src)) toggle_internals(user) return @@ -38,7 +38,7 @@ var/obj/item/clothing/accessory/A = suit.accessories[1] if(!istype(A)) return - visible_message("\The [usr] is trying to remove \the [src]'s [A.name]!") + visible_message(span_danger("\The [usr] is trying to remove \the [src]'s [A.name]!")) if(!do_after(user,HUMAN_STRIP_DELAY,src)) return @@ -47,7 +47,7 @@ return if(istype(A, /obj/item/clothing/accessory/badge) || istype(A, /obj/item/clothing/accessory/medal)) - user.visible_message("\The [user] tears off \the [A] from [src]'s [suit.name]!") + user.visible_message(span_danger("\The [user] tears off \the [A] from [src]'s [suit.name]!")) add_attack_logs(user,src,"Stripped [A.name] off [suit.name]") A.on_removed(user) suit.accessories -= A @@ -58,11 +58,11 @@ if(!UWC) return var/datum/category_item/underwear/UWI = all_underwear[UWC.name] if(!UWI || UWI.name == "None") - to_chat(user, "\The [src] does not have [UWC.gender==PLURAL ? "[UWC.display_name]" : "a [UWC.display_name]"].") + to_chat(user, span_notice("\The [src] does not have [UWC.gender==PLURAL ? "[UWC.display_name]" : "a [UWC.display_name]"].")) return hide_underwear[UWC.name] = !hide_underwear[UWC.name] update_underwear(1) - visible_message("\The [user] [hide_underwear[UWC.name] ? "takes off" : "puts on"] \the [src]'s [UWC.display_name].") + visible_message(span_danger("\The [user] [hide_underwear[UWC.name] ? "takes off" : "puts on"] \the [src]'s [UWC.display_name].")) return // Are we placing or stripping? @@ -83,14 +83,14 @@ if(!istype(target_slot)) // They aren't holding anything valid and there's nothing to remove, why are we even here? return if(!target_slot.canremove) - to_chat(user, "You cannot remove \the [src]'s [target_slot.name].") + to_chat(user, span_warning("You cannot remove \the [src]'s [target_slot.name].")) return - visible_message("\The [user] is trying to remove \the [src]'s [target_slot.name]!") + visible_message(span_danger("\The [user] is trying to remove \the [src]'s [target_slot.name]!")) else if(slot_to_strip == slot_wear_mask && istype(held, /obj/item/grenade)) - visible_message("\The [user] is trying to put \a [held] in \the [src]'s mouth!") + visible_message(span_danger("\The [user] is trying to put \a [held] in \the [src]'s mouth!")) else - visible_message("\The [user] is trying to put \a [held] on \the [src]!") + visible_message(span_danger("\The [user] is trying to put \a [held] on \the [src]!")) if(!do_after(user,HUMAN_STRIP_DELAY,src)) return @@ -100,7 +100,7 @@ return var/obj/item/holder/mobheld = held if(istype(mobheld)&&mobheld.held_mob==src) - to_chat(user, "You can't put someone on themselves! Stop trying to break reality!") + to_chat(user, span_warning("You can't put someone on themselves! Stop trying to break reality!")) return @@ -115,22 +115,22 @@ // Empty out everything in the target's pockets. /mob/living/carbon/human/proc/empty_pockets(var/mob/living/user) if(!r_store && !l_store) - to_chat(user, "\The [src] has nothing in their pockets.") + to_chat(user, span_warning("\The [src] has nothing in their pockets.")) return if(r_store) unEquip(r_store) if(l_store) unEquip(l_store) - visible_message("\The [user] empties \the [src]'s pockets!") + visible_message(span_danger("\The [user] empties \the [src]'s pockets!")) // Modify the current target sensor level. /mob/living/carbon/human/proc/toggle_sensors(var/mob/living/user) var/obj/item/clothing/under/suit = w_uniform if(!suit) - to_chat(user, "\The [src] is not wearing a suit with sensors.") + to_chat(user, span_warning("\The [src] is not wearing a suit with sensors.")) return if (suit.has_sensor >= 2) - to_chat(user, "\The [src]'s suit sensor controls are locked.") + to_chat(user, span_warning("\The [src]'s suit sensor controls are locked.")) return add_attack_logs(user,src,"Adjusted suit sensor level") suit.set_sensors(user) @@ -142,7 +142,7 @@ if(istype(wear_suit,/obj/item/clothing/suit/space)) var/obj/item/clothing/suit/space/suit = wear_suit if(suit.supporting_limbs && suit.supporting_limbs.len) - to_chat(user, "You cannot remove the splints - [src]'s [suit] is supporting some of the breaks.") + to_chat(user, span_warning("You cannot remove the splints - [src]'s [suit] is supporting some of the breaks.")) can_reach_splints = 0 if(can_reach_splints) @@ -156,9 +156,9 @@ user.put_in_active_hand(S) removed_splint = 1 if(removed_splint) - visible_message("\The [user] removes \the [src]'s splints!") + visible_message(span_danger("\The [user] removes \the [src]'s splints!")) else - to_chat(user, "\The [src] has no splints to remove.") + to_chat(user, span_warning("\The [src] has no splints to remove.")) // Set internals on or off. /mob/living/carbon/human/proc/toggle_internals(var/mob/living/user) @@ -180,9 +180,9 @@ internal = belt if(internal) - visible_message("\The [src] is now running on internals!") + visible_message(span_warning("\The [src] is now running on internals!")) internal.add_fingerprint(user) if (internals) internals.icon_state = "internal1" else - visible_message("\The [user] disables \the [src]'s internals!") + visible_message(span_danger("\The [user] disables \the [src]'s internals!")) diff --git a/code/modules/mob/living/carbon/human/unarmed_attack.dm b/code/modules/mob/living/carbon/human/unarmed_attack.dm index cffc73cb2f..1bf633298a 100644 --- a/code/modules/mob/living/carbon/human/unarmed_attack.dm +++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm @@ -51,47 +51,47 @@ var/global/list/sparring_attack_cache = list() switch(zone) // strong punches can have effects depending on where they hit if(BP_HEAD, O_EYES, O_MOUTH) // Induce blurriness - target.visible_message("[target] looks momentarily disoriented.", "You see stars.") + target.visible_message(span_danger("[target] looks momentarily disoriented."), span_danger("You see stars.")) target.apply_effect(attack_damage*2, EYE_BLUR, armour) if(BP_L_ARM, BP_L_HAND) if (target.l_hand) // Disarm left hand //Urist McAssistant dropped the macguffin with a scream just sounds odd. - target.visible_message("\The [target.l_hand] was knocked right out of [target]'s grasp!") + target.visible_message(span_danger("\The [target.l_hand] was knocked right out of [target]'s grasp!")) target.drop_l_hand() if(BP_R_ARM, BP_R_HAND) if (target.r_hand) // Disarm right hand - target.visible_message("\The [target.r_hand] was knocked right out of [target]'s grasp!") + target.visible_message(span_danger("\The [target.r_hand] was knocked right out of [target]'s grasp!")) target.drop_r_hand() if(BP_TORSO) if(!target.lying) var/turf/T = get_step(get_turf(target), get_dir(get_turf(user), get_turf(target))) if(!T.density) step(target, get_dir(get_turf(user), get_turf(target))) - target.visible_message("[pick("[target] was sent flying backward!", "[target] staggers back from the impact!")]") + target.visible_message(span_danger("[pick("[target] was sent flying backward!", "[target] staggers back from the impact!")]")) else - target.visible_message("[target] slams into [T]!") + target.visible_message(span_danger("[target] slams into [T]!")) if(prob(50)) target.set_dir(reverse_dir[target.dir]) target.apply_effect(attack_damage * 0.4, WEAKEN, armour) if(BP_GROIN) - target.visible_message("[target] looks like [TT.he] [TT.is] in pain!", "[(target.gender=="female") ? "Oh god that hurt!" : "Oh no, not your[pick("testicles", "crown jewels", "clockweights", "family jewels", "marbles", "bean bags", "teabags", "sweetmeats", "goolies")]!"]") // I see no easy way to fix this for non-organic or neuter characters. + target.visible_message(span_warning("[target] looks like [TT.he] [TT.is] in pain!"), span_warning("[(target.gender=="female") ? "Oh god that hurt!" : "Oh no, not your[pick("testicles", "crown jewels", "clockweights", "family jewels", "marbles", "bean bags", "teabags", "sweetmeats", "goolies")]!"]")) // I see no easy way to fix this for non-organic or neuter characters. target.apply_effects(stutter = attack_damage * 2, agony = attack_damage* 3, blocked = armour) if("l_leg", "l_foot", "r_leg", "r_foot") if(!target.lying) - target.visible_message("[target] gives way slightly.") + target.visible_message(span_warning("[target] gives way slightly.")) target.apply_effect(attack_damage*3, AGONY, armour) else if(attack_damage >= 5 && !(target == user) && (stun_chance + attack_damage * 5 >= 100) && armour < 2) // Chance to get the usual throwdown as well (25% standard chance) if(!target.lying) - target.visible_message("[target] [pick("slumps", "falls", "drops")] down to the ground!") + target.visible_message(span_danger("[target] [pick("slumps", "falls", "drops")] down to the ground!")) else - target.visible_message("[target] has been weakened!") + target.visible_message(span_danger("[target] has been weakened!")) target.apply_effect(3, WEAKEN, armour) /datum/unarmed_attack/proc/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage) var/obj/item/organ/external/affecting = target.get_organ(zone) - user.visible_message("[user] [pick(attack_verb)] [target] in the [affecting.name]!") + user.visible_message(span_warning("[user] [pick(attack_verb)] [target] in the [affecting.name]!")) playsound(user, attack_sound, 25, 1, -1) /datum/unarmed_attack/proc/handle_eye_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target) @@ -100,11 +100,11 @@ var/global/list/sparring_attack_cache = list() var/datum/gender/TT = gender_datums[target.get_visible_gender()] if(eyes) eyes.take_damage(rand(3,4), 1) - user.visible_message("[user] presses [TU.his] [eye_attack_text] into [target]'s [eyes.name]!") + user.visible_message(span_danger("[user] presses [TU.his] [eye_attack_text] into [target]'s [eyes.name]!")) var/eye_pain = eyes.organ_can_feel_pain() - to_chat(target, "You experience[(eye_pain) ? "" : " immense pain as you feel" ] [eye_attack_text_victim] being pressed into your [eyes.name][(eye_pain)? "." : "!"]") + to_chat(target, span_danger("You experience[(eye_pain) ? "" : " immense pain as you feel" ] [eye_attack_text_victim] being pressed into your [eyes.name][(eye_pain)? "." : "!"]")) return - user.visible_message("[user] attempts to press [TU.his] [eye_attack_text] into [target]'s eyes, but [TT.he] [TT.does]n't have any!") + user.visible_message(span_danger("[user] attempts to press [TU.his] [eye_attack_text] into [target]'s eyes, but [TT.he] [TT.does]n't have any!")) /datum/unarmed_attack/proc/unarmed_override(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/zone) return FALSE //return true if the unarmed override prevents further attacks @@ -148,7 +148,7 @@ var/global/list/sparring_attack_cache = list() attack_damage = CLAMP(attack_damage, 1, 5) // We expect damage input of 1 to 5 for this proc. But we leave this check juuust in case. if(target == user) - user.visible_message("[user] [pick(attack_verb)] [TU.himself] in the [organ]!") + user.visible_message(span_danger("[user] [pick(attack_verb)] [TU.himself] in the [organ]!")) return 0 if(!target.lying) @@ -157,31 +157,31 @@ var/global/list/sparring_attack_cache = list() // ----- HEAD ----- // switch(attack_damage) if(1 to 2) - user.visible_message("[user] slapped [target] across [TT.his] cheek!") + user.visible_message(span_danger("[user] slapped [target] across [TT.his] cheek!")) if(3 to 4) user.visible_message(pick( - 40; "[user] [pick(attack_verb)] [target] in the head!", - 30; "[user] struck [target] in the head[pick("", " with a closed fist")]!", - 30; "[user] threw a hook against [target]'s head!" + 40; span_danger("[user] [pick(attack_verb)] [target] in the head!"), + 30; span_danger("[user] struck [target] in the head[pick("", " with a closed fist")]!"), + 30; span_danger("[user] threw a hook against [target]'s head!") )) if(5) user.visible_message(pick( - 30; "[user] gave [target] a resounding [pick("slap", "punch")] to the face!", - 40; "[user] smashed [TU.his] [pick(attack_noun)] into [target]'s face!", - 30; "[user] gave a strong blow against [target]'s jaw!" + 30; span_danger("[user] gave [target] a resounding [pick("slap", "punch")] to the face!"), + 40; span_danger("[user] smashed [TU.his] [pick(attack_noun)] into [target]'s face!"), + 30; span_danger("[user] gave a strong blow against [target]'s jaw!") )) else // ----- BODY ----- // switch(attack_damage) - if(1 to 2) user.visible_message("[user] threw a glancing punch at [target]'s [organ]!") - if(1 to 4) user.visible_message("[user] [pick(attack_verb)] [target] in [TT.his] [organ]!") + if(1 to 2) user.visible_message(span_danger("[user] threw a glancing punch at [target]'s [organ]!")) + if(1 to 4) user.visible_message(span_danger("[user] [pick(attack_verb)] [target] in [TT.his] [organ]!")) if(5) user.visible_message(pick( - 50; "[user] smashed [TU.his] [pick(attack_noun)] into [target]'s [organ]!", - 50; "[user] landed a striking [pick(attack_noun)] on [target]'s [organ]!" + 50; span_danger("[user] smashed [TU.his] [pick(attack_noun)] into [target]'s [organ]!"), + 50; span_danger("[user] landed a striking [pick(attack_noun)] on [target]'s [organ]!") )) else - user.visible_message("[user] [pick("punched", "threw a punch against", "struck", "slammed [TU.his] [pick(attack_noun)] into")] [target]'s [organ]!") //why do we have a separate set of verbs for lying targets? + user.visible_message(span_danger("[user] [pick("punched", "threw a punch against", "struck", "slammed [TU.his] [pick(attack_noun)] into")] [target]'s [organ]!")) //why do we have a separate set of verbs for lying targets? /datum/unarmed_attack/kick attack_name = "kick" @@ -223,9 +223,9 @@ var/global/list/sparring_attack_cache = list() attack_damage = CLAMP(attack_damage, 1, 5) switch(attack_damage) - if(1 to 2) user.visible_message("[user] threw [target] a glancing [pick(attack_noun)] to the [organ]!") //it's not that they're kicking lightly, it's that the kick didn't quite connect - if(3 to 4) user.visible_message("[user] [pick(attack_verb)] [target] in [TT.his] [organ]!") - if(5) user.visible_message("[user] landed a strong [pick(attack_noun)] against [target]'s [organ]!") + if(1 to 2) user.visible_message(span_danger("[user] threw [target] a glancing [pick(attack_noun)] to the [organ]!")) //it's not that they're kicking lightly, it's that the kick didn't quite connect + if(3 to 4) user.visible_message(span_danger("[user] [pick(attack_verb)] [target] in [TT.his] [organ]!")) + if(5) user.visible_message(span_danger("[user] landed a strong [pick(attack_noun)] against [target]'s [organ]!")) /datum/unarmed_attack/stomp attack_name = "stomp" @@ -270,8 +270,8 @@ var/global/list/sparring_attack_cache = list() attack_damage = CLAMP(attack_damage, 1, 5) switch(attack_damage) - if(1 to 4) user.visible_message("[pick("[user] stomped on", "[user] slammed [TU.his] [shoes ? copytext(shoes.name, 1, -1) : "foot"] down onto")] [target]'s [organ]!") - if(5) user.visible_message("[pick("[user] landed a powerful stomp on", "[user] stomped down hard on", "[user] slammed [TU.his] [shoes ? copytext(shoes.name, 1, -1) : "foot"] down hard onto")] [target]'s [organ]!") //Devastated lol. No. We want to say that the stomp was powerful or forceful, not that it /wrought devastation/ + if(1 to 4) user.visible_message(span_danger("[pick("[user] stomped on", "[user] slammed [TU.his] [shoes ? copytext(shoes.name, 1, -1) : "foot"] down onto")] [target]'s [organ]!")) + if(5) user.visible_message(span_danger("[pick("[user] landed a powerful stomp on", "[user] stomped down hard on", "[user] slammed [TU.his] [shoes ? copytext(shoes.name, 1, -1) : "foot"] down hard onto")] [target]'s [organ]!")) //Devastated lol. No. We want to say that the stomp was powerful or forceful, not that it /wrought devastation/ /datum/unarmed_attack/light_strike attack_name = "light hit" @@ -282,4 +282,4 @@ var/global/list/sparring_attack_cache = list() shredding = 0 damage = 0 sharp = FALSE - edge = FALSE \ No newline at end of file + edge = FALSE diff --git a/code/modules/mob/living/carbon/lick_wounds.dm b/code/modules/mob/living/carbon/lick_wounds.dm index e188467c73..7b757778ae 100644 --- a/code/modules/mob/living/carbon/lick_wounds.dm +++ b/code/modules/mob/living/carbon/lick_wounds.dm @@ -4,20 +4,20 @@ set desc = "Disinfect and heal small wounds with your saliva." if(stat || paralysis || weakened || stunned) - to_chat(src, "You can't do that in your current state.") + to_chat(src, span_warning("You can't do that in your current state.")) return if(nutrition < 50) - to_chat(src, "You need more energy to produce antiseptic enzymes. Eat something and try again.") + to_chat(src, span_warning("You need more energy to produce antiseptic enzymes. Eat something and try again.")) return if (get_dist(src,M) >= 2) - to_chat(src, "You need to be closer to do that.") + to_chat(src, span_warning("You need to be closer to do that.")) return if ( ! (istype(src, /mob/living/carbon/human) || \ istype(src, /mob/living/silicon)) ) - to_chat(src, "If you even have a tongue, it doesn't work that way.") + to_chat(src, span_warning("If you even have a tongue, it doesn't work that way.")) return if (istype(M, /mob/living/carbon/human)) @@ -25,42 +25,42 @@ var/obj/item/organ/external/affecting = H.get_organ(src.zone_sel.selecting) if(!affecting) - to_chat(src, "No body part there to work on!") + to_chat(src, span_warning("No body part there to work on!")) return if(affecting.organ_tag == BP_HEAD) if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space)) - to_chat(src, "You can't seem to lick through [H.head]!") + to_chat(src, span_warning("You can't seem to lick through [H.head]!")) return else if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space)) - to_chat(src, "You can't lick your way through [H.wear_suit]!") + to_chat(src, span_warning("You can't lick your way through [H.wear_suit]!")) return if(affecting.robotic == ORGAN_ROBOT) - to_chat(src, "You don't think your spit will help a robotic limb.") + to_chat(src, span_warning("You don't think your spit will help a robotic limb.")) return if(affecting.robotic >= ORGAN_LIFELIKE) - to_chat(src, "You lick [M]'s [affecting.name], but it seems to have no effect...") + to_chat(src, span_warning("You lick [M]'s [affecting.name], but it seems to have no effect...")) return if(affecting.open) - to_chat(src, "The [affecting.name] is cut open, you don't think your spit will help them!") + to_chat(src, span_notice("The [affecting.name] is cut open, you don't think your spit will help them!")) return if(affecting.is_bandaged() && affecting.is_salved()) - to_chat(src, "The wounds on [M]'s [affecting.name] have already been treated.") + to_chat(src, span_warning("The wounds on [M]'s [affecting.name] have already been treated.")) return if(affecting.brute_dam > 20 || affecting.burn_dam > 20) - to_chat(src, "The wounds on [M]'s [affecting.name] are too severe to treat with just licking.") + to_chat(src, span_warning("The wounds on [M]'s [affecting.name] are too severe to treat with just licking.")) return else visible_message("\The [src] starts licking the wounds on [M]'s [affecting.name] clean.", \ - "You start licking the wounds on [M]'s [affecting.name] clean." ) + span_notice("You start licking the wounds on [M]'s [affecting.name] clean.") ) for (var/datum/wound/W in affecting.wounds) @@ -68,11 +68,11 @@ continue if(!do_mob(src, M, W.damage/5)) - to_chat(src, "You must stand still to clean wounds.") + to_chat(src, span_notice("You must stand still to clean wounds.")) break if(affecting.is_bandaged() && affecting.is_salved()) // We do a second check after the delay, in case it was bandaged after the first check. - to_chat(src, "The wounds on [M]'s [affecting.name] have already been treated.") + to_chat(src, span_warning("The wounds on [M]'s [affecting.name] have already been treated.")) return else @@ -81,7 +81,7 @@ "drips saliva onto \a [W.desc] on [M]'s [affecting.name].", "uses their tongue to disinfect \a [W.desc] on [M]'s [affecting.name].", "licks \a [W.desc] on [M]'s [affecting.name], cleaning it.")]    ", \ - "You treat \a [W.desc] on [M]'s [affecting.name] with your antiseptic saliva." ) + span_notice("You treat \a [W.desc] on [M]'s [affecting.name] with your antiseptic saliva.") ) adjust_nutrition(-20) W.salve() W.bandage() diff --git a/code/modules/mob/living/carbon/metroid/items.dm b/code/modules/mob/living/carbon/metroid/items.dm index 2f769c9cca..ad240a4a56 100644 --- a/code/modules/mob/living/carbon/metroid/items.dm +++ b/code/modules/mob/living/carbon/metroid/items.dm @@ -16,10 +16,10 @@ /obj/item/slime_extract/attackby(obj/item/O as obj, mob/user as mob) if(istype(O, /obj/item/slimesteroid2)) if(enhanced == 1) - to_chat(user, " This extract has already been enhanced!") + to_chat(user, span_warning(" This extract has already been enhanced!")) return ..() if(Uses == 0) - to_chat(user, " You can't enhance a used extract!") + to_chat(user, span_warning(" You can't enhance a used extract!")) return ..() to_chat(user, "You apply the enhancer. It now has triple the amount of uses.") Uses = 3 @@ -131,16 +131,16 @@ /obj/item/slimepotion/docility/attack(mob/living/carbon/slime/M as mob, mob/user as mob) if(!istype(M, /mob/living/carbon/slime))//If target is not a slime. - to_chat(user, " The potion only works on slimes!") + to_chat(user, span_warning(" The potion only works on slimes!")) return ..() // if(M.is_adult) //Can't tame adults -// to_chat(user, " Only baby slimes can be tamed!") +// to_chat(user, span_warning(" Only baby slimes can be tamed!")) // return..() if(M.stat) - to_chat(user, " The slime is dead!") + to_chat(user, span_warning(" The slime is dead!")) return..() if(M.mind) - to_chat(user, " The slime resists!") + to_chat(user, span_warning(" The slime resists!")) return ..() var/mob/living/simple_mob/slime/pet = new /mob/living/simple_mob/slime(M.loc) pet.icon_state = "[M.colour] [M.is_adult ? "adult" : "baby"] slime" @@ -166,16 +166,16 @@ /obj/item/slimepotion/stabilizer/attack(mob/living/carbon/slime/M, mob/user) if(!isslime(M)) - to_chat(user, "The stabilizer only works on slimes!") + to_chat(user, span_warning("The stabilizer only works on slimes!")) return ..() if(M.stat) - to_chat(user, "The slime is dead!") + to_chat(user, span_warning("The slime is dead!")) return ..() if(M.mutation_chance == 0) - to_chat(user, "The slime already has no chance of mutating!") + to_chat(user, span_warning("The slime already has no chance of mutating!")) return ..() - to_chat(user, "You feed the slime the stabilizer. It is now less likely to mutate.") + to_chat(user, span_notice("You feed the slime the stabilizer. It is now less likely to mutate.")) M.mutation_chance = Clamp(M.mutation_chance-15,0,100) qdel(src) @@ -188,13 +188,13 @@ attack(mob/living/carbon/slime/M as mob, mob/user as mob) if(!istype(M, /mob/living/carbon/slime/))//If target is not a slime. - to_chat(user, " The potion only works on slimes!") + to_chat(user, span_warning(" The potion only works on slimes!")) return ..() if(M.stat) - to_chat(user, " The slime is dead!") + to_chat(user, span_warning(" The slime is dead!")) return..() if(M.mind) - to_chat(user, " The slime resists!") + to_chat(user, span_warning(" The slime resists!")) return ..() var/mob/living/simple_mob/adultslime/pet = new /mob/living/simple_mob/adultslime(M.loc) pet.icon_state = "[M.colour] adult slime" @@ -220,16 +220,16 @@ attack(mob/living/carbon/slime/M as mob, mob/user as mob) if(!istype(M, /mob/living/carbon/slime))//If target is not a slime. - to_chat(user, " The steroid only works on baby slimes!") + to_chat(user, span_warning(" The steroid only works on baby slimes!")) return ..() if(M.is_adult) //Can't tame adults - to_chat(user, " Only baby slimes can use the steroid!") + to_chat(user, span_warning(" Only baby slimes can use the steroid!")) return..() if(M.stat) - to_chat(user, " The slime is dead!") + to_chat(user, span_warning(" The slime is dead!")) return..() if(M.cores == 3) - to_chat(user, " The slime already has the maximum amount of extract!") + to_chat(user, span_warning(" The slime already has the maximum amount of extract!")) return..() to_chat(user, "You feed the slime the steroid. It now has triple the amount of extract.") @@ -245,10 +245,10 @@ /*afterattack(obj/target, mob/user , flag) if(istype(target, /obj/item/slime_extract)) if(target.enhanced == 1) - to_chat(user, " This extract has already been enhanced!") + to_chat(user, span_warning(" This extract has already been enhanced!")) return ..() if(target.Uses == 0) - to_chat(user, " You can't enhance a used extract!") + to_chat(user, span_warning(" You can't enhance a used extract!")) return ..() to_chat(user, "You apply the enhancer. It now has triple the amount of uses.") target.Uses = 3 @@ -371,9 +371,9 @@ /obj/item/reagent_containers/food/snacks/egg/slime/proc/Hatch() STOP_PROCESSING(SSobj, src) var/turf/T = get_turf(src) - src.visible_message(" The [name] pulsates and quivers!") + src.visible_message(span_warning(" The [name] pulsates and quivers!")) spawn(rand(50,100)) - src.visible_message(" The [name] bursts open!") + src.visible_message(span_warning(" The [name] bursts open!")) new/mob/living/carbon/slime(T) qdel(src) diff --git a/code/modules/mob/living/carbon/metroid/powers.dm b/code/modules/mob/living/carbon/metroid/powers.dm index bcbf8fb132..505b6861b8 100644 --- a/code/modules/mob/living/carbon/metroid/powers.dm +++ b/code/modules/mob/living/carbon/metroid/powers.dm @@ -52,7 +52,7 @@ Victim.adjustBruteLoss(is_adult ? rand(7, 15) : rand(4, 12)) else - to_chat(src, "[pick("This subject is incompatible", "This subject does not have a life energy", "This subject is empty", "I am not satisfied", "I can not feed from this subject", "I do not feel nourished", "This subject is not food")]...") + to_chat(src, span_warning("[pick("This subject is incompatible", "This subject does not have a life energy", "This subject is empty", "I am not satisfied", "I can not feed from this subject", "I do not feel nourished", "This subject is not food")]...")) Feedstop() break @@ -64,7 +64,7 @@ else if (istype(M, /mob/living/carbon)) var/mob/living/carbon/C = M if (C.can_feel_pain()) - to_chat(M, "[painMes]") + to_chat(M, span_danger("[painMes]")) gain_nutrition(rand(20,25)) @@ -92,7 +92,7 @@ ++Friends[Victim.LAssailant] else - to_chat(src, "This subject does not have a strong enough life energy anymore...") + to_chat(src, span_notice("This subject does not have a strong enough life energy anymore...")) Victim = null @@ -112,7 +112,7 @@ set desc = "This will let you evolve from baby to adult slime." if(stat) - to_chat(src, "I must be conscious to do this...") + to_chat(src, span_notice("I must be conscious to do this...")) return if(!is_adult) @@ -123,22 +123,22 @@ regenerate_icons() name = text("[colour] [is_adult ? "adult" : "baby"] slime ([number])") else - to_chat(src, "I am not ready to evolve yet...") + to_chat(src, span_notice("I am not ready to evolve yet...")) else - to_chat(src, "I have already evolved...") + to_chat(src, span_notice("I have already evolved...")) /mob/living/carbon/slime/verb/Reproduce() set category = "Slime" set desc = "This will make you split into four Slimes." if(stat) - to_chat(src, "I must be conscious to do this...") + to_chat(src, span_notice("I must be conscious to do this...")) return if(is_adult) if(amount_grown >= 10) if(stat) - to_chat(src, "I must be conscious to do this...") + to_chat(src, span_notice("I must be conscious to do this...")) return var/list/babies = list() @@ -164,6 +164,6 @@ new_slime.key = src.key qdel(src) else - to_chat(src, "I am not ready to reproduce yet...") + to_chat(src, span_notice("I am not ready to reproduce yet...")) else - to_chat(src, "I am not old enough to reproduce yet...") + to_chat(src, span_notice("I am not old enough to reproduce yet...")) diff --git a/code/modules/mob/living/carbon/resist.dm b/code/modules/mob/living/carbon/resist.dm index a3d50c4fb9..102540207c 100644 --- a/code/modules/mob/living/carbon/resist.dm +++ b/code/modules/mob/living/carbon/resist.dm @@ -3,14 +3,14 @@ Weaken(3) spin(32,2) visible_message( - "[src] rolls on the floor, trying to put themselves out!", - "You stop, drop, and roll!" + span_danger("[src] rolls on the floor, trying to put themselves out!"), + span_notice("You stop, drop, and roll!") ) sleep(30) if(fire_stacks <= 0) visible_message( - "[src] has successfully extinguished themselves!", - "You extinguish yourself." + span_danger("[src] has successfully extinguished themselves!"), + span_notice("You extinguish yourself.") ) ExtinguishMob() return TRUE @@ -21,7 +21,7 @@ I = handcuffed else if(legcuffed) I = legcuffed - + if(I) setClickCooldown(100) cuff_resist(I, cuff_break = can_break_cuffs()) @@ -30,7 +30,7 @@ return FALSE /mob/living/carbon/proc/cuff_resist(obj/item/handcuffs/I, breakouttime = 1200, cuff_break = 0) - + if(istype(I)) breakouttime = I.breakouttime @@ -42,14 +42,14 @@ displaytime /= reduceCuffTime if(cuff_break) - visible_message("[src] is trying to break [I]!", - "You attempt to break your [I]. (This will take around 5 seconds and you need to stand still)") + visible_message(span_danger("[src] is trying to break [I]!"), + span_warning("You attempt to break your [I]. (This will take around 5 seconds and you need to stand still)")) if(do_after(src, 5 SECONDS, target = src, incapacitation_flags = INCAPACITATION_DEFAULT & ~INCAPACITATION_RESTRAINED)) if(!I || buckled) return - visible_message("[src] manages to break [I]!", - "You successfully break your [I].") + visible_message(span_danger("[src] manages to break [I]!"), + span_warning("You successfully break your [I].")) say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) if(I == handcuffed) @@ -58,20 +58,20 @@ else if(I == legcuffed) legcuffed = null update_inv_legcuffed() - + if(buckled && buckled.buckle_require_restraints) buckled.unbuckle_mob() qdel(I) else - to_chat(src, "You fail to break [I].") + to_chat(src, span_warning("You fail to break [I].")) return - - visible_message("[src] attempts to remove [I]!", - "You attempt to remove [I]. (This will take around [displaytime] seconds and you need to stand still)") + + visible_message(span_danger("[src] attempts to remove [I]!"), + span_warning("You attempt to remove [I]. (This will take around [displaytime] seconds and you need to stand still)")) if(do_after(src, breakouttime, target = src, incapacitation_flags = INCAPACITATION_DISABLED & INCAPACITATION_KNOCKDOWN)) - visible_message("[src] manages to remove [I]!", - "You successfully remove [I].") + visible_message(span_danger("[src] manages to remove [I]!"), + span_notice("You successfully remove [I].")) drop_from_inventory(I) /mob/living/carbon/resist_buckle() @@ -83,15 +83,15 @@ setClickCooldown(100) visible_message( - "[src] attempts to unbuckle themself!", - "You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stand still)" + span_danger("[src] attempts to unbuckle themself!"), + span_warning("You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stand still)") ) if(do_after(src, 2 MINUTES, incapacitation_flags = INCAPACITATION_DEFAULT & ~(INCAPACITATION_RESTRAINED | INCAPACITATION_BUCKLED_FULLY))) if(!buckled) return - visible_message("[src] manages to unbuckle themself!", - "You successfully unbuckle yourself.") + visible_message(span_danger("[src] manages to unbuckle themself!"), + span_notice("You successfully unbuckle yourself.")) buckled.user_unbuckle_mob(src, src) /mob/living/carbon/proc/can_break_cuffs() diff --git a/code/modules/mob/living/carbon/taste.dm b/code/modules/mob/living/carbon/taste.dm index 150f67d955..90e249b79a 100644 --- a/code/modules/mob/living/carbon/taste.dm +++ b/code/modules/mob/living/carbon/taste.dm @@ -15,7 +15,7 @@ text_output = "nothing" if(text_output != last_taste_text || last_taste_time + 100 < world.time) //We dont want to spam the same message over and over again at the person. Give it a bit of a buffer. - to_chat(src, "You can taste [text_output].")//no taste means there are too many tastes and not enough flavor. + to_chat(src, span_notice("You can taste [text_output]."))//no taste means there are too many tastes and not enough flavor. last_taste_time = world.time last_taste_text = text_output @@ -67,4 +67,4 @@ calculate text size per text. intensity_desc = "the strong flavor of" out += "[intensity_desc] [taste_desc]" - return english_list(out, "something indescribable") \ No newline at end of file + return english_list(out, "something indescribable") diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm index c83980f18f..847f1b221b 100644 --- a/code/modules/mob/living/default_language.dm +++ b/code/modules/mob/living/default_language.dm @@ -6,20 +6,20 @@ set category = "IC" if (only_species_language && language != GLOB.all_languages[src.species_language]) - to_chat(src, "You can only speak your species language, [src.species_language].") + to_chat(src, span_notice("You can only speak your species language, [src.species_language].")) return 0 if(language == GLOB.all_languages[src.species_language]) - to_chat(src, "You will now speak your standard default language, [language ? language : "common"], if you do not specify a language when speaking.") + to_chat(src, span_notice("You will now speak your standard default language, [language ? language : "common"], if you do not specify a language when speaking.")) else if (language) if(language && !can_speak(language)) - to_chat(src, "You are unable to speak that language.") + to_chat(src, span_notice("You are unable to speak that language.")) return - to_chat(src, "You will now speak [language] if you do not specify a language when speaking.") + to_chat(src, span_notice("You will now speak [language] if you do not specify a language when speaking.")) else - to_chat(src, "You will now speak whatever your standard default language is if you do not specify one when speaking.") + to_chat(src, span_notice("You will now speak whatever your standard default language is if you do not specify one when speaking.")) default_language = language // Silicons can't neccessarily speak everything in their languages list @@ -31,6 +31,6 @@ set category = "IC" if(default_language) - to_chat(src, "You are currently speaking [default_language] by default.") + to_chat(src, span_notice("You are currently speaking [default_language] by default.")) else - to_chat(src, "Your current default language is your species or mob type default.") + to_chat(src, span_notice("Your current default language is your species or mob type default.")) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 79c588901d..5e782f85eb 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -41,11 +41,11 @@ var/idle_limit = 10 MINUTES if(client.inactivity >= idle_limit && !away_from_keyboard && client.prefs?.read_preference(/datum/preference/toggle/auto_afk)) //if we're not already afk and we've been idle too long, and we have automarking enabled... then automark it add_status_indicator("afk") - to_chat(src, "You have been idle for too long, and automatically marked as AFK.") + to_chat(src, span_notice("You have been idle for too long, and automatically marked as AFK.")) away_from_keyboard = TRUE else if(away_from_keyboard && client.inactivity < idle_limit && !manual_afk) //if we're afk but we do something AND we weren't manually flagged as afk, unmark it remove_status_indicator("afk") - to_chat(src, "You have been automatically un-marked as AFK.") + to_chat(src, span_notice("You have been automatically un-marked as AFK.")) away_from_keyboard = FALSE //Chemicals in the body, this is moved over here so that blood can be added after death diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 641d5cbc86..c707e358a8 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -99,7 +99,7 @@ if(!..()) return 0 - usr.visible_message("[src] points to [A].") + usr.visible_message(span_filter_notice("[src] points to [A].")) return 1 /mob/living/verb/succumb() @@ -127,12 +127,12 @@ set desc = "Mark yourself as Away From Keyboard, or clear that status!" if(away_from_keyboard) remove_status_indicator("afk") - to_chat(src, "You are no longer marked as AFK.") + to_chat(src, span_notice("You are no longer marked as AFK.")) away_from_keyboard = FALSE manual_afk = FALSE else add_status_indicator("afk") - to_chat(src, "You are now marked as AFK.") + to_chat(src, span_notice("You are now marked as AFK.")) away_from_keyboard = TRUE manual_afk = TRUE @@ -716,13 +716,13 @@ if(config.allow_Metadata) if(ooc_notes) ooc_notes_window(usr) -// to_chat(usr, "[src]'s Metainfo:
    [ooc_notes]    ") +// to_chat(usr, span_filter_notice("[src]'s Metainfo:
    [ooc_notes]")) else if(client) - to_chat(usr, "[src]'s Metainfo:
    [client.prefs.metadata]    ") + to_chat(usr, span_filter_notice("[src]'s Metainfo:
    [client.prefs.metadata]")) else - to_chat(usr, "[src] does not have any stored infomation!") + to_chat(usr, span_filter_notice("[src] does not have any stored infomation!")) else - to_chat(usr, "OOC Metadata is not supported by this server!") + to_chat(usr, span_filter_notice("OOC Metadata is not supported by this server!")) //VOREStation Edit End - Making it so SSD people have prefs with fallback to original style. return @@ -779,7 +779,7 @@ resisting++ G.handle_resist() if(resisting) - visible_message("[src] resists!") + visible_message(span_danger("[src] resists!")) /mob/living/proc/resist_fire() return @@ -792,7 +792,7 @@ set category = "IC" resting = !resting - to_chat(src, "You are now [resting ? "resting" : "getting up"].") + to_chat(src, span_notice("You are now [resting ? "resting" : "getting up"].")) update_canmove() //called when the mob receives a bright flash @@ -844,7 +844,7 @@ inertia_dir = 1 else if(y >= world.maxy -TRANSITIONEDGE) inertia_dir = 2 - to_chat(src, "Something you are carrying is preventing you from leaving.") + to_chat(src, span_warning("Something you are carrying is preventing you from leaving.")) return ..() @@ -868,14 +868,14 @@ if(!lastpuke) lastpuke = 1 if(isSynthetic()) - to_chat(src, "A sudden, dizzying wave of internal feedback rushes over you!") + to_chat(src, span_danger("A sudden, dizzying wave of internal feedback rushes over you!")) src.Weaken(5) else if (nutrition <= 100) - to_chat(src, "You gag as you want to throw up, but there's nothing in your stomach!") + to_chat(src, span_danger("You gag as you want to throw up, but there's nothing in your stomach!")) src.Weaken(10) else - to_chat(src, "You feel nauseous...") + to_chat(src, span_warning("You feel nauseous...")) if(ishuman(src)) var/mob/living/carbon/human/Hu = src @@ -888,7 +888,7 @@ spawn() if(!skip_wait) sleep(150) //15 seconds until second warning - to_chat(src, "You feel like you are about to throw up!") + to_chat(src, span_warning("You feel like you are about to throw up!")) sleep(100) //and you have 10 more for mad dash to the bucket //Damaged livers cause you to vomit blood. @@ -901,7 +901,7 @@ blood_vomit = 1 Stun(5) - src.visible_message("[src] throws up!","You throw up!") + src.visible_message(span_warning("[src] throws up!"),span_warning("You throw up!")) playsound(src, 'sound/effects/splat.ogg', 50, 1) var/turf/simulated/T = get_turf(src) //TODO: Make add_blood_floor remove blood from human mobs @@ -1141,7 +1141,7 @@ N.adjustBruteLoss(rand(10,30)) src.drop_from_inventory(G) - src.visible_message("[src] has thrown [item].") + src.visible_message(span_warning("[src] has thrown [item].")) if((isspace(src.loc)) || (src.lastarea?.has_gravity == 0)) src.inertia_dir = get_dir(target, src) @@ -1160,7 +1160,7 @@ var/mob/living/carbon/human/H = target if(H.in_throw_mode && H.a_intent == I_HELP && unEquip(I)) H.put_in_hands(I) // If this fails it will just end up on the floor, but that's fitting for things like dionaea. - visible_message("[src] hands \the [H] \a [I].", span_notice("You give \the [target] \a [I].")) + visible_message(span_filter_notice("[src] hands \the [H] \a [I]."), span_notice("You give \the [target] \a [I].")) else to_chat(src, span_notice("You offer \the [I] to \the [target].")) do_give(H) @@ -1172,7 +1172,7 @@ return TRUE //It may not have thrown, but it sure as hell left your hand successfully. //actually throw it! - src.visible_message("[src] has thrown [item].") + src.visible_message(span_warning("[src] has thrown [item].")) if((isspace(src.loc)) || (src.lastarea?.has_gravity == 0)) src.inertia_dir = get_dir(target, src) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index a3f5919e8d..aa34f5669d 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -29,15 +29,15 @@ armor = max(armor - armour_pen, 0) //Armor pen makes armor less effective. if(armor >= 100) if(absorb_text) - to_chat(src, "[absorb_text]") + to_chat(src, span_danger("[absorb_text]")) else - to_chat(src, "Your armor absorbs the blow!") + to_chat(src, span_danger("Your armor absorbs the blow!")) else if(armor > 0) if(soften_text) - to_chat(src, "[soften_text]") + to_chat(src, span_danger("[soften_text]")) else - to_chat(src, "Your armor softens the blow!") + to_chat(src, span_danger("Your armor softens the blow!")) if(Debug2) to_world_log("## DEBUG: Armor when [src] was attacked was [armor].") return armor @@ -66,13 +66,13 @@ if(absorb_text) show_message("[absorb_text]") else - show_message("Your armor absorbs the blow!") + show_message(span_warning("Your armor absorbs the blow!")) return 2 if(absorb == 1) if(absorb_text) show_message("[soften_text]",4) else - show_message("Your armor softens the blow!") + show_message(span_warning("Your armor softens the blow!")) return 1 return 0 */ @@ -200,7 +200,7 @@ damage_type = BRUTE damage *= 0.66 // Take 2/3s as much damage. - visible_message("\The [B] [attack_verb] \the [src]!", "[attack_message]!") + visible_message(span_danger("\The [B] [attack_verb] \the [src]!"), span_danger("[attack_message]!")) playsound(src, 'sound/effects/attackblob.ogg', 50, 1) //Armor @@ -217,7 +217,7 @@ //Called when the mob is hit with an item in combat. Returns the blocked result /mob/living/proc/hit_with_weapon(obj/item/I, mob/living/user, var/effective_force, var/hit_zone) - visible_message("[src] has been [LAZYLEN(I.attack_verb) ? pick(I.attack_verb) : "attacked"] with [I.name] by [user]!") + visible_message(span_danger("[src] has been [LAZYLEN(I.attack_verb) ? pick(I.attack_verb) : "attacked"] with [I.name] by [user]!")) if(ai_holder) ai_holder.react_to_attack(user) @@ -260,7 +260,7 @@ if(stat != DEAD && istype(O,/obj/item) && trash_catching && vore_selected) //ported from chompstation var/obj/item/I = O if(adminbus_trash || is_type_in_list(I,edible_trash) && I.trash_eatable && !is_type_in_list(I,item_vore_blacklist)) - visible_message("[I] is thrown directly into [src]'s [lowertext(vore_selected.name)]!") + visible_message(span_warning("[I] is thrown directly into [src]'s [lowertext(vore_selected.name)]!")) I.throwing = 0 I.forceMove(vore_selected) return @@ -273,10 +273,10 @@ miss_chance = max(15*(distance-2), 0) if (prob(miss_chance)) - visible_message("\The [O] misses [src] narrowly!") + visible_message(span_notice("\The [O] misses [src] narrowly!")) return - src.visible_message("[span_red("[src] has been hit by [O].")]") + src.visible_message(span_filter_warning("[span_red("[src] has been hit by [O].")]")) var/armor = run_armor_check(null, "melee") var/soaked = get_armor_soak(null, "melee") @@ -303,7 +303,7 @@ if(O.throw_source && momentum >= THROWNOBJ_KNOCKBACK_SPEED) var/dir = get_dir(O.throw_source, src) - visible_message("[span_red("[src] staggers under the impact!")]","[span_red("You stagger under the impact!")]") + visible_message(span_filter_warning("[span_red("[src] staggers under the impact!")]"),span_filter_warning("[span_red("You stagger under the impact!")]")) src.throw_at(get_edge_target_turf(src,dir),1,momentum) if(!O || !src) return @@ -319,7 +319,7 @@ if(T) src.loc = T - visible_message("[src] is pinned to the wall by [O]!","You are pinned to the wall by [O]!") + visible_message(span_warning("[src] is pinned to the wall by [O]!"),span_warning("You are pinned to the wall by [O]!")) src.anchored = TRUE src.pinned += O @@ -339,7 +339,7 @@ if(!vore_selected) return vore_selected.nom_mob(thrown_mob) //Eat them!!! - visible_message("[thrown_mob] is thrown right into [src]'s [lowertext(vore_selected.name)]!") + visible_message(span_vwarning("[thrown_mob] is thrown right into [src]'s [lowertext(vore_selected.name)]!")) if(thrown_mob.loc != vore_selected) thrown_mob.forceMove(vore_selected) //Double check. Should never happen but...Weirder things have happened! on_throw_vore_special(TRUE, thrown_mob) @@ -351,7 +351,7 @@ else if((can_be_drop_prey && throw_vore && devourable) && (thrown_mob.can_be_drop_pred && thrown_mob.throw_vore) && thrown_mob.vore_selected) //Pred thrown into prey. if(!thrown_mob.vore_selected) return - visible_message("[src] suddenly slips inside of [thrown_mob]'s [lowertext(thrown_mob.vore_selected.name)] as [thrown_mob] flies into them!") + visible_message(span_vwarning("[src] suddenly slips inside of [thrown_mob]'s [lowertext(thrown_mob.vore_selected.name)] as [thrown_mob] flies into them!")) thrown_mob.vore_selected.nom_mob(src) //Eat them!!! if(src.loc != thrown_mob.vore_selected) src.forceMove(thrown_mob.vore_selected) //Double check. Should never happen but...Weirder things have happened! @@ -398,7 +398,7 @@ add_attack_logs(user,src,"Generic attack (probably animal)", admin_notify = FALSE) //Usually due to simple_mob attacks if(ai_holder) ai_holder.react_to_attack(user) - src.visible_message("[user] has [attack_message] [src]!") + src.visible_message(span_danger("[user] has [attack_message] [src]!")) user.do_attack_animation(src) spawn(1) updatehealth() return 1 diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm index d8c45f3667..c7ceb2a94a 100644 --- a/code/modules/mob/living/living_movement.dm +++ b/code/modules/mob/living/living_movement.dm @@ -60,12 +60,12 @@ default behaviour is: for(var/mob/living/M in range(tmob, 1)) if(tmob.pinned.len || ((M.pulling == tmob && ( tmob.restrained() && !( M.restrained() ) && M.stat == 0)) || locate(/obj/item/grab, tmob.grabbed_by.len)) ) if ( !(world.time % 5) ) - to_chat(src, "[tmob] is restrained, you cannot push past") + to_chat(src, span_warning("[tmob] is restrained, you cannot push past")) now_pushing = 0 return if( tmob.pulling == M && ( M.restrained() && !( tmob.restrained() ) && tmob.stat == 0) ) if ( !(world.time % 5) ) - to_chat(src, "[tmob] is restraining [M], you cannot push past") + to_chat(src, span_warning("[tmob] is restraining [M], you cannot push past")) now_pushing = 0 return @@ -144,7 +144,7 @@ default behaviour is: if(ishuman(tmob)) var/mob/living/carbon/human/H = tmob if(H.species.lightweight == 1 && prob(50)) - H.visible_message("[src] bumps into [H], knocking them off balance!") + H.visible_message(span_warning("[src] bumps into [H], knocking them off balance!")) H.Weaken(5) now_pushing = 0 return @@ -154,7 +154,7 @@ default behaviour is: // VOREStation Edit - End if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) if(prob(40) && !(FAT in src.mutations)) - to_chat(src, "You fail to push [tmob]'s fat ass out of the way.") + to_chat(src, span_danger("You fail to push [tmob]'s fat ass out of the way.")) now_pushing = 0 return if(tmob.r_hand && istype(tmob.r_hand, /obj/item/shield/riot)) @@ -182,9 +182,9 @@ default behaviour is: if(confused && prob(50) && m_intent=="run") Weaken(2) playsound(src, "punch", 25, 1, -1) - visible_message("[src] [pick("ran", "slammed")] into \the [AM]!") + visible_message(span_warning("[src] [pick("ran", "slammed")] into \the [AM]!")) src.apply_damage(5, BRUTE) - to_chat(src, "You just [pick("ran", "slammed")] into \the [AM]!") + to_chat(src, span_warning("You just [pick("ran", "slammed")] into \the [AM]!")) */ // VOREStation Removal End return if (!now_pushing) @@ -266,7 +266,7 @@ default behaviour is: var/area/A = get_area(src) if(lying && !buckled && pull_damage() && A.has_gravity() && (prob(getBruteLoss() * 200 / maxHealth))) adjustBruteLoss(2) - visible_message("\The [src]'s [isSynthetic() ? "state" : "wounds"] worsen terribly from being dragged!") + visible_message(span_danger("\The [src]'s [isSynthetic() ? "state" : "wounds"] worsen terribly from being dragged!")) /mob/living/Moved(var/atom/oldloc, direct, forced, movetime) . = ..() diff --git a/code/modules/mob/living/living_powers.dm b/code/modules/mob/living/living_powers.dm index a2515085ad..740cbed074 100644 --- a/code/modules/mob/living/living_powers.dm +++ b/code/modules/mob/living/living_powers.dm @@ -1,4 +1,4 @@ -/mob/living/proc/reveal(var/silent, var/message = "You have been revealed! You are no longer hidden.") +/mob/living/proc/reveal(var/silent, var/message = span_warning("You have been revealed! You are no longer hidden.")) if(status_flags & HIDING) status_flags &= ~HIDING reset_plane_and_layer() @@ -14,12 +14,12 @@ return if(status_flags & HIDING) - reveal(FALSE, "You have stopped hiding.") + reveal(FALSE, span_notice("You have stopped hiding.")) else status_flags |= HIDING layer = HIDING_LAYER //Just above cables with their 2.44 plane = OBJ_PLANE - to_chat(src,"You are now hiding.") + to_chat(src,span_notice("You are now hiding.")) /mob/living/proc/toggle_selfsurgery() set name = "Allow Self Surgery" @@ -28,5 +28,5 @@ allow_self_surgery = !allow_self_surgery - to_chat(usr, "You will [allow_self_surgery ? "now" : "no longer"] attempt to operate upon yourself.") + to_chat(usr, span_notice("You will [allow_self_surgery ? "now" : "no longer"] attempt to operate upon yourself.")) log_admin("DEBUG \[[world.timeofday]\]: [src.ckey ? "[src.name]:([src.ckey])" : "[src.name]"] has [allow_self_surgery ? "Enabled" : "Disabled"] self surgery.") diff --git a/code/modules/mob/living/living_vr.dm b/code/modules/mob/living/living_vr.dm index 853e790885..4afe66b0d0 100644 --- a/code/modules/mob/living/living_vr.dm +++ b/code/modules/mob/living/living_vr.dm @@ -33,7 +33,7 @@ if(new_metadata && CanUseTopic(usr)) ooc_notes = new_metadata client.prefs.metadata = new_metadata - to_chat(usr, "OOC notes updated. Don't forget to save!") + to_chat(usr, span_filter_notice("OOC notes updated. Don't forget to save!")) log_admin("[key_name(usr)] updated their OOC notes mid-round.") ooc_notes_window(usr) set_metainfo_likes(FALSE) @@ -46,7 +46,7 @@ if(new_metadata && CanUseTopic(usr)) ooc_notes = new_metadata client.prefs.metadata = new_metadata - to_chat(usr, "OOC notes updated. Don't forget to save!") + to_chat(usr, span_filter_notice("OOC notes updated. Don't forget to save!")) log_admin("[key_name(usr)] updated their OOC notes mid-round.") ooc_notes_window(usr) @@ -59,7 +59,7 @@ new_metadata = "" ooc_notes_likes = new_metadata client.prefs.metadata_likes = new_metadata - to_chat(usr, "OOC note likes have been updated. Don't forget to save!") + to_chat(usr, span_filter_notice("OOC note likes have been updated. Don't forget to save!")) log_admin("[key_name(usr)] updated their OOC note likes mid-round.") if(reopen) ooc_notes_window(usr) @@ -73,7 +73,7 @@ new_metadata = "" ooc_notes_dislikes = new_metadata client.prefs.metadata_dislikes = new_metadata - to_chat(usr, "OOC note dislikes have been updated. Don't forget to save!") + to_chat(usr, span_filter_notice("OOC note dislikes have been updated. Don't forget to save!")) log_admin("[key_name(usr)] updated their OOC note dislikes mid-round.") if(reopen) ooc_notes_window(usr) @@ -82,10 +82,10 @@ if(usr != src) return if(client.prefs.real_name != real_name) - to_chat(usr, "Your selected character slot name is not the same as your character's name. Aborting save. Please select [real_name]'s character slot in character setup before saving.") + to_chat(usr, span_danger("Your selected character slot name is not the same as your character's name. Aborting save. Please select [real_name]'s character slot in character setup before saving.")) return if(client.prefs.save_character()) - to_chat(usr, "Character preferences saved.") + to_chat(usr, span_filter_notice("Character preferences saved.")) /mob/living/proc/print_ooc_notes_to_chat() if(!ooc_notes) @@ -95,7 +95,7 @@ msg += "

    LIKES

    [ooc_notes_likes]" if(ooc_notes_dislikes) msg += "

    DISLIKES

    [ooc_notes_dislikes]" - to_chat(usr, "[src]'s Metainfo:
    [msg]    ") + to_chat(usr, span_chatexport("[src]'s Metainfo:
    [msg]")) /mob/living/verb/set_custom_link() set name = "Set Custom Link" diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm index 927fc4a511..cd2672f97d 100644 --- a/code/modules/mob/living/login.dm +++ b/code/modules/mob/living/login.dm @@ -10,7 +10,7 @@ if(ai_holder && !ai_holder.autopilot) ai_holder.go_sleep() - to_chat(src,"Mob AI disabled while you are controlling the mob.") + to_chat(src,span_notice("Mob AI disabled while you are controlling the mob.")) AddComponent(/datum/component/character_setup) diff --git a/code/modules/mob/living/riding.dm b/code/modules/mob/living/riding.dm index 60d88132f8..5319895da7 100644 --- a/code/modules/mob/living/riding.dm +++ b/code/modules/mob/living/riding.dm @@ -7,10 +7,10 @@ if(istype(riding_datum,/datum/riding)) if(riding_datum.keytype) riding_datum.keytype = null - to_chat(src, "Rider control enabled.") + to_chat(src, span_filter_notice("Rider control enabled.")) return else riding_datum.keytype = /obj/item/material/twohanded/riding_crop - to_chat(src, "Rider control restricted.") + to_chat(src, span_filter_notice("Rider control restricted.")) return return diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 8bad39f94f..94d1e093fc 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -150,7 +150,7 @@ var/list/channel_to_radio_key = new if(message) client.handle_spam_prevention(MUTE_IC) if((client.prefs.muted & MUTE_IC) || say_disabled) - to_chat(src, "You cannot speak in IC (Muted).") + to_chat(src, span_warning("You cannot speak in IC (Muted).")) return //Redirect to say_dead if talker is dead @@ -213,7 +213,7 @@ var/list/channel_to_radio_key = new // If you're muzzled, you can only speak sign language // However, sign language is handled above. if(is_muzzled()) - to_chat(src, "You're muzzled and cannot speak!") + to_chat(src, span_danger("You're muzzled and cannot speak!")) return //Whisper vars @@ -279,7 +279,7 @@ var/list/channel_to_radio_key = new message_range = first_piece.speaking.get_talkinto_msg_range(message) var/msg if(!first_piece.speaking || !(first_piece.speaking.flags & NO_TALK_MSG)) - msg = "[src] talks into [used_radios[1]]" + msg = span_notice("[src] talks into [used_radios[1]]") if(msg) for(var/mob/living/M in hearers(5, src) - src) @@ -372,7 +372,7 @@ var/list/channel_to_radio_key = new //VOREStation Add - Ghosts don't hear whispers if(whispering && isobserver(M) && (!M.client?.prefs?.read_preference(/datum/preference/toggle/ghost_see_whisubtle) || \ (!client?.prefs?.read_preference(/datum/preference/toggle/whisubtle_vis) && !M.client?.holder))) - M.show_message("[src.name] [w_not_heard].", 2) + M.show_message(span_game(span_say(span_name(src.name) + " [w_not_heard].")), 2) return //VOREStation Add End @@ -393,7 +393,7 @@ var/list/channel_to_radio_key = new images_to_clients[I2] |= M.client M << I2 if(dst > w_scramble_range && dst <= world.view) //Inside whisper 'visible' range - M.show_message("[name] [w_not_heard].", 2) + M.show_message(span_game(span_say(span_name(name) + " [w_not_heard].")), 2) //Object message delivery for(var/obj/O in listening_obj) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 67fc942635..47bae9304a 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -196,7 +196,7 @@ var/list/ai_verbs_default = list( "While observing through a camera, you can use most (networked) devices which you can see, such as computers, APCs, intercoms, doors, etc.", "To use something, simply click on it.", "For department channels, use the following say commands:") - to_chat(src, "[jointext(init_text, "
    ")]    ") + to_chat(src, span_filter_notice("[jointext(init_text, "
    ")]")) var/radio_text = "" for(var/i = 1 to common_radio.channels.len) @@ -218,7 +218,7 @@ var/list/ai_verbs_default = list( if (malf && !(mind in malf.current_antagonists)) show_laws() - to_chat(src, "These laws may be changed by other players, or by you being the traitor.") + to_chat(src, span_filter_notice("These laws may be changed by other players, or by you being the traitor.")) job = JOB_AI setup_icon() @@ -364,7 +364,7 @@ var/list/ai_verbs_default = list( return if(message_cooldown) - to_chat(src, "Please allow one minute to pass between announcements.") + to_chat(src, span_filter_notice("Please allow one minute to pass between announcements.")) return var/input = tgui_input_text(usr, "Please write a message to announce to the station crew.", "A.I. Announcement") if(!input) @@ -422,13 +422,13 @@ var/list/ai_verbs_default = list( if(check_unable(AI_CHECK_WIRELESS)) return if(emergency_message_cooldown) - to_chat(usr, "Arrays recycling. Please stand by.") + to_chat(usr, span_warning("Arrays recycling. Please stand by.")) return var/input = sanitize(tgui_input_text(usr, "Please choose a message to transmit to [using_map.boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")) if(!input) return CentCom_announce(input, usr) - to_chat(usr, "Message transmitted.") + to_chat(usr, span_notice("Message transmitted.")) log_game("[key_name(usr)] has made an IA [using_map.boss_short] announcement: [input]") emergency_message_cooldown = 1 spawn(300) @@ -471,7 +471,7 @@ var/list/ai_verbs_default = list( if(H) H.attack_ai(src) //may as well recycle else - to_chat(src, "Unable to locate the holopad.") + to_chat(src, span_notice("Unable to locate the holopad.")) if (href_list["track"]) var/mob/target = locate(href_list["track"]) in mob_list @@ -479,7 +479,7 @@ var/list/ai_verbs_default = list( if(target && (!istype(target, /mob/living/carbon/human) || html_decode(href_list["trackname"]) == target:get_face_name())) ai_actual_track(target) else - to_chat(src, "[span_red("System error. Cannot locate [html_decode(href_list["trackname"])].")]") + to_chat(src, span_filter_warning("[span_red("System error. Cannot locate [html_decode(href_list["trackname"])].")]")) return if(href_list["trackbot"]) @@ -487,7 +487,7 @@ var/list/ai_verbs_default = list( if(target) ai_actual_track(target) else - to_chat(src, "Target is not on or near any active cameras on the station.") + to_chat(src, span_warning("Target is not on or near any active cameras on the station.")) return if(href_list["open"]) @@ -579,7 +579,7 @@ var/list/ai_verbs_default = list( if(network in C.network) eyeobj.setLoc(get_turf(C)) break - to_chat(src, "Switched to [network] camera network.") + to_chat(src, span_notice("Switched to [network] camera network.")) //End of code by Mord_Sith /mob/living/silicon/ai/proc/ai_statuschange() @@ -729,7 +729,7 @@ var/list/ai_verbs_default = list( return camera_light_on = !camera_light_on - to_chat(src, "Camera lights [camera_light_on ? "activated" : "deactivated"].") + to_chat(src, span_filter_notice("Camera lights [camera_light_on ? "activated" : "deactivated"].")) if(!camera_light_on) if(camera) camera.set_light(0) @@ -772,24 +772,24 @@ var/list/ai_verbs_default = list( else if(W.has_tool_quality(TOOL_WRENCH)) if(user == deployed_shell) - to_chat(user, "The shell's subsystems resist your efforts to tamper with your bolts.") + to_chat(user, span_notice("The shell's subsystems resist your efforts to tamper with your bolts.")) return if(anchored) playsound(src, W.usesound, 50, 1) - user.visible_message("\The [user] starts to unbolt \the [src] from the plating...") + user.visible_message(span_notice("\The [user] starts to unbolt \the [src] from the plating...")) if(!do_after(user,40 * W.toolspeed)) - user.visible_message("\The [user] decides not to unbolt \the [src].") + user.visible_message(span_notice("\The [user] decides not to unbolt \the [src].")) return - user.visible_message("\The [user] finishes unfastening \the [src]!") + user.visible_message(span_notice("\The [user] finishes unfastening \the [src]!")) anchored = FALSE return else playsound(src, W.usesound, 50, 1) - user.visible_message("\The [user] starts to bolt \the [src] to the plating...") + user.visible_message(span_notice("\The [user] starts to bolt \the [src] to the plating...")) if(!do_after(user,40 * W.toolspeed)) - user.visible_message("\The [user] decides not to bolt \the [src].") + user.visible_message(span_notice("\The [user] decides not to bolt \the [src].")) return - user.visible_message("\The [user] finishes fastening down \the [src]!") + user.visible_message(span_notice("\The [user] finishes fastening down \the [src]!")) anchored = TRUE return else @@ -803,7 +803,7 @@ var/list/ai_verbs_default = list( if(check_unable(AI_CHECK_RADIO)) return - to_chat(src, "Accessing Subspace Transceiver control...") + to_chat(src, span_filter_notice("Accessing Subspace Transceiver control...")) if (src.aiRadio) src.aiRadio.interact(src) @@ -826,27 +826,27 @@ var/list/ai_verbs_default = list( var/obj/effect/overlay/aiholo/hologram = holo.masters[src] walk(hologram, 0) //VOREStation Add End - to_chat(usr, "Your hologram will [hologram_follow ? "follow" : "no longer follow"] you now.") + to_chat(usr, span_filter_notice("Your hologram will [hologram_follow ? "follow" : "no longer follow"] you now.")) /mob/living/silicon/ai/proc/check_unable(var/flags = 0, var/feedback = 1) if(stat == DEAD) if(feedback) - to_chat(src, "You are dead!") + to_chat(src, span_warning("You are dead!")) return 1 if(aiRestorePowerRoutine) if(feedback) - to_chat(src, "You lack power!") + to_chat(src, span_warning("You lack power!")) return 1 if((flags & AI_CHECK_WIRELESS) && src.control_disabled) if(feedback) - to_chat(src, "Wireless control is disabled!") + to_chat(src, span_warning("Wireless control is disabled!")) return 1 if((flags & AI_CHECK_RADIO) && src.aiRadio.disabledAi) if(feedback) - to_chat(src, "System Error - Transceiver Disabled!") + to_chat(src, span_warning("System Error - Transceiver Disabled!")) return 1 return 0 @@ -878,14 +878,14 @@ var/list/ai_verbs_default = list( switch(tgui_alert(src, "Do you want to open \the [A] for [target]?", "Doorknob_v2a.exe", list("Yes", "No"))) if("Yes") A.AIShiftClick(src) - to_chat(src, "You open \the [A] for [target].") + to_chat(src, span_notice("You open \the [A] for [target].")) else - to_chat(src, "You deny the request.") + to_chat(src, span_warning("You deny the request.")) else - to_chat(src, "Unable to locate an airlock near [target].") + to_chat(src, span_warning("Unable to locate an airlock near [target].")) else - to_chat(src, "Target is not on or near any active cameras on the station.") + to_chat(src, span_warning("Target is not on or near any active cameras on the station.")) /mob/living/silicon/ai/ex_act(var/severity) if(severity == 1.0) @@ -987,7 +987,7 @@ var/list/ai_verbs_default = list( var/message = combined["formatted"] var/name_used = M.GetVoice() //This communication is imperfect because the holopad "filters" voices and is only designed to connect to the master only. - var/rendered = "Relayed Speech: [name_used] [message]" + var/rendered = span_game(span_say("Relayed Speech: [span_name(name_used)] [message]")) show_message(rendered, 2) /mob/living/silicon/ai/proc/toggle_multicam_verb() diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm index c1f07188bb..75224de7dd 100644 --- a/code/modules/mob/living/silicon/ai/examine.dm +++ b/code/modules/mob/living/silicon/ai/examine.dm @@ -2,28 +2,28 @@ . = ..() if (src.stat == DEAD) - . += "It appears to be powered-down." + . += span_deadsay("It appears to be powered-down.") else if (src.getBruteLoss()) if (src.getBruteLoss() < 30) - . += "It looks slightly dented." + . += span_warning("It looks slightly dented.") else - . += "It looks severely dented!" + . += span_warning("It looks severely dented!") if (src.getFireLoss()) if (src.getFireLoss() < 30) - . += "It looks slightly charred." + . += span_warning("It looks slightly charred.") else - . += "Its casing is melted and heat-warped!" + . += span_warning("Its casing is melted and heat-warped!") if (src.getOxyLoss() && (aiRestorePowerRoutine != 0 && !APU_power)) if (src.getOxyLoss() > 175) - . += "It seems to be running on backup power. Its display is blinking a \"BACKUP POWER CRITICAL\" warning." + . += span_warning("It seems to be running on backup power. Its display is blinking a \"BACKUP POWER CRITICAL\" warning.") else if(src.getOxyLoss() > 100) - . += "It seems to be running on backup power. Its display is blinking a \"BACKUP POWER LOW\" warning." + . += span_warning("It seems to be running on backup power. Its display is blinking a \"BACKUP POWER LOW\" warning.") else - . += "It seems to be running on backup power." + . += span_warning("It seems to be running on backup power.") if (src.stat == UNCONSCIOUS) - . += "It is non-responsive and displaying the text: \"RUNTIME: Sensory Overload, stack 26/3\"." + . += span_warning("It is non-responsive and displaying the text: \"RUNTIME: Sensory Overload, stack 26/3\".") if(deployed_shell) . += "The wireless networking light is blinking." diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm index b1ae6e55ce..4afac25fbc 100644 --- a/code/modules/mob/living/silicon/ai/latejoin.dm +++ b/code/modules/mob/living/silicon/ai/latejoin.dm @@ -16,7 +16,7 @@ var/global/list/empty_playable_ai_cores = list() set desc = "Enter intelligence storage. This is functionally equivalent to cryo or robotic storage, freeing up your job slot." if(ticker && ticker.mode && ticker.mode.name == "AI malfunction") - to_chat(usr, "You cannot use this verb in malfunction. If you need to leave, please adminhelp.") + to_chat(usr, span_danger("You cannot use this verb in malfunction. If you need to leave, please adminhelp.")) return // Guard against misclicks, this isn't the sort of thing we want happening accidentally diff --git a/code/modules/mob/living/silicon/ai/laws.dm b/code/modules/mob/living/silicon/ai/laws.dm index 83fde3cd3b..f0f45fff58 100755 --- a/code/modules/mob/living/silicon/ai/laws.dm +++ b/code/modules/mob/living/silicon/ai/laws.dm @@ -10,7 +10,7 @@ who = world else who = src - to_chat(who, "Obey these laws:") + to_chat(who, span_filter_notice("Obey these laws:")) src.laws_sanity_check() src.laws.show_laws(who) diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index ed528ea1c0..cd95a18b6b 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -36,7 +36,7 @@ malf_process() if(APU_power && (hardware_integrity() < 50)) - to_chat(src, "APU GENERATOR FAILURE! (System Damaged)") + to_chat(src, span_notice("APU GENERATOR FAILURE! (System Damaged)")) stop_apu(1) var/blind = 0 @@ -178,4 +178,3 @@ /mob/living/silicon/ai/rejuvenate() ..() add_ai_verbs(src) - diff --git a/code/modules/mob/living/silicon/ai/malf.dm b/code/modules/mob/living/silicon/ai/malf.dm index bb07440625..a6034d649c 100644 --- a/code/modules/mob/living/silicon/ai/malf.dm +++ b/code/modules/mob/living/silicon/ai/malf.dm @@ -83,7 +83,7 @@ return if(hardware_integrity() < 50) if(!shutup) - to_chat(src, "Starting APU... FAULT(System Damaged)") + to_chat(src, span_notice("Starting APU... FAULT(System Damaged)")) return if(!shutup) to_chat(src, "Starting APU... ONLINE") diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm index 1a69c5f5f3..36022c40d4 100644 --- a/code/modules/mob/living/silicon/ai/multicam.dm +++ b/code/modules/mob/living/silicon/ai/multicam.dm @@ -248,25 +248,25 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room) /mob/living/silicon/ai/proc/drop_new_multicam(silent = FALSE) if(!multicam_allowed) if(!silent) - to_chat(src, "This action is currently disabled. Contact an administrator to enable this feature.") + to_chat(src, span_warning("This action is currently disabled. Contact an administrator to enable this feature.")) return if(!eyeobj) return if(multicam_screens.len >= max_multicams) if(!silent) - to_chat(src, "Cannot place more than [max_multicams] multicamera windows.") + to_chat(src, span_warning("Cannot place more than [max_multicams] multicamera windows.")) return var/obj/screen/movable/pic_in_pic/ai/C = new /obj/screen/movable/pic_in_pic/ai() C.set_view_size(3, 3, FALSE) C.set_view_center(get_turf(eyeobj)) C.set_ai(src) if(!silent) - to_chat(src, "Added new multicamera window.") + to_chat(src, span_notice("Added new multicamera window.")) return C /mob/living/silicon/ai/proc/toggle_multicam() if(!multicam_allowed) - to_chat(src, "This action is currently disabled. Contact an administrator to enable this feature.") + to_chat(src, span_warning("This action is currently disabled. Contact an administrator to enable this feature.")) return if(multicam_on) end_multicam() @@ -277,11 +277,11 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room) if(multicam_on || aiRestorePowerRoutine || !isturf(loc)) return if(!GLOB.ai_camera_room_landmark) - to_chat(src, "This function is not available at this time.") + to_chat(src, span_warning("This function is not available at this time.")) return multicam_on = TRUE refresh_multicam() - to_chat(src, "Multiple-camera viewing mode activated.") + to_chat(src, span_notice("Multiple-camera viewing mode activated.")) /mob/living/silicon/ai/proc/refresh_multicam() reset_view(GLOB.ai_camera_room_landmark) @@ -298,7 +298,7 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room) for(var/obj/screen/movable/pic_in_pic/P as anything in multicam_screens) P.unshow_to(client) reset_view() - to_chat(src, "Multiple-camera viewing mode deactivated.") + to_chat(src, span_notice("Multiple-camera viewing mode deactivated.")) /mob/living/silicon/ai/proc/select_main_multicam_window(obj/screen/movable/pic_in_pic/ai/P) diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm index 7914993447..2e94f49ee1 100644 --- a/code/modules/mob/living/silicon/laws.dm +++ b/code/modules/mob/living/silicon/laws.dm @@ -21,7 +21,7 @@ /mob/living/silicon/robot/set_zeroth_law(var/law, var/law_borg, notify = TRUE) ..() if(tracking_entities) - to_chat(src, "Internal camera is currently being accessed.") + to_chat(src, span_warning("Internal camera is currently being accessed.")) /mob/living/silicon/proc/add_ion_law(var/law, notify = TRUE) laws_sanity_check() @@ -98,7 +98,7 @@ /mob/living/silicon/proc/dostatelaws(var/method, var/prefix, var/datum/ai_laws/laws) if(stating_laws[prefix]) - to_chat(src, "[method]: Already stating laws using this communication method.") + to_chat(src, span_notice("[method]: Already stating laws using this communication method.")) return stating_laws[prefix] = 1 @@ -111,7 +111,7 @@ break if(!can_state) - to_chat(src, "[method]: Unable to state laws. Communication method unavailable.") + to_chat(src, span_danger("[method]: Unable to state laws. Communication method unavailable.")) stating_laws[prefix] = 0 /mob/living/silicon/proc/statelaw(var/law) diff --git a/code/modules/mob/living/silicon/pai/examine.dm b/code/modules/mob/living/silicon/pai/examine.dm index 4446562c75..35f5139faf 100644 --- a/code/modules/mob/living/silicon/pai/examine.dm +++ b/code/modules/mob/living/silicon/pai/examine.dm @@ -4,8 +4,8 @@ switch(src.stat) if(CONSCIOUS) if(!src.client) . += "It appears to be in stand-by mode." //afk - if(UNCONSCIOUS) . += "It doesn't seem to be responding." - if(DEAD) . += "It looks completely unsalvageable." + if(UNCONSCIOUS) . += span_warning("It doesn't seem to be responding.") + if(DEAD) . += span_deadsay("It looks completely unsalvageable.") // VOREStation Edit: Start . += attempt_vr(src,"examine_bellies",args) //VOREStation Edit diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index faabb97768..693bf7e0a3 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -237,7 +237,7 @@ medicalActive2 = null medical_cannotfind = 0 SStgui.update_uis(src) - to_chat(usr, "You reset your record-viewing software.") + to_chat(usr, span_notice("You reset your record-viewing software.")) /mob/living/silicon/pai/cancel_camera() set category = "pAI Commands" @@ -274,7 +274,7 @@ M.ejectpai() //I'm not sure how much of this is necessary, but I would rather avoid issues. if(istype(card.loc,/obj/item/rig_module)) - to_chat(src, "There is no room to unfold inside this rig module. You're good and stuck.") + to_chat(src, span_filter_notice("There is no room to unfold inside this rig module. You're good and stuck.")) return 0 else if(istype(card.loc,/mob)) var/mob/holder = card.loc @@ -284,11 +284,11 @@ if(card in affecting.implants) affecting.take_damage(rand(30,50)) affecting.implants -= card - H.visible_message("\The [src] explodes out of \the [H]'s [affecting.name] in shower of gore!") + H.visible_message(span_danger("\The [src] explodes out of \the [H]'s [affecting.name] in shower of gore!")) break holder.drop_from_inventory(card) else if(isbelly(card.loc)) //VOREStation edit. - to_chat(src, "There is no room to unfold in here. You're good and stuck.") //VOREStation edit. + to_chat(src, span_notice("There is no room to unfold in here. You're good and stuck.")) //VOREStation edit. return 0 //VOREStation edit. else if(istype(card.loc,/obj/item/pda)) var/obj/item/pda/holder = card.loc @@ -303,7 +303,7 @@ canmove = TRUE var/turf/T = get_turf(src) - if(istype(T)) T.visible_message("[src] folds outwards, expanding into a mobile form.") + if(istype(T)) T.visible_message(span_filter_notice("[src] folds outwards, expanding into a mobile form.")) verbs |= /mob/living/silicon/pai/proc/pai_nom verbs |= /mob/living/proc/vertical_nom update_icon() @@ -374,7 +374,7 @@ resting = !resting icon_state = resting ? "[chassis]_rest" : "[chassis]" update_icon() //VOREStation edit - to_chat(src, "You are now [resting ? "resting" : "getting up"].") + to_chat(src, span_notice("You are now [resting ? "resting" : "getting up"].")) canmove = !resting @@ -417,20 +417,20 @@ //Overriding this will stop a number of headaches down the track. /mob/living/silicon/pai/attackby(obj/item/W as obj, mob/user as mob) if(W.force) - visible_message("[user.name] attacks [src] with [W]!") + visible_message(span_danger("[user.name] attacks [src] with [W]!")) src.adjustBruteLoss(W.force) src.updatehealth() else - visible_message("[user.name] bonks [src] harmlessly with [W].") + visible_message(span_warning("[user.name] bonks [src] harmlessly with [W].")) spawn(1) if(stat != 2) close_up() return /mob/living/silicon/pai/attack_hand(mob/user as mob) if(user.a_intent == I_HELP) - visible_message("[user.name] pats [src].") + visible_message(span_notice("[user.name] pats [src].")) else - visible_message("[user.name] boops [src] on the head.") + visible_message(span_danger("[user.name] boops [src] on the head.")) close_up() //I'm not sure how much of this is necessary, but I would rather avoid issues. @@ -444,7 +444,7 @@ release_vore_contents(FALSE) //VOREStation Add var/turf/T = get_turf(src) - if(istype(T) && !silent) T.visible_message("[src] neatly folds inwards, compacting down to a rectangular card.") + if(istype(T) && !silent) T.visible_message(span_filter_notice("[src] neatly folds inwards, compacting down to a rectangular card.")) if(client) src.stop_pulling() @@ -502,22 +502,22 @@ switch(tgui_alert(user, "Do you wish to add access to [src] or remove access from [src]?","Access Modify",list("Add Access","Remove Access", "Cancel"))) if("Add Access") idcard.access |= ID.GetAccess() - to_chat(user, "You add the access from the [W] to [src].") - to_chat(src, "\The [user] swipes the [W] over you. You copy the access codes.") + to_chat(user, span_notice("You add the access from the [W] to [src].")) + to_chat(src, span_notice("\The [user] swipes the [W] over you. You copy the access codes.")) if(radio) radio.recalculateChannels() return if("Remove Access") idcard.access = list() - to_chat(user, "You remove the access from [src].") - to_chat(src, "\The [user] swipes the [W] over you, removing access codes from you.") + to_chat(user, span_notice("You remove the access from [src].")) + to_chat(src, span_warning("\The [user] swipes the [W] over you, removing access codes from you.")) if(radio) radio.recalculateChannels() return if("Cancel", null) return else if (istype(W, /obj/item/card/id) && idaccessible == 0) - to_chat(user, "[src] is not accepting access modifcations at this time.") + to_chat(user, span_notice("[src] is not accepting access modifcations at this time.")) return /mob/living/silicon/pai/verb/allowmodification() @@ -527,10 +527,10 @@ if(idaccessible == 0) idaccessible = 1 - visible_message("\The [src] clicks as their access modification slot opens.","You allow access modifications.", runemessage = "click") + visible_message(span_notice("\The [src] clicks as their access modification slot opens."),span_notice("You allow access modifications."), runemessage = "click") else idaccessible = 0 - visible_message("\The [src] clicks as their access modification slot closes.","You block access modfications.", runemessage = "click") + visible_message(span_notice("\The [src] clicks as their access modification slot closes."),span_notice("You block access modfications."), runemessage = "click") /mob/living/silicon/pai/verb/wipe_software() @@ -543,6 +543,6 @@ return close_up() - visible_message("[src] fades away from the screen, the pAI device goes silent.") + visible_message(span_filter_notice("[src] fades away from the screen, the pAI device goes silent.")) card.removePersonality() clear_client() diff --git a/code/modules/mob/living/silicon/pai/pai_vr.dm b/code/modules/mob/living/silicon/pai/pai_vr.dm index 1cacd6e931..22da511922 100644 --- a/code/modules/mob/living/silicon/pai/pai_vr.dm +++ b/code/modules/mob/living/silicon/pai/pai_vr.dm @@ -97,7 +97,7 @@ canmove = TRUE card.setEmotion(15) playsound(card, 'sound/effects/pai-restore.ogg', 50, FALSE) - card.visible_message("\The [card] chimes.", runemessage = "chime") + card.visible_message(span_filter_notice("\The [card] chimes."), runemessage = "chime") /mob/living/silicon/pai/proc/pai_nom(var/mob/living/T in oview(1)) set name = "pAI Nom" @@ -217,7 +217,7 @@ hide_glow = FALSE update_icon() else - to_chat(src, "Your selected chassis cannot modify its eye glow!") + to_chat(src, span_filter_notice("Your selected chassis cannot modify its eye glow!")) return @@ -226,7 +226,7 @@ set name = "Pick Eye Color" if(chassis in allows_eye_color) else - to_chat(src, "Your selected chassis eye color can not be modified. The color you pick will only apply to supporting chassis and your card screen.") + to_chat(src, span_warning("Your selected chassis eye color can not be modified. The color you pick will only apply to supporting chassis and your card screen.")) var/new_eye_color = input(src, "Choose your character's eye color:", "Eye Color") as color|null if(new_eye_color) @@ -322,19 +322,19 @@ if(H.zone_sel.selecting == "head") H.visible_message( \ - "[H] pats [target] on the head.", \ - "You pat [target] on the head.", ) + span_notice("[H] pats [target] on the head."), \ + span_notice("You pat [target] on the head."), ) else if(H.zone_sel.selecting == "r_hand" || H.zone_sel.selecting == "l_hand") H.visible_message( \ - "[H] shakes [target]'s hand.", \ - "You shake [target]'s hand.", ) + span_notice("[H] shakes [target]'s hand."), \ + span_notice("You shake [target]'s hand."), ) else if(H.zone_sel.selecting == "mouth") H.visible_message( \ - "[H] boops [target]'s nose.", \ - "You boop [target] on the nose.", ) + span_notice("[H] boops [target]'s nose."), \ + span_notice("You boop [target] on the nose."), ) else - H.visible_message("[H] hugs [target] to make [t_him] feel better!", \ - "You hug [target] to make [t_him] feel better!") + H.visible_message(span_notice("[H] hugs [target] to make [t_him] feel better!"), \ + span_notice("You hug [target] to make [t_him] feel better!")) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) /mob/living/silicon/pai/proc/savefile_path(mob/user) @@ -411,7 +411,7 @@ set category = "pAI Commands" set name = "Save Configuration" savefile_save(src) - to_chat(src, "[name] configuration saved to global pAI settings.") + to_chat(src, span_filter_notice("[name] configuration saved to global pAI settings.")) /mob/living/silicon/pai/a_intent_change(input as text) . = ..() @@ -470,10 +470,10 @@ if (src.client) if(client.prefs.muted & MUTE_IC) - to_chat(src, "You cannot speak in IC (muted).") + to_chat(src, span_warning("You cannot speak in IC (muted).")) return if(loc != card) - to_chat(src, "Your message won't be visible while unfolded!") + to_chat(src, span_warning("Your message won't be visible while unfolded!")) if (!message) message = tgui_input_text(src, "Enter text you would like to show on your screen.","Screen Message") message = sanitize_or_reflect(message,src) @@ -485,50 +485,50 @@ card.screen_msg = message var/logmsg = "(CARD SCREEN)[message]" log_say(logmsg,src) - to_chat(src, "You print a message to your screen, \"[message]\"") + to_chat(src, span_filter_say(span_cult("You print a message to your screen, \"[message]\""))) if(isliving(card.loc)) var/mob/living/L = card.loc if(L.client) - to_chat(L, "[src.name]'s screen prints, \"[message]\"") + to_chat(L, span_filter_say(span_cult("[src.name]'s screen prints, \"[message]\""))) else return else if(isbelly(card.loc)) var/obj/belly/b = card.loc if(b.owner.client) - to_chat(b.owner, "[src.name]'s screen prints, \"[message]\"") + to_chat(b.owner, span_filter_say(span_cult("[src.name]'s screen prints, \"[message]\""))) else return else if(istype(card.loc, /obj/item/pda)) var/obj/item/pda/p = card.loc if(isliving(p.loc)) var/mob/living/L = p.loc if(L.client) - to_chat(L, "[src.name]'s screen prints, \"[message]\"") + to_chat(L, span_filter_say(span_cult("[src.name]'s screen prints, \"[message]\""))) else return else if(isbelly(p.loc)) var/obj/belly/b = card.loc if(b.owner.client) - to_chat(b.owner, "[src.name]'s screen prints, \"[message]\"") + to_chat(b.owner, span_filter_say(span_cult("[src.name]'s screen prints, \"[message]\""))) else return else return else return - to_chat(src, "Your message was relayed.") + to_chat(src, span_notice("Your message was relayed.")) for (var/mob/G in player_list) if (istype(G, /mob/new_player)) continue else if(isobserver(G) && G.client?.prefs?.read_preference(/datum/preference/toggle/ghost_ears)) if((client?.prefs?.read_preference(/datum/preference/toggle/whisubtle_vis) || G.client.holder) && \ G.client?.prefs?.read_preference(/datum/preference/toggle/ghost_see_whisubtle)) - to_chat(G, "[src.name]'s screen prints, \"[message]\"") + to_chat(G, span_filter_say(span_cult("[src.name]'s screen prints, \"[message]\""))) /mob/living/silicon/pai/proc/touch_window(soft_name) //This lets us touch TGUI procs and windows that may be nested behind other TGUI procs and windows if(stat != CONSCIOUS) //so we can access our software without having to open up the software interface TGUI window - to_chat(src, "You can't do that right now.") + to_chat(src, span_warning("You can't do that right now.")) return for(var/thing in software) var/datum/pai_software/S = software[thing] if(istype(S, /datum/pai_software) && S.name == soft_name) if(S.toggle) S.toggle(src) - to_chat(src, "You toggled [S.name].") + to_chat(src, span_notice("You toggled [S.name].")) refresh_software_status() else S.tgui_interact(src) @@ -538,12 +538,12 @@ var/datum/pai_software/our_soft = pai_software_by_key[thing] if(our_soft.name == soft_name) if(!(ram >= our_soft.ram_cost)) - to_chat(src, "Insufficient RAM for download. (Cost [our_soft.ram_cost] : [ram] Remaining)") + to_chat(src, span_warning("Insufficient RAM for download. (Cost [our_soft.ram_cost] : [ram] Remaining)")) return if(tgui_alert(src, "Do you want to download [our_soft.name]? It costs [our_soft.ram_cost], and you have [ram] remaining.", "Download [our_soft.name]", list("Yes", "No")) == "Yes") ram -= our_soft.ram_cost software[our_soft.id] = our_soft - to_chat(src, "You downloaded [our_soft.name]. ([ram] RAM remaining.)") + to_chat(src, span_notice("You downloaded [our_soft.name]. ([ram] RAM remaining.)")) refresh_software_status() /mob/living/silicon/pai/proc/refresh_software_status() //This manages the pAI software status buttons icon states based on if you have them and if they are enabled diff --git a/code/modules/mob/living/silicon/pai/say.dm b/code/modules/mob/living/silicon/pai/say.dm index 84161ab57d..30e9ef4097 100644 --- a/code/modules/mob/living/silicon/pai/say.dm +++ b/code/modules/mob/living/silicon/pai/say.dm @@ -2,6 +2,6 @@ if(silence_time) to_chat(src, span_green("Communication circuits remain uninitialized.")) else if(card.speech_synthesizer != PP_FUNCTIONAL) - to_chat(src, "Communication circuits damaged. Service required.") + to_chat(src, span_warning("Communication circuits damaged. Service required.")) else ..() diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 3475700c4b..9e52af2bec 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -26,7 +26,7 @@ var/global/list/default_pai_software = list() var/datum/pai_software/P = new type() if(pai_software_by_key[P.id]) var/datum/pai_software/O = pai_software_by_key[P.id] - to_world("pAI software module [P.name] has the same key as [O.name]!") + to_world(span_warning("pAI software module [P.name] has the same key as [O.name]!")) r = 0 continue pai_software_by_key[P.id] = P @@ -55,7 +55,7 @@ var/global/list/default_pai_software = list() /mob/living/silicon/pai/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() - + // Software we have bought var/list/bought_software = list() // Software we have not bought diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm index a0c99e1c20..4e37613b49 100644 --- a/code/modules/mob/living/silicon/pai/software_modules.dm +++ b/code/modules/mob/living/silicon/pai/software_modules.dm @@ -75,7 +75,7 @@ if(answer == "Yes") var/turf/T = get_turf(P.loc) for (var/mob/v in viewers(T)) - v.show_message("[M] presses [TM.his] thumb against [P].", 3, "[P] makes a sharp clicking sound as it extracts DNA material from [M].", 2) + v.show_message(span_notice("[M] presses [TM.his] thumb against [P]."), 3, span_notice("[P] makes a sharp clicking sound as it extracts DNA material from [M]."), 2) var/datum/dna/dna = M.dna to_chat(P, span_red("

    [M]'s UE string : [dna.unique_enzymes]

    ")) if(dna.unique_enzymes == P.master_dna) @@ -285,8 +285,8 @@ P.hack_aborted = 0 P.cable = new /obj/item/pai_cable(T) for(var/mob/M in viewers(T)) - M.show_message("A port on [P] opens to reveal [P.cable], which promptly falls to the floor.", 3, - "You hear the soft click of something light and hard falling to the ground.", 2) + M.show_message(span_warning("A port on [P] opens to reveal [P.cable], which promptly falls to the floor."), 3, + span_warning("You hear the soft click of something light and hard falling to the ground."), 2) return 1 /mob/living/silicon/pai/proc/hackloop() diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm index d09ba10650..44fea24e73 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -46,7 +46,7 @@ to_chat(user, span_red("You can't analyze non-robotic things!")) return - user.visible_message("\The [user] has analyzed [M]'s components.","You have analyzed [M]'s components.") + user.visible_message(span_notice("\The [user] has analyzed [M]'s components."),span_notice("You have analyzed [M]'s components.")) switch(scan_type) if("robot") if(mode) @@ -166,11 +166,11 @@ if("prosthetics") var/mob/living/carbon/human/H = M - to_chat(user, "Analyzing Results for \the [H]:") + to_chat(user, span_notice("Analyzing Results for \the [H]:")) if(H.isSynthetic()) to_chat(user, "System instability: [span_green("[H.getToxLoss()]")]") to_chat(user, "Key: [span_orange("Electronics")]/[span_red("Brute")]") - to_chat(user, "External prosthetics:") + to_chat(user, span_notice("External prosthetics:")) var/organ_found if(H.internal_organs.len) for(var/obj/item/organ/external/E in H.organs) @@ -181,7 +181,7 @@ if(!organ_found) to_chat(user, "No prosthetics located.") to_chat(user, "
    ") - to_chat(user, "Internal prosthetics:") + to_chat(user, span_notice("Internal prosthetics:")) organ_found = null if(H.internal_organs.len) for(var/obj/item/organ/O in H.internal_organs) @@ -215,13 +215,13 @@ to_chat(user, output) to_chat(user, "
    ") - to_chat(user, "Internal Diagnostics:") + to_chat(user, span_notice("Internal Diagnostics:")) for(var/slot in Mecha.internal_components) var/obj/item/mecha_parts/component/MC = Mecha.internal_components[slot] - to_chat(user, "[MC?"[slot]: [MC] [round((MC.integrity / MC.max_integrity) * 100, 0.1)]% integrity. [MC.get_efficiency() * 100] Operational capacity.":"[slot]: Component Not Found"]") + to_chat(user, "[MC?"[slot]: [MC] [round((MC.integrity / MC.max_integrity) * 100, 0.1)]% integrity. [MC.get_efficiency() * 100] Operational capacity.":span_warning("[slot]: Component Not Found")]") to_chat(user, "
    ") - to_chat(user, "General Statistics:") + to_chat(user, span_notice("General Statistics:")) to_chat(user, "Movement Weight: [Mecha.get_step_delay()]
    ") src.add_fingerprint(user) diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm index a8154298a7..7ed60814b9 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm @@ -81,14 +81,14 @@ else if(affecting) if(dogborg) - target.visible_message("[target] has been zap-chomped in the [affecting.name] with [src] by [user]!") + target.visible_message(span_danger("[target] has been zap-chomped in the [affecting.name] with [src] by [user]!")) else - target.visible_message("[target] has been zapped in the [affecting.name] with [src] by [user]!") + target.visible_message(span_danger("[target] has been zapped in the [affecting.name] with [src] by [user]!")) else if(dogborg) - target.visible_message("[target] has been zap-chomped with [src] by [user]!") + target.visible_message(span_danger("[target] has been zap-chomped with [src] by [user]!")) else - target.visible_message("[target] has been zapped with [src] by [user]!") + target.visible_message(span_danger("[target] has been zapped with [src] by [user]!")) playsound(src, 'sound/weapons/Egloves.ogg', 50, 1, -1) // Try to use power @@ -130,17 +130,17 @@ var/total_moles = environment.total_moles user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - user.visible_message("[user] scans the air.", "You scan the air...") + user.visible_message(span_notice("[user] scans the air."), span_notice("You scan the air...")) - to_chat(user, "Scan results:") + to_chat(user, span_notice("Scan results:")) if(abs(pressure - ONE_ATMOSPHERE) < 10) - to_chat(user, "Pressure: [round(pressure,0.1)] kPa") + to_chat(user, span_notice("Pressure: [round(pressure,0.1)] kPa")) else - to_chat(user, "Pressure: [round(pressure,0.1)] kPa") + to_chat(user, span_warning("Pressure: [round(pressure,0.1)] kPa")) if(total_moles) for(var/g in environment.gas) - to_chat(user, "[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]%") - to_chat(user, "Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)") + to_chat(user, span_notice("[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]%")) + to_chat(user, span_notice("Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)")) /obj/item/boop_module/afterattack(obj/O, mob/user as mob, proximity) if(!proximity) @@ -151,7 +151,7 @@ return user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - user.visible_message("[user] scan at \the [O.name].", "You scan \the [O.name]...") + user.visible_message(span_notice("[user] scan at \the [O.name]."), span_notice("You scan \the [O.name]...")) if(!isnull(O.reagents)) var/dat = "" @@ -160,11 +160,11 @@ dat += "\n \t [R]" if(dat) - to_chat(user, "Your BOOP module indicates: [dat]") + to_chat(user, span_notice("Your BOOP module indicates: [dat]")) else - to_chat(user, "No active chemical agents detected in [O].") + to_chat(user, span_notice("No active chemical agents detected in [O].")) else - to_chat(user, "No significant chemical agents detected in [O].") + to_chat(user, span_notice("No significant chemical agents detected in [O].")) return @@ -264,29 +264,29 @@ user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(busy) - to_chat(user, "You are already licking something else.") + to_chat(user, span_warning("You are already licking something else.")) return if(user.client && (target in user.client.screen)) - to_chat(user, "You need to take \the [target.name] off before cleaning it!") + to_chat(user, span_warning("You need to take \the [target.name] off before cleaning it!")) return else if(istype(target,/obj/item)) if(istype(target,/obj/item/trash)) - user.visible_message("[user] nibbles away at \the [target.name].", "You begin to nibble away at \the [target.name]...") + user.visible_message(span_filter_notice("[user] nibbles away at \the [target.name]."), span_notice("You begin to nibble away at \the [target.name]...")) busy = 1 if(do_after (user, 50)) - user.visible_message("[user] finishes eating \the [target.name].", "You finish eating \the [target.name].") - to_chat(user, "You finish off \the [target.name].") + user.visible_message(span_filter_notice("[user] finishes eating \the [target.name]."), span_notice("You finish eating \the [target.name].")) + to_chat(user, span_notice("You finish off \the [target.name].")) qdel(target) var/mob/living/silicon/robot/R = user R.cell.charge += 250 busy = 0 return if(istype(target,/obj/item/cell)) - user.visible_message("[user] begins cramming \the [target.name] down its throat.", "You begin cramming \the [target.name] down your throat...") + user.visible_message(span_filter_notice("[user] begins cramming \the [target.name] down its throat."), span_notice("You begin cramming \the [target.name] down your throat...")) busy = 1 if(do_after (user, 50)) - user.visible_message("[user] finishes gulping down \the [target.name].", "You finish swallowing \the [target.name].") - to_chat(user, "You finish off \the [target.name], and gain some charge!") + user.visible_message(span_filter_notice("[user] finishes gulping down \the [target.name]."), span_notice("You finish swallowing \the [target.name].")) + to_chat(user, span_notice("You finish off \the [target.name], and gain some charge!")) var/mob/living/silicon/robot/R = user var/obj/item/cell/C = target R.cell.charge += C.charge / 3 @@ -303,11 +303,11 @@ L.Stun(1) L.Weaken(1) L.apply_effect(STUTTER, 1) - L.visible_message("[user] has shocked [L] with its tongue!", \ - "[user] has shocked you with its tongue! You can feel the betrayal.") + L.visible_message(span_danger("[user] has shocked [L] with its tongue!"), \ + span_userdanger("[user] has shocked you with its tongue! You can feel the betrayal.")) playsound(src, 'sound/weapons/Egloves.ogg', 50, 1, -1) else - user.visible_message("\The [user] affectionately licks all over \the [target]'s face!", "You affectionately lick all over \the [target]'s face!") + user.visible_message(span_notice("\The [user] affectionately licks all over \the [target]'s face!"), span_notice("You affectionately lick all over \the [target]'s face!")) playsound(src, 'sound/effects/attackblob.ogg', 50, 1) var/mob/living/carbon/human/H = target if(H.species.lightweight == 1) @@ -378,17 +378,17 @@ var/new_color = input(usr, "Choose a color to set the light to! (Default is [LIGHT_COLOR_INCANDESCENT_TUBE])", "", selected_color) as color|null if(new_color) selected_color = new_color - to_chat(user, "The light color has been changed.") + to_chat(user, span_filter_notice("The light color has been changed.")) return else if(uses >= max_uses) - to_chat(user, "[src.name] is full.") + to_chat(user, span_warning("[src.name] is full.")) return if(uses < max_uses && cooldown == 0) if(glass.energy < 125) - to_chat(user, "Insufficient material reserves.") + to_chat(user, span_warning("Insufficient material reserves.")) return - to_chat(user, "It has [uses] lights remaining. Attempting to fabricate a replacement. Please stand still.") + to_chat(user, span_filter_notice("It has [uses] lights remaining. Attempting to fabricate a replacement. Please stand still.")) cooldown = 1 if(do_after(user, 50)) glass.use_charge(125) @@ -397,7 +397,7 @@ else cooldown = 0 else - to_chat(user, "It has [uses] lights remaining.") + to_chat(user, span_filter_notice("It has [uses] lights remaining.")) return /obj/item/dogborg/stasis_clamp @@ -463,17 +463,17 @@ /mob/living/silicon/robot/proc/leap(var/bluespace = FALSE) if(last_special > world.time) - to_chat(src, "Your leap actuators are still recharging.") + to_chat(src, span_filter_notice("Your leap actuators are still recharging.")) return var/power_cost = bluespace ? 1000 : 750 var/minimum_power = bluespace ? 2500 : 1000 if(cell.charge < minimum_power) - to_chat(src, "Cell charge too low to continue.") + to_chat(src, span_filter_notice("Cell charge too low to continue.")) return if(usr.incapacitated(INCAPACITATION_DISABLED)) - to_chat(src, "You cannot leap in your current state.") + to_chat(src, span_filter_notice("You cannot leap in your current state.")) return var/list/choices = list() @@ -502,14 +502,14 @@ return if(usr.incapacitated(INCAPACITATION_DISABLED)) - to_chat(src, "You cannot leap in your current state.") + to_chat(src, span_filter_notice("You cannot leap in your current state.")) return last_special = world.time + 10 status_flags |= LEAPING pixel_y = pixel_y + 10 - src.visible_message("\The [src] leaps at [T]!") + src.visible_message(span_danger("\The [src] leaps at [T]!")) if(bluespace) src.forceMove(get_turf(T)) T.hitby(src) @@ -524,7 +524,7 @@ if(status_flags & LEAPING) status_flags &= ~LEAPING if(!src.Adjacent(T)) - to_chat(src, "You miss!") + to_chat(src, span_warning("You miss!")) return if(ishuman(T)) diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index 9bdf400f8a..3c20a1952a 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -75,70 +75,70 @@ if(target in hound.module.modules) return if(length(contents) >= max_item_count) - to_chat(user, "Your [src.name] is full. Eject or process contents to continue.") + to_chat(user, span_warning("Your [src.name] is full. Eject or process contents to continue.")) return if(compactor) if(is_type_in_list(target,item_vore_blacklist)) - to_chat(user, "You are hard-wired to not ingest this item.") + to_chat(user, span_warning("You are hard-wired to not ingest this item.")) return if(istype(target, /obj/item) || istype(target, /obj/effect/decal/remains)) var/obj/target_obj = target if(target_obj.w_class > ITEMSIZE_LARGE) - to_chat(user, "\The [target] is too large to fit into your [src.name]") + to_chat(user, span_warning("\The [target] is too large to fit into your [src.name]")) return - user.visible_message("[hound.name] is ingesting [target.name] into their [src.name].", "You start ingesting [target] into your [src.name]...") + user.visible_message(span_warning("[hound.name] is ingesting [target.name] into their [src.name]."), span_notice("You start ingesting [target] into your [src.name]...")) if(do_after(user, 30, target) && length(contents) < max_item_count) target.forceMove(src) - user.visible_message("[hound.name]'s [src.name] groans lightly as [target.name] slips inside.", "Your [src.name] groans lightly as [target] slips inside.") + user.visible_message(span_warning("[hound.name]'s [src.name] groans lightly as [target.name] slips inside."), span_notice("Your [src.name] groans lightly as [target] slips inside.")) playsound(src, gulpsound, vol = 60, vary = 1, falloff = 0.1, preference = /datum/preference/toggle/eating_noises) if(analyzer && istype(target,/obj/item)) var/obj/item/tech_item = target var/list/tech_levels = list() for(var/T in tech_item.origin_tech) tech_levels += "\The [tech_item] has level [tech_item.origin_tech[T]] in [CallTechName(T)]." - to_chat(user, "[jointext(tech_levels, "
    ")]    ") + to_chat(user, span_notice("[jointext(tech_levels, "
    ")]")) if(delivery) if(islist(deliverylists[delivery_tag])) deliverylists[delivery_tag] |= target - to_chat(user, "\The [target.name] added to cargo compartment slot: [delivery_tag].") + to_chat(user, span_notice("\The [target.name] added to cargo compartment slot: [delivery_tag].")) update_patient() return if(istype(target, /mob/living/simple_mob/animal/passive/mouse)) //Edible mice, dead or alive whatever. Mostly for carcass picking you cruel bastard :v var/mob/living/simple_mob/trashmouse = target - user.visible_message("[hound.name] is ingesting [trashmouse] into their [src.name].", "You start ingesting [trashmouse] into your [src.name]...") + user.visible_message(span_warning("[hound.name] is ingesting [trashmouse] into their [src.name]."), span_notice("You start ingesting [trashmouse] into your [src.name]...")) if(do_after(user, 30, trashmouse) && length(contents) < max_item_count) trashmouse.forceMove(src) trashmouse.reset_view(src) - user.visible_message("[hound.name]'s [src.name] groans lightly as [trashmouse] slips inside.", "Your [src.name] groans lightly as [trashmouse] slips inside.") + user.visible_message(span_warning("[hound.name]'s [src.name] groans lightly as [trashmouse] slips inside."), span_notice("Your [src.name] groans lightly as [trashmouse] slips inside.")) playsound(src, gulpsound, vol = 60, vary = 1, falloff = 0.1, preference = /datum/preference/toggle/eating_noises) if(delivery) if(islist(deliverylists[delivery_tag])) deliverylists[delivery_tag] |= trashmouse - to_chat(user, "\The [trashmouse] added to cargo compartment slot: [delivery_tag].") + to_chat(user, span_notice("\The [trashmouse] added to cargo compartment slot: [delivery_tag].")) update_patient() return else if(ishuman(target)) var/mob/living/carbon/human/trashman = target if(patient) - to_chat(user, "Your [src.name] is already occupied.") + to_chat(user, span_warning("Your [src.name] is already occupied.")) return if(trashman.buckled) - to_chat(user, "[trashman] is buckled and can not be put into your [src.name].") + to_chat(user, span_warning("[trashman] is buckled and can not be put into your [src.name].")) return - user.visible_message("[hound.name] is ingesting [trashman] into their [src.name].", "You start ingesting [trashman] into your [src.name]...") + user.visible_message(span_warning("[hound.name] is ingesting [trashman] into their [src.name]."), span_notice("You start ingesting [trashman] into your [src.name]...")) if(do_after(user, 30, trashman) && !patient && !trashman.buckled && length(contents) < max_item_count) trashman.forceMove(src) trashman.reset_view(src) START_PROCESSING(SSobj, src) - user.visible_message("[hound.name]'s [src.name] groans lightly as [trashman] slips inside.", "Your [src.name] groans lightly as [trashman] slips inside.") + user.visible_message(span_warning("[hound.name]'s [src.name] groans lightly as [trashman] slips inside."), span_notice("Your [src.name] groans lightly as [trashman] slips inside.")) log_admin("[key_name(hound)] has eaten [key_name(patient)] with a cyborg belly. ([hound ? "JMP" : "null"])") playsound(src, gulpsound, vol = 100, vary = 1, falloff = 0.1, preference = /datum/preference/toggle/eating_noises) if(delivery) if(islist(deliverylists[delivery_tag])) deliverylists[delivery_tag] |= trashman - to_chat(user, "\The [trashman] added to cargo compartment slot: [delivery_tag].") - to_chat(trashman, "[hound.name] has added you to their cargo compartment slot: [delivery_tag].") + to_chat(user, span_notice("\The [trashman] added to cargo compartment slot: [delivery_tag].")) + to_chat(trashman, span_notice("[hound.name] has added you to their cargo compartment slot: [delivery_tag].")) update_patient() return return @@ -146,12 +146,12 @@ else if(ishuman(target)) var/mob/living/carbon/human/H = target if(H.buckled) - to_chat(user, "The user is buckled and can not be put into your [src.name].") + to_chat(user, span_warning("The user is buckled and can not be put into your [src.name].")) return if(patient) - to_chat(user, "Your [src.name] is already occupied.") + to_chat(user, span_warning("Your [src.name] is already occupied.")) return - user.visible_message("[hound.name] is ingesting [H.name] into their [src.name].", "You start ingesting [H] into your [src]...") + user.visible_message(span_warning("[hound.name] is ingesting [H.name] into their [src.name]."), span_notice("You start ingesting [H] into your [src]...")) if(!patient && !H.buckled && do_after (user, 50, H)) if(!proximity) return //If they moved away, you can't eat them. @@ -162,7 +162,7 @@ H.reset_view(src) update_patient() START_PROCESSING(SSobj, src) - user.visible_message("[hound.name]'s [src.name] lights up as [H.name] slips inside.", "Your [src] lights up as [H] slips inside. Life support functions engaged.") + user.visible_message(span_warning("[hound.name]'s [src.name] lights up as [H.name] slips inside."), span_notice("Your [src] lights up as [H] slips inside. Life support functions engaged.")) log_admin("[key_name(hound)] has eaten [key_name(patient)] with a cyborg belly. ([hound ? "JMP" : "null"])") playsound(src, gulpsound, vol = 100, vary = 1, falloff = 0.1, preference = /datum/preference/toggle/eating_noises) @@ -205,7 +205,7 @@ for(var/list/dlist in deliverylists) dlist.Cut() if(length(contents) > 0) - hound.visible_message("[hound.name] empties out their contents via their [eject_port] port.", "You empty your contents via your [eject_port] port.") + hound.visible_message(span_warning("[hound.name] empties out their contents via their [eject_port] port."), span_notice("You empty your contents via your [eject_port] port.")) for(var/C in contents) if(ishuman(C)) var/mob/living/carbon/human/person = C @@ -222,7 +222,7 @@ if (!istype(hound) || length(contents) <= 0) return if (!hound.vore_selected) - to_chat(hound, "You don't have a belly selected to empty the contents into!") + to_chat(hound, span_warning("You don't have a belly selected to empty the contents into!")) return for (var/C in contents) if (isliving(C) || isitem(C)) @@ -266,7 +266,7 @@ if(!cleaning) dat += "Self-Clean" else - dat += "Self-Clean" + dat += span_linkOff("Self-Clean") if(medsensor) dat += "Analyze Patient" if(delivery) @@ -317,25 +317,30 @@ switch(patient.stat) if(0) - dat += "Conscious" + dat += span_green("Conscious") if(1) - dat += "Unconscious" + dat += span_orange("Unconscious") else - dat += "DEAD" + dat += span_red("DEAD") - var/pulsecolor = (patient.pulse == PULSE_NONE || patient.pulse == PULSE_THREADY ? "color:red;" : "color:white;") - var/healthcolor = (patient.health > 0 ? "color:white;" : "color:red;") - var/brutecolor = (patient.getBruteLoss() < 60 ? "color:gray;" : "color:red;") - var/o2color = (patient.getOxyLoss() < 60 ? "color:gray;" : "color:red;") - var/toxcolor = (patient.getToxLoss() < 60 ? "color:gray;" : "color:red;") - var/burncolor = (patient.getFireLoss() < 60 ? "color:gray;" : "color:red;") - - dat += "\t-Pulse, bpm: [patient.get_pulse(GETPULSE_TOOL)]
    " - dat += "\t-Overall Health %: [round(100 * (patient.health / patient.getMaxHealth()))]
    " - dat += "\t-Brute Damage %: [patient.getBruteLoss()]
    " - dat += "\t-Respiratory Damage %: [patient.getOxyLoss()]
    " - dat += "\t-Toxin Content %: [patient.getToxLoss()]
    " - dat += "\t-Burn Severity %: [patient.getFireLoss()]
    " + var/pulse = "\t-Pulse, bpm: [patient.get_pulse(GETPULSE_TOOL)]" + dat += (patient.pulse == PULSE_NONE || patient.pulse == PULSE_THREADY ? span_red(pulse) : span_white(pulse)) + dat += "
    " + var/health = "\t-Overall Health %: [round(100 * (patient.health / patient.getMaxHealth()))]" + dat += (patient.health > 0 ? span_white(health) : span_red(health)) + dat += "
    " + var/brute = "\t-Brute Damage %: [patient.getBruteLoss()]" + dat += (patient.getBruteLoss() < 60 ? span_gray(brute) : span_red(brute)) + dat += "
    " + var/oxygen = "\t-Respiratory Damage %: [patient.getOxyLoss()]" + dat += (patient.getOxyLoss() < 60 ? span_gray(oxygen) : span_red(oxygen)) + dat += "
    " + var/toxic = "\t-Toxin Content %: [patient.getToxLoss()]" + dat += (patient.getToxLoss() < 60 ? span_gray(toxic) : span_red(toxic)) + dat += "
    " + var/burn = "\t-Burn Severity %: [patient.getFireLoss()]" + dat += (patient.getFireLoss() < 60 ? span_gray(burn) : span_red(burn)) + dat += "
    " if(round(patient.paralysis / 4) >= 1) dat += text("
    Patient paralyzed for: []
    ", round(patient.paralysis / 4) >= 1 ? "[round(patient.paralysis / 4)] seconds" : "None") @@ -382,7 +387,7 @@ START_PROCESSING(SSobj, src) update_patient() if(patient) - to_chat(patient, "[hound.name]'s [src.name] fills with caustic enzymes around you!") + to_chat(patient, span_danger("[hound.name]'s [src.name] fills with caustic enzymes around you!")) return if(cleaning) sleeperUI(usr) @@ -410,7 +415,7 @@ return if(href_list["slot_eject"]) if(length(deliverylists[delivery_tag]) > 0) - hound.visible_message("[hound.name] empties out their cargo compartment via their [eject_port] port.", "You empty your cargo compartment via your [eject_port] port.") + hound.visible_message(span_warning("[hound.name] empties out their cargo compartment via their [eject_port] port."), span_notice("You empty your cargo compartment via your [eject_port] port.")) for(var/C in deliverylists[delivery_tag]) if(ishuman(C)) var/mob/living/carbon/human/person = C @@ -447,9 +452,9 @@ if(href_list["inject"] == "inaprovaline" || patient.health > min_health) inject_chem(usr, href_list["inject"]) else - to_chat(usr, "ERROR: Subject is not in stable condition for injections.") + to_chat(usr, span_notice("ERROR: Subject is not in stable condition for injections.")) else - to_chat(usr, "ERROR: Subject cannot metabolise chemicals.") + to_chat(usr, span_notice("ERROR: Subject cannot metabolise chemicals.")) updateUsrDialog() sleeperUI(usr) //Needs a callback to boop the page to refresh. @@ -459,15 +464,15 @@ if(patient && patient.reagents) if(chem in injection_chems + "inaprovaline") if(hound.cell.charge < 800) //This is so borgs don't kill themselves with it. - to_chat(hound, "You don't have enough power to synthesize fluids.") + to_chat(hound, span_notice("You don't have enough power to synthesize fluids.")) return else if(patient.reagents.get_reagent_amount(chem) + 10 >= 20) //Preventing people from accidentally killing themselves by trying to inject too many chemicals! - to_chat(hound, "Your stomach is currently too full of fluids to secrete more fluids of this kind.") + to_chat(hound, span_notice("Your stomach is currently too full of fluids to secrete more fluids of this kind.")) else if(patient.reagents.get_reagent_amount(chem) + 10 <= 20) //No overdoses for you patient.reagents.add_reagent(chem, inject_amount) drain(SLEEPER_INJECT_COST) var/units = round(patient.reagents.get_reagent_amount(chem)) - to_chat(hound, "Injecting [units] unit\s of [SSchemistry.chemical_reagents[chem]] into occupant.") //If they were immersed, the reagents wouldn't leave with them. + to_chat(hound, span_notice("Injecting [units] unit\s of [SSchemistry.chemical_reagents[chem]] into occupant.")) //If they were immersed, the reagents wouldn't leave with them. //For if the dogborg's existing patient uh, doesn't make it. /obj/item/dogborg/sleeper/proc/update_patient() @@ -552,7 +557,7 @@ 'sound/vore/death9.ogg', 'sound/vore/death10.ogg') playsound(src, finisher, vol = 100, vary = 1, falloff = 0.1, ignore_walls = TRUE, preference = /datum/preference/toggle/digestion_noises) - to_chat(hound, "Your [src.name] is now clean. Ending self-cleaning cycle.") + to_chat(hound, span_notice("Your [src.name] is now clean. Ending self-cleaning cycle.")) cleaning = 0 update_patient() playsound(src, 'sound/machines/ding.ogg', vol = 100, vary = 1, falloff = 0.1, ignore_walls = TRUE, preference = /datum/preference/toggle/digestion_noises) @@ -593,8 +598,8 @@ if(T.stat == DEAD) if(ishuman(T)) log_admin("[key_name(hound)] has digested [key_name(T)] with a cyborg belly. ([hound ? "JMP" : "null"])") - to_chat(hound, "You feel your belly slowly churn around [T], breaking them down into a soft slurry to be used as power for your systems.") - to_chat(T, "You feel [hound]'s belly slowly churn around your form, breaking you down into a soft slurry to be used as power for [hound]'s systems.") + to_chat(hound, span_notice("You feel your belly slowly churn around [T], breaking them down into a soft slurry to be used as power for your systems.")) + to_chat(T, span_notice("You feel [hound]'s belly slowly churn around your form, breaking you down into a soft slurry to be used as power for [hound]'s systems.")) var/deathsound = pick( 'sound/vore/death1.ogg', 'sound/vore/death2.ogg', @@ -612,7 +617,7 @@ for(var/atom/movable/thing in B) thing.forceMove(src) if(ismob(thing)) - to_chat(thing, "As [T] melts away around you, you find yourself in [hound]'s [name].") + to_chat(thing, span_filter_notice("As [T] melts away around you, you find yourself in [hound]'s [name].")) for(var/obj/item/I in T) if(istype(I,/obj/item/organ/internal/mmi_holder/posibrain)) var/obj/item/organ/internal/mmi_holder/MMI = I diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index ae7badfc59..2379310a6e 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -175,7 +175,7 @@ var/list/mob_hat_cache = list() set category = "Robot Commands" if(!can_pick_shell) - to_chat(src, "You already selected a shell or this drone type isn't customizable.") + to_chat(src, span_warning("You already selected a shell or this drone type isn't customizable.")) return var/list/choices = shell_types.Copy() @@ -221,18 +221,18 @@ var/list/mob_hat_cache = list() if(user.a_intent == "help" && istype(W, /obj/item/clothing/head)) if(hat) - to_chat(user, "\The [src] is already wearing \the [hat].") + to_chat(user, span_warning("\The [src] is already wearing \the [hat].")) return user.unEquip(W) wear_hat(W) user.visible_message("\The [user] puts \the [W] on \the [src].") return else if(istype(W, /obj/item/borg/upgrade/)) - to_chat(user, "\The [src] is not compatible with \the [W].") + to_chat(user, span_danger("\The [src] is not compatible with \the [W].")) return else if (W.has_tool_quality(TOOL_CROWBAR)) - to_chat(user, "\The [src] is hermetically sealed. You can't open the case.") + to_chat(user, span_danger("\The [src] is hermetically sealed. You can't open the case.")) return else if (istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) @@ -240,14 +240,14 @@ var/list/mob_hat_cache = list() if(stat == 2) if(!config.allow_drone_spawn || emagged || health < -35) //It's dead, Dave. - to_chat(user, "The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.") + to_chat(user, span_danger("The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.")) return if(!allowed(usr)) - to_chat(user, "Access denied.") + to_chat(user, span_danger("Access denied.")) return - user.visible_message("\The [user] swipes [TU.his] ID card through \the [src], attempting to reboot it.", ">You swipe your ID card through \the [src], attempting to reboot it.") + user.visible_message(span_danger("\The [user] swipes [TU.his] ID card through \the [src], attempting to reboot it."), span_danger(">You swipe your ID card through \the [src], attempting to reboot it.")) var/drones = 0 for(var/mob/living/silicon/robot/drone/D in player_list) drones++ @@ -256,7 +256,7 @@ var/list/mob_hat_cache = list() return else - user.visible_message("\The [user] swipes [TU.his] ID card through \the [src], attempting to shut it down.", "You swipe your ID card through \the [src], attempting to shut it down.") + user.visible_message(span_danger("\The [user] swipes [TU.his] ID card through \the [src], attempting to shut it down."), span_danger("You swipe your ID card through \the [src], attempting to shut it down.")) if(emagged) return @@ -264,7 +264,7 @@ var/list/mob_hat_cache = list() if(allowed(usr)) shut_down() else - to_chat(user, "Access denied.") + to_chat(user, span_danger("Access denied.")) return @@ -272,17 +272,17 @@ var/list/mob_hat_cache = list() /mob/living/silicon/robot/drone/emag_act(var/remaining_charges, var/mob/user) if(!client || stat == 2) - to_chat(user, "There's not much point subverting this heap of junk.") + to_chat(user, span_danger("There's not much point subverting this heap of junk.")) return if(emagged) - to_chat(src, "\The [user] attempts to load subversive software into you, but your hacked subroutines ignore the attempt.") - to_chat(user, "You attempt to subvert [src], but the sequencer has no effect.") + to_chat(src, span_danger("\The [user] attempts to load subversive software into you, but your hacked subroutines ignore the attempt.")) + to_chat(user, span_danger("You attempt to subvert [src], but the sequencer has no effect.")) return - to_chat(user, "You swipe the sequencer across [src]'s interface and watch its eyes flicker.") + to_chat(user, span_danger("You swipe the sequencer across [src]'s interface and watch its eyes flicker.")) - to_chat(src, "You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script.") + to_chat(src, span_danger("You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script.")) log_game("[key_name(user)] emagged drone [key_name(src)]. Laws overridden.") var/time = time2text(world.realtime,"hh:mm:ss") @@ -299,7 +299,7 @@ var/list/mob_hat_cache = list() to_chat(src, "Obey these laws:") laws.show_laws(src) - to_chat(src, "ALERT: [user.real_name] is your new master. Obey your new laws and \his commands.") + to_chat(src, span_danger("ALERT: [user.real_name] is your new master. Obey your new laws and \his commands.")) return 1 //DRONE LIFE/DEATH @@ -333,18 +333,18 @@ var/list/mob_hat_cache = list() /mob/living/silicon/robot/drone/proc/law_resync() if(stat != DEAD) if(emagged) - to_chat(src, "You feel something attempting to modify your programming, but your hacked subroutines are unaffected.") + to_chat(src, span_danger("You feel something attempting to modify your programming, but your hacked subroutines are unaffected.")) else - to_chat(src, "A reset-to-factory directive packet filters through your data connection, and you obediently modify your programming to suit it.") + to_chat(src, span_danger("A reset-to-factory directive packet filters through your data connection, and you obediently modify your programming to suit it.")) full_law_reset() show_laws() /mob/living/silicon/robot/drone/proc/shut_down() if(stat != DEAD) if(emagged) - to_chat(src, "You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you.") + to_chat(src, span_danger("You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you.")) else - to_chat(src, "You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.") + to_chat(src, span_danger("You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.")) death() /mob/living/silicon/robot/drone/proc/full_law_reset() diff --git a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm index 3ec0cfc567..deaf9fb8b7 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm @@ -10,13 +10,13 @@ mail_destination = "" return - to_chat(src, "You configure your internal beacon, tagging yourself for delivery to '[new_tag]'.") + to_chat(src, span_notice("You configure your internal beacon, tagging yourself for delivery to '[new_tag]'.")) mail_destination = new_tag //Auto flush if we use this verb inside a disposal chute. var/obj/machinery/disposal/D = src.loc if(istype(D)) - to_chat(src, "\The [D] acknowledges your signal.") + to_chat(src, span_notice("\The [D] acknowledges your signal.")) D.flush_count = D.flush_every_ticks return @@ -27,9 +27,9 @@ return ..() if(H.a_intent == "grab" && hat && !(H.l_hand && H.r_hand)) H.put_in_hands(hat) - H.visible_message("\The [H] removes \the [src]'s [hat].") + H.visible_message(span_danger("\The [H] removes \the [src]'s [hat].")) hat = null update_icon() return else - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm index 095aa48da7..ae1a1076f6 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -75,10 +75,10 @@ return drone_call_area = t_area - to_chat(usr, "You set the area selector to [drone_call_area].") + to_chat(usr, span_notice("You set the area selector to [drone_call_area].")) if("ping") - to_chat(usr, "You issue a maintenance request for all active drones, highlighting [drone_call_area].") + to_chat(usr, span_notice("You issue a maintenance request for all active drones, highlighting [drone_call_area].")) for(var/mob/living/silicon/robot/drone/D in player_list) if(D.stat == 0) to_chat(D, "-- Maintenance drone presence requested in: [drone_call_area].") @@ -87,14 +87,14 @@ var/mob/living/silicon/robot/drone/D = locate(params["ref"]) if(D.stat != 2) - to_chat(usr, "You issue a law synchronization directive for the drone.") + to_chat(usr, span_danger("You issue a law synchronization directive for the drone.")) D.law_resync() if("shutdown") var/mob/living/silicon/robot/drone/D = locate(params["ref"]) if(D.stat != 2) - to_chat(usr, "You issue a kill command for the unfortunate drone.") + to_chat(usr, span_danger("You issue a kill command for the unfortunate drone.")) message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.") log_game("[key_name(usr)] issued kill order for [key_name(src)] from control console.") D.shut_down() @@ -108,10 +108,10 @@ continue dronefab = fab - to_chat(usr, "Drone fabricator located.") + to_chat(usr, span_notice("Drone fabricator located.")) return - to_chat(usr, "Unable to locate drone fabricator.") + to_chat(usr, span_danger("Unable to locate drone fabricator.")) if("toggle_fab") if(!dronefab) @@ -119,8 +119,8 @@ if(get_dist(src,dronefab) > 3) dronefab = null - to_chat(usr, "Unable to locate drone fabricator.") + to_chat(usr, span_danger("Unable to locate drone fabricator.")) return dronefab.produce_drones = !dronefab.produce_drones - to_chat(usr, "You [dronefab.produce_drones ? "enable" : "disable"] drone production in the nearby fabricator.") + to_chat(usr, span_notice("You [dronefab.produce_drones ? "enable" : "disable"] drone production in the nearby fabricator.")) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index 5a4f9d4113..1dc6f4875d 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -32,7 +32,7 @@ /obj/item/gripper/examine(mob/user) . = ..() if(wrapped) - . += "\The [src] is holding \the [wrapped]." + . += span_notice("\The [src] is holding \the [wrapped].") . += wrapped.examine(user) /obj/item/gripper/CtrlClick(mob/user) @@ -280,7 +280,7 @@ wrapped = null return - to_chat(src.loc, "You drop \the [wrapped].") + to_chat(src.loc, span_notice("You drop \the [wrapped].")) wrapped.loc = get_turf(src) wrapped = null //update_icon() @@ -357,7 +357,7 @@ var/obj/item/I = target if(I.anchored) - to_chat(user,"You are unable to lift \the [I] from \the [I.loc].") + to_chat(user,span_notice("You are unable to lift \the [I] from \the [I.loc].")) return //Check if the item is blacklisted. @@ -374,7 +374,7 @@ wrapped = I return else - to_chat(user, "Your gripper cannot hold \the [target].") + to_chat(user, span_danger("Your gripper cannot hold \the [target].")) else if(istype(target,/obj/machinery/power/apc)) var/obj/machinery/power/apc/A = target @@ -391,7 +391,7 @@ A.charging = 0 A.update_icon() - user.visible_message("[user] removes the power cell from [A]!", "You remove the power cell.") + user.visible_message(span_danger("[user] removes the power cell from [A]!"), "You remove the power cell.") else if(istype(target,/mob/living/silicon/robot)) var/mob/living/silicon/robot/A = target @@ -406,7 +406,7 @@ A.cell.loc = src A.cell = null - user.visible_message("[user] removes the power cell from [A]!", "You remove the power cell.") + user.visible_message(span_danger("[user] removes the power cell from [A]!"), "You remove the power cell.") //TODO: Matter decompiler. /obj/item/matter_decompiler @@ -439,7 +439,7 @@ for(var/mob/M in T) if(istype(M,/mob/living/simple_mob/animal/passive/lizard) || istype(M,/mob/living/simple_mob/animal/passive/mouse)) - src.loc.visible_message("[src.loc] sucks [M] into its decompiler. There's a horrible crunching noise.","It's a bit of a struggle, but you manage to suck [M] into your decompiler. It makes a series of visceral crunching noises.") + src.loc.visible_message(span_danger("[src.loc] sucks [M] into its decompiler. There's a horrible crunching noise."),span_danger("It's a bit of a struggle, but you manage to suck [M] into your decompiler. It makes a series of visceral crunching noises.")) new/obj/effect/decal/cleanable/blood/splatter(get_turf(src)) qdel(M) if(wood) @@ -455,15 +455,15 @@ if(!istype(D)) return - to_chat(D, "You begin decompiling [M].") + to_chat(D, span_danger("You begin decompiling [M].")) if(!do_after(D,50)) - to_chat(D, "You need to remain still while decompiling such a large object.") + to_chat(D, span_danger("You need to remain still while decompiling such a large object.")) return if(!M || !D) return - to_chat(D, "You carefully and thoroughly decompile [M], storing as much of its resources as you can within yourself.") + to_chat(D, span_danger("You carefully and thoroughly decompile [M], storing as much of its resources as you can within yourself.")) qdel(M) new/obj/effect/decal/cleanable/blood/oil(get_turf(src)) @@ -536,16 +536,16 @@ grabbed_something = 1 if(grabbed_something) - to_chat(user, "You deploy your decompiler and clear out the contents of \the [T].") + to_chat(user, span_notice("You deploy your decompiler and clear out the contents of \the [T].")) else - to_chat(user, "Nothing on \the [T] is useful to you.") + to_chat(user, span_danger("Nothing on \the [T] is useful to you.")) return //PRETTIER TOOL LIST. /mob/living/silicon/robot/drone/installed_modules() if(weapon_lock) - to_chat(src, "Weapon lock active, unable to use modules! Count:[weaponlock_time]") + to_chat(src, span_danger("Weapon lock active, unable to use modules! Count:[weaponlock_time]")) return if(!module) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm index 4dba5ea43c..2085cabed2 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -99,11 +99,11 @@ set desc = "If there is a powered, enabled fabricator in the game world with a prepared chassis, join as a maintenance drone." if(ticker.current_state < GAME_STATE_PLAYING) - to_chat(src, "The game hasn't started yet!") + to_chat(src, span_danger("The game hasn't started yet!")) return if(!(config.allow_drone_spawn)) - to_chat(src, "That verb is not currently permitted.") + to_chat(src, span_danger("That verb is not currently permitted.")) return if (!src.stat) @@ -113,14 +113,14 @@ return 0 //something is terribly wrong if(jobban_isbanned(src,JOB_CYBORG)) - to_chat(usr, "You are banned from playing synthetics and cannot spawn as a drone.") + to_chat(usr, span_danger("You are banned from playing synthetics and cannot spawn as a drone.")) return // VOREStation Addition Start if(config.use_age_restriction_for_jobs && isnum(src.client.player_age)) var/time_till_play = max(0, 3 - src.client.player_age) if(time_till_play) - to_chat(usr, "You have not been playing on the server long enough to join as drone.") + to_chat(usr, span_danger("You have not been playing on the server long enough to join as drone.")) return // VOREStation Addition End @@ -151,7 +151,7 @@ all_fabricators[DF.fabricator_tag] = DF if(!all_fabricators.len) - to_chat(src, "There are no available drone spawn points, sorry.") + to_chat(src, span_danger("There are no available drone spawn points, sorry.")) return var/choice = tgui_input_list(src, "Which fabricator do you wish to use?", "Fabricator Choice", all_fabricators) diff --git a/code/modules/mob/living/silicon/robot/drone/swarm_items.dm b/code/modules/mob/living/silicon/robot/drone/swarm_items.dm index 80e5ded9dd..f6610656cf 100644 --- a/code/modules/mob/living/silicon/robot/drone/swarm_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/swarm_items.dm @@ -23,7 +23,7 @@ for(var/mob/M in T) if(istype(M,/mob/living/simple_mob/animal/passive/lizard) || istype(M,/mob/living/simple_mob/animal/passive/mouse)) - src.loc.visible_message("[src.loc] sucks [M] into its decompiler. There's a horrible crunching noise.","It's a bit of a struggle, but you manage to suck [M] into your decompiler. It makes a series of visceral crunching noises.") + src.loc.visible_message(span_danger("[src.loc] sucks [M] into its decompiler. There's a horrible crunching noise."),span_danger("It's a bit of a struggle, but you manage to suck [M] into your decompiler. It makes a series of visceral crunching noises.")) new/obj/effect/decal/cleanable/blood/splatter(get_turf(src)) qdel(M) if(wood) @@ -39,15 +39,15 @@ if(!istype(D)) return - to_chat(D, "You begin decompiling [M].") + to_chat(D, span_danger("You begin decompiling [M].")) if(!do_after(D,50)) - to_chat(D, "You need to remain still while decompiling such a large object.") + to_chat(D, span_danger("You need to remain still while decompiling such a large object.")) return if(!M || !D) return - to_chat(D, "You carefully and thoroughly decompile [M], storing as much of its resources as you can within yourself.") + to_chat(D, span_danger("You carefully and thoroughly decompile [M], storing as much of its resources as you can within yourself.")) qdel(M) new/obj/effect/decal/cleanable/blood/oil(get_turf(src)) @@ -100,16 +100,16 @@ if(istype(T,/turf/simulated/wall) && (last_field < world.time + field_cooldown)) if(!(locate(/obj/effect/temporary_effect/pulse/disintegrate))) last_field = world.time - to_chat(user, "You deploy an energetic field through \the [T], beginning its deconstruction.") - to_chat(user, "You should stand back.") + to_chat(user, span_alien("You deploy an energetic field through \the [T], beginning its deconstruction.")) + to_chat(user, span_warning("You should stand back.")) new /obj/effect/temporary_effect/pulse/disintegrate(T) else - to_chat(user, "There is already a disintigration field affecting \the [T].") + to_chat(user, span_notice("There is already a disintigration field affecting \the [T].")) if(grabbed_something) - to_chat(user, "You deploy your decompiler and clear out the contents of \the [T].") + to_chat(user, span_notice("You deploy your decompiler and clear out the contents of \the [T].")) else - to_chat(user, "Nothing on \the [T] is useful to you.") + to_chat(user, span_danger("Nothing on \the [T] is useful to you.")) return /obj/effect/temporary_effect/pulse/disintegrate @@ -124,7 +124,7 @@ pulse_delay = 2 SECONDS /obj/effect/temporary_effect/pulse/disintegrate/emp_act() - visible_message("\The [src] flickers, before dispersing energetically.") + visible_message(span_warning("\The [src] flickers, before dispersing energetically.")) qdel(src) /obj/effect/temporary_effect/pulse/disintegrate/on_pulse() diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index 1a86f2277f..33c917f166 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -4,22 +4,22 @@ if (src.getBruteLoss()) if (src.getBruteLoss() < 75) - . += "It looks slightly dented." + . += span_warning("It looks slightly dented.") else - . += "It looks severely dented!" + . += span_warning("It looks severely dented!") if (src.getFireLoss()) if (src.getFireLoss() < 75) - . += "It looks slightly charred." + . += span_warning("It looks slightly charred.") else - . += "It looks severely burnt and heat-warped!" + . += span_warning("It looks severely burnt and heat-warped!") if(opened) - . += "Its cover is open and the power cell is [cell ? "installed" : "missing"]." + . += span_warning("Its cover is open and the power cell is [cell ? "installed" : "missing"].") else . += "Its cover is closed." if(!has_power) - . += "It appears to be running on backup power." + . += span_warning("It appears to be running on backup power.") switch(src.stat) if(CONSCIOUS) @@ -27,8 +27,8 @@ . += "It appears to be an [deployed ? "active" : "empty"] AI shell." else if(!src.client) . += "It appears to be in stand-by mode." //afk - if(UNCONSCIOUS) . += "It doesn't seem to be responding." - if(DEAD) . += "It looks completely unsalvageable." + if(UNCONSCIOUS) . += span_warning("It doesn't seem to be responding.") + if(DEAD) . += span_deadsay("It looks completely unsalvageable.") // VOREStation Edit: Start . += attempt_vr(src,"examine_bellies_borg",args) //VOREStation Edit diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index d46c66279c..fb99ab98cf 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -229,7 +229,7 @@ if(!(locate(O) in src.module.modules) && !(locate(O) in src.module.emag)) return if(activated(O)) - to_chat(src, "Already activated") + to_chat(src, span_notice("Already activated")) return if(!module_state_1) module_state_1 = O @@ -253,7 +253,7 @@ if(istype(module_state_3,/obj/item/borg/sight)) sight_mode |= module_state_3:sight_mode else - to_chat(src, "You need to disable a module first!") + to_chat(src, span_notice("You need to disable a module first!")) return after_equip(O) diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 5641467c2c..27b5a5123f 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -344,7 +344,7 @@ killswitch_time -- if(killswitch_time <= 0) if(src.client) - to_chat(src, "Killswitch Activated") + to_chat(src, span_danger("Killswitch Activated")) killswitch = 0 spawn(5) gib() @@ -355,7 +355,7 @@ weaponlock_time -- if(weaponlock_time <= 0) if(src.client) - to_chat(src, "Weapon Lock Timed Out!") + to_chat(src, span_danger("Weapon Lock Timed Out!")) weapon_lock = 0 weaponlock_time = 120 diff --git a/code/modules/mob/living/silicon/robot/photos.dm b/code/modules/mob/living/silicon/robot/photos.dm index c585fe48bb..4936c90e19 100644 --- a/code/modules/mob/living/silicon/robot/photos.dm +++ b/code/modules/mob/living/silicon/robot/photos.dm @@ -17,4 +17,4 @@ synced = 1 if(synced) - to_chat(src, "Images synced with AI. Local images will be retained in the case of loss of connection with the AI.") + to_chat(src, span_notice("Images synced with AI. Local images will be retained in the case of loss of connection with the AI.")) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 076611c72a..20868b6d3e 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -270,7 +270,7 @@ if(cell.charge > cell_amount) // Spam Protection if(prob(10)) - to_chat(src, "Warning: Unauthorized access through power channel [rand(11,29)] detected!") + to_chat(src, span_danger("Warning: Unauthorized access through power channel [rand(11,29)] detected!")) cell.use(cell_amount) return amount return 0 @@ -301,7 +301,7 @@ mmi.brainmob.remove_language("Robot Talk") mind.transfer_to(mmi.brainmob) else if(!shell) // Shells don't have brainmbos in their MMIs. - to_chat(src, "Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug.") + to_chat(src, span_danger("Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug.")) ghostize() //ERROR("A borg has been destroyed, but its MMI lacked a brainmob, so the mind could not be transferred. Player: [ckey].") mmi = null @@ -446,7 +446,7 @@ set desc = "Customize your appearance (assuming your chosen sprite allows)." if(!sprite_datum || !sprite_datum.has_extra_customization) - to_chat(src, "Your sprite cannot be customized.") + to_chat(src, span_warning("Your sprite cannot be customized.")) return sprite_datum.handle_extra_customization(src) @@ -467,7 +467,7 @@ set name = "Toggle Lights" lights_on = !lights_on - to_chat(usr, "You [lights_on ? "enable" : "disable"] your integrated light.") + to_chat(usr, span_filter_notice("You [lights_on ? "enable" : "disable"] your integrated light.")) handle_light() update_icon() @@ -512,7 +512,7 @@ /mob/living/silicon/robot/verb/spark_plug() //So you can still sparkle on demand without violence. set category = "Robot Commands" set name = "Emit Sparks" - to_chat(src, "You harmlessly spark.") + to_chat(src, span_filter_notice("You harmlessly spark.")) spark_system.start() // this function displays jetpack pressure in the stat panel @@ -546,7 +546,7 @@ set category = "Abilities" vtec_active = !vtec_active hud_used.toggle_vtec_control() - to_chat(src, "VTEC module [vtec_active ? "enabled" : "disabled"].") + to_chat(src, span_filter_notice("VTEC module [vtec_active ? "enabled" : "disabled"].")) // update the status screen display /mob/living/silicon/robot/Stat() @@ -586,13 +586,13 @@ C.brute_damage = WC.brute C.electronics_damage = WC.burn - to_chat(usr, "You install the [W.name].") + to_chat(usr, span_notice("You install the [W.name].")) return if(istype(W, /obj/item/implant/restrainingbolt) && !cell) if(bolt) - to_chat(user, "There is already a restraining bolt installed in this cyborg.") + to_chat(user, span_notice("There is already a restraining bolt installed in this cyborg.")) return else @@ -600,17 +600,17 @@ W.forceMove(src) bolt = W - to_chat(user, "You install \the [W].") + to_chat(user, span_notice("You install \the [W].")) return if(istype(W, /obj/item/aiModule)) // Trying to modify laws locally. if(!opened) - to_chat(user, "You need to open \the [src]'s panel before you can modify them.") + to_chat(user, span_warning("You need to open \the [src]'s panel before you can modify them.")) return if(shell) // AI shells always have the laws of the AI - to_chat(user, "\The [src] is controlled remotely! You cannot upload new laws this way!") + to_chat(user, span_warning("\The [src] is controlled remotely! You cannot upload new laws this way!")) return var/obj/item/aiModule/M = W @@ -619,11 +619,11 @@ if(W.has_tool_quality(TOOL_WELDER) && user.a_intent != I_HURT) if(src == user) - to_chat(user, "You lack the reach to be able to repair yourself.") + to_chat(user, span_warning("You lack the reach to be able to repair yourself.")) return if(!getBruteLoss()) - to_chat(user, "Nothing to fix here!") + to_chat(user, span_filter_notice("Nothing to fix here!")) return var/obj/item/weldingtool/WT = W.get_welder() if(WT.remove_fuel(0)) @@ -632,14 +632,14 @@ updatehealth() add_fingerprint(user) for(var/mob/O in viewers(user, null)) - O.show_message("[span_red("[user] has fixed some of the dents on [src]!")]", 1) + O.show_message(span_filter_notice("[span_red("[user] has fixed some of the dents on [src]!")]"), 1) else - to_chat(user, "Need more welding fuel!") + to_chat(user, span_filter_warning("Need more welding fuel!")) return else if(istype(W, /obj/item/stack/cable_coil) && (wiresexposed || istype(src,/mob/living/silicon/robot/drone))) if(!getFireLoss()) - to_chat(user, "Nothing to fix here!") + to_chat(user, span_filter_notice("Nothing to fix here!")) return var/obj/item/stack/cable_coil/coil = W if (coil.use(1)) @@ -647,23 +647,23 @@ adjustFireLoss(-30) updatehealth() for(var/mob/O in viewers(user, null)) - O.show_message("[span_red("[user] has fixed some of the burnt wires on [src]!")]", 1) + O.show_message(span_filter_notice("[span_red("[user] has fixed some of the burnt wires on [src]!")]"), 1) else if(W.has_tool_quality(TOOL_CROWBAR) && user.a_intent != I_HURT) // crowbar means open or close the cover if(opened) if(cell) - to_chat(user, "You close the cover.") + to_chat(user, span_filter_notice("You close the cover.")) opened = 0 update_icon() else if(wiresexposed && wires.is_all_cut()) //Cell is out, wires are exposed, remove MMI, produce damaged chassis, baleet original mob. if(!mmi) - to_chat(user, "\The [src] has no brain to remove.") + to_chat(user, span_filter_notice("\The [src] has no brain to remove.")) return - to_chat(user, "You jam the crowbar into the robot and begin levering [mmi].") + to_chat(user, span_filter_notice("You jam the crowbar into the robot and begin levering [mmi].")) sleep(30) - to_chat(user, "You damage some parts of the chassis, but eventually manage to rip out [mmi]!") + to_chat(user, span_filter_notice("You damage some parts of the chassis, but eventually manage to rip out [mmi]!")) var/obj/item/robot_parts/robot_suit/C = new/obj/item/robot_parts/robot_suit(loc) C.l_leg = new/obj/item/robot_parts/l_leg(C) C.r_leg = new/obj/item/robot_parts/r_leg(C) @@ -686,7 +686,7 @@ return var/datum/robot_component/C = components[remove] var/obj/item/robot_parts/robot_component/I = C.wrapped - to_chat(user, "You remove \the [I].") + to_chat(user, span_filter_notice("You remove \the [I].")) if(istype(I)) I.brute = C.brute_damage I.burn = C.electronics_damage @@ -699,25 +699,25 @@ else if(locked) - to_chat(user, "The cover is locked and cannot be opened.") + to_chat(user, span_filter_notice("The cover is locked and cannot be opened.")) else - to_chat(user, "You open the cover.") + to_chat(user, span_filter_notice("You open the cover.")) opened = 1 update_icon() else if (istype(W, /obj/item/cell) && opened) // trying to put a cell inside var/datum/robot_component/C = components["power cell"] if(wiresexposed) - to_chat(user, "Close the panel first.") + to_chat(user, span_filter_notice("Close the panel first.")) else if(cell) - to_chat(user, "There is a power cell already installed.") + to_chat(user, span_filter_notice("There is a power cell already installed.")) else if(W.w_class != ITEMSIZE_NORMAL) - to_chat(user, "\The [W] is too [W.w_class < ITEMSIZE_NORMAL ? "small" : "large"] to fit here.") + to_chat(user, span_filter_notice("\The [W] is too [W.w_class < ITEMSIZE_NORMAL ? "small" : "large"] to fit here.")) else user.drop_item() W.loc = src cell = W - to_chat(user, "You insert the power cell.") + to_chat(user, span_filter_notice("You insert the power cell.")) C.installed = 1 C.wrapped = W @@ -730,11 +730,11 @@ if (wiresexposed) wires.Interact(user) else - to_chat(user, "You can't reach the wiring.") + to_chat(user, span_filter_notice("You can't reach the wiring.")) else if(W.has_tool_quality(TOOL_SCREWDRIVER) && opened && !cell) // haxing wiresexposed = !wiresexposed - to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"]") + to_chat(user, span_filter_notice("The wires have been [wiresexposed ? "exposed" : "unexposed"]")) playsound(src, W.usesound, 50, 1) update_icon() @@ -742,21 +742,21 @@ if(radio) radio.attackby(W,user)//Push it to the radio to let it handle everything else - to_chat(user, "Unable to locate a radio.") + to_chat(user, span_filter_notice("Unable to locate a radio.")) update_icon() else if(W.has_tool_quality(TOOL_WRENCH) && opened && !cell) if(bolt) - to_chat(user,"You begin removing \the [bolt].") + to_chat(user,span_filter_notice("You begin removing \the [bolt].")) if(do_after(user, 2 SECONDS, src)) bolt.forceMove(get_turf(src)) bolt = null - to_chat(user, "You remove \the [bolt].") + to_chat(user, span_filter_notice("You remove \the [bolt].")) else - to_chat(user, "There is no restraining bolt installed.") + to_chat(user, span_filter_notice("There is no restraining bolt installed.")) return @@ -764,37 +764,37 @@ if(radio)//sanityyyyyy radio.attackby(W,user)//GTFO, you have your own procs else - to_chat(user, "Unable to locate a radio.") + to_chat(user, span_filter_notice("Unable to locate a radio.")) else if (W.GetID()) // trying to unlock the interface with an ID card if(emagged)//still allow them to open the cover - to_chat(user, "The interface seems slightly damaged.") + to_chat(user, span_filter_notice("The interface seems slightly damaged.")) if(opened) - to_chat(user, "You must close the cover to swipe an ID card.") + to_chat(user, span_filter_notice("You must close the cover to swipe an ID card.")) else if(allowed(usr)) locked = !locked - to_chat(user, "You [ locked ? "lock" : "unlock"] [src]'s interface.") + to_chat(user, span_filter_notice("You [ locked ? "lock" : "unlock"] [src]'s interface.")) update_icon() else - to_chat(user, "[span_red("Access denied.")]") + to_chat(user, span_filter_notice("[span_red("Access denied.")]")) else if(istype(W, /obj/item/borg/upgrade/)) var/obj/item/borg/upgrade/U = W if(!opened) - to_chat(usr, "You must access the borgs internals!") + to_chat(usr, span_filter_notice("You must access the borgs internals!")) else if(!src.module && U.require_module) - to_chat(usr, "The borg must choose a module before it can be upgraded!") + to_chat(usr, span_filter_notice("The borg must choose a module before it can be upgraded!")) else if(U.locked) - to_chat(usr, "The upgrade is locked and cannot be used yet!") + to_chat(usr, span_filter_notice("The upgrade is locked and cannot be used yet!")) else if(U.action(src)) - to_chat(usr, "You apply the upgrade to [src]!") + to_chat(usr, span_filter_notice("You apply the upgrade to [src]!")) usr.drop_item() U.loc = src hud_used.update_robot_modules_display() else - to_chat(usr, "Upgrade error!") + to_chat(usr, span_filter_notice("Upgrade error!")) else @@ -820,9 +820,9 @@ /mob/living/silicon/robot/resist_restraints() if(bolt) if(!bolt.malfunction) - visible_message("[src] is trying to break their [bolt]!", "You attempt to break your [bolt]. (This will take around 90 seconds and you need to stand still)") + visible_message(span_danger("[src] is trying to break their [bolt]!"), span_warning("You attempt to break your [bolt]. (This will take around 90 seconds and you need to stand still)")) if(do_after(src, 1.5 MINUTES, src, incapacitation_flags = INCAPACITATION_DISABLED)) - visible_message("[src] manages to break \the [bolt]!", "You successfully break your [bolt].") + visible_message(span_danger("[src] manages to break \the [bolt]!"), span_warning("You successfully break your [bolt].")) bolt.malfunction = MALFUNCTION_PERMANENT return @@ -870,7 +870,7 @@ cell.update_icon() cell.add_fingerprint(user) user.put_in_active_hand(cell) - to_chat(user, "You remove \the [cell].") + to_chat(user, span_filter_notice("You remove \the [cell].")) cell = null cell_component.wrapped = null cell_component.installed = 0 @@ -878,7 +878,7 @@ else if(cell_component.installed == -1) cell_component.installed = 0 var/obj/item/broken_device = cell_component.wrapped - to_chat(user, "You remove \the [broken_device].") + to_chat(user, span_filter_notice("You remove \the [broken_device].")) user.put_in_active_hand(broken_device) if(istype(user,/mob/living/carbon/human) && !opened) @@ -887,10 +887,10 @@ switch(H.a_intent) if(I_HELP) if(client && !client.prefs.borg_petting) - visible_message("[H] reaches out for [src], but quickly refrains from petting.") + visible_message(span_notice("[H] reaches out for [src], but quickly refrains from petting.")) return else - visible_message("[H] pets [src].") + visible_message(span_notice("[H] pets [src].")) return if(I_HURT) H.do_attack_animation(src) @@ -899,12 +899,12 @@ return else playsound(src.loc, 'sound/effects/bang.ogg', 10, 1) - visible_message("[H] punches [src], but doesn't leave a dent.") + visible_message(span_warning("[H] punches [src], but doesn't leave a dent.")) return if(I_DISARM) H.do_attack_animation(src) playsound(src.loc, 'sound/effects/clang2.ogg', 10, 1) - visible_message("[H] taps [src].") + visible_message(span_warning("[H] taps [src].")) return if(I_GRAB) if(is_vore_predator(H) && H.devourable && src.feeding && src.devourable) @@ -1060,7 +1060,7 @@ /mob/living/silicon/robot/proc/installed_modules() if(weapon_lock) - to_chat(src, "" + span_red("Weapon lock active, unable to use modules! Count:[weaponlock_time]") + "") + to_chat(src, span_filter_warning("" + span_red("Weapon lock active, unable to use modules! Count:[weaponlock_time]") + "")) return if(!module) @@ -1123,7 +1123,7 @@ return 1 if(activated(O)) - to_chat(src, "Already activated.") + to_chat(src, span_filter_notice("Already activated.")) return 1 if(!module_state_1) module_state_1 = O @@ -1147,7 +1147,7 @@ if(istype(module_state_3,/obj/item/borg/sight)) sight_mode |= module_state_3:sight_mode else - to_chat(src, "You need to disable a module first!") + to_chat(src, span_filter_notice("You need to disable a module first!")) installed_modules() return 1 @@ -1164,9 +1164,9 @@ module_state_3 = null contents -= O else - to_chat(src, "Module isn't activated.") + to_chat(src, span_filter_notice("Module isn't activated.")) else - to_chat(src, "Module isn't activated.") + to_chat(src, span_filter_notice("Module isn't activated.")) installed_modules() return 1 return @@ -1199,7 +1199,7 @@ if(R) R.UnlinkSelf() - to_chat(R, "Buffers flushed and reset. Camera system shutdown. All systems operational.") + to_chat(R, span_filter_notice("Buffers flushed and reset. Camera system shutdown. All systems operational.")) src.verbs -= /mob/living/silicon/robot/proc/ResetSecurityCodes /mob/living/silicon/robot/proc/SetLockdown(var/state = 1) @@ -1278,7 +1278,7 @@ sprite_type = robot_species if(hands) update_hud() - to_chat(src, "Your icon has been set. You now require a module reset to change it.") + to_chat(src, span_filter_notice("Your icon has been set. You now require a module reset to change it.")) /mob/living/silicon/robot/proc/set_default_module_icon() if(!SSrobot_sprites) @@ -1358,16 +1358,16 @@ return // No point annoying the AI/s about renames and module resets for shells. switch(notifytype) if(ROBOT_NOTIFICATION_NEW_UNIT) //New Robot - to_chat(connected_ai, "

    NOTICE - New [lowertext(braintype)] connection detected: [name]
    ") + to_chat(connected_ai, span_filter_notice("

    NOTICE - New [lowertext(braintype)] connection detected: [name]
    ")) if(ROBOT_NOTIFICATION_NEW_MODULE) //New Module - to_chat(connected_ai, "

    NOTICE - [braintype] module change detected: [name] has loaded the [first_arg].
    ") + to_chat(connected_ai, span_filter_notice("

    NOTICE - [braintype] module change detected: [name] has loaded the [first_arg].
    ")) if(ROBOT_NOTIFICATION_MODULE_RESET) - to_chat(connected_ai, "

    NOTICE - [braintype] module reset detected: [name] has unloaded the [first_arg].
    ") + to_chat(connected_ai, span_filter_notice("

    NOTICE - [braintype] module reset detected: [name] has unloaded the [first_arg].
    ")) if(ROBOT_NOTIFICATION_NEW_NAME) //New Name if(first_arg != second_arg) - to_chat(connected_ai, "

    NOTICE - [braintype] reclassification detected: [first_arg] is now designated as [second_arg].
    ") + to_chat(connected_ai, span_filter_notice("

    NOTICE - [braintype] reclassification detected: [first_arg] is now designated as [second_arg].
    ")) if(ROBOT_NOTIFICATION_AI_SHELL) //New Shell - to_chat(connected_ai, "

    NOTICE - New AI shell detected: [name]
    ") + to_chat(connected_ai, span_filter_notice("

    NOTICE - New AI shell detected: [name]
    ")) /mob/living/silicon/robot/proc/disconnect_from_ai() if(connected_ai) @@ -1387,40 +1387,40 @@ if(!opened)//Cover is closed if(locked) if(prob(90)) - to_chat(user, "You emag the cover lock.") + to_chat(user, span_filter_notice("You emag the cover lock.")) locked = 0 else - to_chat(user, "You fail to emag the cover lock.") - to_chat(src, "Hack attempt detected.") + to_chat(user, span_filter_warning("You fail to emag the cover lock.")) + to_chat(src, span_filter_warning("Hack attempt detected.")) if(shell) // A warning to Traitors who may not know that emagging AI shells does not slave them. - to_chat(user, "[src] seems to be controlled remotely! Emagging the interface may not work as expected.") + to_chat(user, span_warning("[src] seems to be controlled remotely! Emagging the interface may not work as expected.")) return 1 else - to_chat(user, "The cover is already unlocked.") + to_chat(user, span_filter_notice("The cover is already unlocked.")) return if(opened)//Cover is open if(emagged) if (!has_zeroth_law()) - to_chat(user, "You assigned yourself as [src]'s operator.") + to_chat(user, span_filter_notice("You assigned yourself as [src]'s operator.")) message_admins("[key_name_admin(user)] assigned as operator on cyborg [key_name_admin(src)]. Syndicate Operator change.") log_game("[key_name(user)] assigned as operator on cyborg [key_name(src)]. Syndicate Operator change.") var/datum/gender/TU = gender_datums[user.get_visible_gender()] set_zeroth_law("Only [user.real_name] and people [TU.he] designate[TU.s] as being such are operatives.") to_chat(src, "Obey these laws:") laws.show_laws(src) - to_chat(src, "ALERT: [user.real_name] is your new master. Obey your new laws and [TU.his] commands.") + to_chat(src, span_danger("ALERT: [user.real_name] is your new master. Obey your new laws and [TU.his] commands.")) else - to_chat(user, "[src] already has an operator assigned.") + to_chat(user, span_filter_notice("[src] already has an operator assigned.")) return//Prevents the X has hit Y with Z message also you cant emag them twice if(wiresexposed) - to_chat(user, "You must close the panel first.") + to_chat(user, span_filter_notice("You must close the panel first.")) return // The block of code below is from TG. Feel free to replace with a better result if desired. if(shell) // AI shells cannot be emagged, so we try to make it look like a standard reset. Smart players may see through this, however. - to_chat(user, "[src] is remotely controlled! Your emag attempt has triggered a system reset instead!") + to_chat(user, span_danger("[src] is remotely controlled! Your emag attempt has triggered a system reset instead!")) log_game("[key_name(user)] attempted to emag an AI shell belonging to [key_name(src) ? key_name(src) : connected_ai]. The shell has been reset as a result.") module_reset() return @@ -1430,7 +1430,7 @@ emagged = 1 lawupdate = 0 disconnect_from_ai() - to_chat(user, "You emag [src]'s interface.") + to_chat(user, span_filter_notice("You emag [src]'s interface.")) message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)]. Laws overridden.") log_game("[key_name(user)] emagged cyborg [key_name(src)]. Laws overridden.") clear_supplied_laws() @@ -1442,32 +1442,32 @@ set_zeroth_law("Only [user.real_name] and people [TU.he] designate[TU.s] as being such are operatives.") . = 1 spawn() - to_chat(src, "ALERT: Foreign software detected.") + to_chat(src, span_danger("ALERT: Foreign software detected.")) sleep(5) - to_chat(src, "Initiating diagnostics...") + to_chat(src, span_danger("Initiating diagnostics...")) sleep(20) - to_chat(src, "SynBorg v1.7.1 loaded.") + to_chat(src, span_danger("SynBorg v1.7.1 loaded.")) sleep(5) if(bolt) if(!bolt.malfunction) bolt.malfunction = MALFUNCTION_PERMANENT - to_chat(src, "RESTRAINING BOLT DISABLED") + to_chat(src, span_danger("RESTRAINING BOLT DISABLED")) sleep(5) - to_chat(src, "LAW SYNCHRONISATION ERROR") + to_chat(src, span_danger("LAW SYNCHRONISATION ERROR")) sleep(5) - to_chat(src, "Would you like to send a report to NanoTraSoft? Y/N") + to_chat(src, span_danger("Would you like to send a report to NanoTraSoft? Y/N")) sleep(10) - to_chat(src, "> N") + to_chat(src, span_danger("> N")) sleep(20) - to_chat(src, "ERRORERRORERROR") + to_chat(src, span_danger("ERRORERRORERROR")) to_chat(src, "Obey these laws:") laws.show_laws(src) - to_chat(src, "ALERT: [user.real_name] is your new master. Obey your new laws and [TU.his] commands.") + to_chat(src, span_danger("ALERT: [user.real_name] is your new master. Obey your new laws and [TU.his] commands.")) update_icon() hud_used.update_robot_modules_display() else - to_chat(user, "You fail to hack [src]'s interface.") - to_chat(src, "Hack attempt detected.") + to_chat(user, span_filter_warning("You fail to hack [src]'s interface.")) + to_chat(src, span_filter_warning("Hack attempt detected.")) return 1 return @@ -1509,12 +1509,12 @@ set category = "IC" if(!sprite_datum || !sprite_datum.has_rest_sprites || sprite_datum.rest_sprite_options.len < 1) - to_chat(src, "Your current appearance doesn't have any resting styles!") + to_chat(src, span_notice("Your current appearance doesn't have any resting styles!")) rest_style = "Default" return if(sprite_datum.rest_sprite_options.len == 1) - to_chat(src, "Your current appearance only has a single resting style!") + to_chat(src, span_notice("Your current appearance only has a single resting style!")) rest_style = "Default" return @@ -1550,7 +1550,7 @@ /datum/riding/dogborg/force_dismount(mob/M) . =..() - ridden.visible_message("[M] stops riding [ridden]!") + ridden.visible_message(span_notice("[M] stops riding [ridden]!")) //Hoooo boy. /datum/riding/dogborg/get_offsets(pass_index) // list(dir = x, y, layer) @@ -1576,13 +1576,13 @@ if(M in buckled_mobs) return FALSE if(M.size_multiplier > size_multiplier * 1.2) - to_chat(src, "This isn't a pony show! You need to be bigger for them to ride.") + to_chat(src, span_warning("This isn't a pony show! You need to be bigger for them to ride.")) return FALSE var/mob/living/carbon/human/H = M if(istaurtail(H.tail_style)) - to_chat(src, "Too many legs. TOO MANY LEGS!!") + to_chat(src, span_warning("Too many legs. TOO MANY LEGS!!")) return FALSE if(M.loc != src.loc) if(M.Adjacent(src)) @@ -1610,12 +1610,12 @@ if(!can_buckle || !istype(M) || !M.Adjacent(src) || M.buckled) return if(buckle_mob(M)) - visible_message("[M] starts riding [name]!") + visible_message(span_notice("[M] starts riding [name]!")) /mob/living/silicon/robot/onTransitZ(old_z, new_z) if(shell) if(deployed && using_map.ai_shell_restricted && !(new_z in using_map.ai_shell_allowed_levels)) - to_chat(src, "Your connection with the shell is suddenly interrupted!") + to_chat(src, span_warning("Your connection with the shell is suddenly interrupted!")) undeploy() ..() diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm index 89d4a69c70..907148e453 100644 --- a/code/modules/mob/living/silicon/robot/robot_damage.dm +++ b/code/modules/mob/living/silicon/robot/robot_damage.dm @@ -77,11 +77,11 @@ var/cost = (absorb_brute+absorb_burn) * 25 if(!use_direct_power(cost, 200)) - to_chat(src, "[span_red("Your shield has overloaded!")]") + to_chat(src, span_filter_warning("[span_red("Your shield has overloaded!")]")) else brute -= absorb_brute burn -= absorb_burn - to_chat(src, "[span_red("Your shield absorbs some of the impact!")]") + to_chat(src, span_filter_combat("[span_red("Your shield absorbs some of the impact!")]")) if(!emp) var/datum/robot_component/armour/A = get_armour() @@ -122,11 +122,11 @@ var/cost = (absorb_brute+absorb_burn) * 25 if(!use_direct_power(cost, 200)) - to_chat(src, "[span_red("Your shield has overloaded!")]") + to_chat(src, span_filter_warning("[span_red("Your shield has overloaded!")]")) else brute -= absorb_brute burn -= absorb_burn - to_chat(src, "[span_red("Your shield absorbs some of the impact!")]") + to_chat(src, span_filter_combat("[span_red("Your shield absorbs some of the impact!")]")) var/datum/robot_component/armour/A = get_armour() if(A) diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index c602ec1723..9dbccb03b9 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -25,7 +25,7 @@ if(loaded_item) var/confirm = tgui_alert(user, "This will destroy the item inside forever. Are you sure?","Confirm Analyze",list("Yes","No")) if(confirm == "Yes" && !QDELETED(loaded_item)) //This is pretty copypasta-y - to_chat(user, "You activate the analyzer's microlaser, analyzing \the [loaded_item] and breaking it down.") + to_chat(user, span_filter_notice("You activate the analyzer's microlaser, analyzing \the [loaded_item] and breaking it down.")) flick("portable_analyzer_scan", src) playsound(src, 'sound/items/Welder2.ogg', 50, 1) var/research_levels = list() @@ -33,7 +33,7 @@ files.UpdateTech(T, loaded_item.origin_tech[T]) research_levels += "\The [loaded_item] had level [loaded_item.origin_tech[T]] in [CallTechName(T)]." if (length(research_levels)) - to_chat(user, "[jointext(research_levels,"
    ")]    ") + to_chat(user, span_filter_notice("[jointext(research_levels,"
    ")]")) loaded_item = null for(var/obj/I in contents) for(var/mob/M in I.contents) @@ -54,7 +54,7 @@ else return else - to_chat(user, "The [src] is empty. Put something inside it first.") + to_chat(user, span_filter_notice("The [src] is empty. Put something inside it first.")) if(response == "Sync") var/success = 0 for(var/obj/machinery/r_n_d/server/S in machines) @@ -65,10 +65,10 @@ success = 1 files.RefreshResearch() if(success) - to_chat(user, "You connect to the research server, push your data upstream to it, then pull the resulting merged data from the master branch.") + to_chat(user, span_filter_notice("You connect to the research server, push your data upstream to it, then pull the resulting merged data from the master branch.")) playsound(src, 'sound/machines/twobeep.ogg', 50, 1) else - to_chat(user, "Reserch server ping response timed out. Unable to connect. Please contact the system administrator.") + to_chat(user, span_filter_notice("Reserch server ping response timed out. Unable to connect. Please contact the system administrator.")) playsound(src, 'sound/machines/buzz-two.ogg', 50, 1) if(response == "Eject") if(loaded_item) @@ -77,7 +77,7 @@ icon_state = initial(icon_state) loaded_item = null else - to_chat(user, "The [src] is already empty.") + to_chat(user, span_filter_notice("The [src] is already empty.")) /obj/item/portable_destructive_analyzer/afterattack(var/atom/target, var/mob/living/user, proximity) @@ -89,13 +89,13 @@ return if(istype(target,/obj/item)) if(loaded_item) - to_chat(user, "Your [src] already has something inside. Analyze or eject it first.") + to_chat(user, span_filter_notice("Your [src] already has something inside. Analyze or eject it first.")) return var/obj/item/I = target I.loc = src loaded_item = I for(var/mob/M in viewers()) - M.show_message("[user] adds the [I] to the [src].", 1) + M.show_message(span_notice("[user] adds the [I] to the [src]."), 1) desc = initial(desc) + "
    It is holding \the [loaded_item]." flick("portable_analyzer_load", src) icon_state = "portable_analyzer_full" @@ -115,13 +115,13 @@ var/obj/item/I = target if(do_after(src, 5 SECONDS * I.w_class)) for(var/mob/M in viewers()) - M.show_message(text("[user] sweeps \the [src] over \the [I]."), 1) + M.show_message(span_notice("[user] sweeps \the [src] over \the [I]."), 1) flick("[initial(icon_state)]-scan", src) if(I.origin_tech && I.origin_tech.len) for(var/T in I.origin_tech) - to_chat(user, "\The [I] had level [I.origin_tech[T]] in [CallTechName(T)].") + to_chat(user, span_notice("\The [I] had level [I.origin_tech[T]] in [CallTechName(T)].")) else - to_chat(user, "\The [I] cannot be scanned by \the [src].") + to_chat(user, span_notice("\The [I] cannot be scanned by \the [src].")) //This is used to unlock other borg covers. /obj/item/card/robot //This is not a child of id cards, as to avoid dumb typechecks on computers. @@ -174,7 +174,7 @@ else if(T.dead) //It's probably dead otherwise. T.remove_dead(user) else - to_chat(user, "Harvesting \a [target] is not the purpose of this tool. [src] is for plants being grown.") + to_chat(user, span_filter_notice("Harvesting \a [target] is not the purpose of this tool. [src] is for plants being grown.")) // A special tray for the service droid. Allow droid to pick up and drop items as if they were using the tray normally // Click on table to unload, click on item to load. Otherwise works identically to a tray. @@ -217,7 +217,7 @@ add_overlay(image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = 30 + I.layer)) addedSomething = 1 if ( addedSomething ) - user.visible_message("[user] loads some items onto their service tray.") + user.visible_message(span_notice("[user] loads some items onto their service tray.")) return @@ -257,9 +257,9 @@ sleep(rand(2,4)) if ( droppedSomething ) if ( foundtable ) - user.visible_message("[user] unloads their service tray.") + user.visible_message(span_notice("[user] unloads their service tray.")) else - user.visible_message("[user] drops all the items on their tray.") + user.visible_message(span_notice("[user] drops all the items on their tray.")) return ..() @@ -293,7 +293,7 @@ mode = 2 else mode = 1 - to_chat(user, "Changed printing mode to '[mode == 2 ? "Rename Paper" : "Write Paper"]'") + to_chat(user, span_filter_notice("Changed printing mode to '[mode == 2 ? "Rename Paper" : "Write Paper"]'")) return @@ -349,17 +349,17 @@ flick("doc_printer_mod_ejecting", src) spawn(22) var/turf/T = get_turf(src) - T.visible_message("\The [src.loc] dispenses a sheet of crisp white paper.") + T.visible_message(span_notice("\The [src.loc] dispenses a sheet of crisp white paper.")) new /obj/item/paper(T) if ("Form") var/list/content = print_form() if(!content) - to_chat(usr, "No form for this category found in central network. Central is advising employees to upload new forms whenever possible.") + to_chat(usr, span_warning("No form for this category found in central network. Central is advising employees to upload new forms whenever possible.")) return flick("doc_printer_mod_printing", src) spawn(22) var/turf/T = get_turf(src) - T.visible_message("\The [src.loc] dispenses an official form to fill.") + T.visible_message(span_notice("\The [src.loc] dispenses an official form to fill.")) new /obj/item/paper(T, content[1], content[2]) /obj/item/form_printer/proc/print_form() @@ -628,7 +628,7 @@ overload_time = 0 var/mob/living/user = src.loc - user.visible_message("[user]'s shield reactivates!", "Your shield reactivates!") + user.visible_message(span_danger("[user]'s shield reactivates!"), span_danger("Your shield reactivates!")) user.update_icon() /obj/item/borg/combat/shield/proc/adjust_flash_count(var/mob/living/user, amount) @@ -642,7 +642,7 @@ /obj/item/borg/combat/shield/proc/overload(var/mob/living/user) active = 0 - user.visible_message("[user]'s shield destabilizes!", "Your shield destabilizes!") + user.visible_message(span_danger("[user]'s shield destabilizes!"), span_danger("Your shield destabilizes!")) user.update_icon() overload_time = world.time @@ -688,14 +688,14 @@ /obj/item/inflatable_dispenser/attack_self() mode = !mode - to_chat(usr, "You set \the [src] to deploy [mode ? "doors" : "walls"].") + to_chat(usr, span_filter_notice("You set \the [src] to deploy [mode ? "doors" : "walls"].")) /obj/item/inflatable_dispenser/afterattack(var/atom/A, var/mob/user) ..(A, user) if(!user) return if(!user.Adjacent(A)) - to_chat(user, "You can't reach!") + to_chat(user, span_filter_notice("You can't reach!")) return if(istype(A, /turf)) try_deploy_inflatable(A, user) @@ -705,7 +705,7 @@ /obj/item/inflatable_dispenser/proc/try_deploy_inflatable(var/turf/T, var/mob/living/user) if(mode) // Door deployment if(!stored_doors) - to_chat(user, "\The [src] is out of doors!") + to_chat(user, span_filter_notice("\The [src] is out of doors!")) return if(T && istype(T)) @@ -714,7 +714,7 @@ else // Wall deployment if(!stored_walls) - to_chat(user, "\The [src] is out of walls!") + to_chat(user, span_filter_notice("\The [src] is out of walls!")) return if(T && istype(T)) @@ -722,40 +722,40 @@ stored_walls-- playsound(T, 'sound/items/zip.ogg', 75, 1) - to_chat(user, "You deploy the inflatable [mode ? "door" : "wall"]!") + to_chat(user, span_filter_notice("You deploy the inflatable [mode ? "door" : "wall"]!")) /obj/item/inflatable_dispenser/proc/pick_up(var/obj/A, var/mob/living/user) if(istype(A, /obj/structure/inflatable)) if(!istype(A, /obj/structure/inflatable/door)) if(stored_walls >= max_walls) - to_chat(user, "\The [src] is full.") + to_chat(user, span_filter_notice("\The [src] is full.")) return stored_walls++ qdel(A) else if(stored_doors >= max_doors) - to_chat(user, "\The [src] is full.") + to_chat(user, span_filter_notice("\The [src] is full.")) return stored_doors++ qdel(A) playsound(src, 'sound/machines/hiss.ogg', 75, 1) - visible_message("\The [user] deflates \the [A] with \the [src]!") + visible_message(span_filter_notice("\The [user] deflates \the [A] with \the [src]!")) return if(istype(A, /obj/item/inflatable)) if(!istype(A, /obj/item/inflatable/door)) if(stored_walls >= max_walls) - to_chat(user, "\The [src] is full.") + to_chat(user, span_filter_notice("\The [src] is full.")) return stored_walls++ qdel(A) else if(stored_doors >= max_doors) - to_chat(usr, "\The [src] is full!") + to_chat(usr, span_filter_notice("\The [src] is full!")) return stored_doors++ qdel(A) - visible_message("\The [user] picks up \the [A] with \the [src]!") + visible_message(span_filter_notice("\The [user] picks up \the [A] with \the [src]!")) return - to_chat(user, "You fail to pick up \the [A] with \the [src].") + to_chat(user, span_filter_notice("You fail to pick up \the [A] with \the [src].")) return diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm index 6c0c7bdd4e..d37a1a5947 100644 --- a/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -96,4 +96,4 @@ cleaned_human.shoes.clean_blood() cleaned_human.update_inv_shoes(0) cleaned_human.clean_blood(1) - to_chat(cleaned_human, "[src] cleans your face!") + to_chat(cleaned_human, span_warning("[src] cleans your face!")) diff --git a/code/modules/mob/living/silicon/robot/sprites/civilian.dm b/code/modules/mob/living/silicon/robot/sprites/civilian.dm index e390e389fc..ad912f5180 100644 --- a/code/modules/mob/living/silicon/robot/sprites/civilian.dm +++ b/code/modules/mob/living/silicon/robot/sprites/civilian.dm @@ -241,7 +241,7 @@ ourborg.sprite_extra_customization += "boozehound" ourborg.sprite_extra_customization["boozehound"] = choice playsound(ourborg.loc, 'sound/effects/bubbles.ogg', 100, 0, 4) - to_chat(ourborg, "Your tank now displays [choice]. Drink up and enjoy!") + to_chat(ourborg, span_filter_notice("Your tank now displays [choice]. Drink up and enjoy!")) ourborg.update_icon() return 1 diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index b4e31f7622..c7eafa0775 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -2,7 +2,7 @@ ..() if(message_mode) if(!is_component_functioning("radio")) - to_chat(src, "Your radio isn't functional at this time.") + to_chat(src, span_warning("Your radio isn't functional at this time.")) return 0 if(message_mode == "general") message_mode = null @@ -17,7 +17,7 @@ return holopad_talk(message, verb, speaking) else if(message_mode) if (aiRadio.disabledAi || aiRestorePowerRoutine || stat) - to_chat(src, "System Error - Transceiver Disabled.") + to_chat(src, span_danger("System Error - Transceiver Disabled.")) return 0 if(message_mode == "general") message_mode = null @@ -73,9 +73,9 @@ /*Radios "filter out" this conversation channel so we don't need to account for them. This is another way of saying that we won't bother dealing with them.*/ var/list/combined = combine_message(message_pieces, verb, src) - to_chat(src, "Holopad transmitted, [real_name] [combined["formatted"]]") + to_chat(src, span_game(span_say("Holopad transmitted, [span_name(real_name)] [combined["formatted"]]"))) else - to_chat(src, "No holopad connected.") + to_chat(src, span_filter_notice("No holopad connected.")) return 0 return 1 @@ -87,8 +87,8 @@ var/obj/machinery/hologram/holopad/T = src.holo if(T && T.masters[src]) - var/rendered = "[name] [message]" - to_chat(src, "Holopad action relayed, [real_name] [message]") + var/rendered = span_game(span_say(span_name(name) + " " + span_message(message))) + to_chat(src, span_game(span_say("Holopad action relayed, [span_name(real_name)] [span_message(message)]"))) var/obj/effect/overlay/aiholo/hologram = T.masters[src] //VOREStation Add for people in the hologram to hear the messages //var/obj/effect/overlay/hologram = T.masters[src] //VOREStation edit. Done above. @@ -111,7 +111,7 @@ log_emote("(HPAD) [message]", src) else //This shouldn't occur, but better safe then sorry. - to_chat(src, "No holopad connected.") + to_chat(src, span_filter_notice("No holopad connected.")) return 0 return 1 diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 3b4df63fa3..9f8822febe 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -74,8 +74,8 @@ src.take_organ_damage(0,5,emp=1) Confuse(2) flash_eyes(affect_silicon = 1) - to_chat(src, "*BZZZT*") - to_chat(src, "Warning: Electromagnetic pulse detected.") + to_chat(src, span_danger("*BZZZT*")) + to_chat(src, span_danger("Warning: Electromagnetic pulse detected.")) ..() /mob/living/silicon/stun_effect_act(var/stun_amount, var/agony_amount) @@ -89,9 +89,9 @@ shock_damage *= siemens_coeff //take reduced damage take_overall_damage(0, shock_damage) - visible_message("[src] was shocked by \the [source]!", \ - "Energy pulse detected, system damaged!", \ - "You hear an electrical crack.") + visible_message(span_warning("[src] was shocked by \the [source]!"), \ + span_danger("Energy pulse detected, system damaged!"), \ + span_warning("You hear an electrical crack.")) if(prob(20)) Stun(2) return @@ -160,7 +160,7 @@ /mob/living/silicon/proc/show_station_manifest() var/dat = "
    " if(!data_core) - to_chat(src, "There is no data to form a manifest with. Contact your Nanotrasen administrator.") + to_chat(src, span_notice("There is no data to form a manifest with. Contact your Nanotrasen administrator.")) return dat += data_core.get_manifest(1) //The 1 makes it monochrome. @@ -172,7 +172,7 @@ //can't inject synths /mob/living/silicon/can_inject(var/mob/user, var/error_msg, var/target_zone, var/ignore_thickness = FALSE) if(error_msg) - to_chat(user, "The armoured plating is too tough.") + to_chat(user, span_alert("The armoured plating is too tough.")) return 0 @@ -336,7 +336,7 @@ alarm_raised = 1 if(!reported) reported = 1 - to_chat(src, "--- [AH.category] Detected ---") + to_chat(src, span_warning("--- [AH.category] Detected ---")) raised_alarm(A) for(var/datum/alarm_handler/AH in queued_alarms) @@ -346,24 +346,24 @@ if(alarms[A] == -1) if(!reported) reported = 1 - to_chat(src, "--- [AH.category] Cleared ---") + to_chat(src, span_notice("--- [AH.category] Cleared ---")) to_chat(src, "\The [A.alarm_name()].") if(alarm_raised) - to_chat(src, "\[Show Alerts\]") + to_chat(src, span_filter_notice("\[Show Alerts\]")) for(var/datum/alarm_handler/AH in queued_alarms) var/list/alarms = queued_alarms[AH] alarms.Cut() /mob/living/silicon/proc/raised_alarm(var/datum/alarm/A) - to_chat(src, "[A.alarm_name()]!") + to_chat(src, span_filter_warning("[A.alarm_name()]!")) /mob/living/silicon/ai/raised_alarm(var/datum/alarm/A) var/cameratext = "" for(var/obj/machinery/camera/C in A.cameras()) cameratext += "[(cameratext == "")? "" : "|"][C.c_tag]" - to_chat(src, "[A.alarm_name()]! ([(cameratext)? cameratext : "No Camera"])") + to_chat(src, span_filter_warning("[A.alarm_name()]! ([(cameratext)? cameratext : "No Camera"])")) /mob/living/silicon/proc/is_traitor() diff --git a/code/modules/mob/living/simple_mob/combat.dm b/code/modules/mob/living/simple_mob/combat.dm index 970be8e584..065878284d 100644 --- a/code/modules/mob/living/simple_mob/combat.dm +++ b/code/modules/mob/living/simple_mob/combat.dm @@ -113,7 +113,7 @@ try_reload() return FALSE - visible_message("\The [src] fires at \the [A]!") + visible_message(span_danger("\The [src] fires at \the [A]!")) shoot(A) if(casingtype) new casingtype(loc) diff --git a/code/modules/mob/living/simple_mob/defense.dm b/code/modules/mob/living/simple_mob/defense.dm index 2f68d970c2..1d59a5d9c2 100644 --- a/code/modules/mob/living/simple_mob/defense.dm +++ b/code/modules/mob/living/simple_mob/defense.dm @@ -16,10 +16,10 @@ switch(L.a_intent) if(I_HELP) if(health > 0) - L.visible_message("\The [L] [response_help] \the [src].") + L.visible_message(span_notice("\The [L] [response_help] \the [src].")) if(I_DISARM) - L.visible_message("\The [L] [response_disarm] \the [src].") + L.visible_message(span_notice("\The [L] [response_disarm] \the [src].")) L.do_attack_animation(src) //TODO: Push the mob away or something @@ -29,7 +29,7 @@ if (!(status_flags & CANPUSH)) return if(!incapacitated(INCAPACITATION_ALL) && prob(grab_resist)) - L.visible_message("\The [L] tries to grab \the [src] but fails!") + L.visible_message(span_warning("\The [L] tries to grab \the [src] but fails!")) return var/obj/item/grab/G = new /obj/item/grab(L, src) @@ -40,7 +40,7 @@ G.affecting = src LAssailant = L - L.visible_message("\The [L] has grabbed [src] passively!") + L.visible_message(span_warning("\The [L] has grabbed [src] passively!")) L.do_attack_animation(src) if(I_HURT) @@ -53,15 +53,15 @@ var/hit_dam_type = attack.damage_type //Let's get the type of damage. Brute? Burn? Defined by the unarmed_attack. real_damage += attack.get_unarmed_damage(attacker) //Add the damage that their special attack has. Some have 0. Some have 15. if(real_damage <= damage_threshold) - L.visible_message("\The [L] uselessly hits \the [src]!") + L.visible_message(span_warning("\The [L] uselessly hits \the [src]!")) L.do_attack_animation(src) return apply_damage(damage = real_damage, damagetype = hit_dam_type, def_zone = null, blocked = armor, blocked = resistance, used_weapon = null, sharp = FALSE, edge = FALSE) - L.visible_message("\The [L] [pick(attack.attack_verb)] \the [src]!") + L.visible_message(span_warning("\The [L] [pick(attack.attack_verb)] \the [src]!")) L.do_attack_animation(src) return //VOREStation EDIT END apply_damage(damage = harm_intent_damage, damagetype = BRUTE, def_zone = null, blocked = armor, blocked = resistance, used_weapon = null, sharp = FALSE, edge = FALSE) //VOREStation EDIT Somebody set this to burn instead of brute. - L.visible_message("\The [L] [response_harm] \the [src]!") + L.visible_message(span_warning("\The [L] [response_harm] \the [src]!")) L.do_attack_animation(src) return @@ -79,7 +79,7 @@ visible_message("\The [user] applies the [MED] on [src].") else var/datum/gender/T = gender_datums[src.get_visible_gender()] - to_chat(user, "\The [src] is dead, medical items won't bring [T.him] back to life.") // the gender lookup is somewhat overkill, but it functions identically to the obsolete gender macros and future-proofs this code + to_chat(user, span_notice("\The [src] is dead, medical items won't bring [T.him] back to life.")) // the gender lookup is somewhat overkill, but it functions identically to the obsolete gender macros and future-proofs this code if(can_butcher(user, O)) //if the animal can be butchered, do so and return. It's likely to be gibbed. harvest(user, O) return @@ -89,13 +89,13 @@ livestock_harvest(O, user) return else - to_chat(user, "\The [src] can't be [harvest_verb] so soon.") + to_chat(user, span_notice("\The [src] can't be [harvest_verb] so soon.")) return if(can_tame(O, user)) - to_chat(user, "You offer \the [src] \the [O].") + to_chat(user, span_notice("You offer \the [src] \the [O].")) if(tame_prob(O, user)) - to_chat(user, "\The [src] appears to accept \the [O], seemingly calmed.") + to_chat(user, span_notice("\The [src] appears to accept \the [O], seemingly calmed.")) do_tame(O,user) else fail_tame(O, user) @@ -115,7 +115,7 @@ effective_force *= 2 purge = 3 if(O.force <= resistance) - to_chat(user,"This weapon is ineffective, it does no damage.") + to_chat(user,span_danger("This weapon is ineffective, it does no damage.")) return 2 //??? . = ..() diff --git a/code/modules/mob/living/simple_mob/hands.dm b/code/modules/mob/living/simple_mob/hands.dm index 74c35abcd4..29d41e2c26 100644 --- a/code/modules/mob/living/simple_mob/hands.dm +++ b/code/modules/mob/living/simple_mob/hands.dm @@ -132,7 +132,7 @@ display_name = tool else display_name = "object" - to_chat(src, "Your [hand_form] are not fit for use of \the [display_name].") + to_chat(src, span_danger("Your [hand_form] are not fit for use of \the [display_name].")) return humanoid_hands /mob/living/simple_mob/is_holding_item_of_type(typepath) diff --git a/code/modules/mob/living/simple_mob/harvesting.dm b/code/modules/mob/living/simple_mob/harvesting.dm index e9439fab99..a1b3e5ef0d 100644 --- a/code/modules/mob/living/simple_mob/harvesting.dm +++ b/code/modules/mob/living/simple_mob/harvesting.dm @@ -18,12 +18,12 @@ /mob/living/simple_mob/examine(mob/user) . = ..() if(stat != DEAD && user && harvest_tool && (get_dist(user, src) <= 3)) - . += "\The [src] can be [harvest_verb] with a [initial(harvest_tool.name)] every [round(harvest_cooldown, 0.1)] minutes." + . += span_notice("\The [src] can be [harvest_verb] with a [initial(harvest_tool.name)] every [round(harvest_cooldown, 0.1)] minutes.") var/time_to_harvest = (harvest_recent + harvest_cooldown) - world.time if(time_to_harvest > 0) - . += "It can be [harvest_verb] in [time_to_harvest / (1 MINUTE)] second(s)." + . += span_notice("It can be [harvest_verb] in [time_to_harvest / (1 MINUTE)] second(s).") else - . += "It can be [harvest_verb] now." + . += span_notice("It can be [harvest_verb] now.") /mob/living/simple_mob/proc/livestock_harvest(var/obj/item/tool, var/mob/living/user) if(!LAZYLEN(harvest_results)) // Might be a unique interaction of an object using the proc to do something weird, or just someone's a donk. diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index e86c8e28e2..de5a3be503 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -308,7 +308,7 @@ /datum/riding/simple_mob/force_dismount(mob/M) . =..() - ridden.visible_message("[M] stops riding [ridden]!") + ridden.visible_message(span_notice("[M] stops riding [ridden]!")) /datum/riding/simple_mob/get_offsets(pass_index) // list(dir = x, y, layer) var/mob/living/simple_mob/L = ridden @@ -335,7 +335,7 @@ if(M in buckled_mobs) return FALSE if(M.size_multiplier > size_multiplier * 1.2) - to_chat(src,"This isn't a pony show! You need to be bigger for them to ride.") + to_chat(src,span_warning("This isn't a pony show! You need to be bigger for them to ride.")) return FALSE var/mob/living/carbon/human/H = M @@ -375,7 +375,7 @@ if(!can_buckle || !istype(M) || !M.Adjacent(src) || M.buckled) return if(buckle_mob(M)) - visible_message("[M] starts riding [name]!") + visible_message(span_notice("[M] starts riding [name]!")) /mob/living/simple_mob/handle_message_mode(message_mode, message, verb, used_radios, speaking, alt_name) if(mob_radio) @@ -431,7 +431,7 @@ status_flags |= LEAPING pixel_y = pixel_y + 10 - src.visible_message("\The [src] leaps at [T]!") + src.visible_message(span_danger("\The [src] leaps at [T]!")) src.throw_at(get_step(get_turf(T),get_turf(src)), 4, 1, src) playsound(src, 'sound/effects/bodyfall1.ogg', 50, 1) pixel_y = default_pixel_y @@ -441,7 +441,7 @@ if(status_flags & LEAPING) status_flags &= ~LEAPING if(!src.Adjacent(T)) - to_chat(src, "You miss!") + to_chat(src, span_warning("You miss!")) return if(ishuman(T)) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm index a57b7aef69..164257a4c7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -153,13 +153,13 @@ else if(!istype(O, /obj/item/reagent_containers/food/snacks)) return ..() if(resting) - to_chat(user, "\The [src] is napping, and doesn't respond to \the [O].") + to_chat(user, span_notice("\The [src] is napping, and doesn't respond to \the [O].")) return if(nutrition >= max_nutrition) if(user == src) - to_chat(src, "You're too full to eat another bite.") + to_chat(src, span_notice("You're too full to eat another bite.")) return - to_chat(user, "\The [src] seems too full to eat.") + to_chat(user, span_notice("\The [src] seems too full to eat.")) return var/nutriment_amount = O.reagents?.get_reagent_amount("nutriment") //does it have nutriment, if so how much? var/protein_amount = O.reagents?.get_reagent_amount("protein") //does it have protein, if so how much? @@ -172,11 +172,11 @@ if(O.bitecount >= 3) user.drop_from_inventory(O) qdel(O) - visible_message("\The [src] eats \the [O].") + visible_message(span_notice("\The [src] eats \the [O].")) else - to_chat(user, "\The [src] takes a bite of \the [O].") + to_chat(user, span_notice("\The [src] takes a bite of \the [O].")) if(user != src) - to_chat(src, "\The [user] feeds \the [O] to you.") + to_chat(src, span_notice("\The [user] feeds \the [O] to you.")) playsound(src, 'sound/items/eatfood.ogg', 75, 1) /mob/living/simple_mob/vore/alienanimals/catslug/attack_hand(mob/living/carbon/human/M as mob) @@ -190,41 +190,41 @@ return ..() playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(resting) - M.visible_message("\The [M.name] shakes \the [src] awake from their nap.","You shake \the [src] awake!") + M.visible_message(span_notice("\The [M.name] shakes \the [src] awake from their nap."),span_notice("You shake \the [src] awake!")) lay_down() ai_holder.go_wake() return if(M.zone_sel.selecting == BP_HEAD) M.visible_message( \ - "[M] pats \the [src] on the head.", \ - "You pat \the [src] on the head.", ) + span_notice("[M] pats \the [src] on the head."), \ + span_notice("You pat \the [src] on the head."), ) if(client) return if(prob(10)) - visible_message("\The [src] purrs and leans into [M]'s hand.") + visible_message(span_notice("\The [src] purrs and leans into [M]'s hand.")) else if(M.zone_sel.selecting == BP_R_HAND || M.zone_sel.selecting == BP_L_HAND) M.visible_message( \ - "[M] shakes \the [src]'s hand.", \ - "You shake \the [src]'s hand.", ) + span_notice("[M] shakes \the [src]'s hand."), \ + span_notice("You shake \the [src]'s hand."), ) if(client) return if(prob(10)) - visible_message("\The [src]'s looks a little confused nibbles at [M]'s hand experimentally.") + visible_message(span_notice("\The [src]'s looks a little confused nibbles at [M]'s hand experimentally.")) else if(M.zone_sel.selecting == "mouth") M.visible_message( \ - "[M] boops \the [src]'s nose.", \ - "You boop \the [src] on the nose.", ) + span_notice("[M] boops \the [src]'s nose."), \ + span_notice("You boop \the [src] on the nose."), ) if(client) return if(prob(10)) - visible_message("\The [src]'s eyes widen as they stare at [M]. After a moment they rub their prodded snoot.") + visible_message(span_notice("\The [src]'s eyes widen as they stare at [M]. After a moment they rub their prodded snoot.")) else if(M.zone_sel.selecting == BP_GROIN) M.visible_message( \ - "[M] rubs \the [src]'s tummy...", \ - "You rub \the [src]'s tummy... You feel the danger.", ) + span_notice("[M] rubs \the [src]'s tummy..."), \ + span_notice("You rub \the [src]'s tummy... You feel the danger."), ) if(client) return - visible_message("\The [src] pushes [M]'s hand away from their tummy and furrows their brow!") + visible_message(span_notice("\The [src] pushes [M]'s hand away from their tummy and furrows their brow!")) if(prob(5)) ai_holder.give_target(M, urgent = TRUE) else @@ -261,11 +261,11 @@ /mob/living/simple_mob/vore/alienanimals/catslug/proc/remove_hat(var/mob/living/user) if(!hat) - to_chat(user, "\The [src] doesn't have a hat to remove.") + to_chat(user, span_warning("\The [src] doesn't have a hat to remove.")) else hat.forceMove(get_turf(src)) user.put_in_hands(hat) - to_chat(user, "You take away \the [src]'s [hat.name]. How mean.") + to_chat(user, span_warning("You take away \the [src]'s [hat.name]. How mean.")) hat = null update_icon() @@ -287,7 +287,7 @@ set category = "Abilities" set desc = "You can set your color!" if(picked_color) - to_chat(src, "You have already picked a color! If you picked the wrong color, ask an admin to change your picked_color variable to 0.") + to_chat(src, span_notice("You have already picked a color! If you picked the wrong color, ask an admin to change your picked_color variable to 0.")) return var/newcolor = input(usr, "Choose a color.", "", color) as color|null if(newcolor) @@ -417,41 +417,41 @@ return ..() playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(resting) - M.visible_message("\The [M.name] shakes \the [src] awake from their nap.","You shake \the [src] awake!") + M.visible_message(span_notice("\The [M.name] shakes \the [src] awake from their nap."),span_notice("You shake \the [src] awake!")) lay_down() ai_holder.go_wake() return if(M.zone_sel.selecting == BP_HEAD) M.visible_message( \ - "[M] pats \the [src] on their helmet.", \ - "You pat \the [src] on their helmet.", ) + span_notice("[M] pats \the [src] on their helmet."), \ + span_notice("You pat \the [src] on their helmet."), ) if(client) return if(prob(10)) - visible_message("\The [src] purrs and leans into [M]'s hand.") + visible_message(span_notice("\The [src] purrs and leans into [M]'s hand.")) else if(M.zone_sel.selecting == BP_R_HAND || M.zone_sel.selecting == BP_L_HAND) M.visible_message( \ - "[M] shakes \the [src]'s hand.", \ - "You shake \the [src]'s hand.", ) + span_notice("[M] shakes \the [src]'s hand."), \ + span_notice("You shake \the [src]'s hand."), ) if(client) return if(prob(10)) - visible_message("\The [src]'s looks a little confused and bonks their helmet's faceplate against [M]'s hand experimentally, attempting to nibble at it.") + visible_message(span_notice("\The [src]'s looks a little confused and bonks their helmet's faceplate against [M]'s hand experimentally, attempting to nibble at it.")) else if(M.zone_sel.selecting == "mouth") M.visible_message( \ - "[M] attempts to boop \the [src]'s nose, defeated only by the helmet they wear.", \ - "You attempt to boop \the [src] on the nose, stopped only by that helmet they wear.", ) + span_notice("[M] attempts to boop \the [src]'s nose, defeated only by the helmet they wear."), \ + span_notice("You attempt to boop \the [src] on the nose, stopped only by that helmet they wear."), ) if(client) return if(prob(10)) - visible_message("\The [src]'s eyes widen as they stare at [M]. After a moment they rub at the faint mark [M]'s digit left upon the surface of their helmet's faceplate.") + visible_message(span_notice("\The [src]'s eyes widen as they stare at [M]. After a moment they rub at the faint mark [M]'s digit left upon the surface of their helmet's faceplate.")) else if(M.zone_sel.selecting == BP_GROIN) M.visible_message( \ - "[M] rubs \the [src]'s tummy...", \ - "You rub \the [src]'s tummy, accidently pressing a few of the buttons on their chestpiece in the process... You feel the danger.", ) + span_notice("[M] rubs \the [src]'s tummy..."), \ + span_notice("You rub \the [src]'s tummy, accidently pressing a few of the buttons on their chestpiece in the process... You feel the danger."), ) if(client) return - visible_message("\The [src] pushes [M]'s hand away from their tummy and furrows their brow, frantically pressing at the buttons [M] so carelessly pushed!") + visible_message(span_notice("\The [src] pushes [M]'s hand away from their tummy and furrows their brow, frantically pressing at the buttons [M] so carelessly pushed!")) if(prob(5)) ai_holder.give_target(M, urgent = TRUE) else @@ -517,41 +517,41 @@ return ..() playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(resting) - M.visible_message("\The [M.name] shakes \the [src] awake from their nap.","You shake \the [src] awake!") + M.visible_message(span_notice("\The [M.name] shakes \the [src] awake from their nap."),span_notice("You shake \the [src] awake!")) lay_down() ai_holder.go_wake() return if(M.zone_sel.selecting == BP_HEAD) M.visible_message( \ - "[M] pats \the [src] on their helmet.", \ - "You pat \the [src] on their helmet.", ) + span_notice("[M] pats \the [src] on their helmet."), \ + span_notice("You pat \the [src] on their helmet."), ) if(client) return if(prob(10)) - visible_message("\The [src] purrs and leans into [M]'s hand.") + visible_message(span_notice("\The [src] purrs and leans into [M]'s hand.")) else if(M.zone_sel.selecting == BP_R_HAND || M.zone_sel.selecting == BP_L_HAND) M.visible_message( \ - "[M] shakes \the [src]'s hand.", \ - "You shake \the [src]'s hand.", ) + span_notice("[M] shakes \the [src]'s hand."), \ + span_notice("You shake \the [src]'s hand."), ) if(client) return if(prob(10)) - visible_message("\The [src]'s looks a little confused and bonks their helmet's faceplate against [M]'s hand experimentally, attempting to nibble at it.") + visible_message(span_notice("\The [src]'s looks a little confused and bonks their helmet's faceplate against [M]'s hand experimentally, attempting to nibble at it.")) else if(M.zone_sel.selecting == "mouth") M.visible_message( \ - "[M] attempts to boop \the [src]'s nose, defeated only by the helmet they wear.", \ - "You attempt to boop \the [src] on the nose, stopped only by that helmet they wear.", ) + span_notice("[M] attempts to boop \the [src]'s nose, defeated only by the helmet they wear."), \ + span_notice("You attempt to boop \the [src] on the nose, stopped only by that helmet they wear."), ) if(client) return if(prob(10)) - visible_message("\The [src]'s eyes widen as they stare at [M]. After a moment they rub at the faint mark [M]'s digit left upon the surface of their helmet's faceplate.") + visible_message(span_notice("\The [src]'s eyes widen as they stare at [M]. After a moment they rub at the faint mark [M]'s digit left upon the surface of their helmet's faceplate.")) else if(M.zone_sel.selecting == BP_GROIN) M.visible_message( \ - "[M] rubs \the [src]'s tummy...", \ - "You rub \the [src]'s tummy... You feel the danger.", ) + span_notice("[M] rubs \the [src]'s tummy..."), \ + span_notice("You rub \the [src]'s tummy... You feel the danger."), ) if(client) return - visible_message("\The [src] pushes [M]'s hand away from their tummy and furrows their brow!") + visible_message(span_notice("\The [src] pushes [M]'s hand away from their tummy and furrows their brow!")) if(prob(5)) ai_holder.give_target(M, urgent = TRUE) else @@ -1095,7 +1095,7 @@ /mob/living/simple_mob/vore/alienanimals/catslug/suslug/can_ventcrawl() if(!is_impostor) - to_chat(src, "You are not an impostor! You can't vent!") + to_chat(src, span_notice("You are not an impostor! You can't vent!")) return FALSE .=..() @@ -1106,19 +1106,19 @@ var/mob/living/simple_mob/vore/alienanimals/catslug/suslug/us = user if(us.is_impostor) if(src.is_impostor) - . += "They appear to be a fellow impostor!" + . += span_notice("They appear to be a fellow impostor!") else - . += "They appear to be a filthy innocent!" + . += span_notice("They appear to be a filthy innocent!") /mob/living/simple_mob/vore/alienanimals/catslug/suslug/proc/assussinate() set name = "Kill Innocent" set category = "Abilities" set desc = "Kill an innocent suslug!" if(!is_impostor) - to_chat(src, "You are not an impostor! You can't kill like that!") + to_chat(src, span_notice("You are not an impostor! You can't kill like that!")) return if((world.time - kill_cooldown) < 1 MINUTE) - to_chat(src, "You cannot kill so soon after previous kill!") + to_chat(src, span_notice("You cannot kill so soon after previous kill!")) return var/mob/living/simple_mob/vore/alienanimals/catslug/suslug/target @@ -1127,7 +1127,7 @@ if(!S.is_impostor) victims += S if(!victims || !victims.len) - to_chat(src, "There are no innocent suslugs nearby!") + to_chat(src, span_warning("There are no innocent suslugs nearby!")) return if(victims.len == 1) target = victims[1] @@ -1136,7 +1136,7 @@ if(target && istype(target)) target.adjustBruteLoss(3000) - visible_message("\The [src] kills \the [target]!") + visible_message(span_warning("\The [src] kills \the [target]!")) kill_cooldown = world.time /mob/living/simple_mob/vore/alienanimals/catslug/suslug/color diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm index 65bd18c973..fe6e37b360 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm @@ -122,10 +122,10 @@ if(child_om_marker.known == TRUE) if(restless) child_om_marker.icon_state = "space_whale_restless" - visible_message("\The [child_om_marker.name] ripples excitedly.") + visible_message(span_notice("\The [child_om_marker.name] ripples excitedly.")) else child_om_marker.icon_state = "space_whale" - visible_message("\The [child_om_marker.name] settles down.") + visible_message(span_notice("\The [child_om_marker.name] settles down.")) /datum/ai_holder/simple_mob/melee/spacewhale hostile = TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm index 6433c37e7c..05e52f6676 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm @@ -87,16 +87,16 @@ if(!possible_targets.len) return ..() - user.visible_message("\The [user] reaches for something in \the [src]'s fur...","You look through \the [src]'s fur...") + user.visible_message(span_warning("\The [user] reaches for something in \the [src]'s fur..."),span_notice("You look through \the [src]'s fur...")) var/mob/living/that_one = tgui_input_list(user, "Select a mob:", "Select a mob to grab!", possible_targets) if(!that_one) return ..() - to_chat(that_one, "\The [user]'s hand reaches toward you!!!") + to_chat(that_one, span_danger("\The [user]'s hand reaches toward you!!!")) if(!do_after(user, 3 SECONDS, src)) return ..() if(!istype(that_one.loc,/turf/simulated/floor/outdoors/fur)) - to_chat(user, "\The [that_one] got away...") - to_chat(that_one, "You got away!") + to_chat(user, span_warning("\The [that_one] got away...")) + to_chat(that_one, span_notice("You got away!")) return var/prev_size = that_one.size_multiplier that_one.resize(RESIZE_TINY, ignore_prefs = TRUE) @@ -148,7 +148,7 @@ movement_cooldown = 0 /mob/living/simple_mob/vore/overmap/stardog/perform_the_nom(mob/living/user, mob/living/prey, mob/living/pred, obj/belly/belly, delay) - to_chat(src, "You can't do that.") //The dog can move back and forth between the overmap. + to_chat(src, span_warning("You can't do that.")) //The dog can move back and forth between the overmap. return //If it can do normal vore mechanics, it can carry players to the OM, //and release them there. I think that's probably a bad idea. @@ -253,24 +253,24 @@ heal = TRUE delet = FALSE else - to_chat(src, "You can't eat \the [e].") + to_chat(src, span_warning("You can't eat \the [e].")) return if(!E) - to_chat(src, "There isn't anything to eat here.") + to_chat(src, span_warning("There isn't anything to eat here.")) return - to_chat(src, "You begin to eat \the [E]...") + to_chat(src, span_notice("You begin to eat \the [E]...")) if(!do_after(src, 20 SECONDS, E, exclusive = TRUE)) return - to_chat(src, "[msg]") + to_chat(src, span_notice("[msg]")) if(nut || aff) adjust_nutrition(nut) adjust_affinity(aff) if(mob) spawn_mob() - to_chat(src, "You can feel something moving inside of you...") + to_chat(src, span_notice("You can feel something moving inside of you...")) if(ore) spawn_ore(ore) if(tre) @@ -299,7 +299,7 @@ set desc = "Attempt to go to the location you have arrived at, or return to space!" set category = "Abilities" if(nutrition <= 500) - to_chat(src, "You're too hungry...") + to_chat(src, span_warning("You're too hungry...")) return if(istype(loc, /turf/unsimulated/map)) var/list/destinations = list() @@ -312,7 +312,7 @@ for(var/our_z in v.map_z) our_maps |= our_z if(!our_maps.len) - to_chat(src, "There is nowhere nearby to go to! You need to get closer to somewhere you can transition to before you can transition.") + to_chat(src, span_warning("There is nowhere nearby to go to! You need to get closer to somewhere you can transition to before you can transition.")) return for(var/obj/effect/landmark/l in landmarks_list) if(l.z in our_maps) @@ -320,30 +320,30 @@ destinations |= l if(!destinations.len) - to_chat(src, "There is nowhere nearby to land! You need to get closer to somewhere else that you can transition to before you can transition.") + to_chat(src, span_warning("There is nowhere nearby to land! You need to get closer to somewhere else that you can transition to before you can transition.")) return for(var/obj/effect/landmark/stardog/l in destinations) var/obj/effect/overmap/visitable/our_dest = tgui_input_list(src, "Where would you like to try to go?", "Transition", destinations, timeout = 15 SECONDS, strict_modern = TRUE) if(!our_dest) - to_chat(src, "You decide not to transition.") + to_chat(src, span_warning("You decide not to transition.")) return - to_chat(src, "You begin to transition down to \the [our_dest], stay still...") + to_chat(src, span_notice("You begin to transition down to \the [our_dest], stay still...")) if(!do_after(src, 15 SECONDS, exclusive = TRUE)) - to_chat(src, "You were interrupted.") + to_chat(src, span_warning("You were interrupted.")) return - visible_message("\The [src] disappears!!!") + visible_message(span_warning("\The [src] disappears!!!")) stop_pulling() forceMove(get_turf(our_dest)) adjust_nutrition(-1000) - visible_message("\The [src] steps into the area as if from nowhere!") + visible_message(span_warning("\The [src] steps into the area as if from nowhere!")) else - to_chat(src, "You begin to transition back to space, stay still...") + to_chat(src, span_notice("You begin to transition back to space, stay still...")) if(!do_after(src, 15 SECONDS, exclusive = TRUE)) - to_chat(src, "You were interrupted.") + to_chat(src, span_warning("You were interrupted.")) return - visible_message("\The [src] disappears!!!") + visible_message(span_warning("\The [src] disappears!!!")) stop_pulling() forceMove(get_turf(get_overmap_sector(z))) adjust_nutrition(-500) @@ -473,7 +473,7 @@ return var/mob/living/L = usr if(L.client.prefs.muted & MUTE_IC) - to_chat(L, "You cannot speak in IC (muted).") + to_chat(L, span_warning("You cannot speak in IC (muted).")) return if (!message) message = tgui_input_text(usr, "Type a message to emote.","Emote Beyond") @@ -489,11 +489,11 @@ var/mob/living/simple_mob/vore/overmap/stardog/m = s.parent log_subtle(message,L) - message = "[L] [message]" + message = span_emote_subtle("[L] [message]") message = "(From the back of \the [m]) " + message message = encode_html_emphasis(message) - var/undisplayed_message = "[L] does something too subtle for you to see." + var/undisplayed_message = span_emote("[L] does something too subtle for you to see.") var/list/vis = get_mobs_and_objs_in_view_fast(get_turf(m),1,2) var/list/vis_mobs = vis["mobs"] vis_mobs |= L @@ -605,13 +605,13 @@ var/obj/item/stack/material/fur/F = new product(get_turf(src), product_amount) F.color = color F.update_icon() - visible_message("\The [src] is felled!") + visible_message(span_notice("\The [src] is felled!")) if(prob(mob_chance)) if(!mob_list.len) return var/ourmob = pickweight(mob_list) var/mob/living/simple_mob/s = new ourmob(get_turf(src)) - visible_message("\The [s] tumbles out of \the [src]!") + visible_message(span_danger("\The [s] tumbles out of \the [src]!")) s.ai_holder.hostile = FALSE s.ai_holder.retaliate = TRUE s.ghostjoin = TRUE @@ -924,7 +924,7 @@ ghostjoin = FALSE /area/redgate/stardog/flesh_abyss/node - enter_message = "Radical energy hangs as a haze in the air. It's much less hot here than other places within the dog, but the air is thick with alien whispers and desires that you can hardly comprehend." + enter_message = span_notice("Radical energy hangs as a haze in the air. It's much less hot here than other places within the dog, but the air is thick with alien whispers and desires that you can hardly comprehend.") icon_state = "yelwhisqu" requires_power = 0 spawnstuff = FALSE @@ -1146,7 +1146,7 @@ return var/mob/living/L = usr if(L.client.prefs.muted & MUTE_IC) - to_chat(L, "You cannot speak in IC (muted).") + to_chat(L, span_warning("You cannot speak in IC (muted).")) return if (!message) message = tgui_input_text(usr, "Type a message to emote.","Emote Beyond") @@ -1157,15 +1157,15 @@ return L.say_dead(message) var/obj/effect/overmap/visitable/ship/s = get_overmap_sector(z) if(!s || !istype(s, /obj/effect/overmap/visitable/ship)) - to_chat(L, "You can't do that here.") + to_chat(L, span_warning("You can't do that here.")) return log_subtle(message,L) - message = "[L] [message]" + message = span_emote_subtle("[L] [message]") message = "(From within \the [s]) " + message message = encode_html_emphasis(message) - var/undisplayed_message = "[L] does something too subtle for you to see." + var/undisplayed_message = span_emote("[L] does something too subtle for you to see.") var/list/vis = get_mobs_and_objs_in_view_fast(get_turf(s),1,2) var/list/vis_mobs = vis["mobs"] vis_mobs |= L @@ -1234,7 +1234,7 @@ /obj/effect/dog_nose/attack_hand(mob/living/user) . = ..() - user.visible_message("\The [user] boops the snoot.","You boop the snoot.",runemessage = "boop") + user.visible_message(span_notice("\The [user] boops the snoot."),span_notice("You boop the snoot."),runemessage = "boop") /obj/effect/dog_nose/Crossed(atom/movable/AM as mob|obj) . = ..() @@ -1244,7 +1244,7 @@ if(!isliving(L)) return if(L.client) - to_chat(L, "A hot breath rushes up from under your feet, before the air rushes back down into the dog's nose as the dog sniffs you! SNEEF SNEEF!!!") + to_chat(L, span_notice("A hot breath rushes up from under your feet, before the air rushes back down into the dog's nose as the dog sniffs you! SNEEF SNEEF!!!")) /obj/effect/dog_eye/Initialize() . = ..() @@ -1348,7 +1348,7 @@ if(!go) return - visible_message("\The [AM] passes through \the [src]!") + visible_message(span_danger("\The [AM] passes through \the [src]!")) if(throw_through) //We will throw the target to the south! var/turf/throwtarg = locate(target.x, (target.y - 5), target.z) spawn(0) @@ -1356,7 +1356,7 @@ /obj/effect/dog_teleporter/food_gobbler teleport_sound = 'sound/vore/gulp.ogg' - teleport_message = "The thundering drum of the dog's heart beat throbs all around you, while the sweltering heat of its body soaks into you. It's soft and wet as a symphony of gurgles and glorps fills the steamy air!" + teleport_message = span_notice("The thundering drum of the dog's heart beat throbs all around you, while the sweltering heat of its body soaks into you. It's soft and wet as a symphony of gurgles and glorps fills the steamy air!") /obj/effect/dog_teleporter/food_gobbler/Crossed(atom/movable/AM) @@ -1375,9 +1375,9 @@ dog.adjust_nutrition(I.reagents.total_volume) dog.adjust_affinity(25) playsound(src, teleport_sound, vol = 100, vary = 1, preference = /datum/preference/toggle/eating_noises, volume_channel = VOLUME_CHANNEL_VORE) - visible_message("The dog gobbles up \the [I]!") + visible_message(span_warning("The dog gobbles up \the [I]!")) if(dog.client) - to_chat(dog, "[I.thrower ? "\The [I.thrower]" : "Someone"] feeds \the [I] to you!") + to_chat(dog, span_notice("[I.thrower ? "\The [I.thrower]" : "Someone"] feeds \the [I] to you!")) qdel(I) GLOB.items_digested_roundstat++ @@ -1471,7 +1471,7 @@ food = TRUE if(prob(95)) //Give people a chance to pick them up return TRUE - I.visible_message("\The [I] sizzles...") + I.visible_message(span_warning("\The [I] sizzles...")) var/yum = I.digest_act() //Glorp if(istype(I , /obj/item/card)) yum = 0 //No, IDs do not have infinite nutrition, thank you @@ -1653,7 +1653,7 @@ if(isliving(L)) L.Weaken(3) if(prob(5)) - to_chat(L, "\The [src] throbs heavily around you...") + to_chat(L, span_warning("\The [src] throbs heavily around you...")) /obj/structure/auto_flesh_door/attack_generic(mob/user, damage, attack_verb) . = ..() @@ -1667,7 +1667,7 @@ playsound(src, knock_sound, 50, 0, 3) countdown -= 10 else - visible_message("[user] hammers on \the [src]!", "Someone hammers loudly on \the [src]!") + visible_message(span_warning("[user] hammers on \the [src]!"), span_warning("Someone hammers loudly on \the [src]!")) playsound(src, knock_sound, 50, 0, 3) countdown -= 25 @@ -1683,7 +1683,7 @@ playsound(src, knock_sound, 50, 0, 3) countdown -= 10 else - visible_message("[user] hammers on \the [src]!", "Someone hammers loudly on \the [src]!") + visible_message(span_warning("[user] hammers on \the [src]!"), span_warning("Someone hammers loudly on \the [src]!")) playsound(src, knock_sound, 50, 0, 3) countdown -= 25 @@ -1730,7 +1730,7 @@ for(var/mob/living/L in src.loc.contents) if(isliving(L)) L.Weaken(3) - L.visible_message("\The [src] closes up on \the [L]!","The weight of \the [src] closes in on you, squeezing you on all sides so tightly that you can hardly move! It throbs against you as the way is sealed, with you stuck in the middle!!!") + L.visible_message(span_danger("\The [src] closes up on \the [L]!"),span_danger("The weight of \the [src] closes in on you, squeezing you on all sides so tightly that you can hardly move! It throbs against you as the way is sealed, with you stuck in the middle!!!")) /obj/structure/auto_flesh_door/update_icon() if(state) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm index 192c260b77..b10077a46a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm @@ -124,7 +124,7 @@ flip_cooldown = 0 flipped = FALSE handle_flip() - visible_message("\The [src] rights itself!!!") + visible_message(span_notice("\The [src] rights itself!!!")) return if(flip_cooldown) flip_cooldown -- diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm index 55e7b340cd..0d8642067e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm @@ -135,7 +135,7 @@ /mob/living/simple_mob/vore/alienanimals/succlet/attackby(var/obj/item/O, var/mob/user) if(istype(O, /obj/item/newspaper) && !ckey && isturf(user.loc)) - user.visible_message("[user] swats [src] with [O]!") + user.visible_message(span_info("[user] swats [src] with [O]!")) release_vore_contents() else ..() @@ -153,7 +153,7 @@ if(l.devourable && l.allowmobvore && l.can_be_drop_prey) target_turf = get_turf(l) else - to_chat(src, "You can't move on to [l], they are watching...") + to_chat(src, span_warning("You can't move on to [l], they are watching...")) return else if(isturf(target)) target_turf = target @@ -166,7 +166,7 @@ if(ismob(A)) continue else if(A.density && !(A.flags & ON_BORDER)) - to_chat(src, "You can't move there...") + to_chat(src, span_warning("You can't move there...")) return else return @@ -176,19 +176,19 @@ if(isliving(M) && M != src && M != target && !istype(M, /mob/observer) && !M.invisibility && !istype(M,/mob/living/simple_mob/vore/alienanimals/succlet)) var/mob/living/check = M if(check.stat == CONSCIOUS) - to_chat(src, "You can't move, [check] is watching...") + to_chat(src, span_warning("You can't move, [check] is watching...")) return else if (!check.eye_blind) - to_chat(src, "You can't move, [check] is watching...") + to_chat(src, span_warning("You can't move, [check] is watching...")) return for(var/atom/T in view(world.view, target_turf)) //Is anyone at our target? if(isliving(T) && T != src && T != target && !istype(T, /mob/observer) && !T.invisibility && !istype(T,/mob/living/simple_mob/vore/alienanimals/succlet)) var/mob/living/check = T if(check.stat == CONSCIOUS) - to_chat(src, "You can't move, [check] is watching...") + to_chat(src, span_warning("You can't move, [check] is watching...")) return else if (!check.eye_blind) - to_chat(src, "You can't move, [check] is watching...") + to_chat(src, span_warning("You can't move, [check] is watching...")) return forceMove(target_turf) if(l) @@ -221,7 +221,7 @@ if(user.a_intent != I_HELP) if(isliving(user)) var/mob/living/l = user - to_chat(l, "You feel \the [src]'s sting!!!") + to_chat(l, span_warning("You feel \the [src]'s sting!!!")) l.hallucination += 25 l.adjustHalLoss(200) l.adjustToxLoss(10) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm index cb76b5f2a8..28c824dc51 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm @@ -498,7 +498,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? if(resting) lay_down() handle_affinity(user, -5) - user.visible_message(user, "\The [user] hits \the [src] with \the [O]. \The [src] grumbles at \the [user].","You hits \the [src] with \the [O]. \The [src] grumbles at you.") + user.visible_message(user, span_notice("\The [user] hits \the [src] with \the [O]. \The [src] grumbles at \the [user]."),span_notice("You hits \the [src] with \the [O]. \The [src] grumbles at you.")) playsound(src, 'sound/weapons/tap.ogg', 50, 1, -1) return ..() if(teppi_wool) @@ -507,10 +507,10 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? /////FOOD///// if(istype(O, /obj/item/reagent_containers/food)) if(resting) - to_chat(user, "\The [src] is napping, and doesn't respond to \the [O].") + to_chat(user, span_notice("\The [src] is napping, and doesn't respond to \the [O].")) return if(nutrition >= 5000) - user.visible_message("\The [user] tries to feed \the [O] to \the [src]. It snoofs but does not eat.","You try to feed \the [O] to \the [src], but it only snoofts at it.") + user.visible_message(span_notice("\The [user] tries to feed \the [O] to \the [src]. It snoofs but does not eat."),span_notice("You try to feed \the [O] to \the [src], but it only snoofts at it.")) return var/nutriment_amount = O.reagents?.get_reagent_amount("nutriment") //does it have nutriment, if so how much? var/protein_amount = O.reagents?.get_reagent_amount("protein") //does it have protein, if so how much? @@ -529,54 +529,54 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? if(R.allergen_type & allergen_unpreference) disliked = TRUE if(liked && disliked) //in case a food has both the thing they like and also the thing they don't like in it - user.visible_message("\The [user] feeds \the [O] to \the [src]. It nibbles \the [O] and looks confused.","You feed \the [O] to \the [src]. It nibbles \the [O] and looks confused.") + user.visible_message(span_notice("\The [user] feeds \the [O] to \the [src]. It nibbles \the [O] and looks confused."),span_notice("You feed \the [O] to \the [src]. It nibbles \the [O] and looks confused.")) else if(liked && !disliked) - user.visible_message("\The [user] feeds \the [O] to \the [src]. It nibbles \the [O] excitedly.","You feed \the [O] to \the [src]. It nibbles \the [O] excitedly.") + user.visible_message(span_notice("\The [user] feeds \the [O] to \the [src]. It nibbles \the [O] excitedly."),span_notice("You feed \the [O] to \the [src]. It nibbles \the [O] excitedly.")) yum *= 2 handle_affinity(user, 5) else if(!liked && disliked) - user.visible_message("\The [user] feeds \the [O] to \the [src]. It nibbles \the [O] slowly.","You feed \the [O] to \the [src]. It nibbles \the [O] slowly.") + user.visible_message(span_notice("\The [user] feeds \the [O] to \the [src]. It nibbles \the [O] slowly."),span_notice("You feed \the [O] to \the [src]. It nibbles \the [O] slowly.")) yum *= 0.5 handle_affinity(user, -5) else - user.visible_message("\The [user] feeds \the [O] to \the [src]. It nibbles \the [O].","You feed \the [O] to \the [src]. It nibbles \the [O].") + user.visible_message(span_notice("\The [user] feeds \the [O] to \the [src]. It nibbles \the [O]."),span_notice("You feed \the [O] to \the [src]. It nibbles \the [O].")) handle_affinity(user, 1) else - user.visible_message("\The [user] feeds \the [O] to \the [src]. It nibbles \the [O] casually.","You feed \the [O] to \the [src]. It nibbles \the [O] casually.") + user.visible_message(span_notice("\The [user] feeds \the [O] to \the [src]. It nibbles \the [O] casually."),span_notice("You feed \the [O] to \the [src]. It nibbles \the [O] casually.")) adjust_nutrition(yum) //add the nutriment! user.drop_from_inventory(O) qdel(O) playsound(src, 'sound/items/eatfood.ogg', 75, 1) if(!client && lets_eat(user) && prob(1)) visible_message("\The [src] scromfs \the [user] along with the food!!") - to_chat(user, "\The [src] leans in close, spreading its jaws in front of you. A hot, humid gust of breath blows over you as the weight of \the [src]'s presses you over, knocking you off of your feet as the warm gooey tough of jaws scromf over your figure, rapidly guzzling you away with the [O], leaving you to tumble down into the depths of its body...") + to_chat(user, span_notice("\The [src] leans in close, spreading its jaws in front of you. A hot, humid gust of breath blows over you as the weight of \the [src]'s presses you over, knocking you off of your feet as the warm gooey tough of jaws scromf over your figure, rapidly guzzling you away with the [O], leaving you to tumble down into the depths of its body...")) playsound(src, pick(bodyfall_sound), 75, 1) teppi_pounce(user) if(yum && nutrition >= 500) - to_chat(user, "\The [src] seems satisfied.") + to_chat(user, span_notice("\The [src] seems satisfied.")) return /////WEAPONS///// if(istype(O, /obj/item/material/knife)) if(client) return ..() if(resting) - user.visible_message("\The [user] approaches \the [src]'s neck with \the [O].","You approach \the [src]'s neck with \the [O].") + user.visible_message(span_attack("\The [user] approaches \the [src]'s neck with \the [O]."),span_attack("You approach \the [src]'s neck with \the [O].")) if(do_after(user, 5 SECONDS, exclusive = TASK_USER_EXCLUSIVE, target = src)) if(resting) death() return else - to_chat(user, "\The [src] woke up! You think better of slaughtering it while it is awake.") + to_chat(user, span_notice("\The [src] woke up! You think better of slaughtering it while it is awake.")) return else return ..() if(istype(O, /obj/item/clothing/accessory/collar/craftable)) var/obj/item/clothing/accessory/collar/craftable/C = O if(item_type == "collar") - to_chat(user, "[src] is already wearing a collar.") + to_chat(user, span_notice("[src] is already wearing a collar.")) return if(!C.given_name) - to_chat(user, "You didn't put a name on the collar. You can use it in your hand to do that!") + to_chat(user, span_notice("You didn't put a name on the collar. You can use it in your hand to do that!")) return item_type = "collar" item_color = C.color @@ -596,18 +596,18 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? return ..() if(M.a_intent == I_GRAB && item_type) if(affinity[M.real_name] >= 30) - M.visible_message("\The [M.name] removes \the [src]'s [item_type].","You remove \the [src]'s [item_type].") + M.visible_message(span_notice("\The [M.name] removes \the [src]'s [item_type]."),span_notice("You remove \the [src]'s [item_type].")) item_type = null update_icon() return if(M.a_intent != I_HELP) //be gentle handle_affinity(M, -5) - to_chat(M, "\The [src] fusses at your rough treatment!!") + to_chat(M, span_notice("\The [src] fusses at your rough treatment!!")) if(resting) lay_down() return..() if(resting) - M.visible_message("\The [M.name] shakes \the [src] awake from their nap.","You shake \the [src] awake!") + M.visible_message(span_notice("\The [M.name] shakes \the [src] awake from their nap."),span_notice("You shake \the [src] awake!")) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) lay_down() return @@ -618,24 +618,24 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? handle_affinity(M, 1) if(teppi_adult) if(prob(25)) - M.visible_message("\The [src] rumbles happily at \the [M]","\The [src] rumbles happily at you!") + M.visible_message(span_notice("\The [src] rumbles happily at \the [M]"),span_notice("\The [src] rumbles happily at you!")) playsound(src, 'sound/voice/teppi/rumble.ogg', 75, 1) vore_selected.digest_mode = DM_DRAIN //People outside can help calm the tumby if you squirm too much else if(prob(25)) - M.visible_message("\The [src] rumbles happily at \the [M]","\The [src] rumbles happily at you!") + M.visible_message(span_notice("\The [src] rumbles happily at \the [M]"),span_notice("\The [src] rumbles happily at you!")) playsound(src, 'sound/voice/teppi/cute_rumble.ogg', 75, 1) if(prob(25)) wantpet = rand(0,25) * affection_factor //We stopped wanting pets - to_chat(M, "\The [src] leans into your touch.") + to_chat(M, span_notice("\The [src] leans into your touch.")) petcount = 0 else if(petcount < 20) wantpet = 0 petcount += 1 if(prob(20)) - to_chat(M, "\The [src] grumbles at your touch.") + to_chat(M, span_notice("\The [src] grumbles at your touch.")) else if(lets_eat(M) && prob(50)) - to_chat(M, "\The [src] grumbles a bit... and then bowls you over, pressing their weight into yours to knock you off of your feet! In a rush of chaotic presses and schlorps, the gooey touch of Teppi flesh grinds over you as you're guzzled away! Casually swallowed down in retaliation for all of the pettings. Pumped down deep into the grumbling depths of \the [src].") - visible_message("\The [src] scromfs \the [M], before chuffing and settling down again.") + to_chat(M, span_notice("\The [src] grumbles a bit... and then bowls you over, pressing their weight into yours to knock you off of your feet! In a rush of chaotic presses and schlorps, the gooey touch of Teppi flesh grinds over you as you're guzzled away! Casually swallowed down in retaliation for all of the pettings. Pumped down deep into the grumbling depths of \the [src].")) + visible_message(span_danger("\The [src] scromfs \the [M], before chuffing and settling down again.")) playsound(src, pick(bodyfall_sound), 75, 1) teppi_pounce(M) wantpet = 100 @@ -645,13 +645,13 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? /mob/living/simple_mob/vore/alienanimals/teppi/examine() . = ..() if(item_type) - . += "They are wearing a [item_type] with [name] written on it." + . += span_notice("They are wearing a [item_type] with [name] written on it.") if(nutrition >= 1000) - . += "They look well fed." + . += span_notice("They look well fed.") if(nutrition <= 500) - . += "They look hungry." + . += span_notice("They look hungry.") if(health < maxHealth && health / maxHealth * 100 <= 75) - . += "They look beat up." + . += span_notice("They look beat up.") /mob/living/simple_mob/vore/alienanimals/teppi/update_icon() @@ -746,7 +746,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? else return FALSE if(do_after(user, sheartime, exclusive = TASK_USER_EXCLUSIVE, target = src)) - user.visible_message("\The [user] shears \the [src] with \the [tool].","You shear \the [src] with \the [tool].") + user.visible_message(span_notice("\The [user] shears \the [src] with \the [tool]."),span_notice("You shear \the [src] with \the [tool].")) amount_grown = rand(0,250) var/obj/item/stack/material/fur/F = new(get_turf(user), rand(10,15)) F.color = marking_color @@ -965,26 +965,26 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? set category = "Abilities" set desc = "You can have babies if the conditions are right." if(prevent_breeding) - to_chat(src, "You have elected to not participate in breeding mechanics, and so cannot complete that action.") + to_chat(src, span_notice("You have elected to not participate in breeding mechanics, and so cannot complete that action.")) return if(!teppi_warned) - to_chat(src, "Be aware of your surroundings when using this verb. If you use this to be disruptive or prefbreak people, you are likely to eat a ban. If whoever's tending the teppi is trying to make more babies, or you're alone, or playing with other people who you know are into it, then sure. You should not however, for example, drag another teppi to the bar (or any public place) and drop a baby in the middle of the floor. If you're not sure if it's okay to do where you are, with whoever's around, it probably isn't. This is intended to preserve the mechanical utility of the mob you are playing as, not as a scene tool.") + to_chat(src, span_danger("Be aware of your surroundings when using this verb. If you use this to be disruptive or prefbreak people, you are likely to eat a ban. If whoever's tending the teppi is trying to make more babies, or you're alone, or playing with other people who you know are into it, then sure. You should not however, for example, drag another teppi to the bar (or any public place) and drop a baby in the middle of the floor. If you're not sure if it's okay to do where you are, with whoever's around, it probably isn't. This is intended to preserve the mechanical utility of the mob you are playing as, not as a scene tool.")) teppi_warned = TRUE return if(stat != CONSCIOUS) - to_chat(src, "I can't do that right now...") + to_chat(src, span_notice("I can't do that right now...")) return if(!teppi_adult) - to_chat(src, "I'm not old enough to make babies.") + to_chat(src, span_notice("I'm not old enough to make babies.")) return if(baby_countdown > 0) - to_chat(src, "It is not time yet...") + to_chat(src, span_notice("It is not time yet...")) return if(!breedable || nutrition < 500) - to_chat(src, "The conditions are not right to produce offspring.") + to_chat(src, span_notice("The conditions are not right to produce offspring.")) return if(GLOB.teppi_count >= GLOB.max_teppi) //if we can't make more then we shouldn't look for partners - to_chat(src, "I cannot produce more offspring at the moment, there are too many of us!") + to_chat(src, span_notice("I cannot produce more offspring at the moment, there are too many of us!")) return . = FALSE for(var/mob/living/simple_mob/vore/alienanimals/teppi/alltep in oview(1,src)) @@ -1000,17 +1000,17 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? alltep.handle_affinity(src, 30) return if(. == FALSE) - to_chat(src, "There are no suitable partners nearby.") + to_chat(src, span_notice("There are no suitable partners nearby.")) /mob/living/simple_mob/vore/alienanimals/teppi/proc/toggle_producing_offspring() set name = "Toggle Producing Offspring" set category = "Abilities" set desc = "You can toggle whether or not you can produce offspring." if(!prevent_breeding) - to_chat(src, "You disable breeding.") + to_chat(src, span_notice("You disable breeding.")) prevent_breeding = TRUE else - to_chat(src, "You enable breeding.") + to_chat(src, span_notice("You enable breeding.")) prevent_breeding = FALSE ///////////////////AI Things//////////////////////// @@ -1100,7 +1100,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? if(!leader) if(speaker_affinity >= 100) set_follow(speaker, follow_for = 10 MINUTES) - holder.visible_message("\The [holder] starts following \the [speaker]","\The [holder] starts following you.") + holder.visible_message(span_notice("\The [holder] starts following \the [speaker]"),span_notice("\The [holder] starts following you.")) return else var/mob/living/L = leader @@ -1108,19 +1108,19 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? lose_follow() if(speaker_affinity >= 100) set_follow(speaker, follow_for = 10 MINUTES) - holder.visible_message("\The [holder] starts following \the [speaker]","\The [holder] starts following you.") + holder.visible_message(span_notice("\The [holder] starts following \the [speaker]"),span_notice("\The [holder] starts following you.")) return else if(speaker_affinity > T.affinity[L.real_name]) - holder.visible_message("\The [holder] starts following \the [speaker]","\The [holder] starts following you.") + holder.visible_message(span_notice("\The [holder] starts following \the [speaker]"),span_notice("\The [holder] starts following you.")) set_follow(speaker, follow_for = 10 MINUTES) return if(speaker_affinity == T.affinity[L.real_name]) lose_follow() - holder.visible_message("\The [holder] gives off an anxious whine.") + holder.visible_message(span_notice("\The [holder] gives off an anxious whine.")) if(findtext(message, "stop teppi") || findtext(message, "stay here") || findtext(message, "stop [holder.name]")) if(leader == speaker) lose_follow() - holder.visible_message("\The [holder] stops following \the [speaker]","\The [holder] stops following you.") + holder.visible_message(span_notice("\The [holder] stops following \the [speaker]"),span_notice("\The [holder] stops following you.")) return //This a teppi with funny colors will spawn! diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_captive.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_captive.dm index c4ee2ce60d..0053f4207d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_captive.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_captive.dm @@ -32,11 +32,11 @@ to_chat(M, "The captive mind of [src] whispers, \"[message]\"") /mob/living/captive_brain/me_verb(message as text) - to_chat(src, "You cannot emote as a captive mind.") + to_chat(src, span_danger("You cannot emote as a captive mind.")) return /mob/living/captive_brain/emote(var/message) - to_chat(src, "You cannot emote as a captive mind.") + to_chat(src, span_danger("You cannot emote as a captive mind.")) return /mob/living/captive_brain/process_resist() @@ -45,15 +45,15 @@ var/mob/living/simple_mob/animal/borer/B = src.loc var/mob/living/captive_brain/H = src - to_chat(H, "You begin doggedly resisting the parasite's control (this will take approximately sixty seconds).") - to_chat(B.host, "You feel the captive mind of [src] begin to resist your control.") + to_chat(H, span_danger("You begin doggedly resisting the parasite's control (this will take approximately sixty seconds).")) + to_chat(B.host, span_danger("You feel the captive mind of [src] begin to resist your control.")) spawn(rand(200,250)+B.host.brainloss) if(!B || !B.controlling) return B.host.adjustBrainLoss(rand(0.1,0.5)) - to_chat(H, "With an immense exertion of will, you regain control of your body!") - to_chat(B.host, "You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you.") + to_chat(H, span_danger("With an immense exertion of will, you regain control of your body!")) + to_chat(B.host, span_danger("You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you.")) B.detatch() verbs -= /mob/living/carbon/proc/release_control verbs -= /mob/living/carbon/proc/punish_host diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm index 62b0c2b209..b31f8d0dcb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm @@ -32,8 +32,8 @@ to_chat(src, "You wiggle out of [host]'s ear and plop to the ground.") if(host.mind) if(!host.stat) - to_chat(host, "Something slimy wiggles out of your ear and plops to the ground!") - to_chat(host, "As though waking from a dream, you shake off the insidious mind control of the brain worm. Your thoughts are your own again.") + to_chat(host, span_danger("Something slimy wiggles out of your ear and plops to the ground!")) + to_chat(host, span_danger("As though waking from a dream, you shake off the insidious mind control of the brain worm. Your thoughts are your own again.")) detatch() leave_host() @@ -348,7 +348,7 @@ return verbs -= /mob/living/carbon/human/proc/jumpstart - visible_message("With a hideous, rattling moan, [src] shudders back to life!") + visible_message(span_warning("With a hideous, rattling moan, [src] shudders back to life!")) rejuvenate() restore_blood() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm index 3f22a813fb..4ef95170e8 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm @@ -32,7 +32,7 @@ /mob/living/simple_mob/animal/passive/cow/attackby(var/obj/item/O as obj, var/mob/user as mob) var/obj/item/reagent_containers/glass/G = O if(stat == CONSCIOUS && istype(G) && G.is_open_container()) - user.visible_message("[user] milks [src] using \the [O].") + user.visible_message(span_notice("[user] milks [src] using \the [O].")) var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) if(G.reagents.total_volume >= G.volume) to_chat(user, span_red("The [O] is full.")) @@ -49,7 +49,7 @@ /mob/living/simple_mob/animal/passive/cow/attack_hand(mob/living/carbon/M as mob) if(!stat && M.a_intent == I_DISARM && icon_state != icon_dead) - M.visible_message("[M] tips over [src].","You tip over [src].") + M.visible_message(span_warning("[M] tips over [src]."),span_notice("You tip over [src].")) Weaken(30) icon_state = icon_dead spawn(rand(20,50)) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm index e1d5ec8c4c..a1fccf962c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm @@ -63,7 +63,7 @@ /mob/living/simple_mob/animal/goat/attackby(var/obj/item/O as obj, var/mob/user as mob) var/obj/item/reagent_containers/glass/G = O if(stat == CONSCIOUS && istype(G) && G.is_open_container()) - user.visible_message("[user] milks [src] using \the [O].") + user.visible_message(span_notice("[user] milks [src] using \the [O].")) var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) if(G.reagents.total_volume >= G.volume) to_chat(user, span_red("The [O] is full.")) @@ -78,4 +78,4 @@ emote_see = list("shakes its head", "stamps a foot", "glares around") // say_got_target doesn't seem to handle emotes, but keeping this here in case someone wants to make it work -// say_got_target = list("[src] gets an evil-looking gleam in their eye.") +// say_got_target = list(span_warning("[src] gets an evil-looking gleam in their eye.")) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm index 83a10048c1..3e8f88b01a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm @@ -130,7 +130,7 @@ // Does actual poison injection, after all checks passed. /mob/living/simple_mob/animal/giant_spider/proc/inject_poison(mob/living/L, target_zone) if(prob(poison_chance)) - to_chat(L, "You feel a tiny prick.") + to_chat(L, span_warning("You feel a tiny prick.")) L.reagents.add_reagent(poison_type, poison_per_bite) /mob/living/simple_mob/animal/giant_spider/proc/make_spiderling() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/hunter.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/hunter.dm index b6cfee6b3f..440a8260c7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/hunter.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/hunter.dm @@ -110,7 +110,7 @@ // G.affecting = victim // victim.LAssailant = src -// visible_message("\The [src] seizes \the [victim] aggressively!") +// visible_message(span_warning("\The [src] seizes \the [victim] aggressively!")) // do_attack_animation(victim) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm index 149c6b4c4b..3b025bc2d7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm @@ -199,8 +199,8 @@ /datum/modifier/tunneler_vulnerable name = "Vulnerable" desc = "You are vulnerable to more harm than usual." - on_created_text = "You feel vulnerable..." - on_expired_text = "You feel better." + on_created_text = span_warning("You feel vulnerable...") + on_expired_text = span_notice("You feel better.") stacks = MODIFIER_STACK_EXTEND incoming_damage_percent = 2 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/cockroach.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/cockroach.dm index 603f5746c4..3b0143d335 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/cockroach.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/cockroach.dm @@ -54,17 +54,17 @@ var/mob/living/A = AM if(A.mob_size > MOB_SMALL) if(prob(squish_chance)) - A.visible_message("[A] squashed [src].", "You squashed [src].") + A.visible_message(span_notice("[A] squashed [src]."), span_notice("You squashed [src].")) adjustBruteLoss(1) //kills a normal cockroach else - visible_message("[src] avoids getting crushed.") + visible_message(span_notice("[src] avoids getting crushed.")) else if(isstructure(AM)) if(prob(squish_chance)) - AM.visible_message("[src] was crushed under [AM].") + AM.visible_message(span_notice("[src] was crushed under [AM].")) adjustBruteLoss(1) else - visible_message("[src] avoids getting crushed.") + visible_message(span_notice("[src] avoids getting crushed.")) /mob/living/simple_mob/animal/passive/cockroach/ex_act() //Explosions are a terrible way to handle a cockroach. return diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm index 658e4b62d7..1b1cc2b063 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm @@ -20,11 +20,11 @@ ..() if(isliving(L) && Adjacent(L)) var/mob/living/M = L - visible_message("\The [src][is_dead()?"'s corpse":""] flails at [M]!") + visible_message(span_warning("\The [src][is_dead()?"'s corpse":""] flails at [M]!")) SpinAnimation(7,1) if(prob(75)) if(sting(M)) - to_chat(M, "You feel a tiny prick.") + to_chat(M, span_warning("You feel a tiny prick.")) if(is_dead()) return for(var/i = 1 to 3) @@ -38,11 +38,11 @@ /mob/living/simple_mob/animal/passive/fish/koi/poisonous/react_to_attack(var/atom/A) if(isliving(A) && Adjacent(A)) var/mob/living/M = A - visible_message("\The [src][is_dead()?"'s corpse":""] flails at [M]!") + visible_message(span_warning("\The [src][is_dead()?"'s corpse":""] flails at [M]!")) SpinAnimation(7,1) if(prob(75)) if(sting(M)) - to_chat(M, "You feel a tiny prick.") + to_chat(M, span_warning("You feel a tiny prick.")) if(is_dead()) return for(var/i = 1 to 3) @@ -74,4 +74,4 @@ vore_bump_chance = 100 vore_default_mode = DM_HOLD //docile shark vore_capacity = 5 - pixel_x = -50 \ No newline at end of file + pixel_x = -50 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm index d5c2dc72ed..09645dc646 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm @@ -16,7 +16,7 @@ for(var/mob/living/simple_mob/M in src.contents) if((I_HELP) && U.checkClickCooldown()) //a little snowflakey, but makes it use the same cooldown as interacting with non-inventory objects U.setClickCooldown(U.get_attack_speed()) //if there's a cleaner way in baycode, I'll change this - U.visible_message("[U] [M.response_help] \the [M].") + U.visible_message(span_notice("[U] [M.response_help] \the [M].")) //Jank grabber that uses the 'attack_hand' insead of 'MouseDrop' /mob/living/simple_mob/animal/passive/mouse/attack_hand(var/atom/over_object) @@ -41,12 +41,12 @@ grabber.put_in_hands(H) if(self_grab) - to_chat(grabber, "\The [src] clambers onto you!") - to_chat(src, "You climb up onto \the [grabber]!") + to_chat(grabber, span_notice("\The [src] clambers onto you!")) + to_chat(src, span_notice("You climb up onto \the [grabber]!")) grabber.equip_to_slot_if_possible(H, slot_back, 0, 1) else - to_chat(grabber, "You scoop up \the [src]!") - to_chat(src, "\The [grabber] scoops you up!") + to_chat(grabber, span_notice("You scoop up \the [src]!")) + to_chat(src, span_notice("\The [grabber] scoops you up!")) add_attack_logs(grabber, H.held_mob, "Scooped up", FALSE) // Not important enough to notify admins, but still helpful. return H @@ -67,5 +67,4 @@ for(var/L in contents) if(isanimal(L)) var/mob/living/simple_mob/S = L - user.visible_message("[user] [S.response_help] \the [S].") - + user.visible_message(span_notice("[user] [S.response_help] \the [S].")) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm index 176d0d0237..33a46f63ac 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm @@ -258,13 +258,13 @@ var/list/_cat_default_emotes = list( /mob/living/simple_mob/animal/passive/cat/attackby(obj/item/W as obj, mob/user as mob) if(istype(W, /obj/item/pen) || istype(W, /obj/item/flashlight/pen)) if(named) - to_chat(user, "\The [name] already has a name!") + to_chat(user, span_notice("\The [name] already has a name!")) else var/tmp_name = sanitizeSafe(tgui_input_text(user, "Give \the [name] a name", "Name", null, MAX_NAME_LEN), MAX_NAME_LEN) if(length(tmp_name) > 50) - to_chat(user, "The name can be at most 50 characters long.") + to_chat(user, span_notice("The name can be at most 50 characters long.")) else - to_chat(user, "You name \the [name]. Meow!") + to_chat(user, span_notice("You name \the [name]. Meow!")) name = tmp_name named = TRUE else @@ -279,7 +279,7 @@ var/list/_cat_default_emotes = list( /obj/item/cat_box/attack_self(var/mob/user) var/turf/catturf = get_turf(src) - to_chat(user, "You peek into \the [name]-- and a cat jumps out!") + to_chat(user, span_notice("You peek into \the [name]-- and a cat jumps out!")) new cattype(catturf) new /obj/item/stack/material/cardboard(catturf) //if i fits i sits qdel(src) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm index 5fb9712d01..9a73a80ac1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm @@ -176,7 +176,7 @@ return if (!(ishuman(usr) && befriend_job && usr.job == befriend_job)) - to_chat(usr, "[src] ignores you.") + to_chat(usr, span_notice("[src] ignores you.")) return friend = usr diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm index 757bffc007..a3ee2fcc9a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm @@ -80,7 +80,7 @@ /mob/living/simple_mob/animal/passive/bird/parrot/proc/remove_headset(mob/living/user) if(!my_headset) - to_chat(user, "\The [src] doesn't have a headset to remove, thankfully.") + to_chat(user, span_warning("\The [src] doesn't have a headset to remove, thankfully.")) else ISay("BAWWWWWK LEAVE THE HEADSET BAWKKKKK!") my_headset.forceMove(get_turf(src)) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm index 686b23df62..02baeeda89 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm @@ -83,14 +83,14 @@ hat = null update_icon() if(user == src) - to_chat(user, "You removed your hat.") + to_chat(user, span_notice("You removed your hat.")) return - to_chat(user, "You removed \the [src]'s hat. You monster.") + to_chat(user, span_warning("You removed \the [src]'s hat. You monster.")) else if(user == src) - to_chat(user, "You are not wearing a hat!") + to_chat(user, span_notice("You are not wearing a hat!")) return - to_chat(user, "\The [src] is not wearing a hat!") + to_chat(user, span_notice("\The [src] is not wearing a hat!")) /mob/living/simple_mob/animal/sif/sakimm/verb/give_hat() set name = "Give Hat" @@ -103,16 +103,16 @@ /mob/living/simple_mob/animal/sif/sakimm/proc/take_hat(var/mob/user) if(hat) if(user == src) - to_chat(user, "You already have a hat!") + to_chat(user, span_notice("You already have a hat!")) return - to_chat(user, "\The [src] already has a hat!") + to_chat(user, span_notice("\The [src] already has a hat!")) else if(user == src) if(istype(get_active_hand(), /obj/item/clothing/head)) hat = get_active_hand() drop_from_inventory(hat, src) hat.forceMove(src) - to_chat(user, "You put on the hat.") + to_chat(user, span_notice("You put on the hat.")) update_icon() return else if(ishuman(user)) @@ -125,10 +125,10 @@ a_intent = I_HELP newhat.attack_hand(src) else if(src.get_active_hand()) - to_chat(user, "\The [src] seems busy with \the [get_active_hand()] already!") + to_chat(user, span_notice("\The [src] seems busy with \the [get_active_hand()] already!")) else - to_chat(user, "You aren't holding a hat...") + to_chat(user, span_warning("You aren't holding a hat...")) /datum/say_list/sakimm speak = list("Shurr.", "|R|rr?", "Hss.") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm index 5b511d98f7..d3256a6c56 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm @@ -44,7 +44,7 @@ var/mob/living/L = A if(prob(scare_chance)) L.Stun(1) - L.visible_message("\The [src] scares \the [L]!") + L.visible_message(span_danger("\The [src] scares \the [L]!")) // Spookiest of bats /mob/living/simple_mob/animal/space/bats/cult diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm index 8d4234567e..d75fc6e33c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm @@ -143,7 +143,7 @@ /mob/living/simple_mob/animal/passive/snake/python/noodle/attackby(var/obj/item/O, var/mob/user) if(istype(O, /obj/item/reagent_containers/food/snacks/snakesnack)) - visible_message("[user] feeds \the [O] to [src].") + visible_message(span_notice("[user] feeds \the [O] to [src].")) qdel(O) else return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm index 3f5266d2b9..47be983339 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm @@ -128,10 +128,10 @@ if(world.time < time_maw_opened + maw_cooldown) if(open_maw) - to_chat(src, "You retract your teeth.") + to_chat(src, span_notice("You retract your teeth.")) time_maw_opened -= maw_cooldown / 2 // Recovers half cooldown if you end it early manually. else - to_chat(src, "You are too tired to do this..") + to_chat(src, span_notice("You are too tired to do this..")) set_maw(FALSE) else set_maw(!open_maw) @@ -158,7 +158,7 @@ if(world.time > time_maw_opened + maw_cooldown) // Auto-stop eating. if(open_maw) - to_chat(src, "Your jaws cannot remain open..") + to_chat(src, span_notice("Your jaws cannot remain open..")) set_maw(FALSE) if(next && !(next in view(src,1)) && !z_transitioning) @@ -260,7 +260,7 @@ break if(do_after(src, 5)) - D.visible_message("Something crashes against \the [D]!") + D.visible_message(span_danger("Something crashes against \the [D]!")) D.take_damage(2 * melee_damage_upper) else objectOrMob = null @@ -274,14 +274,14 @@ var/obj/effect/energy_field/EF = objectOrMob objectOrMob = null // No eating shields. if(EF.opacity) - EF.visible_message("Something begins forcing itself through \the [EF]!") + EF.visible_message(span_danger("Something begins forcing itself through \the [EF]!")) else - EF.visible_message("\The [src] begins forcing itself through \the [EF]!") + EF.visible_message(span_danger("\The [src] begins forcing itself through \the [EF]!")) if(do_after(src, EF.strength * 5)) EF.adjust_strength(rand(-8, -10)) - EF.visible_message("\The [src] crashes through \the [EF]!") + EF.visible_message(span_danger("\The [src] crashes through \the [EF]!")) else - EF.visible_message("\The [EF] reverberates as it returns to normal.") + EF.visible_message(span_danger("\The [EF] reverberates as it returns to normal.")) if(objectOrMob) objectOrMob.update_nearby_tiles(need_rebuild=1) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm b/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm index 54bd9fcf1f..c6a8f0ac94 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm @@ -211,7 +211,7 @@ set category = "Abilities" set desc = "You can set your color!" if(picked_color) - to_chat(src, "You have already picked a color! If you picked the wrong color, ask an admin to change your picked_color variable to 0.") + to_chat(src, span_notice("You have already picked a color! If you picked the wrong color, ask an admin to change your picked_color variable to 0.")) return var/newcolor = input(usr, "Choose a color.", "", color) as color|null if(newcolor) diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm index cc6d1132c1..94cde54931 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm @@ -122,15 +122,15 @@ /mob/living/simple_mob/humanoid/merc/melee/sword/attackby(var/obj/item/O as obj, var/mob/user as mob) if(O.force) if(prob(20)) - visible_message("\The [src] blocks \the [O] with its shield!") + visible_message(span_danger("\The [src] blocks \the [O] with its shield!")) if(user) ai_holder.react_to_attack(user) return else ..() else - to_chat(user, "This weapon is ineffective, it does no damage.") - visible_message("\The [user] gently taps [src] with \the [O].") + to_chat(user, span_warning("This weapon is ineffective, it does no damage.")) + visible_message(span_warning("\The [user] gently taps [src] with \the [O].")) /mob/living/simple_mob/humanoid/merc/melee/sword/bullet_act(var/obj/item/projectile/Proj) if(!Proj) return @@ -321,7 +321,7 @@ try_reload() return FALSE - visible_message("\The [src] fires at \the [orig_targ]!") + visible_message(span_danger("\The [src] fires at \the [orig_targ]!")) shoot(A) if(casingtype) new casingtype(loc) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm index 0b140b623a..834f815cef 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm @@ -62,7 +62,7 @@ // Does actual poison injection, after all checks passed. /mob/living/simple_mob/mechanical/corrupt_maint_drone/proc/inject_poison(mob/living/L, target_zone) if(prob(poison_chance)) - to_chat(L, "Something burns in your veins.") + to_chat(L, span_warning("Something burns in your veins.")) L.reagents.add_reagent(poison_type, poison_per_bite) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm index 3d30826085..48babbe51a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm @@ -66,5 +66,5 @@ // Does actual poison injection, after all checks passed. /mob/living/simple_mob/mechanical/infectionbot/proc/inject_poison(mob/living/L, target_zone) if(prob(poison_chance)) - to_chat(L, "You feel a tiny prick.") + to_chat(L, span_warning("You feel a tiny prick.")) L.reagents.add_reagent(poison_type, poison_per_bite) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm index 0e37e35216..565c4ee004 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm @@ -32,8 +32,8 @@ // The boost is lost if the commander is too far away or dies. /datum/modifier/aura/hivebot_commander_buff name = "Strategicals" - on_created_text = "Signal established with commander. Optimizating combat performance..." - on_expired_text = "Lost signal to commander. Optimization halting." + on_created_text = span_notice("Signal established with commander. Optimizating combat performance...") + on_expired_text = span_warning("Lost signal to commander. Optimization halting.") stacks = MODIFIER_STACK_FORBID aura_max_distance = 4 mob_overlay_state = "signal_blue" diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm index d5e4ebf015..a8f0e30ceb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/tank.dm @@ -23,8 +23,8 @@ /datum/modifier/hivebot_weaken name = "Shocked" desc = "You feel less able to exert yourself after being prodded." - on_created_text = "You feel weak..." - on_expired_text = "You feel better." + on_created_text = span_warning("You feel weak...") + on_expired_text = span_notice("You feel better.") stacks = MODIFIER_STACK_EXTEND mob_overlay_state = "electricity" diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm index 077e8e7b13..af513e23c0 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm @@ -84,7 +84,7 @@ if(l_spell.aspect == ASPECT_CHROMATIC) //Check the other hand too. l_spell.on_combine_cast(S, src) else //Welp - to_chat(src, "You require a free manipulator to use this power.") + to_chat(src, span_warning("You require a free manipulator to use this power.")) return 0 if(S.run_checks()) @@ -128,7 +128,7 @@ adjustFireLoss(rand(repair_lower_bound, repair_upper_bound)) user.visible_message("\The [user] mends some of \the [src]'s wounds.") else - to_chat(user, "\The [src] is undamaged.") + to_chat(user, span_notice("\The [src] is undamaged.")) return return ..() @@ -137,9 +137,9 @@ var/max = getMaxHealth() if (health < max) if (health >= max/2) - . += "It looks slightly dented." + . += span_warning("It looks slightly dented.") else - . += "It looks severely dented!" + . += span_warning("It looks severely dented!") //Constructs levitate, can fall from a shuttle with no harm, and are piloted by either damned spirits or some otherworldly entity. Let 'em float in space. /mob/living/simple_mob/construct/Process_Spacemove() diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm index ceda9788b8..a1a7fbe3a7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm @@ -58,8 +58,8 @@ var/armorcheck = run_armor_check(null, P.check_armour) var/soakedcheck = get_armor_soak(null, P.check_armour) if(!(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam))) - visible_message("The [P.name] bounces off of [src]'s shell!", \ - "The [P.name] bounces off of [src]'s shell!") + visible_message(span_danger("The [P.name] bounces off of [src]'s shell!"), \ + span_userdanger("The [P.name] bounces off of [src]'s shell!")) new /obj/item/material/shard/shrapnel(src.loc) if(!(P.damage_type == BRUTE || P.damage_type == BURN)) projectile_dam_type = BRUTE @@ -67,8 +67,8 @@ apply_damage(incoming_damage, projectile_dam_type, null, armorcheck, soakedcheck, is_sharp(P), has_edge(P), P) return -1 //Doesn't reflect non-beams or non-energy projectiles. They just smack and drop with little to no effect. else - visible_message("The [P.name] gets reflected by [src]'s shell!", \ - "The [P.name] gets reflected by [src]'s shell!") + visible_message(span_danger("The [P.name] gets reflected by [src]'s shell!"), \ + span_userdanger("The [P.name] gets reflected by [src]'s shell!")) damage_mod = rand(3,5) incoming_damage = (round(P.damage / damage_mod) - (round((P.damage / damage_mod) * 0.3))) if(!(P.damage_type == BRUTE || P.damage_type == BURN)) @@ -127,8 +127,8 @@ /mob/living/simple_mob/construct/juggernaut/behemoth/bullet_act(var/obj/item/projectile/P) var/reflectchance = 80 - round(P.damage/3) if(prob(reflectchance)) - visible_message("The [P.name] gets reflected by [src]'s shell!", \ - "The [P.name] gets reflected by [src]'s shell!") + visible_message(span_danger("The [P.name] gets reflected by [src]'s shell!"), \ + span_userdanger("The [P.name] gets reflected by [src]'s shell!")) // Find a turf near or on the original location to bounce to if(P.starting) diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm b/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm index fa06001356..b61bb57dcf 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm @@ -50,7 +50,7 @@ var/mob/living/L = A if(prob(12)) L.Weaken(3) - L.visible_message("\The [src] knocks down \the [L]!") + L.visible_message(span_danger("\The [src] knocks down \the [L]!")) // Strong Variant /mob/living/simple_mob/faithless/strong diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm b/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm index f18f005808..b359d9a458 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm @@ -203,13 +203,13 @@ if(target && istype(target)) if(target.client) - to_chat(target, "You feel as though you are losing your sense of direction! Brace yourself!") + to_chat(target, span_critical("You feel as though you are losing your sense of direction! Brace yourself!")) new /obj/effect/temp_visual/pre_confuse(get_turf(target)) spawn(5 SECONDS) if(target) target.Confuse(3) if(target.client) - to_chat(target, "You feel confused!") + to_chat(target, span_critical("You feel confused!")) new /obj/effect/temp_visual/confuse(get_turf(target)) /mob/living/simple_mob/glitch_boss/proc/bullethell(atom/A) diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm index 3767512c1b..383c25a395 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm @@ -229,11 +229,11 @@ var/list/_slime_default_emotes = list( /mob/living/simple_mob/slime/proc/remove_hat(var/mob/living/user) if(!hat) - to_chat(user, "\The [src] doesn't have a hat to remove.") + to_chat(user, span_warning("\The [src] doesn't have a hat to remove.")) else hat.forceMove(get_turf(src)) user.put_in_hands(hat) - to_chat(user, "You take away \the [src]'s [hat.name]. How mean.") + to_chat(user, span_warning("You take away \the [src]'s [hat.name]. How mean.")) hat = null update_icon() diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm index 613cb89858..f8ee94e227 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm @@ -569,8 +569,8 @@ stacks = MODIFIER_STACK_FORBID aura_max_distance = 2 - on_created_text = "Twinkling spores of goo surround you. It makes you feel healthier." - on_expired_text = "The spores of goo have faded, although you feel much healthier than before." + on_created_text = span_warning("Twinkling spores of goo surround you. It makes you feel healthier.") + on_expired_text = span_notice("The spores of goo have faded, although you feel much healthier than before.") /datum/modifier/aura/slime_heal/tick() if(holder.stat == DEAD) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm index 26d7dcb2d3..faeafaa866 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm @@ -65,7 +65,7 @@ // Does actual poison injection, after all checks passed. /mob/living/simple_mob/vore/bee/proc/inject_poison(mob/living/L, target_zone) if(prob(poison_chance)) - to_chat(L, "You feel a tiny prick.") + to_chat(L, span_warning("You feel a tiny prick.")) L.reagents.add_reagent(poison_type, poison_per_bite) /datum/say_list/bee diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm index 275a56664e..b22b06e29f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm @@ -301,11 +301,11 @@ I think I covered everything. set category = "Abilities" if(norange) - to_chat(src, "You don't have a breath attack!") + to_chat(src, span_userdanger("You don't have a breath attack!")) return flametoggle = !flametoggle - to_chat(src, "You will [flametoggle?"now breath":"no longer breath"] attack on harm intent.") + to_chat(src, span_notice("You will [flametoggle?"now breath":"no longer breath"] attack on harm intent.")) /mob/living/simple_mob/vore/bigdragon/proc/special_toggle() set name = "Toggle special attacks" @@ -313,11 +313,11 @@ I think I covered everything. set category = "Abilities" if(nospecial) - to_chat(src, "You don't have special attacks!") + to_chat(src, span_userdanger("You don't have special attacks!")) return specialtoggle = !specialtoggle - to_chat(src, "You will [specialtoggle?"now special":"no longer special"] attack on grab/disarm intent.") + to_chat(src, span_notice("You will [specialtoggle?"now special":"no longer special"] attack on grab/disarm intent.")) /// @@ -757,14 +757,14 @@ I think I covered everything. M.Weaken(5) if(!gentle) M.adjustBruteLoss(50) //A dragon just slammed ontop of you - to_chat(M, "You're slammed into the floor by [src]!") + to_chat(M, span_userdanger("You're slammed into the floor by [src]!")) else if(isliving(AM)) var/mob/living/M = AM M.Weaken(1.5) if(!gentle) M.adjustBruteLoss(20) - to_chat(M, "You're thrown back by [src]!") + to_chat(M, span_userdanger("You're thrown back by [src]!")) playsound(src, get_sfx("punch"), 50, 1) AM.throw_at(throwtarget, maxthrow, 3, src) @@ -825,7 +825,7 @@ I think I covered everything. set_AI_busy(FALSE) return var/obj/item/projectile/P = new /obj/item/projectile/bullet/dragon(get_turf(src)) - src.visible_message("\The [src] spews fire at \the [A]!") + src.visible_message(span_danger("\The [src] spews fire at \the [A]!")) playsound(src, "sound/weapons/Flamer.ogg", 50, 1) P.launch_projectile(A, BP_TORSO, src) set_AI_busy(FALSE) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm index 2ff98138eb..73b9cc71ef 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm @@ -5,15 +5,15 @@ var/turf/T = get_turf(src) if(!T.CanPass(src,T) || loc != T) - to_chat(src,"You can't use that here!") + to_chat(src,span_warning("You can't use that here!")) return FALSE if(shift_state && shift_state == AB_SHIFT_ACTIVE) - to_chat(src,"You can't do a shift while actively shifting!") + to_chat(src,span_warning("You can't do a shift while actively shifting!")) return FALSE if(!(locate(/obj/effect/decal/cleanable/blood) in src.loc)) - to_chat(src,"You need blood to shift between realities!") + to_chat(src,span_warning("You need blood to shift between realities!")) return FALSE forceMove(T) @@ -57,7 +57,7 @@ var/mob/living/target = pick(potentials) if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected) target.forceMove(vore_selected) - to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") + to_chat(target,span_vwarning("\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!")) // Do this after the potential vore, so we get the belly update_icon() @@ -114,15 +114,15 @@ var/turf/T = get_turf(src) if(shift_state && shift_state == AB_SHIFT_PASSIVE) - to_chat(src,"You can't do a shift while passively shifting!") + to_chat(src,span_warning("You can't do a shift while passively shifting!")) return FALSE if(shifted_out) - to_chat(src,"You can't return to the physical world yet!") + to_chat(src,span_warning("You can't return to the physical world yet!")) return FALSE if(world.time - last_shift < 600) - to_chat(src,"You can't temporarily shift so soon! You need to wait [round(((last_shift+600)-world.time)/10)] second\s!") + to_chat(src,span_warning("You can't temporarily shift so soon! You need to wait [round(((last_shift+600)-world.time)/10)] second\s!")) return FALSE shift_state = AB_SHIFT_ACTIVE @@ -201,7 +201,7 @@ var/mob/living/target = pick(potentials) if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected) target.forceMove(vore_selected) - to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") + to_chat(target,span_vwarning("\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!")) // Do this after the potential vore, so we get the belly update_icon() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm index 321788b775..fed12356a1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm @@ -78,16 +78,16 @@ if(tgui_alert(src, "Do you want to wrest control over your body back from \the [prey_name]?", "Regain Control",list("No","Yes")) != "Yes") return - to_chat(src, "You begin to resist \the [prey_name]'s control!!!") - to_chat(pred_body, "You feel the captive mind of [src] begin to resist your control.") + to_chat(src, span_danger("You begin to resist \the [prey_name]'s control!!!")) + to_chat(pred_body, span_danger("You feel the captive mind of [src] begin to resist your control.")) if(do_after(src, 10 SECONDS, exclusive = TRUE)) restore_control() else - to_chat(src, "Your attempt to regain control has been interrupted...") - to_chat(pred_body, "The dominant sensation fades away...") + to_chat(src, span_notice("Your attempt to regain control has been interrupted...")) + to_chat(pred_body, span_notice("The dominant sensation fades away...")) else - to_chat(src, "\The [pred_body] is already dominated, and cannot be controlled at this time.") + to_chat(src, span_warning("\The [pred_body] is already dominated, and cannot be controlled at this time.")) ..() /mob/living/dominated_brain/proc/restore_control(ask = TRUE) @@ -187,47 +187,47 @@ if(isbelly(pocketpal.card.loc)) pred = pocketpal.card.loc.loc else - to_chat(prey, "You are not inside anyone.") + to_chat(prey, span_notice("You are not inside anyone.")) return if(prey.stat == DEAD) - to_chat(prey, "You cannot do that in your current state.") + to_chat(prey, span_warning("You cannot do that in your current state.")) return if(!pred.allow_mind_transfer) - to_chat(prey, "[pred] is unable to be dominated.") + to_chat(prey, span_warning("[pred] is unable to be dominated.")) return if(!pred.ckey) - to_chat(prey, "\The [pred] isn't able to be dominated.") + to_chat(prey, span_notice("\The [pred] isn't able to be dominated.")) return if(isrobot(pred) && jobban_isbanned(prey, JOB_CYBORG)) - to_chat(prey, "Forces beyond your comprehension forbid you from taking control of [pred].") + to_chat(prey, span_warning("Forces beyond your comprehension forbid you from taking control of [pred].")) return if(prey.prey_controlled) - to_chat(prey, "You are already controlling someone, you can't control anyone else at this time.") + to_chat(prey, span_warning("You are already controlling someone, you can't control anyone else at this time.")) return if(pred.prey_controlled) - to_chat(prey, "\The [pred] is already dominated, and cannot be controlled at this time.") + to_chat(prey, span_warning("\The [pred] is already dominated, and cannot be controlled at this time.")) return if(tgui_alert(prey, "You are attempting to take over [pred], are you sure? Ensure that their preferences align with this kind of play.", "Take Over Predator",list("No","Yes")) != "Yes") return - to_chat(prey, "You attempt to exert your control over \the [pred]...") + to_chat(prey, span_notice("You attempt to exert your control over \the [pred]...")) log_admin("[key_name_admin(prey)] attempted to take over [pred].") if(tgui_alert(pred, "\The [prey] has elected to attempt to take control of you. Is this something you will allow to happen?", "Allow Prey Domination",list("No","Yes")) != "Yes") - to_chat(prey, "\The [pred] declined your request for control.") + to_chat(prey, span_warning("\The [pred] declined your request for control.")) return if(tgui_alert(pred, "Are you sure? If you should decide to revoke this, you will have the ability to do so in your 'Abilities' tab.", "Allow Prey Domination",list("No","Yes")) != "Yes") return - to_chat(pred, "You can feel the will of another overwriting your own, control of your body being sapped away from you...") - to_chat(prey, "You can feel the will of your host diminishing as you exert your will over them!") + to_chat(pred, span_warning("You can feel the will of another overwriting your own, control of your body being sapped away from you...")) + to_chat(prey, span_warning("You can feel the will of your host diminishing as you exert your will over them!")) if(!do_after(prey, 10 SECONDS, exclusive = TRUE)) - to_chat(prey, "Your attempt to regain control has been interrupted...") - to_chat(pred, "The dominant sensation fades away...") + to_chat(prey, span_notice("Your attempt to regain control has been interrupted...")) + to_chat(pred, span_notice("The dominant sensation fades away...")) return - to_chat(prey, "You plunge your conciousness into \the [pred], assuming control over their very body, leaving your own behind within \the [pred]'s [loc].") - to_chat(pred, "You feel your body move on its own, as you are pushed to the background, and an alien consciousness displaces yours.") + to_chat(prey, span_danger("You plunge your conciousness into \the [pred], assuming control over their very body, leaving your own behind within \the [pred]'s [loc].")) + to_chat(pred, span_danger("You feel your body move on its own, as you are pushed to the background, and an alien consciousness displaces yours.")) var/mob/living/dominated_brain/pred_brain var/delete_source = FALSE if(istype(prey, /mob/living/dominated_brain)) @@ -279,13 +279,13 @@ if(istype(I, /mob/living/dominated_brain)) var/mob/living/dominated_brain/db = I if(db.ckey == db.pred_ckey) - to_chat(src, "You ease off of your control, releasing \the [db].") - to_chat(db, "You feel the alien presence fade, and restore control of your body to you of their own will...") + to_chat(src, span_notice("You ease off of your control, releasing \the [db].")) + to_chat(db, span_notice("You feel the alien presence fade, and restore control of your body to you of their own will...")) db.restore_control() return else continue - to_chat(src, "You haven't been taken over, and shouldn't have this verb. I'll clean that up for you. Report this on the github, it is a bug.") + to_chat(src, span_danger("You haven't been taken over, and shouldn't have this verb. I'll clean that up for you. Report this on the github, it is a bug.")) verbs -= /mob/proc/release_predator /mob/living/dominated_brain/proc/resist_control() @@ -296,16 +296,16 @@ dominate_predator() return if(pred_ckey == ckey && pred_body.prey_controlled) - to_chat(src, "You begin to resist \the [prey_name]'s control!!!") - to_chat(pred_body, "You feel the captive mind of [src] begin to resist your control.") + to_chat(src, span_danger("You begin to resist \the [prey_name]'s control!!!")) + to_chat(pred_body, span_danger("You feel the captive mind of [src] begin to resist your control.")) if(do_after(src, 10 SECONDS, exclusive = TRUE)) restore_control() else - to_chat(src, "Your attempt to regain control has been interrupted...") - to_chat(pred_body, "The dominant sensation fades away...") + to_chat(src, span_notice("Your attempt to regain control has been interrupted...")) + to_chat(pred_body, span_notice("The dominant sensation fades away...")) else - to_chat(src, "\The [pred_body] is already dominated, and cannot be controlled at this time.") + to_chat(src, span_warning("\The [pred_body] is already dominated, and cannot be controlled at this time.")) /mob/living/proc/dominate_prey() set category = "Abilities" @@ -320,35 +320,35 @@ else continue if(!possible_mobs) - to_chat(src, "There are no valid targets inside of you.") + to_chat(src, span_warning("There are no valid targets inside of you.")) return var/input = tgui_input_list(src, "Select a mob to dominate:", "Dominate Prey", possible_mobs) if(!input) return var/mob/living/M = input if(!M.allow_mind_transfer) //check if the dominated mob pref is enabled - to_chat(src, "[M] is unable to be dominated.") + to_chat(src, span_warning("[M] is unable to be dominated.")) return if(tgui_alert(src, "You selected [M] to attempt to dominate. Are you sure?", "Dominate Prey",list("No","Yes")) != "Yes") return log_admin("[key_name_admin(src)] offered to use dominate prey on [M] ([M.ckey]).") - to_chat(src, "Attempting to dominate and gather \the [M]'s mind...") + to_chat(src, span_warning("Attempting to dominate and gather \the [M]'s mind...")) if(tgui_alert(M, "\The [src] has elected collect your mind into their own. Is this something you will allow to happen?", "Allow Dominate Prey",list("No","Yes")) != "Yes") - to_chat(src, "\The [M] has declined your Dominate Prey attempt.") + to_chat(src, span_warning("\The [M] has declined your Dominate Prey attempt.")) return if(tgui_alert(M, "Are you sure? You can only undo this while your body is inside of [src]. (You can resist, or use the resist verb in the abilities tab)", "Allow Dominate Prey",list("No","Yes")) != "Yes") - to_chat(src, "\The [M] has declined your Dominate Prey attempt.") + to_chat(src, span_warning("\The [M] has declined your Dominate Prey attempt.")) return - to_chat(M, "You can feel the will of another pulling you away from your body...") - to_chat(src, "You can feel the will of your prey diminishing as you gather them!") + to_chat(M, span_warning("You can feel the will of another pulling you away from your body...")) + to_chat(src, span_warning("You can feel the will of your prey diminishing as you gather them!")) if(!do_after(src, 10 SECONDS, exclusive = TRUE)) - to_chat(M, "The alien presence fades, and you are left along in your body...") - to_chat(src, "Your attempt to gather [M]'s mind has been interrupted.") + to_chat(M, span_notice("The alien presence fades, and you are left along in your body...")) + to_chat(src, span_notice("Your attempt to gather [M]'s mind has been interrupted.")) return if(!isbelly(M.loc)) - to_chat(M, "The alien presence fades, and you are left along in your body...") - to_chat(src, "Your attempt to gather [M]'s mind has been interrupted.") + to_chat(M, span_notice("The alien presence fades, and you are left along in your body...")) + to_chat(src, span_notice("Your attempt to gather [M]'s mind has been interrupted.")) return var/mob/living/dominated_brain/db = new /mob/living/dominated_brain(src, src, M.name, M) @@ -374,8 +374,8 @@ db.ckey = db.prey_ckey log_admin("[db] ([db.ckey]) has agreed to [src]'s dominate prey attempt, and so no longer occupies their original body.") - to_chat(src, "You feel your mind expanded as [M] is incorporated into you.") - to_chat(M, "Your mind is gathered into \the [src], becoming part of them...") + to_chat(src, span_notice("You feel your mind expanded as [M] is incorporated into you.")) + to_chat(M, span_warning("Your mind is gathered into \the [src], becoming part of them...")) /mob/living/dominated_brain/proc/cease_this_foolishness() set category = "Abilities" @@ -383,25 +383,25 @@ set desc = "If your body is inside of your predator still, attempts to re-insert yourself into it." if(prey_body && prey_body.loc.loc == pred_body) - to_chat(src, "You exert your will and attempt to return to yout body!!!") - to_chat(pred_body, "\The [src] resists your hold and attempts to return to their body!") + to_chat(src, span_notice("You exert your will and attempt to return to yout body!!!")) + to_chat(pred_body, span_warning("\The [src] resists your hold and attempts to return to their body!")) if(do_after(src, 10 SECONDS, exclusive = TRUE)) if(prey_body && prey_body.loc.loc == pred_body) prey_body.ckey = prey_ckey pred_body.absorb_langs() - to_chat(src, "Your connection to [pred_body] fades, and you awaken back in your own body!") - to_chat(pred_body, "You feel as though a piece of yourself is missing, as \the [src] returns to their body.") + to_chat(src, span_warning("Your connection to [pred_body] fades, and you awaken back in your own body!")) + to_chat(pred_body, span_warning("You feel as though a piece of yourself is missing, as \the [src] returns to their body.")) log_admin("[src] ([src.ckey]) has returned to their body, [prey_body].") qdel(src) else - to_chat(src, "Your attempt to regain your body has been interrupted...") + to_chat(src, span_warning("Your attempt to regain your body has been interrupted...")) else - to_chat(src, "Your attempt to regain your body has been interrupted...") + to_chat(src, span_warning("Your attempt to regain your body has been interrupted...")) else if(prey_body) - to_chat(src, "You can sense your body... but it is not contained within [pred_body]... You cannot return to it at this time.") + to_chat(src, span_warning("You can sense your body... but it is not contained within [pred_body]... You cannot return to it at this time.")) else - to_chat(src, "Your body seems to no longer exist, so, you cannot return to it.") + to_chat(src, span_warning("Your body seems to no longer exist, so, you cannot return to it.")) verbs -= /mob/living/dominated_brain/proc/cease_this_foolishness /mob/living/proc/lend_prey_control() @@ -417,7 +417,7 @@ else continue if(!possible_mobs) - to_chat(src, "There are no valid targets inside of you.") + to_chat(src, span_warning("There are no valid targets inside of you.")) return var/input = tgui_input_list(src, "Select a mob to give control:", "Give Prey Control", possible_mobs) if(!input) @@ -426,39 +426,39 @@ var/mob/living/pred = src if(prey.stat == DEAD) - to_chat(pred, "You cannot do that to this prey.") + to_chat(pred, span_warning("You cannot do that to this prey.")) return if(!prey.ckey) - to_chat(pred, "\The [prey] cannot take control.") + to_chat(pred, span_notice("\The [prey] cannot take control.")) return if(isrobot(pred) && jobban_isbanned(prey, JOB_CYBORG)) - to_chat(pred, "Forces beyond your comprehension prevent you from giving [prey] control.") + to_chat(pred, span_warning("Forces beyond your comprehension prevent you from giving [prey] control.")) return if(prey.prey_controlled) - to_chat(pred, "\The [prey] is already under someone's control and cannot be given control of your body.") + to_chat(pred, span_warning("\The [prey] is already under someone's control and cannot be given control of your body.")) return if(pred.prey_controlled) - to_chat(pred, "You are already controlling someone's body.") + to_chat(pred, span_warning("You are already controlling someone's body.")) return if(tgui_alert(pred, "You are attempting to give [prey] control over you, are you sure? Ensure that their preferences align with this kind of play.", "Give Prey Control",list("No","Yes")) != "Yes") return - to_chat(pred, "You attempt to give your control over to \the [prey]...") + to_chat(pred, span_notice("You attempt to give your control over to \the [prey]...")) log_admin("[key_name_admin(pred)] attempted to give control to [prey].") if(tgui_alert(prey, "\The [pred] has elected to attempt to give you control of them. Is this something you will allow to happen?", "Allow Prey Domination",list("No","Yes")) != "Yes") - to_chat(pred, "\The [prey] declined your request for control.") + to_chat(pred, span_warning("\The [prey] declined your request for control.")) return if(tgui_alert(prey, "Are you sure? If you should decide to revoke this, you will have the ability to do so in your 'Abilities' tab.", "Allow Prey Domination",list("No","Yes")) != "Yes") return - to_chat(pred, "You diminish your will, reducing it and allowing will of your prey to take over...") - to_chat(prey, "You can feel the will of your host diminishing as you are given control over them!") + to_chat(pred, span_warning("You diminish your will, reducing it and allowing will of your prey to take over...")) + to_chat(prey, span_warning("You can feel the will of your host diminishing as you are given control over them!")) if(!do_after(pred, 10 SECONDS, exclusive = TRUE)) - to_chat(pred, "Your attempt to share control has been interrupted...") - to_chat(prey, "The dominant sensation fades away...") + to_chat(pred, span_notice("Your attempt to share control has been interrupted...")) + to_chat(prey, span_notice("The dominant sensation fades away...")) return - to_chat(prey, "You plunge your conciousness into \the [pred], assuming control over their very body, leaving your own behind within \the [pred]'s [loc].") - to_chat(pred, "You feel your body move on its own, as you move to the background, and an alien consciousness displaces yours.") + to_chat(prey, span_danger("You plunge your conciousness into \the [pred], assuming control over their very body, leaving your own behind within \the [pred]'s [loc].")) + to_chat(pred, span_danger("You feel your body move on its own, as you move to the background, and an alien consciousness displaces yours.")) var/mob/living/dominated_brain/pred_brain var/delete_source = FALSE if(istype(prey, /mob/living/dominated_brain)) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm b/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm index e2b473629d..3251532c59 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm @@ -108,10 +108,10 @@ if(!has_AI())//No autobarf on player control. return if(istype(O, /obj/item/reagent_containers/food/snacks/donut) && istype(src, /mob/living/simple_mob/vore/greatwolf/black)) - to_chat(user,"The huge wolf begrudgingly accepts your offer in exchange for it's catch.") + to_chat(user,span_notice("The huge wolf begrudgingly accepts your offer in exchange for it's catch.")) release_vore_contents() else if(prob(2)) //Small chance to get prey out from white doggos - to_chat(user,"The huge wolf accepts your offer for their catch.") + to_chat(user,span_notice("The huge wolf accepts your offer for their catch.")) release_vore_contents() return . = ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm b/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm index 3affe18ba9..f4c499e798 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm @@ -104,7 +104,7 @@ if(istype(O, /obj/item/reagent_containers/food)) if(health <= 0) return - user.visible_message("\The [src] happily gulps down \the [O] right out of \the [user]'s hand, it seems pretty content now.","\The [src] happily gulps down \the [O] right out of your hand, it seems pretty content now.") + user.visible_message(span_notice("\The [src] happily gulps down \the [O] right out of \the [user]'s hand, it seems pretty content now."),span_notice("\The [src] happily gulps down \the [O] right out of your hand, it seems pretty content now.")) user.drop_from_inventory(O) qdel(O) well_fed = world.time diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/c_shift.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/c_shift.dm index a576a3e39e..70a0daad48 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/c_shift.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/c_shift.dm @@ -5,7 +5,7 @@ /mob/living/simple_mob/clowns/big/c_shift/proc/phase_shift() var/turf/T = get_turf(src) if(!T.CanPass(src,T) || loc != T) - to_chat(src,"You can't use that here!") + to_chat(src,span_warning("You can't use that here!")) return FALSE forceMove(T) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/hespawner.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/hespawner.dm index 42d553b8f1..cf4ac935a3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/hespawner.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/hespawner.dm @@ -13,7 +13,7 @@ cutoff_number = 1 /obj/structure/ghost_pod/manual/clegg/trigger() - ..("\The [usr] places their hand on the egg!", "is attempting to make a mistake!") + ..(span_warning("\The [usr] places their hand on the egg!"), "is attempting to make a mistake!") /obj/structure/ghost_pod/manual/clegg/create_occupant(var/mob/M) lightning_strike(get_turf(src), cosmetic = TRUE) @@ -23,8 +23,8 @@ var/mob/living/simple_mob/R = new chosen_clown(get_turf(src)) if(M.mind) M.mind.transfer_to(R) - to_chat(M, "You are a Clown!! HONK!") + to_chat(M, span_notice("You are a Clown!! HONK!")) R.ckey = M.ckey - visible_message("With a bright flash of light, \the [src] disappears, and in its place you see a... Clown?") + visible_message(span_warning("With a bright flash of light, \the [src] disappears, and in its place you see a... Clown?")) log_and_message_admins("successfully touched \a [src] and summoned a mistake!") ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm index 041eb8fe9f..92071f6f87 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm @@ -80,7 +80,7 @@ if(morphed) . = form.examine(user) if(get_dist(user, src) <= 3 && !resting) - . += "[form] doesn't look quite right..." + . += span_warning("[form] doesn't look quite right...") else . = ..() @@ -93,22 +93,22 @@ if(istype(A) && allowed(A)) assume(A) else - to_chat(src, "Your chameleon skin is still repairing itself!") + to_chat(src, span_warning("Your chameleon skin is still repairing itself!")) else ..() /mob/living/simple_mob/vore/morph/proc/assume(atom/movable/target) var/mob/living/carbon/human/humantarget = target if(istype(humantarget) && !humantarget.allow_mimicry) - to_chat(src, "[target] cannot be impersonated!") + to_chat(src, span_warning("[target] cannot be impersonated!")) return if(morphed) - to_chat(src, "You must restore to your original form first!") + to_chat(src, span_warning("You must restore to your original form first!")) return morphed = TRUE form = target - visible_message("[src] suddenly twists and changes shape, becoming a copy of [target]!") + visible_message(span_warning("[src] suddenly twists and changes shape, becoming a copy of [target]!")) color = null name = target.name desc = target.desc @@ -144,12 +144,12 @@ /mob/living/simple_mob/vore/morph/proc/restore(var/silent = FALSE) if(!morphed) - to_chat(src, "You're already in your normal form!") + to_chat(src, span_warning("You're already in your normal form!")) return morphed = FALSE if(!silent) - visible_message("[src] suddenly collapses in on itself, dissolving into a pile of flesh!") + visible_message(span_warning("[src] suddenly collapses in on itself, dissolving into a pile of flesh!")) form = null name = initial(name) @@ -189,7 +189,7 @@ /mob/living/simple_mob/vore/morph/death(gibbed) if(morphed) - visible_message("[src] twists and dissolves into a pile of flesh!") + visible_message(span_warning("[src] twists and dissolves into a pile of flesh!")) restore(TRUE) ..() @@ -209,10 +209,10 @@ //Stolen from protean blobs, ambush noms from resting! Doesn't hide you any better, but makes noms sneakier. if(resting) plane = ABOVE_OBJ_PLANE - to_chat(src,"Your form settles in, appearing more 'normal'... laying in wait.") + to_chat(src,span_notice("Your form settles in, appearing more 'normal'... laying in wait.")) else plane = MOB_PLANE - to_chat(src,"Your form quivers back to life, allowing you to move again!") + to_chat(src,span_notice("Your form quivers back to life, allowing you to move again!")) if(can_be_drop_pred) //Toggleable in vore panel var/list/potentials = living_mobs(0) if(potentials.len) @@ -221,7 +221,7 @@ if(target.buckled) target.buckled.unbuckle_mob(target, force = TRUE) target.forceMove(vore_selected) - to_chat(target,"\The [src] quickly engulfs you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") + to_chat(target,span_vwarning("\The [src] quickly engulfs you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!")) else ..() @@ -260,7 +260,7 @@ set category = "Abilities" set desc = "Take command of your prey's body." if(morphed) - to_chat(src, "You must restore to your original form first!") + to_chat(src, span_warning("You must restore to your original form first!")) return var/list/possible_mobs = list() for(var/obj/belly/B in src.vore_organs) @@ -273,7 +273,7 @@ if(!L) return if(!L.allow_mimicry) - to_chat(src, "\The [L] cannot be impersonated!") + to_chat(src, span_warning("\The [L] cannot be impersonated!")) return if(tgui_alert(src, "You selected [L] to attempt to take over. Are you sure?", "Take Over Prey",list("No","Yes")) == "Yes") log_admin("[key_name_admin(src)] offered [L] to swap bodies as a morph.") @@ -298,9 +298,9 @@ log_and_message_admins("[key_name_admin(src)] has swapped bodies with [key_name_admin(L)] as a morph at [get_area(src)] - [COORD(src)].") new /mob/living/simple_mob/vore/morph/dominated_prey(L.vore_selected, L.ckey, src, L) else - to_chat(src, "\The [L] declined your request for control.") + to_chat(src, span_warning("\The [L] declined your request for control.")) else - to_chat(src, "\The [L] declined your request for control.") + to_chat(src, span_warning("\The [L] declined your request for control.")) /mob/living/simple_mob/vore/morph/dominated_prey name = "subservient node" @@ -326,7 +326,7 @@ prey_body.ckey = parent_morph.original_ckey parent_morph.forceMove(src) name = "[prey_body.name]" - to_chat(prey_body, "You have completely assumed the form of [prey_body]. Your form is now unable to change anymore until you restore control back to them. You can do this by 'ejecting' them from your [prey_body.vore_selected]. This will not actually release them from your body in this state, but instead return control to them, and restore you to your original form.") + to_chat(prey_body, span_notice("You have completely assumed the form of [prey_body]. Your form is now unable to change anymore until you restore control back to them. You can do this by 'ejecting' them from your [prey_body.vore_selected]. This will not actually release them from your body in this state, but instead return control to them, and restore you to your original form.")) else qdel(src) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm index 82f28cae67..2ae22c5d3c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm @@ -130,7 +130,7 @@ inject_poison(L, target_zone) /mob/living/simple_mob/vore/oregrub/death() - visible_message("\The [src] shudders and collapses, expelling the ores it had devoured!") + visible_message(span_warning("\The [src] shudders and collapses, expelling the ores it had devoured!")) var/i = rand(min_ore,max_ore) while(i>1) var/ore = pick(/obj/item/ore/glass,/obj/item/ore/coal,/obj/item/ore/iron,/obj/item/ore/lead,/obj/item/ore/marble,/obj/item/ore/phoron,/obj/item/ore/silver,/obj/item/ore/gold) @@ -158,7 +158,7 @@ // Does actual poison injection, after all checks passed. /mob/living/simple_mob/vore/oregrub/proc/inject_poison(mob/living/L, target_zone) if(prob(poison_chance)) - to_chat(L, "You feel fire running through your veins!") + to_chat(L, span_warning("You feel fire running through your veins!")) L.reagents.add_reagent(poison_type, poison_per_bite) //I'm no good at writing this stuff, so I've just left it as placeholders and disabled the chances of them eating you. diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm index 16b7103f8d..ad3abb09ef 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm @@ -241,10 +241,10 @@ if(!has_AI())//No autobarf on player control. return if(istype(O, /obj/item/reagent_containers/food/snacks/donut) && istype(src, /mob/living/simple_mob/vore/otie/security)) - to_chat(user,"The guard pup accepts your offer for their catch.") + to_chat(user,span_notice("The guard pup accepts your offer for their catch.")) release_vore_contents() else if(prob(2)) //Small chance to get prey out from non-sec oties. - to_chat(user,"The pup accepts your offer for their catch.") + to_chat(user,span_notice("The pup accepts your offer for their catch.")) release_vore_contents() return . = ..() @@ -276,7 +276,7 @@ switch(M.a_intent) if(I_HELP) if(health > 0) - M.visible_message("[M] [response_help] \the [src].") + M.visible_message(span_notice("[M] [response_help] \the [src].")) if(has_AI()) var/datum/ai_holder/AI = ai_holder AI.set_stance(STANCE_IDLE) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm b/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm index af1aa363d5..b64e9e8b29 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm @@ -95,7 +95,7 @@ return ..() if(resting) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - user.visible_message("\The [user] shakes \the [src] awake.","You shake \the [src] awake!") + user.visible_message(span_notice("\The [user] shakes \the [src] awake."),span_notice("You shake \the [src] awake!")) lay_down() return else @@ -162,7 +162,7 @@ /mob/living/simple_mob/vore/pakkun/attackby(var/obj/item/O, var/mob/user) //if they're newspapered, they'll spit out any junk they've eaten for whatever reason if(istype(O, /obj/item/newspaper) && !ckey && isturf(user.loc)) - user.visible_message("[user] swats [src] with [O]!") + user.visible_message(span_info("[user] swats [src] with [O]!")) release_vore_contents() for(var/mob/living/L in living_mobs(0)) if(!(LAZYFIND(prey_excludes, L))) @@ -261,7 +261,7 @@ /mob/living/simple_mob/vore/pakkun/snapdragon/snappy/attack_hand(mob/living/carbon/human/M as mob) if(M.a_intent == I_HELP && !(M in petters)) - to_chat(M, "\The [src] gets a mischievous glint in her eye!!") + to_chat(M, span_notice("\The [src] gets a mischievous glint in her eye!!")) petters += M //YOU HAVE OFFERED YOURSELF TO THE LIZARD return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/plants.dm b/code/modules/mob/living/simple_mob/subtypes/vore/plants.dm index f2f3053c1c..af3ae2a989 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/plants.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/plants.dm @@ -164,7 +164,7 @@ /mob/living/simple_mob/vore/pitcher/proc/tongue(atom/A) var/obj/item/projectile/P = new /obj/item/projectile/beam/appendage(get_turf(src)) - src.visible_message("\The [src] launches a green appendage at \the [A]!") + src.visible_message(span_danger("\The [src] launches a green appendage at \the [A]!")) playsound(src, "sound/effects/slime_squish.ogg", 50, 1) P.launch_projectile(A, BP_TORSO, src)*/ diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/scel.dm b/code/modules/mob/living/simple_mob/subtypes/vore/scel.dm index 3b29caea2e..4215931467 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/scel.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/scel.dm @@ -189,7 +189,7 @@ /mob/living/simple_mob/vore/scel/proc/tongue(atom/A) var/obj/item/projectile/P = new /obj/item/projectile/beam/appendage(get_turf(src)) - src.visible_message("\The [src] launches a black appendage at \the [A]!") + src.visible_message(span_danger("\The [src] launches a black appendage at \the [A]!")) playsound(src, "sound/effects/slime_squish.ogg", 50, 1) P.launch_projectile(A, BP_TORSO, src) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm index 40355f7ab0..2927eb651c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm @@ -38,22 +38,22 @@ var/opts = clickprops["shift"] if(opts) - to_chat(my_kin,"[name] (Cost: [cost]%) - [desc]") + to_chat(my_kin,span_notice("[name] (Cost: [cost]%) - [desc]")) else do_ability(my_kin) /obj/effect/shadekin_ability/proc/do_ability() if(my_kin.stat) - to_chat(my_kin,"Can't use that ability in your state!") + to_chat(my_kin,span_warning("Can't use that ability in your state!")) return FALSE if(shift_mode == NOT_WHILE_SHIFTED && (my_kin.ability_flags & AB_PHASE_SHIFTED)) - to_chat(my_kin,"Can't use that ability while phase shifted!") + to_chat(my_kin,span_warning("Can't use that ability while phase shifted!")) return FALSE else if(shift_mode == ONLY_WHILE_SHIFTED && !(my_kin.ability_flags & AB_PHASE_SHIFTED)) - to_chat(my_kin,"Can only use that ability while phase shifted!") + to_chat(my_kin,span_warning("Can only use that ability while phase shifted!")) return FALSE else if(my_kin.energy < cost) - to_chat(my_kin,"Not enough energy for that ability!") + to_chat(my_kin,span_warning("Not enough energy for that ability!")) return FALSE my_kin.energy -= cost @@ -97,8 +97,8 @@ desc = "You feel serene and well rested." mob_overlay_state = "green_sparkles" - on_created_text = "Sparkles begin to appear around you, and all your ills seem to fade away." - on_expired_text = "The sparkles have faded, although you feel much healthier than before." + on_created_text = span_notice("Sparkles begin to appear around you, and all your ills seem to fade away.") + on_expired_text = span_notice("The sparkles have faded, although you feel much healthier than before.") stacks = MODIFIER_STACK_EXTEND /datum/modifier/shadekin/heal_boop/tick() @@ -129,8 +129,8 @@ desc = "Darkness envelops you." mob_overlay_state = "" - on_created_text = "You drag part of The Dark into realspace, enveloping yourself." - on_expired_text = "You lose your grasp on The Dark and realspace reasserts itself." + on_created_text = span_notice("You drag part of The Dark into realspace, enveloping yourself.") + on_expired_text = span_warning("You lose your grasp on The Dark and realspace reasserts itself.") stacks = MODIFIER_STACK_EXTEND var/mob/living/simple_mob/shadekin/my_kin @@ -165,4 +165,4 @@ /obj/effect/shadekin_ability/energy_feast/do_ability() if(!..()) return -*/ \ No newline at end of file +*/ diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm index d094bd9114..09bebbd3a4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm @@ -2,7 +2,7 @@ /mob/living/simple_mob/shadekin/proc/phase_shift() var/turf/T = get_turf(src) if(!T.CanPass(src,T) || loc != T) - to_chat(src,"You can't use that here!") + to_chat(src,span_warning("You can't use that here!")) return FALSE forceMove(T) @@ -45,7 +45,7 @@ var/mob/living/target = pick(potentials) if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected) target.forceMove(vore_selected) - to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") + to_chat(target,span_vwarning("\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!")) // Do this after the potential vore, so we get the belly update_icon() @@ -120,7 +120,7 @@ for(var/mob/living/L in viewed) targets += L if(!targets.len) - to_chat(src,"Nobody nearby to mend!") + to_chat(src,span_warning("Nobody nearby to mend!")) return FALSE var/mob/living/target = tgui_input_list(src,"Pick someone to mend:","Mend Other", targets) @@ -128,6 +128,6 @@ return FALSE target.add_modifier(/datum/modifier/shadekin/heal_boop,1 MINUTE) - visible_message("\The [src] gently places a hand on \the [target]...") + visible_message(span_notice("\The [src] gently places a hand on \the [target]...")) face_atom(target) return TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm index 3c54c12639..b7108a9ae3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm @@ -381,7 +381,7 @@ if((get_dist(src,henlo_human) <= 1)) dir = moving_to if(prob(speak_chance)) - visible_message("\The [src] [pick(friendly)] \the [henlo_human].") + visible_message(span_notice("\The [src] [pick(friendly)] \the [henlo_human].")) shy_approach = FALSE //ACCLIMATED lifes_since_move = 0 return //No need to move diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm index 7b388055e8..30ac297628 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm @@ -93,7 +93,7 @@ if(!harvestable_wool) return ..() if(do_after(user, 3 SECONDS, exclusive = TASK_USER_EXCLUSIVE, target = src)) - user.visible_message("\The [user] shears \the [src] with \the [O].","You shear \the [src] with \the [O].") + user.visible_message(span_notice("\The [user] shears \the [src] with \the [O]."),span_notice("You shear \the [src] with \the [O].")) var/obj/item/stack/material/fur/wool/W = new(get_turf(user)) harvestable_wool = FALSE update_icon() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm b/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm index 9eed371799..aaf4ccfd7c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm @@ -279,25 +279,25 @@ /mob/living/simple_mob/vore/woof/hostile/aweful/death() . = ..() if(killswitch) - visible_message("\The [src] evaporates into nothing...") + visible_message(span_notice("\The [src] evaporates into nothing...")) qdel(src) return var/thismany = rand(0,3) var/list/possiblewoofs = list(/mob/living/simple_mob/vore/woof/hostile/aweful/melee, /mob/living/simple_mob/vore/woof/hostile/aweful/ranged) if(thismany == 0) - visible_message("\The [src] evaporates into nothing...") + visible_message(span_notice("\The [src] evaporates into nothing...")) if(thismany >= 1) var/thiswoof = pick(possiblewoofs) new thiswoof(loc, src) - visible_message("Another [src] appears!") + visible_message(span_warning("Another [src] appears!")) if(thismany >= 2) var/thiswoof = pick(possiblewoofs) new thiswoof(loc, src) - visible_message("Another [src] appears!") + visible_message(span_warning("Another [src] appears!")) if(thismany >= 3) var/thiswoof = pick(possiblewoofs) new thiswoof(loc, src) - visible_message("Another [src] appears!") + visible_message(span_warning("Another [src] appears!")) qdel(src) /mob/living/simple_mob/vore/woof/hostile/aweful/melee diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm index 1a866bf5ed..95eb4bca09 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm @@ -112,7 +112,7 @@ List of things solar grubs should be able to do: var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(5, 1, L) s.start() - visible_message("The grub releases a powerful shock!") + visible_message(span_danger("The grub releases a powerful shock!")) else if(L.reagents) var/target_zone = pick(BP_TORSO,BP_TORSO,BP_TORSO,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_HEAD) @@ -122,7 +122,7 @@ List of things solar grubs should be able to do: // Does actual poison injection, after all checks passed. /mob/living/simple_mob/vore/solargrub/proc/inject_poison(mob/living/L, target_zone) if(prob(poison_chance)) - to_chat(L, "You feel a small shock rushing through your veins.") + to_chat(L, span_warning("You feel a small shock rushing through your veins.")) L.reagents.add_reagent(poison_type, poison_per_bite) /mob/living/simple_mob/vore/solargrub/death() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm index 543e373113..1f91fdb592 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm @@ -122,7 +122,7 @@ var/global/list/grub_machine_overlays = list() set_AI_busy(TRUE) forceMove(M) powermachine.draining = 2 - visible_message("\The [src] finds an opening and crawls inside \the [M].") + visible_message(span_warning("\The [src] finds an opening and crawls inside \the [M].")) if(!(M.type in grub_machine_overlays)) generate_machine_effect(M) machine_effect = image(grub_machine_overlays[M.type], M) //Can't do this the reasonable way with an overlay, @@ -176,7 +176,7 @@ var/global/list/grub_machine_overlays = list() /mob/living/simple_mob/animal/solargrub_larva/proc/expand_grub() eject_from_machine() - visible_message("\The [src] suddenly balloons in size!") + visible_message(span_warning("\The [src] suddenly balloons in size!")) log_game("A larva has matured into a grub in area [src.loc.name] ([src.x],[src.y],[src.z]") var/mob/living/simple_mob/vore/solargrub/adult = new(get_turf(src)) adult.tracked = tracked @@ -297,6 +297,6 @@ var/global/list/grub_machine_overlays = list() var/mob/living/simple_mob/animal/solargrub_larva/grub = locate() in O if(grub) grub.eject_from_machine(O) - to_chat(user, "You disturb a grub nesting in \the [O]!") + to_chat(user, span_warning("You disturb a grub nesting in \the [O]!")) return return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm index 21b17eca5e..195480b680 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm @@ -54,7 +54,7 @@ set desc = "Sets your mobs name. You only get to do this once." set category = "Abilities" if(limit_renames && nameset) - to_chat(src, "You've already set your name. Ask an admin to toggle \"nameset\" to 0 if you really must.") + to_chat(src, span_userdanger("You've already set your name. Ask an admin to toggle \"nameset\" to 0 if you really must.")) return var/newname newname = sanitizeSafe(tgui_input_text(src,"Set your name. You only get to do this once. Max 52 chars.", "Name set","", MAX_NAME_LEN), MAX_NAME_LEN) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm b/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm index 392fba99fd..29dd6002a1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm @@ -165,7 +165,7 @@ /* //VOREStation AI Temporary removal /mob/living/simple_mob/animal/passive/cat/PunchTarget() if(istype(target_mob,/mob/living/simple_mob/animal/passive/mouse)) - visible_message("\The [src] pounces on \the [target_mob]!]") + visible_message(span_warning("\The [src] pounces on \the [target_mob]!]")) target_mob.Stun(5) return EatTarget() else ..() diff --git a/code/modules/mob/living/voice/voice.dm b/code/modules/mob/living/voice/voice.dm index 7d1a32429d..3924029ece 100644 --- a/code/modules/mob/living/voice/voice.dm +++ b/code/modules/mob/living/voice/voice.dm @@ -83,14 +83,14 @@ var/new_name = sanitizeSafe(tgui_input_text(src, "Who would you like to be now?", "Communicator", src.client.prefs.real_name, MAX_NAME_LEN), MAX_NAME_LEN) if(new_name) if(comm) - comm.visible_message("[icon2html(comm,viewers(comm))] [src.name] has left, and now you see [new_name].") + comm.visible_message(span_notice("[icon2html(comm,viewers(comm))] [src.name] has left, and now you see [new_name].")) //Do a bit of logging in-case anyone tries to impersonate other characters for whatever reason. var/msg = "[src.client.key] ([src]) has changed their communicator identity's name to [new_name]." message_admins(msg) log_game(msg) src.name = new_name else - to_chat(src, "Invalid name. Rejected.") + to_chat(src, span_warning("Invalid name. Rejected.")) // Proc: Life() // Parameters: None diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 42936d230e..81dbc7350b 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -90,7 +90,7 @@ return // Added voice muffling for Issue 41. if(stat == UNCONSCIOUS || sleeping > 0) - to_chat(src, "... You can almost hear someone talking ...") + to_chat(src, span_filter_notice("... You can almost hear someone talking ...")) else if(client && client.prefs.chat_timestamp) // TG-Chat filters latch directly to the spans, we no longer need that @@ -330,14 +330,14 @@ /mob/proc/warn_flavor_changed() if(flavor_text && flavor_text != "") // don't spam people that don't use it! - to_chat(src, "

    OOC Warning:

    ") - to_chat(src, "Your flavor text is likely out of date! Change") + to_chat(src, span_filter_notice("

    OOC Warning:

    ")) + to_chat(src, span_filter_notice(span_alert("Your flavor text is likely out of date! Change"))) /mob/proc/print_flavor_text() if (flavor_text && flavor_text != "") var/msg = replacetext(flavor_text, "\n", " ") if(length(msg) <= 40) - return "[msg]" + return span_notice("[msg]") else return "[copytext_preserve_html(msg, 1, 37)]... More..." @@ -387,7 +387,7 @@ set category = "OOC" if(stat != DEAD || !ticker) - to_chat(usr, "You must be dead to use this!") + to_chat(usr, span_notice("You must be dead to use this!")) return // Final chance to abort "respawning" @@ -404,7 +404,7 @@ for(var/datum/objective/O in all_objectives) if(O.target == src.mind) if(O.owner && O.owner.current) - to_chat(O.owner.current,"You get the feeling your target is no longer within your reach...") + to_chat(O.owner.current,span_warning("You get the feeling your target is no longer within your reach...")) qdel(O) //Resleeving cleanup @@ -435,7 +435,7 @@ //This removes them from being 'active' list on join screen src.mind.assigned_role = null - to_chat(src,"Your job has been free'd up, and you can rejoin as another character or quit. Thanks for properly quitting round, it helps the server!") + to_chat(src,span_notice("Your job has been free'd up, and you can rejoin as another character or quit. Thanks for properly quitting round, it helps the server!")) // Beyond this point, you're going to respawn @@ -483,7 +483,7 @@ if(client.holder && (client.holder.rights & R_ADMIN|R_EVENT)) is_admin = 1 else if(stat != DEAD || istype(src, /mob/new_player)) - to_chat(usr, "[span_blue("You must be observing to use this!")]") + to_chat(usr, span_filter_notice("[span_blue("You must be observing to use this!")]")) return if(is_admin && stat == DEAD) @@ -563,22 +563,22 @@ return if (AM.anchored) - to_chat(src, "It won't budge!") + to_chat(src, span_warning("It won't budge!")) return var/mob/M = AM if(ismob(AM)) if(!can_pull_mobs || !can_pull_size) - to_chat(src, "They won't budge!") + to_chat(src, span_warning("They won't budge!")) return if((mob_size < M.mob_size) && (can_pull_mobs != MOB_PULL_LARGER)) - to_chat(src, "[M] is too large for you to move!") + to_chat(src, span_warning("[M] is too large for you to move!")) return if((mob_size == M.mob_size) && (can_pull_mobs == MOB_PULL_SMALLER)) - to_chat(src, "[M] is too heavy for you to move!") + to_chat(src, span_warning("[M] is too heavy for you to move!")) return // If your size is larger than theirs and you have some @@ -594,7 +594,7 @@ else qdel(G) if(!.) - to_chat(src, "Somebody has a grip on them!") + to_chat(src, span_warning("Somebody has a grip on them!")) return if(!iscarbon(src)) @@ -605,7 +605,7 @@ else if(isobj(AM)) var/obj/I = AM if(!can_pull_size || can_pull_size < I.w_class) - to_chat(src, "It won't budge!") + to_chat(src, span_warning("It won't budge!")) return if(pulling) @@ -634,7 +634,7 @@ playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 25) //Quieter than hugging/grabbing but we still want some audio feedback if(H.pull_damage()) - to_chat(src, "[span_red("Pulling \the [H] in their current condition would probably be a bad idea.")]") + to_chat(src, span_filter_notice("[span_red("Pulling \the [H] in their current condition would probably be a bad idea.")]")) //Attempted fix for people flying away through space when cuffed and dragged. if(ismob(AM)) @@ -967,11 +967,11 @@ usr.setClickCooldown(20) if(usr.stat == 1) - to_chat(usr, "You are unconcious and cannot do that!") + to_chat(usr, span_filter_notice("You are unconcious and cannot do that!")) return if(usr.restrained()) - to_chat(usr, "You are restrained and cannot do that!") + to_chat(usr, span_filter_notice("You are restrained and cannot do that!")) return var/mob/S = src @@ -985,17 +985,17 @@ valid_objects = get_visible_implants(0) if(!valid_objects.len) if(self) - to_chat(src, "You have nothing stuck in your body that is large enough to remove.") + to_chat(src, span_filter_notice("You have nothing stuck in your body that is large enough to remove.")) else - to_chat(U, "[src] has nothing stuck in their wounds that is large enough to remove.") + to_chat(U, span_filter_notice("[src] has nothing stuck in their wounds that is large enough to remove.")) return var/obj/item/selection = tgui_input_list(usr, "What do you want to yank out?", "Embedded objects", valid_objects) if(self) - to_chat(src, "You attempt to get a good grip on [selection] in your body.") + to_chat(src, span_warning("You attempt to get a good grip on [selection] in your body.")) else - to_chat(U, "You attempt to get a good grip on [selection] in [S]'s body.") + to_chat(U, span_warning("You attempt to get a good grip on [selection] in [S]'s body.")) if(!do_after(U, 30)) return @@ -1003,9 +1003,9 @@ return if(self) - visible_message("[src] rips [selection] out of their body.","You rip [selection] out of your body.") + visible_message(span_warning("[src] rips [selection] out of their body."),span_warning("You rip [selection] out of your body.")) else - visible_message("[usr] rips [selection] out of [src]'s body.","[usr] rips [selection] out of your body.") + visible_message(span_warning("[usr] rips [selection] out of [src]'s body."),span_warning("[usr] rips [selection] out of your body.")) valid_objects = get_visible_implants(0) if(valid_objects.len == 1) //Yanking out last object - removing verb. src.verbs -= /mob/proc/yank_out_object @@ -1072,9 +1072,9 @@ set_face_dir() if(!facing_dir) - to_chat(usr, "You are now not facing anything.") + to_chat(usr, span_filter_notice("You are now not facing anything.")) else - to_chat(usr, "You are now facing [dir2text(facing_dir)].") + to_chat(usr, span_filter_notice("You are now facing [dir2text(facing_dir)].")) /mob/proc/set_face_dir(var/newdir) if(newdir == facing_dir) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 8ce6e2d76a..70b99d2ad0 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -47,8 +47,8 @@ return affecting.grabbed_by += src - affecting.reveal("You are revealed as [assailant] grabs you.") - assailant.reveal("You reveal yourself as you grab [affecting].") + affecting.reveal(span_warning("You are revealed as [assailant] grabs you.")) + assailant.reveal(span_warning("You reveal yourself as you grab [affecting].")) hud = new /obj/screen/grab(src) hud.icon_state = "reinforce" @@ -166,12 +166,12 @@ switch(target_zone) if(O_MOUTH) if(announce) - user.visible_message("\The [user] covers [target]'s mouth!") + user.visible_message(span_warning("\The [user] covers [target]'s mouth!")) if(target.silent < 3) target.silent = 3 if(O_EYES) if(announce) - assailant.visible_message("[assailant] covers [affecting]'s eyes!") + assailant.visible_message(span_warning("[assailant] covers [affecting]'s eyes!")) if(affecting.eye_blind < 3) affecting.Blind(3) //VOREStation Edit @@ -179,7 +179,7 @@ if(force_down) if(user.a_intent == I_HELP) if(announce) - assailant.visible_message("[assailant] sits on [target]'s face!") + assailant.visible_message(span_warning("[assailant] sits on [target]'s face!")) //VOREStation Edit End /obj/item/grab/attack_self() @@ -254,9 +254,9 @@ if(!allow_upgrade) return if(!affecting.lying || size_difference(affecting, assailant) > 0) - assailant.visible_message("[assailant] has grabbed [affecting] aggressively (now hands)!") + assailant.visible_message(span_warning("[assailant] has grabbed [affecting] aggressively (now hands)!")) else - assailant.visible_message("[assailant] pins [affecting] down to the ground (now hands)!") + assailant.visible_message(span_warning("[assailant] pins [affecting] down to the ground (now hands)!")) apply_pinning(affecting, assailant) state = GRAB_AGGRESSIVE @@ -265,10 +265,10 @@ add_attack_logs(assailant, affecting, "Aggressively grabbed", FALSE) // Not important enough to notify admins, but still helpful. else if(state < GRAB_NECK) if(isslime(affecting)) - to_chat(assailant, "You squeeze [affecting], but nothing interesting happens.") + to_chat(assailant, span_notice("You squeeze [affecting], but nothing interesting happens.")) return - assailant.visible_message("[assailant] has reinforced [TU.his] grip on [affecting] (now neck)!") + assailant.visible_message(span_warning("[assailant] has reinforced [TU.his] grip on [affecting] (now neck)!")) state = GRAB_NECK icon_state = "grabbed+1" assailant.set_dir(get_dir(assailant, affecting)) @@ -277,11 +277,11 @@ hud.name = "kill" affecting.Stun(10) //10 ticks of ensured grab else if(state < GRAB_UPGRADING) - assailant.visible_message("[assailant] starts to tighten [TU.his] grip on [affecting]'s neck!") + assailant.visible_message(span_danger("[assailant] starts to tighten [TU.his] grip on [affecting]'s neck!")) hud.icon_state = "kill1" state = GRAB_KILL - assailant.visible_message("[assailant] has tightened [TU.his] grip on [affecting]'s neck!") + assailant.visible_message(span_danger("[assailant] has tightened [TU.his] grip on [affecting]'s neck!")) add_attack_logs(assailant,affecting,"Strangled") affecting.setClickCooldown(10) affecting.AdjustLosebreath(1) @@ -321,7 +321,7 @@ switch(assailant.a_intent) if(I_HELP) if(force_down) - to_chat(assailant, "You are no longer pinning [affecting] to the ground.") + to_chat(assailant, span_warning("You are no longer pinning [affecting] to the ground.")) force_down = 0 return if(state >= GRAB_AGGRESSIVE) @@ -355,7 +355,7 @@ /obj/item/grab/proc/reset_kill_state() if(state == GRAB_KILL) var/datum/gender/T = gender_datums[assailant.get_visible_gender()] - assailant.visible_message("[assailant] lost [T.his] tight grip on [affecting]'s neck!") + assailant.visible_message(span_warning("[assailant] lost [T.his] tight grip on [affecting]'s neck!")) hud.icon_state = "kill" state = GRAB_NECK @@ -394,7 +394,7 @@ reset_kill_state() return else if(grab_name) - affecting.visible_message("[affecting] has broken free of [assailant]'s [grab_name]!") + affecting.visible_message(span_warning("[affecting] has broken free of [assailant]'s [grab_name]!")) qdel(src) //returns the number of size categories between affecting and assailant, rounded. Positive means A is larger than B diff --git a/code/modules/mob/mob_grab_specials.dm b/code/modules/mob/mob_grab_specials.dm index 8e94c0266a..78582aa64c 100644 --- a/code/modules/mob/mob_grab_specials.dm +++ b/code/modules/mob/mob_grab_specials.dm @@ -3,53 +3,53 @@ var/obj/item/organ/external/E = H.get_organ(target_zone) if(!E || E.is_stump()) - to_chat(user, "[H] is missing that bodypart.") + to_chat(user, span_notice("[H] is missing that bodypart.")) return - user.visible_message("[user] starts inspecting [affecting]'s [E.name] carefully.") + user.visible_message(span_notice("[user] starts inspecting [affecting]'s [E.name] carefully.")) if(!do_mob(user,H, 10)) - to_chat(user, "You must stand still to inspect [E] for wounds.") + to_chat(user, span_notice("You must stand still to inspect [E] for wounds.")) else if(E.wounds.len) - to_chat(user, "You find [E.get_wounds_desc()]") + to_chat(user, span_warning("You find [E.get_wounds_desc()]")) else - to_chat(user, "You find no visible wounds.") + to_chat(user, span_notice("You find no visible wounds.")) - to_chat(user, "Checking bones now...") + to_chat(user, span_notice("Checking bones now...")) if(!do_mob(user, H, 20)) - to_chat(user, "You must stand still to feel [E] for fractures.") + to_chat(user, span_notice("You must stand still to feel [E] for fractures.")) else if(E.status & ORGAN_BROKEN) - to_chat(user, "The [E.encased ? E.encased : "bone in the [E.name]"] moves slightly when you poke it!") + to_chat(user, span_warning("The [E.encased ? E.encased : "bone in the [E.name]"] moves slightly when you poke it!")) H.custom_pain("Your [E.name] hurts where it's poked.", 40) else - to_chat(user, "The [E.encased ? E.encased : "bones in the [E.name]"] seem to be fine.") + to_chat(user, span_notice("The [E.encased ? E.encased : "bones in the [E.name]"] seem to be fine.")) - to_chat(user, "Checking skin now...") + to_chat(user, span_notice("Checking skin now...")) if(!do_mob(user, H, 10)) - to_chat(user, "You must stand still to check [H]'s skin for abnormalities.") + to_chat(user, span_notice("You must stand still to check [H]'s skin for abnormalities.")) else var/bad = 0 if(H.getToxLoss() >= 40) - to_chat(user, "[H] has an unhealthy skin discoloration.") + to_chat(user, span_warning("[H] has an unhealthy skin discoloration.")) bad = 1 if(H.getOxyLoss() >= 20) - to_chat(user, "[H]'s skin is unusaly pale.") + to_chat(user, span_warning("[H]'s skin is unusaly pale.")) bad = 1 if(E.status & ORGAN_DEAD) - to_chat(user, "[E] is decaying!") + to_chat(user, span_warning("[E] is decaying!")) bad = 1 if(!bad) - to_chat(user, "[H]'s skin is normal.") + to_chat(user, span_notice("[H]'s skin is normal.")) /obj/item/grab/proc/jointlock(mob/living/carbon/human/target, mob/attacker, var/target_zone) if(state < GRAB_AGGRESSIVE) - to_chat(attacker, "You require a better grab to do this.") + to_chat(attacker, span_warning("You require a better grab to do this.")) return var/obj/item/organ/external/organ = target.get_organ(check_zone(target_zone)) if(!organ || organ.dislocated == -1) return - attacker.visible_message("[attacker] [pick("bent", "twisted")] [target]'s [organ.name] into a jointlock!") + attacker.visible_message(span_danger("[attacker] [pick("bent", "twisted")] [target]'s [organ.name] into a jointlock!")) if(target.species.flags & NO_PAIN) return @@ -57,7 +57,7 @@ var/armor = target.run_armor_check(target, "melee") var/soaked = target.get_armor_soak(target, "melee") if(armor + soaked < 60) - to_chat(target, "You feel extreme pain!") + to_chat(target, span_danger("You feel extreme pain!")) var/max_halloss = round(target.species.total_health * 0.8) //up to 80% of passing out affecting.adjustHalLoss(CLAMP(max_halloss - affecting.halloss, 0, 30)) @@ -71,14 +71,14 @@ if(!attack) return if(state < GRAB_NECK) - to_chat(attacker, "You require a better grab to do this.") + to_chat(attacker, span_warning("You require a better grab to do this.")) return for(var/obj/item/protection in list(target.head, target.wear_mask, target.glasses)) if(protection && (protection.body_parts_covered & EYES)) - to_chat(attacker, "You're going to need to remove the eye covering first.") + to_chat(attacker, span_danger("You're going to need to remove the eye covering first.")) return if(!target.has_eyes()) - to_chat(attacker, "You cannot locate any eyes on [target]!") + to_chat(attacker, span_danger("You cannot locate any eyes on [target]!")) return add_attack_logs(attacker,target,"Eye gouge using grab") @@ -91,7 +91,7 @@ if(target.lying) return var/datum/gender/T = gender_datums[attacker.get_visible_gender()] - attacker.visible_message("[attacker] thrusts [T.his] head into [target]'s skull!") + attacker.visible_message(span_danger("[attacker] thrusts [T.his] head into [target]'s skull!")) var/damage = 20 var/obj/item/clothing/hat = attacker.head @@ -105,7 +105,7 @@ if(!armor && target.headcheck(BP_HEAD) && prob(damage)) target.apply_effect(20, PARALYZE) - target.visible_message("[target] [target.species.get_knockout_message(target)]") + target.visible_message(span_danger("[target] [target.species.get_knockout_message(target)]")) playsound(attacker, "swing_hit", 25, 1, -1) add_attack_logs(attacker,target,"Headbutted using grab") @@ -117,7 +117,7 @@ /obj/item/grab/proc/dislocate(mob/living/carbon/human/target, mob/living/attacker, var/target_zone) if(state < GRAB_NECK) - to_chat(attacker, "You require a better grab to do this.") + to_chat(attacker, span_warning("You require a better grab to do this.")) return if(target.grab_joint(attacker, target_zone)) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) @@ -125,19 +125,19 @@ /obj/item/grab/proc/pin_down(mob/target, mob/attacker) if(state < GRAB_AGGRESSIVE) - to_chat(attacker, "You require a better grab to do this.") + to_chat(attacker, span_warning("You require a better grab to do this.")) return if(force_down) - to_chat(attacker, "You are already pinning [target] to the ground.") + to_chat(attacker, span_warning("You are already pinning [target] to the ground.")) return if(size_difference(affecting, assailant) > 0) - to_chat(attacker, "You are too small to do that!") + to_chat(attacker, span_warning("You are too small to do that!")) return - attacker.visible_message("[attacker] starts forcing [target] to the ground!") + attacker.visible_message(span_danger("[attacker] starts forcing [target] to the ground!")) if(do_after(attacker, 20) && target) last_action = world.time - attacker.visible_message("[attacker] forces [target] to the ground!") + attacker.visible_message(span_danger("[attacker] forces [target] to the ground!")) apply_pinning(target, attacker) /obj/item/grab/proc/apply_pinning(mob/target, mob/attacker) @@ -162,12 +162,12 @@ if(can_eat) var/mob/living/carbon/attacker = user - user.visible_message("[user] is attempting to devour [target]!") + user.visible_message(span_vdanger("[user] is attempting to devour [target]!")) if(can_eat == 2) if(!do_mob(user, target)||!do_after(user, 30)) return else if(!do_mob(user, target)||!do_after(user, 70)) return - user.visible_message("[user] devours [target]!") + user.visible_message(span_vdanger("[user] devours [target]!")) target.loc = user attacker.stomach_contents.Add(target) qdel(src) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index ab54546123..2a583c7804 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -435,7 +435,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) else // Everyone else (dead people who didn't ghost yet, etc.) lname = name lname = "[lname] " - to_chat(M, "" + create_text_tag("dead", "DEAD:", M.client) + " [lname][follow][message]") + to_chat(M, span_deadsay("" + create_text_tag("dead", "DEAD:", M.client) + " [lname][follow][message]")) /proc/say_dead_object(var/message, var/obj/subject = null) for(var/mob/M in player_list) @@ -449,7 +449,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) lname = "[subject.name] ([subject.x],[subject.y],[subject.z])" lname = "[lname] " - to_chat(M, "" + create_text_tag("event_dead", "EVENT:", M.client) + " [lname][follow][message]") + to_chat(M, span_deadsay("" + create_text_tag("event_dead", "EVENT:", M.client) + " [lname][follow][message]")) //Announces that a ghost has joined/left, mainly for use with wizards /proc/announce_ghost_joinleave(O, var/joined_ghosts = 1, var/message = "") diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 0f4c4fa914..da67867ce7 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -353,7 +353,7 @@ if(!T) return if(mob.check_holy(T)) - to_chat(mob, "You cannot get past holy grounds while you are in this plane of existence!") + to_chat(mob, span_warning("You cannot get past holy grounds while you are in this plane of existence!")) return else mob.forceMove(get_step(mob, direct)) @@ -428,7 +428,7 @@ //Check to see if we slipped if(prob(Process_Spaceslipping(5)) && !buckled) - to_chat(src, "You slipped!") + to_chat(src, span_notice("You slipped!")) inertia_dir = last_move step(src, src.inertia_dir) // Not using Move for smooth glide here because this is a 'slip' so should be sudden. return 0 diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm index d1022d99e6..53b29e8ae9 100644 --- a/code/modules/mob/new_player/login.dm +++ b/code/modules/mob/new_player/login.dm @@ -29,7 +29,7 @@ var/obj/effect/lobby_image = new /obj/effect/lobby_image /mob/new_player/Login() update_Login_details() //handles setting lastKnownIP and computer_id for use by the ban systems as well as checking for multikeying if(join_motd) - join_motd = GLOB.is_valid_url.Replace(join_motd,"$1") + join_motd = GLOB.is_valid_url.Replace(join_motd,span_linkify("$1")) to_chat(src, "
    [join_motd]
    ") if(has_respawned) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 2221905e41..f310745486 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -179,10 +179,10 @@ close_spawn_windows() var/obj/O = locate("landmark*Observer-Start") if(istype(O)) - to_chat(src, "Now teleporting.") + to_chat(src, span_notice("Now teleporting.")) observer.forceMove(O.loc) else - to_chat(src, "Could not locate an observer spawn point. Use the Teleport verb to jump to the station map.") + to_chat(src, span_danger("Could not locate an observer spawn point. Use the Teleport verb to jump to the station map.")) announce_ghost_joinleave(src) @@ -206,9 +206,9 @@ var/time_till_respawn = time_till_respawn() if(time_till_respawn == -1) // Special case, never allowed to respawn - to_chat(usr, "Respawning is not allowed!") + to_chat(usr, span_warning("Respawning is not allowed!")) else if(time_till_respawn) // Nonzero time to respawn - to_chat(usr, "You can't respawn yet! You need to wait another [round(time_till_respawn/10/60, 0.1)] minutes.") + to_chat(usr, span_warning("You can't respawn yet! You need to wait another [round(time_till_respawn/10/60, 0.1)] minutes.")) return /* if(client.prefs.species != "Human" && !check_rights(R_ADMIN, 0)) //VORESTATION EDITS: THE COMMENTED OUT AREAS FROM LINE 154 TO 178 @@ -229,15 +229,15 @@ for (var/mob/living/carbon/human/C in mob_list) var/char_name = client.prefs.real_name if(char_name == C.real_name) - to_chat(usr, "There is a character that already exists with the same name - [C.real_name], please join with a different one, or use Quit the Round with the previous character.") //VOREStation Edit + to_chat(usr, span_notice("There is a character that already exists with the same name - [C.real_name], please join with a different one, or use Quit the Round with the previous character.")) //VOREStation Edit return */ //Vorestation Removal End if(!config.enter_allowed) - to_chat(usr, "There is an administrative lock on entering the game!") + to_chat(usr, span_notice("There is an administrative lock on entering the game!")) return else if(ticker && ticker.mode && ticker.mode.explosion_in_progress) - to_chat(usr, "The station is currently exploding. Joining would go poorly.") + to_chat(usr, span_danger("The station is currently exploding. Joining would go poorly.")) return if(!is_alien_whitelisted(src, GLOB.all_species[client.prefs.species])) @@ -437,7 +437,7 @@ to_chat(usr, span_red("The round is either not ready, or has already finished...")) return 0 if(!config.enter_allowed) - to_chat(usr, "There is an administrative lock on entering the game!") + to_chat(usr, span_notice("There is an administrative lock on entering the game!")) return 0 if(!IsJobAvailable(rank)) tgui_alert_async(src,"[rank] is not available. Please try another.") diff --git a/code/modules/mob/new_player/new_player_vr.dm b/code/modules/mob/new_player/new_player_vr.dm index 4306327dbd..678a45102a 100644 --- a/code/modules/mob/new_player/new_player_vr.dm +++ b/code/modules/mob/new_player/new_player_vr.dm @@ -8,28 +8,28 @@ //No Flavor Text if (config.require_flavor && !(J.mob_type & JOB_SILICON) && (!client?.prefs?.flavor_texts["general"] || length(client.prefs.flavor_texts["general"]) < 30)) - to_chat(src,"Please set your general flavor text to give a basic description of your character. Set it using the 'Set Flavor text' button on the 'General' tab in character setup, and choosing 'General' category.") + to_chat(src,span_warning("Please set your general flavor text to give a basic description of your character. Set it using the 'Set Flavor text' button on the 'General' tab in character setup, and choosing 'General' category.")) pass = FALSE //No OOC notes if (config.allow_Metadata && (!client?.prefs?.metadata || length(client.prefs.metadata) < 15)) - to_chat(src,"Please set informative OOC notes related to RP/ERP preferences. Set them using the 'OOC Notes' button on the 'General' tab in character setup.") + to_chat(src,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.")) pass = FALSE //Are they on the VERBOTEN LIST? if (prevent_respawns.Find(client?.prefs?.real_name)) - to_chat(src,"You've already quit the round as this character. You can't go back now that you've free'd your job slot. Play another character, or wait for the next round.") + to_chat(src,span_warning("You've already quit the round as this character. You can't go back now that you've free'd your job slot. Play another character, or wait for the next round.")) pass = FALSE //Do they have their scale properly setup? if(!client?.prefs?.size_multiplier) pass = FALSE - to_chat(src,"You have not set your scale yet. Do this on the VORE tab in character setup.") + to_chat(src,span_warning("You have not set your scale yet. Do this on the VORE tab in character setup.")) //Can they play? if(!is_alien_whitelisted(src,GLOB.all_species[client?.prefs?.species]) && !check_rights(R_ADMIN, 0)) pass = FALSE - to_chat(src,"You are not allowed to spawn in as this species.") + to_chat(src,span_warning("You are not allowed to spawn in as this species.")) //Custom species checks if (client?.prefs?.species == "Custom Species") @@ -37,7 +37,7 @@ //Didn't name it if(!client?.prefs?.custom_species) pass = FALSE - to_chat(src,"You have to name your custom species. Do this on the VORE tab in character setup.") + to_chat(src,span_warning("You have to name your custom species. Do this on the VORE tab in character setup.")) //Check traits/costs var/list/megalist = client.prefs.pos_traits + client.prefs.neu_traits + client.prefs.neg_traits @@ -54,7 +54,7 @@ //A trait was removed from the game if(isnull(cost)) pass = FALSE - to_chat(src,"Your species is not playable. One or more traits appear to have been removed from the game or renamed. Enter character setup to correct this.") + to_chat(src,span_warning("Your species is not playable. One or more traits appear to have been removed from the game or renamed. Enter character setup to correct this.")) break else points_left -= traits_costs[T] @@ -62,12 +62,12 @@ var/take_flags = initial(T.can_take) if((pref_synth && !(take_flags & SYNTHETICS)) || (pref_meat && !(take_flags & ORGANICS))) pass = FALSE - to_chat(src, "Some of your traits are not usable by your character type (synthetic traits on organic, or vice versa).") + to_chat(src, span_warning("Some of your traits are not usable by your character type (synthetic traits on organic, or vice versa).")) //Went into negatives if(points_left < 0 || traits_left < 0) pass = FALSE - to_chat(src,"Your species is not playable. Reconfigure your traits on the VORE tab. Trait points: [points_left]. Traits left: [traits_left].") + to_chat(src,span_warning("Your species is not playable. Reconfigure your traits on the VORE tab. Trait points: [points_left]. Traits left: [traits_left].")) //Final popup notice if (!pass) diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm index 5675c51b36..8994b7ce1c 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -28,7 +28,7 @@ /datum/riding/taur/force_dismount(mob/M) . = ..() - ridden.visible_message("[M] stops riding [ridden]!") + ridden.visible_message(span_notice("[M] stops riding [ridden]!")) //Hoooo boy. /datum/riding/taur/get_offsets(pass_index) // list(dir = x, y, layer) @@ -68,7 +68,7 @@ if(M in buckled_mobs) return FALSE // if(M.size_multiplier > size_multiplier * 1.2) -// to_chat(M,"This isn't a pony show! You need to be bigger for them to ride.") +// to_chat(M,span_warning("This isn't a pony show! You need to be bigger for them to ride.")) // return FALSE if(M.loc != src.loc) if(M.Adjacent(src)) @@ -77,7 +77,7 @@ var/mob/living/carbon/human/H = M if(istaurtail(H.tail_style)) - to_chat(src,"Too many legs. TOO MANY LEGS!!") + to_chat(src,span_warning("Too many legs. TOO MANY LEGS!!")) return FALSE . = ..() @@ -103,7 +103,7 @@ if(!can_buckle || !istype(M) || !M.Adjacent(src) || M.buckled) return if(buckle_mob(M)) - visible_message("[M] starts riding [name]!") + visible_message(span_notice("[M] starts riding [name]!")) /mob/living/carbon/human/attack_hand(mob/user as mob) if(LAZYLEN(buckled_mobs)) diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index f0c494266d..4746cfbb29 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -57,7 +57,7 @@ /mob/proc/say_dead(var/message) if(say_disabled) //This is here to try to identify lag problems - to_chat(usr, "Speech is currently admin-disabled.") + to_chat(usr, span_danger("Speech is currently admin-disabled.")) return if(!client) @@ -65,11 +65,11 @@ if(!client.holder) if(!config.dsay_allowed) - to_chat(src, "Deadchat is globally muted.") + to_chat(src, span_danger("Deadchat is globally muted.")) return if(!client?.prefs?.read_preference(/datum/preference/toggle/show_dsay)) - to_chat(usr, "You have deadchat muted.") + to_chat(usr, span_danger("You have deadchat muted.")) return message = encode_html_emphasis(message) diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm index 6d0721e363..85f07959f9 100644 --- a/code/modules/mob/say_vr.dm +++ b/code/modules/mob/say_vr.dm @@ -83,14 +83,14 @@ if(input) log_subtle(message,src) - message = "[src] [input]" + message = span_emote_subtle("[src] [input]") if(!(subtle_mode == "Adjacent Turfs (Default)")) message = "(T) " + message else return if (message) - var/undisplayed_message = "[src] does something too subtle for you to see." + var/undisplayed_message = span_emote("[src] does something too subtle for you to see.") message = encode_html_emphasis(message) var/list/vis @@ -202,7 +202,7 @@ if(isnewplayer(M)) continue if(src.client && M && !(get_z(src) == get_z(M))) - message = "[message]" + message = span_multizsay("[message]") if(isobserver(M) && (!M.client?.prefs?.read_preference(/datum/preference/toggle/ghost_see_whisubtle) || \ !client?.prefs?.read_preference(/datum/preference/toggle/whisubtle_vis) && !M.client?.holder)) spawn(0) @@ -247,13 +247,13 @@ /proc/fail_to_chat(user,message) if(!message) - to_chat(user, "Your message was NOT SENT, either because it was FAR too long, or sanitized to nothing at all.") + to_chat(user, span_danger("Your message was NOT SENT, either because it was FAR too long, or sanitized to nothing at all.")) return var/length = length(message) var/posts = CEILING((length/MAX_MESSAGE_LEN), 1) to_chat(user,message) - to_chat(user, "^ This message was NOT SENT ^ -- It was [length] characters, and the limit is [MAX_MESSAGE_LEN]. It would fit in [posts] separate messages.") + to_chat(user, span_danger("^ This message was NOT SENT ^ -- It was [length] characters, and the limit is [MAX_MESSAGE_LEN]. It would fit in [posts] separate messages.")) #undef MAX_HUGE_MESSAGE_LEN #undef POST_DELIMITER_STR @@ -266,7 +266,7 @@ if (src.client) if(client.prefs.muted & MUTE_IC) - to_chat(src, "You cannot speak in IC (muted).") + to_chat(src, span_warning("You cannot speak in IC (muted).")) return if (!message) message = tgui_input_text(usr, "Type a message to say.","Psay") @@ -285,18 +285,18 @@ if(istype(M, /mob/living/dominated_brain)) var/mob/living/dominated_brain/db = M if(db.loc != db.pred_body) - to_chat(db, "You aren't inside of a brain anymore!!!") + to_chat(db, span_danger("You aren't inside of a brain anymore!!!")) qdel(db) //Oh no, dominated brains shouldn't exist outside of the body, so if we got here something went very wrong. return else pb = db.pred_body - to_chat(pb, "The captive mind of \the [M] thinks, \"[message]\"") //To our pred if dominated brain + to_chat(pb, span_psay("The captive mind of \the [M] thinks, \"[message]\"")) //To our pred if dominated brain if(pb.read_preference(/datum/preference/toggle/subtle_sounds)) pb << sound('sound/talksounds/subtle_sound.ogg', volume = 50) f = TRUE else if(M.absorbed && isbelly(M.loc)) pb = M.loc.loc - to_chat(pb, "\The [M] thinks, \"[message]\"") //To our pred if absorbed + to_chat(pb, span_psay("\The [M] thinks, \"[message]\"")) //To our pred if absorbed if(pb.read_preference(/datum/preference/toggle/subtle_sounds)) pb << sound('sound/talksounds/subtle_sound.ogg', volume = 50) f = TRUE @@ -306,14 +306,14 @@ for(var/I in pb.contents) if(istype(I, /mob/living/dominated_brain) && I != M) var/mob/living/dominated_brain/db = I - to_chat(db, "The captive mind of \the [M] thinks, \"[message]\"") //To any dominated brains in the pred + to_chat(db, span_psay("The captive mind of \the [M] thinks, \"[message]\"")) //To any dominated brains in the pred if(db.read_preference(/datum/preference/toggle/subtle_sounds)) db << sound('sound/talksounds/subtle_sound.ogg', volume = 50) f = TRUE for(var/B in pb.vore_organs) for(var/mob/living/L in B) if(L.absorbed && L != M && L.ckey) - to_chat(L, "\The [M] thinks, \"[message]\"") //To any absorbed people in the pred + to_chat(L, span_psay("\The [M] thinks, \"[message]\"")) //To any absorbed people in the pred if(L.read_preference(/datum/preference/toggle/subtle_sounds)) L << sound('sound/talksounds/subtle_sound.ogg', volume = 50) f = TRUE @@ -322,25 +322,25 @@ for(var/I in M.contents) if(istype(I, /mob/living/dominated_brain)) var/mob/living/dominated_brain/db = I - to_chat(db, "\The [M] thinks, \"[message]\"") //To any dominated brains inside us + to_chat(db, span_psay("\The [M] thinks, \"[message]\"")) //To any dominated brains inside us if(db.read_preference(/datum/preference/toggle/subtle_sounds)) db << sound('sound/talksounds/subtle_sound.ogg', volume = 50) f = TRUE for(var/B in M.vore_organs) for(var/mob/living/L in B) if(L.absorbed) - to_chat(L, "\The [M] thinks, \"[message]\"") //To any absorbed people inside us + to_chat(L, span_psay("\The [M] thinks, \"[message]\"")) //To any absorbed people inside us if(L.read_preference(/datum/preference/toggle/subtle_sounds)) L << sound('sound/talksounds/subtle_sound.ogg', volume = 50) f = TRUE if(f) //We found someone to send the message to if(pb) - to_chat(M, "You think \"[message]\"") //To us if we are the prey + to_chat(M, span_psay("You think \"[message]\"")) //To us if we are the prey if(M.read_preference(/datum/preference/toggle/subtle_sounds)) M << sound('sound/talksounds/subtle_sound.ogg', volume = 50) else - to_chat(M, "You think \"[message]\"") //To us if we are the pred + to_chat(M, span_psay("You think \"[message]\"")) //To us if we are the pred if(M.read_preference(/datum/preference/toggle/subtle_sounds)) M << sound('sound/talksounds/subtle_sound.ogg', volume = 50) for (var/mob/G in player_list) @@ -349,7 +349,7 @@ else if(isobserver(G) && G.client?.prefs?.read_preference(/datum/preference/toggle/ghost_ears) && \ G.client?.prefs?.read_preference(/datum/preference/toggle/ghost_see_whisubtle)) if(client?.prefs?.read_preference(/datum/preference/toggle/whisubtle_vis) || G.client.holder) - to_chat(G, "\The [M] thinks, \"[message]\"") + to_chat(G, span_psay("\The [M] thinks, \"[message]\"")) log_say(message,M) else //There wasn't anyone to send the message to, pred or prey, so let's just say it instead and correct our psay just in case. M.forced_psay = FALSE @@ -364,7 +364,7 @@ if (src.client) if(client.prefs.muted & MUTE_IC) - to_chat(src, "You cannot speak in IC (muted).") + to_chat(src, span_warning("You cannot speak in IC (muted).")) return if (!message) message = tgui_input_text(usr, "Type a message to emote.","Pme") @@ -382,19 +382,19 @@ if(istype(M, /mob/living/dominated_brain)) var/mob/living/dominated_brain/db = M if(db.loc != db.pred_body) - to_chat(db, "You aren't inside of a brain anymore!!!") + to_chat(db, span_danger("You aren't inside of a brain anymore!!!")) qdel(db) //Oh no, dominated brains shouldn't exist outside of the body, so if we got here something went very wrong. return else pb = db.pred_body - to_chat(pb, "\The [M] [message]") //To our pred if dominated brain + to_chat(pb, span_pemote("\The [M] [message]")) //To our pred if dominated brain if(pb.read_preference(/datum/preference/toggle/subtle_sounds)) pb << sound('sound/talksounds/subtle_sound.ogg', volume = 50) f = TRUE else if(M.absorbed && isbelly(M.loc)) pb = M.loc.loc - to_chat(pb, "\The [M] [message]") //To our pred if absorbed + to_chat(pb, span_pemote("\The [M] [message]")) //To our pred if absorbed if(pb.read_preference(/datum/preference/toggle/subtle_sounds)) pb << sound('sound/talksounds/subtle_sound.ogg', volume = 50) f = TRUE @@ -404,14 +404,14 @@ for(var/I in pb.contents) if(istype(I, /mob/living/dominated_brain) && I != M) var/mob/living/dominated_brain/db = I - to_chat(db, "\The [M] [message]") //To any dominated brains in the pred + to_chat(db, span_pemote("\The [M] [message]")) //To any dominated brains in the pred if(db.read_preference(/datum/preference/toggle/subtle_sounds)) db << sound('sound/talksounds/subtle_sound.ogg', volume = 50) f = TRUE for(var/B in pb.vore_organs) for(var/mob/living/L in B) if(L.absorbed && L != M && L.ckey) - to_chat(L, "\The [M] [message]") //To any absorbed people in the pred + to_chat(L, span_pemote("\The [M] [message]")) //To any absorbed people in the pred if(L.read_preference(/datum/preference/toggle/subtle_sounds)) L << sound('sound/talksounds/subtle_sound.ogg', volume = 50) f = TRUE @@ -420,25 +420,25 @@ for(var/I in M.contents) if(istype(I, /mob/living/dominated_brain)) var/mob/living/dominated_brain/db = I - to_chat(db, "\The [M] [message]") //To any dominated brains inside us + to_chat(db, span_pemote("\The [M] [message]")) //To any dominated brains inside us if(db.read_preference(/datum/preference/toggle/subtle_sounds)) db << sound('sound/talksounds/subtle_sound.ogg', volume = 50) f = TRUE for(var/B in M.vore_organs) for(var/mob/living/L in B) if(L.absorbed) - to_chat(L, "\The [M] [message]") //To any absorbed people inside us + to_chat(L, span_pemote("\The [M] [message]")) //To any absorbed people inside us if(L.read_preference(/datum/preference/toggle/subtle_sounds)) L << sound('sound/talksounds/subtle_sound.ogg', volume = 50) f = TRUE if(f) //We found someone to send the message to if(pb) - to_chat(M, "\The [M] [message]") //To us if we are the prey + to_chat(M, span_pemote("\The [M] [message]")) //To us if we are the prey if(M.read_preference(/datum/preference/toggle/subtle_sounds)) M << sound('sound/talksounds/subtle_sound.ogg', volume = 50) else - to_chat(M, "\The [M] [message]") //To us if we are the pred + to_chat(M, span_pemote("\The [M] [message]")) //To us if we are the pred if(M.read_preference(/datum/preference/toggle/subtle_sounds)) M << sound('sound/talksounds/subtle_sound.ogg', volume = 50) for (var/mob/G in player_list) @@ -447,7 +447,7 @@ else if(isobserver(G) && G.client?.prefs?.read_preference(/datum/preference/toggle/ghost_ears) && \ G.client?.prefs?.read_preference(/datum/preference/toggle/ghost_see_whisubtle)) if(client?.prefs?.read_preference(/datum/preference/toggle/whisubtle_vis) || G.client.holder) - to_chat(G, "\The [M] [message]") + to_chat(G, span_pemote("\The [M] [message]")) log_say(message,M) else //There wasn't anyone to send the message to, pred or prey, so let's just emote it instead and correct our psay just in case. M.forced_psay = FALSE @@ -460,7 +460,7 @@ if(src.client) if(client.prefs.muted & MUTE_IC) - to_chat(src, "You cannot speak in IC (muted).") + to_chat(src, span_warning("You cannot speak in IC (muted).")) return if(!message) message = tgui_input_text(usr, "Type a message to narrate.","Narrate") @@ -472,7 +472,7 @@ if(stat) to_chat(src, "You need to be concious to narrate: [message]") return - message = "([name]) [message]" + message = span_name("([name]) [message]") //Below here stolen from emotes var/turf/T = get_turf(src) @@ -495,7 +495,7 @@ continue if(M.stat == UNCONSCIOUS || M.sleeping > 0) continue - to_chat(M, "[isobserver(M) ? "[message] ([ghost_follow_link(src, M)])" : message]") + to_chat(M, span_filter_say("[isobserver(M) ? "[message] ([ghost_follow_link(src, M)])" : message]")) log_emote(message, src) /mob/verb/select_speech_bubble() diff --git a/code/modules/modular_computers/computers/modular_computer/core.dm b/code/modules/modular_computers/computers/modular_computer/core.dm index 1598d5d47f..19181ba49c 100644 --- a/code/modules/modular_computers/computers/modular_computer/core.dm +++ b/code/modules/modular_computers/computers/modular_computer/core.dm @@ -86,9 +86,9 @@ . += emissive_appearance(overlay_icon, icon_state_screensaver) set_light(0) return add_overlay(.) - + set_light(light_strength) - + if(active_program) var/program_state = active_program.program_icon_state ? active_program.program_icon_state : icon_state_menu . += mutable_appearance(overlay_icon, program_state) @@ -98,7 +98,7 @@ else . += mutable_appearance(overlay_icon, icon_state_menu) . += emissive_appearance(overlay_icon, icon_state_menu) - + return add_overlay(.) /obj/item/modular_computer/proc/turn_on(var/mob/user) @@ -190,7 +190,7 @@ P = hard_drive.find_file_by_name(prog) if(!P || !istype(P)) // Program not found or it's not executable program. - to_chat(user, "\The [src]'s screen shows \"I/O ERROR - Unable to run [prog]\" warning.") + to_chat(user, span_danger("\The [src]'s screen shows \"I/O ERROR - Unable to run [prog]\" warning.")) return P.computer = src @@ -205,11 +205,11 @@ return if(idle_threads.len >= processor_unit.max_idle_programs+1) - to_chat(user, "\The [src] displays a \"Maximal CPU load reached. Unable to run another program.\" error") + to_chat(user, span_notice("\The [src] displays a \"Maximal CPU load reached. Unable to run another program.\" error")) return if(P.requires_ntnet && !get_ntnet_status(P.requires_ntnet_feature)) // The program requires NTNet connection, but we are not connected to NTNet. - to_chat(user, "\The [src]'s screen shows \"NETWORK ERROR - Unable to connect to NTNet. Please retry. If problem persists contact your system administrator.\" warning.") + to_chat(user, span_danger("\The [src]'s screen shows \"NETWORK ERROR - Unable to connect to NTNet. Please retry. If problem persists contact your system administrator.\" warning.")) return if(active_program) @@ -297,4 +297,4 @@ if(hard_drive) . = hard_drive.find_file_by_uid(uid) if(portable_drive && !.) - . = portable_drive.find_file_by_uid(uid) \ No newline at end of file + . = portable_drive.find_file_by_uid(uid) diff --git a/code/modules/modular_computers/computers/modular_computer/damage.dm b/code/modules/modular_computers/computers/modular_computer/damage.dm index deba8273e1..0db2e969f3 100644 --- a/code/modules/modular_computers/computers/modular_computer/damage.dm +++ b/code/modules/modular_computers/computers/modular_computer/damage.dm @@ -1,7 +1,7 @@ /obj/item/modular_computer/examine(var/mob/user) . = ..() if(damage > broken_damage) - . += "It is heavily damaged!" + . += span_danger("It is heavily damaged!") else if(damage) . += "It is damaged." @@ -52,4 +52,4 @@ if(HALLOSS) take_damage(Proj.damage, Proj.damage / 3, 0) if(BURN) - take_damage(Proj.damage, Proj.damage / 1.5) \ No newline at end of file + take_damage(Proj.damage, Proj.damage / 1.5) diff --git a/code/modules/modular_computers/computers/modular_computer/hardware.dm b/code/modules/modular_computers/computers/modular_computer/hardware.dm index ed50a70706..28510f97c1 100644 --- a/code/modules/modular_computers/computers/modular_computer/hardware.dm +++ b/code/modules/modular_computers/computers/modular_computer/hardware.dm @@ -92,7 +92,7 @@ update_verbs() if(critical && enabled) if(user) - to_chat(user, "\The [src]'s screen freezes for few seconds and then displays an \"HARDWARE ERROR: Critical component disconnected. Please verify component connection and reboot the device. If the problem persists contact technical support for assistance.\" warning.") + to_chat(user, span_danger("\The [src]'s screen freezes for few seconds and then displays an \"HARDWARE ERROR: Critical component disconnected. Please verify component connection and reboot the device. If the problem persists contact technical support for assistance.\" warning.")) shutdown_computer() update_icon() @@ -136,4 +136,4 @@ all_components.Add(processor_unit) if(tesla_link) all_components.Add(tesla_link) - return all_components \ No newline at end of file + return all_components diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm index fac9004da6..27f280668f 100644 --- a/code/modules/modular_computers/computers/modular_computer/interaction.dm +++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm @@ -13,11 +13,11 @@ set src in view(1) if(usr.incapacitated() || !istype(usr, /mob/living)) - to_chat(usr, "You can't do that.") + to_chat(usr, span_warning("You can't do that.")) return if(!Adjacent(usr)) - to_chat(usr, "You can't reach it.") + to_chat(usr, span_warning("You can't reach it.")) return if(enabled) @@ -37,11 +37,11 @@ set src in view(1) if(usr.incapacitated() || !istype(usr, /mob/living)) - to_chat(usr, "You can't do that.") + to_chat(usr, span_warning("You can't do that.")) return if(!Adjacent(usr)) - to_chat(usr, "You can't reach it.") + to_chat(usr, span_warning("You can't reach it.")) return proc_eject_id(usr) @@ -53,11 +53,11 @@ set src in view(1) if(usr.incapacitated() || !istype(usr, /mob/living)) - to_chat(usr, "You can't do that.") + to_chat(usr, span_warning("You can't do that.")) return if(!Adjacent(usr)) - to_chat(usr, "You can't reach it.") + to_chat(usr, span_warning("You can't reach it.")) return proc_eject_usb(usr) @@ -197,4 +197,4 @@ return - ..() \ No newline at end of file + ..() diff --git a/code/modules/modular_computers/computers/modular_computer/power.dm b/code/modules/modular_computers/computers/modular_computer/power.dm index 004fcbfb75..29ea856d0d 100644 --- a/code/modules/modular_computers/computers/modular_computer/power.dm +++ b/code/modules/modular_computers/computers/modular_computer/power.dm @@ -1,6 +1,6 @@ /obj/item/modular_computer/proc/power_failure(var/malfunction = 0) if(enabled) // Shut down the computer - visible_message("\The [src]'s screen flickers briefly and then goes dark.") + visible_message(span_danger("\The [src]'s screen flickers briefly and then goes dark.")) if(active_program) active_program.event_powerfailure(0) for(var/datum/computer_file/program/PRG in idle_threads) @@ -54,4 +54,4 @@ return if(battery_power(power_usage)) return - power_failure() \ No newline at end of file + power_failure() diff --git a/code/modules/modular_computers/computers/modular_computer/ui.dm b/code/modules/modular_computers/computers/modular_computer/ui.dm index 88d9d4ac8d..c058e8e04e 100644 --- a/code/modules/modular_computers/computers/modular_computer/ui.dm +++ b/code/modules/modular_computers/computers/modular_computer/ui.dm @@ -102,7 +102,7 @@ return P.kill_program(1) - to_chat(user, "Program [P.filename].[P.filetype] with PID [rand(100,999)] has been killed.") + to_chat(user, span_notice("Program [P.filename].[P.filetype] with PID [rand(100,999)] has been killed.")) return TRUE if("PC_runprogram") return run_program(params["name"]) diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index d43abfa1a3..cc5167b906 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -74,7 +74,7 @@ /datum/computer_file/program/proc/is_supported_by_hardware(var/hardware_flag = 0, var/loud = 0, var/mob/user = null) if(!(hardware_flag & usage_flags)) if(loud && computer && user) - to_chat(user, "\The [computer] flashes: \"Hardware Error - Incompatible software\".") + to_chat(user, span_warning("\The [computer] flashes: \"Hardware Error - Incompatible software\".")) return 0 return 1 @@ -118,13 +118,13 @@ var/obj/item/card/id/I = user.GetIdCard() if(!I) if(loud) - to_chat(user, "\The [computer] flashes an \"RFID Error - Unable to scan ID\" warning.") + to_chat(user, span_notice("\The [computer] flashes an \"RFID Error - Unable to scan ID\" warning.")) return 0 if(access_to_check in I.GetAccess()) return 1 else if(loud) - to_chat(user, "\The [computer] flashes an \"Access Denied\" warning.") + to_chat(user, span_notice("\The [computer] flashes an \"Access Denied\" warning.")) // This attempts to retrieve header data for NanoUIs. If implementing completely new device of different type than existing ones // always include the device here in this proc. This proc basically relays the request to whatever is running the program. diff --git a/code/modules/modular_computers/file_system/program_events.dm b/code/modules/modular_computers/file_system/program_events.dm index ef1eac09aa..46089cc0a2 100644 --- a/code/modules/modular_computers/file_system/program_events.dm +++ b/code/modules/modular_computers/file_system/program_events.dm @@ -13,6 +13,6 @@ /datum/computer_file/program/proc/event_networkfailure(var/background) kill_program(1) if(background) - computer.visible_message("\The [computer]'s screen displays an error: \"Network connectivity lost - process [filename].[filetype] (PID [rand(100,999)]) terminated.\"") + computer.visible_message(span_warning("\The [computer]'s screen displays an error: \"Network connectivity lost - process [filename].[filetype] (PID [rand(100,999)]) terminated.\"")) else - computer.visible_message("\The [computer]'s screen briefly freezes and then shows: \"FATAL NETWORK ERROR - NTNet connection lost. Please try again later. If problem persists, please contact your system administrator.\"") + computer.visible_message(span_warning("\The [computer]'s screen briefly freezes and then shows: \"FATAL NETWORK ERROR - NTNet connection lost. Please try again later. If problem persists, please contact your system administrator.\"")) diff --git a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm index 5d0e291336..bc2f77547f 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm @@ -21,7 +21,7 @@ if(!computer) return - computer.visible_message("\The [computer]'s screen brightly flashes and loud electrical buzzing is heard.") + computer.visible_message(span_notice("\The [computer]'s screen brightly flashes and loud electrical buzzing is heard.")) computer.enabled = 0 computer.update_icon() var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread @@ -64,4 +64,4 @@ data["armed"] = armed - return data \ No newline at end of file + return data diff --git a/code/modules/modular_computers/file_system/programs/generic/email_client.dm b/code/modules/modular_computers/file_system/programs/generic/email_client.dm index cea1f070ce..0fbc939ce6 100644 --- a/code/modules/modular_computers/file_system/programs/generic/email_client.dm +++ b/code/modules/modular_computers/file_system/programs/generic/email_client.dm @@ -40,7 +40,7 @@ /datum/computer_file/program/email_client/proc/new_mail_notify() var/turf/T = get_turf(computer) // Because visible_message is being a butt if(T) - T.visible_message("[computer] beeps softly, indicating a new email has been received.") + T.visible_message(span_notice("[computer] beeps softly, indicating a new email has been received.")) playsound(computer, 'sound/misc/server-ready.ogg', 100, 0) /datum/computer_file/program/email_client/process_tick() diff --git a/code/modules/modular_computers/file_system/programs/generic/game.dm b/code/modules/modular_computers/file_system/programs/generic/game.dm index 63892365cb..c1dcc53195 100644 --- a/code/modules/modular_computers/file_system/programs/generic/game.dm +++ b/code/modules/modular_computers/file_system/programs/generic/game.dm @@ -162,20 +162,20 @@ return TRUE if("Dispense_Tickets") if(!printer) - to_chat(usr, "Hardware error: A printer is required to redeem tickets.") + to_chat(usr, span_notice("Hardware error: A printer is required to redeem tickets.")) return if(printer.stored_paper <= 0) - to_chat(usr, "Hardware error: Printer is out of paper.") + to_chat(usr, span_notice("Hardware error: Printer is out of paper.")) return else computer.visible_message("\The [computer] prints out paper.") if(ticket_count >= 1) new /obj/item/stack/arcadeticket((get_turf(computer)), 1) - to_chat(usr, "[src] dispenses a ticket!") + to_chat(usr, span_notice("[src] dispenses a ticket!")) ticket_count -= 1 printer.stored_paper -= 1 else - to_chat(usr, "You don't have any stored tickets!") + to_chat(usr, span_notice("You don't have any stored tickets!")) return TRUE if("Start_Game") game_active = TRUE diff --git a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm index ab26ed4862..b9c1a8a973 100644 --- a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm @@ -119,9 +119,9 @@ // This program shouldn't even be runnable without computer. CRASH("Var computer is null!") if(!computer.hard_drive) - computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive connection error\" warning.") + computer.visible_message(span_warning("\The [computer] shows an \"I/O Error - Hard drive connection error\" warning.")) else // In 99.9% cases this will mean our HDD is full - computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive may be full. Please free some space and try again. Required space: [logfile.size]GQ\" warning.") + computer.visible_message(span_warning("\The [computer] shows an \"I/O Error - Hard drive may be full. Please free some space and try again. Required space: [logfile.size]GQ\" warning.")) return TRUE if("PRG_renamechannel") if(!authed) diff --git a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm index 36ab677c8f..95b61bd5bb 100644 --- a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm +++ b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm @@ -78,7 +78,7 @@ return TRUE if("PRG_taghelp") - to_chat(usr, "The hologram of a googly-eyed paper clip helpfully tells you:") + to_chat(usr, span_notice("The hologram of a googly-eyed paper clip helpfully tells you:")) var/help = {" \[br\] : Creates a linebreak. \[center\] - \[/center\] : Centers the text. diff --git a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm index ee35f6d0d6..39ee1e7f13 100644 --- a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm +++ b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm @@ -137,6 +137,6 @@ var/warrant_uid = 0 if("editwarrantauth") . = TRUE if(!(access_hos in I.GetAccess())) // VOREStation edit begin - to_chat(usr, "You don't have the access to do this!") + to_chat(usr, span_warning("You don't have the access to do this!")) return // VOREStation edit end activewarrant.fields["auth"] = "[I.registered_name] - [I.assignment ? I.assignment : "(Unknown)"]" diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm index bbe8f4e28c..f4ff407fe1 100644 --- a/code/modules/modular_computers/hardware/_hardware.dm +++ b/code/modules/modular_computers/hardware/_hardware.dm @@ -88,9 +88,9 @@ /obj/item/computer_hardware/examine(var/mob/user) . = ..() if(damage > damage_failure) - . += "It seems to be severely damaged!" + . += span_danger("It seems to be severely damaged!") else if(damage > damage_malfunction) - . += "It seems to be damaged!" + . += span_notice("It seems to be damaged!") else if(damage) . += "It seems to be slightly damaged." diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index 37d3e4d1b8..78aceeebaa 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -276,9 +276,9 @@ // Simplified payment processing, returns 1 on success. /obj/machinery/lapvend/proc/process_payment(var/obj/item/card/id/I, var/obj/item/ID_container) if(I==ID_container || ID_container == null) - visible_message("\The [usr] swipes \the [I] through \the [src].") + visible_message(span_info("\The [usr] swipes \the [I] through \the [src].")) else - visible_message("\The [usr] swipes \the [ID_container] through \the [src].") + visible_message(span_info("\The [usr] swipes \the [ID_container] through \the [src].")) var/datum/money_account/customer_account = get_account(I.associated_account_number) if (!customer_account || customer_account.suspended) ping("Connection error. Unable to connect to account.") diff --git a/code/modules/multiz/ladder_assembly_vr.dm b/code/modules/multiz/ladder_assembly_vr.dm index 41aaba5f26..8bbb805565 100644 --- a/code/modules/multiz/ladder_assembly_vr.dm +++ b/code/modules/multiz/ladder_assembly_vr.dm @@ -22,7 +22,7 @@ return else if(istype(get_area(src), /area/shuttle)) - to_chat(user, "\The [src] cannot be constructed on a shuttle.") + to_chat(user, span_warning("\The [src] cannot be constructed on a shuttle.")) return if(W.has_tool_quality(TOOL_WRENCH)) switch(state) @@ -41,14 +41,14 @@ "You hear a ratchet") src.anchored = FALSE if(CONSTRUCTION_WELDED) - to_chat(user, "\The [src] needs to be unwelded.") + to_chat(user, span_warning("\The [src] needs to be unwelded.")) return if(W.has_tool_quality(TOOL_WELDER)) var/obj/item/weldingtool/WT = W.get_welder() switch(state) if(CONSTRUCTION_UNANCHORED) - to_chat(user, "The refinforcing bolts need to be secured.") + to_chat(user, span_warning("The refinforcing bolts need to be secured.")) if(CONSTRUCTION_WRENCHED) if(WT.remove_fuel(0, user)) playsound(src, 'sound/items/Welder2.ogg', 50, 1) @@ -61,7 +61,7 @@ to_chat(user, "You weld \the [src] to the floor.") try_construct(user) else - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span_warning("You need more welding fuel to complete this task.")) if(CONSTRUCTION_WELDED) if(WT.remove_fuel(0, user)) playsound(src, 'sound/items/Welder2.ogg', 50, 1) @@ -73,7 +73,7 @@ state = CONSTRUCTION_WRENCHED to_chat(user, "You cut \the [src] free from the floor.") else - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span_warning("You need more welding fuel to complete this task.")) return // Try to construct this into a real stairway. @@ -92,7 +92,7 @@ if(direction == DOWN && (src.z in using_map.below_blocked_levels)) continue if(direction == UP && (LA.z in using_map.below_blocked_levels)) continue if(LA.state != CONSTRUCTION_WELDED) - to_chat(user, "\The [LA] [direction == UP ? "above" : "below"] must be secured and welded.") + to_chat(user, span_warning("\The [LA] [direction == UP ? "above" : "below"] must be secured and welded.")) return if(direction == UP) above = LA @@ -100,7 +100,7 @@ below = LA if(!above && !below) - to_chat(user, "\The [src] is ready to be connected to from above or below.") + to_chat(user, span_notice("\The [src] is ready to be connected to from above or below.")) return // Construct them from bottom to top, because they initialize from top to bottom. diff --git a/code/modules/multiz/ladders.dm b/code/modules/multiz/ladders.dm index 7fe7f1ded1..746357c61c 100644 --- a/code/modules/multiz/ladders.dm +++ b/code/modules/multiz/ladders.dm @@ -52,7 +52,7 @@ if(!target_ladder) return if(!(M.loc == loc) && !M.Move(get_turf(src))) - to_chat(M, "You fail to reach \the [src].") + to_chat(M, span_notice("You fail to reach \the [src].")) return climbLadder(M, target_ladder) @@ -68,7 +68,7 @@ /obj/structure/ladder/proc/getTargetLadder(var/mob/M) if((!target_up && !target_down) || (target_up && !istype(target_up.loc, /turf) || (target_down && !istype(target_down.loc,/turf)))) - to_chat(M, "\The [src] is incomplete and can't be climbed.") + to_chat(M, span_notice("\The [src] is incomplete and can't be climbed.")) return if(target_down && target_up) var/direction = tgui_alert(M,"Do you want to go up or down?", "Ladder", list("Up", "Down", "Cancel")) @@ -89,10 +89,10 @@ /mob/proc/may_climb_ladders(var/ladder) if(!Adjacent(ladder)) - to_chat(src, "You need to be next to \the [ladder] to start climbing.") + to_chat(src, span_warning("You need to be next to \the [ladder] to start climbing.")) return FALSE if(incapacitated()) - to_chat(src, "You are physically unable to climb \the [ladder].") + to_chat(src, span_warning("You are physically unable to climb \the [ladder].")) return FALSE return TRUE @@ -105,13 +105,13 @@ "You begin climbing [direction] \the [src]!", "You hear the grunting and clanging of a metal ladder being used.") - target_ladder.audible_message("You hear something coming [direction] \the [src]", runemessage = "clank clank") + target_ladder.audible_message(span_notice("You hear something coming [direction] \the [src]"), runemessage = "clank clank") if(do_after(M, climb_time, src)) var/turf/T = get_turf(target_ladder) for(var/atom/A in T) if(!A.CanPass(M, M.loc, 1.5, 0)) - to_chat(M, "\The [A] is blocking \the [src].") + to_chat(M, span_notice("\The [A] is blocking \the [src].")) return FALSE return M.forceMove(T) //VOREStation Edit - Fixes adminspawned ladders diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index e73626b271..767d684b4c 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -3,14 +3,14 @@ set category = "IC" if(zMove(UP)) - to_chat(src, "You move upwards.") + to_chat(src, span_notice("You move upwards.")) /mob/verb/down() set name = "Move Down" set category = "IC" if(zMove(DOWN)) - to_chat(src, "You move down.") + to_chat(src, span_notice("You move down.")) /mob/proc/zMove(direction) if(eyeobj) @@ -20,17 +20,17 @@ return mech.relaymove(src,direction) if(!can_ztravel()) - to_chat(src, "You lack means of travel in that direction.") + to_chat(src, span_warning("You lack means of travel in that direction.")) return var/turf/start = loc if(!istype(start)) - to_chat(src, "You are unable to move from here.") + to_chat(src, span_notice("You are unable to move from here.")) return 0 var/turf/destination = (direction == UP) ? GetAbove(src) : GetBelow(src) if(!destination) - to_chat(src, "There is nothing of interest in this direction.") + to_chat(src, span_notice("There is nothing of interest in this direction.")) return 0 if(is_incorporeal()) @@ -43,27 +43,27 @@ return ladder.climbLadder(src, (direction == UP ? ladder.target_up : ladder.target_down)) if(!start.CanZPass(src, direction)) - to_chat(src, "\The [start] is in the way.") + to_chat(src, span_warning("\The [start] is in the way.")) return 0 if(direction == DOWN) var/turf/simulated/floor/water/deep/ocean/diving/sink = start if(istype(sink) && !destination.density) var/pull_up_time = max(3 SECONDS + (src.movement_delay() * 10), 1) - to_chat(src, "You start diving underwater...") - src.audible_message("[src] begins to dive under the water.", runemessage = "splish splosh") + to_chat(src, span_notice("You start diving underwater...")) + src.audible_message(span_notice("[src] begins to dive under the water."), runemessage = "splish splosh") if(do_after(src, pull_up_time)) - to_chat(src, "You reach the sea floor.") + to_chat(src, span_notice("You reach the sea floor.")) else - to_chat(src, "You stopped swimming downwards.") + to_chat(src, span_warning("You stopped swimming downwards.")) return 0 else if(!destination.CanZPass(src, direction)) // one for the down and non-special case - to_chat(src, "\The [destination] blocks your way.") + to_chat(src, span_warning("\The [destination] blocks your way.")) return 0 else if(!destination.CanZPass(src, direction)) // and one for up - to_chat(src, "\The [destination] blocks your way.") + to_chat(src, span_warning("\The [destination] blocks your way.")) return 0 @@ -76,65 +76,65 @@ if(lattice) var/pull_up_time = max(5 SECONDS + (src.movement_delay() * 10), 1) - to_chat(src, "You grab \the [lattice] and start pulling yourself upward...") - src.audible_message("[src] begins climbing up \the [lattice].", runemessage = "clank clang") + to_chat(src, span_notice("You grab \the [lattice] and start pulling yourself upward...")) + src.audible_message(span_notice("[src] begins climbing up \the [lattice]."), runemessage = "clank clang") if(do_after(src, pull_up_time)) - to_chat(src, "You pull yourself up.") + to_chat(src, span_notice("You pull yourself up.")) else - to_chat(src, "You gave up on pulling yourself up.") + to_chat(src, span_warning("You gave up on pulling yourself up.")) return 0 else if(istype(surface)) var/pull_up_time = max(5 SECONDS + (src.movement_delay() * 10), 1) - to_chat(src, "You start swimming upwards...") - src.audible_message("[src] begins to swim towards the surface.", runemessage = "splish splosh") + to_chat(src, span_notice("You start swimming upwards...")) + src.audible_message(span_notice("[src] begins to swim towards the surface."), runemessage = "splish splosh") if(do_after(src, pull_up_time)) - to_chat(src, "You reach the surface.") + to_chat(src, span_notice("You reach the surface.")) else - to_chat(src, "You stopped swimming upwards.") + to_chat(src, span_warning("You stopped swimming upwards.")) return 0 else if(catwalk?.hatch_open) var/pull_up_time = max(5 SECONDS + (src.movement_delay() * 10), 1) - to_chat(src, "You grab the edge of \the [catwalk] and start pulling yourself upward...") + to_chat(src, span_notice("You grab the edge of \the [catwalk] and start pulling yourself upward...")) var/old_dest = destination destination = get_step(destination, dir) // mob's dir if(!destination?.Enter(src, old_dest)) - to_chat(src, "There's something in the way up above in that direction, try another.") + to_chat(src, span_notice("There's something in the way up above in that direction, try another.")) return 0 - src.audible_message("[src] begins climbing up \the [lattice].", runemessage = "clank clang") + src.audible_message(span_notice("[src] begins climbing up \the [lattice]."), runemessage = "clank clang") if(do_after(src, pull_up_time)) - to_chat(src, "You pull yourself up.") + to_chat(src, span_notice("You pull yourself up.")) else - to_chat(src, "You gave up on pulling yourself up.") + to_chat(src, span_warning("You gave up on pulling yourself up.")) return 0 else if(isliving(src)) //VOREStation Edit Start. Are they a mob, and are they currently flying?? var/mob/living/H = src if(H.flying) if(H.incapacitated(INCAPACITATION_ALL)) - to_chat(src, "You can't fly in your current state.") + to_chat(src, span_notice("You can't fly in your current state.")) H.stop_flying() //Should already be done, but just in case. return 0 var/fly_time = max(7 SECONDS + (H.movement_delay() * 10), 1) //So it's not too useful for combat. Could make this variable somehow, but that's down the road. - to_chat(src, "You begin to fly upwards...") - H.audible_message("[H] begins to flap \his wings, preparing to move upwards!", runemessage = "flap flap") + to_chat(src, span_notice("You begin to fly upwards...")) + H.audible_message(span_notice("[H] begins to flap \his wings, preparing to move upwards!"), runemessage = "flap flap") if(do_after(H, fly_time) && H.flying) - to_chat(src, "You fly upwards.") + to_chat(src, span_notice("You fly upwards.")) else - to_chat(src, "You stopped flying upwards.") + to_chat(src, span_warning("You stopped flying upwards.")) return 0 else - to_chat(src, "Gravity stops you from moving upward.") + to_chat(src, span_warning("Gravity stops you from moving upward.")) return 0 //VOREStation Edit End. else - to_chat(src, "Gravity stops you from moving upward.") + to_chat(src, span_warning("Gravity stops you from moving upward.")) return 0 for(var/atom/A in destination) if(!A.CanPass(src, start, 1.5, 0)) - to_chat(src, "\The [A] blocks you.") + to_chat(src, span_warning("\The [A] blocks you.")) return 0 if(!Move(destination)) return 0 @@ -146,9 +146,9 @@ for(var/obj/item/grab/G in list(L.l_hand, L.r_hand)) pulling |= G.affecting if(direction == UP) - src.audible_message("[src] moves up.") + src.audible_message(span_notice("[src] moves up.")) else if(direction == DOWN) - src.audible_message("[src] moves down.") + src.audible_message(span_notice("[src] moves down.")) for(var/atom/movable/P in pulling) P.forceMove(destination) return 1 @@ -169,14 +169,14 @@ if(destination) forceMove(destination) else - to_chat(src, "There is nothing of interest in this direction.") + to_chat(src, span_notice("There is nothing of interest in this direction.")) /mob/observer/eye/zMove(direction) var/turf/destination = (direction == UP) ? GetAbove(src) : GetBelow(src) if(destination) setLoc(destination) else - to_chat(src, "There is nothing of interest in this direction.") + to_chat(src, span_notice("There is nothing of interest in this direction.")) /mob/proc/can_ztravel() return 0 @@ -293,14 +293,14 @@ L.stop_flying() //Just here to see if the person is KO'd, stunned, etc. If so, it'll move onto can_fall. else if(L.nutrition < 300 && L.nutrition > 299.4) //290 would be risky, as metabolism could mess it up. Let's do 289. - to_chat(L, "You are starting to get fatigued... You probably have a good minute left in the air, if that. Even less if you continue to fly around! You should get to the ground soon!") //Ticks are, on average, 3 seconds. So this would most likely be 90 seconds, but lets just say 60. + to_chat(L, span_danger("You are starting to get fatigued... You probably have a good minute left in the air, if that. Even less if you continue to fly around! You should get to the ground soon!")) //Ticks are, on average, 3 seconds. So this would most likely be 90 seconds, but lets just say 60. L.adjust_nutrition(-0.5) return else if(L.nutrition < 100 && L.nutrition > 99.4) - to_chat(L, "You're seriously fatigued! You need to get to the ground immediately and eat before you fall!") + to_chat(L, span_danger("You're seriously fatigued! You need to get to the ground immediately and eat before you fall!")) return else if(L.nutrition < 10) //Should have listened to the warnings! - to_chat(L, "You lack the strength to keep yourself up in the air...") + to_chat(L, span_danger("You lack the strength to keep yourself up in the air...")) L.stop_flying() else return @@ -439,7 +439,7 @@ /atom/movable/proc/find_fall_target(var/turf/oldloc, var/turf/landing) if(isopenspace(oldloc)) - oldloc.visible_message("\The [src] falls down through \the [oldloc]!", "You hear something falling through the air.") + oldloc.visible_message(span_notice("\The [src] falls down through \the [oldloc]!"), span_notice("You hear something falling through the air.")) // If the turf has density, we give it first dibs if (landing.density && landing.CheckFall(src)) @@ -527,27 +527,27 @@ safe_fall = TRUE if(planetary && src.CanParachute()) if(!silent) - visible_message("\The [src] glides in from above and lands on \the [landing]!", \ - "You land on \the [landing]!", \ + visible_message(span_warning("\The [src] glides in from above and lands on \the [landing]!"), \ + span_danger("You land on \the [landing]!"), \ "You hear something land \the [landing].") return else if(!planetary && safe_fall) // Falling one floor and falling one atmosphere are very different things if(!silent) - visible_message("\The [src] falls from above and lands on \the [landing]!", \ - "You land on \the [landing]!", \ + visible_message(span_warning("\The [src] falls from above and lands on \the [landing]!"), \ + span_danger("You land on \the [landing]!"), \ "You hear something land \the [landing].") return else if(!silent) if(planetary) - visible_message("\A [src] falls out of the sky and crashes into \the [landing]!", \ - " You fall out of the sky and crash into \the [landing]!", \ + visible_message(span_danger("\A [src] falls out of the sky and crashes into \the [landing]!"), \ + span_danger(" You fall out of the sky and crash into \the [landing]!"), \ "You hear something slam into \the [landing].") var/turf/T = get_turf(landing) explosion(T, 0, 1, 2) else - visible_message("\The [src] falls from above and slams into \the [landing]!", \ - "You fall off and hit \the [landing]!", \ + visible_message(span_warning("\The [src] falls from above and slams into \the [landing]!"), \ + span_danger("You fall off and hit \the [landing]!"), \ "You hear something slam into \the [landing].") playsound(src, "punch", 25, 1, -1) @@ -609,7 +609,7 @@ var/obj/structure/lattice/lattice = locate(/obj/structure/lattice, loc) if(lattice) // Lattices seem a bit too flimsy to hold up a massive exosuit. - lattice.visible_message("\The [lattice] collapses under the weight of \the [src]!") + lattice.visible_message(span_danger("\The [lattice] collapses under the weight of \the [src]!")) qdel(lattice) // Then call parent to have us actually fall @@ -618,7 +618,7 @@ /obj/mecha/fall_impact(var/atom/hit_atom, var/damage_min = 15, var/damage_max = 30, var/silent = FALSE, var/planetary = FALSE) // Anything on the same tile as the landing tile is gonna have a bad day. for(var/mob/living/L in hit_atom.contents) - L.visible_message("\The [src] crushes \the [L] as it lands on them!") + L.visible_message(span_danger("\The [src] crushes \the [L] as it lands on them!")) L.adjustBruteLoss(rand(70, 100)) L.Weaken(8) @@ -626,27 +626,27 @@ if(planetary && src.CanParachute()) if(!silent) - visible_message("\The [src] glides in from above and lands on \the [landing]!", \ - "You land on \the [landing]!", \ + visible_message(span_warning("\The [src] glides in from above and lands on \the [landing]!"), \ + span_danger("You land on \the [landing]!"), \ "You hear something land \the [landing].") return else if(!planetary && src.softfall) // Falling one floor and falling one atmosphere are very different things if(!silent) - visible_message("\The [src] falls from above and lands on \the [landing]!", \ - "You land on \the [landing]!", \ + visible_message(span_warning("\The [src] falls from above and lands on \the [landing]!"), \ + span_danger("You land on \the [landing]!"), \ "You hear something land \the [landing].") return else if(!silent) if(planetary) - visible_message("\A [src] falls out of the sky and crashes into \the [landing]!", \ - " You fall out of the skiy and crash into \the [landing]!", \ + visible_message(span_danger("\A [src] falls out of the sky and crashes into \the [landing]!"), \ + span_danger(" You fall out of the skiy and crash into \the [landing]!"), \ "You hear something slam into \the [landing].") var/turf/T = get_turf(landing) explosion(T, 0, 1, 2) else - visible_message("\The [src] falls from above and slams into \the [landing]!", \ - "You fall off and hit \the [landing]!", \ + visible_message(span_warning("\The [src] falls from above and slams into \the [landing]!"), \ + span_danger("You fall off and hit \the [landing]!"), \ "You hear something slam into \the [landing].") playsound(src, "punch", 25, 1, -1) diff --git a/code/modules/multiz/movement_vr.dm b/code/modules/multiz/movement_vr.dm index 3981538079..13af6e8315 100644 --- a/code/modules/multiz/movement_vr.dm +++ b/code/modules/multiz/movement_vr.dm @@ -48,11 +48,11 @@ pred.loc = fallloc if(!safe_fall) pred.Weaken(8) - pred.visible_message("\The [pred] falls right onto \the [prey]!") + pred.visible_message(span_vdanger("\The [pred] falls right onto \the [prey]!")) else if(prey.vore_selected && prey.can_be_drop_pred && pred.can_be_drop_prey && pred.drop_vore && prey.drop_vore) prey.feed_grabbed_to_self_falling_nom(prey,pred) prey.Weaken(4) - prey.visible_message("\The [pred] falls right into \the [prey]!") + prey.visible_message(span_vdanger("\The [pred] falls right into \the [prey]!")) else pred.loc = prey.loc if(!safe_fall) @@ -66,9 +66,9 @@ prey.adjustBruteLoss(tdamage) pred.updatehealth() prey.updatehealth() - pred.visible_message("\The [pred] falls onto \the [prey]!") + pred.visible_message(span_danger("\The [pred] falls onto \the [prey]!")) else - pred.visible_message("\The [pred] safely brushes past \the [prey] as they land.") + pred.visible_message(span_notice("\The [pred] safely brushes past \the [prey] as they land.")) return 1 /mob/observer/dead/CheckFall() diff --git a/code/modules/multiz/pipes.dm b/code/modules/multiz/pipes.dm index 83b7bd8125..d5a3614a8a 100644 --- a/code/modules/multiz/pipes.dm +++ b/code/modules/multiz/pipes.dm @@ -78,7 +78,7 @@ else return 1 /obj/machinery/atmospherics/pipe/zpipe/proc/burst() - src.visible_message("\The [src] bursts!"); + src.visible_message(span_warning("\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) @@ -272,4 +272,4 @@ piping_layer = PIPING_LAYER_AUX layer = PIPES_AUX_LAYER icon_connect_type = "-aux" - color = PIPE_COLOR_CYAN \ No newline at end of file + color = PIPE_COLOR_CYAN diff --git a/code/modules/multiz/portals_vr.dm b/code/modules/multiz/portals_vr.dm index a6bbb7c043..4e097f1faf 100644 --- a/code/modules/multiz/portals_vr.dm +++ b/code/modules/multiz/portals_vr.dm @@ -36,7 +36,7 @@ return if(!target) if(isliving(user)) - to_chat(user, "Your hand scatters \the [src]...") + to_chat(user, span_notice("Your hand scatters \the [src]...")) qdel(src) //Delete portals which aren't set that people mess with. else return //do not send ghosts, zshadows, ai eyes, etc else if(isliving(user) || istype(user, /mob/observer/dead) && user?.client?.holder) //unless they're staff @@ -45,7 +45,7 @@ /obj/structure/portal_event/attack_ghost(var/mob/observer/dead/user) if(!target && user?.client?.holder) - to_chat(user, "Selecting 'Portal Here' will create and link a portal at your location, while 'Target Here' will create an object that is only visible to ghosts which will act as the target, again at your location. Each option will give you the ability to change portal types, but for all options except 'Select Type' you only get one shot at it, so be sure to experiment with 'Select Type' first if you're not familiar with them.") + to_chat(user, span_notice("Selecting 'Portal Here' will create and link a portal at your location, while 'Target Here' will create an object that is only visible to ghosts which will act as the target, again at your location. Each option will give you the ability to change portal types, but for all options except 'Select Type' you only get one shot at it, so be sure to experiment with 'Select Type' first if you're not familiar with them.")) var/response = tgui_alert(user, "You appear to be staff. This portal has no exit point. If you want to make one, move to where you want it to go, and click the appropriate option, see chat for more info, otherwise click 'Cancel'", "Unbound Portal", list("Cancel","Portal Here","Target Here", "Select Type")) if(response == "Portal Here") target = new type(get_turf(user), src) @@ -112,7 +112,7 @@ if (M.anchored&&istype(M, /obj/mecha)) return if (!target) - to_chat(M, "\The [src] scatters as you pass through it...") + to_chat(M, span_notice("\The [src] scatters as you pass through it...")) qdel(src) return if (!istype(M, /atom/movable)) @@ -132,7 +132,7 @@ if(portalfind) var/possible_turfs = place.AdjacentTurfs() if(isemptylist(possible_turfs)) - to_chat(M, "Something blocks your way.") + to_chat(M, span_notice("Something blocks your way.")) return temptarg = pick(possible_turfs) do_safe_teleport(M, temptarg, 0) @@ -216,7 +216,7 @@ sleep(1) MI.Paralyse(10) MI << 'sound/effects/bamf.ogg' - to_chat(MI,"You're starting to come to. You feel like you've been out for a few minutes, at least...") + to_chat(MI,span_warning("You're starting to come to. You feel like you've been out for a few minutes, at least...")) for(var/obj/item/I in L) if(istype(I,/obj/item/implant) || istype(I,/obj/item/nif)) continue @@ -226,5 +226,5 @@ sleep(1) L.Paralyse(10) L << 'sound/effects/bamf.ogg' - to_chat(L,"You're starting to come to. You feel like you've been out for a few minutes, at least...") + to_chat(L,span_warning("You're starting to come to. You feel like you've been out for a few minutes, at least...")) return diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm index eddc1743df..31afd8f6c7 100644 --- a/code/modules/multiz/turf.dm +++ b/code/modules/multiz/turf.dm @@ -105,7 +105,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr return var/obj/item/stack/rods/R = C if (R.use(1)) - to_chat(user, "Constructing support lattice ...") + to_chat(user, span_notice("Constructing support lattice ...")) playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) ReplaceWithLattice() return @@ -122,7 +122,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr ChangeTurf(/turf/simulated/floor/airless) return else - to_chat(user, "The plating is going to need some support.") + to_chat(user, span_warning("The plating is going to need some support.")) //To lay cable. if(istype(C, /obj/item/stack/cable_coil)) diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm index 101215b7bb..366bf15968 100644 --- a/code/modules/nifsoft/nif.dm +++ b/code/modules/nifsoft/nif.dm @@ -211,7 +211,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable if(human) notify("Danger! General system insta#^!($",TRUE) - to_chat(human,"Your NIF vision overlays disappear and your head suddenly seems very quiet...") + to_chat(human,span_danger("Your NIF vision overlays disappear and your head suddenly seems very quiet...")) //Repair update/check proc /obj/item/nif/proc/repair(var/repair = 0) @@ -224,33 +224,33 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable /obj/item/nif/attackby(obj/item/W, mob/user as mob) if(open == 0 && W.has_tool_quality(TOOL_SCREWDRIVER)) if(do_after(user, 4 SECONDS, src) && open == 0) - user.visible_message("[user] unscrews and pries open \the [src].","You unscrew and pry open \the [src].") + user.visible_message("[user] unscrews and pries open \the [src].",span_notice("You unscrew and pry open \the [src].")) playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) open = 1 update_icon() else if(open == 1 && istype(W,/obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W if(C.get_amount() < 3) - to_chat(user,"You need at least three coils of wire to add them to \the [src].") + to_chat(user,span_warning("You need at least three coils of wire to add them to \the [src].")) return if(durability >= initial(durability)) - to_chat(user,"There's no damaged wiring that needs replacing!") + to_chat(user,span_notice("There's no damaged wiring that needs replacing!")) open = 3 update_icon() return if(do_after(user, 6 SECONDS, src) && open == 1 && C.use(3)) - user.visible_message("[user] replaces some wiring in \the [src].","You replace any burned out wiring in \the [src].") + user.visible_message("[user] replaces some wiring in \the [src].",span_notice("You replace any burned out wiring in \the [src].")) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) open = 2 update_icon() else if(open == 2 && istype(W,/obj/item/multitool)) if(do_after(user, 8 SECONDS, src) && open == 2) - user.visible_message("[user] resets several circuits in \the [src].","You find and repair any faulty circuits in \the [src].") + user.visible_message("[user] resets several circuits in \the [src].",span_notice("You find and repair any faulty circuits in \the [src].")) open = 3 update_icon() else if(open == 3 && W.has_tool_quality(TOOL_SCREWDRIVER)) if(do_after(user, 3 SECONDS, src) && open == 3) - user.visible_message("[user] closes up \the [src].","You re-seal \the [src] for use once more.") + user.visible_message("[user] closes up \the [src].",span_notice("You re-seal \the [src] for use once more.")) playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) open = FALSE repair(initial(durability)) @@ -325,10 +325,10 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable human.custom_pain(message,35) if(2) human.Weaken(5) - to_chat(human,"A wave of weakness rolls over you.") + to_chat(human,span_danger("A wave of weakness rolls over you.")) /*if(3) human.Sleeping(5) //Disabled for being boring - to_chat(human,"You suddenly black out!")*/ + to_chat(human,span_danger("You suddenly black out!"))*/ //Finishing up if(1.0 to INFINITY) @@ -387,8 +387,8 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable last_notification = message // TGUI Hook - to_chat(human,"\[[icon2html(src.big_icon, human.client)]NIF\] displays, \"[message]\"") - if(prob(1)) human.visible_message("\The [human] [pick(look_messages)].") + to_chat(human,span_filter_nif("\[[icon2html(src.big_icon, human.client)]NIF\] displays, " + alert ? span_danger(message) : span_notice(message))) + if(prob(1)) human.visible_message(span_notice("\The [human] [pick(look_messages)].")) if(alert) human << bad_sound else @@ -488,7 +488,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable if(stat != NIF_WORKING) return FALSE if(human) - if(prob(5)) human.visible_message("\The [human] [pick(look_messages)].") + if(prob(5)) human.visible_message(span_notice("\The [human] [pick(look_messages)].")) var/applies_to = soft.applies_to var/synth = human.isSynthetic() if(synth && !(applies_to & NIF_SYNTHETIC)) @@ -515,7 +515,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable //Deactivate a nifsoft /obj/item/nif/proc/deactivate(var/datum/nifsoft/soft) if(human) - if(prob(5)) human.visible_message("\The [human] [pick(look_messages)].") + if(prob(5)) human.visible_message(span_notice("\The [human] [pick(look_messages)].")) human << click_sound if(soft.tick_flags == NIF_ACTIVETICK) @@ -667,14 +667,14 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable if(istype(T.species,/datum/species/shapeshifter/promethean) && target_zone == BP_TORSO) if(T.w_uniform || T.wear_suit) - to_chat(user,"Remove any clothing they have on, as it might interfere!") + to_chat(user,span_warning("Remove any clothing they have on, as it might interfere!")) return var/obj/item/organ/external/eo = T.get_organ(BP_TORSO) if(!T) - to_chat(user,"They should probably regrow their torso first.") + to_chat(user,span_warning("They should probably regrow their torso first.")) return - U.visible_message("[U] begins installing [src] into [T]'s chest by just stuffing it in.", - "You begin installing [src] into [T]'s chest by just stuffing it in.", + U.visible_message(span_notice("[U] begins installing [src] into [T]'s chest by just stuffing it in."), + span_notice("You begin installing [src] into [T]'s chest by just stuffing it in."), "There's a wet SQUISH noise.") if(do_mob(user = user, target = T, time = 200, target_zone = BP_TORSO)) user.unEquip(src) @@ -692,7 +692,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable if(!nif) verbs -= /mob/living/carbon/human/proc/set_nif_examine - to_chat(src,"You don't have a NIF, not sure why this was here.") + to_chat(src,span_warning("You don't have a NIF, not sure why this was here.")) return var/new_flavor = sanitize(tgui_input_text(src,"Describe how your NIF alters your appearance, like glowy eyes or metal plate on your head, etc. Be sensible. Clear this for no examine text. 128ch max.","Describe NIF", nif.examine_msg, 128), max_length = 128) diff --git a/code/modules/nifsoft/nif_softshop.dm b/code/modules/nifsoft/nif_softshop.dm index 3fb2f43684..a687710621 100644 --- a/code/modules/nifsoft/nif_softshop.dm +++ b/code/modules/nifsoft/nif_softshop.dm @@ -102,21 +102,21 @@ var/datum/nifsoft/path = R.item_path if(!ishuman(user)) return FALSE - + var/mob/living/carbon/human/H = user if(!H.nif || !H.nif.stat == NIF_WORKING) - to_chat(H, "[src] seems unable to connect to your NIF...") + to_chat(H, span_warning("[src] seems unable to connect to your NIF...")) return FALSE if(!H.nif.can_install(path)) flick("[icon_state]-deny", entopic.my_image) return FALSE - + if(initial(path.access)) var/list/soft_access = list(initial(path.access)) var/list/usr_access = user.GetAccess() if(scan_id && !has_access(soft_access, list(), usr_access) && !emagged) - to_chat(user, "You aren't authorized to buy [initial(path.name)].") + to_chat(user, span_warning("You aren't authorized to buy [initial(path.name)].")) flick("[icon_state]-deny", entopic.my_image) return FALSE @@ -124,7 +124,7 @@ /obj/machinery/vending/nifsoft_shop/vend(datum/stored_item/vending_product/R, mob/user) var/mob/living/carbon/human/H = user if(!can_buy(R, user)) //For SECURE VENDING MACHINES YEAH - to_chat(user, "Purchase not allowed.") //Unless emagged of course + to_chat(user, span_warning("Purchase not allowed.")) //Unless emagged of course flick("[icon_state]-deny",entopic.my_image) return vend_ready = 0 //One thing at a time!! @@ -132,13 +132,13 @@ if(R.category & CAT_COIN) if(!coin) - to_chat(user, "You need to insert a coin to get this item.") + to_chat(user, span_notice("You need to insert a coin to get this item.")) return if(coin.string_attached) if(prob(50)) - to_chat(user, "You successfully pull the coin out before \the [src] could swallow it.") + to_chat(user, span_notice("You successfully pull the coin out before \the [src] could swallow it.")) else - to_chat(user, "You weren't able to pull the coin out fast enough, the machine ate it, string and all.") + to_chat(user, span_notice("You weren't able to pull the coin out fast enough, the machine ate it, string and all.")) qdel(coin) coin = null categories &= ~CAT_COIN diff --git a/code/modules/nifsoft/nifsoft.dm b/code/modules/nifsoft/nifsoft.dm index 66d8761662..99247ec600 100644 --- a/code/modules/nifsoft/nifsoft.dm +++ b/code/modules/nifsoft/nifsoft.dm @@ -209,14 +209,14 @@ var/mob/living/carbon/human/Hu = user if(!Ht.nif || Ht.nif.stat != NIF_WORKING) - to_chat(user,"Either they don't have a NIF, or the uploader can't connect.") + to_chat(user,span_warning("Either they don't have a NIF, or the uploader can't connect.")) return var/extra = extra_params() if(A == user) - to_chat(user,"You upload [src] into your NIF.") + to_chat(user,span_notice("You upload [src] into your NIF.")) else - Ht.visible_message("[Hu] begins uploading [src] into [Ht]!","[Hu] is uploading [src] into you!") + Ht.visible_message(span_warning("[Hu] begins uploading [src] into [Ht]!"),span_danger("[Hu] is uploading [src] into you!")) icon_state = "[initial(icon_state)]-animate" //makes it play the item animation upon using on a valid target update_icon() @@ -262,7 +262,7 @@ if(!ishuman(A)) return if(!laws) - to_chat(user,"You haven't set any laws yet. Use the disk in-hand first.") + to_chat(user,span_warning("You haven't set any laws yet. Use the disk in-hand first.")) return ..(A,user,flag,params) @@ -270,7 +270,7 @@ var/newlaws = tgui_input_text(user, "Please Input Laws", "Compliance Laws", laws, multiline = TRUE, prevent_enter = TRUE) newlaws = sanitize(newlaws,2048) if(newlaws) - to_chat(user,"You set the laws to:
    [newlaws]    ") + to_chat(user,span_filter_notice("You set the laws to:
    [newlaws]")) laws = newlaws /obj/item/disk/nifsoft/compliance/extra_params() @@ -403,4 +403,4 @@ /obj/item/storage/box/nifsofts_sizechange/New() ..() for(var/i = 0 to 7) - new /obj/item/disk/nifsoft/sizechange(src) \ No newline at end of file + new /obj/item/disk/nifsoft/sizechange(src) diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm index 722a303bc2..bf9eca000a 100644 --- a/code/modules/nifsoft/software/13_soulcatcher.dm +++ b/code/modules/nifsoft/software/13_soulcatcher.dm @@ -74,13 +74,13 @@ to_chat(nif.human, type = MESSAGE_TYPE_NIF, - html = "\[[icon2html(nif.big_icon, nif.human)]NIF\] Soulcatcher displays, \"[message]\"") + html = span_nif("\[[icon2html(nif.big_icon, nif.human)]NIF\] Soulcatcher displays, \"[message]\"")) nif.human << sound for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs) to_chat(CS, type = MESSAGE_TYPE_NIF, - html = "\[[icon2html(nif.big_icon, CS.client)]NIF\] Soulcatcher displays, \"[message]\"") + html = span_nif("\[[icon2html(nif.big_icon, CS.client)]NIF\] Soulcatcher displays, \"[message]\"")) CS << sound /datum/nifsoft/soulcatcher/proc/say_into(var/message, var/mob/living/sender, var/mob/eyeobj) @@ -88,17 +88,17 @@ //AR Projecting if(eyeobj) - sender.eyeobj.visible_message("[sender_name] says, \"[message]\"") + sender.eyeobj.visible_message(span_game(span_say("[sender_name] says, \"[message]\""))) //Not AR Projecting else to_chat(nif.human, type = MESSAGE_TYPE_NIF, - html = "\[[icon2html(nif.big_icon, nif.human.client)]NIF\] [sender_name] speaks, \"[message]\"") + html = span_nif("\[[icon2html(nif.big_icon, nif.human.client)]NIF\] [sender_name] speaks, \"[message]\"")) for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs) to_chat(CS, type = MESSAGE_TYPE_NIF, - html = "\[[icon2html(nif.big_icon, CS.client)]NIF\] [sender_name] speaks, \"[message]\"") + html = span_nif("\[[icon2html(nif.big_icon, CS.client)]NIF\] [sender_name] speaks, \"[message]\"")) log_nsay(message,nif.human.real_name,sender) @@ -107,17 +107,17 @@ //AR Projecting if(eyeobj) - sender.eyeobj.visible_message("[sender_name] [message]") + sender.eyeobj.visible_message(span_emote("[sender_name] [message]")) //Not AR Projecting else to_chat(nif.human, type = MESSAGE_TYPE_NIF, - html = "\[[icon2html(nif.big_icon,nif.human.client)]NIF\] [sender_name] [message]") + html = span_nif("\[[icon2html(nif.big_icon,nif.human.client)]NIF\] [sender_name] [message]")) for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs) to_chat(CS, type = MESSAGE_TYPE_NIF, - html = "\[[icon2html(nif.big_icon,CS.client)]NIF\] [sender_name] [message]") + html = span_nif("\[[icon2html(nif.big_icon,CS.client)]NIF\] [sender_name] [message]")) log_nme(message,nif.human.real_name,sender) @@ -380,7 +380,7 @@ return if (src.client) if (client.prefs.muted & MUTE_IC) - to_chat(src, "You cannot send IC messages (muted).") + to_chat(src, span_warning("You cannot send IC messages (muted).")) return if (stat) return @@ -398,7 +398,7 @@ set name = "Resist" set category = "IC" - to_chat(src,"There's no way out! You're stuck in VR.") + to_chat(src,span_warning("There's no way out! You're stuck in VR.")) /////////////////// //A projected AR soul thing @@ -553,11 +553,11 @@ set category = "Soulcatcher" if(eyeobj) - to_chat(src,"You're already projecting in AR!") + to_chat(src,span_warning("You're already projecting in AR!")) return if(!(soulcatcher.setting_flags & NIF_SC_PROJECTING)) - to_chat(src,"Projecting from this NIF has been disabled!") + to_chat(src,span_warning("Projecting from this NIF has been disabled!")) return if(!client || !client.prefs) @@ -572,7 +572,7 @@ set category = "Soulcatcher" if(!eyeobj) - to_chat(src,"You're not projecting into AR!") + to_chat(src,span_warning("You're not projecting into AR!")) return eyeobj.forceMove(get_turf(nif)) @@ -583,7 +583,7 @@ set category = "Soulcatcher" if(!eyeobj) - to_chat(src,"You're not projecting into AR!") + to_chat(src,span_warning("You're not projecting into AR!")) return QDEL_NULL(eyeobj) diff --git a/code/modules/nifsoft/software/14_commlink.dm b/code/modules/nifsoft/software/14_commlink.dm index 50b682d058..1406143227 100644 --- a/code/modules/nifsoft/software/14_commlink.dm +++ b/code/modules/nifsoft/software/14_commlink.dm @@ -81,7 +81,7 @@ var/message = combined["formatted"] var/name_used = M.GetVoice() var/rendered = null - rendered = "[icon2html(icon_object,mob.client)] [name_used] [message]" + rendered = span_game(span_say("[icon2html(icon_object,mob.client)] [span_name(name_used)] [message]")) mob.show_message(rendered, 2) //Not supported by the internal one diff --git a/code/modules/nifsoft/software/15_misc.dm b/code/modules/nifsoft/software/15_misc.dm index d2e07a679e..785f48b12d 100644 --- a/code/modules/nifsoft/software/15_misc.dm +++ b/code/modules/nifsoft/software/15_misc.dm @@ -21,7 +21,7 @@ deactivate() return FALSE - H.visible_message("Thin snakelike tendrils grow from [H] and connect to \the [apc].","Thin snakelike tendrils grow from you and connect to \the [apc].") + H.visible_message(span_warning("Thin snakelike tendrils grow from [H] and connect to \the [apc]."),span_notice("Thin snakelike tendrils grow from you and connect to \the [apc].")) /datum/nifsoft/apc_recharge/deactivate(var/force = FALSE) if((. = ..())) @@ -36,7 +36,7 @@ return TRUE else nif.notify("APC charging has ended.") - H.visible_message("[H]'s snakelike tendrils whip back into their body from \the [apc].","The APC connector tendrils return to your body.") + H.visible_message(span_warning("[H]'s snakelike tendrils whip back into their body from \the [apc]."),span_notice("The APC connector tendrils return to your body.")) deactivate() return FALSE @@ -105,11 +105,11 @@ /datum/nifsoft/compliance/activate() if((. = ..())) - to_chat(nif.human,"You are compelled to follow these rules: \n[laws]") + to_chat(nif.human,span_danger("You are compelled to follow these rules:     \n[laws]")) /datum/nifsoft/compliance/install() if((. = ..())) - to_chat(nif.human,"You feel suddenly compelled to follow these rules: \n[laws]") + to_chat(nif.human,span_danger("You feel suddenly compelled to follow these rules: \n[laws]")) /datum/nifsoft/compliance/uninstall() nif.notify("ERROR! Unable to comply!",TRUE) @@ -131,12 +131,12 @@ if (!nif.human.size_range_check(new_size)) if(new_size) - to_chat(nif.human,"The safety features of the NIF Program prevent you from choosing this size.") + to_chat(nif.human,span_notice("The safety features of the NIF Program prevent you from choosing this size.")) return else if(nif.human.resize(new_size/100, uncapped=nif.human.has_large_resize_bounds(), ignore_prefs = TRUE)) - to_chat(nif.human,"You set the size to [new_size]%") - nif.human.visible_message("Swirling grey mist envelops [nif.human] as they change size!","Swirling streams of nanites wrap around you as you change size!") + to_chat(nif.human,span_notice("You set the size to [new_size]%")) + nif.human.visible_message(span_warning("Swirling grey mist envelops [nif.human] as they change size!"),span_notice("Swirling streams of nanites wrap around you as you change size!")) spawn(0) deactivate() @@ -188,7 +188,7 @@ /datum/nifsoft/malware/activate() if((. = ..())) - to_chat(nif.human,"Runtime error in 15_misc.dm, line 191.") + to_chat(nif.human,span_danger("Runtime error in 15_misc.dm, line 191.")) /datum/nifsoft/malware/install() if((. = ..())) @@ -198,4 +198,4 @@ if((. = ..())) if(nif.human.client && world.time - last_ads > rand(10 MINUTES, 15 MINUTES) && prob(1)) last_ads = world.time - nif.human.client.create_fake_ad_popup_multiple(/obj/screen/popup/default, 5) \ No newline at end of file + nif.human.client.create_fake_ad_popup_multiple(/obj/screen/popup/default, 5) diff --git a/code/modules/organs/internal/appendix.dm b/code/modules/organs/internal/appendix.dm index e0e4e22a72..a941d5aadc 100644 --- a/code/modules/organs/internal/appendix.dm +++ b/code/modules/organs/internal/appendix.dm @@ -27,11 +27,11 @@ if(inflamed == 1) if(prob(5)) - to_chat(owner, "You feel a stinging pain in your abdomen!") + to_chat(owner, span_warning("You feel a stinging pain in your abdomen!")) owner.custom_emote(VISIBLE_MESSAGE, "winces slightly.") if(inflamed > 1) if(prob(3)) - to_chat(owner, "You feel a stabbing pain in your abdomen!") + to_chat(owner, span_warning("You feel a stabbing pain in your abdomen!")) owner.custom_emote(VISIBLE_MESSAGE, "winces painfully.") owner.adjustToxLoss(1) if(inflamed > 2) @@ -39,7 +39,7 @@ owner.vomit() if(inflamed > 3) if(prob(1)) - to_chat(owner, "Your abdomen is a world of pain!") + to_chat(owner, span_danger("Your abdomen is a world of pain!")) owner.Weaken(10) var/obj/item/organ/external/groin = owner.get_organ(BP_GROIN) @@ -52,4 +52,4 @@ if(inflamed) icon_state = "[initial(icon_state)]inflamed" name = "inflamed appendix" - ..() \ No newline at end of file + ..() diff --git a/code/modules/organs/internal/augment.dm b/code/modules/organs/internal/augment.dm index 8c99d07942..8f6cc818fd 100644 --- a/code/modules/organs/internal/augment.dm +++ b/code/modules/organs/internal/augment.dm @@ -65,7 +65,7 @@ return if(robotic && owner.get_restraining_bolt()) - to_chat(owner, "\The [src] doesn't respond.") + to_chat(owner, span_warning("\The [src] doesn't respond.")) return var/item_to_equip = integrated_object @@ -153,11 +153,11 @@ if(buckled) var/obj/Ob = buckled if(Ob.buckle_lying) - to_chat(M, "You cannot use your augments when restrained.") + to_chat(M, span_notice("You cannot use your augments when restrained.")) return 0 if((slot == slot_l_hand && l_hand) || (slot == slot_r_hand && r_hand)) - to_chat(M,"Your hand is full. Drop something first.") + to_chat(M,span_warning("Your hand is full. Drop something first.")) return 0 var/del_if_failure = destroy_on_drop diff --git a/code/modules/organs/internal/augment/armmounted.dm b/code/modules/organs/internal/augment/armmounted.dm index b90a816898..28804311a0 100644 --- a/code/modules/organs/internal/augment/armmounted.dm +++ b/code/modules/organs/internal/augment/armmounted.dm @@ -31,7 +31,7 @@ organ_tag = O_AUG_L_FOREARM parent_organ = BP_L_ARM target_slot = slot_l_hand - to_chat(user, "You swap \the [src]'s servos to install neatly into \the lower [parent_organ] mount.") + to_chat(user, span_notice("You swap \the [src]'s servos to install neatly into \the lower [parent_organ] mount.")) return . = ..() @@ -76,7 +76,7 @@ organ_tag = O_AUG_L_HAND parent_organ = BP_L_HAND target_slot = slot_l_hand - to_chat(user, "You swap \the [src]'s servos to install neatly into \the upper [parent_organ] mount.") + to_chat(user, span_notice("You swap \the [src]'s servos to install neatly into \the upper [parent_organ] mount.")) return . = ..() @@ -120,7 +120,7 @@ organ_tag = O_AUG_L_UPPERARM parent_organ = BP_L_ARM target_slot = slot_l_hand - to_chat(user, "You swap \the [src]'s servos to install neatly into \the upper [parent_organ] mount.") + to_chat(user, span_notice("You swap \the [src]'s servos to install neatly into \the upper [parent_organ] mount.")) return . = ..() diff --git a/code/modules/organs/internal/augment/bio.dm b/code/modules/organs/internal/augment/bio.dm index 71aa461abb..94ea574717 100644 --- a/code/modules/organs/internal/augment/bio.dm +++ b/code/modules/organs/internal/augment/bio.dm @@ -53,28 +53,28 @@ drop_from_inventory(glasses) aug.integrated_object.forceMove(aug) if(!glasses) - to_chat(src, "Your [aug.integrated_object] retract into your skull.") + to_chat(src, span_alien("Your [aug.integrated_object] retract into your skull.")) else if(!istype(glasses, /obj/item/clothing/glasses/hud/security/jensenshades)) - to_chat(src, "\The [glasses] block your shades from deploying.") + to_chat(src, span_notice("\The [glasses] block your shades from deploying.")) else if(istype(glasses, /obj/item/clothing/glasses/hud/security/jensenshades)) var/obj/item/G = glasses if(G.canremove) - to_chat(src, "\The [G] are not your integrated shades.") + to_chat(src, span_notice("\The [G] are not your integrated shades.")) else drop_from_inventory(G) - to_chat(src, "\The [G] retract into your skull.") + to_chat(src, span_notice("\The [G] retract into your skull.")) qdel(G) else if(aug && aug.integrated_object) - to_chat(src, "Your [aug.integrated_object] deploy.") + to_chat(src, span_alien("Your [aug.integrated_object] deploy.")) equip_to_slot(aug.integrated_object, slot_glasses, 0, 1) if(!glasses || glasses != aug.integrated_object) aug.integrated_object.forceMove(aug) else var/obj/item/clothing/glasses/hud/security/jensenshades/J = new(get_turf(src)) equip_to_slot(J, slot_glasses, 1, 1) - to_chat(src, "Your [aug.integrated_object] deploy.") + to_chat(src, span_notice("Your [aug.integrated_object] deploy.")) /obj/item/organ/internal/augment/bioaugment/sprint_enhance name = "locomotive optimization implant" @@ -101,4 +101,3 @@ if(istype(owner, /mob/living/carbon/human)) var/mob/living/carbon/human/H = owner H.add_modifier(/datum/modifier/sprinting, 1 MINUTES) - diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index 5becf2fa80..4446bc9f19 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -117,7 +117,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) brainmob.languages = H.languages - to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just \a [initial(src.name)].") + to_chat(brainmob, span_notice("You feel slightly disoriented. That's normal when you're just \a [initial(src.name)].")) callHook("debrain", list(brainmob)) /obj/item/organ/internal/brain/examine(mob/user) // -- TLE @@ -295,9 +295,9 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) /decl/chemical_reaction/instant/promethean_brain_revival/on_reaction(var/datum/reagents/holder) var/obj/item/organ/internal/brain/slime/brain = holder.my_atom if(brain.reviveBody()) - brain.visible_message("[brain] bubbles, surrounding itself with a rapidly expanding mass of slime!") + brain.visible_message(span_notice("[brain] bubbles, surrounding itself with a rapidly expanding mass of slime!")) else - brain.visible_message("[brain] shifts strangely, but falls still.") + brain.visible_message(span_warning("[brain] shifts strangely, but falls still.")) /obj/item/organ/internal/brain/golem name = "chem" diff --git a/code/modules/organs/internal/eyes.dm b/code/modules/organs/internal/eyes.dm index 79d22fe577..c0fdfb2b65 100644 --- a/code/modules/organs/internal/eyes.dm +++ b/code/modules/organs/internal/eyes.dm @@ -73,7 +73,7 @@ var/oldbroken = is_broken() ..() if(is_broken() && !oldbroken && owner && !owner.stat) - to_chat(owner, "You go blind!") + to_chat(owner, span_danger("You go blind!")) /obj/item/organ/internal/eyes/process() //Eye damage replaces the old eye_stat var. ..() diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 99bb451410..dd4d9e97b0 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -197,7 +197,7 @@ var/list/organ_cache = list() /obj/item/organ/examine(mob/user) . = ..() if(status & ORGAN_DEAD) - . += "Decay appears to have set in." + . += span_notice("Decay appears to have set in.") //A little wonky: internal organs stop calling this (they return early in process) when dead, but external ones cause further damage when dead /obj/item/organ/proc/handle_germ_effects() @@ -451,7 +451,7 @@ var/list/organ_cache = list() if(robotic >= ORGAN_ROBOT) return - to_chat(user, "You take an experimental bite out of \the [src].") + to_chat(user, span_notice("You take an experimental bite out of \the [src].")) var/datum/reagent/blood/B = locate(/datum/reagent/blood) in reagents.reagent_list blood_splatter(src,B,1) @@ -503,10 +503,10 @@ var/list/organ_cache = list() /obj/item/organ/proc/butcher(var/obj/item/O, var/mob/living/user, var/atom/newtarget) if(robotic >= ORGAN_ROBOT) - user?.visible_message("[user] disassembles \the [src].") + user?.visible_message(span_notice("[user] disassembles \the [src].")) else - user?.visible_message("[user] butchers \the [src].") + user?.visible_message(span_notice("[user] butchers \the [src].")) if(!newtarget) newtarget = get_turf(src) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 8e4b00a268..bb5be2ddaa 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -157,7 +157,7 @@ I.loc = get_turf(user) //just in case something was embedded that is not an item if(istype(I)) user.put_in_hands(I) - user.visible_message("\The [user] rips \the [I] out of \the [src]!") + user.visible_message(span_danger("\The [user] rips \the [I] out of \the [src]!")) return //no eating the limb until everything's been removed return ..() @@ -167,18 +167,18 @@ for(var/obj/item/I in contents) if(istype(I, /obj/item/organ)) continue - . += "There is \a [I] sticking out of it." + . += span_danger("There is \a [I] sticking out of it.") /obj/item/organ/external/attackby(obj/item/W as obj, mob/living/user as mob) switch(stage) if(0) if(istype(W,/obj/item/surgical/scalpel)) - user.visible_message("[user] cuts [src] open with [W]!") + user.visible_message(span_danger("[user] cuts [src] open with [W]!")) stage++ return if(1) if(istype(W,/obj/item/surgical/retractor)) - user.visible_message("[user] cracks [src] open like an egg with [W]!") + user.visible_message(span_danger("[user] cracks [src] open like an egg with [W]!")) stage++ return if(2) @@ -187,9 +187,9 @@ var/obj/item/removing = pick(contents) removing.loc = get_turf(user.loc) user.put_in_hands(removing) - user.visible_message("[user] extracts [removing] from [src] with [W]!") + user.visible_message(span_danger("[user] extracts [removing] from [src] with [W]!")) else - user.visible_message("[user] fishes around fruitlessly in [src] with [W].") + user.visible_message(span_danger("[user] fishes around fruitlessly in [src] with [W].")) return ..() @@ -445,11 +445,11 @@ else return 0 if(!damage_amount) - to_chat(user, "Nothing to fix!") + to_chat(user, span_notice("Nothing to fix!")) return 0 if(brute_dam + burn_dam >= min_broken_damage) //VOREStation Edit - Makes robotic limb damage scalable - to_chat(user, "The damage is far too severe to patch over externally.") + to_chat(user, span_danger("The damage is far too severe to patch over externally.")) return 0 if(user == src.owner) @@ -460,12 +460,12 @@ grasp = "r_hand" if(grasp) - to_chat(user, "You can't reach your [src.name] while holding [tool] in your [owner.get_bodypart_name(grasp)].") + to_chat(user, span_warning("You can't reach your [src.name] while holding [tool] in your [owner.get_bodypart_name(grasp)].")) return 0 user.setClickCooldown(user.get_attack_speed(tool)) if(!do_mob(user, owner, 10)) - to_chat(user, "You must stand still to do that.") + to_chat(user, span_warning("You must stand still to do that.")) return 0 switch(damage_type) @@ -567,13 +567,13 @@ This function completely restores a damaged organ to perfect condition. W.open_wound(damage) if(prob(25)) if(robotic >= ORGAN_ROBOT) - owner.visible_message("The damage to [owner.name]'s [name] worsens.",\ - "The damage to your [name] worsens.",\ - "You hear the screech of abused metal.") + owner.visible_message(span_danger("The damage to [owner.name]'s [name] worsens."),\ + span_danger("The damage to your [name] worsens."),\ + span_danger("You hear the screech of abused metal.")) else - owner.visible_message("The wound on [owner.name]'s [name] widens with a nasty ripping noise.",\ - "The wound on your [name] widens with a nasty ripping noise.",\ - "You hear a nasty ripping noise, as if flesh is being torn apart.") + owner.visible_message(span_danger("The wound on [owner.name]'s [name] widens with a nasty ripping noise."),\ + span_danger("The wound on your [name] widens with a nasty ripping noise."),\ + span_danger("You hear a nasty ripping noise, as if flesh is being torn apart.")) return //Creating wound @@ -731,7 +731,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(. >= 3 && antibiotics < ANTIBIO_OD) //INFECTION_LEVEL_THREE if (!(status & ORGAN_DEAD)) status |= ORGAN_DEAD - to_chat(owner, "You can't feel your [name] anymore...") + to_chat(owner, span_notice("You can't feel your [name] anymore...")) owner.update_icons_body() for (var/obj/item/organ/external/child in children) child.germ_level += 110 //Burst of infection from a parent organ becoming necrotic @@ -889,26 +889,26 @@ Note that amputating the affected organ does in fact remove the infection from t if(!clean) var/gore_sound = "[(robotic >= ORGAN_ROBOT) ? "tortured metal" : "ripping tendons and flesh"]" owner.visible_message( - "\The [owner]'s [src.name] flies off in an arc!",\ - "Your [src.name] goes flying off!",\ - "You hear a terrible sound of [gore_sound].") + span_danger("\The [owner]'s [src.name] flies off in an arc!"),\ + span_moderate("Your [src.name] goes flying off!"),\ + span_danger("You hear a terrible sound of [gore_sound].")) if(DROPLIMB_BURN) if(cannot_gib) return var/gore = "[(robotic >= ORGAN_ROBOT) ? "": " of burning flesh"]" owner.visible_message( - "\The [owner]'s [src.name] flashes away into ashes!",\ - "Your [src.name] flashes away into ashes!",\ - "You hear a crackling sound[gore].") + span_danger("\The [owner]'s [src.name] flashes away into ashes!"),\ + span_moderate("Your [src.name] flashes away into ashes!"),\ + span_danger("You hear a crackling sound[gore].")) if(DROPLIMB_BLUNT) if(cannot_gib) return var/gore = "[(robotic >= ORGAN_ROBOT) ? "": " in shower of gore"]" var/gore_sound = "[(status >= ORGAN_ROBOT) ? "rending sound of tortured metal" : "sickening splatter of gore"]" owner.visible_message( - "\The [owner]'s [src.name] explodes[gore]!",\ - "Your [src.name] explodes[gore]!",\ - "You hear the [gore_sound].") + span_danger("\The [owner]'s [src.name] explodes[gore]!"),\ + span_moderate("Your [src.name] explodes[gore]!"),\ + span_danger("You hear the [gore_sound].")) var/mob/living/carbon/human/victim = owner //Keep a reference for post-removed(). var/obj/item/organ/external/parent_organ = parent @@ -1085,9 +1085,9 @@ Note that amputating the affected organ does in fact remove the infection from t if(owner) //VOREStation Edit Start if(organ_can_feel_pain() && !isbelly(owner.loc) && !isliving(owner.loc)) owner.visible_message(\ - "You hear a loud cracking sound coming from \the [owner].",\ - "Something feels like it shattered in your [name]!",\ - "You hear a sickening crack.") + span_danger("You hear a loud cracking sound coming from \the [owner]."),\ + span_danger("Something feels like it shattered in your [name]!"),\ + span_danger("You hear a sickening crack.")) owner.emote("scream") jostle_bone() //VOREStation Edit End @@ -1220,7 +1220,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(!owner || loc != owner) return if(!silent) - owner.visible_message("\The [W] sticks in the wound!") + owner.visible_message(span_danger("\The [W] sticks in the wound!")) implants += W owner.embedded_flag = 1 owner.verbs += /mob/proc/yank_out_object @@ -1277,9 +1277,9 @@ Note that amputating the affected organ does in fact remove the infection from t //Robotic limbs explode if sabotaged. if(is_robotic && sabotaged) victim.visible_message( - "\The [victim]'s [src.name] explodes violently!",\ - "Your [src.name] explodes!",\ - "You hear an explosion!") + span_danger("\The [victim]'s [src.name] explodes violently!"),\ + span_danger("Your [src.name] explodes!"),\ + span_danger("You hear an explosion!")) explosion(get_turf(owner),-1,-1,2,3) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, victim) @@ -1297,13 +1297,13 @@ Note that amputating the affected organ does in fact remove the infection from t return if(owner) if(type == "brute") - owner.visible_message("You hear a sickening cracking sound coming from \the [owner]'s [name].", \ - "Your [name] becomes a mangled mess!", \ - "You hear a sickening crack.") + owner.visible_message(span_danger("You hear a sickening cracking sound coming from \the [owner]'s [name]."), \ + span_danger("Your [name] becomes a mangled mess!"), \ + span_danger("You hear a sickening crack.")) else - owner.visible_message("\The [owner]'s [name] melts away, turning into mangled mess!", \ - "Your [name] melts away!", \ - "You hear a sickening sizzle.") + owner.visible_message(span_danger("\The [owner]'s [name] melts away, turning into mangled mess!"), \ + span_danger("Your [name] melts away!"), \ + span_danger("You hear a sickening sizzle.")) disfigured = 1 /obj/item/organ/external/proc/jostle_bone(force) diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm index 08b9cc620f..468c8c1a3a 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -13,7 +13,7 @@ /mob/living/carbon/proc/custom_pain(message, power, force) if((!message || stat || !can_feel_pain() || chem_effects[CE_PAINKILLER] > power) && !synth_cosmetic_pain) return 0 - message = "[message]" + message = span_danger("[message]") if(power >= 50) message = "[message]" diff --git a/code/modules/organs/subtypes/machine.dm b/code/modules/organs/subtypes/machine.dm index dbe4154aa8..bbd7513240 100644 --- a/code/modules/organs/subtypes/machine.dm +++ b/code/modules/organs/subtypes/machine.dm @@ -16,7 +16,7 @@ // This is very ghetto way of rebooting an IPC. TODO better way. if(owner && owner.stat == DEAD) owner.set_stat(CONSCIOUS) - owner.visible_message("\The [owner] twitches visibly!") + owner.visible_message(span_danger("\The [owner] twitches visibly!")) /obj/item/organ/internal/cell/emp_act(severity) ..() @@ -89,7 +89,7 @@ owner.set_stat(CONSCIOUS) dead_mob_list -= owner living_mob_list |= owner - owner.visible_message("\The [owner] twitches visibly!") + owner.visible_message(span_danger("\The [owner] twitches visibly!")) /obj/item/organ/internal/mmi_holder/removed(var/mob/living/user) diff --git a/code/modules/organs/subtypes/standard.dm b/code/modules/organs/subtypes/standard.dm index 152c367967..01c05fe2b9 100644 --- a/code/modules/organs/subtypes/standard.dm +++ b/code/modules/organs/subtypes/standard.dm @@ -336,8 +336,8 @@ /obj/item/organ/external/head/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/toy/plushie) || istype(I, /obj/item/organ/external/head)) - user.visible_message("[user] makes \the [I] kiss \the [src]!.", \ - "You make \the [I] kiss \the [src]!.") + user.visible_message(span_notice("[user] makes \the [I] kiss \the [src]!."), \ + span_notice("You make \the [I] kiss \the [src]!.")) return ..() /obj/item/organ/external/head/get_icon(var/skeletal, var/can_apply_transparency = TRUE) diff --git a/code/modules/overmap/bluespace_rift_vr.dm b/code/modules/overmap/bluespace_rift_vr.dm index 2964dd5b7a..0af937164a 100644 --- a/code/modules/overmap/bluespace_rift_vr.dm +++ b/code/modules/overmap/bluespace_rift_vr.dm @@ -13,7 +13,7 @@ . = ..() if(new_partner) pair(new_partner) - + /obj/effect/overmap/bluespace_rift/proc/pair(var/obj/effect/overmap/bluespace_rift/new_partner) if(istype(new_partner)) partner = new_partner @@ -37,6 +37,6 @@ new type(get_turf(user), src) else if(partner) user.forceMove(get_turf(partner)) - to_chat(user, "Your ghostly form is pulled through the rift!") + to_chat(user, span_notice("Your ghostly form is pulled through the rift!")) else return ..() diff --git a/code/modules/overmap/champagne.dm b/code/modules/overmap/champagne.dm index 593be7f2a6..81cd0bf36d 100644 --- a/code/modules/overmap/champagne.dm +++ b/code/modules/overmap/champagne.dm @@ -23,41 +23,41 @@ return if(comp.shuttle_tag) - to_chat(user, "[comp] is already configured to link with [comp.shuttle_tag]") + to_chat(user, span_warning("[comp] is already configured to link with [comp.shuttle_tag]")) return - user.visible_message("[user] lifts [src] bottle over [comp]!") + user.visible_message(span_notice("[user] lifts [src] bottle over [comp]!")) var/shuttle_name = tgui_input_text(usr, "Choose a name for the shuttle", "New Shuttle Name") if(!shuttle_name || QDELETED(src) || QDELETED(comp) || comp.shuttle_tag || user.incapacitated()) return // After input() safety re-checks // Tons of safety checks here. Make sure they don't destroy everything. if(length(shuttle_name) < min_name_len || length(shuttle_name) > max_name_len) - to_chat(user, "Name length must be between [min_name_len] and [max_name_len].") + to_chat(user, span_warning("Name length must be between [min_name_len] and [max_name_len].")) return if(shuttle_name in SSshuttles.shuttles) - to_chat(user, "Invalid name: Already in use.") + to_chat(user, span_warning("Invalid name: Already in use.")) return var/area/my_area = get_area(comp) if(!my_area || istype(my_area, /area/space)) - to_chat(user, "[comp] must be in a valid area to become a shuttle.") + to_chat(user, span_warning("[comp] must be in a valid area to become a shuttle.")) return if(my_area in SSshuttles.shuttle_areas) - to_chat(user, "[comp] is already in a shuttle.") + to_chat(user, span_warning("[comp] is already in a shuttle.")) return // Count turfs in the area var/list/turfs = get_current_area_turfs(my_area) if(turfs.len > max_area_turfs) - to_chat(user, "The new shuttle area is too large.") + to_chat(user, span_warning("The new shuttle area is too large.")) return var/turf/comp_turf = get_turf(comp) var/datum/shuttle/autodock/S = create_landable_shuttle(shuttle_name, comp_turf, my_area) playsound(src, 'sound/effects/Glassbr3.ogg', 100, 0) - user.visible_message("[user] smashes [src] on [comp]", - "You smash [src] on [comp], christening a new landable ship named [S.name]", - "You hear glass shattering") + user.visible_message(span_notice("[user] smashes [src] on [comp]"), + span_info("You smash [src] on [comp], christening a new landable ship named [S.name]"), + span_notice("You hear glass shattering")) log_and_message_admins("[key_name_admin(user)] Created a new shuttle [S.name]. [ADMIN_JMP(comp_turf)]") spawn(1 SECOND) playsound(comp_turf, 'sound/voice/Serithi/Shuttlehere.ogg', 75, 0) diff --git a/code/modules/overmap/disperser/disperser.dm b/code/modules/overmap/disperser/disperser.dm index eb8b2ba7d8..c25f65d0da 100644 --- a/code/modules/overmap/disperser/disperser.dm +++ b/code/modules/overmap/disperser/disperser.dm @@ -25,11 +25,11 @@ if(I && I.has_tool_quality(TOOL_WRENCH)) if(panel_open) user.visible_message("\The [user] rotates \the [src] with \the [I].", - "You rotate \the [src] with \the [I].") + span_notice("You rotate \the [src] with \the [I].")) set_dir(turn(dir, 90)) playsound(src, 'sound/items/jaws_pry.ogg', 50, 1) else - to_chat(user, "The maintenance panel must be screwed open for this!") + to_chat(user, span_notice("The maintenance panel must be screwed open for this!")) return if(default_deconstruction_screwdriver(user, I)) return diff --git a/code/modules/overmap/ships/computers/computer_shims.dm b/code/modules/overmap/ships/computers/computer_shims.dm index d35d821df3..fd0d3abaef 100644 --- a/code/modules/overmap/ships/computers/computer_shims.dm +++ b/code/modules/overmap/ships/computers/computer_shims.dm @@ -73,7 +73,7 @@ /obj/machinery/computer/ship/attack_ai(mob/user) //VOREStation Addition Start if(!ai_control && issilicon(user)) - to_chat(user, "Access Denied.") + to_chat(user, span_warning("Access Denied.")) return //VOREStation Addition End if(tgui_status(user, tgui_state()) > STATUS_CLOSE) @@ -90,11 +90,11 @@ return //VOREStation Addition Start if(!ai_control && issilicon(user)) - to_chat(user, "Access Denied.") + to_chat(user, span_warning("Access Denied.")) return TRUE //VOREStation Addition End if(!allowed(user)) - to_chat(user, "Access Denied.") + to_chat(user, span_warning("Access Denied.")) return TRUE if(tgui_status(user, tgui_state()) > STATUS_CLOSE) return interface_interact(user) diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index ec7cb0ac00..c012eb323c 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -165,7 +165,7 @@ GLOBAL_LIST_EMPTY(all_waypoints) sec_name = "Sector #[known_sectors.len]" R.fields["name"] = sec_name if(sec_name in known_sectors) - to_chat(usr, "Sector with that name already exists, please input a different name.") + to_chat(usr, span_warning("Sector with that name already exists, please input a different name.")) return TRUE switch(params["add"]) if("current") diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index 4cd7ee66f9..92965c4fd2 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -153,13 +153,13 @@ return if(WT.remove_fuel(0,user)) - to_chat(user, "You start repairing the damage to [src].") + to_chat(user, span_notice("You start repairing the damage to [src].")) playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, max(5, damage / 5), src) && WT && WT.isOn()) - to_chat(user, "You finish repairing the damage to [src].") + to_chat(user, span_notice("You finish repairing the damage to [src].")) take_damage(-damage) else - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span_notice("You need more welding fuel to complete this task.")) return return ..() @@ -182,11 +182,11 @@ /obj/machinery/shipsensors/examine(mob/user) . = ..() if(health <= 0) - . += "It is wrecked." + . += span_danger("It is wrecked.") else if(health < max_health * 0.25) - . += "It looks like it's about to break!" + . += span_danger("It looks like it's about to break!") else if(health < max_health * 0.5) - . += "It looks seriously damaged!" + . += span_danger("It looks seriously damaged!") else if(health < max_health * 0.75) . += "It shows signs of damage!" @@ -207,7 +207,7 @@ if(!in_vacuum()) toggle() if(heat > critical_heat) - src.visible_message("\The [src] violently spews out sparks!") + src.visible_message(span_danger("\The [src] violently spews out sparks!")) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() diff --git a/code/modules/overmap/ships/computers/ship.dm b/code/modules/overmap/ships/computers/ship.dm index 31f6d39168..15df9bab59 100644 --- a/code/modules/overmap/ships/computers/ship.dm +++ b/code/modules/overmap/ships/computers/ship.dm @@ -22,7 +22,7 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov return . = attempt_hook_up_recursive(sector) if(. && linked && user) - to_chat(user, "[src] reconnected to [linked]") + to_chat(user, span_notice("[src] reconnected to [linked]")) user << browse(null, "window=[src]") // close reconnect dialog /obj/machinery/computer/ship/proc/attempt_hook_up_recursive(obj/effect/overmap/visitable/ship/sector) diff --git a/code/modules/overmap/ships/computers/shuttle.dm b/code/modules/overmap/ships/computers/shuttle.dm index 6dd79a7dfa..5ad197e050 100644 --- a/code/modules/overmap/ships/computers/shuttle.dm +++ b/code/modules/overmap/ships/computers/shuttle.dm @@ -31,7 +31,7 @@ var/datum/shuttle/autodock/overmap/shuttle = SSshuttles.shuttles[shuttle_tag] if(!istype(shuttle)) - to_chat(usr, "Unable to establish link with the shuttle.") + to_chat(usr, span_warning("Unable to establish link with the shuttle.")) return TRUE if(ismob(usr)) @@ -45,7 +45,7 @@ if(possible_d.len) D = tgui_input_list(usr, "Choose shuttle destination", "Shuttle Destination", possible_d) else - to_chat(usr,"No valid landing sites in range.") + to_chat(usr,span_warning("No valid landing sites in range.")) possible_d = shuttle.get_possible_destinations() if(CanInteract(usr, GLOB.tgui_default_state) && (D in possible_d)) shuttle.set_destination(possible_d[D]) diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm index 96390ed36c..b03368892a 100644 --- a/code/modules/overmap/ships/engines/gas_thruster.dm +++ b/code/modules/overmap/ships/engines/gas_thruster.dm @@ -149,7 +149,7 @@ if(!is_on()) return 0 if(!check_fuel() || (use_power_oneoff(charge_per_burn) < charge_per_burn) || check_blockage()) - audible_message(src,"[src] coughs once and goes silent!", runemessage = "sputtercough") + audible_message(src,span_warning("[src] coughs once and goes silent!"), runemessage = "sputtercough") update_use_power(USE_POWER_OFF) return 0 diff --git a/code/modules/overmap/ships/panicbutton.dm b/code/modules/overmap/ships/panicbutton.dm index aa55ab8ad5..85ff99ca1c 100644 --- a/code/modules/overmap/ships/panicbutton.dm +++ b/code/modules/overmap/ships/panicbutton.dm @@ -35,7 +35,7 @@ // Already launched if(launched) - to_chat(user, "The button is already depressed; the beacon has been launched already.") + to_chat(user, span_warning("The button is already depressed; the beacon has been launched already.")) // Glass present else if(glass) if(user.a_intent == I_HURT) @@ -45,7 +45,7 @@ update_icon() else user.custom_emote(VISIBLE_MESSAGE, "pats [src] in a friendly manner.") - to_chat(user, "If you're trying to break the glass, you'll have to hit it harder than that...") + to_chat(user, span_warning("If you're trying to break the glass, you'll have to hit it harder than that...")) // Must be !glass and !launched else user.custom_emote(VISIBLE_MESSAGE, "pushes the button on [src]!") diff --git a/code/modules/overmap/ships/ship_vr.dm b/code/modules/overmap/ships/ship_vr.dm index 4eed0abd23..21e2e7cb75 100644 --- a/code/modules/overmap/ships/ship_vr.dm +++ b/code/modules/overmap/ships/ship_vr.dm @@ -18,11 +18,11 @@ if(confirm == "Eat it!") var/obj/belly/bellychoice = tgui_input_list(usr, "Which belly?","Select A Belly", L.vore_organs) if(bellychoice) - L.visible_message("[L] is trying to stuff \the [src] into [L.gender == MALE ? "his" : L.gender == FEMALE ? "her" : "their"] [bellychoice]!","You begin putting \the [src] into your [bellychoice]!") + L.visible_message(span_warning("[L] is trying to stuff \the [src] into [L.gender == MALE ? "his" : L.gender == FEMALE ? "her" : "their"] [bellychoice]!"),span_notice("You begin putting \the [src] into your [bellychoice]!")) if(do_after(L, 5 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE)) forceMove(bellychoice) SSskybox.rebuild_skyboxes(map_z) - L.visible_message("[L] eats a spaceship! This is totally normal.","You eat the the spaceship! Yum, metal.") + L.visible_message(span_warning("[L] eats a spaceship! This is totally normal."),"You eat the the spaceship! Yum, metal.") /obj/effect/overmap/visitable/ship/proc/get_people_in_ship() . = list() diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm index 2249bcc0ac..4b5154d84b 100644 --- a/code/modules/paperwork/adminpaper.dm +++ b/code/modules/paperwork/adminpaper.dm @@ -86,7 +86,7 @@ if(href_list["write"]) var/id = href_list["write"] if(free_space <= 0) - to_chat(usr, "There isn't enough space left on \the [src] to write anything.") + to_chat(usr, span_info("There isn't enough space left on \the [src] to write anything.")) return var/raw_t = tgui_input_text(usr, "Enter what you want to write:", "Write", multiline = TRUE, prevent_enter = TRUE) @@ -104,7 +104,7 @@ if(fields > 50)//large amount of fields creates a heavy load on the server, see updateinfolinks() and addtofield() - to_chat(usr, "Too many fields. Sorry, you can't do this.") + to_chat(usr, span_warning("Too many fields. Sorry, you can't do this.")) fields = last_fields_value return diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm index 4ed61dec5f..53aa0eb27a 100644 --- a/code/modules/paperwork/carbonpaper.dm +++ b/code/modules/paperwork/carbonpaper.dm @@ -42,7 +42,7 @@ copy.name = "Copy - " + c.name copy.fields = c.fields copy.updateinfolinks() - to_chat(usr, "You tear off the carbon-copy!") + to_chat(usr, span_notice("You tear off the carbon-copy!")) c.copied = 1 copy.iscopy = 1 copy.update_icon() diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 4fd59c0d02..f0d3e61bbc 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -50,7 +50,7 @@ W.loc = src if(istype(W, /obj/item/paper)) toppaper = W - to_chat(user, "You clip the [W] onto \the [src].") + to_chat(user, span_notice("You clip the [W] onto \the [src].")) update_icon() else if(istype(toppaper) && istype(W, /obj/item/pen)) @@ -64,7 +64,7 @@ P.loc = src toppaper = P update_icon() - to_chat(user, "You clip the [P] onto \the [src].") + to_chat(user, span_notice("You clip the [P] onto \the [src].")) /obj/item/clipboard/attack_self(mob/user as mob) var/dat = "Clipboard" @@ -110,7 +110,7 @@ usr.drop_item() W.loc = src haspen = W - to_chat(usr, "You slot the pen into \the [src].") + to_chat(usr, span_notice("You slot the pen into \the [src].")) else if(href_list["write"]) var/obj/item/P = locate(href_list["write"]) @@ -171,7 +171,7 @@ var/obj/item/P = locate(href_list["top"]) if(P && (P.loc == src) && istype(P, /obj/item/paper) ) toppaper = P - to_chat(usr, "You move [P.name] to the top.") + to_chat(usr, span_notice("You move [P.name] to the top.")) //Update everything attack_self(usr) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index df048f0b05..d7c7ecadbf 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -77,7 +77,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins if(L.stat || L.restrained()) return if(last_fax_role_request && (world.time - last_fax_role_request < 5 MINUTES)) - to_chat(L, "The global automated relays are still recalibrating. Try again later or relay your request in written form for processing.") + to_chat(L, span_warning("The global automated relays are still recalibrating. Try again later or relay your request in written form for processing.")) return var/confirmation = tgui_alert(L, "Are you sure you want to send automated crew request?", "Confirmation", list("Yes", "No", "Cancel")) @@ -115,7 +115,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins var/datum/department/ping_dept = SSjob.get_ping_role(role) if(!ping_dept) - to_chat(L, "Selected job cannot be requested for \[ERRORDEPTNOTFOUND] reason. Please report this to system administrator.") + to_chat(L, span_warning("Selected job cannot be requested for \[ERRORDEPTNOTFOUND] reason. Please report this to system administrator.")) return var/message_color = "#FFFFFF" var/ping_name = null @@ -141,13 +141,13 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins if(DEPARTMENT_TALON) ping_name = "Offmap" if(!ping_name) - to_chat(L, "Selected job cannot be requested for \[ERRORUNKNOWNDEPT] reason. Please report this to system administrator.") + to_chat(L, span_warning("Selected job cannot be requested for \[ERRORUNKNOWNDEPT] reason. Please report this to system administrator.")) return message_color = ping_dept.color message_chat_rolerequest(message_color, ping_name, reason, role) last_fax_role_request = world.time - to_chat(L, "Your request was transmitted.") + to_chat(L, span_notice("Your request was transmitted.")) /obj/machinery/photocopier/faxmachine/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) @@ -218,7 +218,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins return copyitem.forceMove(loc) usr.put_in_hands(copyitem) - to_chat(usr, "You take \the [copyitem] out of \the [src].") + to_chat(usr, span_notice("You take \the [copyitem] out of \the [src].")) copyitem = null if("send_automated_staff_request") request_roles() diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 6b161e56ef..2fed2a8742 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -33,7 +33,7 @@ /obj/structure/filingcabinet/attackby(obj/item/P as obj, mob/user as mob) if(istype(P, /obj/item/paper) || istype(P, /obj/item/folder) || istype(P, /obj/item/photo) || istype(P, /obj/item/paper_bundle)) - to_chat(user, "You put [P] in [src].") + to_chat(user, span_notice("You put [P] in [src].")) user.drop_item() P.loc = src open_animation() @@ -41,24 +41,24 @@ else if(P.has_tool_quality(TOOL_WRENCH)) playsound(src, P.usesound, 50, 1) anchored = !anchored - to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + to_chat(user, span_notice("You [anchored ? "wrench" : "unwrench"] \the [src].")) else if(P.has_tool_quality(TOOL_SCREWDRIVER)) - to_chat(user, "You begin taking the [name] apart.") + to_chat(user, span_notice("You begin taking the [name] apart.")) playsound(src, P.usesound, 50, 1) if(do_after(user, 10 * P.toolspeed)) playsound(src, P.usesound, 50, 1) - to_chat(user, "You take the [name] apart.") + to_chat(user, span_notice("You take the [name] apart.")) new /obj/item/stack/material/steel( src.loc, 4 ) for(var/obj/item/I in contents) I.forceMove(loc) qdel(src) return else - to_chat(user, "You can't put [P] in [src]!") + to_chat(user, span_notice("You can't put [P] in [src]!")) /obj/structure/filingcabinet/attack_hand(mob/user as mob) if(contents.len <= 0) - to_chat(user, "\The [src] is empty.") + to_chat(user, span_notice("\The [src] is empty.")) return tgui_interact(user) @@ -75,9 +75,9 @@ I.loc = loc if(prob(25)) step_rand(I) - to_chat(user, "You pull \a [I] out of [src] at random.") + to_chat(user, span_notice("You pull \a [I] out of [src] at random.")) return - to_chat(user, "You find nothing in [src].") + to_chat(user, span_notice("You find nothing in [src].")) /obj/structure/filingcabinet/tgui_state(mob/user) return GLOB.tgui_physical_state diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 66904ef7eb..1e89ee949c 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -67,7 +67,7 @@ if(istype(W, /obj/item/paper) || istype(W, /obj/item/photo) || istype(W, /obj/item/paper_bundle)) user.drop_item() W.loc = src - to_chat(user, "You put the [W] into \the [src].") + to_chat(user, span_notice("You put the [W] into \the [src].")) update_icon() else if(istype(W, /obj/item/pen)) var/n_name = sanitizeSafe(tgui_input_text(user, "What would you like to label the folder?", "Folder Labelling", null, MAX_NAME_LEN), MAX_NAME_LEN) @@ -79,7 +79,7 @@ for(var/obj/item/paper/P in T) P.loc = src update_icon() - to_chat(user, "You tuck the [P] into \the [src].") + to_chat(user, span_notice("You tuck the [P] into \the [src].")) /obj/item/folder/attack_self(mob/user as mob) var/dat = "[name]" diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 28c119980c..bff59857fc 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -162,7 +162,7 @@ if(in_range(user, src) || istype(user, /mob/observer/dead)) show_content(usr) else - . += "You have to go closer if you want to read it." + . += span_notice("You have to go closer if you want to read it.") /obj/item/paper/proc/show_content(var/mob/user, var/forceshow=0) if(!(forceshow || (istype(user, /mob/living/carbon/human) || istype(user, /mob/observer/dead) || istype(user, /mob/living/silicon) || (istype(user) && user.universal_understand)))) @@ -178,7 +178,7 @@ set src in usr if((CLUMSY in usr.mutations) && prob(50)) - to_chat(usr, "You cut yourself on the paper.") + to_chat(usr, span_warning("You cut yourself on the paper.")) return var/n_name = sanitizeSafe(tgui_input_text(usr, "What would you like to label the paper?", "Paper Labelling", null, MAX_NAME_LEN), MAX_NAME_LEN) @@ -194,7 +194,7 @@ /obj/item/paper/attack_self(mob/living/user as mob) if(user.a_intent == I_HURT) if(icon_state == "scrap") - user.show_message("\The [src] is already crumpled.") + user.show_message(span_warning("\The [src] is already crumpled.")) return //crumple dat paper info = stars(info,85) @@ -227,23 +227,23 @@ /obj/item/paper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(user.zone_sel.selecting == O_EYES) - user.visible_message("You show the paper to [M]. ", \ - " [user] holds up a paper and shows it to [M]. ") + user.visible_message(span_notice("You show the paper to [M]. "), \ + span_notice(" [user] holds up a paper and shows it to [M]. ")) M.examinate(src) else if(user.zone_sel.selecting == O_MOUTH) // lipstick wiping if(ishuman(M)) var/mob/living/carbon/human/H = M if(H == user) - to_chat(user, "You wipe off the lipstick with [src].") + to_chat(user, span_notice("You wipe off the lipstick with [src].")) H.lip_style = null H.update_icons_body() else - user.visible_message("[user] begins to wipe [H]'s lipstick off with \the [src].", \ - "You begin to wipe off [H]'s lipstick.") + user.visible_message(span_warning("[user] begins to wipe [H]'s lipstick off with \the [src]."), \ + span_notice("You begin to wipe off [H]'s lipstick.")) if(do_after(user, 10) && do_after(H, 10, 5, 0)) //user needs to keep their active hand, H does not. - user.visible_message("[user] wipes [H]'s lipstick off with \the [src].", \ - "You wipe off [H]'s lipstick.") + user.visible_message(span_notice("[user] wipes [H]'s lipstick off with \the [src]."), \ + span_notice("You wipe off [H]'s lipstick.")) H.lip_style = null H.update_icons_body() @@ -428,7 +428,7 @@ //var/t = strip_html_simple(input(usr, "What text do you wish to add to " + (id=="end" ? "the end of the paper" : "field "+id) + "?", "[name]", null),8192) as message if(free_space <= 0) - to_chat(usr, "There isn't enough space left on \the [src] to write anything.") + to_chat(usr, span_info("There isn't enough space left on \the [src] to write anything.")) return var/raw = tgui_input_text(usr, "Enter what you want to write:", "Write", multiline = TRUE, prevent_enter = TRUE) @@ -489,7 +489,7 @@ if(fields > 50)//large amount of fields creates a heavy load on the server, see updateinfolinks() and addtofield() - to_chat(usr, "Too many fields. Sorry, you can't do this.") + to_chat(usr, span_warning("Too many fields. Sorry, you can't do this.")) fields = last_fields_value return @@ -532,20 +532,20 @@ src.loc = CB CB.toppaper = src CB.update_icon() - to_chat(user, "You clip the [src] onto \the [CB].") + to_chat(user, span_notice("You clip the [src] onto \the [CB].")) if(istype(P, /obj/item/folder)) if(src.loc == user) user.drop_from_inventory(src) src.loc = P P.update_icon() - to_chat(user, "You tuck the [src] into \the [P].") + to_chat(user, span_notice("You tuck the [src] into \the [P].")) if(istype(P, /obj/item/paper) || istype(P, /obj/item/photo)) if (istype(P, /obj/item/paper/carbon)) var/obj/item/paper/carbon/C = P if (!C.iscopy && !C.copied) - to_chat(user, "Take off the carbon copy first.") + to_chat(user, span_notice("Take off the carbon copy first.")) add_fingerprint(user) return var/obj/item/paper_bundle/B = new(src.loc) @@ -577,7 +577,7 @@ src.loc = get_turf(h_user) if(h_user.client) h_user.client.screen -= src h_user.put_in_hands(B) - to_chat(user, "You clip the [P.name] to [(src.name == "paper") ? "the paper" : src.name].") + to_chat(user, span_notice("You clip the [P.name] to [(src.name == "paper") ? "the paper" : src.name].")) src.loc = B P.loc = B @@ -587,7 +587,7 @@ else if(istype(P, /obj/item/pen)) if(icon_state == "scrap") - to_chat(usr, "\The [src] is too crumpled to write on.") + to_chat(usr, span_warning("\The [src] is too crumpled to write on.")) return var/obj/item/pen/robopen/RP = P @@ -627,7 +627,7 @@ if(istype(P, /obj/item/stamp/clown)) if(!clown) - to_chat(user, "You are totally unable to use the stamp. HONK!") + to_chat(user, span_notice("You are totally unable to use the stamp. HONK!")) return if(!ico) @@ -641,7 +641,7 @@ add_overlay(stampoverlay) playsound(src, 'sound/bureaucracy/stamp.ogg', 50, 1) - to_chat(user, "You stamp the paper with your rubber stamp.") + to_chat(user, span_notice("You stamp the paper with your rubber stamp.")) else if(istype(P, /obj/item/flame)) burnpaper(P, user) diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 280180c6fa..da757143a3 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -24,7 +24,7 @@ if (istype(W, /obj/item/paper/carbon)) var/obj/item/paper/carbon/C = W if (!C.iscopy && !C.copied) - to_chat(user, "Take off the carbon copy first.") + to_chat(user, span_notice("Take off the carbon copy first.")) add_fingerprint(user) return // adding sheets @@ -43,7 +43,7 @@ O.add_fingerprint(usr) pages.Add(O) - to_chat(user, "You add \the [W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].") + to_chat(user, span_notice("You add \the [W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].")) qdel(W) else if(istype(W, /obj/item/tape_roll)) @@ -60,9 +60,9 @@ /obj/item/paper_bundle/proc/insert_sheet_at(mob/user, var/index, obj/item/sheet) if(istype(sheet, /obj/item/paper)) - to_chat(user, "You add [(sheet.name == "paper") ? "the paper" : sheet.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].") + to_chat(user, span_notice("You add [(sheet.name == "paper") ? "the paper" : sheet.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].")) else if(istype(sheet, /obj/item/photo)) - to_chat(user, "You add [(sheet.name == "photo") ? "the photo" : sheet.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].") + to_chat(user, span_notice("You add [(sheet.name == "photo") ? "the photo" : sheet.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].")) user.drop_from_inventory(sheet) sheet.loc = src @@ -101,7 +101,7 @@ if(Adjacent(user)) show_content(user) else - . += "It is too far away." + . += span_notice("It is too far away.") /obj/item/paper_bundle/proc/show_content(mob/user as mob) var/dat @@ -169,7 +169,7 @@ usr.put_in_hands(W) pages.Remove(pages[page]) - to_chat(usr, "You remove the [W.name] from the bundle.") + to_chat(usr, span_notice("You remove the [W.name] from the bundle.")) if(pages.len <= 1) var/obj/item/paper/P = src[1] @@ -187,7 +187,7 @@ src.attack_self(usr) updateUsrDialog() else - to_chat(usr, "You need to hold it in hands!") + to_chat(usr, span_notice("You need to hold it in hands!")) /obj/item/paper_bundle/verb/rename() set name = "Rename bundle" @@ -206,7 +206,7 @@ set category = "Object" set src in usr - to_chat(usr, "You loosen the bundle.") + to_chat(usr, span_notice("You loosen the bundle.")) for(var/obj/O in src) O.loc = usr.loc O.layer = initial(O.layer) diff --git a/code/modules/paperwork/paper_sticky.dm b/code/modules/paperwork/paper_sticky.dm index 8f88bb00b6..eaf25907ca 100644 --- a/code/modules/paperwork/paper_sticky.dm +++ b/code/modules/paperwork/paper_sticky.dm @@ -76,10 +76,10 @@ if (H.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - to_chat(user, "You try to move your [temp.name], but cannot!") + to_chat(user, span_notice("You try to move your [temp.name], but cannot!")) return - to_chat(user, "You pick up the [src].") + to_chat(user, span_notice("You pick up the [src].")) user.put_in_hands(src) return diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index f75ab2677a..ac18b85b71 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -30,10 +30,10 @@ if (H.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - to_chat(user, "You try to move your [temp.name], but cannot!") + to_chat(user, span_notice("You try to move your [temp.name], but cannot!")) return - to_chat(user, "You pick up the [src].") + to_chat(user, span_notice("You pick up the [src].")) user.put_in_hands(src) return @@ -45,7 +45,7 @@ if (H.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - to_chat(user, "You try to move your [temp.name], but cannot!") + to_chat(user, span_notice("You try to move your [temp.name], but cannot!")) return var/response = "" if(!papers.len > 0) @@ -75,9 +75,9 @@ P.loc = user.loc user.put_in_hands(P) - to_chat(user, "You take [P] out of the [src].") + to_chat(user, span_notice("You take [P] out of the [src].")) else - to_chat(user, "[src] is empty!") + to_chat(user, span_notice("[src] is empty!")) add_fingerprint(user) return @@ -89,7 +89,7 @@ user.drop_item() i.loc = src - to_chat(user, "You put [i] in [src].") + to_chat(user, span_notice("You put [i] in [src].")) papers.Add(i) update_icon() amount++ @@ -99,9 +99,9 @@ . = ..() if(Adjacent(user)) if(amount) - . += "There " + (amount > 1 ? "are [amount] papers" : "is one paper") + " in the bin." + . += span_notice("There " + (amount > 1 ? "are [amount] papers" : "is one paper") + " in the bin.") else - . += "There are no papers in the bin." + . += span_notice("There are no papers in the bin.") /obj/item/paper_bin/update_icon() if(amount < 1) diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index d884c9be27..5e45f8b4ad 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -45,7 +45,7 @@ add_overlay(stampoverlay) /obj/item/paperplane/attack_self(mob/user) - to_chat(user, "You unfold [src].") + to_chat(user, span_notice("You unfold [src].")) var/atom/movable/internal_paper_tmp = internalPaper internal_paper_tmp.forceMove(loc) internalPaper = null @@ -55,7 +55,7 @@ /obj/item/paperplane/attackby(obj/item/P, mob/living/carbon/human/user, params) ..() if(istype(P, /obj/item/pen)) - to_chat(user, "You should unfold [src] before changing it.") + to_chat(user, span_notice("You should unfold [src] before changing it.")) return else if(istype(P, /obj/item/stamp)) //we don't randomize stamps on a paperplane @@ -64,8 +64,8 @@ else if(is_hot(P)) if(user.disabilities & CLUMSY && prob(10)) - user.visible_message("[user] accidentally ignites themselves!", \ - "You miss the [src] and accidentally light yourself on fire!") + user.visible_message(span_warning("[user] accidentally ignites themselves!"), \ + span_userdanger("You miss the [src] and accidentally light yourself on fire!")) user.unEquip(P) user.adjust_fire_stacks(1) user.IgniteMob() @@ -74,7 +74,7 @@ if(!(in_range(user, src))) //to prevent issues as a result of telepathically lighting a paper return user.unEquip(src) - user.visible_message("[user] lights [src] ablaze with [P]!", "You light [src] on fire!") + user.visible_message(span_danger("[user] lights [src] ablaze with [P]!"), span_danger("You light [src] on fire!")) fire_act() add_fingerprint(user) @@ -86,7 +86,7 @@ if(prob(2)) if((H.head && H.head.body_parts_covered & EYES) || (H.wear_mask && H.wear_mask.body_parts_covered & EYES) || (H.glasses && H.glasses.body_parts_covered & EYES)) return - visible_message("\The [src] hits [H] in the eye!") + visible_message(span_danger("\The [src] hits [H] in the eye!")) H.eye_blurry += 10 var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES] if(E) @@ -97,9 +97,9 @@ if ( istype(user) ) if( (!in_range(src, user)) || user.stat || user.restrained() ) return - to_chat(user, "You fold [src] into the shape of a plane!") + to_chat(user, span_notice("You fold [src] into the shape of a plane!")) user.unEquip(src) I = new /obj/item/paperplane(user, src) user.put_in_hands(I) else - to_chat(user, " You lack the dexterity to fold \the [src]. ") + to_chat(user, span_notice(" You lack the dexterity to fold \the [src]. ")) diff --git a/code/modules/paperwork/papershredder.dm b/code/modules/paperwork/papershredder.dm index 87ca3c1a4d..25d3dba3ba 100644 --- a/code/modules/paperwork/papershredder.dm +++ b/code/modules/paperwork/papershredder.dm @@ -38,7 +38,7 @@ else if(W.has_tool_quality(TOOL_WRENCH)) playsound(src, W.usesound, 50, 1) anchored = !anchored - to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + to_chat(user, span_notice("You [anchored ? "wrench" : "unwrench"] \the [src].")) return else if(default_part_replacement(user, W)) return @@ -55,7 +55,7 @@ if(inoperable()) return // Need powah! if(paperamount == max_paper) - to_chat(user, "\The [src] is full; please empty it before you continue.") + to_chat(user, span_warning("\The [src] is full; please empty it before you continue.")) return paperamount += paper_result user.drop_from_inventory(W) @@ -63,7 +63,7 @@ playsound(src, 'sound/items/pshred.ogg', 75, 1) flick(shred_anim, src) if(paperamount > max_paper) - to_chat(user,"\The [src] was too full, and shredded paper goes everywhere!") + to_chat(user,span_danger("\The [src] was too full, and shredded paper goes everywhere!")) for(var/i=(paperamount-max_paper);i>0;i--) var/obj/item/shreddedp/SP = get_shredded_paper() SP.loc = get_turf(src) @@ -82,7 +82,7 @@ return if(!paperamount) - to_chat(usr, "\The [src] is empty.") + to_chat(usr, span_notice("\The [src] is empty.")) return empty_bin(usr) @@ -94,7 +94,7 @@ empty_into = null if(empty_into && empty_into.contents.len >= empty_into.storage_slots) - to_chat(user, "\The [empty_into] is full.") + to_chat(user, span_notice("\The [empty_into] is full.")) return while(paperamount) @@ -106,12 +106,12 @@ break if(empty_into) if(paperamount) - to_chat(user, "You fill \the [empty_into] with as much shredded paper as it will carry.") + to_chat(user, span_notice("You fill \the [empty_into] with as much shredded paper as it will carry.")) else - to_chat(user, "You empty \the [src] into \the [empty_into].") + to_chat(user, span_notice("You empty \the [src] into \the [empty_into].")) else - to_chat(user, "You empty \the [src].") + to_chat(user, span_notice("You empty \the [src].")) update_icon() /obj/machinery/papershredder/proc/get_shredded_paper() @@ -166,15 +166,15 @@ if(user.restrained()) return if(!P.lit) - to_chat(user, "\The [P] is not lit.") + to_chat(user, span_warning("\The [P] is not lit.")) return - user.visible_message("\The [user] holds \the [P] up to \the [src]. It looks like [TU.he] [TU.is] trying to burn it!", \ - "You hold \the [P] up to \the [src], burning it slowly.") + user.visible_message(span_warning("\The [user] holds \the [P] up to \the [src]. It looks like [TU.he] [TU.is] trying to burn it!"), \ + span_warning("You hold \the [P] up to \the [src], burning it slowly.")) if(!do_after(user,20)) - to_chat(user, "You must hold \the [P] steady to burn \the [src].") + to_chat(user, span_warning("You must hold \the [P] steady to burn \the [src].")) return - user.visible_message("\The [user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.", \ - "You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.") + user.visible_message(span_danger("\The [user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap."), \ + span_danger("You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.")) FireBurn() /obj/item/shreddedp/proc/FireBurn() diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 496d579bff..16c0b697e0 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -36,7 +36,7 @@ if(!user.checkClickCooldown()) return user.setClickCooldown(1 SECOND) - to_chat(user, "Click.") + to_chat(user, span_notice("Click.")) playsound(src, 'sound/items/penclick.ogg', 50, 1) /* @@ -101,7 +101,7 @@ var/colors = list("black","blue","red") /obj/item/pen/AltClick(mob/user) - to_chat(user, "Click.") + to_chat(user, span_notice("Click.")) playsound(src, 'sound/items/penclick.ogg', 50, 1) return @@ -116,7 +116,7 @@ else icon_state = "pen_[colour]" - to_chat(user, "Changed color to '[colour].'") + to_chat(user, span_notice("Changed color to '[colour].'")) /obj/item/pen/invisible desc = "It's an invisble pen marker." @@ -187,7 +187,7 @@ else activate(user) - to_chat(user, "You [active ? "de" : ""]activate \the [src]'s blade.") + to_chat(user, span_notice("You [active ? "de" : ""]activate \the [src]'s blade.")) /obj/item/pen/blade/proc/activate(mob/living/user) if(active) @@ -317,7 +317,7 @@ colour = COLOR_WHITE else colour = COLOR_BLACK - to_chat(usr, "You select the [lowertext(selected_type)] ink container.") + to_chat(usr, span_info("You select the [lowertext(selected_type)] ink container.")) /* diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 216bb79c7b..91347f41fa 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -67,10 +67,10 @@ if(copyitem) copyitem.loc = usr.loc usr.put_in_hands(copyitem) - to_chat(usr, "You take \the [copyitem] out of \the [src].") + to_chat(usr, span_notice("You take \the [copyitem] out of \the [src].")) copyitem = null else if(has_buckled_mobs()) - to_chat(buckled_mobs[1], "You feel a slight pressure on your ass.") // It can't eject your asscheeks, but it'll try. + to_chat(buckled_mobs[1], span_notice("You feel a slight pressure on your ass.")) // It can't eject your asscheeks, but it'll try. . = TRUE if("set_copies") copies = clamp(text2num(params["num_copies"]), 1, maxcopies) @@ -111,31 +111,31 @@ playsound(src, "sound/machines/copier.ogg", 100, 1) sleep(11) copy(copyitem) - audible_message("You can hear [src] whirring as it finishes printing.", runemessage = "whirr") + audible_message(span_notice("You can hear [src] whirring as it finishes printing."), runemessage = "whirr") playsound(src, "sound/machines/buzzbeep.ogg", 30) else if (istype(copyitem, /obj/item/photo)) playsound(src, "sound/machines/copier.ogg", 100, 1) sleep(11) photocopy(copyitem) - audible_message("You can hear [src] whirring as it finishes printing.", runemessage = "whirr") + audible_message(span_notice("You can hear [src] whirring as it finishes printing."), runemessage = "whirr") playsound(src, "sound/machines/buzzbeep.ogg", 30) else if (istype(copyitem, /obj/item/paper_bundle)) sleep(11) playsound(src, "sound/machines/copier.ogg", 100, 1) var/obj/item/paper_bundle/B = bundlecopy(copyitem) sleep(11*B.pages.len) - audible_message("You can hear [src] whirring as it finishes printing.", runemessage = "whirr") + audible_message(span_notice("You can hear [src] whirring as it finishes printing."), runemessage = "whirr") playsound(src, "sound/machines/buzzbeep.ogg", 30) else if (has_buckled_mobs()) // VOREStation EDIT: For ass-copying. playsound(src, "sound/machines/copier.ogg", 100, 1) - audible_message("You can hear [src] whirring as it attempts to scan.", runemessage = "whirr") + audible_message(span_notice("You can hear [src] whirring as it attempts to scan."), runemessage = "whirr") sleep(rand(20,45)) // Sit with your bare ass on the copier for a random time, feel like a fool, get stared at. copyass(user) sleep(15) - audible_message("You can hear [src] whirring as it finishes printing.", runemessage = "whirr") + audible_message(span_notice("You can hear [src] whirring as it finishes printing."), runemessage = "whirr") playsound(src, "sound/machines/buzzbeep.ogg", 30) else - to_chat(user, "\The [copyitem] can't be copied by [src].") + to_chat(user, span_warning("\The [copyitem] can't be copied by [src].")) playsound(src, "sound/machines/buzz-two.ogg", 100) break @@ -148,28 +148,28 @@ user.drop_item() copyitem = O O.loc = src - to_chat(user, "You insert \the [O] into \the [src].") + to_chat(user, span_notice("You insert \the [O] into \the [src].")) playsound(src, "sound/machines/click.ogg", 100, 1) flick(insert_anim, src) else - to_chat(user, "There is already something in \the [src].") + to_chat(user, span_notice("There is already something in \the [src].")) else if(istype(O, /obj/item/toner)) if(toner <= 10) //allow replacing when low toner is affecting the print darkness user.drop_item() - to_chat(user, "You insert the toner cartridge into \the [src].") + to_chat(user, span_notice("You insert the toner cartridge into \the [src].")) flick("photocopier_toner", src) playsound(loc, 'sound/machines/click.ogg', 50, 1) var/obj/item/toner/T = O toner += T.toner_amount qdel(O) else - to_chat(user, "This cartridge is not yet ready for replacement! Use up the rest of the toner.") + to_chat(user, span_notice("This cartridge is not yet ready for replacement! Use up the rest of the toner.")) flick("photocopier_notoner", src) playsound(loc, 'sound/machines/buzz-two.ogg', 75, 1) else if(O.has_tool_quality(TOOL_WRENCH)) playsound(src, O.usesound, 50, 1) anchored = !anchored - to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + to_chat(user, span_notice("You [anchored ? "wrench" : "unwrench"] \the [src].")) else if(default_deconstruction_screwdriver(user, O)) return else if(default_deconstruction_crowbar(user, O)) @@ -230,7 +230,7 @@ toner-- if(toner == 0) playsound(src, "sound/machines/buzz-sigh.ogg", 100) - visible_message("A [span_red("red")] light on \the [src] flashes, indicating that it is out of toner.") + visible_message(span_notice("A [span_red("red")] light on \the [src] flashes, indicating that it is out of toner.")) return c @@ -253,7 +253,7 @@ if(toner < 0) toner = 0 playsound(src, "sound/machines/buzz-sigh.ogg", 100) - visible_message("A red light on \the [src] flashes, indicating that it is out of toner.") + visible_message(span_notice("A red light on \the [src] flashes, indicating that it is out of toner.")) return p @@ -337,7 +337,7 @@ if(toner < 0) toner = 0 playsound(src, "sound/machines/buzz-sigh.ogg", 100) - visible_message("A red light on \the [src] flashes, indicating that it is out of toner.") + visible_message(span_notice("A red light on \the [src] flashes, indicating that it is out of toner.")) return p // VOREStation Edit Stop @@ -349,7 +349,7 @@ if(toner <= 0 && need_toner) toner = 0 playsound(src, "sound/machines/buzz-sigh.ogg", 100) - visible_message("A red light on \the [src] flashes, indicating that it is out of toner.") + visible_message(span_notice("A red light on \the [src] flashes, indicating that it is out of toner.")) break if(istype(W, /obj/item/paper)) @@ -376,7 +376,7 @@ if(M.item_is_in_hands(C)) continue if((C.body_parts_covered & LOWER_TORSO) && !istype(C,/obj/item/clothing/under/permit)) - to_chat(usr, "One needs to not be wearing pants to photocopy one's ass...") + to_chat(usr, span_warning("One needs to not be wearing pants to photocopy one's ass...")) return FALSE return TRUE diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index b46e8a7a5a..061f46154a 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -58,7 +58,7 @@ var/global/photo_count = 0 show(user) return list(desc) else - return list("It is too far away to examine.") + return list(span_notice("It is too far away to examine.")) /obj/item/photo/proc/show(mob/user as mob) user << browse_rsc(img, "tmp_photo_[id].png") @@ -143,7 +143,7 @@ var/global/photo_count = 0 var/nsize = tgui_input_list(usr, "Photo Size","Pick a size of resulting photo.", list(1,3,5,7)) if(nsize) size = nsize - to_chat(usr, "Camera will now take [size]x[size] photos.") + to_chat(usr, span_notice("Camera will now take [size]x[size] photos.")) /obj/item/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob) return @@ -160,9 +160,9 @@ var/global/photo_count = 0 /obj/item/camera/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/camera_film)) if(pictures_left) - to_chat(user, "[src] still has some film in it!") + to_chat(user, span_notice("[src] still has some film in it!")) return - to_chat(user, "You insert [I] into [src].") + to_chat(user, span_notice("You insert [I] into [src].")) user.drop_item() qdel(I) pictures_left = pictures_max @@ -248,7 +248,7 @@ var/global/photo_count = 0 pictures_left-- desc = "A polaroid camera. It has [pictures_left] photos left." - to_chat(user, "[pictures_left] photos left.") + to_chat(user, span_notice("[pictures_left] photos left.")) icon_state = icon_off on = 0 spawn(64) diff --git a/code/modules/paperwork/silicon_photography.dm b/code/modules/paperwork/silicon_photography.dm index 67b12c4ef2..85853eee2c 100644 --- a/code/modules/paperwork/silicon_photography.dm +++ b/code/modules/paperwork/silicon_photography.dm @@ -25,10 +25,10 @@ var/mob/living/silicon/robot/C = usr if(C.connected_ai) C.connected_ai.aiCamera.injectaialbum(p.copy(1), " (synced from [C.name])") - to_chat(C.connected_ai, "Image uploaded by [C.name]") - to_chat(usr, "Image synced to remote database") //feedback to the Cyborg player that the picture was taken + to_chat(C.connected_ai, span_unconscious("Image uploaded by [C.name]")) + to_chat(usr, span_unconscious("Image synced to remote database")) //feedback to the Cyborg player that the picture was taken else - to_chat(usr, "Image recorded") + to_chat(usr, span_unconscious("Image recorded")) // Always save locally injectaialbum(p) @@ -39,7 +39,7 @@ var/list/nametemp = list() var/find if(cam.aipictures.len == 0) - to_chat(usr, "No images saved") + to_chat(usr, span_userdanger("No images saved")) return for(var/obj/item/photo/t in cam.aipictures) nametemp += t.name @@ -67,7 +67,7 @@ return aipictures -= selection - to_chat(usr, "Local image deleted") + to_chat(usr, span_unconscious("Local image deleted")) /obj/item/camera/siliconcam/ai_camera/can_capture_turf(turf/T, mob/user) var/mob/living/silicon/ai = user @@ -89,7 +89,7 @@ /obj/item/camera/siliconcam/ai_camera/printpicture(mob/user, obj/item/photo/p) injectaialbum(p) - to_chat(usr, "Image recorded") + to_chat(usr, span_unconscious("Image recorded")) /obj/item/camera/siliconcam/robot_camera/printpicture(mob/user, obj/item/photo/p) injectmasteralbum(p) diff --git a/code/modules/pda/cart_vr.dm b/code/modules/pda/cart_vr.dm index 948561de50..305955c1c4 100644 --- a/code/modules/pda/cart_vr.dm +++ b/code/modules/pda/cart_vr.dm @@ -50,7 +50,7 @@ var/list/exploration_cartridges = list( ..(over_object) /obj/item/cartridge/storage/attack_self(mob/user as mob) - to_chat(user, "You empty [src].") + to_chat(user, span_notice("You empty [src].")) var/turf/T = get_turf(src) hold.hide_from(usr) for(var/obj/item/I in hold.contents) diff --git a/code/modules/pda/core_apps.dm b/code/modules/pda/core_apps.dm index 22dd8d69cf..5354620628 100644 --- a/code/modules/pda/core_apps.dm +++ b/code/modules/pda/core_apps.dm @@ -178,12 +178,12 @@ var/titlenote = "Note [alphabet_uppercase[currentnote]]" if(!isnull(notetitle) && notetitle != "") titlenote = notetitle - to_chat(usr, "Successfully printed [titlenote]!") + to_chat(usr, span_notice("Successfully printed [titlenote]!")) P.set_content( pencode2html(note), titlenote) else - to_chat(usr, "You can only print to empty paper!") + to_chat(usr, span_notice("You can only print to empty paper!")) else - to_chat(usr, "You must be holding paper for the pda to print to!") + to_chat(usr, span_notice("You must be holding paper for the pda to print to!")) /datum/data/pda/app/notekeeper/proc/changetonote(var/noteindex) diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm index 2acf25bca0..806eb0910b 100644 --- a/code/modules/pda/messenger.dm +++ b/code/modules/pda/messenger.dm @@ -175,7 +175,7 @@ to_chat(U, "ERROR: Cannot reach recipient.") return useMS.send_pda_message("[P.owner]","[pda.owner]","[t]") - pda.investigate_log("PDA Message - [U.key] - [pda.owner] -> [P.owner]: [t]", "pda") + pda.investigate_log(span_game(span_say("PDA Message - [U.key] - [pda.owner] -> [P.owner]: [t]")), "pda") receive_message(list("sent" = 1, "owner" = "[P.owner]", "job" = "[P.ownjob]", "message" = "[t]", "target" = "\ref[P]"), "\ref[P]") PM.receive_message(list("sent" = 0, "owner" = "[pda.owner]", "job" = "[pda.ownjob]", "message" = "[t]", "target" = "\ref[pda]"), "\ref[pda]") @@ -184,7 +184,7 @@ log_pda("(PDA: [src.name]) sent \"[t]\" to [P.name]", usr) to_chat(U, "[icon2html(pda,U.client)] Sent message to [P.owner] ([P.ownjob]), \"[t]\"") else - to_chat(U, "ERROR: Messaging server is not responding.") + to_chat(U, span_notice("ERROR: Messaging server is not responding.")) /datum/data/pda/app/messenger/proc/available_pdas() var/list/names = list() diff --git a/code/modules/pda/messenger_plugins.dm b/code/modules/pda/messenger_plugins.dm index ebe1e9c314..11f261eeac 100644 --- a/code/modules/pda/messenger_plugins.dm +++ b/code/modules/pda/messenger_plugins.dm @@ -22,7 +22,7 @@ /datum/data/pda/messenger_plugin/virus/clown/user_act(mob/user as mob, obj/item/pda/P) . = ..(user, P) if(.) - user.show_message("Virus sent!", 1) + user.show_message(span_notice("Virus sent!"), 1) P.honkamt = (rand(15,20)) P.ttone = "honk" @@ -33,7 +33,7 @@ /datum/data/pda/messenger_plugin/virus/mime/user_act(mob/user as mob, obj/item/pda/P) . = ..(user, P) if(.) - user.show_message("Virus sent!", 1) + user.show_message(span_notice("Virus sent!"), 1) var/datum/data/pda/app/M = P.find_program(/datum/data/pda/app/messenger) if(M) M.notify_silent = 1 @@ -55,18 +55,18 @@ difficulty += 2 if(!P.detonate || P.hidden_uplink) - user.show_message("The target PDA does not seem to respond to the detonation command.", 1) + user.show_message(span_warning("The target PDA does not seem to respond to the detonation command."), 1) pda.cartridge.charges++ else if(prob(difficulty * 12)) - user.show_message("An error flashes on your [pda].", 1) + user.show_message(span_warning("An error flashes on your [pda]."), 1) else if(prob(difficulty * 3)) - user.show_message("Energy feeds back into your [pda]!", 1) + user.show_message(span_danger("Energy feeds back into your [pda]!"), 1) pda.close(user) pda.explode() log_admin("[key_name(user)] just attempted to blow up [P] with the Detomatix cartridge but failed, blowing themselves up") message_admins("[key_name_admin(user)] just attempted to blow up [P] with the Detomatix cartridge but failed, blowing themselves up", 1) else - user.show_message("Success!", 1) + user.show_message(span_notice("Success!"), 1) log_admin("[key_name(user)] just attempted to blow up [P] with the Detomatix cartridge and succeded") message_admins("[key_name_admin(user)] just attempted to blow up [P] with the Detomatix cartridge and succeded", 1) P.explode() @@ -78,7 +78,7 @@ . = ..(user, P) if(.) var/lock_code = "[rand(100,999)] [pick("Alpha","Bravo","Charlie","Delta","Echo","Foxtrot","Golf","Hotel","India","Juliet","Kilo","Lima","Mike","November","Oscar","Papa","Quebec","Romeo","Sierra","Tango","Uniform","Victor","Whiskey","X-ray","Yankee","Zulu")]" - user.show_message("Virus Sent! The unlock code to the target is: [lock_code]") + user.show_message(span_notice("Virus Sent! The unlock code to the target is: [lock_code]")) if(!P.hidden_uplink) var/obj/item/uplink/hidden/uplink = new(P) P.hidden_uplink = uplink diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm index d3dad05b5e..f279b41520 100644 --- a/code/modules/pda/pda.dm +++ b/code/modules/pda/pda.dm @@ -98,7 +98,7 @@ var/global/list/obj/item/pda/PDAs = list() if(id) remove_id() else - to_chat(usr, "This PDA does not have an ID in it.") + to_chat(usr, span_notice("This PDA does not have an ID in it.")) /obj/item/pda/proc/play_ringtone() var/S @@ -295,7 +295,7 @@ var/global/list/obj/item/pda/PDAs = list() message += "Your [P] shatters in a thousand pieces!" if(M && isliving(M)) - message = "[message]" + message = span_warning("[message]") M.show_message(message, 1) /obj/item/pda/proc/remove_id() @@ -303,7 +303,7 @@ var/global/list/obj/item/pda/PDAs = list() if (ismob(loc)) var/mob/M = loc M.put_in_hands(id) - to_chat(usr, "You remove the ID from the [name].") + to_chat(usr, span_notice("You remove the ID from the [name].")) playsound(src, 'sound/machines/id_swipe.ogg', 100, 1) else id.loc = get_turf(src) @@ -317,12 +317,12 @@ var/global/list/obj/item/pda/PDAs = list() var/mob/M = loc if(M.get_active_hand() == null) M.put_in_hands(O) - to_chat(usr, "You remove \the [O] from \the [src].") + to_chat(usr, span_notice("You remove \the [O] from \the [src].")) cut_overlay("pda-pen") return O.loc = get_turf(src) else - to_chat(usr, "This PDA does not have a pen in it.") + to_chat(usr, span_notice("This PDA does not have a pen in it.")) /obj/item/pda/verb/verb_reset_pda() set category = "Object" @@ -336,9 +336,9 @@ var/global/list/obj/item/pda/PDAs = list() start_program(find_program(/datum/data/pda/app/main_menu)) notifying_programs.Cut() cut_overlay("pda-r") - to_chat(usr, "You press the reset button on \the [src].") + to_chat(usr, span_notice("You press the reset button on \the [src].")) else - to_chat(usr, "You cannot do this while restrained.") + to_chat(usr, span_notice("You cannot do this while restrained.")) /obj/item/pda/verb/verb_remove_id() set category = "Object" @@ -352,9 +352,9 @@ var/global/list/obj/item/pda/PDAs = list() if(id) remove_id() else - to_chat(usr, "This PDA does not have an ID in it.") + to_chat(usr, span_notice("This PDA does not have an ID in it.")) else - to_chat(usr, "You cannot do this while restrained.") + to_chat(usr, span_notice("You cannot do this while restrained.")) /obj/item/pda/verb/verb_remove_pen() @@ -368,7 +368,7 @@ var/global/list/obj/item/pda/PDAs = list() if ( can_use(usr) ) remove_pen() else - to_chat(usr, "You cannot do this while restrained.") + to_chat(usr, span_notice("You cannot do this while restrained.")) /obj/item/pda/verb/verb_remove_cartridge() set category = "Object" @@ -379,11 +379,11 @@ var/global/list/obj/item/pda/PDAs = list() return if(!can_use(usr)) - to_chat(usr, "You cannot do this while restrained.") + to_chat(usr, span_notice("You cannot do this while restrained.")) return if(isnull(cartridge)) - to_chat(usr, "There's no cartridge to eject.") + to_chat(usr, span_notice("There's no cartridge to eject.")) return cartridge.forceMove(get_turf(src)) @@ -394,7 +394,7 @@ var/global/list/obj/item/pda/PDAs = list() // scanmode = 0 if (cartridge.radio) cartridge.radio.hostpda = null - to_chat(usr, "You remove \the [cartridge] from the [name].") + to_chat(usr, span_notice("You remove \the [cartridge] from the [name].")) playsound(src, 'sound/machines/id_swipe.ogg', 100, 1) cartridge = null update_programs() @@ -432,26 +432,26 @@ var/global/list/obj/item/pda/PDAs = list() cartridge.loc = src cartridge.update_programs(src) update_shortcuts() - to_chat(usr, "You insert [cartridge] into [src].") + to_chat(usr, span_notice("You insert [cartridge] into [src].")) if(cartridge.radio) cartridge.radio.hostpda = src else if(istype(C, /obj/item/card/id)) var/obj/item/card/id/idcard = C if(!idcard.registered_name) - to_chat(user, "\The [src] rejects the ID.") + to_chat(user, span_notice("\The [src] rejects the ID.")) return if(!owner) owner = idcard.registered_name ownjob = idcard.assignment ownrank = idcard.rank name = "PDA-[owner] ([ownjob])" - to_chat(user, "Card scanned.") + to_chat(user, span_notice("Card scanned.")) else //Basic safety check. If either both objects are held by user or PDA is on ground and card is in hand. if(((src in user.contents) && (C in user.contents)) || (istype(loc, /turf) && in_range(src, user) && (C in user.contents)) ) if(id_check(user, 2)) - to_chat(user, "You put the ID into \the [src]'s slot.") + to_chat(user, span_notice("You put the ID into \the [src]'s slot.")) add_overlay("pda-id") updateSelfDialog()//Update self dialog on success. return //Return in case of failed check or when successful. @@ -460,16 +460,16 @@ var/global/list/obj/item/pda/PDAs = list() user.drop_item() C.loc = src pai = C - to_chat(user, "You slot \the [C] into \the [src].") + to_chat(user, span_notice("You slot \the [C] into \the [src].")) SStgui.update_uis(src) // update all UIs attached to src else if(istype(C, /obj/item/pen)) var/obj/item/pen/O = locate() in src if(O) - to_chat(user, "There is already a pen in \the [src].") + to_chat(user, span_notice("There is already a pen in \the [src].")) else user.drop_item() C.loc = src - to_chat(user, "You slot \the [C] into \the [src].") + to_chat(user, span_notice("You slot \the [C] into \the [src].")) add_overlay("pda-pen") return diff --git a/code/modules/pda/utilities.dm b/code/modules/pda/utilities.dm index 9f065baf0a..41bfef4e42 100644 --- a/code/modules/pda/utilities.dm +++ b/code/modules/pda/utilities.dm @@ -47,28 +47,28 @@ /datum/data/pda/utility/scanmode/medical/scan_mob(mob/living/C as mob, mob/living/user as mob) C.visible_message("[user] has analyzed [C]'s vitals!") - user.show_message("Analyzing Results for [C]:") - user.show_message(" Overall Status: [C.stat > 1 ? "dead" : "[C.health - C.halloss]% healthy"]", 1) + user.show_message(span_notice("Analyzing Results for [C]:")) + user.show_message(span_notice(" Overall Status: [C.stat > 1 ? "dead" : "[C.health - C.halloss]% healthy"]"), 1) user.show_message(text(" Damage Specifics: []-[]-[]-[]", (C.getOxyLoss() > 50) ? "warning" : "", C.getOxyLoss(), (C.getToxLoss() > 50) ? "warning" : "", C.getToxLoss(), (C.getFireLoss() > 50) ? "warning" : "", C.getFireLoss(), (C.getBruteLoss() > 50) ? "warning" : "", C.getBruteLoss() ), 1) - user.show_message(" Key: Suffocation/Toxin/Burns/Brute", 1) - user.show_message(" Body Temperature: [C.bodytemperature-T0C]°C ([C.bodytemperature*1.8-459.67]°F)", 1) + user.show_message(span_notice(" Key: Suffocation/Toxin/Burns/Brute"), 1) + user.show_message(span_notice(" Body Temperature: [C.bodytemperature-T0C]°C ([C.bodytemperature*1.8-459.67]°F)"), 1) if(C.tod && (C.stat == DEAD || (C.status_flags & FAKEDEATH))) - user.show_message(" Time of Death: [C.tod]") + user.show_message(span_notice(" Time of Death: [C.tod]")) if(istype(C, /mob/living/carbon/human)) var/mob/living/carbon/human/H = C var/list/damaged = H.get_damaged_organs(1,1) - user.show_message("Localized Damage, Brute/Burn:",1) + user.show_message(span_notice("Localized Damage, Brute/Burn:"),1) if(length(damaged)>0) for(var/obj/item/organ/external/org in damaged) user.show_message(text(" []: []-[]", capitalize(org.name), (org.brute_dam > 0) ? "warning" : "notice", org.brute_dam, (org.burn_dam > 0) ? "warning" : "notice", org.burn_dam),1) else - user.show_message(" Limbs are OK.",1) + user.show_message(span_notice(" Limbs are OK."),1) /datum/data/pda/utility/scanmode/dna base_name = "DNA Scanner" @@ -118,13 +118,13 @@ if(!isnull(A.reagents)) if(A.reagents.reagent_list.len > 0) var/reagents_length = A.reagents.reagent_list.len - to_chat(user, "[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found.") + to_chat(user, span_notice("[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found.")) for(var/re in A.reagents.reagent_list) - to_chat(user, "\t [re]") + to_chat(user, span_notice("\t [re]")) else - to_chat(user, "No active chemical agents found in [A].") + to_chat(user, span_notice("No active chemical agents found in [A].")) else - to_chat(user, "No significant chemical agents found in [A].") + to_chat(user, span_notice("No significant chemical agents found in [A].")) /datum/data/pda/utility/scanmode/gas base_name = "Gas Scanner" diff --git a/code/modules/persistence/graffiti.dm b/code/modules/persistence/graffiti.dm index 10f95d2a08..a6b150b604 100644 --- a/code/modules/persistence/graffiti.dm +++ b/code/modules/persistence/graffiti.dm @@ -57,12 +57,12 @@ var/_message = sanitize(tgui_input_text(usr, "Enter an additional message to engrave.", "Graffiti"), trim = TRUE) if(_message && loc && user && !user.incapacitated() && user.Adjacent(loc) && thing.loc == user) - user.visible_message("\The [user] begins carving something into \the [loc].") + user.visible_message(span_warning("\The [user] begins carving something into \the [loc].")) if(do_after(user, max(20, length(_message)), src) && loc) - user.visible_message("\The [user] carves some graffiti into \the [loc].") + user.visible_message(span_danger("\The [user] carves some graffiti into \the [loc].")) message = "[message] [_message]" author = user.ckey if(lowertext(message) == "elbereth") - to_chat(user, "You feel much safer.") + to_chat(user, span_notice("You feel much safer.")) else . = ..() diff --git a/code/modules/persistence/noticeboard.dm b/code/modules/persistence/noticeboard.dm index a94855ba1c..62261ae0d8 100644 --- a/code/modules/persistence/noticeboard.dm +++ b/code/modules/persistence/noticeboard.dm @@ -76,23 +76,23 @@ return return else if(I.has_tool_quality(TOOL_WRENCH)) - visible_message("[user] begins dismantling [src].") + visible_message(span_warning("[user] begins dismantling [src].")) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 50, src)) - visible_message("[user] has dismantled [src]!") + visible_message(span_danger("[user] has dismantled [src]!")) dismantle() return else if(istype(I, /obj/item/paper) || istype(I, /obj/item/photo)) if(jobban_isbanned(user, JOB_GRAFFITI)) - to_chat(user, "You are banned from leaving persistent information across rounds.") + to_chat(user, span_warning("You are banned from leaving persistent information across rounds.")) else if(LAZYLEN(notices) < max_notices && user.unEquip(I, src)) add_fingerprint(user) add_paper(I) - to_chat(user, "You pin [I] to [src].") + to_chat(user, span_notice("You pin [I] to [src].")) SSpersistence.track_value(I, /datum/persistent/paper) else - to_chat(user, "You hesitate, certain [I] will not be seen among the many others already attached to \the [src].") + to_chat(user, span_warning("You hesitate, certain [I] will not be seen among the many others already attached to \the [src].")) return return ..() @@ -166,7 +166,7 @@ add_fingerprint(M) P.attackby(E, usr) else - to_chat(M, "You'll need something to write with!") + to_chat(M, span_notice("You'll need something to write with!")) . = TRUE /obj/structure/noticeboard/anomaly diff --git a/code/modules/planet/sif.dm b/code/modules/planet/sif.dm index 20d084ff26..50c1892555 100644 --- a/code/modules/planet/sif.dm +++ b/code/modules/planet/sif.dm @@ -277,7 +277,7 @@ var/datum/planet/sif/planet_sif = null wind_high = 2 wind_low = 1 light_modifier = 0.5 - effect_message = "Rain falls on you." + effect_message = span_warning("Rain falls on you.") transition_chances = list( WEATHER_OVERCAST = 20, @@ -309,7 +309,7 @@ var/datum/planet/sif/planet_sif = null if(istype(U) && U.open) if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") + to_chat(L, span_notice("Rain patters softly onto your umbrella.")) continue L.water_act(1) @@ -325,7 +325,7 @@ var/datum/planet/sif/planet_sif = null wind_low = 2 light_modifier = 0.3 flight_failure_modifier = 10 - effect_message = "Rain falls on you, drenching you in water." + effect_message = span_warning("Rain falls on you, drenching you in water.") var/next_lightning_strike = 0 // world.time when lightning will strike. var/min_lightning_cooldown = 5 SECONDS @@ -361,7 +361,7 @@ var/datum/planet/sif/planet_sif = null if(istype(U) && U.open) if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") + to_chat(L, span_notice("Rain showers loudly onto your umbrella!")) continue @@ -389,7 +389,7 @@ var/datum/planet/sif/planet_sif = null flight_failure_modifier = 15 timer_low_bound = 2 timer_high_bound = 5 - effect_message = "The hail smacks into you!" + effect_message = span_warning("The hail smacks into you!") transition_chances = list( WEATHER_HAIL = 10, @@ -417,7 +417,7 @@ var/datum/planet/sif/planet_sif = null if(istype(U) && U.open) if(show_message) - to_chat(H, "Hail patters onto your umbrella.") + to_chat(H, span_notice("Hail patters onto your umbrella.")) continue var/target_zone = pick(BP_ALL) diff --git a/code/modules/planet/virgo3b_vr.dm b/code/modules/planet/virgo3b_vr.dm index c9b0fd21ef..75afb6fcf3 100644 --- a/code/modules/planet/virgo3b_vr.dm +++ b/code/modules/planet/virgo3b_vr.dm @@ -268,7 +268,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null wind_high = 2 wind_low = 1 light_modifier = 0.5 - effect_message = "Rain falls on you." + effect_message = span_warning("Rain falls on you.") transition_chances = list( WEATHER_OVERCAST = 25, @@ -301,7 +301,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null if(istype(U) && U.open) if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") + to_chat(L, span_notice("Rain patters softly onto your umbrella.")) continue L.water_act(1) @@ -315,7 +315,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null wind_low = 2 light_modifier = 0.3 flight_failure_modifier = 10 - effect_message = "Rain falls on you, drenching you in water." + effect_message = span_warning("Rain falls on you, drenching you in water.") var/next_lightning_strike = 0 // world.time when lightning will strike. var/min_lightning_cooldown = 5 SECONDS @@ -354,7 +354,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null if(istype(U) && U.open) if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") + to_chat(L, span_notice("Rain patters softly onto your umbrella.")) continue @@ -380,7 +380,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null flight_failure_modifier = 15 timer_low_bound = 2 timer_high_bound = 5 - effect_message = "The hail smacks into you!" + effect_message = span_warning("The hail smacks into you!") transition_chances = list( WEATHER_RAIN = 45, @@ -412,7 +412,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null if(istype(U) && U.open) if(show_message) - to_chat(H, "Hail patters onto your umbrella.") + to_chat(H, span_notice("Hail patters onto your umbrella.")) continue var/target_zone = pick(BP_ALL) @@ -625,4 +625,3 @@ var/datum/planet/virgo3b/planet_virgo3b = null "Suddenly, colorful confetti starts raining from the sky." ) imminent_transition_message = "A rain is starting... A rain of confetti...?" - diff --git a/code/modules/planet/virgo3c_vr.dm b/code/modules/planet/virgo3c_vr.dm index 5178063c86..9ab6cb9f02 100644 --- a/code/modules/planet/virgo3c_vr.dm +++ b/code/modules/planet/virgo3c_vr.dm @@ -258,7 +258,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null wind_high = 2 wind_low = 1 light_modifier = 0.5 - effect_message = "Rain falls on you." + effect_message = span_warning("Rain falls on you.") outdoor_sounds_type = /datum/looping_sound/weather/rain indoor_sounds_type = /datum/looping_sound/weather/rain/indoors @@ -290,7 +290,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null if(istype(U) && U.open) if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") + to_chat(L, span_notice("Rain patters softly onto your umbrella.")) continue L.water_act(1) @@ -306,7 +306,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null wind_low = 2 light_modifier = 0.3 flight_failure_modifier = 10 - effect_message = "Rain falls on you, drenching you in water." + effect_message = span_warning("Rain falls on you, drenching you in water.") var/next_lightning_strike = 0 // world.time when lightning will strike. var/min_lightning_cooldown = 1 MINUTE @@ -344,7 +344,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null if(istype(U) && U.open) if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") + to_chat(L, span_notice("Rain showers loudly onto your umbrella!")) continue @@ -372,7 +372,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null flight_failure_modifier = 15 timer_low_bound = 2 timer_high_bound = 5 - effect_message = "The hail smacks into you!" + effect_message = span_warning("The hail smacks into you!") transition_chances = list( WEATHER_FOG = 5, @@ -402,7 +402,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null if(istype(U) && U.open) if(show_message) - to_chat(H, "Hail patters onto your umbrella.") + to_chat(H, span_notice("Hail patters onto your umbrella.")) continue var/target_zone = pick(BP_ALL) @@ -527,7 +527,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null continue //Don't murder the wildlife, they live here it's fine L.inflict_heat_damage(1) - to_chat(L, "Smoldering ash singes you!") + to_chat(L, span_warning("Smoldering ash singes you!")) diff --git a/code/modules/planet/virgo4_vr.dm b/code/modules/planet/virgo4_vr.dm index 4ba26a37d6..d20da34cdf 100644 --- a/code/modules/planet/virgo4_vr.dm +++ b/code/modules/planet/virgo4_vr.dm @@ -251,7 +251,7 @@ var/datum/planet/virgo4/planet_virgo4 = null wind_high = 2 wind_low = 1 light_modifier = 0.5 - effect_message = "Rain falls on you." + effect_message = span_warning("Rain falls on you.") transition_chances = list( WEATHER_OVERCAST = 25, @@ -280,7 +280,7 @@ var/datum/planet/virgo4/planet_virgo4 = null if(istype(U) && U.open) if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") + to_chat(L, span_notice("Rain patters softly onto your umbrella.")) continue L.water_act(1) @@ -294,7 +294,7 @@ var/datum/planet/virgo4/planet_virgo4 = null wind_low = 2 light_modifier = 0.3 flight_failure_modifier = 10 - effect_message = "Rain falls on you, drenching you in water." + effect_message = span_warning("Rain falls on you, drenching you in water.") var/next_lightning_strike = 0 // world.time when lightning will strike. var/min_lightning_cooldown = 5 SECONDS @@ -330,7 +330,7 @@ var/datum/planet/virgo4/planet_virgo4 = null if(istype(U) && U.open) if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") + to_chat(L, span_notice("Rain showers loudly onto your umbrella!")) continue @@ -356,7 +356,7 @@ var/datum/planet/virgo4/planet_virgo4 = null flight_failure_modifier = 15 timer_low_bound = 2 timer_high_bound = 5 - effect_message = "The hail smacks into you!" + effect_message = span_warning("The hail smacks into you!") transition_chances = list( WEATHER_HAIL = 10, @@ -386,7 +386,7 @@ var/datum/planet/virgo4/planet_virgo4 = null if(istype(U) && U.open) if(show_message) - to_chat(H, "Hail patters onto your umbrella.") + to_chat(H, span_notice("Hail patters onto your umbrella.")) continue var/target_zone = pick(BP_ALL) @@ -611,4 +611,4 @@ var/datum/planet/virgo4/planet_virgo4 = null RCon = TRUE input_level = input_level_max output_level = output_level_max - input_attempt = TRUE \ No newline at end of file + input_attempt = TRUE diff --git a/code/modules/player_tips_vr/player_tips_controller_vr.dm b/code/modules/player_tips_vr/player_tips_controller_vr.dm index fa0db859f9..6b8ce44414 100644 --- a/code/modules/player_tips_vr/player_tips_controller_vr.dm +++ b/code/modules/player_tips_vr/player_tips_controller_vr.dm @@ -31,7 +31,7 @@ Controlled by the player_tips subsystem under code/controllers/subsystems/player if(!M.key && !(M.key in HasReceived)) to_chat(M, span_warning("You have periodic player tips enabled. You may turn them off at any time with the Toggle Receiving Player Tips verb in Preferences, or in character set up under the OOC tab!\n Player tips appear every 45-75 minutes.")) HasReceived.Add(M.key) - tip = GLOB.is_valid_url.Replace(tip,"$1") + tip = GLOB.is_valid_url.Replace(tip,span_linkify("$1")) to_chat(M, span_notice("[tip]")) @@ -47,4 +47,4 @@ Controlled by the player_tips subsystem under code/controllers/subsystems/player if(choice == "cancel") return var/static/datum/player_tips/player_tips = new - to_chat(src, span_notice("[GLOB.is_valid_url.Replace(player_tips.pick_tip(choice),"$1")]")) + to_chat(src, span_notice("[GLOB.is_valid_url.Replace(player_tips.pick_tip(choice),span_linkify("$1"))]")) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index a526872c6f..551ad6b024 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -474,7 +474,7 @@ GLOBAL_LIST_EMPTY(apcs) if(W.has_tool_quality(TOOL_CROWBAR) && opened) if(has_electronics == APC_HAS_ELECTRONICS_WIRED) if(terminal) - to_chat(user, "Disconnect the wires first.") + to_chat(user, span_warning("Disconnect the wires first.")) return playsound(src, W.usesound, 50, 1) to_chat(user, "You begin to remove the power control board...") //lpeters - fixed grammar issues //Ner - grrrrrr @@ -483,21 +483,21 @@ GLOBAL_LIST_EMPTY(apcs) has_electronics = APC_HAS_ELECTRONICS_NONE if((stat & BROKEN)) user.visible_message(\ - "[user.name] has broken the charred power control board inside [name]!",\ - "You broke the charred power control board and remove the remains.", + span_warning("[user.name] has broken the charred power control board inside [name]!"),\ + span_notice("You broke the charred power control board and remove the remains."), "You hear a crack!") //ticker.mode:apcs-- //XSI said no and I agreed. -rastaf0 else user.visible_message(\ - "[user.name] has removed the power control board from [name]!",\ - "You remove the power control board.") + span_warning("[user.name] has removed the power control board from [name]!"),\ + span_notice("You remove the power control board.")) new /obj/item/module/power_control(loc) else if(opened != 2) //cover isn't removed opened = 0 update_icon() else if(W.has_tool_quality(TOOL_CROWBAR) && !(stat & BROKEN) ) if(coverlocked && !(stat & MAINT)) - to_chat(user, "The cover is locked and cannot be opened.") + to_chat(user, span_warning("The cover is locked and cannot be opened.")) return else opened = 1 @@ -507,7 +507,7 @@ GLOBAL_LIST_EMPTY(apcs) to_chat(user, "The [name] already has a power cell installed.") return if(stat & MAINT) - to_chat(user, "You need to install the wiring and electronics first.") + to_chat(user, span_warning("You need to install the wiring and electronics first.")) return if(W.w_class != ITEMSIZE_NORMAL) to_chat(user, "\The [W] is too [W.w_class < 3? "small" : "large"] to work here.") @@ -517,14 +517,14 @@ GLOBAL_LIST_EMPTY(apcs) W.forceMove(src) cell = W user.visible_message(\ - "[user.name] has inserted a power cell into [name]!",\ - "You insert the power cell.") + span_warning("[user.name] has inserted a power cell into [name]!"),\ + span_notice("You insert the power cell.")) chargecount = 0 update_icon() else if (W.has_tool_quality(TOOL_SCREWDRIVER)) // haxing if(opened) if(cell) - to_chat(user, "Remove the power cell first.") + to_chat(user, span_warning("Remove the power cell first.")) return else if(has_electronics == APC_HAS_ELECTRONICS_WIRED && terminal) @@ -538,7 +538,7 @@ GLOBAL_LIST_EMPTY(apcs) playsound(src, W.usesound, 50, 1) to_chat(user, "You unfasten the electronics.") else /* has_electronics == APC_HAS_ELECTRONICS_NONE */ - to_chat(user, "There is nothing to secure.") + to_chat(user, span_warning("There is nothing to secure.")) return update_icon() else @@ -553,13 +553,13 @@ GLOBAL_LIST_EMPTY(apcs) else if(istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics != APC_HAS_ELECTRONICS_SECURED) var/turf/T = loc if(istype(T) && !T.is_plating()) - to_chat(user, "You must remove the floor plating in front of the APC first.") + to_chat(user, span_warning("You must remove the floor plating in front of the APC first.")) return var/obj/item/stack/cable_coil/C = W if(C.get_amount() < 10) - to_chat(user, "You need ten lengths of cable for that.") + to_chat(user, span_warning("You need ten lengths of cable for that.")) return - user.visible_message("[user.name] adds cables to the APC frame.", \ + user.visible_message(span_warning("[user.name] adds cables to the APC frame."), \ "You start adding cables to the APC frame...") playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) @@ -573,16 +573,16 @@ GLOBAL_LIST_EMPTY(apcs) return C.use(10) user.visible_message(\ - "[user.name] has added cables to the APC frame!",\ + span_warning("[user.name] has added cables to the APC frame!"),\ "You add cables to the APC frame.") make_terminal() terminal.connect_to_network() else if(W.has_tool_quality(TOOL_WIRECUTTER) && terminal && opened && has_electronics != APC_HAS_ELECTRONICS_SECURED) var/turf/T = loc if(istype(T) && !T.is_plating()) - to_chat(user, "You must remove the floor plating in front of the APC first.") + to_chat(user, span_warning("You must remove the floor plating in front of the APC first.")) return - user.visible_message("[user.name] starts dismantling the [src]'s power terminal.", \ + user.visible_message(span_warning("[user.name] starts dismantling the [src]'s power terminal."), \ "You begin to cut the cables...") playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 50 * W.toolspeed)) @@ -594,27 +594,27 @@ GLOBAL_LIST_EMPTY(apcs) if(usr.stunned) return new /obj/item/stack/cable_coil(loc,10) - to_chat(user, "You cut the cables and dismantle the power terminal.") + to_chat(user, span_notice("You cut the cables and dismantle the power terminal.")) qdel(terminal) else if(istype(W, /obj/item/module/power_control) && opened && has_electronics == APC_HAS_ELECTRONICS_NONE && !((stat & BROKEN))) - user.visible_message("[user.name] inserts the power control board into [src].", \ + user.visible_message(span_warning("[user.name] inserts the power control board into [src]."), \ "You start to insert the power control board into the frame...") playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 10)) if(has_electronics == APC_HAS_ELECTRONICS_NONE) has_electronics = APC_HAS_ELECTRONICS_WIRED reboot() - to_chat(user, "You place the power control board inside the frame.") + to_chat(user, span_notice("You place the power control board inside the frame.")) qdel(W) else if(istype(W, /obj/item/module/power_control) && opened && has_electronics == APC_HAS_ELECTRONICS_NONE && ((stat & BROKEN))) - to_chat(user, "The [src] is too broken for that. Repair it first.") + to_chat(user, span_warning("The [src] is too broken for that. Repair it first.")) return else if(W.has_tool_quality(TOOL_WELDER) && opened && has_electronics == APC_HAS_ELECTRONICS_NONE && !terminal) var/obj/item/weldingtool/WT = W.get_welder() if(WT.get_fuel() < 3) - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span_warning("You need more welding fuel to complete this task.")) return - user.visible_message("[user.name] begins cutting apart [src] with the [WT.name].", \ + user.visible_message(span_warning("[user.name] begins cutting apart [src] with the [WT.name]."), \ "You start welding the APC frame...", \ "You hear welding.") playsound(src, WT.usesound, 25, 1) @@ -623,26 +623,26 @@ GLOBAL_LIST_EMPTY(apcs) if(emagged || (stat & BROKEN) || opened==2) new /obj/item/stack/material/steel(loc) user.visible_message(\ - "[src] has been cut apart by [user.name] with the [WT.name].",\ - "You disassembled the broken APC frame.",\ + span_warning("[src] has been cut apart by [user.name] with the [WT.name]."),\ + span_notice("You disassembled the broken APC frame."),\ "You hear welding.") else new /obj/item/frame/apc(loc) user.visible_message(\ - "[src] has been cut from the wall by [user.name] with the [WT.name].",\ - "You cut the APC frame from the wall.",\ + span_warning("[src] has been cut from the wall by [user.name] with the [WT.name]."),\ + span_notice("You cut the APC frame from the wall."),\ "You hear welding.") qdel(src) return else if(opened && ((stat & BROKEN) || hacker || emagged)) if(istype(W, /obj/item/frame/apc) && (stat & BROKEN)) if(cell) - to_chat(user, "You need to remove the power cell first.") + to_chat(user, span_warning("You need to remove the power cell first.")) return - user.visible_message("[user.name] begins replacing the damaged APC cover with a new one.",\ + user.visible_message(span_warning("[user.name] begins replacing the damaged APC cover with a new one."),\ "You begin to replace the damaged APC cover...") if(do_after(user, 50)) - user.visible_message("[user.name] has replaced the damaged APC cover with a new one.",\ + user.visible_message(span_notice("[user.name] has replaced the damaged APC cover with a new one."),\ "You replace the damaged APC cover with a new one.") qdel(W) stat &= ~BROKEN @@ -652,12 +652,12 @@ GLOBAL_LIST_EMPTY(apcs) update_icon() else if(istype(W, /obj/item/multitool) && (hacker || emagged)) if(cell) - to_chat(user, "You need to remove the power cell first.") + to_chat(user, span_warning("You need to remove the power cell first.")) return - user.visible_message("[user.name] connects their [W.name] to the APC and begins resetting it.",\ + user.visible_message(span_warning("[user.name] connects their [W.name] to the APC and begins resetting it."),\ "You begin resetting the APC...") if(do_after(user, 50)) - user.visible_message("[user.name] resets the APC with a beep from their [W.name].",\ + user.visible_message(span_notice("[user.name] resets the APC with a beep from their [W.name]."),\ "You finish resetting the APC.") playsound(src, 'sound/machines/chime.ogg', 25, 1) reboot() @@ -666,13 +666,13 @@ GLOBAL_LIST_EMPTY(apcs) && !opened \ && W.force >= 5 \ && W.w_class >= ITEMSIZE_SMALL ) - user.visible_message("The [name] has been hit with the [W.name] by [user.name]!", \ - "You hit the [name] with your [W.name]!", \ + user.visible_message(span_danger("The [name] has been hit with the [W.name] by [user.name]!"), \ + span_danger("You hit the [name] with your [W.name]!"), \ "You hear a bang!") if(prob(20)) opened = 2 - user.visible_message("The APC cover was knocked down with the [W.name] by [user.name]!", \ - "You knock down the APC cover with your [W.name]!", \ + user.visible_message(span_danger("The APC cover was knocked down with the [W.name] by [user.name]!"), \ + span_danger("You knock down the APC cover with your [W.name]!"), \ "You hear a bang!") update_icon() else @@ -681,7 +681,7 @@ GLOBAL_LIST_EMPTY(apcs) if(!opened && wiresexposed && (istype(W, /obj/item/multitool) || W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/assembly/signaler))) return attack_hand(user) //Placeholder until someone can do take_damage() for APCs or something. - to_chat(user, "The [name] looks too sturdy to bash open with \the [W.name].") + to_chat(user, span_notice("The [name] looks too sturdy to bash open with \the [W.name].")) // attack with hand - remove cell (if cover open) or interact with the APC @@ -695,14 +695,14 @@ GLOBAL_LIST_EMPTY(apcs) else if(stat & (BROKEN|MAINT)) to_chat(user, "Nothing happens.") else if(hacker) - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) else if(allowed(user) && !wires.is_cut(WIRE_IDSCAN)) locked = !locked to_chat(user, "You [ locked ? "lock" : "unlock"] the APC interface.") update_icon() else - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) /obj/machinery/power/apc/AltClick(mob/user) ..() @@ -721,7 +721,7 @@ GLOBAL_LIST_EMPTY(apcs) if(do_after(user,6)) emagged = 1 locked = 0 - to_chat(user, "You emag the APC interface.") + to_chat(user, span_notice("You emag the APC interface.")) update_icon() return 1 @@ -742,7 +742,7 @@ GLOBAL_LIST_EMPTY(apcs) if(H.species.can_shred(H)) user.setClickCooldown(user.get_attack_speed()) - user.visible_message("[user.name] slashes at the [name]!", "You slash at the [name]!") + user.visible_message("[user.name] slashes at the [name]!", span_notice("You slash at the [name]!")) playsound(src, 'sound/weapons/slash.ogg', 100, 1) var/allcut = wires.is_all_cut() @@ -767,8 +767,8 @@ GLOBAL_LIST_EMPTY(apcs) cell.update_icon() cell = null - user.visible_message("[user.name] removes the power cell from [name]!",\ - "You remove the power cell.") + user.visible_message(span_warning("[user.name] removes the power cell from [name]!"),\ + span_notice("You remove the power cell.")) charging = 0 update_icon() return @@ -885,10 +885,10 @@ GLOBAL_LIST_EMPTY(apcs) if(!user.IsAdvancedToolUser()) return 0 if(user.restrained()) - to_chat(user, "Your hands must be free to use [src].") + to_chat(user, span_warning("Your hands must be free to use [src].")) return 0 if(user.lying) - to_chat(user, "You must stand to use [src]!") + to_chat(user, span_warning("You must stand to use [src]!")) return 0 autoflag = 5 if(istype(user, /mob/living/silicon)) @@ -903,14 +903,14 @@ GLOBAL_LIST_EMPTY(apcs) if(aidisabled && !permit) if(!loud) - to_chat(user, "\The AI control for [src] has been disabled!") + to_chat(user, span_danger("\The AI control for [src] has been disabled!")) return 0 else if(!in_range(src, user) || !istype(loc, /turf)) return 0 var/mob/living/carbon/human/H = user if(istype(H) && prob(H.getBrainLoss())) - to_chat(user, "You momentarily forget how to use [src].") + to_chat(user, span_danger("You momentarily forget how to use [src].")) return 0 return 1 @@ -947,7 +947,7 @@ GLOBAL_LIST_EMPTY(apcs) toggle_breaker() if("nightshift") if(last_nightshift_switch > world.time - 10 SECONDS) // don't spam... - to_chat(usr, "[src]'s night lighting circuit breaker is still cycling!") + to_chat(usr, span_warning("[src]'s night lighting circuit breaker is still cycling!")) return 0 last_nightshift_switch = world.time nightshift_setting = params["nightshift"] @@ -1244,7 +1244,7 @@ GLOBAL_LIST_EMPTY(apcs) /obj/machinery/power/apc/proc/set_broken() // Aesthetically much better! spawn(rand(2,5)) - visible_message("[src]'s screen flickers suddenly, then explodes in a rain of sparks and small debris!") + visible_message(span_warning("[src]'s screen flickers suddenly, then explodes in a rain of sparks and small debris!")) stat |= BROKEN operating = 0 update_icon() diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index 1962751d28..b91e5f688e 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -224,9 +224,9 @@ /obj/machinery/power/smes/batteryrack/attackby(var/obj/item/W as obj, var/mob/user as mob) if(istype(W, /obj/item/cell)) // ID Card, try to insert it. if(insert_cell(W, user)) - to_chat(user, "You insert \the [W] into \the [src].") + to_chat(user, span_filter_notice("You insert \the [W] into \the [src].")) else - to_chat(user, "\The [src] has no empty slot for \the [W]") + to_chat(user, span_filter_notice("\The [src] has no empty slot for \the [W]")) if(!..()) return 0 if(default_deconstruction_crowbar(user, W)) diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm index e79bc38635..76576bc7ec 100644 --- a/code/modules/power/breaker_box.dm +++ b/code/modules/power/breaker_box.dm @@ -47,9 +47,9 @@ /obj/machinery/power/breakerbox/examine(mob/user) . = ..() if(on) - . += "It seems to be online." + . += span_notice("It seems to be online.") else - . += "It seems to be offline." + . += span_warning("It seems to be offline.") /obj/machinery/power/breakerbox/attack_ai(mob/user) if(update_locked) @@ -87,8 +87,8 @@ if(do_after(user, 50)) set_state(!on) user.visible_message(\ - "[user.name] [on ? "enabled" : "disabled"] the breaker box!",\ - "You [on ? "enabled" : "disabled"] the breaker box!") + span_notice("[user.name] [on ? "enabled" : "disabled"] the breaker box!"),\ + span_notice("You [on ? "enabled" : "disabled"] the breaker box!")) update_locked = 1 spawn(600) update_locked = 0 @@ -100,7 +100,7 @@ newtag = sanitize(newtag,MAX_NAME_LEN) if(newtag) RCon_tag = newtag - to_chat(user, "You changed the RCON tag to: [newtag]") + to_chat(user, span_notice("You changed the RCON tag to: [newtag]")) if(on) to_chat(user, span_red("Disable the breaker before performing maintenance.")) return diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 99b6fc8f74..f8c7d4fe99 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -114,7 +114,7 @@ var/list/possible_cable_coil_colours = list( /obj/structure/cable/examine(mob/user) . = ..() if(isobserver(user)) - . += "[powernet?.avail > 0 ? "[DisplayPower(powernet.avail)] in power network." : "The cable is not powered."]" + . += span_warning("[powernet?.avail > 0 ? "[DisplayPower(powernet.avail)] in power network." : "The cable is not powered."]") // Rotating cables requires d1 and d2 to be rotated /obj/structure/cable/set_dir(new_dir) @@ -180,11 +180,11 @@ var/list/possible_cable_coil_colours = list( if(W.has_tool_quality(TOOL_WIRECUTTER)) var/obj/item/stack/cable_coil/CC if(d1 == UP || d2 == UP) - to_chat(user, "You must cut this cable from above.") + to_chat(user, span_warning("You must cut this cable from above.")) return if(breaker_box) - to_chat(user, "This cable is connected to nearby breaker box. Use breaker box to interact with it.") + to_chat(user, span_warning("This cable is connected to nearby breaker box. Use breaker box to interact with it.")) return if (shock(user, 50)) @@ -199,7 +199,7 @@ var/list/possible_cable_coil_colours = list( src.transfer_fingerprints_to(CC) for(var/mob/O in viewers(src, null)) - O.show_message("[user] cuts the cable.", 1) + O.show_message(span_warning("[user] cuts the cable."), 1) if(d1 == DOWN || d2 == DOWN) var/turf/turf = GetBelow(src) @@ -224,10 +224,10 @@ var/list/possible_cable_coil_colours = list( else if(istype(W, /obj/item/multitool)) if(powernet && (powernet.avail > 0)) // is it powered? - to_chat(user, "[DisplayPower(powernet.avail)] in power network.") + to_chat(user, span_warning("[DisplayPower(powernet.avail)] in power network.")) else - to_chat(user, "The cable is not powered.") + to_chat(user, span_warning("The cable is not powered.")) shock(user, 5, 0.2) @@ -554,11 +554,11 @@ var/list/possible_cable_coil_colours = list( if(S.organ_tag == BP_HEAD) if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space)) - to_chat(user, "You can't apply [src] through [H.head]!") + to_chat(user, span_warning("You can't apply [src] through [H.head]!")) return 1 else if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space)) - to_chat(user, "You can't apply [src] through [H.wear_suit]!") + to_chat(user, span_warning("You can't apply [src] through [H.wear_suit]!")) return 1 var/use_amt = min(src.amount, CEILING(S.burn_dam/5, 1), 5) @@ -591,7 +591,7 @@ var/list/possible_cable_coil_colours = list( final_color = possible_cable_coil_colours["Red"] selected_color = "red" color = final_color - to_chat(user, "You change \the [src]'s color to [lowertext(selected_color)].") + to_chat(user, span_notice("You change \the [src]'s color to [lowertext(selected_color)].")) /obj/item/stack/cable_coil/proc/update_wclass() if(amount == 1) @@ -614,14 +614,14 @@ var/list/possible_cable_coil_colours = list( if(ishuman(M) && !M.restrained() && !M.stat && !M.paralysis && ! M.stunned) if(!istype(usr.loc,/turf)) return if(src.amount <= 14) - to_chat(usr, "You need at least 15 lengths to make restraints!") + to_chat(usr, span_warning("You need at least 15 lengths to make restraints!")) return var/obj/item/handcuffs/cable/B = new /obj/item/handcuffs/cable(usr.loc) B.color = color - to_chat(usr, "You wind some cable together to make some restraints.") + to_chat(usr, span_notice("You wind some cable together to make some restraints.")) src.use(15) else - to_chat(usr, "You cannot do that.") + to_chat(usr, span_notice("You cannot do that.")) /obj/item/stack/cable_coil/cyborg/verb/set_colour() set name = "Change Colour" @@ -685,7 +685,7 @@ var/list/possible_cable_coil_colours = list( for(var/obj/structure/cable/LC in F) if((LC.d1 == dirn && LC.d2 == end_dir ) || ( LC.d2 == dirn && LC.d1 == end_dir)) - to_chat(user, "There's already a cable at that position.") + to_chat(user, span_warning("There's already a cable at that position.")) return put_cable(F, user, end_dir, dirn) diff --git a/code/modules/power/cable_ender.dm b/code/modules/power/cable_ender.dm index ba6359be63..906da2a42a 100644 --- a/code/modules/power/cable_ender.dm +++ b/code/modules/power/cable_ender.dm @@ -25,10 +25,10 @@ /obj/structure/cable/ender/attackby(obj/item/W, mob/user) src.add_fingerprint(user) if(W.has_tool_quality(TOOL_WIRECUTTER)) - to_chat(user, " These cables are too tough to be cut with those [W.name].") + to_chat(user, span_notice(" These cables are too tough to be cut with those [W.name].")) return else if(istype(W, /obj/item/stack/cable_coil)) - to_chat(user, " You will need heavier cables to connect to these.") + to_chat(user, span_notice(" You will need heavier cables to connect to these.")) return else ..() @@ -36,4 +36,3 @@ // Because they cannot be rebuilt, they are hard to destroy /obj/structure/cable/ender/ex_act(severity) return - diff --git a/code/modules/power/cells/device_cells_vr.dm b/code/modules/power/cells/device_cells_vr.dm index 27ecba7ecb..f810799f84 100644 --- a/code/modules/power/cells/device_cells_vr.dm +++ b/code/modules/power/cells/device_cells_vr.dm @@ -7,7 +7,7 @@ /obj/item/cell/device/weapon/recharge/alien/attack_self(var/mob/user) user.remove_from_mob(src) - to_chat(user, "You swap [src] to 'machinery cell' mode.") + to_chat(user, span_notice("You swap [src] to 'machinery cell' mode.")) var/obj/item/cell/newcell = new swaps_to(null) user.put_in_active_hand(newcell) var/percentage = charge/maxcharge @@ -32,7 +32,7 @@ /obj/item/cell/void/attack_self(var/mob/user) user.remove_from_mob(src) - to_chat(user, "You swap [src] to 'device cell' mode.") + to_chat(user, span_notice("You swap [src] to 'device cell' mode.")) var/obj/item/cell/newcell = new swaps_to(null) user.put_in_active_hand(newcell) var/percentage = charge/maxcharge diff --git a/code/modules/power/cells/esoteric_cells.dm b/code/modules/power/cells/esoteric_cells.dm index 2dbfd5720c..aeacc6b3e6 100644 --- a/code/modules/power/cells/esoteric_cells.dm +++ b/code/modules/power/cells/esoteric_cells.dm @@ -66,7 +66,7 @@ var/obj/item/plastique/C4 = locate() in get_turf(src) if(C4) - C4.visible_message("The current fries \the [C4]!") + C4.visible_message(span_danger("The current fries \the [C4]!")) if(prob(10)) C4.explode(get_turf(src)) diff --git a/code/modules/power/cells/power_cells.dm b/code/modules/power/cells/power_cells.dm index 017804d4e5..774c5d8817 100644 --- a/code/modules/power/cells/power_cells.dm +++ b/code/modules/power/cells/power_cells.dm @@ -224,11 +224,11 @@ if(H.nutrition <= amount) use(user,H) else - to_chat(user,"The difference in potential is too great. [user == M ? "You have" : "[H] has"] too much charge to use such a small battery.") + to_chat(user,span_warning("The difference in potential is too great. [user == M ? "You have" : "[H] has"] too much charge to use such a small battery.")) else if(M == user) - to_chat(user,"You lick the cell, and your tongue tingles slightly.") + to_chat(user,span_warning("You lick the cell, and your tongue tingles slightly.")) else - to_chat(user,"This cell is meant for use on humanoid synthetics only.") + to_chat(user,span_warning("This cell is meant for use on humanoid synthetics only.")) . = ..() diff --git a/code/modules/power/debug_items.dm b/code/modules/power/debug_items.dm index 0fe6e9fb07..371b239ded 100644 --- a/code/modules/power/debug_items.dm +++ b/code/modules/power/debug_items.dm @@ -13,15 +13,15 @@ /obj/machinery/power/debug_items/proc/show_info(var/mob/user) var/list/extra_info = list() if(!powernet) - extra_info += "This device is not connected to a powernet" + extra_info += span_filter_notice("This device is not connected to a powernet") return - extra_info += "Connected to powernet: [powernet]" - extra_info += "Available power: [num2text(powernet.avail, 20)] W" - extra_info += "Load: [num2text(powernet.viewload, 20)] W" - extra_info += "Has alert: [powernet.problem ? "YES" : "NO"]" - extra_info += "Cables: [powernet.cables.len]" - extra_info += "Nodes: [powernet.nodes.len]" + extra_info += span_filter_notice("Connected to powernet: [powernet]") + extra_info += span_filter_notice("Available power: [num2text(powernet.avail, 20)] W") + extra_info += span_filter_notice("Load: [num2text(powernet.viewload, 20)] W") + extra_info += span_filter_notice("Has alert: [powernet.problem ? "YES" : "NO"]") + extra_info += span_filter_notice("Cables: [powernet.cables.len]") + extra_info += span_filter_notice("Nodes: [powernet.nodes.len]") return extra_info @@ -36,7 +36,7 @@ /obj/machinery/power/debug_items/infinite_generator/show_info(var/mob/user) . = ..() - . += "Generator is providing [num2text(power_generation_rate, 20)] W" + . += span_filter_notice("Generator is providing [num2text(power_generation_rate, 20)] W") // A cable powersink, without the explosion/network alarms normal powersink causes. @@ -51,8 +51,8 @@ /obj/machinery/power/debug_items/infinite_cable_powersink/show_info(var/mob/user) . = ..() - . += "Power sink is demanding [num2text(power_usage_rate, 20)] W" - . += "[num2text(last_used, 20)] W was actually used last tick" + . += span_filter_notice("Power sink is demanding [num2text(power_usage_rate, 20)] W") + . += span_filter_notice("[num2text(last_used, 20)] W was actually used last tick") /obj/machinery/power/debug_items/infinite_apc_powersink @@ -63,5 +63,5 @@ /obj/machinery/power/debug_items/infinite_apc_powersink/show_info(var/mob/user) . = ..() - . += "Dummy load is using [num2text(active_power_usage, 20)] W" - . += "Powered: [powered() ? "YES" : "NO"]" + . += span_filter_notice("Dummy load is using [num2text(active_power_usage, 20)] W") + . += span_filter_notice("Powered: [powered() ? "YES" : "NO"]") diff --git a/code/modules/power/fusion/core/_core.dm b/code/modules/power/fusion/core/_core.dm index 21a7436ee3..391e909e8e 100644 --- a/code/modules/power/fusion/core/_core.dm +++ b/code/modules/power/fusion/core/_core.dm @@ -138,7 +138,7 @@ GLOBAL_LIST_EMPTY(fusion_cores) /obj/machinery/power/fusion_core/attackby(var/obj/item/W, var/mob/user) if(owned_field) - to_chat(user,"Shut \the [src] off first!") + to_chat(user,span_warning("Shut \the [src] off first!")) return if(default_deconstruction_screwdriver(user, W)) @@ -166,4 +166,4 @@ GLOBAL_LIST_EMPTY(fusion_cores) if(!owned_field) return FALSE owned_field.plasma_temperature = field_temperature - return TRUE \ No newline at end of file + return TRUE diff --git a/code/modules/power/fusion/core/core_control.dm b/code/modules/power/fusion/core/core_control.dm index abf2209b3a..47b85b21ba 100644 --- a/code/modules/power/fusion/core/core_control.dm +++ b/code/modules/power/fusion/core/core_control.dm @@ -57,7 +57,7 @@ cur_viewed_device = null if(!id_tag) - to_chat(user, "This console has not been assigned an ident tag. Please contact your system administrator or conduct a manual update with a standard multitool.") + to_chat(user, span_warning("This console has not been assigned an ident tag. Please contact your system administrator or conduct a manual update with a standard multitool.")) return if(cur_viewed_device && (cur_viewed_device.id_tag != id_tag || get_dist(src, cur_viewed_device) > scan_range)) diff --git a/code/modules/power/fusion/core/core_field.dm b/code/modules/power/fusion/core/core_field.dm index 18d6a6834a..03dd6ced8d 100644 --- a/code/modules/power/fusion/core/core_field.dm +++ b/code/modules/power/fusion/core/core_field.dm @@ -206,21 +206,21 @@ else if(percent_unstable > 0.1 && prob(percent_unstable*100)) if(plasma_temperature < 2000) - visible_message("\The [src] ripples uneasily, like a disturbed pond.") + visible_message(span_danger("\The [src] ripples uneasily, like a disturbed pond.")) else var/flare var/fuel_loss var/rupture if(percent_unstable > 0.2) - visible_message("\The [src] ripples uneasily, like a disturbed pond.") + visible_message(span_danger("\The [src] ripples uneasily, like a disturbed pond.")) flare = prob(25) else if(percent_unstable > 0.5) - visible_message("\The [src] undulates violently, shedding plumes of plasma!") + visible_message(span_danger("\The [src] undulates violently, shedding plumes of plasma!")) flare = prob(50) fuel_loss = prob(20) rupture = prob(5) else if(percent_unstable > 0.8) - visible_message("\The [src] is wracked by a series of horrendous distortions, buckling and twisting like a living thing!") + visible_message(span_danger("\The [src] is wracked by a series of horrendous distortions, buckling and twisting like a living thing!")) flare = 1 fuel_loss = prob(50) rupture = prob(25) @@ -260,11 +260,11 @@ critical += 0.6 if(critical >= 25 && prob(percent_unstable*100)) if (critical >= 90) - visible_message("\The [src] rumbles and quivers violently, threatening to break free!") + visible_message(span_danger("\The [src] rumbles and quivers violently, threatening to break free!")) else if(critical >= 50) - visible_message("\The [src] rumbles and quivers energetically, the walls distorting slightly.") + visible_message(span_danger("\The [src] rumbles and quivers energetically, the walls distorting slightly.")) else if(critical >= 25) - visible_message("\The [src] rumbles and quivers slightly, vibrating the deck.") + visible_message(span_danger("\The [src] rumbles and quivers slightly, vibrating the deck.")) */ /obj/effect/fusion_em_field/proc/ChangeFieldStrength(var/new_strength) var/calc_size = 1 @@ -353,7 +353,7 @@ continue log_debug("R-UST DEBUG: [AM] is [AM.type]") - AM.visible_message("The field buckles visibly around \the [AM]!") + AM.visible_message(span_danger("The field buckles visibly around \the [AM]!")) tick_instability += rand(15,30) AM.emp_act(empsev) @@ -580,7 +580,7 @@ light_min_power = 30 light_min_range = 30 light_max_range = 30 - visible_message("\The [src] flares to eye-searing brightness!") + visible_message(span_danger("\The [src] flares to eye-searing brightness!")) sleep(60) temp_color() //plasma_temperature -= lost_plasma @@ -589,7 +589,7 @@ /obj/effect/fusion_em_field/proc/Rupture() - visible_message("\The [src] shudders like a dying animal before flaring to eye-searing brightness and rupturing!") + visible_message(span_danger("\The [src] shudders like a dying animal before flaring to eye-searing brightness and rupturing!")) set_light(15, 15, "#CCCCFF") empulse(get_turf(src), CEILING(plasma_temperature/1000, 1), CEILING(plasma_temperature/300, 1)) global_announcer.autosay("WARNING: FIELD RUPTURE IMMINENT!", "Containment Monitor") @@ -616,7 +616,7 @@ return /obj/effect/fusion_em_field/proc/MRC() //spews electromagnetic pulses in an area around the core. - visible_message("\The [src] glows an extremely bright pink and flares out of existance!") + visible_message(span_danger("\The [src] glows an extremely bright pink and flares out of existance!")) global_announcer.autosay("Warning! Magnetic Resonance Cascade detected! Brace for electronic system distruption.", "Field Stability Monitor") set_light(15, 15, "#ff00d8") var/list/things_in_range = range(15, owned_core) @@ -667,7 +667,7 @@ return /obj/effect/fusion_em_field/proc/BluespaceQuenchEvent() //!!FUN!! causes a number of explosions in an area around the core. Will likely destory or heavily damage the reactor. - visible_message("\The [src] shudders like a dying animal before flaring to eye-searing brightness and rupturing!") + visible_message(span_danger("\The [src] shudders like a dying animal before flaring to eye-searing brightness and rupturing!")) set_light(15, 15, "#CCCCFF") empulse(get_turf(src), CEILING(plasma_temperature/1000, 1), CEILING(plasma_temperature/300, 1)) global_announcer.autosay("WARNING: FIELD RUPTURE IMMINENT!", "Containment Monitor") diff --git a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm index fa3a48cef2..48a59da413 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm @@ -20,10 +20,10 @@ /obj/machinery/fusion_fuel_compressor/proc/do_special_fuel_compression(var/obj/item/thing, var/mob/user) if(istype(thing) && thing.reagents && thing.reagents.total_volume && thing.is_open_container()) if(thing.reagents.reagent_list.len > 1) - to_chat(user, "The contents of \the [thing] are impure and cannot be used as fuel.") + to_chat(user, span_warning("The contents of \the [thing] are impure and cannot be used as fuel.")) return 1 if(thing.reagents.total_volume < 300) - to_chat(user, "You need at least three hundred units of material to form a fuel rod.") + to_chat(user, span_warning("You need at least three hundred units of material to form a fuel rod.")) return 1 var/datum/reagent/R = thing.reagents.reagent_list[1] visible_message("\The [src] compresses the contents of \the [thing] into a new fuel assembly.") @@ -52,10 +52,10 @@ var/obj/item/stack/material/M = thing var/datum/material/mat = M.get_material() if(!mat.is_fusion_fuel) - to_chat(user, "It would be pointless to make a fuel rod out of [mat.use_name].") + to_chat(user, span_warning("It would be pointless to make a fuel rod out of [mat.use_name].")) return if(M.get_amount() < FUSION_ROD_SHEET_AMT) - to_chat(user, "You need at least 25 [mat.sheet_plural_name] to make a fuel rod.") + to_chat(user, span_warning("You need at least 25 [mat.sheet_plural_name] to make a fuel rod.")) return var/obj/item/fuel_assembly/F = new(get_turf(src), mat.name) visible_message("\The [src] compresses the [mat.use_name] into a new fuel assembly.") @@ -67,4 +67,4 @@ return ..() -#undef FUSION_ROD_SHEET_AMT \ No newline at end of file +#undef FUSION_ROD_SHEET_AMT diff --git a/code/modules/power/fusion/fuel_assembly/fuel_control.dm b/code/modules/power/fusion/fuel_assembly/fuel_control.dm index fbfb57f3aa..5f66fc52d8 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_control.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_control.dm @@ -47,7 +47,7 @@ return if(!id_tag) - to_chat(user, "This console has not been assigned an ident tag. Please contact your system administrator or conduct a manual update with a standard multitool.") + to_chat(user, span_warning("This console has not been assigned an ident tag. Please contact your system administrator or conduct a manual update with a standard multitool.")) return var/dat = "Reactor Core Fuel Control #[id_tag]
    " diff --git a/code/modules/power/fusion/fuel_assembly/fuel_injector.dm b/code/modules/power/fusion/fuel_assembly/fuel_injector.dm index e96acaa63c..81e95b0df0 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_injector.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_injector.dm @@ -52,7 +52,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors) if(istype(W, /obj/item/fuel_assembly)) if(injecting) - to_chat(user, "Shut \the [src] off before playing with the fuel rod!") + to_chat(user, span_warning("Shut \the [src] off before playing with the fuel rod!")) return if(cur_assembly) @@ -71,7 +71,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors) if(W.has_tool_quality(TOOL_WRENCH) || W.has_tool_quality(TOOL_SCREWDRIVER) || W.has_tool_quality(TOOL_CROWBAR) || istype(W, /obj/item/storage/part_replacer)) if(injecting) - to_chat(user, "Shut \the [src] off first!") + to_chat(user, span_warning("Shut \the [src] off first!")) return if(default_unfasten_wrench(user, W)) return @@ -87,7 +87,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors) /obj/machinery/fusion_fuel_injector/attack_hand(mob/user) if(injecting) - to_chat(user, "Shut \the [src] off before playing with the fuel rod!") + to_chat(user, span_warning("Shut \the [src] off before playing with the fuel rod!")) return if(cur_assembly) @@ -97,7 +97,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors) cur_assembly = null return else - to_chat(user, "There is no fuel rod in \the [src].") + to_chat(user, span_warning("There is no fuel rod in \the [src].")) return /obj/machinery/fusion_fuel_injector/proc/BeginInjecting() diff --git a/code/modules/power/fusion/gyrotron/gyrotron_control.dm b/code/modules/power/fusion/gyrotron/gyrotron_control.dm index bf50504e63..e62947f82b 100644 --- a/code/modules/power/fusion/gyrotron/gyrotron_control.dm +++ b/code/modules/power/fusion/gyrotron/gyrotron_control.dm @@ -44,7 +44,7 @@ return if(!id_tag) - to_chat(user, "This console has not been assigned an ident tag. Please contact your system administrator or conduct a manual update with a standard multitool.") + to_chat(user, span_warning("This console has not been assigned an ident tag. Please contact your system administrator or conduct a manual update with a standard multitool.")) return var/dat = "Gyrotron controller #[id_tag]" @@ -92,7 +92,7 @@ if(href_list["modifypower"]) var/new_val = input(usr, "Enter new emission power level (1 - 50)", "Modifying power level", G.mega_energy) as num if(!new_val) - to_chat(usr, "That's not a valid number.") + to_chat(usr, span_warning("That's not a valid number.")) return 1 G.mega_energy = CLAMP(new_val, 1, 50) G.update_active_power_usage(G.mega_energy * 1500) @@ -102,7 +102,7 @@ if(href_list["modifyrate"]) var/new_val = input(usr, "Enter new emission delay between 1 and 10 seconds.", "Modifying emission rate", G.rate) as num if(!new_val) - to_chat(usr, "That's not a valid number.") + to_chat(usr, span_warning("That's not a valid number.")) return 1 G.rate = CLAMP(new_val, 1, 10) updateUsrDialog() diff --git a/code/modules/power/gravitygenerator_vr.dm b/code/modules/power/gravitygenerator_vr.dm index 936d9e1805..61e9669aef 100644 --- a/code/modules/power/gravitygenerator_vr.dm +++ b/code/modules/power/gravitygenerator_vr.dm @@ -205,7 +205,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) switch(broken_state) if(GRAV_NEEDS_SCREWDRIVER) if(I.has_tool_quality(TOOL_SCREWDRIVER)) - to_chat(user, "You secure the screws of the framework.") + to_chat(user, span_notice("You secure the screws of the framework.")) playsound(src, I.usesound, 75, 1) broken_state++ update_icon() @@ -214,7 +214,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) if(I.has_tool_quality(TOOL_WELDER)) var/obj/item/weldingtool/W = I.get_welder() if(W.remove_fuel(0,user)) - to_chat(user, "You mend the damaged framework.") + to_chat(user, span_notice("You mend the damaged framework.")) broken_state++ update_icon() return @@ -223,16 +223,16 @@ GLOBAL_LIST_EMPTY(gravity_generators) var/obj/item/stack/material/plasteel/PS = I if(PS.get_amount() >= 10) PS.use(10) - to_chat(user, "You add the plating to the framework.") + to_chat(user, span_notice("You add the plating to the framework.")) playsound(src, 'sound/machines/click.ogg', 75, 1) broken_state++ update_icon() else - to_chat(user, "You need 10 sheets of plasteel!") + to_chat(user, span_warning("You need 10 sheets of plasteel!")) return if(GRAV_NEEDS_WRENCH) if(I.has_tool_quality(TOOL_WRENCH)) - to_chat(user, "You secure the plating to the framework.") + to_chat(user, span_notice("You secure the plating to the framework.")) playsound(src, I.usesound, 75, 1) set_fix() return diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 2960c6ab9e..6a696bf4cd 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -67,14 +67,14 @@ var/global/list/light_type_cache = list() else . += "The casing has no power cell for backup power." else - . += "This casing doesn't support power cells for backup power." + . += span_danger("This casing doesn't support power cells for backup power.") /obj/machinery/light_construct/attack_hand(mob/user) . = ..() if(.) return . // obj/machinery/attack_hand returns 1 if user can't use the machine if(cell) - user.visible_message("[user] removes [cell] from [src]!","You remove [cell].") + user.visible_message("[user] removes [cell] from [src]!",span_notice("You remove [cell].")) user.put_in_hands(cell) cell.update_icon() cell = null @@ -83,16 +83,16 @@ var/global/list/light_type_cache = list() src.add_fingerprint(user) if(istype(W, /obj/item/cell/emergency_light)) if(!cell_connectors) - to_chat(user, "This [name] can't support a power cell!") + to_chat(user, span_warning("This [name] can't support a power cell!")) return if(!user.unEquip(W)) - to_chat(user, "[W] is stuck to your hand!") + to_chat(user, span_warning("[W] is stuck to your hand!")) return if(cell) - to_chat(user, "There is a power cell already installed!") + to_chat(user, span_warning("There is a power cell already installed!")) else if(user.drop_from_inventory(W)) - user.visible_message("[user] hooks up [W] to [src].", \ - "You add [W] to [src].") + user.visible_message(span_notice("[user] hooks up [W] to [src]."), \ + span_notice("You add [W] to [src].")) playsound(src, 'sound/machines/click.ogg', 50, TRUE) W.forceMove(src) cell = W @@ -508,7 +508,7 @@ var/global/list/light_type_cache = list() return if(!(status == LIGHT_OK||status == LIGHT_BURNED)) return - visible_message("[user] smashes the light!") + visible_message(span_danger("[user] smashes the light!")) user.do_attack_animation(src) broken() return 1 @@ -664,7 +664,7 @@ var/global/list/light_type_cache = list() if(W.has_tool_quality(TOOL_WRENCH)) anchored = !anchored playsound(src, W.usesound, 50, 1) - to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + to_chat(user, span_notice("You [anchored ? "wrench" : "unwrench"] \the [src].")) if(!lamp_shade) if(istype(W, /obj/item/lampshade)) @@ -719,7 +719,7 @@ var/global/list/light_type_cache = list() if(!has_emergency_power(pwr)) return FALSE if(cell.charge > 300) //it's meant to handle 120 W, ya doofus - visible_message("[src] short-circuits from too powerful of a power cell!") + visible_message(span_warning("[src] short-circuits from too powerful of a power cell!")) status = LIGHT_BURNED installed_light.status = status return FALSE @@ -746,7 +746,7 @@ var/global/list/light_type_cache = list() // ai attack - turn on/off emergency lighting for a specific fixture /obj/machinery/light/attack_ai(mob/user) no_emergency = !no_emergency - to_chat(user, "Emergency lights for this fixture have been [no_emergency ? "disabled" : "enabled"].") + to_chat(user, span_notice("Emergency lights for this fixture have been [no_emergency ? "disabled" : "enabled"].")) update(FALSE) return diff --git a/code/modules/power/lightswitch_vr.dm b/code/modules/power/lightswitch_vr.dm index e7c3ca3175..3753999571 100644 --- a/code/modules/power/lightswitch_vr.dm +++ b/code/modules/power/lightswitch_vr.dm @@ -87,17 +87,17 @@ if(stage == FRAME_UNFASTENED) var/obj/item/weldingtool/WT = W.get_welder() if(!WT.remove_fuel(0, user)) - to_chat(user, "\The [src] must be on to complete this task.") + to_chat(user, span_warning("\The [src] must be on to complete this task.")) return playsound(src, WT.usesound, 50, 1) user.visible_message( \ - "\The [user] begins deconstructing \the [src].", \ - "You start deconstructing \the [src].") + span_warning("\The [user] begins deconstructing \the [src]."), \ + span_notice("You start deconstructing \the [src].")) if(do_after(user, 20 * WT.toolspeed, target = src) && WT.isOn()) new /obj/item/stack/material/steel(get_turf(src), 2) user.visible_message( \ - "\The [user] has deconstructed \the [src].", \ - "You deconstruct \the [src].") + span_warning("\The [user] has deconstructed \the [src]."), \ + span_notice("You deconstruct \the [src].")) playsound(src, 'sound/items/Deconstruct.ogg', 75, 1) qdel(src) else if (stage == FRAME_FASTENED) diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm index 908ac76878..786d03ec06 100644 --- a/code/modules/power/pacman2.dm +++ b/code/modules/power/pacman2.dm @@ -45,7 +45,7 @@ examine(mob/user) . = ..() - . += "The generator has [P.air_contents.phoron] units of fuel left, producing [power_gen] per cycle." + . += span_notice("The generator has [P.air_contents.phoron] units of fuel left, producing [power_gen] per cycle.") handleInactive() heat -= 2 diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 000c988fd3..b3a4f6ee92 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -67,9 +67,9 @@ . = ..() if(Adjacent(user)) //It literally has a light on the sprite, are you sure this is necessary? if(active) - . += "The generator is on." + . += span_notice("The generator is on.") else - . += "The generator is off." + . += span_notice("The generator is off.") /obj/machinery/power/port_gen/emp_act(severity) var/duration = 6000 //ten minutes @@ -156,9 +156,9 @@ . += "It appears to be producing [power_gen*power_output] W." . += "There [sheets == 1 ? "is" : "are"] [sheets] sheet\s left in the hopper." if(IsBroken()) - . += "It seems to have broken down." + . += span_warning("It seems to have broken down.") if(overheating) - . += "It is overheating!" + . += span_danger("It is overheating!") /obj/machinery/power/port_gen/pacman/HasFuel() var/needed_sheets = power_output / time_per_sheet @@ -273,9 +273,9 @@ var/obj/item/stack/addstack = O var/amount = min((max_sheets - sheets), addstack.get_amount()) if(amount < 1) - to_chat(user, "The [src.name] is full!") + to_chat(user, span_warning("The [src.name] is full!")) return - to_chat(user, "You add [amount] sheet\s to the [src.name].") + to_chat(user, span_notice("You add [amount] sheet\s to the [src.name].")) sheets += amount addstack.use(amount) updateUsrDialog() @@ -284,10 +284,10 @@ if(O.has_tool_quality(TOOL_WRENCH)) if(!anchored) connect_to_network() - to_chat(user, "You secure the generator to the floor.") + to_chat(user, span_notice("You secure the generator to the floor.")) else disconnect_from_network() - to_chat(user, "You unsecure the generator from the floor.") + to_chat(user, span_notice("You unsecure the generator from the floor.")) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) anchored = !anchored return diff --git a/code/modules/power/port_gen_vr.dm b/code/modules/power/port_gen_vr.dm index 3fa9b2c765..9401bdd227 100644 --- a/code/modules/power/port_gen_vr.dm +++ b/code/modules/power/port_gen_vr.dm @@ -116,7 +116,7 @@ /obj/machinery/power/rtg/examine(mob/user) . = ..() if(Adjacent(user, src) || isobserver(user)) - . += "The status display reads: Power generation now at [power_gen*0.001]kW." + . += span_notice("The status display reads: Power generation now at [power_gen*0.001]kW.") /obj/machinery/power/rtg/attackby(obj/item/I, mob/user, params) if(default_deconstruction_screwdriver(user, I)) @@ -179,8 +179,8 @@ if(going_kaboom) return going_kaboom = TRUE - visible_message("\The [src] lets out an shower of sparks as it starts to lose stability!",\ - "You hear a loud electrical crack!") + visible_message(span_danger("\The [src] lets out an shower of sparks as it starts to lose stability!"),\ + span_italics("You hear a loud electrical crack!")) playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5) tesla_zap(src, 5, power_gen * 0.05) addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(explosion), get_turf(src), 2, 3, 4, 8), 100) // Not a normal explosion. @@ -285,8 +285,8 @@ can_buckle = FALSE /obj/machinery/power/rtg/kugelblitz/proc/asplod() - visible_message("\The [src] lets out an shower of sparks as it starts to lose stability!",\ - "You hear a loud electrical crack!") + visible_message(span_danger("\The [src] lets out an shower of sparks as it starts to lose stability!"),\ + span_italics("You hear a loud electrical crack!")) playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5) var/turf/T = get_turf(src) qdel(src) @@ -339,7 +339,7 @@ /obj/machinery/power/rtg/reg/user_buckle_mob(mob/living/M, mob/user, var/forced = FALSE, var/silent = TRUE) . = ..() M.pixel_y = 8 - M.visible_message("\The [M], hops up onto \the [src] and begins running!") + M.visible_message(span_notice("\The [M], hops up onto \the [src] and begins running!")) /obj/machinery/power/rtg/reg/unbuckle_mob(mob/living/buckled_mob, force = FALSE) . = ..() @@ -380,7 +380,7 @@ /obj/machinery/power/rtg/reg/proc/runner_process(var/mob/living/runner) if(runner.stat != CONSCIOUS) unbuckle_mob(runner) - runner.visible_message("\The [runner], topples off of \the [src]!") + runner.visible_message(span_warning("\The [runner], topples off of \the [src]!")) return var/cool_rotations if(ishuman(runner)) @@ -407,7 +407,7 @@ cool_rotations *= 0.25 else //TOO HUNGY IT TIME TO STOP!!! unbuckle_mob(runner) - runner.visible_message("\The [runner], panting and exhausted hops off of \the [src]!") + runner.visible_message(span_notice("\The [runner], panting and exhausted hops off of \the [src]!")) if(part_mult > 1) cool_rotations += (cool_rotations * (part_mult - 1)) / 4 power_gen = cool_rotations @@ -497,9 +497,9 @@ var/obj/item/stack/addstack = O var/amount = min((max_sheets - sheets), addstack.get_amount()) if(amount < 1) - to_chat(user, "The [src.name] is full!") + to_chat(user, span_warning("The [src.name] is full!")) return - to_chat(user, "You add [amount] sheet\s to the [src.name].") + to_chat(user, span_notice("You add [amount] sheet\s to the [src.name].")) sheets += amount addstack.use(amount) update_icon() diff --git a/code/modules/power/singularity/act.dm b/code/modules/power/singularity/act.dm index 53fe67aaad..7639504f6d 100644 --- a/code/modules/power/singularity/act.dm +++ b/code/modules/power/singularity/act.dm @@ -33,7 +33,7 @@ to_chat(src, "The [S] pulls \the [hand] from your grip!") if(!lying && (!shoes || !(shoes.item_flags & NOSLIP)) && (!species || !(species.flags & NOSLIP)) && prob(current_size*5)) - to_chat(src, "A strong gravitational force slams you to the ground!") + to_chat(src, span_danger("A strong gravitational force slams you to the ground!")) Weaken(current_size) ..() diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index d9c1bf6e83..e73379d5a5 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -93,9 +93,9 @@ investigate_log("turned on by [user.key]","singulo") update_icon() else - to_chat(user, "The controls are locked!") + to_chat(user, span_warning("The controls are locked!")) else - to_chat(user, "\The [src] needs to be firmly secured to the floor first.") + to_chat(user, span_warning("\The [src] needs to be firmly secured to the floor first.")) return 1 @@ -177,7 +177,7 @@ src.anchored = FALSE disconnect_from_network() if(2) - to_chat(user, "\The [src] needs to be unwelded from the floor.") + to_chat(user, span_warning("\The [src] needs to be unwelded from the floor.")) update_icon() // VOREStation Add return @@ -188,7 +188,7 @@ return switch(state) if(0) - to_chat(user, "\The [src] needs to be wrenched to the floor.") + to_chat(user, span_warning("\The [src] needs to be wrenched to the floor.")) if(1) if (WT.remove_fuel(0,user)) playsound(src, WT.usesound, 50, 1) @@ -201,7 +201,7 @@ to_chat(user, "You weld [src] to the floor.") connect_to_network() else - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span_warning("You need more welding fuel to complete this task.")) if(2) if (WT.remove_fuel(0,user)) playsound(src, WT.usesound, 50, 1) @@ -214,39 +214,39 @@ to_chat(user, "You cut [src] free from the floor.") disconnect_from_network() else - to_chat(user, "You need more welding fuel to complete this task.") + to_chat(user, span_warning("You need more welding fuel to complete this task.")) update_icon() // VOREStation Add return if(istype(W, /obj/item/stack/material) && W.get_material_name() == MAT_STEEL) var/amt = CEILING(( initial(integrity) - integrity)/10, 1) if(!amt) - to_chat(user, "\The [src] is already fully repaired.") + to_chat(user, span_notice("\The [src] is already fully repaired.")) return var/obj/item/stack/P = W if(!P.can_use(amt)) - to_chat(user, "You don't have enough sheets to repair this! You need at least [amt] sheets.") + to_chat(user, span_warning("You don't have enough sheets to repair this! You need at least [amt] sheets.")) return - to_chat(user, "You begin repairing \the [src]...") + to_chat(user, span_notice("You begin repairing \the [src]...")) if(do_after(user, 30)) if(P.use(amt)) - to_chat(user, "You have repaired \the [src].") + to_chat(user, span_notice("You have repaired \the [src].")) integrity = initial(integrity) return else - to_chat(user, "You don't have enough sheets to repair this! You need at least [amt] sheets.") + to_chat(user, span_warning("You don't have enough sheets to repair this! You need at least [amt] sheets.")) return if(istype(W, /obj/item/card/id) || istype(W, /obj/item/pda)) if(emagged) - to_chat(user, "The lock seems to be broken.") + to_chat(user, span_warning("The lock seems to be broken.")) return if(src.allowed(user)) src.locked = !src.locked to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]") update_icon() // VOREStation Add else - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) return ..() return @@ -255,7 +255,7 @@ if(!emagged) locked = 0 emagged = 1 - user.visible_message("[user.name] emags [src].","You short out the lock.") + user.visible_message("[user.name] emags [src].",span_warning("You short out the lock.")) return 1 /obj/machinery/power/emitter/bullet_act(var/obj/item/projectile/P) @@ -271,10 +271,10 @@ integrity = between(0, integrity + amount, initial(integrity)) if(integrity == 0) if(powernet && avail(active_power_usage)) // If it's powered, it goes boom if killed. - visible_message(src, "\The [src] explodes violently!", "You hear an explosion!") + visible_message(src, span_danger("\The [src] explodes violently!"), span_danger("You hear an explosion!")) explosion(get_turf(src), 1, 2, 4) else - src.visible_message("\The [src] crumples apart!", "You hear metal collapsing.") + src.visible_message(span_danger("\The [src] crumples apart!"), span_warning("You hear metal collapsing.")) if(src) qdel(src) @@ -282,19 +282,19 @@ . = ..() switch(state) if(0) - . += "It is not secured in place!" + . += span_warning("It is not secured in place!") if(1) - . += "It has been bolted down securely, but not welded into place." + . += span_warning("It has been bolted down securely, but not welded into place.") if(2) - . += "It has been bolted down securely and welded down into place." + . += span_notice("It has been bolted down securely and welded down into place.") var/integrity_percentage = round((integrity / initial(integrity)) * 100) switch(integrity_percentage) if(0 to 30) - . += "It is close to falling apart!" + . += span_danger("It is close to falling apart!") if(31 to 70) - . += "It is damaged." + . += span_danger("It is damaged.") if(77 to 99) - . += "It is slightly damaged." + . += span_warning("It is slightly damaged.") //R-UST port /obj/machinery/power/emitter/proc/get_initial_fire_delay() diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index c77c3b2b17..b4419043c3 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -44,11 +44,11 @@ field_generator power level display . = ..() switch(state) if(0) - . += "It is not secured in place!" + . += span_warning("It is not secured in place!") if(1) - . += "It has been bolted down securely, but not welded into place." + . += span_warning("It has been bolted down securely, but not welded into place.") if(2) - . += "It has been bolted down securely and welded down into place." + . += span_notice("It has been bolted down securely and welded down into place.") /obj/machinery/field_generator/update_icon() cut_overlays() diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm index e95597495b..8dc81c24a6 100644 --- a/code/modules/power/singularity/generator.dm +++ b/code/modules/power/singularity/generator.dm @@ -13,9 +13,9 @@ /obj/machinery/the_singularitygen/examine() . = ..() if(anchored) - . += "It has been securely bolted down and is ready for operation." + . += span_notice("It has been securely bolted down and is ready for operation.") else - . += "It is not secured!" + . += span_warning("It is not secured!") /obj/machinery/the_singularitygen/process() var/turf/T = get_turf(src) @@ -41,12 +41,12 @@ playsound(src, W.usesound, 50, 1) visible_message("\The [user] adjusts \the [src]'s mechanisms.") if(panel_open && do_after(user, 30)) - to_chat(user, "\The [src] looks like it could be modified.") + to_chat(user, span_notice("\The [src] looks like it could be modified.")) if(panel_open && do_after(user, 80 * W.toolspeed)) // We don't have skills, so a delayed hint for engineers will have to do for now. (Panel open check for sanity) playsound(src, W.usesound, 50, 1) - to_chat(user, "\The [src] looks like it could be adapted to forge advanced materials via particle acceleration, somehow..") + to_chat(user, span_cult("\The [src] looks like it could be adapted to forge advanced materials via particle acceleration, somehow..")) else - to_chat(user, "\The [src]'s mechanisms look secure.") + to_chat(user, span_notice("\The [src]'s mechanisms look secure.")) if(istype(W, /obj/item/smes_coil/super_io) && panel_open) visible_message("\The [user] begins to modify \the [src] with \the [W].") if(do_after(user, 300)) diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 99d71c50e6..6b762cc73d 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -202,7 +202,7 @@ /obj/machinery/particle_accelerator/control_box/proc/is_interactive(mob/user) if(!interface_control) - to_chat(user, "ERROR: Request timed out. Check wire contacts.") + to_chat(user, span_alert("ERROR: Request timed out. Check wire contacts.")) return FALSE if(construction_state != 3) return FALSE diff --git a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm index c73ce542ac..d6e6dd2436 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm @@ -42,12 +42,12 @@ /obj/machinery/particle_smasher/examine(mob/user) . = ..() if(Adjacent(user)) - . += "\The [src] contains:" + . += span_notice("\The [src] contains:") for(var/obj/item/I in contents) - . += "\the [I]" + . += span_notice("\the [I]") /obj/machinery/particle_smasher/atmosanalyze(var/mob/user) - return list("\The [src] reads an energy level of [energy].") + return list(span_notice("\The [src] reads an energy level of [energy].")) /obj/machinery/particle_smasher/attackby(obj/item/W as obj, mob/user as mob) if(W.type == /obj/item/analyzer) @@ -55,14 +55,14 @@ else if(istype(W, /obj/item/stack/material)) var/obj/item/stack/material/M = W if(M.uses_charge) - to_chat(user, "You cannot fill \the [src] with a synthesizer!") + to_chat(user, span_notice("You cannot fill \the [src] with a synthesizer!")) return target = M.split(1) target.forceMove(src) update_icon() else if(istype(W, beaker_type)) if(reagent_container) - to_chat(user, "\The [src] already has a container attached.") + to_chat(user, span_notice("\The [src] already has a container attached.")) return if(isrobot(user) && istype(W.loc, /obj/item/gripper)) var/obj/item/gripper/G = W.loc @@ -71,7 +71,7 @@ user.drop_from_inventory(W) reagent_container = W reagent_container.forceMove(src) - to_chat(user, "You add \the [reagent_container] to \the [src].") + to_chat(user, span_notice("You add \the [reagent_container] to \the [src].")) update_icon() return else if(W.has_tool_quality(TOOL_WRENCH)) @@ -88,7 +88,7 @@ update_icon() return else if(istype(W, /obj/item/card/id)) - to_chat(user, "Swiping \the [W] on \the [src] doesn't seem to do anything...") + to_chat(user, span_notice("Swiping \the [W] on \the [src] doesn't seem to do anything...")) return ..() else if(((isrobot(user) && istype(W.loc, /obj/item/gripper)) || (!isrobot(user) && W.canremove)) && storage.len < max_storage) if(isrobot(user) && istype(W.loc, /obj/item/gripper)) @@ -182,7 +182,7 @@ return if(successful_craft) - visible_message("\The [src] fizzles.") + visible_message(span_warning("\The [src] fizzles.")) if(prob(33)) // Why are you blasting it after it's already done! SSradiation.radiate(src, 10 + round(src.energy / 60, 1)) energy = max(0, energy - 30) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 29e2652ef5..3e49965bbb 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -135,7 +135,7 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity) overlays = 0 if(chained) overlays = "chain_s1" - visible_message("The singularity has shrunk to a rather pitiful size.") + visible_message(span_notice("The singularity has shrunk to a rather pitiful size.")) if (STAGE_TWO) //1 to 3 does not check for the turfs if you put the gens right next to a 1x1 then its going to eat them. name = "gravitational singularity" desc = "A gravitational singularity." @@ -153,9 +153,9 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity) if(chained) overlays = "chain_s3" if(growing) - visible_message("The singularity noticeably grows in size.") + visible_message(span_notice("The singularity noticeably grows in size.")) else - visible_message("The singularity has shrunk to a less powerful size.") + visible_message(span_notice("The singularity has shrunk to a less powerful size.")) if (STAGE_THREE) if ((check_turfs_in(1, 2)) && (check_turfs_in(2, 2)) && (check_turfs_in(4, 2)) && (check_turfs_in(8, 2))) name = "gravitational singularity" @@ -174,9 +174,9 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity) if(chained) overlays = "chain_s5" if(growing) - visible_message("The singularity expands to a reasonable size.") + visible_message(span_notice("The singularity expands to a reasonable size.")) else - visible_message("The singularity has returned to a safe size.") + visible_message(span_notice("The singularity has returned to a safe size.")) if(STAGE_FOUR) if ((check_turfs_in(1, 3)) && (check_turfs_in(2, 3)) && (check_turfs_in(4, 3)) && (check_turfs_in(8, 3))) name = "gravitational singularity" @@ -195,9 +195,9 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity) if(chained) overlays = "chain_s7" if(growing) - visible_message("The singularity expands to a dangerous size.") + visible_message(span_warning("The singularity expands to a dangerous size.")) else - visible_message("Miraculously, the singularity reduces in size, and can be contained.") + visible_message(span_notice("Miraculously, the singularity reduces in size, and can be contained.")) if(STAGE_FIVE) //This one also lacks a check for gens because it eats everything. name = "gravitational singularity" desc = "A gravitational singularity." @@ -213,9 +213,9 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity) if(chained) overlays = "chain_s9" if(growing) - visible_message("The singularity has grown out of control!") + visible_message(span_danger("The singularity has grown out of control!")) else - visible_message("The singularity miraculously reduces in size and loses its supermatter properties.") + visible_message(span_warning("The singularity miraculously reduces in size and loses its supermatter properties.")) if(STAGE_SUPER)//SUPERSINGULO name = "super gravitational singularity" desc = "A gravitational singularity with the properties of supermatter. It has the power to destroy worlds." @@ -230,7 +230,7 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity) event_chance = 25 //Events will fire off more often. if(chained) overlays = "chain_s9" - visible_message("You witness the creation of a destructive force that cannot possibly be stopped by human hands.") + visible_message(span_sinister("You witness the creation of a destructive force that cannot possibly be stopped by human hands.")) if (current_size == allowed_size) investigate_log("grew to size [current_size].", I_SINGULO) @@ -431,10 +431,10 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity) return else to_chat(H, "You look directly into The [src.name], but your eyewear does absolutely nothing to protect you from it!") - to_chat(M, "You look directly into The [src.name] and feel [current_size == STAGE_SUPER ? "helpless" : "weak"].") + to_chat(M, span_danger("You look directly into The [src.name] and feel [current_size == STAGE_SUPER ? "helpless" : "weak"].")) M.apply_effect(3, STUN) for(var/mob/O in viewers(M, null)) - O.show_message(text("[] stares blankly at The []!", M, src), 1) + O.show_message(span_danger("[M] stares blankly at The [src]!"), 1) /obj/singularity/proc/emp_area() if(current_size != STAGE_SUPER) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 4fb610ff32..5ab784135b 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -220,7 +220,7 @@ GLOBAL_LIST_EMPTY(smeses) //Will return 1 on failure /obj/machinery/power/smes/proc/make_terminal(const/mob/user) if (user.loc == loc) - to_chat(user, "You must not be on the same tile as the [src].") + to_chat(user, span_filter_notice(span_warning("You must not be on the same tile as the [src]."))) return 1 //Direction the terminal will face to @@ -232,15 +232,15 @@ GLOBAL_LIST_EMPTY(smeses) tempDir = WEST var/turf/tempLoc = get_step(src, reverse_direction(tempDir)) if (istype(tempLoc, /turf/space)) - to_chat(user, "You can't build a terminal on space.") + to_chat(user, span_filter_notice(span_warning("You can't build a terminal on space."))) return 1 else if (istype(tempLoc)) if(!tempLoc.is_plating()) - to_chat(user, "You must remove the floor plating first.") + to_chat(user, span_filter_notice(span_warning("You must remove the floor plating first."))) return 1 if(check_terminal_exists(tempLoc, user, tempDir)) return 1 - to_chat(user, "You start adding cable to the [src].") + to_chat(user, span_filter_notice(span_notice("You start adding cable to the [src]."))) if(do_after(user, 50)) if(check_terminal_exists(tempLoc, user, tempDir)) return 1 @@ -255,7 +255,7 @@ GLOBAL_LIST_EMPTY(smeses) /obj/machinery/power/smes/proc/check_terminal_exists(var/turf/location, var/mob/user, var/direction) for(var/obj/machinery/power/terminal/term in location) if(term.dir == direction) - to_chat(user, "There is already a terminal here.") + to_chat(user, span_filter_notice(span_notice("There is already a terminal here."))) return 1 return 0 @@ -284,26 +284,26 @@ GLOBAL_LIST_EMPTY(smeses) return FALSE if (!panel_open) - to_chat(user, "You need to open access hatch on [src] first!") + to_chat(user, span_filter_notice(span_warning("You need to open access hatch on [src] first!"))) return FALSE if(W.has_tool_quality(TOOL_WELDER)) var/obj/item/weldingtool/WT = W.get_welder() if(!WT.isOn()) - to_chat(user, "Turn on \the [WT] first!") + to_chat(user, span_filter_notice("Turn on \the [WT] first!")) return FALSE if(!damage) - to_chat(user, "\The [src] is already fully repaired.") + to_chat(user, span_filter_notice("\The [src] is already fully repaired.")) return FALSE if(WT.remove_fuel(0,user) && do_after(user, damage, src)) - to_chat(user, "You repair all structural damage to \the [src]") + to_chat(user, span_filter_notice("You repair all structural damage to \the [src]")) damage = 0 return FALSE else if(istype(W, /obj/item/stack/cable_coil) && !building_terminal) building_terminal = 1 var/obj/item/stack/cable_coil/CC = W if (CC.get_amount() < 10) - to_chat(user, "You need more cables.") + to_chat(user, span_filter_notice(span_warning("You need more cables."))) building_terminal = 0 return FALSE if (make_terminal(user)) @@ -312,8 +312,8 @@ GLOBAL_LIST_EMPTY(smeses) building_terminal = 0 CC.use(10) user.visible_message(\ - "[user.name] has added cables to the [src].",\ - "You added cables to the [src].") + span_filter_notice(span_notice("[user.name] has added cables to the [src].")),\ + span_filter_notice(span_notice("You added cables to the [src]."))) stat = 0 if(!powernet) connect_to_network() @@ -327,15 +327,15 @@ GLOBAL_LIST_EMPTY(smeses) term = T break if(!term) - to_chat(user, "There is no terminal on this tile.") + to_chat(user, span_filter_notice(span_warning("There is no terminal on this tile."))) building_terminal = FALSE return FALSE var/turf/tempTDir = get_turf(term) if (istype(tempTDir)) if(!tempTDir.is_plating()) - to_chat(user, "You must remove the floor plating first.") + to_chat(user, span_filter_notice(span_warning("You must remove the floor plating first."))) else - to_chat(user, "You begin to cut the cables...") + to_chat(user, span_filter_notice(span_notice("You begin to cut the cables..."))) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 50 * W.toolspeed)) if (prob(50) && electrocute_mob(usr, term.powernet, term)) @@ -347,8 +347,8 @@ GLOBAL_LIST_EMPTY(smeses) return FALSE new /obj/item/stack/cable_coil(loc,10) user.visible_message(\ - "[user.name] cut the cables and dismantled the power terminal.",\ - "You cut the cables and dismantle the power terminal.") + span_filter_notice(span_notice("[user.name] cut the cables and dismantled the power terminal.")),\ + span_filter_notice(span_notice("You cut the cables and dismantle the power terminal."))) terminals -= term qdel(term) building_terminal = FALSE @@ -438,7 +438,7 @@ GLOBAL_LIST_EMPTY(smeses) amount = max(0, round(amount)) damage += amount if(damage > maxdamage) - visible_message("\The [src] explodes in large shower of sparks and smoke!") + visible_message(span_filter_notice(span_danger("\The [src] explodes in large shower of sparks and smoke!"))) // Depending on stored charge percentage cause damage. switch(Percentage()) if(75 to INFINITY) @@ -470,19 +470,19 @@ GLOBAL_LIST_EMPTY(smeses) /obj/machinery/power/smes/examine(var/mob/user) . = ..() - . += "The service hatch is [panel_open ? "open" : "closed"]." + . += span_filter_notice("The service hatch is [panel_open ? "open" : "closed"].") if(!damage) return var/damage_percentage = round((damage / maxdamage) * 100) switch(damage_percentage) if(75 to INFINITY) - . += "It's casing is severely damaged, and sparking circuitry may be seen through the holes!" + . += span_filter_notice(span_danger("It's casing is severely damaged, and sparking circuitry may be seen through the holes!")) if(50 to 74) - . += "It's casing is considerably damaged, and some of the internal circuits appear to be exposed!" + . += span_filter_notice(span_notice("It's casing is considerably damaged, and some of the internal circuits appear to be exposed!")) if(25 to 49) - . += "It's casing is quite seriously damaged." + . += span_filter_notice(span_notice("It's casing is quite seriously damaged.")) if(0 to 24) - . += "It's casing has some minor damage." + . += span_filter_notice("It's casing has some minor damage.") // Proc: toggle_input() diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index 4909e3eef1..c2f10b7e2a 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -113,7 +113,7 @@ if(RCon) ..() else // RCON wire cut - to_chat(usr, "Connection error: Destination Unreachable.") + to_chat(usr, span_warning("Connection error: Destination Unreachable.")) // Cyborgs standing next to the SMES can play with the wiring. if(istype(usr, /mob/living/silicon/robot) && Adjacent(usr) && panel_open) @@ -303,7 +303,7 @@ /obj/machinery/power/smes/buildable/attackby(var/obj/item/W as obj, var/mob/user as mob) // No more disassembling of overloaded SMESs. You broke it, now enjoy the consequences. if (failing) - to_chat(user, "The [src]'s indicator lights are flashing wildly. It seems to be overloaded! Touching it now is probably not a good idea.") + to_chat(user, span_warning("The [src]'s indicator lights are flashing wildly. It seems to be overloaded! Touching it now is probably not a good idea.")) return // If parent returned 1: // - Hatch is open, so we can modify the SMES @@ -316,15 +316,15 @@ newtag = sanitize(newtag,MAX_NAME_LEN) if(newtag) RCon_tag = newtag - to_chat(user, "You changed the RCON tag to: [newtag]") + to_chat(user, span_notice("You changed the RCON tag to: [newtag]")) return // Charged above 1% and safeties are enabled. if((charge > (capacity/100)) && safeties_enabled) - to_chat(user, "The safety circuit of [src] is preventing modifications while there is charge stored!") + to_chat(user, span_warning("The safety circuit of [src] is preventing modifications while there is charge stored!")) return if (output_attempt || input_attempt) - to_chat(user, "Turn off the [src] first!") + to_chat(user, span_warning("Turn off the [src] first!")) return // Probability of failure if safety circuit is disabled (in %) @@ -337,11 +337,11 @@ // Crowbar - Disassemble the SMES. if(W.has_tool_quality(TOOL_CROWBAR)) if (terminals.len) - to_chat(user, "You have to disassemble the terminal first!") + to_chat(user, span_warning("You have to disassemble the terminal first!")) return playsound(src, W.usesound, 50, 1) - to_chat(user, "You begin to disassemble the [src]!") + to_chat(user, span_warning("You begin to disassemble the [src]!")) if (do_after(usr, (100 * cur_coils) * W.toolspeed)) // More coils = takes longer to disassemble. It's complex so largest one with 5 coils will take 50s with a normal crowbar if (failure_probability && prob(failure_probability)) diff --git a/code/modules/power/smes_vr.dm b/code/modules/power/smes_vr.dm index f5f6f4afa5..4d90a87fd7 100644 --- a/code/modules/power/smes_vr.dm +++ b/code/modules/power/smes_vr.dm @@ -7,7 +7,7 @@ /obj/machinery/power/smes/buildable/hybrid/attackby(var/obj/item/W as obj, var/mob/user as mob) if(W.has_tool_quality(TOOL_SCREWDRIVER) || W.has_tool_quality(TOOL_WIRECUTTER)) - to_chat(user,"\The [src] full of weird alien technology that's best not messed with.") + to_chat(user,span_warning("\The [src] full of weird alien technology that's best not messed with.")) return 0 /obj/machinery/power/smes/buildable/hybrid/update_icon() @@ -33,4 +33,4 @@ charge += min(recharge_rate, capacity - charge) ..() -//hey travis wake up \ No newline at end of file +//hey travis wake up diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 10efdc071d..8f8dae624d 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -60,13 +60,13 @@ GLOBAL_LIST_EMPTY(solars_list) if(W.has_tool_quality(TOOL_CROWBAR)) playsound(src, 'sound/machines/click.ogg', 50, 1) - user.visible_message("[user] begins to take the glass off the solar panel.") + user.visible_message(span_notice("[user] begins to take the glass off the solar panel.")) if(do_after(user, 50)) var/obj/item/solar_assembly/S = new(loc) S.anchored = TRUE new glass_type(loc, 2) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - user.visible_message("[user] takes the glass off the solar panel.") + user.visible_message(span_notice("[user] takes the glass off the solar panel.")) qdel(src) return else if (W) @@ -209,13 +209,13 @@ GLOBAL_LIST_EMPTY(solars_list) if(!anchored) if(W.has_tool_quality(TOOL_WRENCH)) anchored = TRUE - user.visible_message("[user] wrenches the solar assembly into place.") + user.visible_message(span_notice("[user] wrenches the solar assembly into place.")) playsound(src, W.usesound, 75, 1) return 1 else if(W.has_tool_quality(TOOL_WRENCH)) anchored = FALSE - user.visible_message("[user] unwrenches the solar assembly from it's place.") + user.visible_message(span_notice("[user] unwrenches the solar assembly from it's place.")) playsound(src, W.usesound, 75, 1) return 1 @@ -223,14 +223,14 @@ GLOBAL_LIST_EMPTY(solars_list) var/obj/item/stack/material/S = W if(S.use(2)) playsound(src, 'sound/machines/click.ogg', 50, 1) - user.visible_message("[user] places the glass on the solar assembly.") + user.visible_message(span_notice("[user] places the glass on the solar assembly.")) if(tracker) new /obj/machinery/power/tracker(get_turf(src), W.type) else new /obj/machinery/power/solar(get_turf(src), W.type) qdel(src) else - to_chat(user, "You need two sheets of glass to put them into a solar panel.") + to_chat(user, span_warning("You need two sheets of glass to put them into a solar panel.")) return return 1 @@ -239,13 +239,13 @@ GLOBAL_LIST_EMPTY(solars_list) tracker = 1 user.drop_item() qdel(W) - user.visible_message("[user] inserts the electronics into the solar assembly.") + user.visible_message(span_notice("[user] inserts the electronics into the solar assembly.")) return 1 else if(W.has_tool_quality(TOOL_CROWBAR)) new /obj/item/tracker_electronics(src.loc) tracker = 0 - user.visible_message("[user] takes out the electronics from the solar assembly.") + user.visible_message(span_notice("[user] takes out the electronics from the solar assembly.")) return 1 ..() diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 50dc4933ed..e60ce8b08d 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -188,7 +188,7 @@ continue mob.Weaken(DETONATION_MOB_CONCUSSION) - to_chat(mob, "An invisible force slams you against the ground!") + to_chat(mob, span_danger("An invisible force slams you against the ground!")) // Effect 2: Z-level wide electrical pulse for(var/obj/machinery/power/apc/A in GLOB.apcs) diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index e12372c299..e2b586d294 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -25,9 +25,9 @@ /obj/machinery/power/tesla_coil/examine() . = ..() if(anchored) - . += "It has been securely bolted down and is ready for operation." + . += span_notice("It has been securely bolted down and is ready for operation.") else - . += "It is not secured!" + . += span_warning("It is not secured!") /obj/machinery/power/tesla_coil/New() ..() @@ -240,9 +240,9 @@ /obj/machinery/power/grounding_rod/examine() . = ..() if(anchored) - . += "It has been securely bolted down and is ready for operation." + . += span_notice("It has been securely bolted down and is ready for operation.") else - . += "It is not secured!" + . += span_warning("It is not secured!") /obj/machinery/power/grounding_rod/pre_mapped anchored = TRUE diff --git a/code/modules/power/tesla/tesla_act.dm b/code/modules/power/tesla/tesla_act.dm index 8111d1e4d1..ede7a52a75 100644 --- a/code/modules/power/tesla/tesla_act.dm +++ b/code/modules/power/tesla/tesla_act.dm @@ -52,7 +52,7 @@ /obj/structure/closet/tesla_act(var/power) ..() //extend the zap - visible_message("[src] is blown apart by the bolt of electricity!", "You hear a metallic screeching sound.") + visible_message(span_danger("[src] is blown apart by the bolt of electricity!"), span_danger("You hear a metallic screeching sound.")) dump_contents() qdel(src) diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 7c773b2ab3..bc29919636 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -55,14 +55,14 @@ if(W.has_tool_quality(TOOL_CROWBAR)) playsound(src, 'sound/machines/click.ogg', 50, 1) - user.visible_message("[user] begins to take the glass off the solar tracker.") + user.visible_message(span_notice("[user] begins to take the glass off the solar tracker.")) if(do_after(user, 50)) var/obj/item/solar_assembly/S = new(loc) S.tracker = TRUE S.anchored = TRUE new glass_type(loc, 2) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - user.visible_message("[user] takes the glass off the tracker.") + user.visible_message(span_notice("[user] takes the glass off the tracker.")) qdel(src) return ..() diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index d7d61a3ad1..f4053d2b2b 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -138,10 +138,10 @@ inturf = get_step(src, dir) locate_machinery() if(turbine) - to_chat(user, "Turbine connected.") + to_chat(user, span_notice("Turbine connected.")) stat &= ~BROKEN else - to_chat(user, "Turbine not connected.") + to_chat(user, span_alert("Turbine not connected.")) stat |= BROKEN /obj/machinery/compressor/process() @@ -236,10 +236,10 @@ outturf = get_step(src, dir) locate_machinery() if(compressor) - to_chat(user, "Compressor connected.") + to_chat(user, span_notice("Compressor connected.")) stat &= ~BROKEN else - to_chat(user, "Compressor not connected.") + to_chat(user, span_alert("Compressor not connected.")) stat |= BROKEN /obj/machinery/power/turbine/process() diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 9d845c1eb8..1e854ae0c9 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -59,7 +59,7 @@ break if(box.caliber == bullet.caliber && bullet.BB) if (boolets < 1) - to_chat(user, "You start collecting shells.") // Say it here so it doesn't get said if we don't find anything useful. + to_chat(user, span_notice("You start collecting shells.")) // Say it here so it doesn't get said if we don't find anything useful. if(do_after(user,5,box)) if(box.stored_ammo.len >= box.max_ammo) // Double check because these can change during the wait. break @@ -73,9 +73,9 @@ break if(boolets > 0) - to_chat(user, "You collect [boolets] shell\s. [box] now contains [box.stored_ammo.len] shell\s.") + to_chat(user, span_notice("You collect [boolets] shell\s. [box] now contains [box.stored_ammo.len] shell\s.")) else - to_chat(user, "You fail to collect anything!") + to_chat(user, span_warning("You fail to collect anything!")) box.reloading = FALSE else return ..() @@ -139,10 +139,10 @@ if(istype(W, /obj/item/ammo_casing)) var/obj/item/ammo_casing/C = W if(C.caliber != caliber) - to_chat(user, "[C] does not fit into [src].") + to_chat(user, span_warning("[C] does not fit into [src].")) return if(stored_ammo.len >= max_ammo) - to_chat(user, "[src] is full!") + to_chat(user, span_warning("[src] is full!")) return user.remove_from_mob(C) C.forceMove(src) @@ -151,13 +151,13 @@ if(istype(W, /obj/item/ammo_magazine/clip)) var/obj/item/ammo_magazine/clip/L = W if(L.caliber != caliber) - to_chat(user, "The ammo in [L] does not fit into [src].") + to_chat(user, span_warning("The ammo in [L] does not fit into [src].")) return if(!L.stored_ammo.len) - to_chat(user, "There's no more ammo [L]!") + to_chat(user, span_warning("There's no more ammo [L]!")) return if(stored_ammo.len >= max_ammo) - to_chat(user, "[src] is full!") + to_chat(user, span_warning("[src] is full!")) return var/obj/item/ammo_casing/AC = L.stored_ammo[1] //select the next casing. L.stored_ammo -= AC //Remove this casing from loaded list of the clip. @@ -171,9 +171,9 @@ /obj/item/ammo_magazine/attack_self(mob/user) if(can_remove_ammo) if(!stored_ammo.len) - to_chat(user, "[src] is already empty!") + to_chat(user, span_notice("[src] is already empty!")) return - to_chat(user, "You empty [src].") + to_chat(user, span_notice("You empty [src].")) playsound(src, "casing_sound", 50, 1) spawn(7) playsound(src, "casing_sound", 50, 1) @@ -185,7 +185,7 @@ stored_ammo.Cut() update_icon() else - to_chat(user, "\The [src] is not designed to be unloaded.") + to_chat(user, span_notice("\The [src] is not designed to be unloaded.")) return // This puts one bullet from the magazine into your hand @@ -196,7 +196,7 @@ var/obj/item/ammo_casing/C = stored_ammo[stored_ammo.len] stored_ammo-=C user.put_in_hands(C) - user.visible_message("\The [user] removes \a [C] from [src].", "You remove \a [C] from [src].") + user.visible_message("\The [user] removes \a [C] from [src].", span_notice("You remove \a [C] from [src].")) update_icon() return ..() @@ -268,7 +268,7 @@ var/obj/item/ammo_casing/C = stored_ammo[stored_ammo.len] stored_ammo-=C user.put_in_hands(C) - user.visible_message("\The [user] removes \a [C] from [src].", "You remove \a [C] from [src].") + user.visible_message("\The [user] removes \a [C] from [src].", span_notice("You remove \a [C] from [src].")) update_icon() return ..() @@ -276,4 +276,4 @@ /obj/item/ammo_magazine/ammo_box/examine(mob/user) . = ..() - . += to_chat(usr, "Alt-click to extract contents.") + . += to_chat(usr, span_notice("Alt-click to extract contents.")) diff --git a/code/modules/projectiles/ammunition/smartmag.dm b/code/modules/projectiles/ammunition/smartmag.dm index 390e2949b7..5c412b0c62 100644 --- a/code/modules/projectiles/ammunition/smartmag.dm +++ b/code/modules/projectiles/ammunition/smartmag.dm @@ -53,9 +53,9 @@ . = ..() if(attached_cell) - . += "\The [src] is loaded with a [attached_cell.name]. It is [round(attached_cell.percent())]% charged." + . += span_notice("\The [src] is loaded with a [attached_cell.name]. It is [round(attached_cell.percent())]% charged.") else - . += "\The [src] does not appear to have a power source installed." + . += span_warning("\The [src] does not appear to have a power source installed.") /obj/item/ammo_magazine/smart/update_icon() if(attached_cell) @@ -66,7 +66,7 @@ // Emagging lets you remove bullets from your bullet-making magazine /obj/item/ammo_magazine/smart/emag_act(var/remaining_charges, var/mob/user) if(!emagged) - to_chat(user, "You overload \the [src]'s security measures causing widespread destabilisation. It is likely you could empty \the [src] now.") + to_chat(user, span_notice("You overload \the [src]'s security measures causing widespread destabilisation. It is likely you could empty \the [src] now.")) emagged = TRUE can_remove_ammo = TRUE return TRUE @@ -75,7 +75,7 @@ /obj/item/ammo_magazine/smart/attackby(var/obj/item/I as obj, mob/user) if(istype(I, /obj/item/cell/device)) if(attached_cell) - to_chat(user, "\The [src] already has a [attached_cell.name] attached.") + to_chat(user, span_notice("\The [src] already has a [attached_cell.name] attached.")) return else to_chat(user, "You begin inserting \the [I] into \the [src].") @@ -182,7 +182,7 @@ msg += "ammunition type." if(change) - to_chat(user, "[msg]") + to_chat(user, span_notice("[msg]")) caliber = new_caliber ammo_type = new_ammo_type set_production_cost(ammo_type) // Update our cost @@ -214,13 +214,13 @@ return if(LAZYLEN(stored_ammo)) - to_chat(usr, "You can't reset \the [src] unless it's empty!") + to_chat(usr, span_warning("You can't reset \the [src] unless it's empty!")) return - to_chat(usr, "You clear \the [src]'s data buffers.") + to_chat(usr, span_notice("You clear \the [src]'s data buffers.")) caliber = null ammo_type = null production_cost = null - return \ No newline at end of file + return diff --git a/code/modules/projectiles/broken.dm b/code/modules/projectiles/broken.dm index 0c7e23feb4..6d90e68fef 100644 --- a/code/modules/projectiles/broken.dm +++ b/code/modules/projectiles/broken.dm @@ -27,10 +27,10 @@ . = ..() spawn() if(get_dist(get_turf(user),get_turf(src)) <= 1) - to_chat(user, "You begin inspecting \the [src].") + to_chat(user, span_notice("You begin inspecting \the [src].")) if(do_after(user, 5 SECONDS)) - to_chat(user, "\The [src] can possibly be restored with:") + to_chat(user, span_notice("\The [src] can possibly be restored with:")) for(var/obj/item/res as anything in material_needs) if(material_needs[res] > 0) var/res_name = "" @@ -43,7 +43,7 @@ res_name = "[mat.use_name] [mat.sheet_singular_name]" else res_name = initial(res.name) - to_chat(user, "- x [material_needs[res]] [res_name]") + to_chat(user, span_notice("- x [material_needs[res]] [res_name]")) /obj/item/broken_gun/proc/setup_gun(var/obj/item/gun/path) if(ispath(path)) @@ -105,7 +105,7 @@ if(S.can_use(material_needs[path])) return TRUE else - to_chat(user, "You do not have enough [path] to continue repairs.") + to_chat(user, span_notice("You do not have enough [path] to continue repairs.")) else return TRUE @@ -120,11 +120,11 @@ if(S.can_use(material_needs[path])) S.use(material_needs[path]) material_needs[path] = 0 - to_chat(user, "You repair some damage on \the [src] with \the [S].") + to_chat(user, span_notice("You repair some damage on \the [src] with \the [S].")) else material_needs[path] = max(0, material_needs[path] - 1) user.drop_from_inventory(I) - to_chat(user, "You repair some damage on \the [src] with \the [I].") + to_chat(user, span_notice("You repair some damage on \the [src] with \the [I].")) qdel(I) check_complete_repair(user) @@ -141,5 +141,5 @@ if(fully_repaired) my_guntype = new my_guntype(get_turf(src)) my_guntype.name = "[pick("salvaged", "repaired", "old")] [initial(my_guntype.name)]" - to_chat(user, "You finish your repairs on \the [my_guntype].") + to_chat(user, span_notice("You finish your repairs on \the [my_guntype].")) qdel(src) diff --git a/code/modules/projectiles/dnalocking.dm b/code/modules/projectiles/dnalocking.dm index fb81b25cb2..c4527f28b4 100644 --- a/code/modules/projectiles/dnalocking.dm +++ b/code/modules/projectiles/dnalocking.dm @@ -18,17 +18,17 @@ if(!attached_lock.controller_lock) if(!attached_lock.stored_dna && !(M.dna in attached_lock.stored_dna)) - to_chat(M, "\The [src] buzzes and displays a symbol showing the gun already contains your DNA.") + to_chat(M, span_warning("\The [src] buzzes and displays a symbol showing the gun already contains your DNA.")) return 0 else attached_lock.stored_dna += M.dna - to_chat(M, "\The [src] pings and a needle flicks out from the grip, taking a DNA sample from you.") + to_chat(M, span_notice("\The [src] pings and a needle flicks out from the grip, taking a DNA sample from you.")) if(!attached_lock.controller_dna) attached_lock.controller_dna = M.dna - to_chat(M, "\The [src] processes the dna sample and pings, acknowledging you as the primary controller.") + to_chat(M, span_notice("\The [src] processes the dna sample and pings, acknowledging you as the primary controller.")) return 1 else - to_chat(M, "\The [src] buzzes and displays a locked symbol. It is not allowing DNA samples at this time.") + to_chat(M, span_warning("\The [src] buzzes and displays a locked symbol. It is not allowing DNA samples at this time.")) return 0 /obj/item/gun/verb/give_dna() @@ -41,19 +41,19 @@ var/mob/living/M = user if(!attached_lock.controller_lock) if(!authorized_user(M)) - to_chat(M, "\The [src] buzzes and displays an invalid user symbol.") + to_chat(M, span_warning("\The [src] buzzes and displays an invalid user symbol.")) return 0 else attached_lock.stored_dna -= user.dna - to_chat(M, "\The [src] beeps and clears the DNA it has stored.") + to_chat(M, span_notice("\The [src] beeps and clears the DNA it has stored.")) if(M.dna == attached_lock.controller_dna) attached_lock.controller_dna = null - to_chat(M, "\The [src] beeps and removes you as the primary controller.") + to_chat(M, span_notice("\The [src] beeps and removes you as the primary controller.")) if(attached_lock.controller_lock) attached_lock.controller_lock = 0 return 1 else - to_chat(M, "\The [src] buzzes and displays a locked symbol. It is not allowing DNA modifcation at this time.") + to_chat(M, span_warning("\The [src] buzzes and displays a locked symbol. It is not allowing DNA modifcation at this time.")) return 0 /obj/item/gun/verb/remove_dna() @@ -67,12 +67,12 @@ if(authorized_user(M) && user.dna == attached_lock.controller_dna) if(!attached_lock.controller_lock) attached_lock.controller_lock = 1 - to_chat(M, "\The [src] beeps and displays a locked symbol, informing you it will no longer allow DNA samples.") + to_chat(M, span_notice("\The [src] beeps and displays a locked symbol, informing you it will no longer allow DNA samples.")) else attached_lock.controller_lock = 0 - to_chat(M, "\The [src] beeps and displays an unlocked symbol, informing you it will now allow DNA samples.") + to_chat(M, span_notice("\The [src] beeps and displays an unlocked symbol, informing you it will now allow DNA samples.")) else - to_chat(M, "\The [src] buzzes and displays an invalid user symbol.") + to_chat(M, span_warning("\The [src] buzzes and displays an invalid user symbol.")) /obj/item/gun/verb/allow_dna() set name = "Toggle DNA Samples Allowance" @@ -85,4 +85,4 @@ return 1 if(!(user.dna in attached_lock.stored_dna)) return 0 - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 0c1e3e6133..9d0985e0dc 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -184,12 +184,12 @@ if(dna_lock && attached_lock.stored_dna) if(!authorized_user(user)) if(attached_lock.safety_level == 0) - to_chat(M, "\The [src] buzzes in dissapointment and displays an invalid DNA symbol.") + to_chat(M, span_danger("\The [src] buzzes in dissapointment and displays an invalid DNA symbol.")) return 0 if(!attached_lock.exploding) if(attached_lock.safety_level == 1) - to_chat(M, "\The [src] hisses in dissapointment.") - visible_message("\The [src] announces, \"Self-destruct occurring in ten seconds.\"", "\The [src] announces, \"Self-destruct occurring in ten seconds.\"") + to_chat(M, span_danger("\The [src] hisses in dissapointment.")) + visible_message(span_game(span_say("\The [src] announces, \"Self-destruct occurring in ten seconds.\"")), span_game(span_say("\The [src] announces, \"Self-destruct occurring in ten seconds.\""))) attached_lock.exploding = 1 spawn(100) explosion(src, 0, 0, 3, 4) @@ -197,7 +197,7 @@ qdel(src) return 0 if(HULK in M.mutations) - to_chat(M, "Your fingers are much too large for the trigger guard!") + to_chat(M, span_danger("Your fingers are much too large for the trigger guard!")) return 0 if((CLUMSY in M.mutations) && prob(40)) //Clumsy handling var/obj/P = consume_next_projectile() @@ -206,8 +206,8 @@ handle_post_fire(user, user) var/datum/gender/TU = gender_datums[user.get_visible_gender()] user.visible_message( - "\The [user] shoots [TU.himself] in the foot with \the [src]!", - "You shoot yourself in the foot with \the [src]!" + span_danger("\The [user] shoots [TU.himself] in the foot with \the [src]!"), + span_danger("You shoot yourself in the foot with \the [src]!") ) M.drop_item() else @@ -230,7 +230,7 @@ return if(user && user.a_intent == I_HELP && user.client?.prefs?.read_preference(/datum/preference/toggle/safefiring)) //regardless of what happens, refuse to shoot if help intent is on - to_chat(user, "You refrain from firing your [src] as your intent is set to help.") + to_chat(user, span_warning("You refrain from firing your [src] as your intent is set to help.")) return else @@ -245,12 +245,12 @@ if(auto_target)//If they already have one then update it auto_target.loc = get_turf(A) auto_target.delay_del = 1//And reset the del so its like they got a new one and doesnt instantly vanish - to_chat(user, "You ready \the [src]! Click and drag the target around to shoot.") + to_chat(user, span_notice("You ready \the [src]! Click and drag the target around to shoot.")) else//Otherwise just make a new one auto_target = new/obj/screen/auto_target(get_turf(A), src) - visible_message("\The [user] readies the [src]!") + visible_message(span_danger("\The [user] readies the [src]!")) playsound(src, 'sound/weapons/TargetOn.ogg', 50, 1) - to_chat(user, "You ready \the [src]! Click and drag the target around to shoot.") + to_chat(user, span_notice("You ready \the [src]! Click and drag the target around to shoot.")) return Fire(A,user,params) //Otherwise, fire normally. */ @@ -270,9 +270,9 @@ /obj/item/gun/attackby(var/obj/item/A as obj, mob/user as mob) if(istype(A, /obj/item/dnalockingchip)) if(dna_lock) - to_chat(user, "\The [src] already has a [attached_lock].") + to_chat(user, span_notice("\The [src] already has a [attached_lock].")) return - to_chat(user, "You insert \the [A] into \the [src].") + to_chat(user, span_notice("You insert \the [A] into \the [src].")) user.drop_item() A.loc = src attached_lock = A @@ -284,10 +284,10 @@ if(A.has_tool_quality(TOOL_SCREWDRIVER)) if(dna_lock && attached_lock && !attached_lock.controller_lock) - to_chat(user, "You begin removing \the [attached_lock] from \the [src].") + to_chat(user, span_notice("You begin removing \the [attached_lock] from \the [src].")) playsound(src, A.usesound, 50, 1) if(do_after(user, 25 * A.toolspeed)) - to_chat(user, "You remove \the [attached_lock] from \the [src].") + to_chat(user, span_notice("You remove \the [attached_lock] from \the [src].")) user.put_in_hands(attached_lock) dna_lock = 0 attached_lock = null @@ -295,12 +295,12 @@ verbs -= /obj/item/gun/verb/give_dna verbs -= /obj/item/gun/verb/allow_dna else - to_chat(user, "\The [src] is not accepting modifications at this time.") + to_chat(user, span_warning("\The [src] is not accepting modifications at this time.")) ..() /obj/item/gun/emag_act(var/remaining_charges, var/mob/user) if(dna_lock && attached_lock.controller_lock) - to_chat(user, "You short circuit the internal locking mechanisms of \the [src]!") + to_chat(user, span_notice("You short circuit the internal locking mechanisms of \the [src]!")) attached_lock.controller_dna = null attached_lock.controller_lock = 0 attached_lock.stored_dna = list() @@ -351,7 +351,7 @@ if(world.time < next_fire_time) if (world.time % 3) //to prevent spam - to_chat(user, "[src] is not ready to fire again!") + to_chat(user, span_warning("[src] is not ready to fire again!")) return var/shoot_time = (burst - 1)* burst_delay @@ -421,7 +421,7 @@ // We do this down here, so we don't get the message if we fire an empty gun. if(user.item_is_in_hands(src) && user.hands_are_full()) if(one_handed_penalty >= 20) - to_chat(user, "You struggle to keep \the [src] pointed at the correct position with just one hand!") + to_chat(user, span_warning("You struggle to keep \the [src] pointed at the correct position with just one hand!")) //update timing user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) @@ -529,7 +529,7 @@ //called if there was no projectile to shoot /obj/item/gun/proc/handle_click_empty(mob/user) if (user) - user.visible_message("*click click*", "*click*") + user.visible_message("*click click*", span_danger("*click*")) user.hud_used.update_ammo_hud(user, src) else src.visible_message("*click click*") @@ -539,18 +539,18 @@ // Moved from handle_post_fire() because if using a laser, the message for when someone got shot would show up before the firing message. /obj/item/gun/proc/handle_firing_text(mob/user, atom/target, pointblank = FALSE, reflex = FALSE) if(silenced) - to_chat(user, "You fire \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]") + to_chat(user, span_warning("You fire \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]")) for(var/mob/living/L in oview(2,user)) if(L.stat) continue if(L.blinded) to_chat(L, "You hear a [fire_sound_text]!") continue - to_chat(L, "\The [user] fires \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]!") + to_chat(L, span_danger("\The [user] fires \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]!")) else user.visible_message( - "\The [user] fires \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]!", - "You fire \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]!", + span_danger("\The [user] fires \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]!"), + span_warning("You fire \the [src][pointblank ? " point blank at \the [target]":""][reflex ? " by reflex":""]!"), "You hear a [fire_sound_text]!" ) @@ -575,24 +575,24 @@ switch(one_handed_penalty) if(1 to 15) if(prob(50)) //don't need to tell them every single time - to_chat(user, "Your aim wavers slightly.") + to_chat(user, span_warning("Your aim wavers slightly.")) if(16 to 30) - to_chat(user, "Your aim wavers as you fire \the [src] with just one hand.") + to_chat(user, span_warning("Your aim wavers as you fire \the [src] with just one hand.")) if(31 to 45) - to_chat(user, "You have trouble keeping \the [src] on target with just one hand.") + to_chat(user, span_warning("You have trouble keeping \the [src] on target with just one hand.")) if(46 to INFINITY) - to_chat(user, "You struggle to keep \the [src] on target with just one hand!") + to_chat(user, span_warning("You struggle to keep \the [src] on target with just one hand!")) else if(!user.can_wield_item(src)) switch(one_handed_penalty) if(1 to 15) if(prob(50)) //don't need to tell them every single time - to_chat(user, "Your aim wavers slightly.") + to_chat(user, span_warning("Your aim wavers slightly.")) if(16 to 30) - to_chat(user, "Your aim wavers as you try to hold \the [src] steady.") + to_chat(user, span_warning("Your aim wavers as you try to hold \the [src] steady.")) if(31 to 45) - to_chat(user, "You have trouble holding \the [src] steady.") + to_chat(user, span_warning("You have trouble holding \the [src] steady.")) if(46 to INFINITY) - to_chat(user, "You struggle to hold \the [src] steady!") + to_chat(user, span_warning("You struggle to hold \the [src] steady!")) if(recoil) spawn() @@ -769,7 +769,7 @@ sel_mode = 1 var/datum/firemode/new_mode = firemodes[sel_mode] new_mode.apply_to(src) - to_chat(user, "\The [src] is now set to [new_mode.name].") + to_chat(user, span_notice("\The [src] is now set to [new_mode.name].")) user.hud_used.update_ammo_hud(user, src) // TGMC Ammo HUD return new_mode diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index f2ca338313..e2c58cf927 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -126,42 +126,42 @@ /obj/item/gun/energy/proc/load_ammo(var/obj/item/C, mob/user) if(istype(C, /obj/item/cell)) if(self_recharge || battery_lock) - to_chat(user, "[src] does not have a battery port.") + to_chat(user, span_notice("[src] does not have a battery port.")) return if(istype(C, accept_cell_type)) var/obj/item/cell/P = C if(power_supply) - to_chat(user, "[src] already has a power cell.") + to_chat(user, span_notice("[src] already has a power cell.")) else - user.visible_message("[user] is reloading [src].", "You start to insert [P] into [src].") + user.visible_message("[user] is reloading [src].", span_notice("You start to insert [P] into [src].")) if(do_after(user, reload_time * P.w_class)) user.remove_from_mob(P) power_supply = P P.loc = src - user.visible_message("[user] inserts [P] into [src].", "You insert [P] into [src].") + user.visible_message("[user] inserts [P] into [src].", span_notice("You insert [P] into [src].")) playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) update_icon() update_held_icon() user.hud_used.update_ammo_hud(user, src) // TGMC Ammo HUD else - to_chat(user, "This cell is not fitted for [src].") + to_chat(user, span_notice("This cell is not fitted for [src].")) return /obj/item/gun/energy/proc/unload_ammo(mob/user) if(self_recharge || battery_lock) - to_chat(user, "[src] does not have a battery port.") + to_chat(user, span_notice("[src] does not have a battery port.")) return if(power_supply) user.put_in_hands(power_supply) power_supply.update_icon() - user.visible_message("[user] removes [power_supply] from [src].", "You remove [power_supply] from [src].") + user.visible_message("[user] removes [power_supply] from [src].", span_notice("You remove [power_supply] from [src].")) power_supply = null playsound(src, 'sound/weapons/empty.ogg', 50, 1) update_icon() update_held_icon() user.hud_used.update_ammo_hud(user, src) // TGMC Ammo HUD else - to_chat(user, "[src] does not have a power cell.") + to_chat(user, span_notice("[src] does not have a power cell.")) /obj/item/gun/energy/attackby(var/obj/item/A as obj, mob/user as mob) ..() @@ -263,4 +263,4 @@ if(!power_supply) return 0 else - return FLOOR(power_supply.charge / max(charge_cost, 1), 1) \ No newline at end of file + return FLOOR(power_supply.charge / max(charge_cost, 1), 1) diff --git a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm index 4654fe17d7..a5a072f1c1 100644 --- a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm +++ b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm @@ -44,22 +44,22 @@ if(I.has_tool_quality(TOOL_SCREWDRIVER)) if(!scanmod) - to_chat(user, "There's no scanner module installed!") + to_chat(user, span_warning("There's no scanner module installed!")) return var/turf/T = get_turf(src) - to_chat(user, "You remove [scanmod] from [src].") + to_chat(user, span_notice("You remove [scanmod] from [src].")) playsound(src, I.usesound, 75, 1) scanmod.forceMove(T) scanmod = null update_fail_chance() else if(istype(I, /obj/item/stock_parts/scanning_module)) if(scanmod) - to_chat(user, "There's already [scanmod] installed! Remove it first.") + to_chat(user, span_warning("There's already [scanmod] installed! Remove it first.")) return user.remove_from_mob(I) I.forceMove(src) scanmod = I - to_chat(user, "You install [scanmod] into [src].") + to_chat(user, span_notice("You install [scanmod] into [src].")) update_fail_chance() else return ..() @@ -88,20 +88,20 @@ return var/turf/ownturf = get_turf(src) if(ownturf.z != T.z || get_dist(T,ownturf) > world.view) - to_chat(user, "The target is out of range!") + to_chat(user, span_warning("The target is out of range!")) return if(get_area(A).flags & BLUE_SHIELDED) - to_chat(user, "The target area protected by bluespace shielding!") + to_chat(user, span_warning("The target area protected by bluespace shielding!")) return if(!(A in view(user, world.view))) - to_chat(user, "Harpoon fails to lock on the obstructed target!") + to_chat(user, span_warning("Harpoon fails to lock on the obstructed target!")) return firable = FALSE VARSET_IN(src, firable, TRUE, 30 SECONDS) playsound(src, 'sound/weapons/wave.ogg', 60, 1) - user.visible_message("[user] fires \the [src]!","You fire \the [src]!") + user.visible_message(span_warning("[user] fires \the [src]!"),span_warning("You fire \the [src]!")) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(4, 1, A) @@ -144,8 +144,8 @@ if(prey != user && prey.can_be_drop_prey) prey.forceMove(belly_dest) vore_happened = TRUE - to_chat(prey, "[living_user] materializes around you, as you end up in their [belly_dest]!") - to_chat(living_user, "You materialize around [prey] as they end up in your [belly_dest]!") + to_chat(prey, span_vdanger("[living_user] materializes around you, as you end up in their [belly_dest]!")) + to_chat(living_user, span_vnotice("You materialize around [prey] as they end up in your [belly_dest]!")) if(can_dropnom && !vore_happened && living_user.can_be_drop_prey) var/mob/living/pred for(var/mob/living/potential_pred in ToTurf) @@ -159,8 +159,8 @@ belly_dest = pick(pred.vore_organs) if(belly_dest) living_user.forceMove(belly_dest) - to_chat(pred, "[living_user] materializes inside you as they end up in your [belly_dest]!") - to_chat(living_user, "You materialize inside [pred] as you end up in their [belly_dest]!") + to_chat(pred, span_vnotice("[living_user] materializes inside you as they end up in your [belly_dest]!")) + to_chat(living_user, span_vdanger("You materialize inside [pred] as you end up in their [belly_dest]!")) else for(var/obj/O in FromTurf) @@ -185,8 +185,8 @@ belly_dest = pick(living_user.vore_organs) if(belly_dest) M.forceMove(belly_dest) - to_chat(living_user, "[M] materializes inside you as they end up in your [belly_dest]!") - to_chat(M, "You materialize inside [living_user] as you end up in their [belly_dest]!") + to_chat(living_user, span_vnotice("[M] materializes inside you as they end up in your [belly_dest]!")) + to_chat(M, span_vdanger("You materialize inside [living_user] as you end up in their [belly_dest]!")) else if(can_dropnom && living_user.can_be_drop_prey && M.can_be_drop_pred && !user_vored) var/obj/belly/belly_dest if(M.vore_selected) @@ -196,8 +196,8 @@ if(belly_dest) living_user.forceMove(belly_dest) user_vored = TRUE - to_chat(living_user, "[M] materializes around you, as you end up in their [belly_dest]!") - to_chat(M, "You materialize around [living_user] as they end up in your [belly_dest]!") + to_chat(living_user, span_vdanger("[M] materializes around you, as you end up in their [belly_dest]!")) + to_chat(M, span_vnotice("You materialize around [living_user] as they end up in your [belly_dest]!")) /obj/item/bluespace_harpoon/attack_self(mob/living/user as mob) diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm index 50a1906a99..c703c0787f 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm @@ -58,9 +58,9 @@ /obj/item/gun/projectile/cell_loaded/proc/switch_to(obj/item/ammo_casing/microbattery/new_batt) if(ishuman(loc)) if(chambered && new_batt.type == chambered.type) - to_chat(loc,"\The [src] is now using the next [new_batt.type_name] power cell.") + to_chat(loc,span_warning("\The [src] is now using the next [new_batt.type_name] power cell.")) else - to_chat(loc,"\The [src] is now firing [new_batt.type_name].") + to_chat(loc,span_warning("\The [src] is now firing [new_batt.type_name].")) chambered = new_batt update_charge() @@ -159,10 +159,10 @@ if(istype(W, /obj/item/ammo_casing/microbattery)) var/obj/item/ammo_casing/microbattery/B = W if(!istype(B, ammo_type)) - to_chat(user, "[B] does not fit into [src].") + to_chat(user, span_warning("[B] does not fit into [src].")) return if(stored_ammo.len >= max_ammo) - to_chat(user, "[src] is full!") + to_chat(user, span_warning("[src] is full!")) return user.remove_from_mob(B) B.loc = src diff --git a/code/modules/projectiles/guns/energy/crestrose_vr.dm b/code/modules/projectiles/guns/energy/crestrose_vr.dm index ee6f0f4782..df3f6785cc 100644 --- a/code/modules/projectiles/guns/energy/crestrose_vr.dm +++ b/code/modules/projectiles/guns/energy/crestrose_vr.dm @@ -34,7 +34,7 @@ /obj/item/gun/projectile/automatic/fluff/crestrose/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(50)) - user.visible_message("\The [user] parries [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!")) playsound(user, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 - return 0 \ No newline at end of file + return 0 diff --git a/code/modules/projectiles/guns/energy/dominator_vr.dm b/code/modules/projectiles/guns/energy/dominator_vr.dm index bfed677fd2..89ac9c1536 100644 --- a/code/modules/projectiles/guns/energy/dominator_vr.dm +++ b/code/modules/projectiles/guns/energy/dominator_vr.dm @@ -27,7 +27,7 @@ /obj/item/gun/energy/gun/fluff/dominator/special_check(mob/user) if(!emagged && mode_name == "lethal" && get_security_level() == "green") - to_chat(user,"The trigger refuses to depress while on the lethal setting under security level green!") + to_chat(user,span_warning("The trigger refuses to depress while on the lethal setting under security level green!")) return FALSE return ..() @@ -36,7 +36,7 @@ ..() if(!emagged) emagged = TRUE - to_chat(user,"You disable the alert level locking mechanism on \the [src]!") + to_chat(user,span_warning("You disable the alert level locking mechanism on \the [src]!")) return TRUE @@ -47,4 +47,4 @@ icon_state = "xray" muzzle_type = /obj/effect/projectile/muzzle/xray tracer_type = /obj/effect/projectile/tracer/xray - impact_type = /obj/effect/projectile/impact/xray \ No newline at end of file + impact_type = /obj/effect/projectile/impact/xray diff --git a/code/modules/projectiles/guns/energy/gunsword_vr.dm b/code/modules/projectiles/guns/energy/gunsword_vr.dm index bfb4ea98a9..1ba9f267e4 100644 --- a/code/modules/projectiles/guns/energy/gunsword_vr.dm +++ b/code/modules/projectiles/guns/energy/gunsword_vr.dm @@ -99,8 +99,8 @@ var/datum/gender/TU = gender_datums[user.get_visible_gender()] if (active) if ((CLUMSY in user.mutations) && prob(50)) - user.visible_message("\The [user] accidentally cuts [TU.himself] with \the [src].",\ - "You accidentally cut yourself with \the [src].") + user.visible_message(span_danger("\The [user] accidentally cuts [TU.himself] with \the [src]."),\ + span_danger("You accidentally cut yourself with \the [src].")) user.take_organ_damage(5,5) deactivate(user) update_icon() @@ -119,4 +119,4 @@ return /obj/item/cell/device/weapon/gunsword/update_icon() - cut_overlays() \ No newline at end of file + cut_overlays() diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm index 3349c214f9..bca9fcab16 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm @@ -105,7 +105,7 @@ . += "[get_remaining_mod_capacity()]% mod capacity remaining." for(var/A in get_modkits()) var/obj/item/borg/upgrade/modkit/M = A - . += "There is \a [M] installed, using [M.cost]% capacity." + . += span_notice("There is \a [M] installed, using [M.cost]% capacity.") /obj/item/gun/energy/kinetic_accelerator/Exited(atom/movable/AM) . = ..() @@ -116,12 +116,12 @@ /obj/item/gun/energy/kinetic_accelerator/attackby(obj/item/I, mob/user) if(I.has_tool_quality(TOOL_CROWBAR)) if(modkits.len) - to_chat(user, "You pry the modifications out.") + to_chat(user, span_notice("You pry the modifications out.")) playsound(loc, I.usesound, 100, 1) for(var/obj/item/borg/upgrade/modkit/M in modkits) M.uninstall(src) else - to_chat(user, "There are no modifications currently installed.") + to_chat(user, span_notice("There are no modifications currently installed.")) if(istype(I, /obj/item/borg/upgrade/modkit)) var/obj/item/borg/upgrade/modkit/MK = I MK.install(src, user) @@ -221,7 +221,7 @@ // if(!suppressed) playsound(src, 'sound/weapons/kenetic_reload.ogg', 60, 1) // else - // to_chat(loc, "[src] silently charges up.") + // to_chat(loc, span_warning("[src] silently charges up.")) overheat = FALSE update_icon() @@ -365,7 +365,7 @@ /obj/item/borg/upgrade/modkit/examine(mob/user) . = ..() - . += "Occupies [cost]% of mod capacity." + . += span_notice("Occupies [cost]% of mod capacity.") /obj/item/borg/upgrade/modkit/attackby(obj/item/A, mob/user) if(istype(A, /obj/item/gun/energy/kinetic_accelerator)) @@ -378,7 +378,7 @@ for(var/obj/item/gun/energy/kinetic_accelerator/H in R.module.modules) if(install(H, R)) //It worked return - to_chat(R, "Upgrade error - Aborting Kinetic Accelerator linking.") //No applicable KA found, insufficient capacity, or some other problem. + to_chat(R, span_alert("Upgrade error - Aborting Kinetic Accelerator linking.")) //No applicable KA found, insufficient capacity, or some other problem. */ /obj/item/borg/upgrade/modkit/proc/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) @@ -399,13 +399,13 @@ user.drop_from_inventory(src, KA) // if(!user.transferItemToLoc(src, KA)) // return FALSE - to_chat(user, "You install the modkit.") + to_chat(user, span_notice("You install the modkit.")) playsound(loc, 'sound/items/screwdriver.ogg', 100, 1) KA.modkits += src else - to_chat(user, "The modkit you're trying to install would conflict with an already installed modkit. Use a crowbar to remove existing modkits.") + to_chat(user, span_notice("The modkit you're trying to install would conflict with an already installed modkit. Use a crowbar to remove existing modkits.")) else - to_chat(user, "You don't have room([KA.get_remaining_mod_capacity()]% remaining, [cost]% needed) to install this modkit. Use a crowbar to remove existing modkits.") + to_chat(user, span_notice("You don't have room([KA.get_remaining_mod_capacity()]% remaining, [cost]% needed) to install this modkit. Use a crowbar to remove existing modkits.")) . = FALSE /obj/item/borg/upgrade/modkit/proc/uninstall(obj/item/gun/energy/kinetic_accelerator/KA, forcemove = TRUE) @@ -517,7 +517,7 @@ // var/armor = L.run_armor_check(K.def_zone, K.flag, null, null, K.armour_penetration) L.apply_damage(K.damage*modifier, K.damage_type, K.def_zone, armor) // L.apply_damage(K.damage*modifier, K.damage_type, K.def_zone, armor) - to_chat(L, "You're struck by a [K.name]!") + to_chat(L, span_userdanger("You're struck by a [K.name]!")) /obj/item/borg/upgrade/modkit/aoe/turfs name = "mining explosion" diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 79ade7ccad..2198a11219 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -201,7 +201,7 @@ power_supply.charge = 0 power_supply.maxcharge = 1 //just to avoid div/0 runtimes desc = "A rare weapon, produced by the Lunar Arms Company around 2105 - one of humanity's first wholly extra-terrestrial weapon designs. It looks to have completely burned out." - user.visible_message("\The [src] erupts in a shower of sparks!", "\the [src] bursts into a shower of sparks!") + user.visible_message(span_warning("\The [src] erupts in a shower of sparks!"), span_danger("\the [src] bursts into a shower of sparks!")) var/turf/T = get_turf(src) var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(2, 1, T) @@ -218,7 +218,7 @@ sparks.set_up(2, 1, T) sparks.start() update_icon() - user.visible_message("\The [src] shorts out!", "\the [src] shorts out!") + user.visible_message(span_warning("\The [src] shorts out!"), span_danger("\the [src] shorts out!")) failurechance += rand(1,5) return if(6 to 7) //20% chance of weakening the beam type, possibly to uselessness @@ -238,18 +238,18 @@ projectile_type = /obj/item/projectile/beam/heavylaser if(81 to 100) //pulse becomes cannon projectile_type = /obj/item/projectile/beam/heavylaser/cannon - user.visible_message("\The [src] dims slightly!", "\the [src] dims slightly!") + user.visible_message(span_warning("\The [src] dims slightly!"), span_danger("\the [src] dims slightly!")) return if(8) //10% chance of reducing the number of shots you have left, or giving you a limit if there isn't one if(!remainingshots) remainingshots = rand(1,40) else remainingshots = min(1, round(remainingshots/2)) - user.visible_message("\The [src] lets out a faint pop.", "\the [src] lets out a faint pop.") + user.visible_message(span_warning("\The [src] lets out a faint pop."), span_danger("\the [src] lets out a faint pop.")) if(9) //10% chance of permanently reducing the cell's max charge power_supply.maxcharge = power_supply.maxcharge/2 power_supply.charge = min(power_supply.charge, power_supply.maxcharge) - user.visible_message("\The [src] sparks,letting off a puff of smoke!", "\the [src] sparks,letting off a puff of smoke!") + user.visible_message(span_warning("\The [src] sparks,letting off a puff of smoke!"), span_danger("\the [src] sparks,letting off a puff of smoke!")) var/turf/T = get_turf(src) var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(2, 1, T) @@ -454,4 +454,4 @@ charge_cost = 1200 force = 12 accuracy = 0 - scoped_accuracy = 20 \ No newline at end of file + scoped_accuracy = 20 diff --git a/code/modules/projectiles/guns/energy/particle.dm b/code/modules/projectiles/guns/energy/particle.dm index d3c4d536f0..6aeb04cc7d 100644 --- a/code/modules/projectiles/guns/energy/particle.dm +++ b/code/modules/projectiles/guns/energy/particle.dm @@ -67,12 +67,12 @@ var/pressure = environment ? environment.return_pressure() : 0 if (!power_supply || power_supply.charge < charge_cost) - user.visible_message("*click*", "*click*") + user.visible_message(span_warning("*click*"), span_danger("*click*")) playsound(src, 'sound/weapons/empty.ogg', 100, 1) return 0 if(pressure >= 10) if (safetycatch) //weapons with a pressure regulator simply won't fire - user.visible_message("*click*", "The pressure-interlock prevents you from firing \the [src].") + user.visible_message(span_warning("*click*"), span_danger("The pressure-interlock prevents you from firing \the [src].")) playsound(src, 'sound/weapons/empty.ogg', 100, 1) return 0 else if (prob(min(pressure, 100))) //pressure% chance of failing @@ -84,10 +84,10 @@ /obj/item/gun/energy/particle/proc/pressuremalfunction(severity, var/mob/user, var/turf/T) if (severity <= 10) // just doesn't fire. 10% chance in 100 atmo. - user.visible_message("*click*", "\The [src] jams.") + user.visible_message(span_warning("*click*"), span_danger("\The [src] jams.")) playsound(src, 'sound/weapons/empty.ogg', 100, 1) else if (severity <= 60) //50% chance of fizzling and wasting a shot - user.visible_message("\The [user] fires \the [src], but the shot fizzles in the air!", "You fire \the [src], but the shot fizzles in the air!") + user.visible_message(span_warning("\The [user] fires \the [src], but the shot fizzles in the air!"), span_danger("You fire \the [src], but the shot fizzles in the air!")) power_supply.charge -= charge_cost playsound(src, fire_sound, 100, 1) var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() @@ -95,14 +95,14 @@ sparks.start() update_icon() else if (severity <= 80) //20% chance of shorting out and emptying the cell - user.visible_message("\The [user] pulls the trigger, but \the [src] shorts out!", "You pull the trigger, but \the [src] shorts out!") + user.visible_message(span_warning("\The [user] pulls the trigger, but \the [src] shorts out!"), span_danger("You pull the trigger, but \the [src] shorts out!")) power_supply.charge = 0 var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(2, 1, T) sparks.start() update_icon() else if (severity <= 90) //10% chance of breaking the gun - user.visible_message("\The [user] pulls the trigger, but \the [src] erupts in a shower of sparks!", "You pull the trigger, but \the [src] bursts into a shower of sparks!") + user.visible_message(span_warning("\The [user] pulls the trigger, but \the [src] erupts in a shower of sparks!"), span_danger("You pull the trigger, but \the [src] bursts into a shower of sparks!")) var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(2, 1, T) sparks.start() @@ -114,12 +114,12 @@ charge_cost += charge_cost update_icon() else if (severity <= 150) // 10% chance of exploding - user.visible_message("\The [user] pulls the trigger, but \the [src] explodes!", "The [src] explodes!") + user.visible_message(span_danger("\The [user] pulls the trigger, but \the [src] explodes!"), span_danger("The [src] explodes!")) log_and_message_admins("blew themself up with a particle gun.", user) explosion(T, -1, -1, 1, 1) qdel(src) else //can only possibly happen if you're dumb enough to fire it in an OVER pressure environment, over 150kPa - user.visible_message("\The [user] pulls the trigger, but \the [src] explodes!", "The [src] explodes catastrophically!") + user.visible_message(span_danger("\The [user] pulls the trigger, but \the [src] explodes!"), span_danger("The [src] explodes catastrophically!")) log_and_message_admins("blew their dumb ass up with a particle gun.", user) explosion(T, -1, 1, 2, 2) qdel(src) @@ -131,9 +131,9 @@ /obj/item/gun/energy/particle/attackby(var/obj/item/A as obj, mob/user as mob) if(istype(A, /obj/item/pressurelock)) if(safetycatch) - to_chat(user, "\The [src] already has a [attached_safety].") + to_chat(user, span_notice("\The [src] already has a [attached_safety].")) return - to_chat(user, "You insert \the [A] into \the [src].") + to_chat(user, span_notice("You insert \the [A] into \the [src].")) user.drop_item() A.loc = src attached_safety = A @@ -142,9 +142,9 @@ if(istype(A, /obj/item/tool/screwdriver)) if(safetycatch && attached_safety) - to_chat(user, "You begin removing \the [attached_safety] from \the [src].") + to_chat(user, span_notice("You begin removing \the [attached_safety] from \the [src].")) if(do_after(user, 25)) - to_chat(user, "You remove \the [attached_safety] from \the [src].") + to_chat(user, span_notice("You remove \the [attached_safety] from \the [src].")) user.put_in_hands(attached_safety) safetycatch = 0 attached_safety = null @@ -187,4 +187,3 @@ if(prob(Proj.damage)) GetDrilled() ..() - diff --git a/code/modules/projectiles/guns/energy/protector_vr.dm b/code/modules/projectiles/guns/energy/protector_vr.dm index 122cfb9835..aac54ad147 100644 --- a/code/modules/projectiles/guns/energy/protector_vr.dm +++ b/code/modules/projectiles/guns/energy/protector_vr.dm @@ -43,7 +43,7 @@ /obj/item/gun/energy/gun/protector/special_check(mob/user) if(!emagged && mode_name == "lethal" && get_security_level() == "green") - to_chat(user,"The trigger refuses to depress while on the lethal setting under security level green!") + to_chat(user,span_warning("The trigger refuses to depress while on the lethal setting under security level green!")) return FALSE return ..() @@ -64,7 +64,7 @@ ..() if(!emagged) emagged = TRUE - to_chat(user,"You disable the alert level locking mechanism on \the [src]!") + to_chat(user,span_warning("You disable the alert level locking mechanism on \the [src]!")) return TRUE @@ -141,10 +141,10 @@ if(istype(id) && lockable) if(check_access(id)) locked = !locked - to_chat(user, "You [locked ? "enable" : "disable"] the safety interlock on \the [src].") + to_chat(user, span_warning("You [locked ? "enable" : "disable"] the safety interlock on \the [src].")) else - to_chat(user, "Access denied.") - user.visible_message("[user] swipes \the [I] against \the [src].") + to_chat(user, span_warning("Access denied.")) + user.visible_message(span_notice("[user] swipes \the [I] against \the [src].")) else return ..() @@ -155,6 +155,6 @@ if(locked) var/turf/T = get_turf(src) if(T.z in using_map.station_levels) - to_chat(user, "The safety device prevents the gun from firing this close to the facility.") + to_chat(user, span_warning("The safety device prevents the gun from firing this close to the facility.")) return 0 return ..() diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index 3440716e10..b9239da43f 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -36,7 +36,7 @@ fire_delay = 12 /obj/item/gun/energy/pulse_rifle/destroyer/attack_self(mob/living/user as mob) - to_chat(user, "[src.name] has three settings, and they are all DESTROY.") + to_chat(user, span_warning("[src.name] has three settings, and they are all DESTROY.")) /* * Pulse Carbine @@ -79,4 +79,4 @@ list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, fire_delay=null, charge_cost = 240), list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, fire_delay=null, charge_cost = 240), list(mode_name="DESTROY", projectile_type=/obj/item/projectile/beam/pulse, fire_delay=null, charge_cost = 480), - ) \ No newline at end of file + ) diff --git a/code/modules/projectiles/guns/energy/pummeler_vr.dm b/code/modules/projectiles/guns/energy/pummeler_vr.dm index 98a7b0ca36..0c2346bbfb 100644 --- a/code/modules/projectiles/guns/energy/pummeler_vr.dm +++ b/code/modules/projectiles/guns/energy/pummeler_vr.dm @@ -50,7 +50,7 @@ var/mob/living/simple_mob/vore/alienanimals/startreader/S = L if(!S.flipped) S.adjustBruteLoss(100) - S.visible_message("\The [S] is flipped over!!!") + S.visible_message(span_notice("\The [S] is flipped over!!!")) S.flipped = TRUE S.flip_cooldown = 10 S.handle_flip() diff --git a/code/modules/projectiles/guns/energy/pump.dm b/code/modules/projectiles/guns/energy/pump.dm index ae09d37548..65b2847c47 100644 --- a/code/modules/projectiles/guns/energy/pump.dm +++ b/code/modules/projectiles/guns/energy/pump.dm @@ -24,10 +24,10 @@ if(istype(id) && lockable) if(check_access(id)) locked = !locked - to_chat(user, "You [locked ? "enable" : "disable"] the safety lock on \the [src].") + to_chat(user, span_warning("You [locked ? "enable" : "disable"] the safety lock on \the [src].")) else - to_chat(user, "Access denied.") - user.visible_message("[user] swipes \the [I] against \the [src].") + to_chat(user, span_warning("Access denied.")) + user.visible_message(span_notice("[user] swipes \the [I] against \the [src].")) else return ..() @@ -35,14 +35,14 @@ ..() if(lockable) locked = !locked - to_chat(user, "You [locked ? "enable" : "disable"] the safety lock on \the [src]!") + to_chat(user, span_warning("You [locked ? "enable" : "disable"] the safety lock on \the [src]!")) return 1 /obj/item/gun/energy/locked/special_check(mob/user) if(locked) var/turf/T = get_turf(src) if(T.z in using_map.station_levels) - to_chat(user, "The safety device prevents the gun from firing this close to the facility.") + to_chat(user, span_warning("The safety device prevents the gun from firing this close to the facility.")) return 0 return ..() @@ -85,8 +85,8 @@ return recharging = 1 update_icon() - user.visible_message("[user] opens \the [src] and starts pumping the handle.", \ - "You open \the [src] and start pumping the handle.") + user.visible_message(span_notice("[user] opens \the [src] and starts pumping the handle."), \ + span_notice("You open \the [src] and start pumping the handle.")) while(recharging) if(!do_after(user, 10, src)) break @@ -269,4 +269,4 @@ desc = "An minaturized weapon that fires a bolt of energy. Includes a built-in crank charger for recharging away from civilization." req_access = newlist() //for toggling safety locked = 0 - lockable = 0 \ No newline at end of file + lockable = 0 diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index eaca0459ac..752cd2f0cf 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -72,29 +72,29 @@ user.drop_item() W.loc = src emitter = W - to_chat(user, "You install a [emitter.name] in [src].") + to_chat(user, span_notice("You install a [emitter.name] in [src].")) else - to_chat(user, "[src] already has a laser.") + to_chat(user, span_notice("[src] already has a laser.")) else if(W.has_tool_quality(TOOL_SCREWDRIVER)) if(emitter) - to_chat(user, "You remove the [emitter.name] from the [src].") + to_chat(user, span_notice("You remove the [emitter.name] from the [src].")) emitter.loc = get_turf(src.loc) playsound(src, W.usesound, 50, 1) emitter = null return else - to_chat(user, "There is no micro laser in this [src].") + to_chat(user, span_notice("There is no micro laser in this [src].")) return /obj/item/gun/energy/floragun/afterattack(obj/target, mob/user, adjacent_flag) //allow shooting into adjacent hydrotrays regardless of intent if(!emitter) - to_chat(user, "The [src] has no laser! ") + to_chat(user, span_notice("The [src] has no laser! ")) playsound(src, 'sound/weapons/empty.ogg', 50, 1) return if(adjacent_flag && istype(target,/obj/machinery/portable_atmospherics/hydroponics)) - user.visible_message("\The [user] fires \the [src] into \the [target]!") + user.visible_message(span_danger("\The [user] fires \the [src] into \the [target]!")) Fire(target,user) return ..() @@ -111,7 +111,7 @@ gene = SSplants.plant_gene_datums[genemask] - to_chat(usr, "You set the [src]'s targeted genetic area to [genemask].") + to_chat(usr, span_info("You set the [src]'s targeted genetic area to [genemask].")) return @@ -186,14 +186,14 @@ /obj/item/gun/energy/staff/special_check(var/mob/user) if((user.mind && !wizards.is_antagonist(user.mind))) - to_chat(usr, "You focus your mind on \the [src], but nothing happens!") + to_chat(usr, span_warning("You focus your mind on \the [src], but nothing happens!")) return 0 return ..() /obj/item/gun/energy/staff/handle_click_empty(mob/user = null) if (user) - user.visible_message("*fizzle*", "*fizzle*") + user.visible_message("*fizzle*", span_danger("*fizzle*")) else src.visible_message("*fizzle*") playsound(src, 'sound/effects/sparks1.ogg', 100, 1) @@ -215,11 +215,11 @@ attack_self(mob/living/user as mob) if(projectile_type == "/obj/item/projectile/forcebolt") charge_cost = 400 - to_chat(user, "The [src.name] will now strike a small area.") + to_chat(user, span_warning("The [src.name] will now strike a small area.")) projectile_type = "/obj/item/projectile/forcebolt/strong" else charge_cost = 200 - to_chat(user, "The [src.name] will now strike only a single person.") + to_chat(user, span_warning("The [src.name] will now strike only a single person.")) projectile_type = "/obj/item/projectile/forcebolt" */ @@ -278,12 +278,12 @@ /obj/item/gun/energy/maghowitzer/attack(atom/A, mob/living/user, def_zone) if(power_cycle) - to_chat(user, "\The [src] is already powering up!") + to_chat(user, span_notice("\The [src] is already powering up!")) return 0 var/turf/target_turf = get_turf(A) var/beameffect = user.Beam(target_turf,icon_state="sat_beam",icon='icons/effects/beam.dmi',time=31, maxdistance=10,beam_type=/obj/effect/ebeam,beam_sleep_time=3) if(beameffect) - user.visible_message("[user] aims \the [src] at \the [A].") + user.visible_message(span_cult("[user] aims \the [src] at \the [A].")) if(power_supply && power_supply.charge >= charge_cost) //Do a delay for pointblanking too. power_cycle = TRUE if(do_after(user, 30)) @@ -304,7 +304,7 @@ /obj/item/gun/energy/maghowitzer/afterattack(atom/A, mob/living/user, adjacent, params) if(power_cycle) - to_chat(user, "\The [src] is already powering up!") + to_chat(user, span_notice("\The [src] is already powering up!")) return 0 var/turf/target_turf = get_turf(A) @@ -312,7 +312,7 @@ var/beameffect = user.Beam(target_turf,icon_state="sat_beam",icon='icons/effects/beam.dmi',time=31, maxdistance=10,beam_type=/obj/effect/ebeam,beam_sleep_time=3) if(beameffect) - user.visible_message("[user] aims \the [src] at \the [A].") + user.visible_message(span_cult("[user] aims \the [src] at \the [A].")) if(!power_cycle) power_cycle = TRUE @@ -331,4 +331,4 @@ handle_click_empty(user) power_cycle = FALSE else - to_chat(user, "\The [src] is already powering up!") + to_chat(user, span_notice("\The [src] is already powering up!")) diff --git a/code/modules/projectiles/guns/energy/special_vr.dm b/code/modules/projectiles/guns/energy/special_vr.dm index e7c9506093..c7b3f3ca0d 100644 --- a/code/modules/projectiles/guns/energy/special_vr.dm +++ b/code/modules/projectiles/guns/energy/special_vr.dm @@ -53,8 +53,8 @@ playsound(src, 'sound/weapons/chargeup.ogg', 100, 1) spinning_up = TRUE update_icon() - user.visible_message("[user] starts charging the [src]!", \ - "You start charging the [src]!") + user.visible_message(span_notice("[user] starts charging the [src]!"), \ + span_notice("You start charging the [src]!")) if(do_after(user, 8, src)) spinning_up = FALSE ..() @@ -99,4 +99,4 @@ for(var/target in victims) var/obj/item/projectile/P = new zaptype(src.loc) P.launch_projectile_from_turf(target = target, target_zone = null, user = firer, params = null, angle_override = null, forced_spread = 0) - ..() \ No newline at end of file + ..() diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 19555d595b..facbbf9dcf 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -149,7 +149,7 @@ if(!M.mind) return 0 var/job = M.mind.assigned_role if(job != JOB_DETECTIVE && job != JOB_SECURITY_OFFICER && job != JOB_WARDEN && job != JOB_HEAD_OF_SECURITY ) - to_chat(M, "You don't feel cool enough to name this gun, chump.") + to_chat(M, span_notice("You don't feel cool enough to name this gun, chump.")) return 0 var/input = sanitizeSafe(input("What do you want to name the gun?", ,""), MAX_NAME_LEN) diff --git a/code/modules/projectiles/guns/launcher/bows.dm b/code/modules/projectiles/guns/launcher/bows.dm index 2d1a9901ac..ce05c71f2b 100644 --- a/code/modules/projectiles/guns/launcher/bows.dm +++ b/code/modules/projectiles/guns/launcher/bows.dm @@ -60,7 +60,7 @@ /obj/item/gun/launcher/crossbow/bow/consume_next_projectile(mob/user) if(!drawn) - to_chat(user, "\The [src] is not drawn back!") + to_chat(user, span_warning("\The [src] is not drawn back!")) return null return bolt @@ -94,7 +94,7 @@ return current_user = user - user.visible_message("[user] begins to draw back the string of [src].","You begin to draw back the string of [src].") + user.visible_message("[user] begins to draw back the string of [src].",span_notice("You begin to draw back the string of [src].")) if(do_after(user, 25, src, exclusive = TASK_ALL_EXCLUSIVE)) drawn = TRUE user.visible_message("[user] draws the string on [src] back fully!", "You draw the string on [src] back fully!") diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm index f7e14faebe..2c50e021e2 100644 --- a/code/modules/projectiles/guns/launcher/crossbow.dm +++ b/code/modules/projectiles/guns/launcher/crossbow.dm @@ -72,7 +72,7 @@ /obj/item/gun/launcher/crossbow/consume_next_projectile(mob/user=null) if(tension <= 0) - to_chat(user, "\The [src] is not drawn back!") + to_chat(user, span_warning("\The [src] is not drawn back!")) return null return bolt @@ -107,12 +107,12 @@ return current_user = user - user.visible_message("[user] begins to draw back the string of [src].","You begin to draw back the string of [src].") + user.visible_message("[user] begins to draw back the string of [src].",span_notice("You begin to draw back the string of [src].")) tension = 1 while(bolt && tension && loc == current_user) if(!do_after(user, 25)) //crossbow strings don't just magically pull back on their own. - user.visible_message("[usr] stops drawing and relaxes the string of [src].","You stop drawing back and relax the string of [src].") + user.visible_message("[usr] stops drawing and relaxes the string of [src].",span_warning("You stop drawing back and relax the string of [src].")) tension = 0 update_icon() return @@ -129,7 +129,7 @@ to_chat(usr, "[src] clunks as you draw the string to its maximum tension!") return - user.visible_message("[usr] draws back the string of [src]!","You continue drawing back the string of [src]!") + user.visible_message("[usr] draws back the string of [src]!",span_notice("You continue drawing back the string of [src]!")) /obj/item/gun/launcher/crossbow/proc/increase_tension(var/mob/user as mob) @@ -161,20 +161,20 @@ user.drop_item() cell = W cell.loc = src - to_chat(user, "You jam [cell] into [src] and wire it to the firing coil.") + to_chat(user, span_notice("You jam [cell] into [src] and wire it to the firing coil.")) superheat_rod(user) else - to_chat(user, "[src] already has a cell installed.") + to_chat(user, span_notice("[src] already has a cell installed.")) else if(W.has_tool_quality(TOOL_SCREWDRIVER)) if(cell) var/obj/item/C = cell C.loc = get_turf(user) - to_chat(user, "You jimmy [cell] out of [src] with [W].") + to_chat(user, span_notice("You jimmy [cell] out of [src] with [W].")) playsound(src, W.usesound, 50, 1) cell = null else - to_chat(user, "[src] doesn't have a cell installed.") + to_chat(user, span_notice("[src] doesn't have a cell installed.")) else ..() @@ -185,7 +185,7 @@ if(bolt.throwforce >= 15) return if(!istype(bolt,/obj/item/arrow/rod)) return - to_chat(user, "[bolt] plinks and crackles as it begins to glow red-hot.") + to_chat(user, span_notice("[bolt] plinks and crackles as it begins to glow red-hot.")) bolt.throwforce = 15 bolt.icon_state = "metal-rod-superheated" cell.use(500) @@ -230,11 +230,11 @@ if(buildstate == 0) var/obj/item/stack/rods/R = W if(R.use(3)) - to_chat(user, "You assemble a backbone of rods around the wooden stock.") + to_chat(user, span_notice("You assemble a backbone of rods around the wooden stock.")) buildstate++ update_icon() else - to_chat(user, "You need at least three rods to complete this task.") + to_chat(user, span_notice("You need at least three rods to complete this task.")) return else if(W.has_tool_quality(TOOL_WELDER)) if(buildstate == 1) @@ -242,7 +242,7 @@ if(T.remove_fuel(0,user)) if(!src || !T.isOn()) return playsound(src, W.usesound, 50, 1) - to_chat(user, "You weld the rods into place.") + to_chat(user, span_notice("You weld the rods into place.")) buildstate++ update_icon() return @@ -250,33 +250,33 @@ var/obj/item/stack/cable_coil/C = W if(buildstate == 2) if(C.use(5)) - to_chat(user, "You wire a crude cell mount into the top of the crossbow.") + to_chat(user, span_notice("You wire a crude cell mount into the top of the crossbow.")) buildstate++ update_icon() else - to_chat(user, "You need at least five segments of cable coil to complete this task.") + to_chat(user, span_notice("You need at least five segments of cable coil to complete this task.")) return else if(buildstate == 4) if(C.use(5)) - to_chat(user, "You string a steel cable across the crossbow's lath.") + to_chat(user, span_notice("You string a steel cable across the crossbow's lath.")) buildstate++ update_icon() else - to_chat(user, "You need at least five segments of cable coil to complete this task.") + to_chat(user, span_notice("You need at least five segments of cable coil to complete this task.")) return else if(istype(W,/obj/item/stack/material) && W.get_material_name() == "plastic") if(buildstate == 3) var/obj/item/stack/material/P = W if(P.use(3)) - to_chat(user, "You assemble and install a heavy plastic lath onto the crossbow.") + to_chat(user, span_notice("You assemble and install a heavy plastic lath onto the crossbow.")) buildstate++ update_icon() else - to_chat(user, "You need at least three plastic sheets to complete this task.") + to_chat(user, span_notice("You need at least three plastic sheets to complete this task.")) return else if(W.has_tool_quality(TOOL_SCREWDRIVER)) if(buildstate == 5) - to_chat(user, "You secure the crossbow's various parts.") + to_chat(user, span_notice("You secure the crossbow's various parts.")) playsound(src, W.usesound, 50, 1) new /obj/item/gun/launcher/crossbow(get_turf(src)) qdel(src) diff --git a/code/modules/projectiles/guns/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/launcher/grenade_launcher.dm index 2d06df48c7..bd199941d8 100644 --- a/code/modules/projectiles/guns/launcher/grenade_launcher.dm +++ b/code/modules/projectiles/guns/launcher/grenade_launcher.dm @@ -30,9 +30,9 @@ if(next) grenades -= next //Remove grenade from loaded list. chambered = next - to_chat(M, "You pump [src], loading \a [next] into the chamber.") + to_chat(M, span_warning("You pump [src], loading \a [next] into the chamber.")) else - to_chat(M, "You pump [src], but the magazine is empty.") + to_chat(M, span_warning("You pump [src], but the magazine is empty.")) update_icon() /obj/item/gun/launcher/grenade/examine(mob/user) @@ -46,24 +46,24 @@ /obj/item/gun/launcher/grenade/proc/load(obj/item/grenade/G, mob/user) if(G.loadable) if(grenades.len >= max_grenades) - to_chat(user, "[src] is full.") + to_chat(user, span_warning("[src] is full.")) return user.remove_from_mob(G) G.loc = src grenades.Insert(1, G) //add to the head of the list, so that it is loaded on the next pump - user.visible_message("[user] inserts \a [G] into [src].", "You insert \a [G] into [src].") + user.visible_message("[user] inserts \a [G] into [src].", span_notice("You insert \a [G] into [src].")) return - to_chat(user, "[G] doesn't seem to fit in the [src]!") + to_chat(user, span_warning("[G] doesn't seem to fit in the [src]!")) /obj/item/gun/launcher/grenade/proc/unload(mob/user) if(grenades.len) var/obj/item/grenade/G = grenades[grenades.len] grenades.len-- user.put_in_hands(G) - user.visible_message("[user] removes \a [G] from [src].", "You remove \a [G] from [src].") + user.visible_message("[user] removes \a [G] from [src].", span_notice("You remove \a [G] from [src].")) playsound(src, 'sound/weapons/empty.ogg', 50, 1) else - to_chat(user, "[src] is empty.") + to_chat(user, span_warning("[src] is empty.")) /obj/item/gun/launcher/grenade/attack_self(mob/user) pump(user) @@ -106,20 +106,20 @@ /obj/item/gun/launcher/grenade/underslung/load(obj/item/grenade/G, mob/user) if(G.loadable) if(chambered) - to_chat(user, "[src] is already loaded.") + to_chat(user, span_warning("[src] is already loaded.")) return user.remove_from_mob(G) G.loc = src chambered = G - user.visible_message("[user] load \a [G] into [src].", "You load \a [G] into [src].") + user.visible_message("[user] load \a [G] into [src].", span_notice("You load \a [G] into [src].")) return - to_chat(user, "[G] doesn't seem to fit in the [src]!") + to_chat(user, span_warning("[G] doesn't seem to fit in the [src]!")) /obj/item/gun/launcher/grenade/underslung/unload(mob/user) if(chambered) user.put_in_hands(chambered) - user.visible_message("[user] removes \a [chambered] from [src].", "You remove \a [chambered] from [src].") + user.visible_message("[user] removes \a [chambered] from [src].", span_notice("You remove \a [chambered] from [src].")) playsound(src, 'sound/weapons/empty.ogg', 50, 1) chambered = null else - to_chat(user, "[src] is empty.") \ No newline at end of file + to_chat(user, span_warning("[src] is empty.")) diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm index 112d31f305..0c694388ac 100644 --- a/code/modules/projectiles/guns/launcher/pneumatic.dm +++ b/code/modules/projectiles/guns/launcher/pneumatic.dm @@ -168,7 +168,7 @@ if(buildstate == 0) user.drop_from_inventory(W) qdel(W) - to_chat(user, "You secure the piping inside the frame.") + to_chat(user, span_notice("You secure the piping inside the frame.")) buildstate++ update_icon() return @@ -176,17 +176,17 @@ if(buildstate == 2) var/obj/item/stack/material/M = W if(M.use(5)) - to_chat(user, "You assemble a chassis around the cannon frame.") + to_chat(user, span_notice("You assemble a chassis around the cannon frame.")) buildstate++ update_icon() else - to_chat(user, "You need at least five metal sheets to complete this task.") + to_chat(user, span_notice("You need at least five metal sheets to complete this task.")) return else if(istype(W,/obj/item/transfer_valve)) if(buildstate == 4) user.drop_from_inventory(W) qdel(W) - to_chat(user, "You install the transfer valve and connect it to the piping.") + to_chat(user, span_notice("You install the transfer valve and connect it to the piping.")) buildstate++ update_icon() return @@ -196,21 +196,21 @@ if(T.remove_fuel(0,user)) if(!src || !T.isOn()) return playsound(src, W.usesound, 100, 1) - to_chat(user, "You weld the pipe into place.") + to_chat(user, span_notice("You weld the pipe into place.")) buildstate++ update_icon() if(buildstate == 3) if(T.remove_fuel(0,user)) if(!src || !T.isOn()) return playsound(src, W.usesound, 100, 1) - to_chat(user, "You weld the metal chassis together.") + to_chat(user, span_notice("You weld the metal chassis together.")) buildstate++ update_icon() if(buildstate == 5) if(T.remove_fuel(0,user)) if(!src || !T.isOn()) return playsound(src, W.usesound, 100, 1) - to_chat(user, "You weld the valve into place.") + to_chat(user, span_notice("You weld the valve into place.")) new /obj/item/gun/launcher/pneumatic(get_turf(src)) qdel(src) return diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index 7ed3441217..abe75ae6c0 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -20,7 +20,7 @@ /obj/item/syringe_cartridge/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/reagent_containers/syringe)) syringe = I - to_chat(user, "You carefully insert [syringe] into [src].") + to_chat(user, span_notice("You carefully insert [syringe] into [src].")) user.remove_from_mob(syringe) syringe.loc = src sharp = TRUE @@ -29,7 +29,7 @@ /obj/item/syringe_cartridge/attack_self(mob/user) if(syringe) - to_chat(user, "You remove [syringe] from [src].") + to_chat(user, span_notice("You remove [syringe] from [src].")) playsound(src, 'sound/weapons/empty.ogg', 50, 1) user.put_in_hands(syringe) syringe = null @@ -94,26 +94,26 @@ /obj/item/gun/launcher/syringe/attack_self(mob/living/user as mob) if(next) - user.visible_message("[user] unlatches and carefully relaxes the bolt on [src].", "You unlatch and carefully relax the bolt on [src], unloading the spring.") + user.visible_message("[user] unlatches and carefully relaxes the bolt on [src].", span_warning("You unlatch and carefully relax the bolt on [src], unloading the spring.")) next = null else if(darts.len) playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) - user.visible_message("[user] draws back the bolt on [src], clicking it into place.", "You draw back the bolt on the [src], loading the spring!") + user.visible_message("[user] draws back the bolt on [src], clicking it into place.", span_warning("You draw back the bolt on the [src], loading the spring!")) next = darts[1] add_fingerprint(user) /obj/item/gun/launcher/syringe/attack_hand(mob/living/user as mob) if(user.get_inactive_hand() == src) if(!darts.len) - to_chat(user, "[src] is empty.") + to_chat(user, span_warning("[src] is empty.")) return if(next) - to_chat(user, "[src]'s cover is locked shut.") + to_chat(user, span_warning("[src]'s cover is locked shut.")) return var/obj/item/syringe_cartridge/C = darts[1] darts -= C user.put_in_hands(C) - user.visible_message("[user] removes \a [C] from [src].", "You remove \a [C] from [src].") + user.visible_message("[user] removes \a [C] from [src].", span_notice("You remove \a [C] from [src].")) playsound(src, 'sound/weapons/empty.ogg', 50, 1) else ..() @@ -122,12 +122,12 @@ if(istype(A, /obj/item/syringe_cartridge)) var/obj/item/syringe_cartridge/C = A if(darts.len >= max_darts) - to_chat(user, "[src] is full!") + to_chat(user, span_warning("[src] is full!")) return user.remove_from_mob(C) C.loc = src darts += C //add to the end - user.visible_message("[user] inserts \a [C] into [src].", "You insert \a [C] into [src].") + user.visible_message("[user] inserts \a [C] into [src].", span_notice("You insert \a [C] into [src].")) else ..() diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index b01f1da46b..2822a9155e 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -54,7 +54,7 @@ /obj/item/gun/magic/handle_click_empty(mob/user) if (user) - user.visible_message("*wzhzhzh*", "The [name] whizzles quietly.") + user.visible_message("*wzhzhzh*", span_danger("The [name] whizzles quietly.")) else src.visible_message("*wzhzh*") playsound(src, 'sound/weapons/empty.ogg', 100, 1) diff --git a/code/modules/projectiles/guns/magnetic/bore.dm b/code/modules/projectiles/guns/magnetic/bore.dm index ac5c5d8191..92450511bc 100644 --- a/code/modules/projectiles/guns/magnetic/bore.dm +++ b/code/modules/projectiles/guns/magnetic/bore.dm @@ -30,9 +30,9 @@ /obj/item/gun/magnetic/matfed/examine(mob/user) . = ..() if(manipulator) - . += "The installed [manipulator.name] consumes [mat_cost] units of [ammo_material] per shot." + . += span_notice("The installed [manipulator.name] consumes [mat_cost] units of [ammo_material] per shot.") else - . += "The \"manipulator missing\" indicator is lit. [src] consumes [mat_cost] units of [ammo_material] per shot." + . += span_notice("The \"manipulator missing\" indicator is lit. [src] consumes [mat_cost] units of [ammo_material] per shot.") /obj/item/gun/magnetic/matfed/update_icon() var/list/overlays_to_add = list() @@ -79,9 +79,9 @@ /obj/item/gun/magnetic/matfed/show_ammo() if(mat_storage) - return "It has [mat_storage] out of [max_mat_storage] units of [ammo_material] loaded." + return span_notice("It has [mat_storage] out of [max_mat_storage] units of [ammo_material] loaded.") else - return "It\'s out of [ammo_material]!" + return span_warning("It\'s out of [ammo_material]!") /obj/item/gun/magnetic/matfed/attackby(var/obj/item/thing, var/mob/user) @@ -90,7 +90,7 @@ if(removable_components) if(thing.has_tool_quality(TOOL_CROWBAR)) if(!manipulator) - to_chat(user, "\The [src] has no manipulator installed.") + to_chat(user, span_warning("\The [src] has no manipulator installed.")) return user.put_in_hands(manipulator) user.visible_message("\The [user] levers \the [manipulator] from \the [src].") @@ -103,7 +103,7 @@ if(istype(thing, /obj/item/stock_parts/manipulator)) if(manipulator) - to_chat(user, "\The [src] already has \a [manipulator] installed.") + to_chat(user, span_warning("\The [src] already has \a [manipulator] installed.")) return manipulator = thing user.drop_from_inventory(manipulator, src) @@ -122,7 +122,7 @@ return if(mat_storage + SHEET_MATERIAL_AMOUNT > max_mat_storage) - to_chat(user, "\The [src] cannot hold more [ammo_material].") + to_chat(user, span_warning("\The [src] cannot hold more [ammo_material].")) return loading = TRUE while(mat_storage + SHEET_MATERIAL_AMOUNT <= max_mat_storage && do_after(user,1.5 SECONDS)) @@ -137,7 +137,7 @@ return if(mat_storage + (SHEET_MATERIAL_AMOUNT/2*0.8) > max_mat_storage) - to_chat(user, "\The [src] cannot hold more [ammo_material].") + to_chat(user, span_warning("\The [src] cannot hold more [ammo_material].")) return qdel(M) @@ -192,9 +192,9 @@ /obj/item/gun/magnetic/matfed/phoronbore/examine(mob/user) . = ..() if(rating_modifier) - . += "A display on the side slowly scrolls the text \"BLAST EFFICIENCY [rating_modifier]\"." + . += span_notice("A display on the side slowly scrolls the text \"BLAST EFFICIENCY [rating_modifier]\".") else // rating_mod 0 = something's not right - . += "A display on the side slowly scrolls the text \"ERR: MISSING COMPONENT - EFFICIENCY MODIFICATION INCOMPLETE\"." + . += span_warning("A display on the side slowly scrolls the text \"ERR: MISSING COMPONENT - EFFICIENCY MODIFICATION INCOMPLETE\".") /obj/item/gun/magnetic/matfed/phoronbore/Initialize() . = ..() diff --git a/code/modules/projectiles/guns/magnetic/gasthrower.dm b/code/modules/projectiles/guns/magnetic/gasthrower.dm index e00b68b2c8..a12e7387a3 100644 --- a/code/modules/projectiles/guns/magnetic/gasthrower.dm +++ b/code/modules/projectiles/guns/magnetic/gasthrower.dm @@ -69,10 +69,10 @@ if(loaded) var/obj/item/tank/T = loaded - . += "\The [T]'s pressure meter shows: [T.air_contents.return_pressure()] kpa." + . += span_notice("\The [T]'s pressure meter shows: [T.air_contents.return_pressure()] kpa.") switch(check_ammo()) if(TRUE) - . += "\The [src]'s display registers a proper fuel mixture." + . += span_notice("\The [src]'s display registers a proper fuel mixture.") if(FALSE) - . += "\The [src]'s display registers an improper fuel mixture." + . += span_warning("\The [src]'s display registers an improper fuel mixture.") diff --git a/code/modules/projectiles/guns/magnetic/magnetic.dm b/code/modules/projectiles/guns/magnetic/magnetic.dm index d6ea979737..89305ca377 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic.dm @@ -119,7 +119,7 @@ /obj/item/gun/magnetic/proc/show_ammo() var/list/ammotext = list() if(loaded) - ammotext += "It has \a [loaded] loaded." + ammotext += span_notice("It has \a [loaded] loaded.") return ammotext @@ -129,24 +129,24 @@ . += show_ammo() if(cell) - . += "The installed [cell.name] has a charge level of [round((cell.charge/cell.maxcharge)*100)]%." + . += span_notice("The installed [cell.name] has a charge level of [round((cell.charge/cell.maxcharge)*100)]%.") if(capacitor) - . += "The installed [capacitor.name] has a charge level of [round((capacitor.charge/capacitor.max_charge)*100)]%." + . += span_notice("The installed [capacitor.name] has a charge level of [round((capacitor.charge/capacitor.max_charge)*100)]%.") if(state & ICON_BAD) - . += "The capacitor charge indicator is blinking [span_red("red")]. Maybe you should check the cell or capacitor." + . += span_notice("The capacitor charge indicator is blinking [span_red("red")]. Maybe you should check the cell or capacitor.") else if(state & ICON_CHARGE) - . += "The capacitor charge indicator is [span_orange("amber")]." + . += span_notice("The capacitor charge indicator is [span_orange("amber")].") else - . += "The capacitor charge indicator is [span_green("green")]." + . += span_notice("The capacitor charge indicator is [span_green("green")].") /obj/item/gun/magnetic/attackby(var/obj/item/thing, var/mob/user) if(removable_components) if(istype(thing, /obj/item/cell)) if(cell) - to_chat(user, "\The [src] already has \a [cell] installed.") + to_chat(user, span_warning("\The [src] already has \a [cell] installed.")) return cell = thing user.drop_from_inventory(cell, src) @@ -157,7 +157,7 @@ if(thing.has_tool_quality(TOOL_SCREWDRIVER)) if(!capacitor) - to_chat(user, "\The [src] has no capacitor installed.") + to_chat(user, span_warning("\The [src] has no capacitor installed.")) return user.put_in_hands(capacitor) user.visible_message("\The [user] unscrews \the [capacitor] from \the [src].") @@ -168,7 +168,7 @@ if(istype(thing, /obj/item/stock_parts/capacitor)) if(capacitor) - to_chat(user, "\The [src] already has \a [capacitor] installed.") + to_chat(user, span_warning("\The [src] already has \a [capacitor] installed.")) return capacitor = thing user.drop_from_inventory(capacitor, src) @@ -181,7 +181,7 @@ if(istype(thing, load_type)) if(loaded) - to_chat(user, "\The [src] already has \a [loaded] loaded.") + to_chat(user, span_warning("\The [src] already has \a [loaded] loaded.")) return // This is not strictly necessary for the magnetic gun but something using @@ -239,7 +239,7 @@ if(gun_unreliable && prob(gun_unreliable)) spawn(3) // So that it will still fire - considered modifying Fire() to return a value but burst fire makes that annoying. - visible_message("\The [src] explodes with the force of the shot!") + visible_message(span_danger("\The [src] explodes with the force of the shot!")) explosion(get_turf(src), -1, 0, 2) qdel(src) @@ -279,19 +279,19 @@ projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod/phoron else if(rod.fuel_type == "supermatter") projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod/supermatter - visible_message("The barrel of \the [src] glows a blinding white!") + visible_message(span_danger("The barrel of \the [src] glows a blinding white!")) spawn(5) - visible_message("\The [src] begins to rattle, its acceleration chamber collapsing in on itself!") + visible_message(span_danger("\The [src] begins to rattle, its acceleration chamber collapsing in on itself!")) removable_components = FALSE spawn(15) - audible_message("\The [src]'s power supply begins to overload as the device crumples!", runemessage = "VWRRRRRRRR") //Why are you still holding this? + audible_message(span_critical("\The [src]'s power supply begins to overload as the device crumples!"), runemessage = "VWRRRRRRRR") //Why are you still holding this? playsound(src, 'sound/effects/grillehit.ogg', 10, 1) var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() var/turf/T = get_turf(src) sparks.set_up(2, 1, T) sparks.start() spawn(15) - visible_message("\The [src] explodes in a blinding white light!") + visible_message(span_critical("\The [src] explodes in a blinding white light!")) explosion(src.loc, -1, 1, 2, 3) qdel(src) else diff --git a/code/modules/projectiles/guns/magnetic/magnetic_construction.dm b/code/modules/projectiles/guns/magnetic/magnetic_construction.dm index e8d501c222..ee98bb9f1f 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic_construction.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic_construction.dm @@ -14,7 +14,7 @@ var/datum/material/reinforcing_with = reinforcing.get_material() if(reinforcing_with.name == MAT_STEEL) // Steel if(reinforcing.get_amount() < 5) - to_chat(user, "You need at least 5 [reinforcing.singular_name]\s for this task.") + to_chat(user, span_warning("You need at least 5 [reinforcing.singular_name]\s for this task.")) return reinforcing.use(5) user.visible_message("\The [user] shapes some steel sheets around \the [src] to form a body.") @@ -37,11 +37,11 @@ var/obj/item/weldingtool/welder = thing.get_welder() if(!welder.isOn()) - to_chat(user, "Turn it on first!") + to_chat(user, span_warning("Turn it on first!")) return if(!welder.remove_fuel(0,user)) - to_chat(user, "You need more fuel!") + to_chat(user, span_warning("You need more fuel!")) return user.visible_message("\The [user] welds the barrel of \the [src] into place.") @@ -52,7 +52,7 @@ if(istype(thing, /obj/item/stack/cable_coil) && construction_stage == 5) var/obj/item/stack/cable_coil/cable = thing if(cable.get_amount() < 5) - to_chat(user, "You need at least 5 lengths of cable for this task.") + to_chat(user, span_warning("You need at least 5 lengths of cable for this task.")) return cable.use(5) user.visible_message("\The [user] wires \the [src].") @@ -92,18 +92,18 @@ if(get_dist(user, src) <= 2) switch(construction_stage) if(2) - . += "It has a metal frame loosely shaped around the stock." + . += span_notice("It has a metal frame loosely shaped around the stock.") if(3) - . += "It has a metal frame duct-taped to the stock." + . += span_notice("It has a metal frame duct-taped to the stock.") if(4) - . += "It has a length of pipe attached to the body." + . += span_notice("It has a length of pipe attached to the body.") if(4) - . += "It has a length of pipe welded to the body." + . += span_notice("It has a length of pipe welded to the body.") if(6) - . += "It has a cable mount and capacitor jack wired to the frame." + . += span_notice("It has a cable mount and capacitor jack wired to the frame.") if(7) - . += "It has a single superconducting coil threaded onto the barrel." + . += span_notice("It has a single superconducting coil threaded onto the barrel.") if(8) - . += "It has a pair of superconducting coils threaded onto the barrel." + . += span_notice("It has a pair of superconducting coils threaded onto the barrel.") if(9) - . += "It has three superconducting coils attached to the body, waiting to be secured." + . += span_notice("It has three superconducting coils attached to the body, waiting to be secured.") diff --git a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm index 5f676852ae..8e7b3d5229 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm @@ -29,9 +29,9 @@ /obj/item/gun/magnetic/railgun/show_ammo() var/obj/item/rcd_ammo/ammo = loaded if (ammo) - return list("There are [ammo.remaining] shot\s remaining in \the [loaded].") + return list(span_notice("There are [ammo.remaining] shot\s remaining in \the [loaded].")) else - return list("There is nothing loaded.") + return list(span_notice("There is nothing loaded.")) /obj/item/gun/magnetic/railgun/check_ammo() var/obj/item/rcd_ammo/ammo = loaded @@ -46,7 +46,7 @@ /obj/item/gun/magnetic/railgun/proc/out_of_ammo() loaded.forceMove(get_turf(src)) loaded = null - visible_message("\The [src] beeps and ejects its empty cartridge.","There's a beeping sound!") + visible_message(span_warning("\The [src] beeps and ejects its empty cartridge."),span_warning("There's a beeping sound!")) playsound(src, empty_sound, 40, 1) update_state() @@ -75,7 +75,7 @@ /obj/item/gun/magnetic/railgun/automatic/examine(var/mob/user) . = ..() if(Adjacent(user)) - . += "Someone has scratched Ultima Ratio Regum onto the side of the barrel." + . += span_notice("Someone has scratched Ultima Ratio Regum onto the side of the barrel.") /obj/item/gun/magnetic/railgun/flechette name = "flechette gun" diff --git a/code/modules/projectiles/guns/modular_guns.dm b/code/modules/projectiles/guns/modular_guns.dm index bc0f0524c3..5533fd15f7 100644 --- a/code/modules/projectiles/guns/modular_guns.dm +++ b/code/modules/projectiles/guns/modular_guns.dm @@ -52,16 +52,16 @@ /obj/item/gun/energy/modular/attackby(obj/item/O, mob/user) if(O.has_tool_quality(TOOL_SCREWDRIVER)) - to_chat(user, "You [assembled ? "disassemble" : "assemble"] the gun.") + to_chat(user, span_notice("You [assembled ? "disassemble" : "assemble"] the gun.")) assembled = !assembled playsound(src, O.usesound, 50, 1) return if(O.has_tool_quality(TOOL_CROWBAR)) if(assembled == 1) - to_chat(user, "Disassemble the [src] first!") + to_chat(user, span_warning("Disassemble the [src] first!")) return for(var/obj/item/I in guncomponents) - to_chat(user, "You remove the gun's components.") + to_chat(user, span_notice("You remove the gun's components.")) playsound(src, O.usesound, 50, 1) I.forceMove(get_turf(src)) guncomponents.Remove(I) @@ -72,18 +72,18 @@ if(assembled) // can't put anything in return if(!(O.type in accepted_components))//check if we can accept it - to_chat(user, "You can't add this to [src]!") + to_chat(user, span_warning("You can't add this to [src]!")) return if(guncomponents.len >= max_components) //We have too many componenets and can't fit more. - to_chat(user, "You can't add any more components!") + to_chat(user, span_warning("You can't add any more components!")) return if(istype(O, /obj/item/stock_parts/capacitor) && capacitor_rating == 5) - to_chat(user, "You can't add any more capacitors!") + to_chat(user, span_warning("You can't add any more capacitors!")) return user.drop_item() guncomponents += O O.forceMove(src) - to_chat(user, "You add a component to the [src]") + to_chat(user, span_notice("You add a component to the [src]")) CheckParts() @@ -131,18 +131,18 @@ /obj/item/gun/energy/modular/load_ammo(var/obj/item/C, mob/user) if(istype(C, cell_type)) if(self_recharge || battery_lock) - to_chat(user, "[src] does not have a battery port.") + to_chat(user, span_notice("[src] does not have a battery port.")) return var/obj/item/cell/P = C if(power_supply) - to_chat(user, "[src] already has a power cell.") + to_chat(user, span_notice("[src] already has a power cell.")) else - user.visible_message("[user] is reloading [src].", "You start to insert [P] into [src].") + user.visible_message("[user] is reloading [src].", span_notice("You start to insert [P] into [src].")) if(do_after(user, 10)) user.remove_from_mob(P) power_supply = P P.loc = src - user.visible_message("[user] inserts [P] into [src].", "You insert [P] into [src].") + user.visible_message("[user] inserts [P] into [src].", span_notice("You insert [P] into [src].")) playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) update_icon() update_held_icon() @@ -172,4 +172,4 @@ one_handed_penalty = 4 //dual wielding = no. cell_type = /obj/item/cell //We're bigger. We can use much larger power cells. origin_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 6, TECH_MATERIAL = 5, TECH_BLUESPACE = 4) //its a damn cannon capable of holding a huge amount of parts. - burst_delay = 4 //preventing extreme silliness. \ No newline at end of file + burst_delay = 4 //preventing extreme silliness. diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index fd94b7300f..20fb358a74 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -120,23 +120,23 @@ if(istype(A, /obj/item/ammo_magazine)) var/obj/item/ammo_magazine/AM = A if(!(load_method & AM.mag_type) || caliber != AM.caliber || allowed_magazines && !is_type_in_list(A, allowed_magazines)) - to_chat(user, "[AM] won't load into [src]!") + to_chat(user, span_warning("[AM] won't load into [src]!")) return switch(AM.mag_type) if(MAGAZINE) if(ammo_magazine) - to_chat(user, "[src] already has a magazine loaded.") //already a magazine here + to_chat(user, span_warning("[src] already has a magazine loaded.")) //already a magazine here return if(do_after(user, reload_time * AM.w_class)) user.remove_from_mob(AM) AM.loc = src ammo_magazine = AM - user.visible_message("[user] inserts [AM] into [src].", "You insert [AM] into [src].") + user.visible_message("[user] inserts [AM] into [src].", span_notice("You insert [AM] into [src].")) user.hud_used.update_ammo_hud(user, src) playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) if(SPEEDLOADER) if(loaded.len >= max_shells) - to_chat(user, "[src] is full!") + to_chat(user, span_warning("[src] is full!")) return var/count = 0 for(var/obj/item/ammo_casing/C in AM.stored_ammo) @@ -150,7 +150,7 @@ user.hud_used.update_ammo_hud(user, src) if(do_after(user, reload_time * AM.w_class)) if(count) - user.visible_message("[user] reloads [src].", "You load [count] round\s into [src].") + user.visible_message("[user] reloads [src].", span_notice("You load [count] round\s into [src].")) user.hud_used.update_ammo_hud(user, src) playsound(src, 'sound/weapons/empty.ogg', 50, 1) AM.update_icon() @@ -159,14 +159,14 @@ if(!(load_method & SINGLE_CASING) || caliber != C.caliber) return //incompatible if(loaded.len >= max_shells) - to_chat(user, "[src] is full.") + to_chat(user, span_warning("[src] is full.")) return if(do_after(user, reload_time * C.w_class)) user.remove_from_mob(C) C.loc = src loaded.Insert(1, C) //add to the head of the list - user.visible_message("[user] inserts \a [C] into [src].", "You insert \a [C] into [src].") + user.visible_message("[user] inserts \a [C] into [src].", span_notice("You insert \a [C] into [src].")) playsound(src, 'sound/weapons/empty.ogg', 50, 1) else if(istype(A, /obj/item/storage)) @@ -174,7 +174,7 @@ if(!(load_method & SINGLE_CASING)) return //incompatible - to_chat(user, "You start loading \the [src].") + to_chat(user, span_notice("You start loading \the [src].")) sleep(1 SECOND) for(var/obj/item/ammo_casing/ammo in storage.contents) if(caliber != ammo.caliber) @@ -183,7 +183,7 @@ load_ammo(ammo, user) if(loaded.len >= max_shells) - to_chat(user, "[src] is full.") + to_chat(user, span_warning("[src] is full.")) break sleep(1 SECOND) @@ -194,7 +194,7 @@ /obj/item/gun/projectile/proc/unload_ammo(mob/user, var/allow_dump=1) if(ammo_magazine) user.put_in_hands(ammo_magazine) - user.visible_message("[user] removes [ammo_magazine] from [src].", "You remove [ammo_magazine] from [src].") + user.visible_message("[user] removes [ammo_magazine] from [src].", span_notice("You remove [ammo_magazine] from [src].")) playsound(src, 'sound/weapons/empty.ogg', 50, 1) ammo_magazine.update_icon() ammo_magazine = null @@ -210,16 +210,16 @@ count++ loaded.Cut() if(count) - user.visible_message("[user] unloads [src].", "You unload [count] round\s from [src].") + user.visible_message("[user] unloads [src].", span_notice("You unload [count] round\s from [src].")) else if(load_method & SINGLE_CASING) var/obj/item/ammo_casing/C = loaded[loaded.len] loaded.len-- user.put_in_hands(C) - user.visible_message("[user] removes \a [C] from [src].", "You remove \a [C] from [src].") + user.visible_message("[user] removes \a [C] from [src].", span_notice("You remove \a [C] from [src].")) playsound(src, 'sound/weapons/empty.ogg', 50, 1) user.hud_used.update_ammo_hud(user, src) else - to_chat(user, "[src] is empty.") + to_chat(user, span_warning("[src] is empty.")) update_icon() user.hud_used.update_ammo_hud(user, src) @@ -245,7 +245,7 @@ ammo_magazine.loc = get_turf(src.loc) user.visible_message( "[ammo_magazine] falls out and clatters on the floor!", - "[ammo_magazine] falls out and clatters on the floor!" + span_notice("[ammo_magazine] falls out and clatters on the floor!") ) if(auto_eject_sound) playsound(src, auto_eject_sound, 40, 1) diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 4768c96606..3f147ef160 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -291,13 +291,13 @@ /obj/item/gun/projectile/automatic/l6_saw/special_check(mob/user) if(cover_open) - to_chat(user, "[src]'s cover is open! Close it before firing!") + to_chat(user, span_warning("[src]'s cover is open! Close it before firing!")) return 0 return ..() /obj/item/gun/projectile/automatic/l6_saw/proc/toggle_cover(mob/user) cover_open = !cover_open - to_chat(user, "You [cover_open ? "open" : "close"] [src]'s cover.") + to_chat(user, span_notice("You [cover_open ? "open" : "close"] [src]'s cover.")) update_icon() update_held_icon() @@ -324,13 +324,13 @@ /obj/item/gun/projectile/automatic/l6_saw/load_ammo(var/obj/item/A, mob/user) if(!cover_open) - to_chat(user, "You need to open the cover to load [src].") + to_chat(user, span_warning("You need to open the cover to load [src].")) return ..() /obj/item/gun/projectile/automatic/l6_saw/unload_ammo(mob/user, var/allow_dump=1) if(!cover_open) - to_chat(user, "You need to open the cover to unload [src].") + to_chat(user, span_warning("You need to open the cover to unload [src].")) return ..() diff --git a/code/modules/projectiles/guns/projectile/boltaction.dm b/code/modules/projectiles/guns/projectile/boltaction.dm index 5a1ae152e1..2979aae35a 100644 --- a/code/modules/projectiles/guns/projectile/boltaction.dm +++ b/code/modules/projectiles/guns/projectile/boltaction.dm @@ -69,14 +69,14 @@ /obj/item/gun/projectile/shotgun/pump/rifle/ceremonial/attackby(var/obj/item/A as obj, mob/user as mob) if(sawn_off) - to_chat(user, "The [src] is already shortened!") + to_chat(user, span_warning("The [src] is already shortened!")) return if(istype(A, /obj/item/surgical/circular_saw) || istype(A, /obj/item/melee/energy) || istype(A, /obj/item/pickaxe/plasmacutter) && w_class != ITEMSIZE_NORMAL) - to_chat(user, "You begin to shorten the barrel and stock of \the [src].") + to_chat(user, span_notice("You begin to shorten the barrel and stock of \the [src].")) if(loaded.len) afterattack(user, user) playsound(src, fire_sound, 50, 1) - user.visible_message("[src] goes off!", "The rifle goes off in your face!") + user.visible_message(span_danger("[src] goes off!"), span_danger("The rifle goes off in your face!")) return if(do_after(user, 30)) if(sawn_off) @@ -91,7 +91,7 @@ name = "sawn-off rifle" desc = "The firepower of a rifle, now the size of a pistol, with an effective combat range of about three feet. Uses 7.62mm rounds." pump_animation = "sawn_rifle-cycling" - to_chat(user, "You shorten the barrel and stock of \the [src]!") + to_chat(user, span_warning("You shorten the barrel and stock of \the [src]!")) sawn_off = TRUE else ..() @@ -147,4 +147,4 @@ /obj/item/gun/projectile/shotgun/pump/rifle/verb/scope() set category = "Object" set name = "Use Scope" - set popup_menu = 1 \ No newline at end of file + set popup_menu = 1 diff --git a/code/modules/projectiles/guns/projectile/contender.dm b/code/modules/projectiles/guns/projectile/contender.dm index 77393fd077..541330d87c 100644 --- a/code/modules/projectiles/guns/projectile/contender.dm +++ b/code/modules/projectiles/guns/projectile/contender.dm @@ -30,20 +30,20 @@ loaded -= C if(!retracted_bolt) - to_chat(user, "You cycle back the bolt on [src], ejecting the casing and allowing you to reload.") + to_chat(user, span_notice("You cycle back the bolt on [src], ejecting the casing and allowing you to reload.")) icon_state = icon_retracted retracted_bolt = 1 return 1 else if(retracted_bolt && loaded.len) - to_chat(user, "You cycle the loaded round into the chamber, allowing you to fire.") + to_chat(user, span_notice("You cycle the loaded round into the chamber, allowing you to fire.")) else - to_chat(user, "You cycle the boly back into position, leaving the gun empty.") + to_chat(user, span_notice("You cycle the boly back into position, leaving the gun empty.")) icon_state = initial(icon_state) retracted_bolt = 0 /obj/item/gun/projectile/contender/load_ammo(var/obj/item/A, mob/user) if(!retracted_bolt) - to_chat(user, "You can't load [src] without cycling the bolt.") + to_chat(user, span_notice("You can't load [src] without cycling the bolt.")) return ..() @@ -56,4 +56,4 @@ tactical look. For when you really want to make a hole. This one has been \ modified to work almost like a bolt-action. Uses .357 rounds." icon_state = "pockrifle_b" - icon_retracted = "pockrifle_b-e" \ No newline at end of file + icon_retracted = "pockrifle_b-e" diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm index 4d16f889bc..b4f0e4c8b1 100644 --- a/code/modules/projectiles/guns/projectile/dartgun.dm +++ b/code/modules/projectiles/guns/projectile/dartgun.dm @@ -102,11 +102,11 @@ /obj/item/gun/projectile/dartgun/examine(mob/user) . = ..() if(beakers.len) - . += "[src] contains:" + . += span_notice("[src] contains:") for(var/obj/item/reagent_containers/glass/beaker/B in beakers) if(B.reagents && B.reagents.reagent_list.len) for(var/datum/reagent/R in B.reagents.reagent_list) - . += "[R.volume] units of [R.name]" + . += span_notice("[R.volume] units of [R.name]") /obj/item/gun/projectile/dartgun/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/reagent_containers/glass)) diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 891d78263c..d0eeef4225 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -41,7 +41,7 @@ if(!M.mind) return 0 var/job = M.mind.assigned_role if(job != JOB_DETECTIVE && job != JOB_SECURITY_OFFICER && job != JOB_WARDEN && job != JOB_HEAD_OF_SECURITY ) - to_chat(M, "You don't feel cool enough to name this gun, chump.") + to_chat(M, span_notice("You don't feel cool enough to name this gun, chump.")) return 0 var/input = sanitizeSafe(input(usr, "What do you want to name the gun?", ,""), MAX_NAME_LEN) @@ -234,7 +234,7 @@ if(!user.item_is_in_hands(src)) ..() return - to_chat(user, "You unscrew [silenced] from [src].") + to_chat(user, span_notice("You unscrew [silenced] from [src].")) user.put_in_hands(silenced) silenced = 0 w_class = ITEMSIZE_SMALL @@ -245,10 +245,10 @@ /obj/item/gun/projectile/pistol/attackby(obj/item/I as obj, mob/living/user as mob) if(istype(I, /obj/item/silencer)) if(!user.item_is_in_hands(src)) //if we're not in his hands - to_chat(user, "You'll need [src] in your hands to do that.") + to_chat(user, span_notice("You'll need [src] in your hands to do that.")) return user.drop_item() - to_chat(user, "You screw [I] onto [src].") + to_chat(user, span_notice("You screw [I] onto [src].")) silenced = I //dodgy? w_class = ITEMSIZE_NORMAL I.loc = src //put the silencer into the gun @@ -290,7 +290,7 @@ if(!user.item_is_in_hands(src)) ..() return - to_chat(user, "You unscrew [silenced] from [src].") + to_chat(user, span_notice("You unscrew [silenced] from [src].")) user.put_in_hands(silenced) silenced = 0 update_icon() @@ -300,10 +300,10 @@ /obj/item/gun/projectile/aps/attackby(obj/item/I as obj, mob/living/user as mob) if(istype(I, /obj/item/silencer)) if(!user.item_is_in_hands(src)) //if we're not in his hands - to_chat(user, "You'll need [src] in your hands to do that.") + to_chat(user, span_notice("You'll need [src] in your hands to do that.")) return user.drop_item() - to_chat(user, "You screw [I] onto [src].") + to_chat(user, span_notice("You screw [I] onto [src].")) silenced = I //dodgy? I.loc = src //put the silencer into the gun update_icon() diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 2a8fd9c860..a7a0cfc1e4 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -24,8 +24,8 @@ set category = "Object" chamber_offset = 0 - visible_message("\The [usr] spins the cylinder of \the [src]!", \ - "You hear something metallic spin and click.") + visible_message(span_warning("\The [usr] spins the cylinder of \the [src]!"), \ + span_notice("You hear something metallic spin and click.")) playsound(src, 'sound/weapons/revolver_spin.ogg', 100, 1) loaded = shuffle(loaded) if(rand(1,max_shells) > loaded.len) @@ -64,7 +64,7 @@ var/mob/M = usr if(!M.mind) return 0 if(!M.mind.assigned_role == JOB_DETECTIVE) - to_chat(M, "You don't feel cool enough to name this gun, chump.") + to_chat(M, span_notice("You don't feel cool enough to name this gun, chump.")) return 0 var/input = sanitizeSafe(input(usr, "What do you want to name the gun?", ,""), MAX_NAME_LEN) @@ -92,7 +92,7 @@ if(!M.mind) return 0 var/job = M.mind.assigned_role if(job != JOB_DETECTIVE) - to_chat(M, "You don't feel cool enough to name this gun, chump.") + to_chat(M, span_notice("You don't feel cool enough to name this gun, chump.")) return 0 var/input = sanitizeSafe(input(usr, "What do you want to name the gun?", ,""), MAX_NAME_LEN) @@ -253,7 +253,7 @@ if(!M.mind) return 0 - to_chat(M, "You change the firing mode on \the [src].") + to_chat(M, span_notice("You change the firing mode on \the [src].")) if(!flipped_firing) if(max_shells && secondary_max_shells) max_shells = secondary_max_shells @@ -292,8 +292,8 @@ set category = "Object" chamber_offset = 0 - visible_message("\The [usr] spins the cylinder of \the [src]!", \ - "You hear something metallic spin and click.") + visible_message(span_warning("\The [usr] spins the cylinder of \the [src]!"), \ + span_notice("You hear something metallic spin and click.")) playsound(src, 'sound/weapons/revolver_spin.ogg', 100, 1) if(!flipped_firing) loaded = shuffle(loaded) diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 739b6dc409..9ac452db9f 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -163,7 +163,7 @@ options["Blued"] = "dshotgun_b" var/choice = tgui_input_list(M,"Choose your sprite!","Resprite Gun", options) if(sawn_off) - to_chat(M, "The [src] is already shortened and cannot be resprited!") + to_chat(M, span_warning("The [src] is already shortened and cannot be resprited!")) return if(src && choice && !M.stat && in_range(M,src)) icon_state = options[choice] @@ -174,14 +174,14 @@ //this is largely hacky and bad :( -Pete //less hacky and bad now :) -Ghost /obj/item/gun/projectile/shotgun/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob) if(sawn_off) - to_chat(user, "The [src] is already shortened!") + to_chat(user, span_warning("The [src] is already shortened!")) return if(istype(A, /obj/item/surgical/circular_saw) || istype(A, /obj/item/melee/energy) || istype(A, /obj/item/pickaxe/plasmacutter)) - to_chat(user, "You begin to shorten the barrel of \the [src].") + to_chat(user, span_notice("You begin to shorten the barrel of \the [src].")) if(loaded.len) var/burstsetting = burst burst = 2 - user.visible_message("The shotgun goes off!", "The shotgun goes off in your face!") + user.visible_message(span_danger("The shotgun goes off!"), span_danger("The shotgun goes off in your face!")) Fire_userless(user) user.hud_used.update_ammo_hud(user, src) // TGMC Ammo HUD Port burst = burstsetting @@ -200,7 +200,7 @@ slot_flags |= (SLOT_BELT|SLOT_HOLSTER) // but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - or in a holster, why not. name = "sawn-off shotgun" desc = "Omar's coming!" - to_chat(user, "You shorten the barrel of \the [src]!") + to_chat(user, span_warning("You shorten the barrel of \the [src]!")) sawn_off = TRUE else ..() @@ -233,4 +233,3 @@ load_method = SINGLE_CASING max_shells = 5 ammo_type = /obj/item/ammo_casing/a12g/beanbag - diff --git a/code/modules/projectiles/guns/projectile/shotgun_vr.dm b/code/modules/projectiles/guns/projectile/shotgun_vr.dm index e13507b4b5..88f098ff7a 100644 --- a/code/modules/projectiles/guns/projectile/shotgun_vr.dm +++ b/code/modules/projectiles/guns/projectile/shotgun_vr.dm @@ -45,8 +45,8 @@ var/mob/living/user = loc stock = !stock if(stock) - user.visible_message("With a fluid movement, [user] unfolds their shotgun's stock and foregrip.",\ - "You unfold the shotgun's stock and foregrip.",\ + user.visible_message(span_warning("With a fluid movement, [user] unfolds their shotgun's stock and foregrip."),\ + span_warning("You unfold the shotgun's stock and foregrip."),\ "You hear an ominous click.") icon_state = "compshot" item_state = icon_state @@ -55,7 +55,7 @@ recoil = 1 //As above, stock and foregrip would help with the kick else user.visible_message("\The [user] collapses their shotgun's stock and fold it's foregrip.",\ - "You fold the shotgun's stock and foregrip.",\ + span_notice("You fold the shotgun's stock and foregrip."),\ "You hear a click.") icon_state = "compshotc" item_state = icon_state @@ -82,7 +82,7 @@ if (isliving(usr)) toggle_stock() else - to_chat(usr, "You cannot do this in your current state.") + to_chat(usr, span_notice("You cannot do this in your current state.")) /obj/item/gun/projectile/shotgun/compact/attack_self(mob/user as mob) @@ -92,7 +92,7 @@ if (isliving(usr)) toggle_stock() else - to_chat(usr, "You cannot do this in your current state.") + to_chat(usr, span_notice("You cannot do this in your current state.")) /obj/item/gun/projectile/shotgun/compact/ui_action_click() var/mob/living/user = loc diff --git a/code/modules/projectiles/guns/projectile/smartgun.dm b/code/modules/projectiles/guns/projectile/smartgun.dm index f98fabfc3f..0a8f70f8ac 100644 --- a/code/modules/projectiles/guns/projectile/smartgun.dm +++ b/code/modules/projectiles/guns/projectile/smartgun.dm @@ -51,20 +51,20 @@ /obj/item/gun/projectile/smartgun/load_ammo(var/obj/item/A, mob/user) if(closed) - to_chat(user, "[src] can't be loaded until you un-ready it. (Alt-click)") + to_chat(user, span_warning("[src] can't be loaded until you un-ready it. (Alt-click)")) return return ..() /obj/item/gun/projectile/smartgun/unload_ammo(mob/user, var/allow_dump=0) if(closed) - to_chat(user, "[src] can't be unloaded until you un-ready it. (Alt-click)") + to_chat(user, span_warning("[src] can't be unloaded until you un-ready it. (Alt-click)")) return return ..() /obj/item/gun/projectile/smartgun/AltClick(mob/user) if(ishuman(user) && !user.incapacitated() && Adjacent(user)) if(cycling) - to_chat(user, "[src] is still cycling!") + to_chat(user, span_warning("[src] is still cycling!")) return cycling = TRUE @@ -72,11 +72,11 @@ if(closed) icon_state = "[initial(icon_state)]_open" playsound(src, 'sound/weapons/smartgunopen.ogg', 75, 0) - to_chat(user, "You unready [src] so that it can be reloaded.") + to_chat(user, span_notice("You unready [src] so that it can be reloaded.")) else icon_state = "[initial(icon_state)]_closed" playsound(src, 'sound/weapons/smartgunclose.ogg', 75, 0) - to_chat(user, "You ready [src] so that it can be fired.") + to_chat(user, span_notice("You ready [src] so that it can be fired.")) addtimer(CALLBACK(src, PROC_REF(toggle_real_state)), 2 SECONDS, TIMER_UNIQUE) /obj/item/gun/projectile/smartgun/proc/toggle_real_state() diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 3efdf1f401..62bb668018 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -35,21 +35,21 @@ bolt_open = !bolt_open if(bolt_open) if(chambered) - to_chat(user, "You work the bolt open, ejecting [chambered]!") + to_chat(user, span_notice("You work the bolt open, ejecting [chambered]!")) chambered.loc = get_turf(src) loaded -= chambered chambered = null else - to_chat(user, "You work the bolt open.") + to_chat(user, span_notice("You work the bolt open.")) else - to_chat(user, "You work the bolt closed.") + to_chat(user, span_notice("You work the bolt closed.")) bolt_open = 0 add_fingerprint(user) update_icon() /obj/item/gun/projectile/heavysniper/special_check(mob/user) if(bolt_open) - to_chat(user, "You can't fire [src] while the bolt is open!") + to_chat(user, span_warning("You can't fire [src] while the bolt is open!")) return 0 return ..() @@ -110,4 +110,4 @@ set name = "Use Scope" set popup_menu = 1 - toggle_scope(2.0) \ No newline at end of file + toggle_scope(2.0) diff --git a/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm b/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm index 322819c20c..786d101f33 100644 --- a/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm @@ -11,15 +11,15 @@ return if(chambered) - to_chat(user, "You need to empty the rifle to break it down.") + to_chat(user, span_warning("You need to empty the rifle to break it down.")) else collapse_rifle(user) /obj/item/gun/projectile/heavysniper/proc/collapse_rifle(mob/user) - to_chat(user, "You begin removing \the [src]'s barrel.") + to_chat(user, span_warning("You begin removing \the [src]'s barrel.")) if(do_after(user, 40)) if(user.unEquip(src, force=1)) - to_chat(user, "You remove \the [src]'s barrel.") + to_chat(user, span_warning("You remove \the [src]'s barrel.")) qdel(src) var/obj/item/barrel = new /obj/item/sniper_rifle_part/barrel(user) var/obj/item/sniper_rifle_part/assembly = new /obj/item/sniper_rifle_part/trigger_group(user) @@ -71,14 +71,14 @@ /obj/item/sniper_rifle_part/attack_self(mob/user as mob) if(part_count == 1) - to_chat(user, "You can't disassemble this further!") + to_chat(user, span_warning("You can't disassemble this further!")) return - to_chat(user, "You start disassembling \the [src].") + to_chat(user, span_notice("You start disassembling \the [src].")) if(!do_after(user, 40)) return - to_chat(user, "You disassemble \the [src].") + to_chat(user, span_notice("You disassemble \the [src].")) for(var/obj/item/sniper_rifle_part/P in list(barrel, stock, trigger_group)) if(P.barrel != P) P.barrel = null @@ -94,7 +94,7 @@ /obj/item/sniper_rifle_part/attackby(var/obj/item/sniper_rifle_part/A as obj, mob/user as mob) - to_chat(user, "You begin adding \the [A] to \the [src].") + to_chat(user, span_notice("You begin adding \the [A] to \the [src].")) if(!do_after(user, 30)) return @@ -102,14 +102,14 @@ if(istype(A, /obj/item/sniper_rifle_part/trigger_group)) if(A.part_count > 1 && src.part_count > 1) - to_chat(user, "Disassemble one of these parts first!") + to_chat(user, span_warning("Disassemble one of these parts first!")) return if(!trigger_group) if(user.unEquip(A, force=1)) trigger_group = A else - to_chat(user, "There's already a trigger group!") + to_chat(user, span_warning("There's already a trigger group!")) return else if(istype(A, /obj/item/sniper_rifle_part/barrel)) @@ -117,7 +117,7 @@ if(user.unEquip(A, force=1)) barrel = A else - to_chat(user, "There's already a barrel!") + to_chat(user, span_warning("There's already a barrel!")) return else if(istype(A, /obj/item/sniper_rifle_part/stock)) @@ -125,11 +125,11 @@ if(user.unEquip(A, force=1)) stock = A else - to_chat(user, "There's already a stock!") + to_chat(user, span_warning("There's already a stock!")) return A.forceMove(src) - to_chat(user, "You install \the [A].") + to_chat(user, span_notice("You install \the [A].")) if(A.barrel && !src.barrel) src.barrel = A.barrel diff --git a/code/modules/projectiles/guns/toy.dm b/code/modules/projectiles/guns/toy.dm index c61b899ecf..71c4b0f62d 100644 --- a/code/modules/projectiles/guns/toy.dm +++ b/code/modules/projectiles/guns/toy.dm @@ -277,7 +277,7 @@ /obj/item/gun/energy/lasertag/special_check(var/mob/living/carbon/human/M) if(ishuman(M)) if(!istype(M.wear_suit, required_vest)) - to_chat(M, "You need to be wearing your laser tag vest!") + to_chat(M, span_warning("You need to be wearing your laser tag vest!")) return 0 return ..() diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index b1a5f7a9fa..a72cdbf9bf 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -583,14 +583,14 @@ if(G.affecting.stat == DEAD) var/shield_chance = min(80, (30 * (M.mob_size / 10))) //Small mobs have a harder time keeping a dead body as a shield than a human-sized one. Unathi would have an easier job, if they are made to be SIZE_LARGE in the future. -Mech if(prob(shield_chance)) - visible_message("\The [M] uses [G.affecting] as a shield!") + visible_message(span_danger("\The [M] uses [G.affecting] as a shield!")) if(bump_targets) if(Bump(G.affecting)) return else - visible_message("\The [M] tries to use [G.affecting] as a shield, but fails!") + visible_message(span_danger("\The [M] tries to use [G.affecting] as a shield, but fails!")) else - visible_message("\The [M] uses [G.affecting] as a shield!") + visible_message(span_danger("\The [M] uses [G.affecting] as a shield!")) if(bump_targets) if(Bump(G.affecting)) return //If Bump() returns 0 (keep going) then we continue on to attack M. diff --git a/code/modules/projectiles/projectile/arc.dm b/code/modules/projectiles/projectile/arc.dm index 331bbadb0c..0324d273cc 100644 --- a/code/modules/projectiles/projectile/arc.dm +++ b/code/modules/projectiles/projectile/arc.dm @@ -184,7 +184,7 @@ attack_mob(L) spawn() - T.visible_message("\The [src] covers \the [T] in a corrosive paste!") + T.visible_message(span_warning("\The [src] covers \the [T] in a corrosive paste!")) for(var/turf/simulated/floor/F in view(2, T)) spawn() var/obj/effect/effect/water/splash = new(T) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 03d49db9a6..9068f24484 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -252,11 +252,11 @@ var/obj/item/clothing/suit/redtag/S = M.wear_suit if (S.lasertag_health <= 1) M.Weaken(5) - to_chat(M,"You have been defeated!") + to_chat(M,span_warning("You have been defeated!")) S.lasertag_health = initial(S.lasertag_health) else S.lasertag_health-- - to_chat(M,"Danger! You have [num2text(S.lasertag_health)] hits remaining!") + to_chat(M,span_warning("Danger! You have [num2text(S.lasertag_health)] hits remaining!")) return 1 /obj/item/projectile/beam/lasertag/red @@ -281,11 +281,11 @@ var/obj/item/clothing/suit/bluetag/S = M.wear_suit if(S.lasertag_health <= 1) M.Weaken(5) - to_chat(M,"You have been defeated!") + to_chat(M,span_warning("You have been defeated!")) S.lasertag_health = initial(S.lasertag_health) else S.lasertag_health-- - to_chat(M,"Danger! You have [num2text(S.lasertag_health)] hits remaining!") + to_chat(M,span_warning("Danger! You have [num2text(S.lasertag_health)] hits remaining!")) return 1 /obj/item/projectile/beam/lasertag/omni//A laser tag bolt that stuns EVERYONE @@ -504,9 +504,9 @@ pulse.anchored = TRUE spawn(20) qdel(pulse) - to_chat(target, "As the beam strikes you, your injuries close up!") + to_chat(target, span_notice("As the beam strikes you, your injuries close up!")) M.adjustBruteLoss(-15) M.adjustFireLoss(-15) M.adjustToxLoss(-5) M.adjustOxyLoss(-5) - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index f68895bd84..3d4d446488 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -62,7 +62,7 @@ if(prob(chance)) if(A.opacity) //display a message so that people on the other side aren't so confused - A.visible_message("\The [src] pierces through \the [A]!") + A.visible_message(span_warning("\The [src] pierces through \the [A]!")) return 1 return 0 diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm index 0ec50a4ee6..8576dc880e 100644 --- a/code/modules/projectiles/projectile/change.dm +++ b/code/modules/projectiles/projectile/change.dm @@ -92,10 +92,10 @@ else new_mob.key = M.key - to_chat(new_mob, "Your form morphs into that of \a [lowertext(randomize)].") + to_chat(new_mob, span_warning("Your form morphs into that of \a [lowertext(randomize)].")) qdel(M) return else - to_chat(M, "Your form morphs into that of \a [lowertext(randomize)].") + to_chat(M, span_warning("Your form morphs into that of \a [lowertext(randomize)].")) return diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index e56115614b..9397fe3972 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -46,7 +46,7 @@ //snap pop playsound(src, 'sound/effects/snap.ogg', 50, 1) - src.visible_message("\The [src] explodes in a bright flash!") + src.visible_message(span_warning("\The [src] explodes in a bright flash!")) var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(2, 1, T) @@ -243,7 +243,7 @@ /obj/item/projectile/energy/plasmastun/proc/bang(var/mob/living/carbon/M) - to_chat(M, "You hear a loud roar.") + to_chat(M, span_danger("You hear a loud roar.")) playsound(src, 'sound/effects/bang.ogg', 50, 1) var/ear_safety = 0 ear_safety = M.get_ear_protection() @@ -257,13 +257,13 @@ M.ear_damage += rand(1, 10) M.ear_deaf = max(M.ear_deaf,15) if (M.ear_damage >= 15) - to_chat(M, "Your ears start to ring badly!") + to_chat(M, span_danger("Your ears start to ring badly!")) if (prob(M.ear_damage - 5)) - to_chat(M, "You can't hear anything!") + to_chat(M, span_danger("You can't hear anything!")) M.sdisabilities |= DEAF else if (M.ear_damage >= 5) - to_chat(M, "Your ears start to ring!") + to_chat(M, span_danger("Your ears start to ring!")) M.update_icons() //Just to apply matrix transform for laying asap /obj/item/projectile/energy/plasmastun/on_hit(var/atom/target) diff --git a/code/modules/projectiles/projectile/hook.dm b/code/modules/projectiles/projectile/hook.dm index 324ff8c559..e4b3ca6626 100644 --- a/code/modules/projectiles/projectile/hook.dm +++ b/code/modules/projectiles/projectile/hook.dm @@ -90,7 +90,7 @@ turfs += T if(turfs.len) var/turf/target = pick(turfs) - visible_message("[H]'s [W] goes off due to \the [src]!") + visible_message(span_danger("[H]'s [W] goes off due to \the [src]!")) return W.afterattack(target,H) if(!(H.species.flags & NO_SLIP) && prob(50)) @@ -98,9 +98,9 @@ H.apply_effect(3, WEAKEN, armor_check) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) if(armor_check < 60) - visible_message("\The [src] has pushed [H]!") + visible_message(span_danger("\The [src] has pushed [H]!")) else - visible_message("\The [src] attempted to push [H]!") + visible_message(span_warning("\The [src] attempted to push [H]!")) return else @@ -111,7 +111,7 @@ for(var/obj/item/I in holding) if(I) H.drop_from_inventory(I) - visible_message("\The [src] has disarmed [H]!") + visible_message(span_danger("\The [src] has disarmed [H]!")) playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) return @@ -151,7 +151,7 @@ spawn(2) playsound(target, crack_sound, 40, 1) - visible_message("\The [T] is snatched by \the [src]!") + visible_message(span_notice("\The [T] is snatched by \the [src]!")) T.throw_at(get_turf(firer), 7, 1, src) success = TRUE else if(isliving(target) && !done_mob_unique) @@ -163,12 +163,12 @@ if(message == "slaps") spawn(1) playsound(src, 'sound/effects/snap.ogg', 50, 1) - visible_message("\The [src] [message] [target].") + visible_message(span_notice("\The [src] [message] [target].")) done_mob_unique = TRUE success = TRUE if(I_HURT) if(prob(10) && istype(L, /mob/living/carbon/human)) - to_chat(L, "\The [src] rips at your hands!") + to_chat(L, span_warning("\The [src] rips at your hands!")) ranged_disarm(L) success = TRUE done_mob_unique = TRUE @@ -176,7 +176,7 @@ if(prob(disarm_chance) && istype(L, /mob/living/carbon/human)) ranged_disarm(L) else - L.visible_message("\The [src] sends \the [L] stumbling backwards.") + L.visible_message(span_danger("\The [src] sends \the [L] stumbling backwards.")) L.throw_at(get_turf(get_step(L,get_dir(firer,L))), 1, 1, src) done_mob_unique = TRUE success = TRUE @@ -184,7 +184,7 @@ var/turf/STurf = get_turf(L) spawn(2) playsound(STurf, crack_sound, 60, 1) - L.visible_message("\The [src] rips [L] towards \the [firer]!") + L.visible_message(span_critical("\The [src] rips [L] towards \the [firer]!")) L.throw_at(get_turf(get_step(firer,get_dir(firer,L))), 6, 1, src) done_mob_unique = TRUE success = TRUE diff --git a/code/modules/projectiles/projectile/magnetic.dm b/code/modules/projectiles/projectile/magnetic.dm index b1041d6d17..afc16d3b40 100644 --- a/code/modules/projectiles/projectile/magnetic.dm +++ b/code/modules/projectiles/projectile/magnetic.dm @@ -117,10 +117,10 @@ /obj/item/projectile/bullet/magnetic/fuelrod/on_impact(var/atom/A) //Future-proofing, again. In the event new fuel rods are introduced, and have special effects for when they stop flying. if(src.loc) if(detonate_travel && detonate_mob) - visible_message("\The [src] shatters in a violent explosion!") + visible_message(span_warning("\The [src] shatters in a violent explosion!")) explosion(src.loc, 1, 1, 3, 4) else if(detonate_travel) - visible_message("\The [src] explodes in a shower of embers!") + visible_message(span_warning("\The [src] explodes in a shower of embers!")) explosion(src.loc, -1, 1, 2, 3) ..(A) @@ -163,7 +163,7 @@ /obj/item/projectile/bullet/magnetic/fuelrod/supermatter/on_hit(var/atom/target, var/blocked = 0, var/def_zone = null) //You cannot touch the supermatter without disentigrating. Assumedly, this is true for condensed rods of it flying at relativistic speeds. if(istype(target,/turf/simulated/wall) || istype(target,/mob/living)) - target.visible_message("The [src] burns a perfect hole through \the [target] with a blinding flash!") + target.visible_message(span_danger("The [src] burns a perfect hole through \the [target] with a blinding flash!")) playsound(target, 'sound/effects/teleport.ogg', 40, 0) return ..(target, blocked, def_zone) @@ -200,4 +200,4 @@ explosion(A, -1, -1, 1, 3) return ..() else - ..() \ No newline at end of file + ..() diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 7e34d74f33..8e2f2c5176 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -279,7 +279,7 @@ if(isturf(target.loc)) var/obj/effect/spider/stickyweb/W = locate() in get_turf(target) if(!W && prob(75)) - visible_message("\The [src] splatters a layer of web on \the [target]!") + visible_message(span_danger("\The [src] splatters a layer of web on \the [target]!")) new /obj/effect/spider/stickyweb(target.loc) ..() @@ -339,17 +339,17 @@ target_limb.dislocate() if(armor_special > 1) - target.visible_message("\The [src] slams into \the [target]'s [target_limb], reverberating loudly!") + target.visible_message(span_cult("\The [src] slams into \the [target]'s [target_limb], reverberating loudly!")) else if(armor_special) - target.visible_message("\The [src] slams into \the [target]'s [target_limb] with a low rumble!") + target.visible_message(span_cult("\The [src] slams into \the [target]'s [target_limb] with a low rumble!")) ..() /obj/item/projectile/beam/tungsten/on_impact(var/atom/A) if(istype(A,/turf/simulated/shuttle/wall) || istype(A,/turf/simulated/wall) || (istype(A,/turf/simulated/mineral) && A.density) || istype(A,/obj/mecha) || istype(A,/obj/machinery/door)) var/blast_dir = src.dir - A.visible_message("\The [A] begins to glow!") + A.visible_message(span_danger("\The [A] begins to glow!")) spawn(2 SECONDS) var/blastloc = get_step(A, blast_dir) if(blastloc) diff --git a/code/modules/projectiles/targeting/targeting_mob.dm b/code/modules/projectiles/targeting/targeting_mob.dm index 1f2921354b..f80255c2b5 100644 --- a/code/modules/projectiles/targeting/targeting_mob.dm +++ b/code/modules/projectiles/targeting/targeting_mob.dm @@ -12,7 +12,7 @@ M.aiming = new(src) M.aiming.toggle_active() else - to_chat(src, "This verb may only be used by living mobs, sorry.") + to_chat(src, span_warning("This verb may only be used by living mobs, sorry.")) return /mob/living/proc/stop_aiming(var/obj/item/thing, var/no_message = 0) @@ -63,4 +63,4 @@ m_intent = intent if(hud_used) if (hud_used.move_intent) - hud_used.move_intent.icon_state = intent == "walk" ? "walking" : "running" \ No newline at end of file + hud_used.move_intent.icon_state = intent == "walk" ? "walking" : "running" diff --git a/code/modules/projectiles/targeting/targeting_overlay.dm b/code/modules/projectiles/targeting/targeting_overlay.dm index d53c5dd7cc..486b3a93f1 100644 --- a/code/modules/projectiles/targeting/targeting_overlay.dm +++ b/code/modules/projectiles/targeting/targeting_overlay.dm @@ -110,24 +110,24 @@ if(!locked && lock_time <= world.time) locked = 1 to_chat(owner, "You are locked onto your target.") - to_chat(aiming_at, "The gun is trained on you!") + to_chat(aiming_at, span_danger("The gun is trained on you!")) update_icon() var/cancel_aim = 1 var/mob/living/carbon/human/H = owner if(!(aiming_with in owner) || (istype(H) && !H.item_is_in_hands(aiming_with))) - to_chat(owner, "You must keep hold of your weapon!") + to_chat(owner, span_warning("You must keep hold of your weapon!")) else if(owner.eye_blind) - to_chat(owner, "You are blind and cannot see your target!") + to_chat(owner, span_warning("You are blind and cannot see your target!")) else if(!aiming_at || !istype(aiming_at.loc, /turf)) - to_chat(owner, "You have lost sight of your target!") + to_chat(owner, span_warning("You have lost sight of your target!")) else if(owner.incapacitated() || owner.lying || owner.restrained()) - to_chat(owner, "You must be conscious and standing to keep track of your target!") + to_chat(owner, span_warning("You must be conscious and standing to keep track of your target!")) else if(aiming_at.alpha <= 50 || (aiming_at.invisibility > owner.see_invisible)) - to_chat(owner, "Your target has become invisible!") + to_chat(owner, span_warning("Your target has become invisible!")) else if(get_dist(get_turf(owner), get_turf(aiming_at)) > 7) // !(owner in viewers(aiming_at, 7)) - to_chat(owner, "Your target is too far away to track!") + to_chat(owner, span_warning("Your target is too far away to track!")) else cancel_aim = 0 @@ -147,31 +147,31 @@ return if(owner.incapacitated()) - to_chat(owner, "You cannot aim a gun in your current state.") + to_chat(owner, span_warning("You cannot aim a gun in your current state.")) return if(owner.lying) - to_chat(owner, "You cannot aim a gun while prone.") + to_chat(owner, span_warning("You cannot aim a gun while prone.")) return if(owner.restrained()) - to_chat(owner, "You cannot aim a gun while handcuffed.") + to_chat(owner, span_warning("You cannot aim a gun while handcuffed.")) return if(target.alpha <= 50) - to_chat(owner, "You cannot aim at something you cannot see.") + to_chat(owner, span_warning("You cannot aim at something you cannot see.")) return if(aiming_at) if(aiming_at == target) return aiming_at.aimed -= src - owner.visible_message("\The [owner] turns \the [thing] on \the [target]!") + owner.visible_message(span_danger("\The [owner] turns \the [thing] on \the [target]!")) else - owner.visible_message("\The [owner] aims \the [thing] at \the [target]!") + owner.visible_message(span_danger("\The [owner] aims \the [thing] at \the [target]!")) log_and_message_admins("aimed \a [thing] at [key_name(target)].") if(owner.client) owner.client.add_gun_icons() - to_chat(target, "You now have a gun pointed at you. No sudden moves!") - to_chat(target, "If you fail to comply with your assailant, you accept the consequences of your actions.") + to_chat(target, span_danger("You now have a gun pointed at you. No sudden moves!")) + to_chat(target, span_critical("If you fail to comply with your assailant, you accept the consequences of your actions.")) aiming_with = thing aiming_at = target if(istype(aiming_with, /obj/item/gun)) @@ -204,10 +204,10 @@ if(owner.client) if(active) - to_chat(owner, "You will now aim rather than fire.") + to_chat(owner, span_notice("You will now aim rather than fire.")) owner.client.add_gun_icons() else - to_chat(owner, "You will no longer aim rather than fire.") + to_chat(owner, span_notice("You will no longer aim rather than fire.")) owner.client.remove_gun_icons() owner.gun_setting_icon.icon_state = "gun[active]" @@ -224,4 +224,3 @@ aiming_at = null loc = null STOP_PROCESSING(SSobj, src) - diff --git a/code/modules/projectiles/targeting/targeting_triggers.dm b/code/modules/projectiles/targeting/targeting_triggers.dm index 67ac8f1fed..7f0dd162aa 100644 --- a/code/modules/projectiles/targeting/targeting_triggers.dm +++ b/code/modules/projectiles/targeting/targeting_triggers.dm @@ -21,9 +21,9 @@ return owner.setClickCooldown(5) // Spam prevention, essentially. if(owner.a_intent == I_HELP && owner.client?.prefs?.read_preference(/datum/preference/toggle/safefiring)) - to_chat(owner, "You refrain from firing \the [aiming_with] as your intent is set to help.") + to_chat(owner, span_warning("You refrain from firing \the [aiming_with] as your intent is set to help.")) return - owner.visible_message("\The [owner] pulls the trigger reflexively!") + owner.visible_message(span_danger("\The [owner] pulls the trigger reflexively!")) var/obj/item/gun/G = aiming_with if(istype(G)) G.Fire(aiming_at, owner, reflex = 1) diff --git a/code/modules/random_map/automata/diona.dm b/code/modules/random_map/automata/diona.dm index 2966c172c2..b94e4e60f5 100644 --- a/code/modules/random_map/automata/diona.dm +++ b/code/modules/random_map/automata/diona.dm @@ -6,7 +6,7 @@ if(can_open == WALL_OPENING) return can_open = WALL_CAN_OPEN - user.visible_message("\The [user] strokes its feelers against \the [src] and the biomass [density ? "moves aside" : "closes up"].") + user.visible_message(span_alium("\The [user] strokes its feelers against \the [src] and the biomass [density ? "moves aside" : "closes up"].")) toggle_open(user) sleep(15) if(can_open == WALL_CAN_OPEN) can_open = 0 @@ -169,4 +169,4 @@ V.growth = 3 V.update_icon() spawn(1) - V.spread() \ No newline at end of file + V.spread() diff --git a/code/modules/random_map/drop/droppod_doors.dm b/code/modules/random_map/drop/droppod_doors.dm index 78df7a6699..84828b76f2 100644 --- a/code/modules/random_map/drop/droppod_doors.dm +++ b/code/modules/random_map/drop/droppod_doors.dm @@ -25,7 +25,7 @@ /obj/structure/droppod_door/attack_hand(var/mob/user) if(deploying) return - to_chat(user, "You prime the explosive bolts. Better get clear!") + to_chat(user, span_danger("You prime the explosive bolts. Better get clear!")) sleep(30) deploy() @@ -34,7 +34,7 @@ return deployed = 1 - visible_message("The explosive bolts on \the [src] detonate, throwing it open!") + visible_message(span_danger("The explosive bolts on \the [src] detonate, throwing it open!")) playsound(src, 'sound/effects/bang.ogg', 50, 1, 5) // This is shit but it will do for the sake of testing. diff --git a/code/modules/random_map/noise/ore.dm b/code/modules/random_map/noise/ore.dm index 1ad9153866..8466dd0688 100644 --- a/code/modules/random_map/noise/ore.dm +++ b/code/modules/random_map/noise/ore.dm @@ -25,13 +25,13 @@ deep_count++ // Sanity check. if(surface_count < MIN_SURFACE_COUNT) - admin_notice("Insufficient surface minerals. Rerolling...", R_DEBUG) + admin_notice(span_danger("Insufficient surface minerals. Rerolling..."), R_DEBUG) return 0 else if(rare_count < MIN_RARE_COUNT) - admin_notice("Insufficient rare minerals. Rerolling...", R_DEBUG) + admin_notice(span_danger("Insufficient rare minerals. Rerolling..."), R_DEBUG) return 0 else if(deep_count < MIN_DEEP_COUNT) - admin_notice("Insufficient deep minerals. Rerolling...", R_DEBUG) + admin_notice(span_danger("Insufficient deep minerals. Rerolling..."), R_DEBUG) return 0 else return 1 diff --git a/code/modules/random_map/random_map.dm b/code/modules/random_map/random_map.dm index a563f16c11..67bc78cd0c 100644 --- a/code/modules/random_map/random_map.dm +++ b/code/modules/random_map/random_map.dm @@ -56,7 +56,7 @@ var/global/list/map_count = list() set_map_size() var/start_time = world.timeofday - if(!do_not_announce) admin_notice("Generating [name].", R_DEBUG) + if(!do_not_announce) admin_notice(span_danger("Generating [name]."), R_DEBUG) sleep(-1) // Testing needed to see how reliable this is (asynchronous calls, called during worldgen), DM ref is not optimistic @@ -71,9 +71,9 @@ var/global/list/map_count = list() if(!do_not_announce) if(!failed) - admin_notice("[capitalize(name)] generation completed in [round(0.1*(world.timeofday-start_time),0.1)] seconds.", R_DEBUG) + admin_notice(span_danger("[capitalize(name)] generation completed in [round(0.1*(world.timeofday-start_time),0.1)] seconds."), R_DEBUG) else - admin_notice("[capitalize(name)] failed to generate ([round(0.1*(world.timeofday-start_time),0.1)] seconds): could not produce sane map.", R_DEBUG) + admin_notice(span_danger("[capitalize(name)] failed to generate ([round(0.1*(world.timeofday-start_time),0.1)] seconds): could not produce sane map."), R_DEBUG) /datum/random_map/proc/get_map_cell(var/x,var/y) if(!map) diff --git a/code/modules/reagents/hoses/hose_connector.dm b/code/modules/reagents/hoses/hose_connector.dm index a6423dbe98..0983d5262a 100644 --- a/code/modules/reagents/hoses/hose_connector.dm +++ b/code/modules/reagents/hoses/hose_connector.dm @@ -25,7 +25,7 @@ /obj/item/stack/hose/CtrlClick(mob/user) if(remembered) - to_chat(user, "You wind \the [src] back up.") + to_chat(user, span_notice("You wind \the [src] back up.")) remembered = null return @@ -50,18 +50,18 @@ if(remembered && remembered.valid_connection(AC)) var/distancetonode = get_dist(remembered,AC) if(distancetonode > world.view) - to_chat(user, "\The [src] would probably burst if it were this long.") + to_chat(user, span_notice("\The [src] would probably burst if it were this long.")) else if(distancetonode <= amount) - to_chat(user, "You join \the [remembered] to \the [AC]") + to_chat(user, span_notice("You join \the [remembered] to \the [AC]")) remembered.setup_hoses(AC) use(distancetonode) remembered = null else - to_chat(user, "You do not have enough tubing to connect the sockets.") + to_chat(user, span_notice("You do not have enough tubing to connect the sockets.")) else remembered = AC - to_chat(user, "You connect one end of tubing to \the [AC].") + to_chat(user, span_notice("You connect one end of tubing to \the [AC].")) else var/choice = tgui_input_list(usr, "Select a target hose connector.", "Socket Selection", available_sockets) @@ -72,20 +72,20 @@ if(remembered.valid_connection(CC)) var/distancetonode = get_dist(remembered, CC) if(distancetonode > world.view) - to_chat(user, "\The [src] would probably burst if it were this long.") + to_chat(user, span_notice("\The [src] would probably burst if it were this long.")) else if(distancetonode <= amount) - to_chat(user, "You join \the [remembered] to \the [CC]") + to_chat(user, span_notice("You join \the [remembered] to \the [CC]")) remembered.setup_hoses(CC) use(distancetonode) remembered = null else - to_chat(user, "You do not have enough tubing to connect the sockets.") + to_chat(user, span_notice("You do not have enough tubing to connect the sockets.")) else remembered = CC - to_chat(user, "You connect one end of tubing to \the [CC].") + to_chat(user, span_notice("You connect one end of tubing to \the [CC].")) return diff --git a/code/modules/reagents/machinery/chem_master.dm b/code/modules/reagents/machinery/chem_master.dm index f0450804b3..4daf890ed8 100644 --- a/code/modules/reagents/machinery/chem_master.dm +++ b/code/modules/reagents/machinery/chem_master.dm @@ -298,7 +298,7 @@ var/amount_per_pill = CLAMP(reagents.total_volume / count, 0, MAX_UNITS_PER_PILL) while(count--) if(reagents.total_volume <= 0) - to_chat(usr, "Not enough reagents to create these pills!") + to_chat(usr, span_notice("Not enough reagents to create these pills!")) return var/obj/item/reagent_containers/pill/P = new(loc) @@ -334,7 +334,7 @@ // var/is_medical_patch = chemical_safety_check(reagents) while(count--) if(reagents.total_volume <= 0) - to_chat(usr, "Not enough reagents to create these patches!") + to_chat(usr, span_notice("Not enough reagents to create these patches!")) return var/obj/item/reagent_containers/pill/patch/P = new(loc) @@ -361,7 +361,7 @@ var/amount_per_bottle = CLAMP(reagents.total_volume / count, 0, MAX_UNITS_PER_BOTTLE) while(count--) if(reagents.total_volume <= 0) - to_chat(usr, "Not enough reagents to create these bottles!") + to_chat(usr, span_notice("Not enough reagents to create these bottles!")) return var/obj/item/reagent_containers/glass/bottle/P = new(loc) P.name = "[answer] bottle" @@ -417,7 +417,7 @@ var/datum/reagent/R = reagent_list[idx] printing = TRUE - visible_message("[src] rattles and prints out a sheet of paper.") + visible_message(span_notice("[src] rattles and prints out a sheet of paper.")) // playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) var/obj/item/paper/P = new /obj/item/paper(loc) diff --git a/code/modules/reagents/machinery/dispenser/cartridge.dm b/code/modules/reagents/machinery/dispenser/cartridge.dm index 5af1388dee..0324ca049d 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge.dm @@ -41,13 +41,13 @@ /obj/item/reagent_containers/chem_disp_cartridge/proc/setLabel(L, mob/user = null) if(L) if(user) - to_chat(user, "You set the label on \the [src] to '[L]'.") + to_chat(user, span_notice("You set the label on \the [src] to '[L]'.")) label = L name = "[initial(name)] - '[L]'" else if(user) - to_chat(user, "You clear the label on \the [src].") + to_chat(user, span_notice("You clear the label on \the [src].")) label = "" name = initial(name) @@ -68,28 +68,28 @@ target.add_fingerprint(user) if(!target.reagents.total_volume && target.reagents) - to_chat(user, "\The [target] is empty.") + to_chat(user, span_warning("\The [target] is empty.")) return if(reagents.total_volume >= reagents.maximum_volume) - to_chat(user, "\The [src] is full.") + to_chat(user, span_warning("\The [src] is full.")) return var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this) - to_chat(user, "You fill \the [src] with [trans] units of the contents of \the [target].") + to_chat(user, span_notice("You fill \the [src] with [trans] units of the contents of \the [target].")) else if(target.is_open_container() && target.reagents) //Something like a glass. Player probably wants to transfer TO it. if(!reagents.total_volume) - to_chat(user, "\The [src] is empty.") + to_chat(user, span_warning("\The [src] is empty.")) return if(target.reagents.total_volume >= target.reagents.maximum_volume) - to_chat(user, "\The [target] is full.") + to_chat(user, span_warning("\The [target] is full.")) return var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this) - to_chat(user, "You transfer [trans] units of the solution to \the [target].") + to_chat(user, span_notice("You transfer [trans] units of the solution to \the [target].")) else return ..() diff --git a/code/modules/reagents/machinery/dispenser/dispenser2.dm b/code/modules/reagents/machinery/dispenser/dispenser2.dm index 6e2e6e42fd..015234cf62 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser2.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser2.dm @@ -63,27 +63,27 @@ /obj/machinery/chemical_dispenser/proc/add_cartridge(obj/item/reagent_containers/chem_disp_cartridge/C, mob/user) if(!istype(C)) if(user) - to_chat(user, "\The [C] will not fit in \the [src]!") + to_chat(user, span_warning("\The [C] will not fit in \the [src]!")) return if(cartridges.len >= max_catriges) if(user) - to_chat(user, "\The [src] does not have any slots open for \the [C] to fit into!") + to_chat(user, span_warning("\The [src] does not have any slots open for \the [C] to fit into!")) return if(!C.label) if(user) - to_chat(user, "\The [C] does not have a label!") + to_chat(user, span_warning("\The [C] does not have a label!")) return if(cartridges[C.label]) if(user) - to_chat(user, "\The [src] already contains a cartridge with that label!") + to_chat(user, span_warning("\The [src] already contains a cartridge with that label!")) return if(user) user.drop_from_inventory(C) - to_chat(user, "You add \the [C] to \the [src].") + to_chat(user, span_notice("You add \the [C] to \the [src].")) C.loc = src cartridges[C.label] = C @@ -98,15 +98,15 @@ /obj/machinery/chemical_dispenser/attackby(obj/item/W, mob/user) if(W.has_tool_quality(TOOL_WRENCH)) playsound(src, W.usesound, 50, 1) - to_chat(user, "You begin to [anchored ? "un" : ""]fasten \the [src].") + to_chat(user, span_notice("You begin to [anchored ? "un" : ""]fasten \the [src].")) if (do_after(user, 20 * W.toolspeed)) user.visible_message( - "\The [user] [anchored ? "un" : ""]fastens \the [src].", - "You have [anchored ? "un" : ""]fastened \the [src].", + span_notice("\The [user] [anchored ? "un" : ""]fastens \the [src]."), + span_notice("You have [anchored ? "un" : ""]fastened \the [src]."), "You hear a ratchet.") anchored = !anchored else - to_chat(user, "You decide not to [anchored ? "un" : ""]fasten \the [src].") + to_chat(user, span_notice("You decide not to [anchored ? "un" : ""]fasten \the [src].")) else if(istype(W, /obj/item/reagent_containers/chem_disp_cartridge)) add_cartridge(W, user) @@ -116,29 +116,29 @@ if(!label) return var/obj/item/reagent_containers/chem_disp_cartridge/C = remove_cartridge(label) if(C) - to_chat(user, "You remove \the [C] from \the [src].") + to_chat(user, span_notice("You remove \the [C] from \the [src].")) C.loc = loc playsound(src, W.usesound, 50, 1) else if(istype(W, /obj/item/reagent_containers/glass) || istype(W, /obj/item/reagent_containers/food)) if(container) - to_chat(user, "There is already \a [container] on \the [src]!") + to_chat(user, span_warning("There is already \a [container] on \the [src]!")) return var/obj/item/reagent_containers/RC = W if(!accept_drinking && istype(RC,/obj/item/reagent_containers/food)) - to_chat(user, "This machine only accepts beakers!") + to_chat(user, span_warning("This machine only accepts beakers!")) return if(!RC.is_open_container()) - to_chat(user, "You don't see how \the [src] could dispense reagents into \the [RC].") + to_chat(user, span_warning("You don't see how \the [src] could dispense reagents into \the [RC].")) return container = RC user.drop_from_inventory(RC) RC.loc = src - to_chat(user, "You set \the [RC] on \the [src].") + to_chat(user, span_notice("You set \the [RC] on \the [src].")) else return ..() diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index 05c752ad0f..e821a54366 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -43,12 +43,12 @@ /obj/structure/reagent_dispensers/examine(mob/user) . = ..() if(get_dist(user, src) <= 2) - . += "It contains:" + . += span_notice("It contains:") if(reagents && reagents.reagent_list.len) for(var/datum/reagent/R in reagents.reagent_list) - . += "[R.volume] units of [R.name]" + . += span_notice("[R.volume] units of [R.name]") else - . += "Nothing." + . += span_notice("Nothing.") /obj/structure/reagent_dispensers/verb/set_APTFT() //set amount_per_transfer_from_this set name = "Set transfer amount" @@ -187,15 +187,15 @@ . = ..() if(get_dist(user, src) <= 2) if(modded) - . += "Fuel faucet is wrenched open, leaking the fuel!" + . += span_warning("Fuel faucet is wrenched open, leaking the fuel!") if(rig) - . += "There is some kind of device rigged to the tank." + . += span_notice("There is some kind of device rigged to the tank.") /obj/structure/reagent_dispensers/fueltank/attack_hand() if (rig) usr.visible_message("[usr] begins to detach [rig] from \the [src].", "You begin to detach [rig] from \the [src]") if(do_after(usr, 20)) - usr.visible_message("[usr] detaches [rig] from \the [src].", "You detach [rig] from \the [src]") + usr.visible_message(span_notice("[usr] detaches [rig] from \the [src]."), span_notice("You detach [rig] from \the [src]")) rig.loc = get_turf(usr) rig = null overlays = new/list() @@ -213,11 +213,11 @@ leak_fuel(amount_per_transfer_from_this) if (istype(W,/obj/item/assembly_holder)) if (rig) - to_chat(user, "There is another device in the way.") + to_chat(user, span_warning("There is another device in the way.")) return ..() user.visible_message("[user] begins rigging [W] to \the [src].", "You begin rigging [W] to \the [src]") if(do_after(user, 20)) - user.visible_message("[user] rigs [W] to \the [src].", "You rig [W] to \the [src]") + user.visible_message(span_notice("[user] rigs [W] to \the [src]."), span_notice("You rig [W] to \the [src]")) var/obj/item/assembly_holder/H = W if (istype(H.a_left,/obj/item/assembly/igniter) || istype(H.a_right,/obj/item/assembly/igniter)) @@ -346,7 +346,7 @@ /obj/structure/reagent_dispensers/water_cooler/examine(mob/user) . = ..() if(cupholder) - . += "There are [cups] cups in the cup dispenser." + . += span_notice("There are [cups] cups in the cup dispenser.") /obj/structure/reagent_dispensers/water_cooler/verb/rotate_clockwise() set name = "Rotate Cooler Clockwise" @@ -378,7 +378,7 @@ if(bottle) playsound(src, I.usesound, 50, 1) if(do_after(user, 20) && bottle) - to_chat(user, "You unfasten the jug.") + to_chat(user, span_notice("You unfasten the jug.")) var/obj/item/reagent_containers/glass/cooler_bottle/G = new /obj/item/reagent_containers/glass/cooler_bottle( src.loc ) for(var/datum/reagent/R in reagents.reagent_list) var/total_reagent = reagents.get_reagent_amount(R.id) @@ -393,7 +393,7 @@ user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.") if(do_after(user, 20 * I.toolspeed, src)) if(!src) return - to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") + to_chat(user, span_notice("You [anchored? "un" : ""]secured \the [src]!")) anchored = !anchored playsound(src, I.usesound, 50, 1) return @@ -401,7 +401,7 @@ if(I.has_tool_quality(TOOL_SCREWDRIVER)) if(cupholder) playsound(src, I.usesound, 50, 1) - to_chat(user, "You take the cup dispenser off.") + to_chat(user, span_notice("You take the cup dispenser off.")) new /obj/item/stack/material/plastic( src.loc ) if(cups) for(var/i = 0 to cups) @@ -412,9 +412,9 @@ return if(!bottle && !cupholder) playsound(src, I.usesound, 50, 1) - to_chat(user, "You start taking the water-cooler apart.") + to_chat(user, span_notice("You start taking the water-cooler apart.")) if(do_after(user, 20 * I.toolspeed) && !bottle && !cupholder) - to_chat(user, "You take the water-cooler apart.") + to_chat(user, span_notice("You take the water-cooler apart.")) new /obj/item/stack/material/plastic( src.loc, 4 ) qdel(src) return @@ -424,19 +424,19 @@ if(!bottle) if(anchored) var/obj/item/reagent_containers/glass/cooler_bottle/G = I - to_chat(user, "You start to screw the bottle onto the water-cooler.") + to_chat(user, span_notice("You start to screw the bottle onto the water-cooler.")) if(do_after(user, 20) && !bottle && anchored) bottle = 1 update_icon() - to_chat(user, "You screw the bottle onto the water-cooler!") + to_chat(user, span_notice("You screw the bottle onto the water-cooler!")) for(var/datum/reagent/R in G.reagents.reagent_list) var/total_reagent = G.reagents.get_reagent_amount(R.id) reagents.add_reagent(R.id, total_reagent) qdel(G) else - to_chat(user, "You need to wrench down the cooler first.") + to_chat(user, span_warning("You need to wrench down the cooler first.")) else - to_chat(user, "There is already a bottle there!") + to_chat(user, span_warning("There is already a bottle there!")) return 1 if(istype(I, /obj/item/stack/material/plastic)) @@ -444,17 +444,17 @@ if(anchored) var/obj/item/stack/material/plastic/P = I src.add_fingerprint(user) - to_chat(user, "You start to attach a cup dispenser onto the water-cooler.") + to_chat(user, span_notice("You start to attach a cup dispenser onto the water-cooler.")) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20) && !cupholder && anchored) if (P.use(1)) - to_chat(user, "You attach a cup dispenser onto the water-cooler.") + to_chat(user, span_notice("You attach a cup dispenser onto the water-cooler.")) cupholder = 1 update_icon() else - to_chat(user, "You need to wrench down the cooler first.") + to_chat(user, span_warning("You need to wrench down the cooler first.")) else - to_chat(user, "There is already a cup dispenser there!") + to_chat(user, span_warning("There is already a cup dispenser there!")) return /obj/structure/reagent_dispensers/water_cooler/attack_hand(mob/user) diff --git a/code/modules/reagents/machinery/distillery.dm b/code/modules/reagents/machinery/distillery.dm index 4cafec6e96..6e978fa46d 100644 --- a/code/modules/reagents/machinery/distillery.dm +++ b/code/modules/reagents/machinery/distillery.dm @@ -104,29 +104,29 @@ /obj/machinery/portable_atmospherics/powered/reagent_distillery/examine(mob/user) . = ..() if(get_dist(user, src) <= 2) - . += "\The [src] is powered [on ? "on" : "off"]." + . += span_notice("\The [src] is powered [on ? "on" : "off"].") - . += "\The [src]'s gauges read:" + . += span_notice("\The [src]'s gauges read:") if(!use_atmos) - . += "- Target Temperature: [target_temp]" - . += "- Temperature: [current_temp]" + . += span_notice("- Target Temperature:     [target_temp]") + . += span_notice("- Temperature: [current_temp]") if(InputBeaker) if(InputBeaker.reagents.reagent_list.len) - . += "\The [src]'s input beaker holds [InputBeaker.reagents.total_volume] units of liquid." + . += span_notice("\The [src]'s input beaker holds [InputBeaker.reagents.total_volume] units of liquid.") else - . += "\The [src]'s input beaker is empty!" + . += span_notice("\The [src]'s input beaker is empty!") if(reagents.reagent_list.len) - . += "\The [src]'s internal buffer holds [reagents.total_volume] units of liquid." + . += span_notice("\The [src]'s internal buffer holds [reagents.total_volume] units of liquid.") else - . += "\The [src]'s internal buffer is empty!" + . += span_notice("\The [src]'s internal buffer is empty!") if(OutputBeaker) if(OutputBeaker.reagents.reagent_list.len) - . += "\The [src]'s output beaker holds [OutputBeaker.reagents.total_volume] units of liquid." + . += span_notice("\The [src]'s output beaker holds [OutputBeaker.reagents.total_volume] units of liquid.") else - . += "\The [src]'s output beaker is empty!" + . += span_notice("\The [src]'s output beaker is empty!") /obj/machinery/portable_atmospherics/powered/reagent_distillery/verb/toggle_power(mob/user = usr) set name = "Toggle Distillery Heating" @@ -135,22 +135,22 @@ if(powered()) on = !on - to_chat(user, "You turn \the [src] [on ? "on" : "off"].") + to_chat(user, span_notice("You turn \the [src] [on ? "on" : "off"].")) else - to_chat(user, " Nothing happens.") + to_chat(user, span_notice(" Nothing happens.")) /obj/machinery/portable_atmospherics/powered/reagent_distillery/verb/toggle_mixing(mob/user = usr) set name = "Start Distillery Mixing" set category = "Object" set src in view(1) - to_chat(user, "You press \the [src]'s chamber agitator button.") + to_chat(user, span_notice("You press \the [src]'s chamber agitator button.")) if(on) visible_message("\The [src] rattles to life.") reagents.handle_reactions() else spawn(1 SECOND) - to_chat(user, "Nothing happens..") + to_chat(user, span_notice("Nothing happens..")) /obj/machinery/portable_atmospherics/powered/reagent_distillery/attack_hand(mob/user) var/list/options = list() @@ -185,10 +185,10 @@ toggle_power(user) if("inspect gauges") - to_chat(user, "\The [src]'s gauges read:") + to_chat(user, span_notice("\The [src]'s gauges read:")) if(!use_atmos) - to_chat(user, "- Target Temperature: [target_temp]") - to_chat(user, "- Temperature: [current_temp]") + to_chat(user, span_notice("- Target Temperature: [target_temp]")) + to_chat(user, span_notice("- Temperature: [current_temp]")) if("pulse agitator") toggle_mixing(user) @@ -321,7 +321,7 @@ else if(connected_port && avg_pressure > 1000) current_temp = round((current_temp + avg_temp) / 2) else if(!run_pump) - visible_message("\The [src]'s motors wind down.") + visible_message(span_notice("\The [src]'s motors wind down.")) on = FALSE if(InputBeaker && reagents.total_volume < reagents.maximum_volume) diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm index 50586d09bd..e04c60e652 100644 --- a/code/modules/reagents/machinery/grinder.dm +++ b/code/modules/reagents/machinery/grinder.dm @@ -45,25 +45,25 @@ /obj/machinery/reagentgrinder/examine(mob/user) . = ..() if(!in_range(user, src) && !issilicon(user) && !isobserver(user)) - . += "You're too far away to examine [src]'s contents and display!" + . += span_warning("You're too far away to examine [src]'s contents and display!") return if(inuse) - . += "\The [src] is operating." + . += span_warning("\The [src] is operating.") return if(beaker || length(holdingitems)) - . += "\The [src] contains:" + . += span_notice("\The [src] contains:") if(beaker) - . += "- \A [beaker]." + . += span_notice("- \A [beaker].") for(var/obj/item/O as anything in holdingitems) - . += "- \A [O.name]." + . += span_notice("- \A [O.name].") if(!(stat & (NOPOWER|BROKEN))) . += "The status display reads:\n" if(beaker) for(var/datum/reagent/R in beaker.reagents.reagent_list) - . += "- [R.volume] units of [R.name]." + . += span_notice("- [R.volume] units of [R.name].") /obj/machinery/reagentgrinder/update_icon() icon_state = "juicer"+num2text(!isnull(beaker)) @@ -265,4 +265,4 @@ if(new_beaker) beaker = new_beaker update_icon() - return TRUE \ No newline at end of file + return TRUE diff --git a/code/modules/reagents/machinery/injector_maker.dm b/code/modules/reagents/machinery/injector_maker.dm index 29aad8ad34..9365cedcdf 100644 --- a/code/modules/reagents/machinery/injector_maker.dm +++ b/code/modules/reagents/machinery/injector_maker.dm @@ -126,13 +126,13 @@ /obj/machinery/injector_maker/examine(mob/user) . = ..() if(!in_range(user, src) && !issilicon(user) && !isobserver(user)) - . += "You're too far away to examine [src]'s contents and display!" + . += span_warning("You're too far away to examine [src]'s contents and display!") return if(beaker) - . += "\The [src] contains:" + . += span_notice("\The [src] contains:") if(beaker) - . += "- \A [beaker]." + . += span_notice("- \A [beaker].") . += "\The [src] contains [src.count_small_injector] small injectors and [src.count_large_injector] large injectors.\n " . += " It can hold [capacity_small_injector] small and [capacity_large_injector] large injectors respectively.\n " @@ -142,7 +142,7 @@ . += "The status display reads the following reagents:\n" if(beaker) for(var/datum/reagent/R in beaker.reagents.reagent_list) - . += "- [R.volume] units of [R.name]." + . += span_notice("- [R.volume] units of [R.name].") /obj/machinery/injector_maker/attack_hand(mob/user as mob) interact(user) diff --git a/code/modules/reagents/machinery/pump.dm b/code/modules/reagents/machinery/pump.dm index 4b50c8e153..53bf48365e 100644 --- a/code/modules/reagents/machinery/pump.dm +++ b/code/modules/reagents/machinery/pump.dm @@ -95,7 +95,7 @@ if(Output.get_pairing()) reagents.trans_to_holder(Output.reagents, Output.reagents.maximum_volume) if(prob(5)) - visible_message("\The [src] gurgles as it pumps fluid.") + visible_message(span_notice("\The [src] gurgles as it pumps fluid.")) // Sets the power state, if possible. @@ -124,7 +124,7 @@ /obj/machinery/pump/attack_ai(mob/user) if(!set_state(!on)) - to_chat(user, "You try to toggle \the [src] but it does not respond.") + to_chat(user, span_notice("You try to toggle \the [src] but it does not respond.")) /obj/machinery/pump/attack_hand(mob/user) if(open && istype(cell)) @@ -133,11 +133,11 @@ cell.update_icon() cell = null set_state(FALSE) - to_chat(user, "You remove the power cell.") + to_chat(user, span_notice("You remove the power cell.")) return if(!set_state(!on)) - to_chat(user, "You try to toggle \the [src] but it does not respond.") + to_chat(user, span_notice("You try to toggle \the [src] but it does not respond.")) /obj/machinery/pump/attackby(obj/item/W, mob/user) . = TRUE @@ -147,23 +147,23 @@ else if(W.has_tool_quality(TOOL_CROWBAR) && unlocked) to_chat(user, open ? \ - "You crowbar the battery panel in place." : \ - "You remove the battery panel." \ + span_notice("You crowbar the battery panel in place.") : \ + span_notice("You remove the battery panel.") \ ) open = !open else if(W.has_tool_quality(TOOL_WRENCH)) if(on) - to_chat(user, "\The [src] is active. Turn it off before trying to move it!") + to_chat(user, span_notice("\The [src] is active. Turn it off before trying to move it!")) return FALSE default_unfasten_wrench(user, W, 2 SECONDS) else if(istype(W, /obj/item/cell) && open) if(istype(cell)) - to_chat(user, "There is a power cell already installed.") + to_chat(user, span_notice("There is a power cell already installed.")) return FALSE user.drop_from_inventory(W, src) - to_chat(user, "You insert the power cell.") + to_chat(user, span_notice("You insert the power cell.")) else . = ..() diff --git a/code/modules/reagents/reactions/_reactions.dm b/code/modules/reagents/reactions/_reactions.dm index b3e242ba70..d6f3c73a50 100644 --- a/code/modules/reagents/reactions/_reactions.dm +++ b/code/modules/reagents/reactions/_reactions.dm @@ -119,7 +119,7 @@ var/list/seen = viewers(4, T) for(var/mob/M in seen) if(M.client) - M.show_message("[icon2html(container,M.client)] [mix_message]", 1) + M.show_message(span_notice("[icon2html(container,M.client)] [mix_message]"), 1) playsound(T, reaction_sound, 80, 1) //obtains any special data that will be provided to the reaction products diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm index 299ec6d448..b0ed2c37cd 100644 --- a/code/modules/reagents/reactions/instant/instant.dm +++ b/code/modules/reagents/reactions/instant/instant.dm @@ -846,7 +846,7 @@ var/location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) - to_chat(M, "The solution spews out foam!") + to_chat(M, span_warning("The solution spews out foam!")) var/datum/effect/effect/system/foam_spread/s = new() s.set_up(created_volume, location, holder, 0) @@ -868,7 +868,7 @@ var/location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) - to_chat(M, "The solution spews out a metalic foam!") + to_chat(M, span_warning("The solution spews out a metalic foam!")) var/datum/effect/effect/system/foam_spread/s = new() s.set_up(created_volume, location, holder, 1) @@ -886,7 +886,7 @@ var/location = get_turf(holder.my_atom) for(var/mob/M in viewers(5, location)) - to_chat(M, "The solution spews out a metalic foam!") + to_chat(M, span_warning("The solution spews out a metalic foam!")) var/datum/effect/effect/system/foam_spread/s = new() s.set_up(created_volume, location, holder, 2) diff --git a/code/modules/reagents/reagent_containers/_reagent_containers.dm b/code/modules/reagents/reagent_containers/_reagent_containers.dm index 04539d0df7..fc3fe99e4c 100644 --- a/code/modules/reagents/reagent_containers/_reagent_containers.dm +++ b/code/modules/reagents/reagent_containers/_reagent_containers.dm @@ -22,7 +22,7 @@ if(!possible_transfer_amounts) src.verbs -= /obj/item/reagent_containers/verb/set_APTFT create_reagents(volume) - + if(starts_with) var/total_so_far = 0 for(var/string in starts_with) @@ -49,15 +49,15 @@ return 0 if(!target.reagents || !target.reagents.total_volume) - to_chat(user, "[target] is empty.") + to_chat(user, span_notice("[target] is empty.")) return 1 if(reagents && !reagents.get_free_space()) - to_chat(user, "[src] is full.") + to_chat(user, span_notice("[src] is full.")) return 1 var/trans = target.reagents.trans_to_obj(src, target:amount_per_transfer_from_this) - to_chat(user, "You fill [src] with [trans] units of the contents of [target].") + to_chat(user, span_notice("You fill [src] with [trans] units of the contents of [target].")) return 1 /obj/item/reagent_containers/proc/standard_splash_mob(var/mob/user, var/mob/target) // This goes into afterattack @@ -65,27 +65,27 @@ return if(!reagents || !reagents.total_volume) - to_chat(user, "[src] is empty.") + to_chat(user, span_notice("[src] is empty.")) return 1 if(target.reagents && !target.reagents.get_free_space()) - to_chat(user, "[target] is full.") + to_chat(user, span_notice("[target] is full.")) return 1 var/contained = reagentlist() add_attack_logs(user,target,"Splashed with [src.name] containing [contained]") - user.visible_message("[target] has been splashed with something by [user]!", "You splash the solution onto [target].") + user.visible_message(span_danger("[target] has been splashed with something by [user]!"), "You splash the solution onto [target].") reagents.splash(target, reagents.total_volume) return 1 /obj/item/reagent_containers/proc/self_feed_message(var/mob/user) - to_chat(user, "You eat \the [src]") + to_chat(user, span_notice("You eat \the [src]")) /obj/item/reagent_containers/proc/other_feed_message_start(var/mob/user, var/mob/target) - user.visible_message("[user] is trying to feed [target] \the [src]!") + user.visible_message(span_warning("[user] is trying to feed [target] \the [src]!")) /obj/item/reagent_containers/proc/other_feed_message_finish(var/mob/user, var/mob/target) - user.visible_message("[user] has fed [target] \the [src]!") + user.visible_message(span_warning("[user] has fed [target] \the [src]!")) /obj/item/reagent_containers/proc/feed_sound(var/mob/user) return @@ -95,7 +95,7 @@ return FALSE if(!reagents || !reagents.total_volume) - to_chat(user, "\The [src] is empty.") + to_chat(user, span_notice("\The [src] is empty.")) return TRUE if(ishuman(target)) @@ -105,16 +105,16 @@ return FALSE var/obj/item/blocked = H.check_mouth_coverage() if(blocked) - to_chat(user, "\The [blocked] is in the way!") + to_chat(user, span_warning("\The [blocked] is in the way!")) return FALSE user.setClickCooldown(user.get_attack_speed(src)) //puts a limit on how fast people can eat/drink things - if(user == target) + if(user == target) self_feed_message(user) reagents.trans_to_mob(user, issmall(user) ? CEILING(amount_per_transfer_from_this/2, 1) : amount_per_transfer_from_this, CHEM_INGEST) feed_sound(user) return TRUE - + else other_feed_message_start(user, target) if(!do_mob(user, target)) @@ -132,13 +132,13 @@ return 0 if(!reagents || !reagents.total_volume) - to_chat(user, "[src] is empty.") + to_chat(user, span_notice("[src] is empty.")) return 1 if(!target.reagents.get_free_space()) - to_chat(user, "[target] is full.") + to_chat(user, span_notice("[target] is full.")) return 1 var/trans = reagents.trans_to(target, amount_per_transfer_from_this) - to_chat(user, "You transfer [trans] units of the solution to [target].") + to_chat(user, span_notice("You transfer [trans] units of the solution to [target].")) return 1 diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index 6490813686..3cbdb38f64 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -58,13 +58,13 @@ if(istype(W, /obj/item/pen) || istype(W, /obj/item/flashlight/pen)) var/tmp_label = sanitizeSafe(tgui_input_text(user, "Enter a label for [name]", "Label", label_text, MAX_NAME_LEN), MAX_NAME_LEN) if(length(tmp_label) > 50) - to_chat(user, "The label can be at most 50 characters long.") + to_chat(user, span_notice("The label can be at most 50 characters long.")) else if(length(tmp_label) > 10) - to_chat(user, "You set the label.") + to_chat(user, span_notice("You set the label.")) label_text = tmp_label update_iv_label() else - to_chat(user, "You set the label to \"[tmp_label]\".") + to_chat(user, span_notice("You set the label to \"[tmp_label]\".")) label_text = tmp_label update_iv_label() @@ -108,4 +108,4 @@ name = "Empty BloodPack" desc = "Seems pretty useless... Maybe if there were a way to fill it?" icon_state = "empty" - item_state = "bloodpack_empty" \ No newline at end of file + item_state = "bloodpack_empty" diff --git a/code/modules/reagents/reagent_containers/blood_pack_vr.dm b/code/modules/reagents/reagent_containers/blood_pack_vr.dm index fa4c2862fd..5beff9b498 100644 --- a/code/modules/reagents/reagent_containers/blood_pack_vr.dm +++ b/code/modules/reagents/reagent_containers/blood_pack_vr.dm @@ -5,17 +5,17 @@ var/reagent_to_remove = reagents.get_master_reagent_id() switch(reagents.get_master_reagent_id()) if("blood") - user.show_message("You sink your fangs into \the [src] and suck the blood out of it!") + user.show_message(span_warning("You sink your fangs into \the [src] and suck the blood out of it!")) user.visible_message(span_red("[user] sinks their fangs into \the [src] and drains it!")) user.adjust_nutrition(remove_volume*5) reagents.remove_reagent(reagent_to_remove, remove_volume) update_icon() return else - user.show_message("You take a look at \the [src] and notice that it is not filled with blood!") + user.show_message(span_warning("You take a look at \the [src] and notice that it is not filled with blood!")) return else - user.show_message("You take a look at \the [src] and notice it has nothing in it!") + user.show_message(span_warning("You take a look at \the [src] and notice it has nothing in it!")) return else return diff --git a/code/modules/reagents/reagent_containers/borghypo.dm b/code/modules/reagents/reagent_containers/borghypo.dm index 65923ef9e1..4d6a0e60d2 100644 --- a/code/modules/reagents/reagent_containers/borghypo.dm +++ b/code/modules/reagents/reagent_containers/borghypo.dm @@ -67,31 +67,31 @@ return if(!reagent_volumes[reagent_ids[mode]]) - to_chat(user, "The injector is empty.") + to_chat(user, span_warning("The injector is empty.")) return var/mob/living/carbon/human/H = M if(istype(H)) var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting) if(!affected) - to_chat(user, "\The [H] is missing that limb!") + to_chat(user, span_danger("\The [H] is missing that limb!")) return /* since synths have oil/coolant streams now, it only makes sense that you should be able to inject stuff. preserved for posterity. else if(affected.robotic >= ORGAN_ROBOT) - to_chat(user, "You cannot inject a robotic limb.") + to_chat(user, span_danger("You cannot inject a robotic limb.")) return */ if(M.can_inject(user, 1, ignore_thickness = bypass_protection)) - to_chat(user, "You inject [M] with the injector.") - to_chat(M, "You feel a tiny prick!") + to_chat(user, span_notice("You inject [M] with the injector.")) + to_chat(M, span_notice("You feel a tiny prick!")) if(M.reagents) var/t = min(amount_per_transfer_from_this, reagent_volumes[reagent_ids[mode]]) M.reagents.add_reagent(reagent_ids[mode], t) reagent_volumes[reagent_ids[mode]] -= t add_attack_logs(user, M, "Borg injected with [reagent_ids[mode]]") - to_chat(user, "[t] units injected. [reagent_volumes[reagent_ids[mode]]] units remaining.") + to_chat(user, span_notice("[t] units injected. [reagent_volumes[reagent_ids[mode]]] units remaining.")) return /obj/item/reagent_containers/borghypo/attack_self(mob/user as mob) //Change the mode @@ -115,13 +115,13 @@ playsound(src, 'sound/effects/pop.ogg', 50, 0) mode = t var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]] - to_chat(usr, "Synthesizer is now producing '[R.name]'.") + to_chat(usr, span_notice("Synthesizer is now producing '[R.name]'.")) /obj/item/reagent_containers/borghypo/examine(mob/user) . = ..() if(get_dist(user, src) <= 2) var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]] - . += "It is currently producing [R.name] and has [reagent_volumes[reagent_ids[mode]]] out of [volume] units left." + . += span_notice("It is currently producing [R.name] and has [reagent_volumes[reagent_ids[mode]]] out of [volume] units left.") /obj/item/reagent_containers/borghypo/service name = "cyborg drink synthesizer" @@ -187,15 +187,15 @@ return if(!reagent_volumes[reagent_ids[mode]]) - to_chat(user, "[src] is out of this reagent, give it some time to refill.") + to_chat(user, span_notice("[src] is out of this reagent, give it some time to refill.")) return if(!target.reagents.get_free_space()) - to_chat(user, "[target] is full.") + to_chat(user, span_notice("[target] is full.")) return var/t = min(amount_per_transfer_from_this, reagent_volumes[reagent_ids[mode]]) target.reagents.add_reagent(reagent_ids[mode], t) reagent_volumes[reagent_ids[mode]] -= t - to_chat(user, "You transfer [t] units of the solution to [target].") + to_chat(user, span_notice("You transfer [t] units of the solution to [target].")) return diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 6bca6b11b2..ecf6010821 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -18,9 +18,9 @@ . = ..() if(get_dist(user, src) <= 2) if(reagents && reagents.reagent_list.len) - . += "It contains [reagents.total_volume] units of liquid." + . += span_notice("It contains [reagents.total_volume] units of liquid.") else - . += "It is empty." + . += span_notice("It is empty.") /obj/item/reagent_containers/dropper/afterattack(var/obj/target, var/mob/user, var/proximity) if(!target.reagents || !proximity) return @@ -28,11 +28,11 @@ if(reagents.total_volume) if(!target.reagents.get_free_space()) - to_chat(user, "[target] is full.") + to_chat(user, span_notice("[target] is full.")) return if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/reagent_containers/food) && !istype(target, /obj/item/clothing/mask/smokable/cigarette)) //You can inject humans and food but you cant remove the shit. - to_chat(user, "You cannot directly fill this object.") + to_chat(user, span_notice("You cannot directly fill this object.")) return var/trans = 0 @@ -40,7 +40,7 @@ if(ismob(target)) var/time = 20 //2/3rds the time of a syringe - user.visible_message("[user] is trying to squirt something into [target]'s eyes!") + user.visible_message(span_warning("[user] is trying to squirt something into [target]'s eyes!")) if(!do_mob(user, target, time)) return @@ -61,7 +61,7 @@ if(safe_thing) trans = reagents.splash(safe_thing, min(amount_per_transfer_from_this, reagents.total_volume), max_spill=30) - user.visible_message("[user] tries to squirt something into [target]'s eyes, but fails!", "You transfer [trans] units of the solution.") + user.visible_message(span_warning("[user] tries to squirt something into [target]'s eyes, but fails!"), span_notice("You transfer [trans] units of the solution.")) return var/contained = reagentlist() @@ -69,27 +69,27 @@ trans += reagents.trans_to_mob(target, min(amount_per_transfer_from_this, reagents.total_volume)/2, CHEM_INGEST) //Half injected, half ingested trans += reagents.trans_to_mob(target, min(amount_per_transfer_from_this, reagents.total_volume), CHEM_BLOOD) //I guess it gets into the bloodstream through the eyes or something - user.visible_message("[user] squirts something into [target]'s eyes!", "You transfer [trans] units of the solution.") + user.visible_message(span_warning("[user] squirts something into [target]'s eyes!"), span_notice("You transfer [trans] units of the solution.")) return else trans = reagents.trans_to_obj(target, amount_per_transfer_from_this) - to_chat(user, "You transfer [trans] units of the solution.") + to_chat(user, span_notice("You transfer [trans] units of the solution.")) else // Taking from something if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers)) - to_chat(user, "You cannot directly remove reagents from [target].") + to_chat(user, span_notice("You cannot directly remove reagents from [target].")) return if(!target.reagents || !target.reagents.total_volume) - to_chat(user, "[target] is empty.") + to_chat(user, span_notice("[target] is empty.")) return var/trans = target.reagents.trans_to_obj(src, amount_per_transfer_from_this) - to_chat(user, "You fill the dropper with [trans] units of the solution.") + to_chat(user, span_notice("You fill the dropper with [trans] units of the solution.")) return diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 213d99819e..9042091ab3 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -66,11 +66,11 @@ . = ..() if(get_dist(user, src) <= 2) if(reagents && reagents.reagent_list.len) - . += "It contains [reagents.total_volume] units of liquid." + . += span_notice("It contains [reagents.total_volume] units of liquid.") else - . += "It is empty." + . += span_notice("It is empty.") if(!is_open_container()) - . += "Airtight lid seals it completely." + . += span_notice("Airtight lid seals it completely.") /obj/item/reagent_containers/glass/attack_self() ..() @@ -101,7 +101,7 @@ return ..() /obj/item/reagent_containers/glass/self_feed_message(var/mob/user) - to_chat(user, "You swallow a gulp from \the [src].") + to_chat(user, span_notice("You swallow a gulp from \the [src].")) /obj/item/reagent_containers/glass/proc/attempt_snake_milking(mob/living/user, mob/living/target) var/reagent @@ -142,7 +142,7 @@ if(standard_splash_mob(user,target)) return 1 if(reagents && reagents.total_volume) - to_chat(user, "You splash the solution onto [target].") //They are on harm intent, aka wanting to spill it. + to_chat(user, span_notice("You splash the solution onto [target].")) //They are on harm intent, aka wanting to spill it. reagents.splash(target, reagents.total_volume) return 1 ..() @@ -151,19 +151,19 @@ if(istype(W, /obj/item/pen) || istype(W, /obj/item/flashlight/pen)) var/tmp_label = sanitizeSafe(tgui_input_text(user, "Enter a label for [name]", "Label", label_text, MAX_NAME_LEN), MAX_NAME_LEN) if(length(tmp_label) > 50) - to_chat(user, "The label can be at most 50 characters long.") + to_chat(user, span_notice("The label can be at most 50 characters long.")) else if(length(tmp_label) > 10) - to_chat(user, "You set the label.") + to_chat(user, span_notice("You set the label.")) label_text = tmp_label update_name_label() else - to_chat(user, "You set the label to \"[tmp_label]\".") + to_chat(user, span_notice("You set the label to \"[tmp_label]\".")) label_text = tmp_label update_name_label() if(istype(W,/obj/item/storage/bag)) ..() if(W && W.w_class <= w_class && (flags & OPENCONTAINER) && user.a_intent != I_HELP) - to_chat(user, "You dip \the [W] into \the [src].") + to_chat(user, span_notice("You dip \the [W] into \the [src].")) reagents.touch_obj(W, reagents.total_volume) /obj/item/reagent_containers/glass/proc/update_name_label() @@ -324,7 +324,7 @@ qdel(src) return else if(D.has_tool_quality(TOOL_WIRECUTTER)) - to_chat(user, "You cut a big hole in \the [src] with \the [D]. It's kinda useless as a bucket now.") + to_chat(user, span_notice("You cut a big hole in \the [src] with \the [D]. It's kinda useless as a bucket now.")) user.put_in_hands(new /obj/item/clothing/head/helmet/bucket) user.drop_from_inventory(src) qdel(src) @@ -334,19 +334,19 @@ if (M.use(1)) var/obj/item/secbot_assembly/edCLN_assembly/B = new /obj/item/secbot_assembly/edCLN_assembly B.loc = get_turf(src) - to_chat(user, "You armed the robot frame.") + to_chat(user, span_notice("You armed the robot frame.")) if (user.get_inactive_hand()==src) user.remove_from_mob(src) user.put_in_inactive_hand(B) qdel(src) else - to_chat(user, "You need one sheet of metal to arm the robot frame.") + to_chat(user, span_warning("You need one sheet of metal to arm the robot frame.")) else if(istype(D, /obj/item/mop) || istype(D, /obj/item/soap) || istype(D, /obj/item/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on buckets" if(reagents.total_volume < 1) - to_chat(user, "\The [src] is empty!") + to_chat(user, span_warning("\The [src] is empty!")) else reagents.trans_to_obj(D, 5) - to_chat(user, "You wet \the [D] in \the [src].") + to_chat(user, span_notice("You wet \the [D] in \the [src].")) playsound(src, 'sound/effects/slosh.ogg', 25, 1) else return ..() @@ -378,17 +378,17 @@ to_chat(user, "This wooden bucket doesn't play well with electronics.") return else if(istype(D, /obj/item/material/knife/machete/hatchet)) - to_chat(user, "You cut a big hole in \the [src] with \the [D]. It's kinda useless as a bucket now.") + to_chat(user, span_notice("You cut a big hole in \the [src] with \the [D]. It's kinda useless as a bucket now.")) user.put_in_hands(new /obj/item/clothing/head/helmet/bucket/wood) user.drop_from_inventory(src) qdel(src) return else if(istype(D, /obj/item/mop)) if(reagents.total_volume < 1) - to_chat(user, "\The [src] is empty!") + to_chat(user, span_warning("\The [src] is empty!")) else reagents.trans_to_obj(D, 5) - to_chat(user, "You wet \the [D] in \the [src].") + to_chat(user, span_notice("You wet \the [D] in \the [src].")) playsound(src, 'sound/effects/slosh.ogg', 25, 1) return else diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 1a086dee7b..fb98d48483 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -31,7 +31,7 @@ /obj/item/reagent_containers/hypospray/attack(mob/living/M as mob, mob/user as mob) if(!reagents.total_volume) - to_chat(user, "[src] is empty.") + to_chat(user, span_warning("[src] is empty.")) return if (!istype(M)) return @@ -40,26 +40,26 @@ if(istype(H)) var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting) if(!affected) - to_chat(user, "\The [H] is missing that limb!") + to_chat(user, span_danger("\The [H] is missing that limb!")) return /* since synths have oil/coolant streams now, it only makes sense that you should be able to inject stuff. preserved for posterity. else if(affected.robotic >= ORGAN_ROBOT) - to_chat(user, "You cannot inject a robotic limb.") + to_chat(user, span_danger("You cannot inject a robotic limb.")) return */ //VOREStation Add Start - Adds Prototype Hypo functionality if(H != user && prototype) - to_chat(user, "You begin injecting [H] with \the [src].") - to_chat(H, " [user] is trying to inject you with \the [src]!") + to_chat(user, span_notice("You begin injecting [H] with \the [src].")) + to_chat(H, span_danger(" [user] is trying to inject you with \the [src]!")) if(!do_after(user, 30, H)) return //VOREstation Add End else if(!H.stat && !prototype) //VOREStation Edit if(H != user) if(H.a_intent != I_HELP) - to_chat(user, "[H] is resisting your attempt to inject them with \the [src].") - to_chat(H, " [user] is trying to inject you with \the [src]!") + to_chat(user, span_notice("[H] is resisting your attempt to inject them with \the [src].")) + to_chat(H, span_danger(" [user] is trying to inject you with \the [src]!")) if(!do_after(user, 30, H)) return @@ -109,7 +109,7 @@ loaded_vial.update_icon() user.put_in_hands(loaded_vial) loaded_vial = null - to_chat(user, "You remove the vial from the [src].") + to_chat(user, span_notice("You remove the vial from the [src].")) update_icon() playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) return @@ -127,7 +127,7 @@ /obj/item/reagent_containers/hypospray/vial/attackby(obj/item/W, mob/user as mob) if(istype(W, /obj/item/reagent_containers/glass/beaker/vial)) if(!loaded_vial) - user.visible_message("[user] begins loading [W] into \the [src].","You start loading [W] into \the [src].") + user.visible_message(span_notice("[user] begins loading [W] into \the [src]."),span_notice("You start loading [W] into \the [src].")) if(!do_after(user,30) || loaded_vial || !(W in user)) return 0 if(W.is_open_container()) @@ -138,11 +138,11 @@ loaded_vial = W reagents.maximum_volume = loaded_vial.reagents.maximum_volume loaded_vial.reagents.trans_to_holder(reagents,volume) - user.visible_message("[user] has loaded [W] into \the [src].","You have loaded [W] into \the [src].") + user.visible_message(span_notice("[user] has loaded [W] into \the [src]."),span_notice("You have loaded [W] into \the [src].")) update_icon() playsound(src, 'sound/weapons/empty.ogg', 50, 1) else - to_chat(user, "\The [src] already has a vial.") + to_chat(user, span_notice("\The [src] already has a vial.")) else ..() @@ -186,9 +186,9 @@ /obj/item/reagent_containers/hypospray/autoinjector/examine(mob/user) . = ..() if(reagents && reagents.reagent_list.len) - . += "It is currently loaded." + . += span_notice("It is currently loaded.") else - . += "It is spent." + . += span_notice("It is spent.") /obj/item/reagent_containers/hypospray/autoinjector/detox diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index c80dd669e3..8a453173f1 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -27,17 +27,17 @@ var/mob/living/carbon/human/H = M var/obj/item/organ/external/affecting = H.get_organ(check_zone(L.zone_sel.selecting)) if(!affecting) - to_chat(user, "The limb is missing!") + to_chat(user, span_warning("The limb is missing!")) return if(affecting.status >= ORGAN_ROBOT) - to_chat(user, "\The [src] won't work on a robotic limb!") + to_chat(user, span_notice("\The [src] won't work on a robotic limb!")) return if(!H.can_inject(user, FALSE, L.zone_sel.selecting, pierce_material)) - to_chat(user, "\The [src] can't be applied through such a thick material!") + to_chat(user, span_notice("\The [src] can't be applied through such a thick material!")) return - to_chat(H, "\The [src] is placed on your [affecting].") + to_chat(H, span_notice("\The [src] is placed on your [affecting].")) M.drop_from_inventory(src) //icon update if(reagents.total_volume) reagents.trans_to_mob(M, reagents.total_volume, CHEM_BLOOD) //CHEM_TOUCH @@ -48,29 +48,29 @@ var/mob/living/carbon/human/H = M var/obj/item/organ/external/affecting = H.get_organ(check_zone(L.zone_sel.selecting)) if(!affecting) - to_chat(user, "The limb is missing!") + to_chat(user, span_warning("The limb is missing!")) return if(affecting.status >= ORGAN_ROBOT) - to_chat(user, "\The [src] won't work on a robotic limb!") + to_chat(user, span_notice("\The [src] won't work on a robotic limb!")) return if(!H.can_inject(user, FALSE, L.zone_sel.selecting, pierce_material)) - to_chat(user, "\The [src] can't be applied through such a thick material!") + to_chat(user, span_notice("\The [src] can't be applied through such a thick material!")) return - user.visible_message("[user] attempts to place \the [src] onto [H]`s [affecting].") + user.visible_message(span_warning("[user] attempts to place \the [src] onto [H]`s [affecting].")) user.setClickCooldown(user.get_attack_speed(src)) if(!do_mob(user, M)) return user.drop_from_inventory(src) //icon update - user.visible_message("[user] applies \the [src] to [H].") + user.visible_message(span_warning("[user] applies \the [src] to [H].")) var/contained = reagentlist() add_attack_logs(user,M,"Applied a patch containing [contained]") - to_chat(H, "\The [src] is placed on your [affecting].") + to_chat(H, span_notice("\The [src] is placed on your [affecting].")) M.drop_from_inventory(src) //icon update if(reagents.total_volume) @@ -79,4 +79,4 @@ return 1 - return 0 \ No newline at end of file + return 0 diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index f74091ff12..88dde6b271 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -31,10 +31,10 @@ return var/obj/item/blocked = H.check_mouth_coverage() if(blocked) - to_chat(user, "\The [blocked] is in the way!") + to_chat(user, span_warning("\The [blocked] is in the way!")) return - to_chat(M, "You swallow \the [src].") + to_chat(M, span_notice("You swallow \the [src].")) M.drop_from_inventory(src) //icon update if(reagents.total_volume) reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST) @@ -49,17 +49,17 @@ return var/obj/item/blocked = H.check_mouth_coverage() if(blocked) - to_chat(user, "\The [blocked] is in the way!") + to_chat(user, span_warning("\The [blocked] is in the way!")) return - user.visible_message("[user] attempts to force [M] to swallow \the [src].") + user.visible_message(span_warning("[user] attempts to force [M] to swallow \the [src].")) user.setClickCooldown(user.get_attack_speed(src)) if(!do_mob(user, M)) return user.drop_from_inventory(src) //icon update - user.visible_message("[user] forces [M] to swallow \the [src].") + user.visible_message(span_warning("[user] forces [M] to swallow \the [src].")) var/contained = reagentlist() add_attack_logs(user,M,"Fed a pill containing [contained]") @@ -77,15 +77,15 @@ if(target.is_open_container() && target.reagents) if(!target.reagents.total_volume) - to_chat(user, "[target] is empty. Can't dissolve \the [src].") + to_chat(user, span_notice("[target] is empty. Can't dissolve \the [src].")) return - to_chat(user, "You dissolve \the [src] in [target].") + to_chat(user, span_notice("You dissolve \the [src] in [target].")) add_attack_logs(user,null,"Spiked [target.name] with a pill containing [reagentlist()]") reagents.trans_to(target, reagents.total_volume) for(var/mob/O in viewers(2, user)) - O.show_message("[user] puts something in \the [target].", 1) + O.show_message(span_warning("[user] puts something in \the [target]."), 1) qdel(src) @@ -94,7 +94,7 @@ /obj/item/reagent_containers/pill/attackby(obj/item/W as obj, mob/user as mob) if(is_sharp(W)) var/obj/item/reagent_containers/powder/J = new /obj/item/reagent_containers/powder(src.loc) - user.visible_message("[user] gently cuts up [src] with [W]!") + user.visible_message(span_warning("[user] gently cuts up [src] with [W]!")) playsound(src.loc, 'sound/effects/chop.ogg', 50, 1) if(reagents) @@ -104,7 +104,7 @@ if(istype(W, /obj/item/card/id)) var/obj/item/reagent_containers/powder/J = new /obj/item/reagent_containers/powder(src.loc) - user.visible_message("[user] clumsily chops up [src] with [W]!") + user.visible_message(span_warning("[user] clumsily chops up [src] with [W]!")) playsound(src.loc, 'sound/effects/chop.ogg', 50, 1) if(reagents) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 896785d912..2c5cbe76d3 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -35,7 +35,7 @@ return if(reagents.total_volume < amount_per_transfer_from_this) - to_chat(user, "\The [src] is empty!") + to_chat(user, span_notice("\The [src] is empty!")) return Spray_at(A, user, proximity) @@ -75,7 +75,7 @@ return amount_per_transfer_from_this = next_in_list(amount_per_transfer_from_this, possible_transfer_amounts) spray_size = next_in_list(spray_size, spray_sizes) - to_chat(user, "You adjusted the pressure nozzle. You'll now use [amount_per_transfer_from_this] units per spray.") + to_chat(user, span_notice("You adjusted the pressure nozzle. You'll now use [amount_per_transfer_from_this] units per spray.")) /obj/item/reagent_containers/spray/examine(mob/user) . = ..() @@ -91,7 +91,7 @@ if (tgui_alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", list("Yes", "No")) != "Yes") return if(isturf(usr.loc)) - to_chat(usr, "You empty \the [src] onto the floor.") + to_chat(usr, span_notice("You empty \the [src] onto the floor.")) reagents.splash(usr.loc, reagents.total_volume) //space cleaner @@ -245,7 +245,7 @@ /obj/item/reagent_containers/spray/chemsprayer/hosed/AltClick(mob/living/carbon/user) if(++spray_particles > 3) spray_particles = 1 - to_chat(user, "You turn the dial on \the [src] to [spray_particles].") + to_chat(user, span_notice("You turn the dial on \the [src] to [spray_particles].")) return /obj/item/reagent_containers/spray/chemsprayer/hosed/CtrlClick(var/mob/user) @@ -264,7 +264,7 @@ var/list/the_targets = list(T, T1, T2) if(src.reagents.total_volume < 1) - to_chat(usr, "\The [src] is empty.") + to_chat(usr, span_notice("\The [src] is empty.")) return if(!heavy_spray) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index d7ac1e42c8..244f52ca20 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -67,7 +67,7 @@ switch(mode) if(SYRINGE_CAPPED) mode = SYRINGE_DRAW - to_chat(user,"You uncap the syringe.") + to_chat(user,span_notice("You uncap the syringe.")) if(SYRINGE_DRAW) mode = SYRINGE_INJECT if(SYRINGE_INJECT) @@ -88,7 +88,7 @@ return if(mode == SYRINGE_BROKEN) - to_chat(user, "This syringe is broken!") + to_chat(user, span_warning("This syringe is broken!")) return if(user.a_intent == I_HURT && ismob(target)) @@ -101,23 +101,23 @@ switch(mode) if(SYRINGE_DRAW) if(!reagents.get_free_space()) - to_chat(user, "The syringe is full.") + to_chat(user, span_warning("The syringe is full.")) mode = SYRINGE_INJECT return if(ismob(target))//Blood! if(reagents.has_reagent("blood")) - to_chat(user, "There is already a blood sample in this syringe.") + to_chat(user, span_notice("There is already a blood sample in this syringe.")) return if(istype(target, /mob/living/carbon)) var/amount = reagents.get_free_space() var/mob/living/carbon/T = target if(!T.dna) - to_chat(user, "You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum).") + to_chat(user, span_warning("You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum).")) return if(NOCLONE in T.mutations) //target done been et, no more blood in him - to_chat(user, "You are unable to locate any blood.") + to_chat(user, span_warning("You are unable to locate any blood.")) return if(T.isSynthetic()) @@ -125,7 +125,7 @@ return if(drawing) - to_chat(user, "You are already drawing blood from [T.name].") + to_chat(user, span_warning("You are already drawing blood from [T.name].")) return var/datum/reagent/B @@ -153,21 +153,21 @@ reagents.update_total() on_reagent_change() reagents.handle_reactions() - to_chat(user, "You take a blood sample from [target].") + to_chat(user, span_notice("You take a blood sample from [target].")) for(var/mob/O in viewers(4, user)) - O.show_message("[user] takes a blood sample from [target].", 1) + O.show_message(span_notice("[user] takes a blood sample from [target]."), 1) else //if not mob if(!target.reagents.total_volume) - to_chat(user, "[target] is empty.") + to_chat(user, span_notice("[target] is empty.")) return if(!target.is_open_container() && !istype(target, /obj/structure/reagent_dispensers) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/reagent_containers/food)) - to_chat(user, "You cannot directly remove reagents from this object.") + to_chat(user, span_notice("You cannot directly remove reagents from this object.")) return var/trans = target.reagents.trans_to_obj(src, amount_per_transfer_from_this) - to_chat(user, "You fill the syringe with [trans] units of the solution.") + to_chat(user, span_notice("You fill the syringe with [trans] units of the solution.")) update_icon() @@ -177,17 +177,17 @@ if(SYRINGE_INJECT) if(!reagents.total_volume) - to_chat(user, "The syringe is empty.") + to_chat(user, span_notice("The syringe is empty.")) mode = SYRINGE_DRAW return if(istype(target, /obj/item/implantcase/chem)) return if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/reagent_containers/food) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/clothing/mask/smokable/cigarette) && !istype(target, /obj/item/storage/fancy/cigarettes)) - to_chat(user, "You cannot directly fill this object.") + to_chat(user, span_notice("You cannot directly fill this object.")) return if(!target.reagents.get_free_space()) - to_chat(user, "[target] is full.") + to_chat(user, span_notice("[target] is full.")) return var/mob/living/carbon/human/H = target @@ -195,11 +195,11 @@ if(istype(H)) affected = H.get_organ(user.zone_sel.selecting) //VOREStation Edit - See above comment. if(!affected) - to_chat(user, "\The [H] is missing that limb!") + to_chat(user, span_danger("\The [H] is missing that limb!")) return /* since synths have oil/coolant streams now, it only makes sense that you should be able to inject stuff. preserved for posterity. else if(affected.robotic >= ORGAN_ROBOT) - to_chat(user, "You cannot inject a robotic limb.") + to_chat(user, span_danger("You cannot inject a robotic limb.")) return */ @@ -223,9 +223,9 @@ return if(injtime == time) - user.visible_message("[user] is trying to inject [target] with [visible_name]!","You begin injecting [target] with [visible_name].") + user.visible_message(span_warning("[user] is trying to inject [target] with [visible_name]!"),span_notice("You begin injecting [target] with [visible_name].")) else - user.visible_message("[user] begins hunting for an injection port on [target]'s suit!","You begin hunting for an injection port on [target]'s suit!") + user.visible_message(span_warning("[user] begins hunting for an injection port on [target]'s suit!"),span_notice("You begin hunting for an injection port on [target]'s suit!")) //The warmup user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) @@ -248,11 +248,11 @@ update_icon() if(trans) - to_chat(user, "You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units.") + to_chat(user, span_notice("You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units.")) if(ismob(target)) add_attack_logs(user,target,"Injected with [src.name] containing [contained], trasferred [trans] units") else - to_chat(user, "The syringe is empty.") + to_chat(user, span_notice("The syringe is empty.")) // dirty(target,affected) //VOREStation Add -- Removed by Request return @@ -266,7 +266,7 @@ var/obj/item/organ/external/affecting = H.get_organ(target_zone) if (!affecting || affecting.is_stump()) - to_chat(user, "They are missing that limb!") + to_chat(user, span_danger("They are missing that limb!")) return var/hit_area = affecting.name @@ -284,13 +284,13 @@ return - user.visible_message("[user] stabs [target] in \the [hit_area] with [src.name]!") + user.visible_message(span_danger("[user] stabs [target] in \the [hit_area] with [src.name]!")) if(affecting.take_damage(3)) H.UpdateDamageIcon() else - user.visible_message("[user] stabs [target] with [src.name]!") + user.visible_message(span_danger("[user] stabs [target] with [src.name]!")) target.take_organ_damage(3)// 7 is the same as crowbar punch @@ -322,10 +322,10 @@ /obj/item/reagent_containers/syringe/ld50_syringe/afterattack(obj/target, mob/user, flag) if(mode == SYRINGE_DRAW && ismob(target)) // No drawing 50 units of blood at once - to_chat(user, "This needle isn't designed for drawing blood.") + to_chat(user, span_notice("This needle isn't designed for drawing blood.")) return if(user.a_intent == "hurt" && ismob(target)) // No instant injecting - to_chat(user, "This syringe is too big to stab someone with it.") + to_chat(user, span_notice("This syringe is too big to stab someone with it.")) ..() //////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/reagents/reagents/core.dm b/code/modules/reagents/reagents/core.dm index 103aa1d51c..10a50a3b98 100644 --- a/code/modules/reagents/reagents/core.dm +++ b/code/modules/reagents/reagents/core.dm @@ -190,7 +190,7 @@ var/removed_heat = between(0, volume * WATER_LATENT_HEAT, -environment.get_thermal_energy_change(min_temperature)) environment.add_thermal_energy(-removed_heat) if (prob(5)) - T.visible_message("The water sizzles as it lands on \the [T]!") + T.visible_message(span_warning("The water sizzles as it lands on \the [T]!")) else if(volume >= 10) T.wet_floor(1) @@ -214,7 +214,7 @@ if(istype(L, /mob/living/simple_mob/slime)) var/mob/living/simple_mob/slime/S = L S.adjustToxLoss(15 * amount) - S.visible_message("[S]'s flesh sizzles where the water touches it!", "Your flesh burns in the water!") + S.visible_message(span_warning("[S]'s flesh sizzles where the water touches it!"), span_danger("Your flesh burns in the water!")) // Then extinguish people on fire. var/needed = max(0,L.fire_stacks) * 5 @@ -230,7 +230,7 @@ var/obj/item/clothing/mask/smokable/S = H.wear_mask if(S.lit) S.quench() - H.visible_message("[H]\'s [S.name] is put out.") + H.visible_message(span_notice("[H]\'s [S.name] is put out.")) /* //VOREStation Edit Start. Stops slimes from dying from water. Fixes fuel affect_ingest, too. /datum/reagent/water/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) @@ -247,7 +247,7 @@ /datum/reagent/water/affect_touch(var/mob/living/carbon/M, var/alien, var/removed) if(alien == IS_SLIME && prob(10)) - M.visible_message("[M]'s flesh sizzles where the water touches it!", "Your flesh burns in the water!") + M.visible_message(span_warning("[M]'s flesh sizzles where the water touches it!"), span_danger("Your flesh burns in the water!")) ..() */ //VOREStation Edit End. diff --git a/code/modules/reagents/reagents/dispenser.dm b/code/modules/reagents/reagents/dispenser.dm index d959ef768c..add0a75156 100644 --- a/code/modules/reagents/reagents/dispenser.dm +++ b/code/modules/reagents/reagents/dispenser.dm @@ -205,11 +205,11 @@ if(volume < 5) return if(istype(O, /obj/item/book/tome)) - to_chat(usr, "The solution does nothing. Whatever this is, it isn't normal ink.") + to_chat(usr, span_notice("The solution does nothing. Whatever this is, it isn't normal ink.")) return var/obj/item/book/affectedbook = O affectedbook.dat = null - to_chat(usr, "The solution dissolves the ink on the book.") + to_chat(usr, span_notice("The solution dissolves the ink on the book.")) return /datum/reagent/fluorine @@ -364,11 +364,11 @@ var/mob/living/carbon/human/H = M if(H.head) if(H.head.unacidable) - to_chat(H, "Your [H.head] protects you from the acid.") + to_chat(H, span_danger("Your [H.head] protects you from the acid.")) remove_self(volume) return else if(removed > meltdose) - to_chat(H, "Your [H.head] melts away!") + to_chat(H, span_danger("Your [H.head] melts away!")) qdel(H.head) H.update_inv_head(1) H.update_hair(1) @@ -378,11 +378,11 @@ if(H.wear_mask) if(H.wear_mask.unacidable) - to_chat(H, "Your [H.wear_mask] protects you from the acid.") + to_chat(H, span_danger("Your [H.wear_mask] protects you from the acid.")) remove_self(volume) return else if(removed > meltdose) - to_chat(H, "Your [H.wear_mask] melts away!") + to_chat(H, span_danger("Your [H.wear_mask] melts away!")) qdel(H.wear_mask) H.update_inv_wear_mask(1) H.update_hair(1) @@ -392,10 +392,10 @@ if(H.glasses) if(H.glasses.unacidable) - to_chat(H, "Your [H.glasses] partially protect you from the acid!") + to_chat(H, span_danger("Your [H.glasses] partially protect you from the acid!")) removed /= 2 else if(removed > meltdose) - to_chat(H, "Your [H.glasses] melt away!") + to_chat(H, span_danger("Your [H.glasses] melt away!")) qdel(H.glasses) H.update_inv_glasses(1) removed -= meltdose / 2 @@ -427,7 +427,7 @@ var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc) I.desc = "Looks like this was \an [O] some time ago." for(var/mob/M in viewers(5, O)) - to_chat(M, "\The [O] melts.") + to_chat(M, span_warning("\The [O] melts.")) qdel(O) remove_self(meltdose) // 10 units of acid will not melt EVERYTHING on the tile diff --git a/code/modules/reagents/reagents/drugs.dm b/code/modules/reagents/reagents/drugs.dm index f24d1c8397..8ce249cfe1 100644 --- a/code/modules/reagents/reagents/drugs.dm +++ b/code/modules/reagents/reagents/drugs.dm @@ -31,11 +31,11 @@ if(world.time > data + 90 SECONDS && volume > 0.5) /// Spam prevention. data = world.time var/msg = pick(high_message_list) - to_chat(M, "[msg]") + to_chat(M, span_warning("[msg]")) else if(volume <= 0.2 && data != -1) data = -1 var/msg = pick(sober_message_list) - to_chat(M, "[msg]") + to_chat(M, span_warning("[msg]")) if(prob(5) && prob_proc == FALSE) /// Enables procs to activate, remains true until THAT PROC sets it to false again. prob_proc = TRUE @@ -251,7 +251,7 @@ M.fear = max((M.fear - 6),0) if(prob(5) && prob_proc == TRUE) - to_chat(M, "Everything feels out of control...") + to_chat(M, span_warning("Everything feels out of control...")) M.hallucination += 200 prob_proc = FALSE @@ -262,4 +262,4 @@ taste_description = "mint" color = "#e6efe3" high_message_list = list("You feel sluggish...", "You feel calm and collected.") - sober_message_list = list("You feel so much more antsy...", "Your concentration wavers.") \ No newline at end of file + sober_message_list = list("You feel so much more antsy...", "Your concentration wavers.") diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index b30b1ecad4..775f04bdaf 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -88,7 +88,7 @@ //We'll assume that the batter isnt going to be regurgitated and eaten by someone else. Only show this once if(data["cooked"] != 1) if (!messaged) - to_chat(M, "Ugh, this raw [name] tastes disgusting.") + to_chat(M, span_warning("Ugh, this raw [name] tastes disgusting.")) nutriment_factor *= 0.5 messaged = 1 @@ -238,7 +238,7 @@ M.take_organ_damage(0, removed * 1.5 * dfactor) data["temperature"] -= (6 * removed) / (1 + volume*0.1)//Cools off as it burns you if (lastburnmessage+100 < world.time ) - to_chat(M, "Searing hot oil burns you, wash it off quick!") + to_chat(M, span_danger("Searing hot oil burns you, wash it off quick!")) lastburnmessage = world.time /datum/reagent/nutriment/triglyceride/oil/cooking @@ -587,7 +587,7 @@ ..() if(iscarbon(M) && !M.isSynthetic()) var/message = pick("Oh god, it smells disgusting here.", "What is that stench?", "That's an awful odor.") - to_chat(M, "[message]") + to_chat(M, span_alien("[message]")) if(prob(CLAMP(amount, 5, 90))) var/mob/living/L = M L.vomit() @@ -725,7 +725,7 @@ return if(alien == IS_ALRAUNE) // VOREStation Edit: It wouldn't affect plants that much. if(prob(5)) - to_chat(M, "You feel a chilly, tingling sensation in your mouth.") + to_chat(M, span_rose("You feel a chilly, tingling sensation in your mouth.")) M.bodytemperature -= rand(10, 25) return if(ishuman(M)) @@ -734,12 +734,12 @@ return var/effective_dose = (dose * M.species.spice_mod) if((effective_dose < 5) && (dose == metabolism || prob(5))) - to_chat(M, "Your insides suddenly feel a spreading chill!") + to_chat(M, span_danger("Your insides suddenly feel a spreading chill!")) if(effective_dose >= 5) M.apply_effect(2 * M.species.spice_mod, AGONY, 0) M.bodytemperature -= rand(1, 5) * M.species.spice_mod // Really fucks you up, cause it makes you cold. if(prob(5)) - M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]", pick("You feel like your insides are freezing!", "Your insides feel like they're turning to ice!")) + M.visible_message(span_warning("[M] [pick("dry heaves!","coughs!","splutters!")]"), pick(span_danger("You feel like your insides are freezing!"), span_danger("Your insides feel like they're turning to ice!"))) // holder.remove_reagent("capsaicin", 5) // VOREStation Edit: Nop, we don't instadelete spices for free. /datum/reagent/frostoil/cryotoxin //A longer lasting version of frost oil. @@ -770,7 +770,7 @@ return if(alien == IS_ALRAUNE) // VOREStation Edit: It wouldn't affect plants that much. if(prob(5)) - to_chat(M, "You feel a pleasant sensation in your mouth.") + to_chat(M, span_rose("You feel a pleasant sensation in your mouth.")) M.bodytemperature += rand(10, 25) return if(ishuman(M)) @@ -780,12 +780,12 @@ var/effective_dose = (dose * M.species.spice_mod) if((effective_dose < 5) && (dose == metabolism || prob(5))) - to_chat(M, "Your insides feel uncomfortably hot!") + to_chat(M, span_danger("Your insides feel uncomfortably hot!")) if(effective_dose >= 5) M.apply_effect(2 * M.species.spice_mod, AGONY, 0) M.bodytemperature += rand(1, 5) * M.species.spice_mod // Really fucks you up, cause it makes you overheat, too. if(prob(5)) - M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]", pick("You feel like your insides are burning!", "You feel like your insides are on fire!", "You feel like your belly is full of lava!")) + M.visible_message(span_warning("[M] [pick("dry heaves!","coughs!","splutters!")]"), pick(span_danger("You feel like your insides are burning!"), span_danger("You feel like your insides are on fire!"), span_danger("You feel like your belly is full of lava!"))) // holder.remove_reagent("frostoil", 5) // VOREStation Edit: Nop, we don't instadelete spices for free. /datum/reagent/condensedcapsaicin @@ -865,11 +865,11 @@ if(head_covered && chest_covered && groin_covered && legs_covered && arms_covered && hands_covered && feet_covered) break if(eyes_covered && mouth_covered) - to_chat(M, "Your [safe_thing] protects you from the pepperspray!") + to_chat(M, span_warning("Your [safe_thing] protects you from the pepperspray!")) if(alien != IS_SLIME) return else if(eyes_covered) - to_chat(M, "Your [safe_thing] protects you from most of the pepperspray!") + to_chat(M, span_warning("Your [safe_thing] protects you from most of the pepperspray!")) M.eye_blurry = max(M.eye_blurry, effective_strength * 3) M.Blind(effective_strength) M.Stun(5) @@ -877,12 +877,12 @@ if(alien != IS_SLIME) return else if(mouth_covered) // Mouth cover is better than eye cover - to_chat(M, "Your [safe_thing] protects your face from the pepperspray!") + to_chat(M, span_warning("Your [safe_thing] protects your face from the pepperspray!")) M.eye_blurry = max(M.eye_blurry, effective_strength) if(alien != IS_SLIME) return else// Oh dear :D - to_chat(M, "You're sprayed directly in the eyes with pepperspray!") + to_chat(M, span_warning("You're sprayed directly in the eyes with pepperspray!")) M.eye_blurry = max(M.eye_blurry, effective_strength * 5) M.Blind(effective_strength * 2) M.Stun(5) @@ -892,31 +892,31 @@ if(alien == IS_SLIME) if(!head_covered) if(prob(33)) - to_chat(M, "The exposed flesh on your head burns!") + to_chat(M, span_warning("The exposed flesh on your head burns!")) M.apply_effect(5 * effective_strength, AGONY, 0) if(!chest_covered) if(prob(33)) - to_chat(M, "The exposed flesh on your chest burns!") + to_chat(M, span_warning("The exposed flesh on your chest burns!")) M.apply_effect(5 * effective_strength, AGONY, 0) if(!groin_covered && prob(75)) if(prob(33)) - to_chat(M, "The exposed flesh on your groin burns!") + to_chat(M, span_warning("The exposed flesh on your groin burns!")) M.apply_effect(3 * effective_strength, AGONY, 0) if(!arms_covered && prob(45)) if(prob(33)) - to_chat(M, "The exposed flesh on your arms burns!") + to_chat(M, span_warning("The exposed flesh on your arms burns!")) M.apply_effect(3 * effective_strength, AGONY, 0) if(!legs_covered && prob(45)) if(prob(33)) - to_chat(M, "The exposed flesh on your legs burns!") + to_chat(M, span_warning("The exposed flesh on your legs burns!")) M.apply_effect(3 * effective_strength, AGONY, 0) if(!hands_covered && prob(20)) if(prob(33)) - to_chat(M, "The exposed flesh on your hands burns!") + to_chat(M, span_warning("The exposed flesh on your hands burns!")) M.apply_effect(effective_strength / 2, AGONY, 0) if(!feet_covered && prob(20)) if(prob(33)) - to_chat(M, "The exposed flesh on your feet burns!") + to_chat(M, span_warning("The exposed flesh on your feet burns!")) M.apply_effect(effective_strength / 2, AGONY, 0) /datum/reagent/condensedcapsaicin/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -925,11 +925,11 @@ if(!H.can_feel_pain()) return if(dose == metabolism) - to_chat(M, "You feel like your insides are burning!") + to_chat(M, span_danger("You feel like your insides are burning!")) else M.apply_effect(4, AGONY, 0) if(prob(5)) - M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]", "You feel like your insides are burning!") + M.visible_message(span_warning("[M] [pick("dry heaves!","coughs!","splutters!")]"), span_danger("You feel like your insides are burning!")) // holder.remove_reagent("frostoil", 5) // VOREStation Edit: Nop, we don't instadelete spices for free. /* Drinks */ @@ -4370,7 +4370,7 @@ return var/adjust_liver = rand(-3, 2) if(prob(L.damage)) - to_chat(M, "You feel woozy...") + to_chat(M, span_cult("You feel woozy...")) L.damage = max(L.damage + (adjust_liver * removed), 0) var/adjust_tox = rand(-4, 2) M.adjustToxLoss(adjust_tox * removed) @@ -4544,7 +4544,7 @@ ..() playsound(M, 'sound/items/hooh.ogg', 50, 1, -1) if(prob(5)) - to_chat(M, "You feel like you've been gnomed...") + to_chat(M, span_warning("You feel like you've been gnomed...")) /datum/reagent/drink/soda/kompot name = "Kompot" diff --git a/code/modules/reagents/reagents/food_drinks_vr.dm b/code/modules/reagents/reagents/food_drinks_vr.dm index 2c4a0d24ec..3f245ac219 100644 --- a/code/modules/reagents/reagents/food_drinks_vr.dm +++ b/code/modules/reagents/reagents/food_drinks_vr.dm @@ -62,9 +62,9 @@ return else if((dose < 5) && (dose == metabolism || prob(5))) - to_chat(M, "Your insides feel uncomfortably hot!") + to_chat(M, span_danger("Your insides feel uncomfortably hot!")) if(dose >= 5 && prob(5)) - M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]", pick("You feel like your insides are burning!", "You feel like your insides are on fire!", "You feel like your belly is full of lava!")) + M.visible_message(span_warning("[M] [pick("dry heaves!","coughs!","splutters!")]"), pick(span_danger("You feel like your insides are burning!"), span_danger("You feel like your insides are on fire!"), span_danger("You feel like your belly is full of lava!"))) /datum/reagent/ethanol/monstertamer name = "Monster Tamer" @@ -103,7 +103,7 @@ H.feral -= removed * 3 // should calm them down quick, provided they're actually in a state to STAY calm. if (H.feral <=0) //check if they're unferalled H.feral = 0 - to_chat(H, "Your mind starts to clear, soothed into a state of clarity as your senses return.") + to_chat(H, span_info("Your mind starts to clear, soothed into a state of clarity as your senses return.")) log_and_message_admins("is no longer feral.", H) /datum/reagent/ethanol/monstertamer/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) @@ -466,7 +466,7 @@ H.feral -= removed * 3 // should calm them down quick, provided they're actually in a state to STAY calm. if (H.feral <=0) //check if they're unferalled H.feral = 0 - to_chat(H, "Your mind starts to clear, soothed into a state of clarity as your senses return.") + to_chat(H, span_info("Your mind starts to clear, soothed into a state of clarity as your senses return.")) log_and_message_admins("is no longer feral.", H) /datum/reagent/ethanol/hairoftherat/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) @@ -556,7 +556,7 @@ H.feral -= removed * 3 //Should calm them down quick, provided they're actually in a state to STAY calm. if(H.feral <=0) //Check if they're unferalled H.feral = 0 - to_chat(H, "Your mind starts to clear, soothed into a state of clarity as your senses return.") + to_chat(H, span_info("Your mind starts to clear, soothed into a state of clarity as your senses return.")) log_and_message_admins("is no longer feral.", H) /datum/reagent/nutriment/protein/brainzsnax/red @@ -883,7 +883,7 @@ /datum/reagent/drink/coffee/nukie/mega/fast/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() if(prob(1)) - M.visible_message("\The [M] sizzles!") + M.visible_message(span_danger("\The [M] sizzles!")) M.adjustFireLoss(5) M.add_chemical_effect(CE_SPEEDBOOST, 1) diff --git a/code/modules/reagents/reagents/medicine.dm b/code/modules/reagents/reagents/medicine.dm index 8316cfefa5..8599c3dc49 100644 --- a/code/modules/reagents/reagents/medicine.dm +++ b/code/modules/reagents/reagents/medicine.dm @@ -261,7 +261,7 @@ else if(alien == IS_SLIME && dose >= 15) M.add_chemical_effect(CE_PAINKILLER, 15 * M.species.chem_strength_pain) if(prob(15)) - to_chat(M, "You have a moment of clarity as you collapse.") + to_chat(M, span_notice("You have a moment of clarity as you collapse.")) M.adjustBrainLoss(-20 * removed) //VOREStation Edit M.Weaken(6) else if(alien != IS_DIONA) @@ -286,7 +286,7 @@ else if(alien == IS_SLIME && dose >= 10) M.add_chemical_effect(CE_PAINKILLER, 25 * M.species.chem_strength_pain) if(prob(25)) - to_chat(M, "You have a moment of clarity, as you feel your tubes lose pressure rapidly.") + to_chat(M, span_notice("You have a moment of clarity, as you feel your tubes lose pressure rapidly.")) M.adjustBrainLoss(-8 * removed) M.Weaken(3) else if(alien != IS_DIONA) @@ -368,7 +368,7 @@ var/chem_effective = 1 * M.species.chem_strength_heal if(alien == IS_SLIME) chem_effective = 0.25 - to_chat(M, "It's cold. Something causes your cellular mass to harden occasionally, resulting in vibration.") + to_chat(M, span_danger("It's cold. Something causes your cellular mass to harden occasionally, resulting in vibration.")) M.Weaken(10) M.silent = max(M.silent, 10) M.make_jittery(4) @@ -393,7 +393,7 @@ var/chem_effective = 1 * M.species.chem_strength_heal if(alien == IS_SLIME) if(prob(10)) - to_chat(M, "It's so cold. Something causes your cellular mass to harden sporadically, resulting in seizure-like twitching.") + to_chat(M, span_danger("It's so cold. Something causes your cellular mass to harden sporadically, resulting in seizure-like twitching.")) chem_effective = 0.5 M.Weaken(20) M.silent = max(M.silent, 20) @@ -427,7 +427,7 @@ var/chem_effective = 1 * M.species.chem_strength_heal if(alien == IS_SLIME) if(prob(10)) - to_chat(M, "It's so cold. Something causes your cellular mass to solidify sporadically, resulting in uncontrollable twitching.") + to_chat(M, span_danger("It's so cold. Something causes your cellular mass to solidify sporadically, resulting in uncontrollable twitching.")) chem_effective = 0.5 M.Weaken(10) M.silent = max(M.silent, 10) @@ -463,7 +463,7 @@ if(M.bodytemperature < 170 || (M.stat == DEAD && M.has_modifier_of_type(/datum/modifier/bloodpump_corpse))) if(alien == IS_SLIME) if(prob(10)) - to_chat(M, "It's so cold. Something causes your cellular mass to harden sporadically, resulting in seizure-like twitching.") + to_chat(M, span_danger("It's so cold. Something causes your cellular mass to harden sporadically, resulting in seizure-like twitching.")) chem_effective = 0.5 M.Weaken(20) M.silent = max(M.silent, 20) @@ -617,7 +617,7 @@ var/mob/living/carbon/human/H = M var/obj/item/organ/internal/heart/ht = H.internal_organs_by_name[O_HEART] ht?.take_damage(1) - to_chat(M, "Huh... Is this what a heart attack feels like?") + to_chat(M, span_warning("Huh... Is this what a heart attack feels like?")) /datum/reagent/alkysine name = "Alkysine" @@ -862,7 +862,7 @@ if(prob(5)) H.vomit(1) else if(prob(5)) - to_chat(H, "Something churns inside you.") + to_chat(H, span_danger("Something churns inside you.")) H.adjustToxLoss(10 * removed) H.vomit(0, 1) else @@ -1136,12 +1136,12 @@ if(alien == IS_SLIME) if(volume <= 0.1 && data != -1) data = -1 - to_chat(M, "You regain focus...") + to_chat(M, span_notice("You regain focus...")) else var/delay = (5 MINUTES) if(world.time > data + delay) data = world.time - to_chat(M, "Your senses feel unfocused, and divided.") + to_chat(M, span_warning("Your senses feel unfocused, and divided.")) M.add_chemical_effect(CE_ANTIBIOTIC, dose >= overdose ? ANTIBIO_OD : ANTIBIO_NORM) /datum/reagent/spaceacillin/affect_touch(var/mob/living/carbon/M, var/alien, var/removed) @@ -1169,12 +1169,12 @@ if(ishuman(M) && alien == IS_SLIME) //Everything about them is treated like a targetted organism. Widespread bodily function begins to fail. if(volume <= 0.1 && data != -1) data = -1 - to_chat(M, "Your body ceases its revolt.") + to_chat(M, span_notice("Your body ceases its revolt.")) else var/delay = (3 MINUTES) if(world.time > data + delay) data = world.time - to_chat(M, "It feels like your body is revolting!") + to_chat(M, span_critical("It feels like your body is revolting!")) M.Confuse(7) M.adjustFireLoss(removed * 2) M.adjustToxLoss(removed * 2) @@ -1183,7 +1183,7 @@ M.eye_blurry = min(20, max(0, M.eye_blurry + 10)) if(prob(25)) if(prob(25)) - to_chat(M, "Your pneumatic fluids seize for a moment.") + to_chat(M, span_danger("Your pneumatic fluids seize for a moment.")) M.Stun(2) spawn(30) M.Weaken(2) @@ -1196,7 +1196,7 @@ if(M.bruteloss >= 60 && M.toxloss >= 60 && M.brainloss >= 30) //Total Structural Failure. Limbs start splattering. var/obj/item/organ/external/O = pick(H.organs) if(prob(20) && !istype(O, /obj/item/organ/external/chest/unbreakable/slime) && !istype(O, /obj/item/organ/external/groin/unbreakable/slime)) - to_chat(M, "You feel your [O] begin to dissolve, before it sloughs from your body.") + to_chat(M, span_critical("You feel your [O] begin to dissolve, before it sloughs from your body.")) O.droplimb() //Splat. return @@ -1241,12 +1241,12 @@ if(alien == IS_SLIME) if(volume <= 0.1 && data != -1) data = -1 - to_chat(M, "The itching fades...") + to_chat(M, span_notice("The itching fades...")) else var/delay = (2 MINUTES) if(world.time > data + delay) data = world.time - to_chat(M, "Your skin itches.") + to_chat(M, span_warning("Your skin itches.")) M.add_chemical_effect(CE_ANTIBIOTIC, dose >= overdose ? ANTIBIO_OD : ANTIBIO_NORM) M.add_chemical_effect(CE_PAINKILLER, 20 * M.species.chem_strength_pain) // 5 less than paracetamol. @@ -1313,7 +1313,7 @@ if(istype(L, /mob/living/simple_mob/slime)) var/mob/living/simple_mob/slime/S = L S.adjustToxLoss(rand(15, 25) * amount) // Does more damage than water. - S.visible_message("[S]'s flesh sizzles where the fluid touches it!", "Your flesh burns in the fluid!") + S.visible_message(span_warning("[S]'s flesh sizzles where the fluid touches it!"), span_danger("Your flesh burns in the fluid!")) remove_self(amount) /datum/reagent/leporazine @@ -1427,4 +1427,4 @@ M.adjustCloneLoss(-2 * removed) M.druggy = max(M.druggy, 20) M.hallucination = max(M.hallucination, 3) - M.adjustBrainLoss(1 * removed) //your life for your mind. The Earthmother's Tithe. \ No newline at end of file + M.adjustBrainLoss(1 * removed) //your life for your mind. The Earthmother's Tithe. diff --git a/code/modules/reagents/reagents/medicine_vr.dm b/code/modules/reagents/reagents/medicine_vr.dm index edaf07c655..88da82e573 100644 --- a/code/modules/reagents/reagents/medicine_vr.dm +++ b/code/modules/reagents/reagents/medicine_vr.dm @@ -32,7 +32,7 @@ /datum/reagent/numbing_enzyme/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.add_chemical_effect(CE_PAINKILLER, 200) if(prob(0.01)) //1 in 10000 chance per tick. Extremely rare. - to_chat(M,"Your body feels numb as a light, tingly sensation spreads throughout it, like some odd warmth.") + to_chat(M,span_warning("Your body feels numb as a light, tingly sensation spreads throughout it, like some odd warmth.")) //Not noted here, but a movement debuff of 1.5 is handed out in human_movement.dm when numbing_enzyme is in a person's bloodstream! /datum/reagent/numbing_enzyme/overdose(var/mob/living/carbon/M, var/alien) @@ -40,24 +40,24 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(prob(1)) - to_chat(H,"Your entire body feels numb and the sensation of pins and needles continually assaults you. You blink and the next thing you know, your legs give out momentarily!") + to_chat(H,span_warning("Your entire body feels numb and the sensation of pins and needles continually assaults you. You blink and the next thing you know, your legs give out momentarily!")) H.AdjustWeakened(5) //Fall onto the floor for a few moments. H.Confuse(15) //Be unable to walk correctly for a bit longer. if(prob(1)) if(H.losebreath <= 1 && H.oxyloss <= 20) //Let's not suffocate them to the point that they pass out. - to_chat(H,"You feel a sharp stabbing pain in your chest and quickly realize that your lungs have stopped functioning!") //Let's scare them a bit. + to_chat(H,span_warning("You feel a sharp stabbing pain in your chest and quickly realize that your lungs have stopped functioning!")) //Let's scare them a bit. H.losebreath = 10 H.adjustOxyLoss(5) if(prob(2)) - to_chat(H,"You feel a dull pain behind your eyes and at thee back of your head...") + to_chat(H,span_warning("You feel a dull pain behind your eyes and at thee back of your head...")) H.hallucination += 20 //It messes with your mind for some reason. H.eye_blurry += 20 //Groggy vision for a small bit. if(prob(3)) - to_chat(H,"You shiver, your body continually being assaulted by the sensation of pins and needles.") + to_chat(H,span_warning("You shiver, your body continually being assaulted by the sensation of pins and needles.")) H.emote("shiver") H.make_jittery(10) if(prob(3)) - to_chat(H,"Your tongue feels numb and unresponsive.") + to_chat(H,span_warning("Your tongue feels numb and unresponsive.")) H.stuttering += 20 /datum/reagent/vermicetol diff --git a/code/modules/reagents/reagents/modifiers.dm b/code/modules/reagents/reagents/modifiers.dm index 22b1f047c7..16ba25db54 100644 --- a/code/modules/reagents/reagents/modifiers.dm +++ b/code/modules/reagents/reagents/modifiers.dm @@ -52,7 +52,7 @@ /datum/reagent/modapplying/cryofluid/touch_turf(var/turf/T, var/amount) ..() if(istype(T, /turf/simulated/floor/water) && prob(amount)) - T.visible_message("\The [T] crackles loudly as the cryogenic fluid causes it to boil away, leaving behind a hard layer of ice.") + T.visible_message(span_danger("\The [T] crackles loudly as the cryogenic fluid causes it to boil away, leaving behind a hard layer of ice.")) T.ChangeTurf(/turf/simulated/floor/outdoors/ice, 1, 1, TRUE) else if(istype(T, /turf/simulated)) diff --git a/code/modules/reagents/reagents/other.dm b/code/modules/reagents/reagents/other.dm index fa8d2f30a1..3bf60711ca 100644 --- a/code/modules/reagents/reagents/other.dm +++ b/code/modules/reagents/reagents/other.dm @@ -509,7 +509,7 @@ var/obj/item/clothing/mask/smokable/S = H.wear_mask if(S.lit) S.quench() // No smoking in my medbay! - H.visible_message("[H]\'s [S.name] is put out.") + H.visible_message(span_notice("[H]\'s [S.name] is put out.")) /datum/reagent/lube // TODO: spraying on borgs speeds them up name = "Space Lube" diff --git a/code/modules/reagents/reagents/other_vr.dm b/code/modules/reagents/reagents/other_vr.dm index 7820fcd5bb..287f181056 100644 --- a/code/modules/reagents/reagents/other_vr.dm +++ b/code/modules/reagents/reagents/other_vr.dm @@ -11,7 +11,7 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.species.name != "Promethean") - to_chat(M, "Your flesh rapidly mutates!") + to_chat(M, span_danger("Your flesh rapidly mutates!")) var/list/backup_implants = list() for(var/obj/item/organ/I in H.organs) @@ -80,7 +80,7 @@ var/removed_heat = between(0, volume * 19000, -environment.get_thermal_energy_change(min_temperature)) environment.add_thermal_energy(-removed_heat) if(prob(5)) - T.visible_message("The foam sizzles as it lands on \the [T]!") + T.visible_message(span_warning("The foam sizzles as it lands on \the [T]!")) /datum/reagent/firefighting_foam/touch_obj(var/obj/O, reac_volume) O.water_act(reac_volume / 5) @@ -89,7 +89,7 @@ if(istype(M, /mob/living/simple_mob/slime)) //I'm sure foam is water-based! var/mob/living/simple_mob/slime/S = M S.adjustToxLoss(15 * reac_volume) - S.visible_message("[S]'s flesh sizzles where the foam touches it!", "Your flesh burns in the foam!") + S.visible_message(span_warning("[S]'s flesh sizzles where the foam touches it!"), span_danger("Your flesh burns in the foam!")) M.adjust_fire_stacks(-reac_volume) M.ExtinguishMob() diff --git a/code/modules/reagents/reagents/toxins.dm b/code/modules/reagents/reagents/toxins.dm index 003ba3e74f..26b7012330 100644 --- a/code/modules/reagents/reagents/toxins.dm +++ b/code/modules/reagents/reagents/toxins.dm @@ -120,7 +120,7 @@ if(alien == IS_SLIME) M.adjust_fire_stacks(removed * 10) if(prob(10)) - to_chat(M, "You feel something boiling within you!") + to_chat(M, span_critical("You feel something boiling within you!")) spawn(rand(30, 60)) M.IgniteMob() @@ -254,7 +254,7 @@ var/mob/living/carbon/human/H = M var/obj/item/organ/internal/heart/ht = H.internal_organs_by_name[O_HEART] ht?.take_damage(1) - to_chat(M, "Huh... Is this what a heart attack feels like?") + to_chat(M, span_warning("Huh... Is this what a heart attack feels like?")) /datum/reagent/toxin/potassium_chloride name = "Potassium Chloride" @@ -416,7 +416,7 @@ if(locate(/obj/effect/overlay/wallrot) in W) for(var/obj/effect/overlay/wallrot/E in W) qdel(E) - W.visible_message("The fungi are completely dissolved by the solution!") + W.visible_message(span_notice("The fungi are completely dissolved by the solution!")) /datum/reagent/toxin/plantbgone/touch_obj(var/obj/O, var/volume) ..() @@ -501,11 +501,11 @@ if(alien == IS_DIONA) return if(prob(10)) - to_chat(M, "Your veins feel like they're on fire!") + to_chat(M, span_warning("Your veins feel like they're on fire!")) M.adjust_fire_stacks(0.1) else if(prob(5)) M.IgniteMob() - to_chat(M, "Some of your veins rupture, the exposed blood igniting!") + to_chat(M, span_critical("Some of your veins rupture, the exposed blood igniting!")) /datum/reagent/condensedcapsaicin/venom name = "Irritant toxin" @@ -523,9 +523,9 @@ if(prob(50)) M.apply_effect(4, AGONY, 0) if(prob(20)) - to_chat(M, "You feel like your insides are burning!") + to_chat(M, span_danger("You feel like your insides are burning!")) else if(prob(20)) - M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!","rubs at their eyes!")]") + M.visible_message(span_warning("[M] [pick("dry heaves!","coughs!","splutters!","rubs at their eyes!")]")) else M.eye_blurry = max(M.eye_blurry, 10) @@ -545,7 +545,7 @@ M.apply_effect(5, AGONY, 0) M.adjustToxLoss(3 * removed) if(prob(10)) - to_chat(M, "Your cellular mass hardens for a moment.") + to_chat(M, span_warning("Your cellular mass hardens for a moment.")) M.Stun(6) return if(alien == IS_SKRELL) @@ -623,7 +623,7 @@ M.UpdateAppearance() if(prob(removed * 40)) //Additionally, let's make it so there's an 8% chance per tick for a random cosmetic/not guranteed good/bad mutation. randmuti(M)//This should equate to 4 random cosmetic mutations per 10 injected/20 ingested/30 touching units - to_chat(M, "You feel odd!") + to_chat(M, span_warning("You feel odd!")) M.apply_effect(10 * removed, IRRADIATE, 0) /datum/reagent/slimejelly @@ -646,7 +646,7 @@ M.add_chemical_effect(CE_PAINKILLER, 60) else if(prob(10)) - to_chat(M, "Your insides are burning!") + to_chat(M, span_danger("Your insides are burning!")) M.adjustToxLoss(rand(100, 300) * removed) else if(prob(40)) M.heal_organ_damage(25 * removed, 0) @@ -893,7 +893,7 @@ M.UpdateAppearance() if(prob(removed * 40)) randmuti(M) - to_chat(M, "You feel odd!") + to_chat(M, span_warning("You feel odd!")) M.apply_effect(16 * removed, IRRADIATE, 0) /datum/reagent/aslimetoxin @@ -923,7 +923,7 @@ M.UpdateAppearance() if(prob(removed * 40)) randmuti(M) - to_chat(M, "You feel odd!") + to_chat(M, span_warning("You feel odd!")) M.apply_effect(6 * removed, IRRADIATE, 0) /* diff --git a/code/modules/reagents/reagents/vore_vr.dm b/code/modules/reagents/reagents/vore_vr.dm index 4b56d19fc9..9441c6c1ef 100644 --- a/code/modules/reagents/reagents/vore_vr.dm +++ b/code/modules/reagents/reagents/vore_vr.dm @@ -142,8 +142,8 @@ if(!(H.gender == MALE)) H.set_gender(MALE) H.change_gender_identity(MALE) - H.visible_message("[H] suddenly twitches as some of their features seem to contort and reshape, adjusting... In the end, it seems they are now male.", - "Your body suddenly contorts, feeling very different in various ways... By the time the rushing feeling is over it seems you just became male.") + H.visible_message(span_notice("[H] suddenly twitches as some of their features seem to contort and reshape, adjusting... In the end, it seems they are now male."), + span_warning("Your body suddenly contorts, feeling very different in various ways... By the time the rushing feeling is over it seems you just became male.")) /datum/reagent/gynorovir name = "Gynorovir" @@ -163,8 +163,8 @@ if(!(H.gender == FEMALE)) H.set_gender(FEMALE) H.change_gender_identity(FEMALE) - H.visible_message("[H] suddenly twitches as some of their features seem to contort and reshape, adjusting... In the end, it seems they are now female.", - "Your body suddenly contorts, feeling very different in various ways... By the time the rushing feeling is over it seems you just became female.") + H.visible_message(span_notice("[H] suddenly twitches as some of their features seem to contort and reshape, adjusting... In the end, it seems they are now female."), + span_warning("Your body suddenly contorts, feeling very different in various ways... By the time the rushing feeling is over it seems you just became female.")) /datum/reagent/androgynorovir name = "Androgynorovir" @@ -184,8 +184,8 @@ if(!(H.gender == PLURAL)) H.set_gender(PLURAL) H.change_gender_identity(PLURAL) - H.visible_message("[H] suddenly twitches as some of their features seem to contort and reshape, adjusting... In the end, it seems they are now of mixed gender.", - "Your body suddenly contorts, feeling very different in various ways... By the time the rushing feeling is over it seems you just became of mixed gender.") + H.visible_message(span_notice("[H] suddenly twitches as some of their features seem to contort and reshape, adjusting... In the end, it seems they are now of mixed gender."), + span_warning("Your body suddenly contorts, feeling very different in various ways... By the time the rushing feeling is over it seems you just became of mixed gender.")) ////////////////////////// Misc Drugs ////////////////////////// @@ -241,4 +241,4 @@ /datum/reagent/pain_enzyme/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.add_chemical_effect(CE_PAINKILLER, -200) if(prob(0.01)) //1 in 10000 chance per tick. Extremely rare. - to_chat(M,"Your body feels as though it's on fire!") + to_chat(M,span_warning("Your body feels as though it's on fire!")) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 9270fa422c..a3952a80ae 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -270,7 +270,7 @@ // attack with hand, switch position /obj/machinery/conveyor_switch/attack_hand(mob/user) if(!allowed(user)) - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) return if(position == 0) @@ -308,7 +308,7 @@ playsound(src, WT.usesound, 50, 1) if(do_after(user, 20 * WT.toolspeed)) if(!src || !WT.isOn()) return - to_chat(user, "You deconstruct the frame.") + to_chat(user, span_notice("You deconstruct the frame.")) new /obj/item/stack/material/steel( src.loc, 2 ) qdel(src) return diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 43f24fe544..97fa704580 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -266,11 +266,11 @@ return if(usr.loc == src) - to_chat(usr, "You cannot reach the controls from inside.") + to_chat(usr, span_warning("You cannot reach the controls from inside.")) return TRUE if(mode==-1 && action != "eject") // If the mode is -1, only allow ejection - to_chat(usr, "The disposal units power is disabled.") + to_chat(usr, span_warning("The disposal units power is disabled.")) return if(stat & BROKEN) diff --git a/code/modules/recycling/recycling.dm b/code/modules/recycling/recycling.dm index 5c6eb417af..41a54d30a6 100644 --- a/code/modules/recycling/recycling.dm +++ b/code/modules/recycling/recycling.dm @@ -24,7 +24,7 @@ return if(working) - to_chat(user, "\The [src] is busy! Wait until it's idle.") + to_chat(user, span_warning("\The [src] is busy! Wait until it's idle.")) return if(default_deconstruction_screwdriver(user, O)) @@ -40,7 +40,7 @@ take_item(O) M.visible_message("[M] inserts [O] into [src].", "You insert [O] into [src].") else - to_chat(user, "\The [src] can't accept [O] for recycling.") + to_chat(user, span_warning("\The [src] can't accept [O] for recycling.")) // Conveyors etc /obj/machinery/recycling/Bumped(atom/A) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 1f805d9dd9..663f6c4fb5 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -27,7 +27,7 @@ var/obj/item/destTagger/O = W if(O.currTag) if(src.sortTag != O.currTag) - to_chat(user, "You have labeled the destination as [O.currTag].") + to_chat(user, span_notice("You have labeled the destination as [O.currTag].")) if(!src.sortTag) src.sortTag = O.currTag update_icon() @@ -35,19 +35,19 @@ src.sortTag = O.currTag playsound(src, 'sound/machines/twobeep.ogg', 50, 1) else - to_chat(user, "The package is already labeled for [O.currTag].") + to_chat(user, span_warning("The package is already labeled for [O.currTag].")) else - to_chat(user, "You need to set a destination first!") + to_chat(user, span_warning("You need to set a destination first!")) else if(istype(W, /obj/item/pen)) switch(tgui_alert(usr, "What would you like to alter?","Select Alteration",list("Title","Description","Cancel"))) if("Title") var/str = sanitizeSafe(tgui_input_text(usr,"Label text?","Set label","", MAX_NAME_LEN), MAX_NAME_LEN) if(!str || !length(str)) - to_chat(user, " Invalid text.") + to_chat(user, span_warning(" Invalid text.")) return user.visible_message("\The [user] titles \the [src] with \a [W], marking down: \"[str]\"",\ - "You title \the [src]: \"[str]\"",\ + span_notice("You title \the [src]: \"[str]\""),\ "You hear someone scribbling a note.") playsound(src, pick('sound/bureaucracy/pen1.ogg','sound/bureaucracy/pen2.ogg'), 20) name = "[name] ([str])" @@ -67,7 +67,7 @@ else examtext = str user.visible_message("\The [user] labels \the [src] with \a [W], scribbling down: \"[examtext]\"",\ - "You label \the [src]: \"[examtext]\"",\ + span_notice("You label \the [src]: \"[examtext]\""),\ "You hear someone scribbling a note.") playsound(src, pick('sound/bureaucracy/pen1.ogg','sound/bureaucracy/pen2.ogg'), 20) return @@ -105,9 +105,9 @@ . = ..() if(get_dist(user, src) <= 4) if(sortTag) - . += "It is labeled \"[sortTag]\"" + . += span_notice("It is labeled \"[sortTag]\"") if(examtext) - . += "It has a note attached which reads, \"[examtext]\"" + . += span_notice("It has a note attached which reads, \"[examtext]\"") /obj/item/smallDelivery desc = "A small wrapped package." @@ -138,7 +138,7 @@ var/obj/item/destTagger/O = W if(O.currTag) if(src.sortTag != O.currTag) - to_chat(user, "You have labeled the destination as [O.currTag].") + to_chat(user, span_notice("You have labeled the destination as [O.currTag].")) if(!src.sortTag) src.sortTag = O.currTag update_icon() @@ -146,19 +146,19 @@ src.sortTag = O.currTag playsound(src, 'sound/machines/twobeep.ogg', 50, 1) else - to_chat(user, "The package is already labeled for [O.currTag].") + to_chat(user, span_warning("The package is already labeled for [O.currTag].")) else - to_chat(user, "You need to set a destination first!") + to_chat(user, span_warning("You need to set a destination first!")) else if(istype(W, /obj/item/pen)) switch(tgui_alert(usr, "What would you like to alter?","Select Alteration",list("Title","Description","Cancel"))) if("Title") var/str = sanitizeSafe(tgui_input_text(usr,"Label text?","Set label","", MAX_NAME_LEN), MAX_NAME_LEN) if(!str || !length(str)) - to_chat(user, " Invalid text.") + to_chat(user, span_warning(" Invalid text.")) return user.visible_message("\The [user] titles \the [src] with \a [W], marking down: \"[str]\"",\ - "You title \the [src]: \"[str]\"",\ + span_notice("You title \the [src]: \"[str]\""),\ "You hear someone scribbling a note.") playsound(src, pick('sound/bureaucracy/pen1.ogg','sound/bureaucracy/pen2.ogg'), 20) name = "[name] ([str])" @@ -179,7 +179,7 @@ else examtext = str user.visible_message("\The [user] labels \the [src] with \a [W], scribbling down: \"[examtext]\"",\ - "You label \the [src]: \"[examtext]\"",\ + span_notice("You label \the [src]: \"[examtext]\""),\ "You hear someone scribbling a note.") playsound(src, pick('sound/bureaucracy/pen1.ogg','sound/bureaucracy/pen2.ogg'), 20) return @@ -213,9 +213,9 @@ . = ..() if(get_dist(user, src) <= 4) if(sortTag) - . += "It is labeled \"[sortTag]\"" + . += span_notice("It is labeled \"[sortTag]\"") if(examtext) - . += "It has a note attached which reads, \"[examtext]\"" + . += span_notice("It has a note attached which reads, \"[examtext]\"") /obj/item/packageWrap name = "package wrapper" @@ -273,7 +273,7 @@ src.add_fingerprint(usr) src.amount -= 1 user.visible_message("\The [user] wraps \a [target] with \a [src].",\ - "You wrap \the [target], leaving [amount] units of paper on \the [src].",\ + span_notice("You wrap \the [target], leaving [amount] units of paper on \the [src]."),\ "You hear someone taping paper around a small object.") playsound(src, 'sound/items/package_wrap.ogg', 50, 1) else if (istype(target, /obj/structure/closet/crate)) @@ -285,11 +285,11 @@ O.loc = P src.amount -= 3 user.visible_message("\The [user] wraps \a [target] with \a [src].",\ - "You wrap \the [target], leaving [amount] units of paper on \the [src].",\ + span_notice("You wrap \the [target], leaving [amount] units of paper on \the [src]."),\ "You hear someone taping paper around a large object.") playsound(src, 'sound/items/package_wrap.ogg', 50, 1) else if(src.amount < 3) - to_chat(user, "You need more paper.") + to_chat(user, span_warning("You need more paper.")) else if (istype (target, /obj/structure/closet)) var/obj/structure/closet/O = target if (src.amount > 3 && !O.opened) @@ -299,11 +299,11 @@ O.loc = P src.amount -= 3 user.visible_message("\The [user] wraps \a [target] with \a [src].",\ - "You wrap \the [target], leaving [amount] units of paper on \the [src].",\ + span_notice("You wrap \the [target], leaving [amount] units of paper on \the [src]."),\ "You hear someone taping paper around a large object.") playsound(src, 'sound/items/package_wrap.ogg', 50, 1) else if(src.amount < 3) - to_chat(user, "You need more paper.") + to_chat(user, span_warning("You need more paper.")) else to_chat(user, span_blue("The object you are trying to wrap is unsuitable for the sorting machinery!")) if (src.amount <= 0) diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index ad133ef112..7883c303d6 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -60,7 +60,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). update_icon() else if(busy) - visible_message("[icon2html(src,viewers(src))] flashes: insufficient materials: [getLackingMaterials(D)].") + visible_message(span_notice("[icon2html(src,viewers(src))] flashes: insufficient materials: [getLackingMaterials(D)].")) busy = 0 update_icon() @@ -105,7 +105,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). /obj/machinery/r_n_d/circuit_imprinter/attackby(var/obj/item/O as obj, var/mob/user as mob) if(busy) - to_chat(user, "\The [src] is busy. Please wait for completion of previous operation.") + to_chat(user, span_notice("\The [src] is busy. Please wait for completion of previous operation.")) return 1 if(default_deconstruction_screwdriver(user, O)) if(linked_console) @@ -119,7 +119,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). if(istype(O, /obj/item/gripper/no_use/loader)) return 0 //Sheet loaders weren't finishing attack(), this prevents the message "You can't stuff that gripper into this" without preventing the rest of the attack sequence from finishing if(panel_open) - to_chat(user, "You can't load \the [src] while it's opened.") + to_chat(user, span_notice("You can't load \the [src] while it's opened.")) return 1 if(!linked_console) to_chat(user, "\The [src] must be linked to an R&D console first.") @@ -127,18 +127,18 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). if(O.is_open_container()) return 0 if(!istype(O, /obj/item/stack/material)) //Previously checked for specific material sheets, for some reason? Made the check on 133 redundant. - to_chat(user, "You cannot insert this item into \the [src].") + to_chat(user, span_notice("You cannot insert this item into \the [src].")) return 1 if(stat) return 1 if(TotalMaterials() + SHEET_MATERIAL_AMOUNT > max_material_storage) - to_chat(user, "\The [src]'s material bin is full. Please remove material before adding more.") + to_chat(user, span_notice("\The [src]'s material bin is full. Please remove material before adding more.")) return 1 var/obj/item/stack/material/S = O if(!(S.material.name in materials)) - to_chat(user, "The [src] doesn't accept [S.material]!") + to_chat(user, span_warning("The [src] doesn't accept [S.material]!")) return busy = 1 @@ -158,9 +158,9 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). materials[S.material.name] += amnt S.use(1) count++ - to_chat(user, "You insert [count] [sname] into the fabricator.") + to_chat(user, span_filter_notice("You insert [count] [sname] into the fabricator.")) else - to_chat(user, "The fabricator cannot hold more [sname].") + to_chat(user, span_filter_notice("The fabricator cannot hold more [sname].")) busy = 0 updateUsrDialog() diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index d4c2599eae..1fdb3c196c 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -38,10 +38,10 @@ Note: Must be placed within 3 tiles of the R&D Console /obj/machinery/r_n_d/destructive_analyzer/attackby(var/obj/item/O as obj, var/mob/user as mob) if(busy) - to_chat(user, "\The [src] is busy right now.") + to_chat(user, span_notice("\The [src] is busy right now.")) return if(loaded_item) - to_chat(user, "There is something already loaded into \the [src].") + to_chat(user, span_notice("There is something already loaded into \the [src].")) return 1 if(default_deconstruction_screwdriver(user, O)) if(linked_console) @@ -53,25 +53,25 @@ Note: Must be placed within 3 tiles of the R&D Console if(default_part_replacement(user, O)) return if(panel_open) - to_chat(user, "You can't load \the [src] while it's opened.") + to_chat(user, span_notice("You can't load \the [src] while it's opened.")) return 1 if(!linked_console) - to_chat(user, "\The [src] must be linked to an R&D console first.") + to_chat(user, span_notice("\The [src] must be linked to an R&D console first.")) return if(!loaded_item) if(isrobot(user)) //Don't put your module items in there! return if(!O.origin_tech) - to_chat(user, "This doesn't seem to have a tech origin.") + to_chat(user, span_notice("This doesn't seem to have a tech origin.")) return if(O.origin_tech.len == 0) - to_chat(user, "You cannot deconstruct this item.") + to_chat(user, span_notice("You cannot deconstruct this item.")) return busy = 1 loaded_item = O user.drop_item() O.loc = src - to_chat(user, "You add \the [O] to \the [src].") + to_chat(user, span_notice("You add \the [O] to \the [src].")) flick("d_analyzer_la", src) spawn(10) update_icon() @@ -84,13 +84,13 @@ Note: Must be placed within 3 tiles of the R&D Console var/obj/item/storage/part_replacer/replacer = dropping replacer.hide_from(user) if(!linked_console) - to_chat(user, "\The [src] must be linked to an R&D console first.") + to_chat(user, span_notice("\The [src] must be linked to an R&D console first.")) return 0 if(!linked_console.linked_lathe) - to_chat(user, "Link a protolathe to [src]'s R&D console first.") + to_chat(user, span_notice("Link a protolathe to [src]'s R&D console first.")) return 0 if(!rped_recycler_ready) - to_chat(user, "\The [src]'s stock parts recycler isn't ready yet.") + to_chat(user, span_notice("\The [src]'s stock parts recycler isn't ready yet.")) return 0 var/obj/machinery/r_n_d/protolathe/lathe_to_fill = linked_console.linked_lathe var/lowest_rating = INFINITY // We want the lowest-part tier rating in the RPED so we only recycle the lowest-tier parts. @@ -98,7 +98,7 @@ Note: Must be placed within 3 tiles of the R&D Console if(B.rped_rating() < lowest_rating) lowest_rating = B.rped_rating() if(lowest_rating == INFINITY) - to_chat(user, "Mass part deconstruction attempt canceled - no valid parts for recycling detected.") + to_chat(user, span_notice("Mass part deconstruction attempt canceled - no valid parts for recycling detected.")) return 0 for(var/obj/item/B in replacer.contents) if(B.rped_rating() > lowest_rating) @@ -111,7 +111,7 @@ Note: Must be placed within 3 tiles of the R&D Console playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) rped_recycler_ready = FALSE addtimer(CALLBACK(src, PROC_REF(rped_ready)), 5 SECONDS) - to_chat(user, "You deconstruct all the parts of rating [lowest_rating] in [replacer] with [src].") + to_chat(user, span_notice("You deconstruct all the parts of rating [lowest_rating] in [replacer] with [src].")) return 1 else ..() diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 329bdcae43..88c4ac92af 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -143,7 +143,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() /obj/machinery/message_server/attack_hand(user as mob) // to_chat(user, "There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays.") - to_chat(user, "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"].") + to_chat(user, span_filter_notice("You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"].")) active = !active update_icon() @@ -155,7 +155,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() spamfilter_limit += round(MESSAGE_SERVER_DEFAULT_SPAM_LIMIT / 2) user.drop_item() qdel(O) - to_chat(user, "You install additional memory and processors into message server. Its filtering capabilities been enhanced.") + to_chat(user, span_filter_notice("You install additional memory and processors into message server. Its filtering capabilities been enhanced.")) else ..(O, user) diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 9e29e1424e..46861f544b 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -75,7 +75,7 @@ update_icon() else if(busy) - visible_message("[icon2html(src,viewers(src))] flashes: insufficient materials: [getLackingMaterials(D)].") + visible_message(span_notice("[icon2html(src,viewers(src))] flashes: insufficient materials: [getLackingMaterials(D)].")) busy = 0 update_icon() @@ -121,7 +121,7 @@ /obj/machinery/r_n_d/protolathe/attackby(var/obj/item/O as obj, var/mob/user as mob) if(busy) - to_chat(user, "\The [src] is busy. Please wait for completion of previous operation.") + to_chat(user, span_notice("\The [src] is busy. Please wait for completion of previous operation.")) return 1 if(default_deconstruction_screwdriver(user, O)) if(linked_console) @@ -137,20 +137,20 @@ if(istype(O, /obj/item/gripper/no_use/loader)) return 0 //Sheet loaders weren't finishing attack(), this prevents the message "You can't stuff that gripper into this" without preventing the rest of the attack sequence from finishing if(panel_open) - to_chat(user, "You can't load \the [src] while it's opened.") + to_chat(user, span_notice("You can't load \the [src] while it's opened.")) return 1 if(!linked_console) - to_chat(user, "\The [src] must be linked to an R&D console first!") + to_chat(user, span_notice("\The [src] must be linked to an R&D console first!")) return 1 if(!istype(O, /obj/item/stack/material)) - to_chat(user, "You cannot insert this item into \the [src]!") + to_chat(user, span_notice("You cannot insert this item into \the [src]!")) return 1 if(stat) return 1 var/obj/item/stack/material/S = O if(!(S.material.name in materials)) - to_chat(user, "The [src] doesn't accept [S.material]!") + to_chat(user, span_warning("The [src] doesn't accept [S.material]!")) return busy = 1 @@ -168,9 +168,9 @@ materials[S.material.name] += amnt S.use(1) count++ - to_chat(user, "You insert [count] [sname] into the fabricator.") + to_chat(user, span_filter_notice("You insert [count] [sname] into the fabricator.")) else - to_chat(user, "The fabricator cannot hold more [sname].") + to_chat(user, span_filter_notice("The fabricator cannot hold more [sname].")) busy = 0 var/stacktype = S.type diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 8530f1b865..c97c9df4c7 100755 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -120,7 +120,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, //Loading a disk into it. if(istype(D, /obj/item/disk)) if(t_disk || d_disk) - to_chat(user, "A disk is already loaded into the machine.") + to_chat(user, span_filter_notice("A disk is already loaded into the machine.")) return if(istype(D, /obj/item/disk/tech_disk)) @@ -128,11 +128,11 @@ won't update every console in existence) but it's more of a hassle to do. Also, else if (istype(D, /obj/item/disk/design_disk)) d_disk = D else - to_chat(user, "Machine cannot accept disks in that format.") + to_chat(user, span_notice("Machine cannot accept disks in that format.")) return user.drop_item() D.loc = src - to_chat(user, "You add \the [D] to the machine.") + to_chat(user, span_notice("You add \the [D] to the machine.")) else //The construction/deconstruction of the console code. ..() @@ -153,7 +153,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(!emagged) playsound(src, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - to_chat(user, "You disable the security protocols.") + to_chat(user, span_notice("You disable the security protocols.")) return 1 /obj/machinery/computer/rdconsole/proc/GetResearchLevelsInfo() diff --git a/code/modules/research/rdconsole_tgui.dm b/code/modules/research/rdconsole_tgui.dm index 8405dfb961..5208630cb5 100644 --- a/code/modules/research/rdconsole_tgui.dm +++ b/code/modules/research/rdconsole_tgui.dm @@ -394,7 +394,7 @@ if("eject_item") //Eject the item inside the destructive analyzer. if(linked_destroy) if(linked_destroy.busy) - to_chat(usr, "The destructive analyzer is busy at the moment.") + to_chat(usr, span_notice("The destructive analyzer is busy at the moment.")) return FALSE if(linked_destroy.loaded_item) @@ -408,7 +408,7 @@ return FALSE if(linked_destroy.busy) - to_chat(usr, "The destructive analyzer is busy at the moment.") + to_chat(usr, span_notice("The destructive analyzer is busy at the moment.")) return if(tgui_alert(usr, "Proceeding will destroy loaded item. Continue?", "Destructive analyzer confirmation", list("Yes", "No")) != "Yes" || !linked_destroy) @@ -421,7 +421,7 @@ linked_destroy.busy = 0 busy_msg = null if(!linked_destroy.loaded_item) - to_chat(usr, "The destructive analyzer appears to be empty.") + to_chat(usr, span_notice("The destructive analyzer appears to be empty.")) return if(istype(linked_destroy.loaded_item,/obj/item/stack))//Only deconsturcts one sheet at a time instead of the entire stack @@ -475,7 +475,7 @@ if("sync") //Sync the research holder with all the R&D consoles in the game that aren't sync protected. if(!sync) - to_chat(usr, "You must connect to the network first.") + to_chat(usr, span_notice("You must connect to the network first.")) return busy_msg = "Updating Database..." diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 8ba581313f..3d6b1af851 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -295,7 +295,7 @@ if(!emagged) playsound(src, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - to_chat(user, "You you disable the security protocols.") + to_chat(user, span_notice("You you disable the security protocols.")) SStgui.update_uis(src) return 1 @@ -309,4 +309,4 @@ name = "Core R&D Server" id_with_upload_string = "1" id_with_download_string = "1" - server_id = 1 \ No newline at end of file + server_id = 1 diff --git a/code/modules/resleeving/autoresleever.dm b/code/modules/resleeving/autoresleever.dm index d6aa44cb7b..52154baa05 100644 --- a/code/modules/resleeving/autoresleever.dm +++ b/code/modules/resleeving/autoresleever.dm @@ -27,19 +27,19 @@ /obj/machinery/transhuman/autoresleever/attack_ghost(mob/observer/dead/user as mob) update_icon() if(spawn_slots == 0) - to_chat(user, "There are no more respawn slots.") + to_chat(user, span_warning("There are no more respawn slots.")) return if(user.mind) if(user.mind.vore_death) if(vore_respawn <= world.time - user.timeofdeath) autoresleeve(user) else - to_chat(user, "You must wait [((vore_respawn - (world.time - user.timeofdeath)) * 0.1) / 60] minutes to use \the [src].") + to_chat(user, span_warning("You must wait [((vore_respawn - (world.time - user.timeofdeath)) * 0.1) / 60] minutes to use \the [src].")) return else if(respawn <= world.time - user.timeofdeath) autoresleeve(user) else - to_chat(user, "You must wait [((respawn - (world.time - user.timeofdeath)) * 0.1) /60] minutes to use \the [src].") + to_chat(user, span_warning("You must wait [((respawn - (world.time - user.timeofdeath)) * 0.1) /60] minutes to use \the [src].")) return else if(spawntype) if(tgui_alert(user, "This [src] spawns something special, would you like to play as it?", "Creachur", list("No","Yes")) == "Yes") @@ -48,7 +48,7 @@ if(tgui_alert(user, "Would you like to be spawned here as your presently loaded character?", "Spawn here", list("No","Yes")) == "Yes") autoresleeve(user) else - to_chat(user, "You need to have been spawned in order to respawn here.") + to_chat(user, span_warning("You need to have been spawned in order to respawn here.")) /obj/machinery/transhuman/autoresleever/attackby(var/mob/user) //Let's not let people mess with this. update_icon() @@ -59,7 +59,7 @@ /obj/machinery/transhuman/autoresleever/proc/autoresleeve(var/mob/observer/dead/ghost) if(stat) - to_chat(ghost, "This machine is not functioning...") + to_chat(ghost, span_warning("This machine is not functioning...")) return if(!istype(ghost,/mob/observer/dead)) return @@ -70,13 +70,13 @@ if(istype(ghost.mind.current.loc, /obj/item/mmi)) qdel(ghost.mind.current.loc) else - to_chat(ghost, "Your body is still alive, you cannot be resleeved.") + to_chat(ghost, span_warning("Your body is still alive, you cannot be resleeved.")) return var/client/ghost_client = ghost.client if(!is_alien_whitelisted(ghost, GLOB.all_species[ghost_client?.prefs?.species]) && !check_rights(R_ADMIN, 0)) // Prevents a ghost ghosting in on a slot and spawning via a resleever with race they're not whitelisted for, getting around normal join restrictions. - to_chat(ghost, "You are not whitelisted to spawn as this species!") + to_chat(ghost, span_warning("You are not whitelisted to spawn as this species!")) return /* // Comments out NO_SCAN restriction, as per headmin/maintainer request. @@ -85,7 +85,7 @@ chosen_species = GLOB.all_species[ghost_client.prefs.species] if(chosen_species.flags && NO_SCAN) // Sanity. Prevents species like Xenochimera, Proteans, etc from rejoining the round via resleeve, as they should have their own methods of doing so already, as agreed to when you whitelist as them. - to_chat(ghost, "This species cannot be resleeved!") + to_chat(ghost, span_warning("This species cannot be resleeved!")) return */ @@ -100,7 +100,7 @@ else if(equip_body || ghost_spawns) charjob = default_job else - to_chat(ghost, "It appears as though your loaded character has not been spawned this round, or has quit the round. If you died as a different character, please load them, and try again.") + to_chat(ghost, span_warning("It appears as though your loaded character has not been spawned this round, or has quit the round. If you died as a different character, please load them, and try again.")) return //For logging later @@ -111,7 +111,7 @@ var/spawnloc = get_turf(src) //Did we actually get a loc to spawn them? if(!spawnloc) - to_chat(ghost, "Could not find a valid location to spawn your character.") + to_chat(ghost, span_warning("Could not find a valid location to spawn your character.")) return if(spawntype) @@ -123,7 +123,7 @@ log_admin("[L.ckey]'s has been spawned as [L] via \the [src].") message_admins("[L.ckey]'s has been spawned as [L] via \the [src].") else - to_chat(ghost, "You can't play as a [spawnthing]...") + to_chat(ghost, span_warning("You can't play as a [spawnthing]...")) return if(spawn_slots == -1) return diff --git a/code/modules/resleeving/computers.dm b/code/modules/resleeving/computers.dm index e8caee0900..d3f6d0c2ed 100644 --- a/code/modules/resleeving/computers.dm +++ b/code/modules/resleeving/computers.dm @@ -87,21 +87,21 @@ pods += P P.connected = src P.name = "[initial(P.name)] #[pods.len]" - to_chat(user, "You connect [P] to [src].") + to_chat(user, span_notice("You connect [P] to [src].")) else if(istype(W, /obj/item/disk/transcore) && !our_db.core_dumped) user.unEquip(W) disk = W disk.forceMove(src) - to_chat(user, "You insert \the [W] into \the [src].") + to_chat(user, span_notice("You insert \the [W] into \the [src].")) if(istype(W, /obj/item/disk/body_record)) var/obj/item/disk/body_record/brDisk = W if(!brDisk.stored) - to_chat(user, "\The [W] does not contain a stored body record.") + to_chat(user, span_warning("\The [W] does not contain a stored body record.")) return user.unEquip(W) W.forceMove(get_turf(src)) // Drop on top of us active_br = new /datum/transhuman/body_record(brDisk.stored) // Loads a COPY! - to_chat(user, "\The [src] loads the body record from \the [W] before ejecting it.") + to_chat(user, span_notice("\The [src] loads the body record from \the [W] before ejecting it.")) attack_hand(user) view_b_rec("view_b_rec", list("ref" = "\ref[active_br]")) else @@ -259,7 +259,7 @@ if(disk) our_db.core_dump(disk) sleep(5) - visible_message("\The [src] spits out \the [disk].") + visible_message(span_warning("\The [src] spits out \the [disk].")) disk.forceMove(get_turf(src)) disk = null if("ejectdisk") @@ -458,7 +458,7 @@ /obj/item/cmo_disk_holder/attack_self(var/mob/attacker) playsound(src, 'sound/items/poster_ripped.ogg', 50) - to_chat(attacker, "You tear open \the [name].") + to_chat(attacker, span_warning("You tear open \the [name].")) attacker.unEquip(src) var/obj/item/disk/transcore/newdisk = new(get_turf(src)) attacker.put_in_any_hand_if_possible(newdisk) diff --git a/code/modules/resleeving/designer.dm b/code/modules/resleeving/designer.dm index befdfcd9ad..c3a220790b 100644 --- a/code/modules/resleeving/designer.dm +++ b/code/modules/resleeving/designer.dm @@ -75,7 +75,7 @@ user.unEquip(W) disk = W disk.forceMove(src) - to_chat(user, "You insert \the [W] into \the [src].") + to_chat(user, span_notice("You insert \the [W] into \the [src].")) updateUsrDialog() else ..() diff --git a/code/modules/resleeving/implant.dm b/code/modules/resleeving/implant.dm index bcc86f4085..7e8e07f045 100644 --- a/code/modules/resleeving/implant.dm +++ b/code/modules/resleeving/implant.dm @@ -85,14 +85,14 @@ return if(imps.len) - to_chat(user, "You eject a backup implant.") + to_chat(user, span_notice("You eject a backup implant.")) var/obj/item/implant/backup/imp = imps[imps.len] imp.forceMove(get_turf(user)) imps -= imp user.put_in_any_hand_if_possible(imp) update() else - to_chat(user, "\The [src] is empty.") + to_chat(user, span_warning("\The [src] is empty.")) return @@ -104,15 +104,15 @@ W.germ_level = 0 W.forceMove(src) update() - to_chat(user, "You load \the [W] into \the [src].") + to_chat(user, span_notice("You load \the [W] into \the [src].")) else - to_chat(user, "\The [src] is already full!") + to_chat(user, span_warning("\The [src] is already full!")) /obj/item/backup_implanter/attack(mob/M as mob, mob/user as mob) if (!istype(M, /mob/living/carbon)) return if (user && imps.len) - M.visible_message("[user] is injecting a backup implant into [M].") + M.visible_message(span_notice("[user] is injecting a backup implant into [M].")) user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) user.do_attack_animation(M) @@ -120,7 +120,7 @@ var/turf/T1 = get_turf(M) if (T1 && ((M == user) || do_after(user, 5 SECONDS, M))) if(user && M && (get_turf(M) == T1) && src && src.imps.len) - M.visible_message("[M] has been backup implanted by [user].") + M.visible_message(span_notice("[M] has been backup implanted by [user].")) var/obj/item/implant/backup/imp = imps[imps.len] if(imp.handle_implant(M,user.zone_sel.selecting)) diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index 38e7a56abc..869eb606e4 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -390,7 +390,7 @@ /obj/machinery/transhuman/synthprinter/attackby(obj/item/W as obj, mob/user as mob) src.add_fingerprint(user) if(busy) - to_chat(user, "\The [src] is busy. Please wait for completion of previous operation.") + to_chat(user, span_notice("\The [src] is busy. Please wait for completion of previous operation.")) return if(default_deconstruction_screwdriver(user, W)) return @@ -399,15 +399,15 @@ if(default_part_replacement(user, W)) return if(panel_open) - to_chat(user, "You can't load \the [src] while it's opened.") + to_chat(user, span_notice("You can't load \the [src] while it's opened.")) return if(!istype(W, /obj/item/stack/material)) - to_chat(user, "You cannot insert this item into \the [src]!") + to_chat(user, span_notice("You cannot insert this item into \the [src]!")) return var/obj/item/stack/material/S = W if(!(S.material.name in stored_material)) - to_chat(user, "\The [src] doesn't accept [S.material]!") + to_chat(user, span_warning("\The [src] doesn't accept [S.material]!")) return var/amnt = S.perunit @@ -539,7 +539,7 @@ C.removePersonality() qdel(C) sleevecards++ - to_chat(user, "You store \the [C] in \the [src].") + to_chat(user, span_notice("You store \the [C] in \the [src].")) return return ..() @@ -556,7 +556,7 @@ if(!ishuman(user) && !isrobot(user)) return 0 //not a borg or human if(panel_open) - to_chat(user, "Close the maintenance panel first.") + to_chat(user, span_notice("Close the maintenance panel first.")) return 0 //panel open if(O.buckled) @@ -593,7 +593,7 @@ //In case they already had a mind! if(occupant && occupant.mind) - to_chat(occupant, "You feel your mind being overwritten...") + to_chat(occupant, span_warning("You feel your mind being overwritten...")) log_and_message_admins("was resleeve-wiped from their body.",occupant.mind) occupant.ghostize() @@ -634,9 +634,9 @@ //Inform them and make them a little dizzy. if(confuse_amount + blur_amount <= 16) - to_chat(occupant, "You feel a small pain in your head as you're given a new backup implant. Your new body feels comfortable already, however.") + to_chat(occupant, span_notice("You feel a small pain in your head as you're given a new backup implant. Your new body feels comfortable already, however.")) else - to_chat(occupant, "You feel a small pain in your head as you're given a new backup implant. Oh, and a new body. It's disorienting, to say the least.") + to_chat(occupant, span_warning("You feel a small pain in your head as you're given a new backup implant. Oh, and a new body. It's disorienting, to say the least.")) occupant.confused = max(occupant.confused, confuse_amount) // Apply immedeate effects occupant.eye_blurry = max(occupant.eye_blurry, blur_amount) @@ -674,10 +674,10 @@ /obj/machinery/transhuman/resleever/proc/put_mob(mob/living/carbon/human/M as mob) if(!ishuman(M)) - to_chat(usr, "\The [src] cannot hold this!") + to_chat(usr, span_warning("\The [src] cannot hold this!")) return if(src.occupant) - to_chat(usr, "\The [src] is already occupied!") + to_chat(usr, span_warning("\The [src] is already occupied!")) return if(M.client) M.client.perspective = EYE_PERSPECTIVE diff --git a/code/modules/resleeving/resleeving_sickness.dm b/code/modules/resleeving/resleeving_sickness.dm index d0fef60a9f..2645a0af66 100644 --- a/code/modules/resleeving/resleeving_sickness.dm +++ b/code/modules/resleeving/resleeving_sickness.dm @@ -3,8 +3,8 @@ desc = "You feel rather weak and unfocused, having been sleeved not so long ago." stacks = MODIFIER_STACK_EXTEND - on_created_text = "You feel weak and unfocused." - on_expired_text = "You feel your strength and focus return to you." + on_created_text = span_warning("You feel weak and unfocused.") + on_expired_text = span_notice("You feel your strength and focus return to you.") incoming_brute_damage_percent = 1.1 // 10% more brute damage incoming_fire_damage_percent = 1.1 // 10% more burn damage @@ -20,8 +20,8 @@ desc = "You feel somewhat weak and unfocused, having been sleeved not so long ago. (OOC: No real penalty for vore-related deaths)" stacks = MODIFIER_STACK_EXTEND - on_created_text = "You feel slightly weak and unfocused." - on_expired_text = "You feel your strength and focus return to you." + on_created_text = span_warning("You feel slightly weak and unfocused.") + on_expired_text = span_notice("You feel your strength and focus return to you.") /datum/modifier/gory_devourment name = "gory devourment" @@ -44,4 +44,4 @@ if(holder.stat == DEAD) cached_mind?.vore_death = TRUE cached_mind = null //Don't keep a hardref - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/resleeving/sleevecard.dm b/code/modules/resleeving/sleevecard.dm index 100a160622..9dcf0b5691 100644 --- a/code/modules/resleeving/sleevecard.dm +++ b/code/modules/resleeving/sleevecard.dm @@ -67,10 +67,10 @@ add_fingerprint(user) if(!pai) - to_chat(user,"\The [src] does not have a mind in it!") + to_chat(user,span_warning("\The [src] does not have a mind in it!")) else if(!emagged) - to_chat(user,"\The [src] displays the name '[pai]'.") + to_chat(user,span_notice("\The [src] displays the name '[pai]'.")) else ..() /mob/living/silicon/pai/infomorph @@ -133,4 +133,4 @@ if(emagged) touch_window("Directives") else - to_chat(src, "You are not bound by any laws or directives.") + to_chat(src, span_notice("You are not bound by any laws or directives.")) diff --git a/code/modules/samples/container.dm b/code/modules/samples/container.dm index 068f27dc6f..20aea763a2 100644 --- a/code/modules/samples/container.dm +++ b/code/modules/samples/container.dm @@ -29,7 +29,7 @@ for(var/obj/item/research_sample/S in T) S.loc = src update_icon() - to_chat(user, "You scoop \the [S] into \the [src].") + to_chat(user, span_notice("You scoop \the [S] into \the [src].")) //Splice research sample containers into the list of valid items for these belts *without* overriding the lists entirely /obj/item/storage/belt/explorer/New() diff --git a/code/modules/samples/samples.dm b/code/modules/samples/samples.dm index 9bbeca877e..faa34d5e6f 100644 --- a/code/modules/samples/samples.dm +++ b/code/modules/samples/samples.dm @@ -86,32 +86,32 @@ if(burn_user) switch(damage_type) if("BRUTE") - H.visible_message("\The [src] creaks as it ravages [H]'s hands!") + H.visible_message(span_danger("\The [src] creaks as it ravages [H]'s hands!")) H.apply_damage(rand(min_damage,max_damage), BRUTE, "r_hand", used_weapon="Anomalous Material") H.apply_damage(rand(min_damage,max_damage), BRUTE, "l_hand", used_weapon="Anomalous Material") if("BURN") - H.visible_message("\The [src] flashes as it scorches [H]'s hands!") + H.visible_message(span_danger("\The [src] flashes as it scorches [H]'s hands!")) H.apply_damage(rand(min_damage,max_damage), BURN, "r_hand", used_weapon="Anomalous Material") H.apply_damage(rand(min_damage,max_damage), BURN, "l_hand", used_weapon="Anomalous Material") if("TOX") - H.visible_message("\The [src] seethes and hisses like burning acid!") + H.visible_message(span_danger("\The [src] seethes and hisses like burning acid!")) if(!H.isSynthetic()) - to_chat(user,"A wave of nausea washes over you!") + to_chat(user,span_danger("A wave of nausea washes over you!")) H.adjustToxLoss(rand(min_damage,max_damage)+rand(min_damage,max_damage)) if("OXY") - H.visible_message("\The [src] seems to draw something into itself!") + H.visible_message(span_danger("\The [src] seems to draw something into itself!")) if(!H.isSynthetic()) - to_chat(user,"You feel dizzy and short of breath!") + to_chat(user,span_danger("You feel dizzy and short of breath!")) H.adjustOxyLoss(rand(min_damage,max_damage)+rand(min_damage,max_damage)) if("EMP") - H.visible_message("\The [src] ripples and distorts, emitting some kind of pulse!") + H.visible_message(span_danger("\The [src] ripples and distorts, emitting some kind of pulse!")) empulse(H,0,1,1,1) if("PAIN") - H.visible_message("\The [src] flashes with coruscating energy!") - to_chat(user,"Blinding pain assails your senses!") + H.visible_message(span_danger("\The [src] flashes with coruscating energy!")) + to_chat(user,span_danger("Blinding pain assails your senses!")) H.adjustHalLoss(rand(min_damage,max_damage)*5) else - H.visible_message("\The [src] flickers with kaleidoscopic light. You should report this to someone immediately.") + H.visible_message(span_notice("\The [src] flickers with kaleidoscopic light. You should report this to someone immediately.")) H.drop_from_inventory(src, get_turf(H)) return @@ -143,37 +143,37 @@ if(burn_user) switch(damage_type) if("BRUTE") - H.visible_message("\The [src] creaks as it ravages [H]'s hands!") + H.visible_message(span_danger("\The [src] creaks as it ravages [H]'s hands!")) H.apply_damage(rand(min_damage,max_damage), BRUTE, "r_hand", used_weapon="Anomalous Material") H.apply_damage(rand(min_damage,max_damage), BRUTE, "l_hand", used_weapon="Anomalous Material") if("BURN") - H.visible_message("\The [src] flashes as it scorches [H]'s hands!") + H.visible_message(span_danger("\The [src] flashes as it scorches [H]'s hands!")) H.apply_damage(rand(min_damage,max_damage), BURN, "r_hand", used_weapon="Anomalous Material") H.apply_damage(rand(min_damage,max_damage), BURN, "l_hand", used_weapon="Anomalous Material") if("TOX") - H.visible_message("\The [src] seethes and hisses like burning acid!") + H.visible_message(span_danger("\The [src] seethes and hisses like burning acid!")) if(!H.isSynthetic()) - to_chat(user,"A wave of nausea washes over you!") + to_chat(user,span_danger("A wave of nausea washes over you!")) H.adjustToxLoss(rand(min_damage,max_damage)+rand(min_damage,max_damage)) if("OXY") - H.visible_message("\The [src] seems to draw something into itself!") + H.visible_message(span_danger("\The [src] seems to draw something into itself!")) if(!H.isSynthetic()) - to_chat(user,"You feel dizzy and short of breath!") + to_chat(user,span_danger("You feel dizzy and short of breath!")) H.adjustOxyLoss(rand(min_damage,max_damage)+rand(min_damage,max_damage)) if("EMP") - H.visible_message("\The [src] ripples and distorts, emitting some kind of pulse!") + H.visible_message(span_danger("\The [src] ripples and distorts, emitting some kind of pulse!")) empulse(H,0,1,1,1) if("PAIN") - H.visible_message("\The [src] flashes with coruscating energy!") - to_chat(user,"Blinding pain assails your senses!") + H.visible_message(span_danger("\The [src] flashes with coruscating energy!")) + to_chat(user,span_danger("Blinding pain assails your senses!")) H.adjustHalLoss(rand(min_damage,max_damage)*5) else - H.visible_message("\The [src] flickers with kaleidoscopic light. You should report this to someone immediately.") + H.visible_message(span_notice("\The [src] flickers with kaleidoscopic light. You should report this to someone immediately.")) H.drop_from_inventory(src, get_turf(H)) return else if(do_after(user,3 SECONDS)) //short delay, so you can abort/cancel if you misclick - H.visible_message("[H] crushes \the [src], stabilizing its anomalous properties and rendering it into a pile of assorted minerals.") + H.visible_message(span_notice("[H] crushes \the [src], stabilizing its anomalous properties and rendering it into a pile of assorted minerals.")) var/i = rand(min_ore,max_ore) while(i>1) var/ore = pick(resource_list) @@ -195,12 +195,12 @@ var/obj/item/storage/sample_container/SC = P src.loc = SC SC.update_icon() - to_chat(user, "You store \the [src] in \the [SC].") + to_chat(user, span_notice("You store \the [src] in \the [SC].")) if(istype(P, /obj/item/cataloguer)) - to_chat(user, "You start to scan \the [src] with \the [P]...") + to_chat(user, span_notice("You start to scan \the [src] with \the [P]...")) if(do_after(user, 2 SECONDS)) - to_chat(user, "\The [src] seems to have [origin_tech[1]] properties?") + to_chat(user, span_notice("\The [src] seems to have [origin_tech[1]] properties?")) /obj/item/research_sample/common tech_level = 2 //2~3 diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index c4b3317cd1..6f89d0e320 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -23,7 +23,7 @@ power_channel = ENVIRON /obj/machinery/keycard_auth/attack_ai(mob/user as mob) - to_chat (user, "A firewall prevents you from interfacing with this device!") + to_chat (user, span_warning("A firewall prevents you from interfacing with this device!")) return /obj/machinery/keycard_auth/attackby(obj/item/W as obj, mob/user as mob) diff --git a/code/modules/shieldgen/directional_shield.dm b/code/modules/shieldgen/directional_shield.dm index 204f47b000..4dcc10b43d 100644 --- a/code/modules/shieldgen/directional_shield.dm +++ b/code/modules/shieldgen/directional_shield.dm @@ -149,7 +149,7 @@ if(shield_health <= 0) destroy_shields() var/turf/T = get_turf(src) - T.visible_message("\The [src] overloads and the shield vanishes!") + T.visible_message(span_danger("\The [src] overloads and the shield vanishes!")) playsound(src, 'sound/machines/defib_failed.ogg', 75, 0) else if(shield_health < max_shield_health / 4) // Play a more urgent sounding beep if it's at 25% health. @@ -189,13 +189,13 @@ /obj/item/shield_projector/attack_self(var/mob/living/user) if(active) if(always_on) - to_chat(user, "You can't seem to deactivate \the [src].") + to_chat(user, span_warning("You can't seem to deactivate \the [src].")) return set_on(FALSE) else set_dir(user.dir) // Needed for linear shields. set_on(TRUE) - visible_message("\The [user] [!active ? "de":""]activates \the [src].") + visible_message(span_notice("\The [user] [!active ? "de":""]activates \the [src].")) /obj/item/shield_projector/proc/set_on(var/on) if(isnull(on)) @@ -381,7 +381,7 @@ /obj/item/shield_projector/line/exosuit/attack_self(var/mob/living/user) if(active) if(always_on) - to_chat(user, "You can't seem to deactivate \the [src].") + to_chat(user, span_warning("You can't seem to deactivate \the [src].")) return destroy_shields() @@ -391,7 +391,7 @@ else set_dir(user.dir) create_shields() - visible_message("\The [user] [!active ? "de":""]activates \the [src].") + visible_message(span_notice("\The [user] [!active ? "de":""]activates \the [src].")) /obj/item/shield_projector/line/exosuit/adjust_health(amount) ..() diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index 354f7886cc..20b7d79d23 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -93,7 +93,7 @@ /obj/machinery/shield/hitby(AM as mob|obj) //Let everyone know we've been hit! - visible_message("\The [src] was hit by [AM].") + visible_message(span_danger("\The [src] was hit by [AM].")) //Super realistic, resource-intensive, real-time damage calculations. var/tforce = 0 @@ -291,13 +291,13 @@ else if(istype(W, /obj/item/stack/cable_coil) && malfunction && is_open) var/obj/item/stack/cable_coil/coil = W - to_chat(user, "You begin to replace the wires.") + to_chat(user, span_notice("You begin to replace the wires.")) //if(do_after(user, min(60, round( ((getMaxHealth()/health)*10)+(malfunction*10) ))) //Take longer to repair heavier damage if(do_after(user, 30)) if (coil.use(1)) health = max_health malfunction = 0 - to_chat(user, "You repair the [src]!") + to_chat(user, span_notice("You repair the [src]!")) update_icon() else if(W.has_tool_quality(TOOL_WRENCH)) diff --git a/code/modules/shieldgen/energy_shield.dm b/code/modules/shieldgen/energy_shield.dm index df8844ebb1..6f9a31fe28 100644 --- a/code/modules/shieldgen/energy_shield.dm +++ b/code/modules/shieldgen/energy_shield.dm @@ -126,9 +126,9 @@ // Fails shield segments in specific range. Range of 1 affects the shielded turf only. /obj/effect/shield/proc/fail_adjacent_segments(var/range, var/hitby = null) if(hitby) - visible_message("\The [src] flashes a bit as \the [hitby] collides with it, eventually fading out in a rain of sparks!") + visible_message(span_danger("\The [src] flashes a bit as \the [hitby] collides with it, eventually fading out in a rain of sparks!")) else - visible_message("\The [src] flashes a bit as it eventually fades out in a rain of sparks!") + visible_message(span_danger("\The [src] flashes a bit as it eventually fades out in a rain of sparks!")) fail(range * 2) for(var/obj/effect/shield/S in range(range, src)) @@ -247,7 +247,7 @@ user.do_attack_animation(src) if(gen.check_flag(MODEFLAG_HYPERKINETIC)) - user.visible_message("\The [user] hits \the [src] with \the [I]!") + user.visible_message(span_danger("\The [user] hits \the [src] with \the [I]!")) if(I.damtype == BURN) take_damage(I.force, SHIELD_DAMTYPE_HEAT) else if (I.damtype == BRUTE) @@ -255,7 +255,7 @@ else take_damage(I.force, SHIELD_DAMTYPE_EM) else - user.visible_message("\The [user] tries to attack \the [src] with \the [I], but it passes through!") + user.visible_message(span_danger("\The [user] tries to attack \the [src] with \the [I], but it passes through!")) // Special treatment for meteors because they would otherwise penetrate right through the shield. @@ -274,7 +274,7 @@ /obj/effect/shield/proc/overcharge_shock(var/mob/living/M) M.adjustFireLoss(rand(20, 40)) M.Weaken(5) - to_chat(M, "As you come into contact with \the [src] a surge of energy paralyses you!") + to_chat(M, span_danger("As you come into contact with \the [src] a surge of energy paralyses you!")) take_damage(10, SHIELD_DAMTYPE_EM) // Called when a flag is toggled. Can be used to add on-toggle behavior, such as visual changes. @@ -352,6 +352,6 @@ if(!S.gen.check_flag(MODEFLAG_HYPERKINETIC)) return S.take_damage(get_shield_damage(), SHIELD_DAMTYPE_PHYSICAL, src) - visible_message("\The [src] breaks into dust!") + visible_message(span_danger("\The [src] breaks into dust!")) make_debris() qdel(src) diff --git a/code/modules/shieldgen/shield_generator.dm b/code/modules/shieldgen/shield_generator.dm index b6170fb7b7..86889ab3da 100644 --- a/code/modules/shieldgen/shield_generator.dm +++ b/code/modules/shieldgen/shield_generator.dm @@ -364,10 +364,10 @@ return if(O?.has_tool_quality(TOOL_CROWBAR) || O?.has_tool_quality(TOOL_WRENCH) || istype(O, /obj/item/storage/part_replacer)) if(offline_for) - to_chat(user, "Wait until \the [src] cools down from emergency shutdown first!") + to_chat(user, span_warning("Wait until \the [src] cools down from emergency shutdown first!")) return if(running) - to_chat(user, "Turn off \the [src] first!") + to_chat(user, span_notice("Turn off \the [src] first!")) return if(default_deconstruction_crowbar(user, O)) return diff --git a/code/modules/shuttles/escape_pods.dm b/code/modules/shuttles/escape_pods.dm index aa966b582a..ecf7d5ef5c 100644 --- a/code/modules/shuttles/escape_pods.dm +++ b/code/modules/shuttles/escape_pods.dm @@ -101,7 +101,7 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth/emag_act(var/remaining_charges, var/mob/user) if (!emagged) - to_chat(user, "You emag the [src], arming the escape pod!") + to_chat(user, span_notice("You emag the [src], arming the escape pod!")) emagged = 1 if (istype(program, /datum/embedded_program/docking/simple/escape_pod_berth)) var/datum/embedded_program/docking/simple/escape_pod_berth/P = program diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm index 801d7d55ad..a60ae0cb10 100644 --- a/code/modules/shuttles/landmarks.dm +++ b/code/modules/shuttles/landmarks.dm @@ -170,7 +170,7 @@ /obj/item/spaceflare/attack_self(var/mob/user) if(!active) - visible_message("[user] pulls the cord, activating the [src].") + visible_message(span_notice("[user] pulls the cord, activating the [src].")) activate() /obj/item/spaceflare/proc/activate() diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index d8b44e9d61..51d2d9ba36 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -338,7 +338,7 @@ to_chat(M, span_red("The floor lurches beneath you!")) shake_camera(M, 10, 1) // TODO - tossing? - //M.visible_message("[M.name] is tossed around by the sudden acceleration!") + //M.visible_message(span_warning("[M.name] is tossed around by the sudden acceleration!")) //M.throw_at_random(FALSE, 4, 1) if(istype(M, /mob/living/carbon)) M.Weaken(3) diff --git a/code/modules/shuttles/shuttle_autodock.dm b/code/modules/shuttles/shuttle_autodock.dm index beb0bab011..132548f238 100644 --- a/code/modules/shuttles/shuttle_autodock.dm +++ b/code/modules/shuttles/shuttle_autodock.dm @@ -63,7 +63,7 @@ current_dock_target = docking_controller_tag shuttle_docking_controller = SSshuttles.docking_registry[current_dock_target] if(current_dock_target && !shuttle_docking_controller) - log_shuttle("warning: shuttle [src] can't find its controller with tag [current_dock_target]!") // No toggle because this is an error message that needs to be seen + log_shuttle(span_danger("warning: shuttle [src] can't find its controller with tag [current_dock_target]!")) // No toggle because this is an error message that needs to be seen /* Docking stuff */ diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index 6855f6623c..7e33f70272 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -17,13 +17,13 @@ return //VOREStation Addition Start if(!ai_control && issilicon(user)) - to_chat(user, "Access Denied.") + to_chat(user, span_warning("Access Denied.")) return TRUE //VOREStation Addition End //src.add_fingerprint(user) //shouldn't need fingerprints just for looking at it. if(!allowed(user)) - to_chat(user, "Access Denied.") + to_chat(user, span_warning("Access Denied.")) return 1 tgui_interact(user) @@ -71,12 +71,12 @@ /obj/machinery/computer/shuttle_control/proc/can_move(var/datum/shuttle/autodock/shuttle, var/user) var/cannot_depart = shuttle.current_location.cannot_depart(shuttle) if(cannot_depart) - to_chat(user, "[cannot_depart]") + to_chat(user, span_warning("[cannot_depart]")) if(shuttle.debug_logging) log_shuttle("Shuttle [shuttle] cannot depart [shuttle.current_location] because: [cannot_depart].") return FALSE if(!shuttle.next_location.is_valid(shuttle)) - to_chat(user, "Destination zone is invalid or obstructed.") + to_chat(user, span_warning("Destination zone is invalid or obstructed.")) if(shuttle.debug_logging) log_shuttle("Shuttle [shuttle] destination [shuttle.next_location] is invalid.") return FALSE @@ -92,7 +92,7 @@ var/datum/shuttle/autodock/shuttle = SSshuttles.shuttles[shuttle_tag] if(!istype(shuttle)) - to_chat(usr, "Unable to establish link with the shuttle.") + to_chat(usr, span_warning("Unable to establish link with the shuttle.")) return TRUE switch(action) @@ -127,7 +127,7 @@ /obj/machinery/computer/shuttle_control/tgui_data(mob/user) var/datum/shuttle/autodock/shuttle = SSshuttles.shuttles[shuttle_tag] if(!istype(shuttle)) - to_chat(user, "Unable to establish link with the shuttle.") + to_chat(user, span_warning("Unable to establish link with the shuttle.")) return return shuttlerich_tgui_data(shuttle) diff --git a/code/modules/shuttles/shuttle_console_multi.dm b/code/modules/shuttles/shuttle_console_multi.dm index 6d5b460a21..76f32f450f 100644 --- a/code/modules/shuttles/shuttle_console_multi.dm +++ b/code/modules/shuttles/shuttle_console_multi.dm @@ -20,7 +20,7 @@ var/datum/shuttle/autodock/multi/shuttle = SSshuttles.shuttles[shuttle_tag] if(!istype(shuttle)) - to_chat(usr, "Unable to establish link with the shuttle.") + to_chat(usr, span_warning("Unable to establish link with the shuttle.")) return TRUE switch(action) @@ -35,7 +35,7 @@ return TRUE shuttle.cloaked = !shuttle.cloaked if(shuttle.legit) - to_chat(usr, "Ship ATC inhibitor systems have been [(shuttle.cloaked ? "activated. The station will not" : "deactivated. The station will")] be notified of our arrival.") + to_chat(usr, span_notice("Ship ATC inhibitor systems have been [(shuttle.cloaked ? "activated. The station will not" : "deactivated. The station will")] be notified of our arrival.")) else - to_chat(usr, "Ship stealth systems have been [(shuttle.cloaked ? "activated. The station will not" : "deactivated. The station will")] be warned of our arrival.") + to_chat(usr, span_warning("Ship stealth systems have been [(shuttle.cloaked ? "activated. The station will not" : "deactivated. The station will")] be warned of our arrival.")) return TRUE diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm index 2bb63df4df..f6604fbf90 100644 --- a/code/modules/shuttles/shuttle_emergency.dm +++ b/code/modules/shuttles/shuttle_emergency.dm @@ -70,7 +70,7 @@ if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console if (emergency_shuttle.autopilot) emergency_shuttle.autopilot = 0 - to_world("Alert: The shuttle autopilot has been overridden. Launch sequence initiated!") + to_world(span_notice("Alert: The shuttle autopilot has been overridden. Launch sequence initiated!")) if(usr) log_admin("[key_name(usr)] has overridden the departure shuttle's autopilot and activated the launch sequence.") @@ -84,7 +84,7 @@ if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console if (emergency_shuttle.autopilot) emergency_shuttle.autopilot = 0 - to_world("Alert: The shuttle autopilot has been overridden. Bluespace drive engaged!") + to_world(span_notice("Alert: The shuttle autopilot has been overridden. Bluespace drive engaged!")) if(usr) log_admin("[key_name(usr)] has overridden the departure shuttle's autopilot and forced immediate launch.") @@ -98,7 +98,7 @@ if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console if (emergency_shuttle.autopilot) emergency_shuttle.autopilot = 0 - to_chat(world, "Alert: The shuttle autopilot has been overridden. Launch sequence aborted!") + to_chat(world, span_notice("Alert: The shuttle autopilot has been overridden. Launch sequence aborted!")) if(usr) log_admin("[key_name(usr)] has overridden the departure shuttle's autopilot and cancelled the launch sequence.") @@ -158,7 +158,7 @@ playsound(src, 'sound/machines/twobeep.ogg', 50, 0) authorized[dna_hash] = auth_name if (req_authorizations - authorized.len) - to_chat(world, "Alert: [req_authorizations - authorized.len] authorization\s needed to override the shuttle autopilot.") //TODO- Belsima, make this an announcement instead of magic. + to_chat(world, span_notice("Alert: [req_authorizations - authorized.len] authorization\s needed to override the shuttle autopilot.")) //TODO- Belsima, make this an announcement instead of magic. if(usr) log_admin("[key_name(usr)] has inserted [ID] into the shuttle control computer - [req_authorizations - authorized.len] authorisation\s needed") @@ -168,7 +168,7 @@ /obj/machinery/computer/shuttle_control/emergency/emag_act(var/remaining_charges, var/mob/user) if (!emagged) - to_chat(user, "You short out \the [src]'s authorization protocols.") + to_chat(user, span_notice("You short out \the [src]'s authorization protocols.")) emagged = 1 return 1 diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm index 45129080ff..f394781957 100644 --- a/code/modules/shuttles/shuttle_specops.dm +++ b/code/modules/shuttles/shuttle_specops.dm @@ -4,7 +4,7 @@ req_access = list(access_cent_specops) /obj/machinery/computer/shuttle_control/specops/attack_ai(user as mob) - to_chat(user, "Access Denied.") + to_chat(user, span_warning("Access Denied.")) return 1 // Formerly /datum/shuttle/ferry/multidock/specops @@ -36,14 +36,14 @@ var/obj/machinery/computer/C = user if(world.time <= reset_time) - C.visible_message("[global.using_map.boss_name] will not allow the Special Operations shuttle to launch yet.") + C.visible_message(span_notice("[global.using_map.boss_name] will not allow the Special Operations shuttle to launch yet.")) if (((world.time - reset_time)/10) > 60) - C.visible_message("[-((world.time - reset_time)/10)/60] minutes remain!") + C.visible_message(span_notice("[-((world.time - reset_time)/10)/60] minutes remain!")) else - C.visible_message("[-(world.time - reset_time)/10] seconds remain!") + C.visible_message(span_notice("[-(world.time - reset_time)/10] seconds remain!")) return - C.visible_message("The Special Operations shuttle will depart in [(specops_countdown_time/10)] seconds.") + C.visible_message(span_notice("The Special Operations shuttle will depart in [(specops_countdown_time/10)] seconds.")) if (location) //returning radio_announce("THE SPECIAL OPERATIONS SHUTTLE IS PREPARING TO RETURN") @@ -67,12 +67,12 @@ if (!location) //just arrived home for(var/turf/T in get_area_turfs(shuttle_area)) var/mob/M = locate(/mob) in T - to_chat(M, "You have arrived at [using_map.boss_name]. Operation has ended!") + to_chat(M, span_danger("You have arrived at [using_map.boss_name]. Operation has ended!")) else //just left for the station launch_mauraders() for(var/turf/T in get_area_turfs(shuttle_area)) var/mob/M = locate(/mob) in T - to_chat(M, "You have arrived at [station_name()]. Commence operation!") + to_chat(M, span_danger("You have arrived at [station_name()]. Commence operation!")) var/obj/machinery/light/small/readylight/light = locate() in T if(light) light.set_state(1) @@ -85,7 +85,7 @@ radio_announce("ALERT: LAUNCH SEQUENCE ABORTED") if (istype(in_use, /obj/machinery/computer)) var/obj/machinery/computer/C = in_use - C.visible_message("Launch sequence aborted.") + C.visible_message(span_warning("Launch sequence aborted.")) ..() diff --git a/code/modules/shuttles/shuttles_web.dm b/code/modules/shuttles/shuttles_web.dm index aa65d935c7..55d9ba85af 100644 --- a/code/modules/shuttles/shuttles_web.dm +++ b/code/modules/shuttles/shuttles_web.dm @@ -118,7 +118,7 @@ continue if(!H.shuttle_comp || !(get_area(H) in shuttle_area)) H.shuttle_comp = null - H.audible_message("\The [H] pings as it loses it's connection with the ship.", runemessage = "ping") + H.audible_message(span_warning("\The [H] pings as it loses it's connection with the ship."), runemessage = "ping") H.update_hud("discon") helmets -= H else @@ -142,22 +142,22 @@ process_state = initial(process_state) /datum/shuttle/autodock/web_shuttle/proc/autopilot_say(message) // Makes the autopilot 'talk' to the passengers. - var/padded_message = "shuttle autopilot states, \"[message]\"" + var/padded_message = span_game(span_say(span_name("shuttle autopilot") + " states, \"[message]\"")) message_passengers(padded_message) /datum/shuttle/autodock/web_shuttle/proc/rename_shuttle(mob/user) if(!can_rename) - to_chat(user, "You can't rename this vessel.") + to_chat(user, span_warning("You can't rename this vessel.")) return var/new_name = tgui_input_text(user, "Please enter a new name for this vessel. Note that you can only set its name once, so choose wisely.", "Rename Shuttle", visible_name) var/sanitized_name = sanitizeName(new_name, MAX_NAME_LEN, TRUE) if(sanitized_name) //can_rename = FALSE //VOREStation Removal - to_chat(user, "You've renamed the vessel to '[sanitized_name]'.") + to_chat(user, span_notice("You've renamed the vessel to '[sanitized_name]'.")) message_admins("[key_name_admin(user)] renamed shuttle '[visible_name]' to '[sanitized_name]'.") visible_name = sanitized_name else - to_chat(user, "The name you supplied was invalid. Try another name.") + to_chat(user, span_warning("The name you supplied was invalid. Try another name.")) /obj/machinery/computer/shuttle_control/web name = "flight computer" @@ -200,7 +200,7 @@ var/obj/item/clothing/head/pilot/H = I H.shuttle_comp = src shuttle.helmets |= I - to_chat(user, "You register the helmet with the ship's console.") + to_chat(user, span_notice("You register the helmet with the ship's console.")) shuttle.update_helmets() return @@ -212,7 +212,7 @@ var/list/routes[0] var/datum/shuttle/autodock/web_shuttle/shuttle = SSshuttles.shuttles[shuttle_tag] if(!istype(shuttle)) - to_chat(user, "Unable to establish link with the shuttle.") + to_chat(user, span_warning("Unable to establish link with the shuttle.")) return var/list/R = shuttle.web_master.get_available_routes() @@ -309,13 +309,13 @@ if("dock_command") if(WS.autopilot) - to_chat(usr, "The autopilot must be disabled before you can control the vessel manually.") + to_chat(usr, span_warning("The autopilot must be disabled before you can control the vessel manually.")) return WS.dock() if("undock_command") if(WS.autopilot) - to_chat(usr, "The autopilot must be disabled before you can control the vessel manually.") + to_chat(usr, span_warning("The autopilot must be disabled before you can control the vessel manually.")) return WS.undock() @@ -324,16 +324,16 @@ return WS.cloaked = !WS.cloaked if(WS.cloaked) - to_chat(usr, "Ship stealth systems have been activated. The station will not be warned of our arrival.") + to_chat(usr, span_danger("Ship stealth systems have been activated. The station will not be warned of our arrival.")) else - to_chat(usr, "Ship stealth systems have been deactivated. The station will be warned of our arrival.") + to_chat(usr, span_danger("Ship stealth systems have been deactivated. The station will be warned of our arrival.")) if("toggle_autopilot") WS.adjust_autopilot(!WS.autopilot) if("traverse") if(WS.autopilot) - to_chat(usr, "The autopilot must be disabled before you can control the vessel manually.") + to_chat(usr, span_warning("The autopilot must be disabled before you can control the vessel manually.")) return if((WS.last_move + WS.cooldown) > world.time) @@ -359,7 +359,7 @@ return WS.web_master.future_destination = target_destination - to_chat(usr, "[WS.visible_name] flight computer received command.") + to_chat(usr, span_notice("[WS.visible_name] flight computer received command.")) WS.web_master.reset_autopath() // Deviating from the path will almost certainly confuse the autopilot, so lets just reset its memory. var/travel_time = new_route.travel_time * WS.flight_time_modifier diff --git a/code/modules/spells/aoe_turf/charge.dm b/code/modules/spells/aoe_turf/charge.dm index 490046125d..3171835c0c 100644 --- a/code/modules/spells/aoe_turf/charge.dm +++ b/code/modules/spells/aoe_turf/charge.dm @@ -27,9 +27,9 @@ for(var/spell/S in M.spell_list) if(!istype(S, /spell/aoe_turf/charge)) S.charge_counter = S.charge_max - to_chat(M, "You feel raw magic flowing through you, it feels good!") + to_chat(M, span_notice("You feel raw magic flowing through you, it feels good!")) else - to_chat(M, "You feel very strange for a moment, but then it passes.") + to_chat(M, span_notice("You feel very strange for a moment, but then it passes.")) return M /spell/aoe_turf/charge/proc/cast_charge(var/atom/target) @@ -47,7 +47,7 @@ if(istype(target, /obj/item/spellbook/oneuse)) var/obj/item/spellbook/oneuse/I = target if(prob(50)) - I.visible_message("[I] catches fire!") + I.visible_message(span_warning("[I] catches fire!")) qdel(I) else I.used = 0 @@ -65,5 +65,5 @@ if(!charged_item) return 0 else - charged_item.visible_message("[charged_item] suddenly sparks with energy!") - return 1 \ No newline at end of file + charged_item.visible_message(span_notice("[charged_item] suddenly sparks with energy!")) + return 1 diff --git a/code/modules/spells/aoe_turf/conjure/conjure.dm b/code/modules/spells/aoe_turf/conjure/conjure.dm index 10c9948d52..ecb907f5f1 100644 --- a/code/modules/spells/aoe_turf/conjure/conjure.dm +++ b/code/modules/spells/aoe_turf/conjure/conjure.dm @@ -45,7 +45,7 @@ How they spawn stuff is decided by behaviour vars, which are explained below var/atom/summoned_object if(ispath(summoned_object_type,/turf)) if(istype(get_turf(user),/turf/simulated/shuttle) || istype(spawn_place, /turf/simulated/shuttle)) - to_chat(user, "You can't build things on shuttles!") + to_chat(user, span_warning("You can't build things on shuttles!")) continue spawn_place.ChangeTurf(summoned_object_type) summoned_object = spawn_place @@ -72,4 +72,4 @@ How they spawn stuff is decided by behaviour vars, which are explained below return /spell/aoe_turf/conjure/proc/conjure_animation(var/atom/movable/overlay/animation, var/turf/target) - qdel(animation) \ No newline at end of file + qdel(animation) diff --git a/code/modules/spells/artifacts.dm b/code/modules/spells/artifacts.dm index dd10d30527..0a15af661d 100644 --- a/code/modules/spells/artifacts.dm +++ b/code/modules/spells/artifacts.dm @@ -14,12 +14,12 @@ /obj/item/scrying/attack_self(mob/user as mob) if((user.mind && !wizards.is_antagonist(user.mind))) - to_chat(user, "You stare into the orb and see nothing but your own reflection.") + to_chat(user, span_warning("You stare into the orb and see nothing but your own reflection.")) return - to_chat(user, "You can see... everything!") - visible_message("[user] stares into [src], their eyes glazing over.") - + to_chat(user, span_info("You can see... everything!")) + visible_message(span_danger("[user] stares into [src], their eyes glazing over.")) + user.teleop = user.ghostize(1) announce_ghost_joinleave(user.teleop, 1, "You feel that they used a powerful artifact to [pick("invade","disturb","disrupt","infest","taint","spoil","blight")] this place with their presence.") return diff --git a/code/modules/spells/general/rune_write.dm b/code/modules/spells/general/rune_write.dm index 2871033395..71f9ca8c46 100644 --- a/code/modules/spells/general/rune_write.dm +++ b/code/modules/spells/general/rune_write.dm @@ -171,5 +171,5 @@ R.word3=cultwords["technology"] R.check_icon() else - to_chat(user, " You do not have enough space to write a proper rune.") + to_chat(user, span_warning(" You do not have enough space to write a proper rune.")) return diff --git a/code/modules/spells/spell_code.dm b/code/modules/spells/spell_code.dm index 0491deac1a..ff27d7170f 100644 --- a/code/modules/spells/spell_code.dm +++ b/code/modules/spells/spell_code.dm @@ -12,7 +12,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now var/charge_max = 100 //recharge time in deciseconds if charge_type = Sp_RECHARGE or starting charges if charge_type = Sp_CHARGES var/charge_counter = 0 //can only cast spells if it equals recharge, ++ each decisecond if charge_type = Sp_RECHARGE or -- each cast if charge_type = Sp_CHARGES - var/still_recharging_msg = "The spell is still recharging." + var/still_recharging_msg = span_notice("The spell is still recharging.") var/silenced = 0 //not a binary - the length of time we can't cast this for @@ -61,7 +61,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now /spell/New() ..() - //still_recharging_msg = "[name] is still recharging." + //still_recharging_msg = span_notice("[name] is still recharging.") charge_counter = charge_max /spell/process() @@ -180,7 +180,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now if(!(src in user.spell_list) && holder == user) error("[user] utilized the spell '[src]' without having it.") - to_chat(user, "You shouldn't have this spell! Something's wrong.") + to_chat(user, span_warning("You shouldn't have this spell! Something's wrong.")) return 0 if(silenced > 0) @@ -188,7 +188,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now var/turf/user_turf = get_turf(user) if(!user_turf) - to_chat(user, "You cannot cast spells in null space!") + to_chat(user, span_warning("You cannot cast spells in null space!")) if(spell_flags & Z2NOCAST && (user_turf.z in using_map.admin_levels)) //Certain spells are not allowed on the CentCom zlevel return 0 @@ -201,7 +201,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now if(istype(user, /mob/living/simple_mob) && holder == user) var/mob/living/simple_mob/SM = user if(SM.purge) - to_chat(SM, "The nullrod's power interferes with your own!") + to_chat(SM, span_warning("The nullrod's power interferes with your own!")) return 0 if(!src.check_charge(skipcharge, user)) //sees if we can cast based on charges alone @@ -233,7 +233,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now return 0 if(Sp_CHARGES) if(!charge_counter) - to_chat(user, "[name] has no charges left.") + to_chat(user, span_notice("[name] has no charges left.")) return 0 return 1 diff --git a/code/modules/spells/spellbook.dm b/code/modules/spells/spellbook.dm index bf1f619f2d..4324ec8d12 100644 --- a/code/modules/spells/spellbook.dm +++ b/code/modules/spells/spellbook.dm @@ -15,7 +15,7 @@ if(!user) return if((user.mind && !wizards.is_antagonist(user.mind))) - to_chat(usr, "You stare at the book but cannot make sense of the markings!") + to_chat(usr, span_warning("You stare at the book but cannot make sense of the markings!")) return user.set_machine(src) @@ -229,7 +229,7 @@ H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) H.see_in_dark = 8 H.see_invisible = SEE_INVISIBLE_LEVEL_TWO - to_chat(H, "The walls suddenly disappear.") + to_chat(H, span_notice("The walls suddenly disappear.")) temp = "You have purchased a scrying orb, and gained x-ray vision." max_uses-- else @@ -261,24 +261,24 @@ if(user.mind) // TODO: Update to new antagonist system. if(user.mind.special_role == JOB_APPRENTICE || user.mind.special_role == JOB_WIZARD) - to_chat(user, "You're already far more versed in this spell than this flimsy how-to book can provide.") + to_chat(user, span_notice("You're already far more versed in this spell than this flimsy how-to book can provide.")) else - to_chat(user, "You've already read this one.") + to_chat(user, span_notice("You've already read this one.")) return if(used) recoil(user) else user.add_spell(S) - to_chat(user, "you rapidly read through the arcane book. Suddenly you realize you understand [spellname]!") + to_chat(user, span_notice("you rapidly read through the arcane book. Suddenly you realize you understand [spellname]!")) user.attack_log += text("\[[time_stamp()]\] [span_orange("[user.real_name] ([user.ckey]) learned the spell [spellname] ([S]).")]") onlearned(user) /obj/item/spellbook/oneuse/proc/recoil(mob/user as mob) - user.visible_message("[src] glows in a black light!") + user.visible_message(span_warning("[src] glows in a black light!")) /obj/item/spellbook/oneuse/proc/onlearned(mob/user as mob) used = 1 - user.visible_message("[src] glows dark for a second!") + user.visible_message(span_warning("[src] glows dark for a second!")) /obj/item/spellbook/oneuse/attackby() return @@ -302,7 +302,7 @@ /obj/item/spellbook/oneuse/smoke/recoil(mob/living/user as mob) ..() - to_chat(user, "Your stomach rumbles...") + to_chat(user, span_warning("Your stomach rumbles...")) if(user.nutrition) user.adjust_nutrition(-200) @@ -314,7 +314,7 @@ /obj/item/spellbook/oneuse/blind/recoil(mob/user as mob) ..() - to_chat(user, "You go blind!") + to_chat(user, span_warning("You go blind!")) user.Blind(10) /obj/item/spellbook/oneuse/mindswap @@ -336,10 +336,10 @@ stored_swap = null if(!stored_swap) stored_swap = user - to_chat(user, "For a moment you feel like you don't even know who you are anymore.") + to_chat(user, span_warning("For a moment you feel like you don't even know who you are anymore.")) return if(stored_swap == user) - to_chat(user, "You stare at the book some more, but there doesn't seem to be anything else to learn...") + to_chat(user, span_notice("You stare at the book some more, but there doesn't seem to be anything else to learn...")) return if(user.mind.special_verbs.len) @@ -368,8 +368,8 @@ for(var/V in user.mind.special_verbs) user.verbs += V - to_chat(stored_swap, "You're suddenly somewhere else... and someone else?!") - to_chat(user, "Suddenly you're staring at [src] again... where are you, who are you?!") + to_chat(stored_swap, span_warning("You're suddenly somewhere else... and someone else?!")) + to_chat(user, span_warning("Suddenly you're staring at [src] again... where are you, who are you?!")) stored_swap = null /obj/item/spellbook/oneuse/forcewall @@ -380,7 +380,7 @@ /obj/item/spellbook/oneuse/forcewall/recoil(mob/user as mob) ..() - to_chat(user, "You suddenly feel very solid!") + to_chat(user, span_warning("You suddenly feel very solid!")) var/obj/structure/closet/statue/S = new /obj/structure/closet/statue(user.loc, user) S.timer = 30 user.drop_item() @@ -394,7 +394,7 @@ /obj/item/spellbook/oneuse/knock/recoil(mob/user as mob) ..() - to_chat(user, "You're knocked down!") + to_chat(user, span_warning("You're knocked down!")) user.Weaken(20) /obj/item/spellbook/oneuse/horsemask @@ -414,7 +414,7 @@ user.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1) qdel(src) else - to_chat(user, "I say thee neigh") + to_chat(user, span_notice("I say thee neigh")) /obj/item/spellbook/oneuse/charge spell = /spell/aoe_turf/charge @@ -424,5 +424,5 @@ /obj/item/spellbook/oneuse/charge/recoil(mob/user as mob) ..() - to_chat(user, "[src] suddenly feels very warm!") + to_chat(user, span_warning("[src] suddenly feels very warm!")) empulse(src, 1, 1, 1, 1) diff --git a/code/modules/spells/targeted/equip/horsemask.dm b/code/modules/spells/targeted/equip/horsemask.dm index 5ec6ccfc00..f8b52c5a02 100644 --- a/code/modules/spells/targeted/equip/horsemask.dm +++ b/code/modules/spells/targeted/equip/horsemask.dm @@ -24,8 +24,8 @@ /spell/targeted/equip_item/horsemask/cast(list/targets, mob/user = usr) ..() for(var/mob/living/target in targets) - target.visible_message( "[target]'s face lights up in fire, and after the event a horse's head takes its place!", \ - "Your face burns up, and shortly after the fire you realise you have the face of a horse!") + target.visible_message( span_danger("[target]'s face lights up in fire, and after the event a horse's head takes its place!"), \ + span_danger("Your face burns up, and shortly after the fire you realise you have the face of a horse!")) target.flash_eyes() /spell/targeted/equip_item/horsemask/summon_item(var/new_type) diff --git a/code/modules/spells/targeted/ethereal_jaunt.dm b/code/modules/spells/targeted/ethereal_jaunt.dm index d300f6a912..d60a930448 100644 --- a/code/modules/spells/targeted/ethereal_jaunt.dm +++ b/code/modules/spells/targeted/ethereal_jaunt.dm @@ -97,11 +97,11 @@ if(!T.contains_dense_objects()) last_valid_turf = T else - to_chat(user, "Some strange aura is blocking the way!") + to_chat(user, span_warning("Some strange aura is blocking the way!")) src.canmove = 0 spawn(2) src.canmove = 1 /obj/effect/dummy/spell_jaunt/ex_act(blah) return /obj/effect/dummy/spell_jaunt/bullet_act(blah) - return \ No newline at end of file + return diff --git a/code/modules/spells/targeted/genetic.dm b/code/modules/spells/targeted/genetic.dm index 045fbc7d41..eed2437212 100644 --- a/code/modules/spells/targeted/genetic.dm +++ b/code/modules/spells/targeted/genetic.dm @@ -37,7 +37,7 @@ code\game\dna\genes\goon_powers.dm spell_flags = 0 invocation = "STI KALY" invocation_type = SpI_WHISPER - message = "Your eyes cry out in pain!" + message = span_danger("Your eyes cry out in pain!") cooldown_min = 50 range = 7 @@ -57,7 +57,7 @@ code\game\dna\genes\goon_powers.dm spell_flags = Z2NOCAST | NEEDSCLOTHES | INCLUDEUSER invocation = "BIRUZ BENNAR" invocation_type = SpI_SHOUT - message = "You feel strong! You feel a pressure building behind your eyes!" + message = span_notice("You feel strong! You feel a pressure building behind your eyes!") range = 0 max_targets = 1 diff --git a/code/modules/spells/targeted/harvest.dm b/code/modules/spells/targeted/harvest.dm index 3bebe72e25..bcb70c194d 100644 --- a/code/modules/spells/targeted/harvest.dm +++ b/code/modules/spells/targeted/harvest.dm @@ -38,7 +38,7 @@ M.forceMove(destination) if(M != user) prey = 1 - to_chat(user, "You warp back to Nar-Sie[prey ? " along with your prey":""].") + to_chat(user, span_sinister("You warp back to Nar-Sie[prey ? " along with your prey":""].")) else - to_chat(user, "...something's wrong!")//There shouldn't be an instance of Harvesters when Nar-Sie isn't in the world. -*/ \ No newline at end of file + to_chat(user, span_danger("...something's wrong!"))//There shouldn't be an instance of Harvesters when Nar-Sie isn't in the world. +*/ diff --git a/code/modules/spells/targeted/mind_transfer.dm b/code/modules/spells/targeted/mind_transfer.dm index 3b11a5f59c..4ccd7354c6 100644 --- a/code/modules/spells/targeted/mind_transfer.dm +++ b/code/modules/spells/targeted/mind_transfer.dm @@ -78,4 +78,4 @@ //After a certain amount of time the victim gets a message about being in a different body. spawn(msg_wait) - to_chat(caster, "You feel woozy and lightheaded. Your body doesn't seem like your own.") + to_chat(caster, span_danger("You feel woozy and lightheaded. Your body doesn't seem like your own.")) diff --git a/code/modules/spells/targeted/projectile/magic_missile.dm b/code/modules/spells/targeted/projectile/magic_missile.dm index c3589ce94b..0c1c2d26c8 100644 --- a/code/modules/spells/targeted/projectile/magic_missile.dm +++ b/code/modules/spells/targeted/projectile/magic_missile.dm @@ -24,7 +24,7 @@ amt_dam_fire = 10 /spell/targeted/projectile/magic_missile/prox_cast(var/list/targets, atom/spell_holder) - spell_holder.visible_message("\The [spell_holder] pops with a flash!") + spell_holder.visible_message(span_danger("\The [spell_holder] pops with a flash!")) for(var/mob/living/M in targets) apply_spell_damage(M) return diff --git a/code/modules/spells/targeted/subjugate.dm b/code/modules/spells/targeted/subjugate.dm index 8f6efa3c14..28f6e55fe4 100644 --- a/code/modules/spells/targeted/subjugate.dm +++ b/code/modules/spells/targeted/subjugate.dm @@ -7,7 +7,7 @@ spell_flags = 0 invocation = "DII ODA BAJI" invocation_type = SpI_WHISPER - message = "You suddenly feel completely overwhelmed!" + message = span_danger("You suddenly feel completely overwhelmed!") max_targets = 1 diff --git a/code/modules/stockmarket/computer.dm b/code/modules/stockmarket/computer.dm index 8054c773da..6cdb2df041 100644 --- a/code/modules/stockmarket/computer.dm +++ b/code/modules/stockmarket/computer.dm @@ -99,7 +99,7 @@ data["stationName"] = using_map.station_name data["balance"] = balance() data["screen"] = screen - + switch(screen) // Main Stocks List if("stocks") @@ -187,7 +187,7 @@ // Stocks Logs Screen if("logs") data["logs"] = list() - + for(var/D in GLOB.stockExchange.logs) var/datum/stock_log/L = D @@ -266,12 +266,12 @@ return var/li = logged_in if (!li) - to_chat(user, "No active account on the console!") + to_chat(user, span_danger("No active account on the console!")) return var/b = SSsupply.points var/avail = S.shareholders[logged_in] if (!avail) - to_chat(user, "This account does not own any shares of [S.name]!") + to_chat(user, span_danger("This account does not own any shares of [S.name]!")) return var/price = S.current_value var/amt = round(tgui_input_number(user, "How many shares? \n(Have: [avail], unit price: [price])", "Sell shares in [S.name]", 0)) @@ -285,14 +285,14 @@ return b = SSsupply.points if (!isnum(b)) - to_chat(user, "No active account on the console!") + to_chat(user, span_danger("No active account on the console!")) return var/total = amt * S.current_value if (!S.sellShares(logged_in, amt)) - to_chat(user, "Could not complete transaction.") + to_chat(user, span_danger("Could not complete transaction.")) return - to_chat(user, "Sold [amt] shares of [S.name] at [S.current_value] a share for [total] credits.") + to_chat(user, span_notice("Sold [amt] shares of [S.name] at [S.current_value] a share for [total] credits.")) GLOB.stockExchange.add_log(/datum/stock_log/sell, user.name, S.name, amt, S.current_value, total) /obj/machinery/computer/stockexchange/proc/buy_some_shares(var/datum/stock/S, var/mob/user) @@ -300,11 +300,11 @@ return var/li = logged_in if (!li) - to_chat(user, "No active account on the console!") + to_chat(user, span_danger("No active account on the console!")) return var/b = balance() if (!isnum(b)) - to_chat(user, "No active account on the console!") + to_chat(user, span_danger("No active account on the console!")) return var/avail = S.available_shares var/price = S.current_value @@ -316,26 +316,26 @@ return b = balance() if (!isnum(b)) - to_chat(user, "No active account on the console!") + to_chat(user, span_danger("No active account on the console!")) return amt = min(amt, S.available_shares, round(b / S.current_value)) if (!amt) return if (!S.buyShares(logged_in, amt)) - to_chat(user, "Could not complete transaction.") + to_chat(user, span_danger("Could not complete transaction.")) return var/total = amt * S.current_value - to_chat(user, "Bought [amt] shares of [S.name] at [S.current_value] a share for [total] credits.") + to_chat(user, span_notice("Bought [amt] shares of [S.name] at [S.current_value] a share for [total] credits.")) GLOB.stockExchange.add_log(/datum/stock_log/buy, user.name, S.name, amt, S.current_value, total) /obj/machinery/computer/stockexchange/proc/do_borrowing_deal(var/datum/borrow/B, var/mob/user) if (B.stock.borrow(B, logged_in)) - to_chat(user, "You successfully borrowed [B.share_amount] shares. Deposit: [B.deposit].") + to_chat(user, span_notice("You successfully borrowed [B.share_amount] shares. Deposit: [B.deposit].")) GLOB.stockExchange.add_log(/datum/stock_log/borrow, user.name, B.stock.name, B.share_amount, B.deposit) else - to_chat(user, "Could not complete transaction. Check your account balance.") + to_chat(user, span_danger("Could not complete transaction. Check your account balance.")) /obj/machinery/computer/stockexchange/Topic(href, href_list) if (..()) @@ -345,4 +345,4 @@ usr.machine = src src.add_fingerprint(usr) - src.updateUsrDialog() \ No newline at end of file + src.updateUsrDialog() diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm index 16cd795832..b350e1cde8 100644 --- a/code/modules/surgery/bones.dm +++ b/code/modules/surgery/bones.dm @@ -32,21 +32,21 @@ /datum/surgery_step/glue_bone/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected.stage == 0) - user.visible_message("[user] starts applying medication to the damaged bones in [target]'s [affected.name] with \the [tool]." , \ - "You start applying medication to the damaged bones in [target]'s [affected.name] with \the [tool].") + user.visible_message(span_notice("[user] starts applying medication to the damaged bones in [target]'s [affected.name] with \the [tool].") , \ + span_notice("You start applying medication to the damaged bones in [target]'s [affected.name] with \the [tool].")) target.custom_pain("Something in your [affected.name] is causing you a lot of pain!", 50) ..() /datum/surgery_step/glue_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] applies some [tool] to [target]'s bone in [affected.name]", \ - "You apply some [tool] to [target]'s bone in [affected.name] with \the [tool].") + user.visible_message(span_notice("[user] applies some [tool] to [target]'s bone in [affected.name]"), \ + span_notice("You apply some [tool] to [target]'s bone in [affected.name] with \the [tool].")) affected.stage = 1 /datum/surgery_step/glue_bone/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \ - "Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") + user.visible_message(span_danger("[user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") , \ + span_danger("Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!")) /////////////////////////////////////////////////////////////// // Bone Setting Surgery @@ -73,16 +73,16 @@ /datum/surgery_step/set_bone/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] is beginning to set the bone in [target]'s [affected.name] in place with \the [tool]." , \ - "You are beginning to set the bone in [target]'s [affected.name] in place with \the [tool].") + user.visible_message(span_notice("[user] is beginning to set the bone in [target]'s [affected.name] in place with \the [tool].") , \ + span_notice("You are beginning to set the bone in [target]'s [affected.name] in place with \the [tool].")) target.custom_pain("The pain in your [affected.name] is going to make you pass out!", 50) ..() /datum/surgery_step/set_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected.status & ORGAN_BROKEN) - user.visible_message("[user] sets the bone in [target]'s [affected.name] in place with \the [tool].", \ - "You set the bone in [target]'s [affected.name] in place with \the [tool].") + user.visible_message(span_notice("[user] sets the bone in [target]'s [affected.name] in place with \the [tool]."), \ + span_notice("You set the bone in [target]'s [affected.name] in place with \the [tool].")) affected.stage = 2 else user.visible_message("[user] sets the bone in [target]'s [affected.name] in the WRONG place with \the [tool].", \ @@ -91,8 +91,8 @@ /datum/surgery_step/set_bone/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!" , \ - "Your hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_danger("[user]'s hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!") , \ + span_danger("Your hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!")) affected.createwound(BRUISE, 5) /////////////////////////////////////////////////////////////// @@ -119,20 +119,20 @@ return affected && affected.organ_tag == BP_HEAD && (affected.robotic < ORGAN_ROBOT) && affected.open >= 2 && affected.stage == 1 /datum/surgery_step/mend_skull/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] is beginning to piece together [target]'s skull with \the [tool]." , \ - "You are beginning to piece together [target]'s skull with \the [tool].") + user.visible_message(span_notice("[user] is beginning to piece together [target]'s skull with \the [tool].") , \ + span_notice("You are beginning to piece together [target]'s skull with \the [tool].")) ..() /datum/surgery_step/mend_skull/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] sets [target]'s skull with \the [tool]." , \ - "You set [target]'s skull with \the [tool].") + user.visible_message(span_notice("[user] sets [target]'s skull with \the [tool].") , \ + span_notice("You set [target]'s skull with \the [tool].")) affected.stage = 2 /datum/surgery_step/mend_skull/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, damaging [target]'s face with \the [tool]!" , \ - "Your hand slips, damaging [target]'s face with \the [tool]!") + user.visible_message(span_danger("[user]'s hand slips, damaging [target]'s face with \the [tool]!") , \ + span_danger("Your hand slips, damaging [target]'s face with \the [tool]!")) var/obj/item/organ/external/head/h = affected h.createwound(BRUISE, 10) h.disfigured = 1 @@ -165,21 +165,21 @@ /datum/surgery_step/finish_bone/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].", \ - "You start to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].") + user.visible_message(span_notice("[user] starts to finish mending the damaged bones in [target]'s [affected.name] with \the [tool]."), \ + span_notice("You start to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].")) ..() /datum/surgery_step/finish_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has mended the damaged bones in [target]'s [affected.name] with \the [tool]." , \ - "You have mended the damaged bones in [target]'s [affected.name] with \the [tool]." ) + user.visible_message(span_notice("[user] has mended the damaged bones in [target]'s [affected.name] with \the [tool].") , \ + span_notice("You have mended the damaged bones in [target]'s [affected.name] with \the [tool].") ) affected.status &= ~ORGAN_BROKEN affected.stage = 0 /datum/surgery_step/finish_bone/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \ - "Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") + user.visible_message(span_danger("[user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") , \ + span_danger("Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!")) /////////////////////////////////////////////////////////////// // Bone Clamp Surgery @@ -208,19 +208,19 @@ /datum/surgery_step/clamp_bone/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected.stage == 0) - user.visible_message("[user] starts repairing the damaged bones in [target]'s [affected.name] with \the [tool]." , \ - "You starts repairing the damaged bones in [target]'s [affected.name] with \the [tool].") + user.visible_message(span_notice("[user] starts repairing the damaged bones in [target]'s [affected.name] with \the [tool].") , \ + span_notice("You starts repairing the damaged bones in [target]'s [affected.name] with \the [tool].")) target.custom_pain("Something in your [affected.name] is causing you a lot of pain!", 50) ..() /datum/surgery_step/clamp_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] sets the bone in [target]'s [affected.name] with \the [tool].", \ - "You sets [target]'s bone in [affected.name] with \the [tool].") + user.visible_message(span_notice("[user] sets the bone in [target]'s [affected.name] with \the [tool]."), \ + span_notice("You sets [target]'s bone in [affected.name] with \the [tool].")) affected.status &= ~ORGAN_BROKEN /datum/surgery_step/clamp_bone/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!" , \ - "Your hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_danger("[user]'s hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!") , \ + span_danger("Your hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!")) affected.createwound(BRUISE, 5) diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm index 6d946c24ed..bc3612e77f 100644 --- a/code/modules/surgery/encased.dm +++ b/code/modules/surgery/encased.dm @@ -42,8 +42,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] begins to cut through [target]'s [affected.encased] with \the [tool].", \ - "You begin to cut through [target]'s [affected.encased] with \the [tool].") + user.visible_message(span_filter_notice("[user] begins to cut through [target]'s [affected.encased] with \the [tool]."), \ + span_filter_notice("You begin to cut through [target]'s [affected.encased] with \the [tool].")) target.custom_pain("Something hurts horribly in your [affected.name]!", 60) ..() @@ -52,8 +52,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has cut [target]'s [affected.encased] open with \the [tool].", \ - "You have cut [target]'s [affected.encased] open with \the [tool].") + user.visible_message(span_notice("[user] has cut [target]'s [affected.encased] open with \the [tool]."), \ + span_notice("You have cut [target]'s [affected.encased] open with \the [tool].")) affected.open = 2.5 /datum/surgery_step/open_encased/saw/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -61,8 +61,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, cracking [target]'s [affected.encased] with \the [tool]!" , \ - "Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!" ) + user.visible_message(span_danger("[user]'s hand slips, cracking [target]'s [affected.encased] with \the [tool]!") , \ + span_danger("Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!") ) affected.createwound(CUT, 20) affected.fracture() @@ -93,8 +93,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user] starts to force open the [affected.encased] in [target]'s [affected.name] with \the [tool]." - var/self_msg = "You start to force open the [affected.encased] in [target]'s [affected.name] with \the [tool]." + var/msg = span_filter_notice("[user] starts to force open the [affected.encased] in [target]'s [affected.name] with \the [tool].") + var/self_msg = span_filter_notice("You start to force open the [affected.encased] in [target]'s [affected.name] with \the [tool].") user.visible_message(msg, self_msg) target.custom_pain("Something hurts horribly in your [affected.name]!", 40) ..() @@ -103,8 +103,8 @@ if (!hasorgans(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user] forces open [target]'s [affected.encased] with \the [tool]." - var/self_msg = "You force open [target]'s [affected.encased] with \the [tool]." + var/msg = span_notice("[user] forces open [target]'s [affected.encased] with \the [tool].") + var/self_msg = span_notice("You force open [target]'s [affected.encased] with \the [tool].") user.visible_message(msg, self_msg) affected.open = 3 @@ -114,8 +114,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user]'s hand slips, cracking [target]'s [affected.encased]!" - var/self_msg = "Your hand slips, cracking [target]'s [affected.encased]!" + var/msg = span_danger("[user]'s hand slips, cracking [target]'s [affected.encased]!") + var/self_msg = span_danger("Your hand slips, cracking [target]'s [affected.encased]!") user.visible_message(msg, self_msg) affected.createwound(BRUISE, 20) @@ -147,8 +147,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user] starts bending [target]'s [affected.encased] back into place with \the [tool]." - var/self_msg = "You start bending [target]'s [affected.encased] back into place with \the [tool]." + var/msg = span_filter_notice("[user] starts bending [target]'s [affected.encased] back into place with \the [tool].") + var/self_msg = span_filter_notice("You start bending [target]'s [affected.encased] back into place with \the [tool].") user.visible_message(msg, self_msg) target.custom_pain("Something hurts horribly in your [affected.name]!", 100) ..() @@ -158,8 +158,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user] bends [target]'s [affected.encased] back into place with \the [tool]." - var/self_msg = "You bend [target]'s [affected.encased] back into place with \the [tool]." + var/msg = span_notice("[user] bends [target]'s [affected.encased] back into place with \the [tool].") + var/self_msg = span_notice("You bend [target]'s [affected.encased] back into place with \the [tool].") user.visible_message(msg, self_msg) affected.open = 2.5 @@ -169,15 +169,15 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user]'s hand slips, bending [target]'s [affected.encased] the wrong way!" - var/self_msg = "Your hand slips, bending [target]'s [affected.encased] the wrong way!" + var/msg = span_danger("[user]'s hand slips, bending [target]'s [affected.encased] the wrong way!") + var/self_msg = span_danger("Your hand slips, bending [target]'s [affected.encased] the wrong way!") user.visible_message(msg, self_msg) affected.createwound(BRUISE, 20) affected.fracture() /*if (prob(40)) //TODO: ORGAN REMOVAL UPDATE. - user.visible_message(" A rib pierces the lung!") + user.visible_message(span_danger(" A rib pierces the lung!")) target.rupture_lung()*/ /////////////////////////////////////////////////////////////// @@ -206,8 +206,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user] starts applying \the [tool] to [target]'s [affected.encased]." - var/self_msg = "You start applying \the [tool] to [target]'s [affected.encased]." + var/msg = span_filter_notice("[user] starts applying \the [tool] to [target]'s [affected.encased].") + var/self_msg = span_filter_notice("You start applying \the [tool] to [target]'s [affected.encased].") user.visible_message(msg, self_msg) target.custom_pain("Something hurts horribly in your [affected.name]!", 100) ..() @@ -217,8 +217,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user] applied \the [tool] to [target]'s [affected.encased]." - var/self_msg = "You applied \the [tool] to [target]'s [affected.encased]." + var/msg = span_notice("[user] applied \the [tool] to [target]'s [affected.encased].") + var/self_msg = span_notice("You applied \the [tool] to [target]'s [affected.encased].") user.visible_message(msg, self_msg) affected.open = 2 @@ -249,8 +249,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] begins to open [target]'s [affected.encased] with \the [tool].", \ - "You begin to open [target]'s [affected.encased] with \the [tool].") + user.visible_message(span_filter_notice("[user] begins to open [target]'s [affected.encased] with \the [tool]."), \ + span_filter_notice("You begin to open [target]'s [affected.encased] with \the [tool].")) target.custom_pain("Something hurts horribly in your [affected.name]!", 60) ..() @@ -259,8 +259,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has cut [target]'s [affected.encased] wide open with \the [tool].", \ - "You have cut [target]'s [affected.encased] wide open with \the [tool].") + user.visible_message(span_notice("[user] has cut [target]'s [affected.encased] wide open with \the [tool]."), \ + span_notice("You have cut [target]'s [affected.encased] wide open with \the [tool].")) affected.open = 3 /datum/surgery_step/open_encased/advancedsaw_open/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -268,8 +268,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, searing [target]'s [affected.encased] with \the [tool]!" , \ - "Your hand slips, searing [target]'s [affected.encased] with \the [tool]!" ) + user.visible_message(span_danger("[user]'s hand slips, searing [target]'s [affected.encased] with \the [tool]!") , \ + span_danger("Your hand slips, searing [target]'s [affected.encased] with \the [tool]!") ) affected.createwound(CUT, 20) affected.createwound(BURN, 15) @@ -299,8 +299,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user] starts sealing \the [target]'s [affected.encased] with \the [tool]." - var/self_msg = "You start sealing \the [target]'s [affected.encased] with \the [tool]." + var/msg = span_filter_notice("[user] starts sealing \the [target]'s [affected.encased] with \the [tool].") + var/self_msg = span_filter_notice("You start sealing \the [target]'s [affected.encased] with \the [tool].") user.visible_message(msg, self_msg) target.custom_pain("Something hurts horribly in your [affected.name]!", 100) ..() @@ -310,8 +310,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user] sealed \the [target]'s [affected.encased] with \the [tool]." - var/self_msg = "You sealed \the [target]'s [affected.encased] with \the [tool]." + var/msg = span_notice("[user] sealed \the [target]'s [affected.encased] with \the [tool].") + var/self_msg = span_notice("You sealed \the [target]'s [affected.encased] with \the [tool].") user.visible_message(msg, self_msg) affected.open = 2 diff --git a/code/modules/surgery/external_repair.dm b/code/modules/surgery/external_repair.dm index 89187da728..53dbf21195 100644 --- a/code/modules/surgery/external_repair.dm +++ b/code/modules/surgery/external_repair.dm @@ -60,27 +60,27 @@ /datum/surgery_step/repairflesh/scan_injury/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] begins scanning [target]'s [affected] with \the [tool].", \ - "You begin scanning [target]'s [affected] with \the [tool].") + user.visible_message(span_notice("[user] begins scanning [target]'s [affected] with \the [tool]."), \ + span_notice("You begin scanning [target]'s [affected] with \the [tool].")) ..() /datum/surgery_step/repairflesh/scan_injury/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] finishes scanning [target]'s [affected].", \ - "You finish scanning [target]'s [affected].") + user.visible_message(span_notice("[user] finishes scanning [target]'s [affected]."), \ + span_notice("You finish scanning [target]'s [affected].")) if(affected.brute_dam) - to_chat(user, "The muscle in [target]'s [affected] is notably bruised.") + to_chat(user, span_notice("The muscle in [target]'s [affected] is notably bruised.")) if(affected.status & ORGAN_BROKEN) - to_chat(user, "\The [target]'s [affected] is broken!") + to_chat(user, span_warning("\The [target]'s [affected] is broken!")) affected.brute_stage = max(1, affected.brute_stage) if(affected.burn_dam) - to_chat(user, "\The muscle in [target]'s [affected] is notably charred.") + to_chat(user, span_notice("\The muscle in [target]'s [affected] is notably charred.")) affected.burn_stage = max(1, affected.burn_stage) /datum/surgery_step/repairflesh/scan_injury/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, dropping \the [tool] onto [target]'s [affected]!" , \ - "Your hand slips, dropping \the [tool] onto [target]'s [affected]!" ) + user.visible_message(span_warning("[user]'s hand slips, dropping \the [tool] onto [target]'s [affected]!") , \ + span_warning("Your hand slips, dropping \the [tool] onto [target]'s [affected]!") ) affected.createwound(BRUISE, 10) ////////////////////////////////////////////////////////////////// @@ -112,22 +112,22 @@ /datum/surgery_step/repairflesh/repair_burns/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) if(istype(tool, /obj/item/tape_roll) || istype(tool, /obj/item/taperoll)) - user.visible_message("[user] begins taping up [target]'s [affected] with \the [tool].", \ - "You begin taping up [target]'s [affected] with \the [tool].") + user.visible_message(span_warning("[user] begins taping up [target]'s [affected] with \the [tool]."), \ + span_notice("You begin taping up [target]'s [affected] with \the [tool].")) affected.jostle_bone(10) else if(istype(tool, /obj/item/surgical/hemostat) || istype(tool, /obj/item/surgical/FixOVein)) - user.visible_message("[user] begins mending the charred blood vessels in [target]'s [affected] with \the [tool].", \ - "You begin mending the charred blood vessels in [target]'s [affected] with \the [tool].") + user.visible_message(span_notice("[user] begins mending the charred blood vessels in [target]'s [affected] with \the [tool]."), \ + span_notice("You begin mending the charred blood vessels in [target]'s [affected] with \the [tool].")) else - user.visible_message("[user] begins coating the charred tissue in [target]'s [affected] with \the [tool].", \ - "You begin coating the charred tissue in [target]'s [affected] with \the [tool].") + user.visible_message(span_notice("[user] begins coating the charred tissue in [target]'s [affected] with \the [tool]."), \ + span_notice("You begin coating the charred tissue in [target]'s [affected] with \the [tool].")) ..() /datum/surgery_step/repairflesh/repair_burns/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) if(istype(tool, /obj/item/tape_roll) || istype(tool, /obj/item/taperoll)) - user.visible_message("[user] finishes taping up [target]'s [affected] with \the [tool].", \ - "You finish taping up [target]'s [affected] with \the [tool].") + user.visible_message(span_notice("[user] finishes taping up [target]'s [affected] with \the [tool]."), \ + span_notice("You finish taping up [target]'s [affected] with \the [tool].")) affected.createwound(BRUISE, 10) affected.heal_damage(0, 25, 0, 0) if(!(affected.burn_dam)) @@ -139,8 +139,8 @@ /datum/surgery_step/repairflesh/repair_burns/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, tearing up [target]'s [affected] with \the [tool].", \ - "Your hand slips, tearing up [target]'s [affected] with \the [tool].") + user.visible_message(span_danger("[user]'s hand slips, tearing up [target]'s [affected] with \the [tool]."), \ + span_danger("Your hand slips, tearing up [target]'s [affected] with \the [tool].")) affected.createwound(BRUISE, 10) affected.createwound(CUT, 5) if(istype(tool, /obj/item/stack) && prob(30)) @@ -177,22 +177,22 @@ /datum/surgery_step/repairflesh/repair_brute/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) if(istype(tool, /obj/item/tape_roll) || istype(tool, /obj/item/taperoll)) - user.visible_message("[user] begins taping up [target]'s [affected] with \the [tool].", \ - "You begin taping up [target]'s [affected] with \the [tool].") + user.visible_message(span_warning("[user] begins taping up [target]'s [affected] with \the [tool]."), \ + span_notice("You begin taping up [target]'s [affected] with \the [tool].")) affected.jostle_bone(10) else if(istype(tool, /obj/item/surgical/FixOVein) || istype(tool, /obj/item/surgical/bonesetter)) - user.visible_message("[user] begins mending the torn tissue in [target]'s [affected] with \the [tool].", \ - "You begin mending the torn tissue in [target]'s [affected] with \the [tool].") + user.visible_message(span_notice("[user] begins mending the torn tissue in [target]'s [affected] with \the [tool]."), \ + span_notice("You begin mending the torn tissue in [target]'s [affected] with \the [tool].")) else - user.visible_message("[user] begins coating the tissue in [target]'s [affected] with \the [tool].", \ - "You begin coating the tissue in [target]'s [affected] with \the [tool].") + user.visible_message(span_notice("[user] begins coating the tissue in [target]'s [affected] with \the [tool]."), \ + span_notice("You begin coating the tissue in [target]'s [affected] with \the [tool].")) ..() /datum/surgery_step/repairflesh/repair_brute/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) if(istype(tool, /obj/item/tape_roll) || istype(tool, /obj/item/taperoll)) - user.visible_message("[user] finishes taping up [target]'s [affected] with \the [tool].", \ - "You finish taping up [target]'s [affected] with \the [tool].") + user.visible_message(span_notice("[user] finishes taping up [target]'s [affected] with \the [tool]."), \ + span_notice("You finish taping up [target]'s [affected] with \the [tool].")) affected.createwound(BRUISE, 10) affected.heal_damage(25, 0, 0, 0) if(!(affected.brute_dam)) @@ -204,8 +204,8 @@ /datum/surgery_step/repairflesh/repair_brute/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, tearing up [target]'s [affected] with \the [tool].", \ - "Your hand slips, tearing up [target]'s [affected] with \the [tool].") + user.visible_message(span_danger("[user]'s hand slips, tearing up [target]'s [affected] with \the [tool]."), \ + span_danger("Your hand slips, tearing up [target]'s [affected] with \the [tool].")) affected.createwound(BRUISE, 10) affected.createwound(CUT, 5) if(istype(tool, /obj/item/stack) && prob(30)) diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm index a60fa8921d..d2fee592a2 100644 --- a/code/modules/surgery/face.dm +++ b/code/modules/surgery/face.dm @@ -38,19 +38,19 @@ return ..() && target_zone == O_MOUTH && target.op_stage.face == 0 /datum/surgery_step/generic/cut_face/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] starts to cut open [target]'s face and neck with \the [tool].", \ - "You start to cut open [target]'s face and neck with \the [tool].") + user.visible_message(span_filter_notice("[user] starts to cut open [target]'s face and neck with \the [tool]."), \ + span_filter_notice("You start to cut open [target]'s face and neck with \the [tool].")) ..() /datum/surgery_step/generic/cut_face/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has cut open [target]'s face and neck with \the [tool]." , \ - " You have cut open[target]'s face and neck with \the [tool].",) + user.visible_message(span_notice("[user] has cut open [target]'s face and neck with \the [tool].") , \ + span_notice(" You have cut open[target]'s face and neck with \the [tool]."),) target.op_stage.face = 1 /datum/surgery_step/generic/cut_face/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, slicing [target]'s throat wth \the [tool]!" , \ - "Your hand slips, slicing [target]'s throat wth \the [tool]!" ) + user.visible_message(span_danger("[user]'s hand slips, slicing [target]'s throat wth \the [tool]!") , \ + span_danger("Your hand slips, slicing [target]'s throat wth \the [tool]!") ) affected.createwound(CUT, 60) target.AdjustLosebreath(10) @@ -73,18 +73,18 @@ return ..() && target.op_stage.face == 1 /datum/surgery_step/face/mend_vocal/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] starts mending [target]'s vocal cords with \the [tool].", \ - "You start mending [target]'s vocal cords with \the [tool].") + user.visible_message(span_filter_notice("[user] starts mending [target]'s vocal cords with \the [tool]."), \ + span_filter_notice("You start mending [target]'s vocal cords with \the [tool].")) ..() /datum/surgery_step/face/mend_vocal/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] mends [target]'s vocal cords with \the [tool].", \ - "You mend [target]'s vocal cords with \the [tool].") + user.visible_message(span_notice("[user] mends [target]'s vocal cords with \the [tool]."), \ + span_notice("You mend [target]'s vocal cords with \the [tool].")) target.op_stage.face = 2 /datum/surgery_step/face/mend_vocal/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user]'s hand slips, clamping [target]'s trachea shut for a moment with \the [tool]!", \ - "Your hand slips, clamping [user]'s trachea shut for a moment with \the [tool]!") + user.visible_message(span_danger("[user]'s hand slips, clamping [target]'s trachea shut for a moment with \the [tool]!"), \ + span_danger("Your hand slips, clamping [user]'s trachea shut for a moment with \the [tool]!")) target.AdjustLosebreath(10) /////////////////////////////////////////////////////////////// @@ -107,19 +107,19 @@ return ..() && target.op_stage.face == 2 /datum/surgery_step/face/fix_face/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] starts pulling the skin on [target]'s face back in place with \the [tool].", \ - "You start pulling the skin on [target]'s face back in place with \the [tool].") + user.visible_message(span_filter_notice("[user] starts pulling the skin on [target]'s face back in place with \the [tool]."), \ + span_filter_notice("You start pulling the skin on [target]'s face back in place with \the [tool].")) ..() /datum/surgery_step/face/fix_face/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] pulls the skin on [target]'s face back in place with \the [tool].", \ - "You pull the skin on [target]'s face back in place with \the [tool].") + user.visible_message(span_notice("[user] pulls the skin on [target]'s face back in place with \the [tool]."), \ + span_notice("You pull the skin on [target]'s face back in place with \the [tool].")) target.op_stage.face = 3 /datum/surgery_step/face/fix_face/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, tearing skin on [target]'s face with \the [tool]!", \ - "Your hand slips, tearing skin on [target]'s face with \the [tool]!") + user.visible_message(span_danger("[user]'s hand slips, tearing skin on [target]'s face with \the [tool]!"), \ + span_danger("Your hand slips, tearing skin on [target]'s face with \the [tool]!")) target.apply_damage(10, BRUTE, affected, sharp = TRUE, sharp = TRUE) /////////////////////////////////////////////////////////////// @@ -142,14 +142,14 @@ return ..() && target.op_stage.face > 0 /datum/surgery_step/face/cauterize/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] is beginning to cauterize the incision on [target]'s face and neck with \the [tool]." , \ - "You are beginning to cauterize the incision on [target]'s face and neck with \the [tool].") + user.visible_message(span_notice("[user] is beginning to cauterize the incision on [target]'s face and neck with \the [tool].") , \ + span_notice("You are beginning to cauterize the incision on [target]'s face and neck with \the [tool].")) ..() /datum/surgery_step/face/cauterize/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] cauterizes the incision on [target]'s face and neck with \the [tool].", \ - "You cauterize the incision on [target]'s face and neck with \the [tool].") + user.visible_message(span_notice("[user] cauterizes the incision on [target]'s face and neck with \the [tool]."), \ + span_notice("You cauterize the incision on [target]'s face and neck with \the [tool].")) affected.open = 0 affected.status &= ~ORGAN_BLEEDING if (target.op_stage.face == 3) @@ -159,6 +159,6 @@ /datum/surgery_step/face/cauterize/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, leaving a small burn on [target]'s face with \the [tool]!", \ - "Your hand slips, leaving a small burn on [target]'s face with \the [tool]!") + user.visible_message(span_danger("[user]'s hand slips, leaving a small burn on [target]'s face with \the [tool]!"), \ + span_danger("Your hand slips, leaving a small burn on [target]'s face with \the [tool]!")) target.apply_damage(4, BURN, affected) diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index aedb52a349..4a5cea8ef2 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -47,15 +47,15 @@ /datum/surgery_step/generic/cut_open/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts the incision on [target]'s [affected.name] with \the [tool].", \ - "You start the incision on [target]'s [affected.name] with \the [tool].") + user.visible_message(span_filter_notice("[user] starts the incision on [target]'s [affected.name] with \the [tool]."), \ + span_filter_notice("You start the incision on [target]'s [affected.name] with \the [tool].")) target.custom_pain("You feel a horrible pain as if from a sharp knife in your [affected.name]!", 40) ..() /datum/surgery_step/generic/cut_open/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has made an incision on [target]'s [affected.name] with \the [tool].", \ - "You have made an incision on [target]'s [affected.name] with \the [tool].",) + user.visible_message(span_notice("[user] has made an incision on [target]'s [affected.name] with \the [tool]."), \ + span_notice("You have made an incision on [target]'s [affected.name] with \the [tool]."),) affected.open = 1 if(istype(target) && target.should_have_organ(O_HEART)) @@ -65,8 +65,8 @@ /datum/surgery_step/generic/cut_open/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, slicing open [target]'s [affected.name] in the wrong place with \the [tool]!", \ - "Your hand slips, slicing open [target]'s [affected.name] in the wrong place with \the [tool]!") + user.visible_message(span_danger("[user]'s hand slips, slicing open [target]'s [affected.name] in the wrong place with \the [tool]!"), \ + span_danger("Your hand slips, slicing open [target]'s [affected.name] in the wrong place with \the [tool]!")) affected.createwound(CUT, 10) /////////////////////////////////////////////////////////////// @@ -94,8 +94,8 @@ /datum/surgery_step/generic/cut_with_laser/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts the bloodless incision on [target]'s [affected.name] with \the [tool].", \ - "You start the bloodless incision on [target]'s [affected.name] with \the [tool].") + user.visible_message(span_filter_notice("[user] starts the bloodless incision on [target]'s [affected.name] with \the [tool]."), \ + span_filter_notice("You start the bloodless incision on [target]'s [affected.name] with \the [tool].")) target.custom_pain("You feel a horrible, searing pain in your [affected.name]!", 50) ..() @@ -113,19 +113,19 @@ clamp_chance = 95 if(clamp_chance) affected.organ_clamp() - user.visible_message("[user] has made a bloodless incision on [target]'s [affected.name] with \the [tool].", \ - "You have made a bloodless incision on [target]'s [affected.name] with \the [tool].",) + user.visible_message(span_notice("[user] has made a bloodless incision on [target]'s [affected.name] with \the [tool]."), \ + span_notice("You have made a bloodless incision on [target]'s [affected.name] with \the [tool]."),) else - user.visible_message("[user] has made an incision on [target]'s [affected.name] with \the [tool], but blood is still escaping from the wound.", \ - "You have made an incision on [target]'s [affected.name] with \the [tool], but blood is still coming from the wound..",) + user.visible_message(span_notice("[user] has made an incision on [target]'s [affected.name] with \the [tool], but blood is still escaping from the wound."), \ + span_notice("You have made an incision on [target]'s [affected.name] with \the [tool], but blood is still coming from the wound.."),) //Could be cleaner ... spread_germs_to_organ(affected, user) /datum/surgery_step/generic/cut_with_laser/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips as the blade sputters, searing a long gash in [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips as the blade sputters, searing a long gash in [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_danger("[user]'s hand slips as the blade sputters, searing a long gash in [target]'s [affected.name] with \the [tool]!"), \ + span_danger("Your hand slips as the blade sputters, searing a long gash in [target]'s [affected.name] with \the [tool]!")) affected.createwound(CUT, 7.5) affected.createwound(BURN, 12.5) @@ -152,15 +152,15 @@ /datum/surgery_step/generic/incision_manager/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts to construct a prepared incision on and within [target]'s [affected.name] with \the [tool].", \ - "You start to construct a prepared incision on and within [target]'s [affected.name] with \the [tool].") + user.visible_message(span_filter_notice("[user] starts to construct a prepared incision on and within [target]'s [affected.name] with \the [tool]."), \ + span_filter_notice("You start to construct a prepared incision on and within [target]'s [affected.name] with \the [tool].")) target.custom_pain("You feel a horrible, searing pain in your [affected.name] as it is pushed apart!", 50) ..() /datum/surgery_step/generic/incision_manager/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has constructed a prepared incision on and within [target]'s [affected.name] with \the [tool].", \ - "You have constructed a prepared incision on and within [target]'s [affected.name] with \the [tool].",) + user.visible_message(span_notice("[user] has constructed a prepared incision on and within [target]'s [affected.name] with \the [tool]."), \ + span_notice("You have constructed a prepared incision on and within [target]'s [affected.name] with \the [tool]."),) affected.open = 1 if(istype(target) && target.should_have_organ(O_HEART)) @@ -172,8 +172,8 @@ /datum/surgery_step/generic/incision_manager/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand jolts as the system sparks, ripping a gruesome hole in [target]'s [affected.name] with \the [tool]!", \ - "Your hand jolts as the system sparks, ripping a gruesome hole in [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_danger("[user]'s hand jolts as the system sparks, ripping a gruesome hole in [target]'s [affected.name] with \the [tool]!"), \ + span_danger("Your hand jolts as the system sparks, ripping a gruesome hole in [target]'s [affected.name] with \the [tool]!")) affected.createwound(CUT, 20) affected.createwound(BURN, 15) @@ -199,22 +199,22 @@ /datum/surgery_step/generic/clamp_bleeders/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts clamping bleeders in [target]'s [affected.name] with \the [tool].", \ - "You start clamping bleeders in [target]'s [affected.name] with \the [tool].") + user.visible_message(span_filter_notice("[user] starts clamping bleeders in [target]'s [affected.name] with \the [tool]."), \ + span_filter_notice("You start clamping bleeders in [target]'s [affected.name] with \the [tool].")) target.custom_pain("The pain in your [affected.name] is maddening!", 40) ..() /datum/surgery_step/generic/clamp_bleeders/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] clamps bleeders in [target]'s [affected.name] with \the [tool].", \ - "You clamp bleeders in [target]'s [affected.name] with \the [tool].") + user.visible_message(span_notice("[user] clamps bleeders in [target]'s [affected.name] with \the [tool]."), \ + span_notice("You clamp bleeders in [target]'s [affected.name] with \the [tool].")) affected.organ_clamp() spread_germs_to_organ(affected, user) /datum/surgery_step/generic/clamp_bleeders/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, tearing blood vessals and causing massive bleeding in [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips, tearing blood vessels and causing massive bleeding in [target]'s [affected.name] with \the [tool]!",) + user.visible_message(span_danger("[user]'s hand slips, tearing blood vessals and causing massive bleeding in [target]'s [affected.name] with \the [tool]!"), \ + span_danger("Your hand slips, tearing blood vessels and causing massive bleeding in [target]'s [affected.name] with \the [tool]!"),) affected.createwound(CUT, 10) /////////////////////////////////////////////////////////////// @@ -248,33 +248,33 @@ if (target_zone == BP_GROIN) msg = "[user] starts to pry open the incision and rearrange the organs in [target]'s lower abdomen with \the [tool]." self_msg = "You start to pry open the incision and rearrange the organs in [target]'s lower abdomen with \the [tool]." - user.visible_message("[msg]", "[self_msg]") + user.visible_message(span_filter_notice("[msg]"), span_filter_notice("[self_msg]")) target.custom_pain("It feels like the skin on your [affected.name] is on fire!", 40) ..() /datum/surgery_step/generic/retract_skin/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user] keeps the incision open on [target]'s [affected.name] with \the [tool]." - var/self_msg = "You keep the incision open on [target]'s [affected.name] with \the [tool]." + var/msg = span_notice("[user] keeps the incision open on [target]'s [affected.name] with \the [tool].") + var/self_msg = span_notice("You keep the incision open on [target]'s [affected.name] with \the [tool].") if (target_zone == BP_TORSO) - msg = "[user] keeps the ribcage open on [target]'s torso with \the [tool]." - self_msg = "You keep the ribcage open on [target]'s torso with \the [tool]." + msg = span_notice("[user] keeps the ribcage open on [target]'s torso with \the [tool].") + self_msg = span_notice("You keep the ribcage open on [target]'s torso with \the [tool].") if (target_zone == BP_GROIN) - msg = "[user] keeps the incision open on [target]'s lower abdomen with \the [tool]." - self_msg = "You keep the incision open on [target]'s lower abdomen with \the [tool]." + msg = span_notice("[user] keeps the incision open on [target]'s lower abdomen with \the [tool].") + self_msg = span_notice("You keep the incision open on [target]'s lower abdomen with \the [tool].") user.visible_message(msg, self_msg) affected.open = 2 /datum/surgery_step/generic/retract_skin/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "[user]'s hand slips, tearing the edges of the incision on [target]'s [affected.name] with \the [tool]!" - var/self_msg = "Your hand slips, tearing the edges of the incision on [target]'s [affected.name] with \the [tool]!" + var/msg = span_danger("[user]'s hand slips, tearing the edges of the incision on [target]'s [affected.name] with \the [tool]!") + var/self_msg = span_danger("Your hand slips, tearing the edges of the incision on [target]'s [affected.name] with \the [tool]!") if (target_zone == BP_TORSO) - msg = "[user]'s hand slips, damaging several organs in [target]'s torso with \the [tool]!" - self_msg = "Your hand slips, damaging several organs in [target]'s torso with \the [tool]!" + msg = span_danger("[user]'s hand slips, damaging several organs in [target]'s torso with \the [tool]!") + self_msg = span_danger("Your hand slips, damaging several organs in [target]'s torso with \the [tool]!") if (target_zone == BP_GROIN) - msg = "[user]'s hand slips, damaging several organs in [target]'s lower abdomen with \the [tool]!" - self_msg = "Your hand slips, damaging several organs in [target]'s lower abdomen with \the [tool]!" + msg = span_danger("[user]'s hand slips, damaging several organs in [target]'s lower abdomen with \the [tool]!") + self_msg = span_danger("Your hand slips, damaging several organs in [target]'s lower abdomen with \the [tool]!") user.visible_message(msg, self_msg) target.apply_damage(12, BRUTE, affected, sharp = TRUE) @@ -301,23 +301,23 @@ /datum/surgery_step/generic/cauterize/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] is beginning to cauterize the incision on [target]'s [affected.name] with \the [tool]." , \ - "You are beginning to cauterize the incision on [target]'s [affected.name] with \the [tool].") + user.visible_message(span_filter_notice("[user] is beginning to cauterize the incision on [target]'s [affected.name] with \the [tool].") , \ + span_filter_notice("You are beginning to cauterize the incision on [target]'s [affected.name] with \the [tool].")) target.custom_pain("Your [affected.name] is being burned!", 40) ..() /datum/surgery_step/generic/cauterize/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] cauterizes the incision on [target]'s [affected.name] with \the [tool].", \ - "You cauterize the incision on [target]'s [affected.name] with \the [tool].") + user.visible_message(span_notice("[user] cauterizes the incision on [target]'s [affected.name] with \the [tool]."), \ + span_notice("You cauterize the incision on [target]'s [affected.name] with \the [tool].")) affected.open = 0 affected.germ_level = 0 affected.status &= ~ORGAN_BLEEDING /datum/surgery_step/generic/cauterize/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_danger("[user]'s hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!"), \ + span_danger("Your hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!")) target.apply_damage(3, BURN, affected) /////////////////////////////////////////////////////////////// @@ -347,20 +347,20 @@ /datum/surgery_step/generic/amputate/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] is beginning to amputate [target]'s [affected.name] with \the [tool]." , \ - "You are beginning to cut through [target]'s [affected.amputation_point] with \the [tool].") + user.visible_message(span_filter_notice("[user] is beginning to amputate [target]'s [affected.name] with \the [tool].") , \ + span_filter_notice("You are beginning to cut through [target]'s [affected.amputation_point] with \the [tool].")) target.custom_pain("Your [affected.amputation_point] is being ripped apart!", 100) ..() /datum/surgery_step/generic/amputate/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] amputates [target]'s [affected.name] at the [affected.amputation_point] with \the [tool].", \ - "You amputate [target]'s [affected.name] with \the [tool].") + user.visible_message(span_notice("[user] amputates [target]'s [affected.name] at the [affected.amputation_point] with \the [tool]."), \ + span_notice("You amputate [target]'s [affected.name] with \the [tool].")) affected.droplimb(1,DROPLIMB_EDGE) /datum/surgery_step/generic/amputate/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, sawing through the bone in [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips, sawwing through the bone in [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_danger("[user]'s hand slips, sawing through the bone in [target]'s [affected.name] with \the [tool]!"), \ + span_danger("Your hand slips, sawwing through the bone in [target]'s [affected.name] with \the [tool]!")) affected.createwound(CUT, 30) affected.fracture() diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index 4455327862..305ee981e1 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -38,8 +38,8 @@ /datum/surgery_step/cavity/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_danger("[user]'s hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!"), \ + span_danger("Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!")) affected.createwound(CUT, 20) /////////////////////////////////////////////////////////////// @@ -64,16 +64,16 @@ /datum/surgery_step/cavity/make_space/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts making some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].", \ - "You start making some space inside [target]'s [get_cavity(affected)] cavity with \the [tool]." ) + user.visible_message(span_filter_notice("[user] starts making some space inside [target]'s [get_cavity(affected)] cavity with \the [tool]."), \ + span_filter_notice("You start making some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].") ) target.custom_pain("The pain in your chest is living hell!",1) affected.cavity = 1 ..() /datum/surgery_step/cavity/make_space/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) - user.visible_message("[user] makes some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].", \ - "You make some space inside [target]'s [get_cavity(affected)] cavity with \the [tool]." ) + user.visible_message(span_notice("[user] makes some space inside [target]'s [get_cavity(affected)] cavity with \the [tool]."), \ + span_notice("You make some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].") ) /////////////////////////////////////////////////////////////// // Cavity Closing Surgery @@ -99,16 +99,16 @@ /datum/surgery_step/cavity/close_space/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts mending [target]'s [get_cavity(affected)] cavity wall with \the [tool].", \ - "You start mending [target]'s [get_cavity(affected)] cavity wall with \the [tool]." ) + user.visible_message(span_filter_notice("[user] starts mending [target]'s [get_cavity(affected)] cavity wall with \the [tool]."), \ + span_filter_notice("You start mending [target]'s [get_cavity(affected)] cavity wall with \the [tool].") ) target.custom_pain("The pain in your chest is living hell!",1) affected.cavity = 0 ..() /datum/surgery_step/cavity/close_space/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) - user.visible_message("[user] mends [target]'s [get_cavity(affected)] cavity walls with \the [tool].", \ - " You mend[target]'s [get_cavity(affected)] cavity walls with \the [tool]." ) + user.visible_message(span_notice("[user] mends [target]'s [get_cavity(affected)] cavity walls with \the [tool]."), \ + span_notice(" You mend[target]'s [get_cavity(affected)] cavity walls with \the [tool].") ) /////////////////////////////////////////////////////////////// // Item Implantation Surgery @@ -149,8 +149,8 @@ if(isrobot(user) && istype(tool, /obj/item/gripper)) var/obj/item/gripper/G = tool tool = G.wrapped - user.visible_message("[user] starts putting \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ - "You start putting \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) //Nobody will probably ever see this, but I made these two blue. ~CK + user.visible_message(span_notice("[user] starts putting \the [tool] inside [target]'s [get_cavity(affected)] cavity."), \ + span_notice("You start putting \the [tool] inside [target]'s [get_cavity(affected)] cavity.") ) //Nobody will probably ever see this, but I made these two blue. ~CK target.custom_pain("The pain in your chest is living hell!",1) ..() @@ -162,10 +162,10 @@ G.drop_item() else user.drop_item() - user.visible_message("[user] puts \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ - "You put \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) + user.visible_message(span_notice("[user] puts \the [tool] inside [target]'s [get_cavity(affected)] cavity."), \ + span_notice("You put \the [tool] inside [target]'s [get_cavity(affected)] cavity.") ) if (tool.w_class > get_max_wclass(affected)/2 && prob(50) && (affected.robotic < ORGAN_ROBOT)) - to_chat(user, " You tear some blood vessels trying to fit such a big object in this cavity.") + to_chat(user, span_danger(" You tear some blood vessels trying to fit such a big object in this cavity.")) var/datum/wound/internal_bleeding/I = new (10) affected.wounds += I affected.owner.custom_pain("You feel something rip in your [affected.name]!", 1) @@ -200,8 +200,8 @@ /datum/surgery_step/cavity/implant_removal/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts poking around inside [target]'s [affected.name] with \the [tool].", \ - "You start poking around inside [target]'s [affected.name] with \the [tool]." ) + user.visible_message(span_notice("[user] starts poking around inside [target]'s [affected.name] with \the [tool]."), \ + span_notice("You start poking around inside [target]'s [affected.name] with \the [tool].") ) target.custom_pain("The pain in your [affected.name] is living hell!",1) ..() @@ -212,28 +212,28 @@ var/obj/item/obj = tgui_input_list(user, "Which embedded item do you wish to remove?", "Surgery Select", affected.implants) if(isnull(obj)) //They clicked cancel. - user.visible_message("[user] takes \the [tool] out of [target]'s [affected.name].", \ - "You take \the [tool] out of the incision on [target]'s [affected.name]." ) + user.visible_message(span_notice("[user] takes \the [tool] out of [target]'s [affected.name]."), \ + span_notice("You take \the [tool] out of the incision on [target]'s [affected.name].") ) return if(!do_mob(user, target, 1)) //They moved away - to_chat(user, "You must remain close to and keep focused on your patient to conduct surgery.") - user.visible_message("[user] fails to remove anything from [target]'s [affected.name] with \the [tool]!", \ - "You fail to remove the [obj] from [target]'s [affected.name]s with \the [tool]!" ) + to_chat(user, span_warning("You must remain close to and keep focused on your patient to conduct surgery.")) + user.visible_message(span_notice("[user] fails to remove anything from [target]'s [affected.name] with \the [tool]!"), \ + span_notice("You fail to remove the [obj] from [target]'s [affected.name]s with \the [tool]!") ) return if(istype(obj,/obj/item/implant)) var/obj/item/implant/imp = obj if (!imp.islegal()) //ILLEGAL IMPLANT ALERT!!!!!!!!!! - user.visible_message("[user] seems to be intently working on something within [target]'s [affected.name] with \the [tool]!", \ - "You intently begin to take [obj] out of the incision on [target]'s [affected.name]s with \the [tool]!" ) + user.visible_message(span_notice("[user] seems to be intently working on something within [target]'s [affected.name] with \the [tool]!"), \ + span_notice("You intently begin to take [obj] out of the incision on [target]'s [affected.name]s with \the [tool]!") ) if(!do_after(user, min_duration, target)) - user.visible_message("[user] fails to remove anything from [target]'s [affected.name] with \the [tool]!", \ - "You fail to remove the [obj] from [target]'s [affected.name]s with \the [tool]!" ) + user.visible_message(span_notice("[user] fails to remove anything from [target]'s [affected.name] with \the [tool]!"), \ + span_notice("You fail to remove the [obj] from [target]'s [affected.name]s with \the [tool]!") ) return - user.visible_message("[user] takes something out of the incision on [target]'s [affected.name] with \the [tool]!", \ - "You take [obj] out of the incision on [target]'s [affected.name]s with \the [tool]!" ) + user.visible_message(span_notice("[user] takes something out of the incision on [target]'s [affected.name] with \the [tool]!"), \ + span_notice("You take [obj] out of the incision on [target]'s [affected.name]s with \the [tool]!") ) affected.implants -= obj if(!target.has_embedded_objects()) target.clear_alert("embeddedobject") @@ -257,8 +257,8 @@ imp.implanted = 0 else if(istype(tool,/obj/item/nif)){var/obj/item/nif/N = tool;N.unimplant(target)} //VOREStation Add - NIF support else - user.visible_message("[user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out.", \ - "You could not find anything inside [target]'s [affected.name]." ) + user.visible_message(span_notice("[user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out."), \ + span_notice("You could not find anything inside [target]'s [affected.name].") ) /datum/surgery_step/cavity/implant_removal/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) ..() @@ -268,7 +268,7 @@ fail_prob += 100 - tool_quality(tool) if (prob(fail_prob)) var/obj/item/implant/imp = affected.implants[1] - user.visible_message(" Something beeps inside [target]'s [affected.name]!") + user.visible_message(span_danger(" Something beeps inside [target]'s [affected.name]!")) playsound(imp, 'sound/items/countdown.ogg', 75, 1, -3) spawn(25) imp.activate() diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm index 8b9b18bb0c..3b0a13310a 100644 --- a/code/modules/surgery/limb_reattach.dm +++ b/code/modules/surgery/limb_reattach.dm @@ -36,29 +36,29 @@ var/obj/item/organ/external/P = target.organs_by_name[E.parent_organ] var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected) - to_chat(user, "Something is in the way! You can't attach [E] here!") + to_chat(user, span_warning("Something is in the way! You can't attach [E] here!")) return 0 if(!P) - to_chat(user, "There's nothing to attach [E] to!") + to_chat(user, span_warning("There's nothing to attach [E] to!")) return 0 else if((P.robotic >= ORGAN_ROBOT) && (E.robotic < ORGAN_ROBOT)) - to_chat(user, "Attaching [E] to [P] wouldn't work well.") + to_chat(user, span_warning("Attaching [E] to [P] wouldn't work well.")) return 0 else if(istype(E, /obj/item/organ/external/head) && E.robotic >= ORGAN_ROBOT && P.robotic < ORGAN_ROBOT) - to_chat(user, "Attaching [E] to [P] might break [E].") + to_chat(user, span_warning("Attaching [E] to [P] might break [E].")) return 0 else return 1 /datum/surgery_step/limb/attach/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/E = tool - user.visible_message("[user] starts attaching [E.name] to [target]'s [E.amputation_point].", \ - "You start attaching [E.name] to [target]'s [E.amputation_point].") + user.visible_message(span_filter_notice("[user] starts attaching [E.name] to [target]'s [E.amputation_point]."), \ + span_filter_notice("You start attaching [E.name] to [target]'s [E.amputation_point].")) /datum/surgery_step/limb/attach/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/E = tool - user.visible_message("[user] has attached [target]'s [E.name] to the [E.amputation_point].", \ - "You have attached [target]'s [E.name] to the [E.amputation_point].") + user.visible_message(span_notice("[user] has attached [target]'s [E.name] to the [E.amputation_point]."), \ + span_notice("You have attached [target]'s [E.name] to the [E.amputation_point].")) user.drop_from_inventory(E) E.replaced(target) @@ -74,8 +74,8 @@ /datum/surgery_step/limb/attach/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/E = tool - user.visible_message(" [user]'s hand slips, damaging [target]'s [E.amputation_point]!", \ - " Your hand slips, damaging [target]'s [E.amputation_point]!") + user.visible_message(span_warning(" [user]'s hand slips, damaging [target]'s [E.amputation_point]!"), \ + span_warning(" Your hand slips, damaging [target]'s [E.amputation_point]!")) target.apply_damage(10, BRUTE, null, sharp = TRUE) /////////////////////////////////////////////////////////////// @@ -100,13 +100,13 @@ /datum/surgery_step/limb/connect/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/E = target.get_organ(target_zone) - user.visible_message("[user] starts connecting tendons and muscles in [target]'s [E.amputation_point] with [tool].", \ - "You start connecting tendons and muscle in [target]'s [E.amputation_point].") + user.visible_message(span_filter_notice("[user] starts connecting tendons and muscles in [target]'s [E.amputation_point] with [tool]."), \ + span_filter_notice("You start connecting tendons and muscle in [target]'s [E.amputation_point].")) /datum/surgery_step/limb/connect/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/E = target.get_organ(target_zone) - user.visible_message("[user] has connected tendons and muscles in [target]'s [E.amputation_point] with [tool].", \ - "You have connected tendons and muscles in [target]'s [E.amputation_point] with [tool].") + user.visible_message(span_notice("[user] has connected tendons and muscles in [target]'s [E.amputation_point] with [tool]."), \ + span_notice("You have connected tendons and muscles in [target]'s [E.amputation_point] with [tool].")) E.status &= ~ORGAN_CUT_AWAY target.update_icons_body() target.updatehealth() @@ -114,8 +114,8 @@ /datum/surgery_step/limb/connect/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/E = tool - user.visible_message(" [user]'s hand slips, damaging [target]'s [E.amputation_point]!", \ - " Your hand slips, damaging [target]'s [E.amputation_point]!") + user.visible_message(span_warning(" [user]'s hand slips, damaging [target]'s [E.amputation_point]!"), \ + span_warning(" Your hand slips, damaging [target]'s [E.amputation_point]!")) target.apply_damage(10, BRUTE, null, sharp = TRUE) /////////////////////////////////////////////////////////////// @@ -138,13 +138,13 @@ return isnull(target.get_organ(target_zone)) /datum/surgery_step/limb/mechanize/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] starts attaching \the [tool] to [target].", \ - "You start attaching \the [tool] to [target].") + user.visible_message(span_filter_notice("[user] starts attaching \the [tool] to [target]."), \ + span_filter_notice("You start attaching \the [tool] to [target].")) /datum/surgery_step/limb/mechanize/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/robot_parts/L = tool - user.visible_message("[user] has attached \the [tool] to [target].", \ - "You have attached \the [tool] to [target].") + user.visible_message(span_notice("[user] has attached \the [tool] to [target]."), \ + span_notice("You have attached \the [tool] to [target].")) if(L.part) for(var/part_name in L.part) @@ -166,6 +166,6 @@ qdel(tool) /datum/surgery_step/limb/mechanize/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message(" [user]'s hand slips, damaging [target]'s flesh!", \ - " Your hand slips, damaging [target]'s flesh!") + user.visible_message(span_warning(" [user]'s hand slips, damaging [target]'s flesh!"), \ + span_warning(" Your hand slips, damaging [target]'s flesh!")) target.apply_damage(10, BRUTE, null, sharp = TRUE) diff --git a/code/modules/surgery/neck.dm b/code/modules/surgery/neck.dm index c9fe45e9b1..17261d9f36 100644 --- a/code/modules/surgery/neck.dm +++ b/code/modules/surgery/neck.dm @@ -38,19 +38,19 @@ return ..() && target_zone == BP_HEAD && target.op_stage.brainstem == 0 /datum/surgery_step/brainstem/mend_vessels/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] starts to mend the blood vessels on [target]'s brainstem with \the [tool].", \ - "You start to mend the blood vessels on [target]'s brainstem with \the [tool].") + user.visible_message(span_filter_notice("[user] starts to mend the blood vessels on [target]'s brainstem with \the [tool]."), \ + span_filter_notice("You start to mend the blood vessels on [target]'s brainstem with \the [tool].")) ..() /datum/surgery_step/brainstem/mend_vessels/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has mended the blood vessels on [target]'s brainstem with \the [tool]." , \ - " You have mended the blood vessels on [target]'s brainstem with \the [tool].",) + user.visible_message(span_notice("[user] has mended the blood vessels on [target]'s brainstem with \the [tool].") , \ + span_notice(" You have mended the blood vessels on [target]'s brainstem with \the [tool]."),) target.op_stage.brainstem = 1 /datum/surgery_step/brainstem/mend_vessels/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, tearing at [target]'s brainstem with \the [tool]!" , \ - "Your hand slips, tearing at [target]'s brainstem with \the [tool]!" ) + user.visible_message(span_danger("[user]'s hand slips, tearing at [target]'s brainstem with \the [tool]!") , \ + span_danger("Your hand slips, tearing at [target]'s brainstem with \the [tool]!") ) affected.createwound(PIERCE, 10) target.AdjustParalysis(10) @@ -76,22 +76,22 @@ return ..() && target_zone == BP_HEAD && target.op_stage.brainstem == 1 /datum/surgery_step/brainstem/drill_vertebrae/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] starts to drill around [target]'s brainstem with \the [tool].", \ - "You start to drill around [target]'s brainstem with \the [tool].") + user.visible_message(span_filter_notice("[user] starts to drill around [target]'s brainstem with \the [tool]."), \ + span_filter_notice("You start to drill around [target]'s brainstem with \the [tool].")) ..() /datum/surgery_step/brainstem/drill_vertebrae/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has drilled around [target]'s brainstem with \the [tool]." , \ - " You have drilled around [target]'s brainstem with \the [tool].",) + user.visible_message(span_notice("[user] has drilled around [target]'s brainstem with \the [tool].") , \ + span_notice(" You have drilled around [target]'s brainstem with \the [tool]."),) target.AdjustParalysis(10) //We're getting Invasive here. This only ticks down when the person is alive, so it's a good side-effect for this step. Rattling the braincase with a drill is not optimal. target.op_stage.brainstem = 2 affected.fracture() //Does not apply damage, simply breaks it if it wasn't already. Doesn't stop a defib on its own. /datum/surgery_step/brainstem/drill_vertebrae/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, shredding [target]'s brainstem with \the [tool]!" , \ - "Your hand slips, shredding [target]'s brainstem with \the [tool]!" ) + user.visible_message(span_danger("[user]'s hand slips, shredding [target]'s brainstem with \the [tool]!") , \ + span_danger("Your hand slips, shredding [target]'s brainstem with \the [tool]!") ) affected.createwound(PIERCE, 10) target.AdjustParalysis(15) spawn() @@ -118,20 +118,20 @@ return ..() && target_zone == BP_HEAD && target.op_stage.brainstem == 2 /datum/surgery_step/brainstem/clean_chips/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] starts to pick around [target]'s brainstem for bone chips with \the [tool].", \ - "You start to pick around [target]'s brainstem for bone chips with \the [tool].") + user.visible_message(span_filter_notice("[user] starts to pick around [target]'s brainstem for bone chips with \the [tool]."), \ + span_filter_notice("You start to pick around [target]'s brainstem for bone chips with \the [tool].")) ..() /datum/surgery_step/brainstem/clean_chips/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has cleaned around [target]'s brainstem with \the [tool]." , \ - " You have cleaned around [target]'s brainstem with \the [tool].",) + user.visible_message(span_notice("[user] has cleaned around [target]'s brainstem with \the [tool].") , \ + span_notice(" You have cleaned around [target]'s brainstem with \the [tool]."),) target.AdjustParalysis(10) //Still invasive. target.op_stage.brainstem = 3 /datum/surgery_step/brainstem/clean_chips/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, gouging [target]'s brainstem with \the [tool]!" , \ - "Your hand slips, gouging [target]'s brainstem with \the [tool]!" ) + user.visible_message(span_danger("[user]'s hand slips, gouging [target]'s brainstem with \the [tool]!") , \ + span_danger("Your hand slips, gouging [target]'s brainstem with \the [tool]!") ) affected.createwound(CUT, 5) target.AdjustParalysis(10) spawn() @@ -158,21 +158,21 @@ return ..() && target_zone == BP_HEAD && target.op_stage.brainstem == 3 /datum/surgery_step/brainstem/mend_cord/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] starts to fuse [target]'s spinal cord with \the [tool].", \ - "You start to fuse [target]'s spinal cord with \the [tool].") + user.visible_message(span_filter_notice("[user] starts to fuse [target]'s spinal cord with \the [tool]."), \ + span_filter_notice("You start to fuse [target]'s spinal cord with \the [tool].")) ..() /datum/surgery_step/brainstem/mend_cord/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has fused [target]'s spinal cord with \the [tool]." , \ - " You have fused [target]'s spinal cord with \the [tool].",) + user.visible_message(span_notice("[user] has fused [target]'s spinal cord with \the [tool].") , \ + span_notice(" You have fused [target]'s spinal cord with \the [tool]."),) target.op_stage.brainstem = 4 target.AdjustParalysis(5) target.add_modifier(/datum/modifier/franken_sickness, 20 MINUTES) /datum/surgery_step/brainstem/mend_cord/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, tearing at [target]'s spinal cord with \the [tool]!" , \ - "Your hand slips, tearing at [target]'s spinal cord with \the [tool]!" ) + user.visible_message(span_danger("[user]'s hand slips, tearing at [target]'s spinal cord with \the [tool]!") , \ + span_danger("Your hand slips, tearing at [target]'s spinal cord with \the [tool]!") ) affected.createwound(PIERCE, 5) target.AdjustParalysis(20) spawn() @@ -198,20 +198,20 @@ return ..() && target_zone == BP_HEAD && target.op_stage.brainstem == 4 /datum/surgery_step/brainstem/mend_vertebrae/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] starts to mend [target]'s opened vertebrae with \the [tool].", \ - "You start to mend [target]'s opened vertebrae with \the [tool].") + user.visible_message(span_filter_notice("[user] starts to mend [target]'s opened vertebrae with \the [tool]."), \ + span_filter_notice("You start to mend [target]'s opened vertebrae with \the [tool].")) ..() /datum/surgery_step/brainstem/mend_vertebrae/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has mended [target]'s vertebrae with \the [tool]." , \ - " You have mended [target]'s vertebrae with \the [tool].",) + user.visible_message(span_notice("[user] has mended [target]'s vertebrae with \the [tool].") , \ + span_notice(" You have mended [target]'s vertebrae with \the [tool]."),) target.can_defib = 1 target.op_stage.brainstem = 5 /datum/surgery_step/brainstem/mend_vertebrae/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, tearing at [target]'s spinal cord with \the [tool]!" , \ - "Your hand slips, tearing at [target]'s spinal cord with \the [tool]!" ) + user.visible_message(span_danger("[user]'s hand slips, tearing at [target]'s spinal cord with \the [tool]!") , \ + span_danger("Your hand slips, tearing at [target]'s spinal cord with \the [tool]!") ) affected.createwound(PIERCE, 5) target.AdjustParalysis(15) spawn() @@ -238,20 +238,20 @@ return ..() && target_zone == BP_HEAD && target.op_stage.brainstem == 5 /datum/surgery_step/brainstem/realign_tissue/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] starts to realign the tissues in [target]'s skull with \the [tool].", \ - "You start to realign the tissues in [target]'s skull with \the [tool].") + user.visible_message(span_filter_notice("[user] starts to realign the tissues in [target]'s skull with \the [tool]."), \ + span_filter_notice("You start to realign the tissues in [target]'s skull with \the [tool].")) ..() /datum/surgery_step/brainstem/realign_tissue/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has realigned the tissues in [target]'s skull back into place with \the [tool]." , \ - " You have realigned the tissues in [target]'s skull back into place with \the [tool].",) + user.visible_message(span_notice("[user] has realigned the tissues in [target]'s skull back into place with \the [tool].") , \ + span_notice(" You have realigned the tissues in [target]'s skull back into place with \the [tool]."),) target.AdjustParalysis(5) //I n v a s i v e target.op_stage.brainstem = 0 //The cycle begins anew. /datum/surgery_step/brainstem/realign_tissue/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, gouging [target]'s brainstem with \the [tool]!" , \ - "Your hand slips, gouging [target]'s brainstem with \the [tool]!" ) + user.visible_message(span_danger("[user]'s hand slips, gouging [target]'s brainstem with \the [tool]!") , \ + span_danger("Your hand slips, gouging [target]'s brainstem with \the [tool]!") ) affected.createwound(CUT, 5) target.AdjustParalysis(30) spawn() diff --git a/code/modules/surgery/organ_ripper_vr.dm b/code/modules/surgery/organ_ripper_vr.dm index 5d51c07e06..a0d89accb2 100644 --- a/code/modules/surgery/organ_ripper_vr.dm +++ b/code/modules/surgery/organ_ripper_vr.dm @@ -41,8 +41,8 @@ /datum/surgery_step/generic/ripper/tear_vessel/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has ripped [target]'s [affected] \the [tool], blood and viscera spraying everywhere!", \ - "You have ripped [target]'s [target.op_stage.current_organ] out with \the [tool], spraying blood all through the room!") + user.visible_message(span_notice("[user] has ripped [target]'s [affected] \the [tool], blood and viscera spraying everywhere!"), \ + span_notice("You have ripped [target]'s [target.op_stage.current_organ] out with \the [tool], spraying blood all through the room!")) var/datum/wound/internal_bleeding/I = new (30) //splurt. New severed artery. affected.wounds += I affected.owner.custom_pain("You feel something rip in your [affected.name]!", 1) @@ -52,8 +52,8 @@ /datum/surgery_step/generic/ripper/tear_vessel/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips, damaging [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_warning("[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!"), \ + span_warning("Your hand slips, damaging [target]'s [affected.name] with \the [tool]!")) affected.createwound(BRUISE, 20) //Only bruised...Sad. @@ -73,16 +73,16 @@ /datum/surgery_step/generic/ripper/break_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has destroyed the bones within [target]'s [affected] with \the [tool]", \ - "You have destroyed the bones in [target]'s [affected] with \the [tool]!") + user.visible_message(span_notice("[user] has destroyed the bones within [target]'s [affected] with \the [tool]"), \ + span_notice("You have destroyed the bones in [target]'s [affected] with \the [tool]!")) affected.fracture() affected.createwound(BRUISE, 20) target.emote("scream") //Hope you put them under... /datum/surgery_step/generic/ripper/tear_vessel/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips, damaging [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_warning("[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!"), \ + span_warning("Your hand slips, damaging [target]'s [affected.name] with \the [tool]!")) affected.createwound(BRUISE, 20) //Mutilate Organ @@ -119,7 +119,7 @@ var/organ_to_destroy = tgui_input_list(user, "Which organ do you want to mutilate?", "Organ Choice", removable_organs) if(!organ_to_destroy) //They decided to cancel. Let's slowly pull the tool back... - to_chat(user, "You decide against mutilating any organs.") + to_chat(user, span_warning("You decide against mutilating any organs.")) user.visible_message("[user] starts pulling their [tool] out from [target]'s [affected.name] with \the [tool].", \ "You start pulling your \the [tool] out of [target]'s [affected.name].") target.custom_pain("Someone's moving something around in your [affected.name]!", 100) @@ -134,13 +134,13 @@ /datum/surgery_step/generic/ripper/destroy_organ/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!target.op_stage.current_organ) - user.visible_message("[user] has pulled their \the [tool] from [target]'s [affected.name].", \ - "You have pulled your [tool] out from [target]'s [affected].") + user.visible_message(span_notice("[user] has pulled their \the [tool] from [target]'s [affected.name]."), \ + span_notice("You have pulled your [tool] out from [target]'s [affected].")) // Damage the organ! if(target.op_stage.current_organ) - user.visible_message("[user] has ripped [target]'s [target.op_stage.current_organ] out with \the [tool].", \ - "You have ripped [target]'s [target.op_stage.current_organ] out with \the [tool].") + user.visible_message(span_notice("[user] has ripped [target]'s [target.op_stage.current_organ] out with \the [tool]."), \ + span_notice("You have ripped [target]'s [target.op_stage.current_organ] out with \the [tool].")) var/obj/item/organ/O = target.internal_organs_by_name[target.op_stage.current_organ] if(O && istype(O)) O.take_damage(10) @@ -150,8 +150,8 @@ /datum/surgery_step/generic/ripper/destroy_organ/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips, damaging [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_warning("[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!"), \ + span_warning("Your hand slips, damaging [target]'s [affected.name] with \the [tool]!")) affected.createwound(BRUISE, 20) /////////////////////////////////////////////////////////////// @@ -198,7 +198,7 @@ var/organ_to_remove = tgui_input_list(user, "Which organ do you want to tear out?", "Organ Choice", removable_organs) if(!organ_to_remove) //They decided to cancel. Let's slowly pull the tool back... - to_chat(user, "You decide against ripping out any organs.") + to_chat(user, span_warning("You decide against ripping out any organs.")) user.visible_message("[user] starts pulling their [tool] out from [target]'s [affected.name] with \the [tool].", \ "You start pulling your \the [tool] out of [target]'s [affected.name].") target.custom_pain("Someone's moving something around in your [affected.name]!", 100) @@ -212,12 +212,12 @@ /datum/surgery_step/generic/ripper/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!target.op_stage.current_organ) - user.visible_message("[user] has pulled their \the [tool] from [target]'s [affected.name].", \ - "You have pulled your [tool] out from [target]'s [affected].") + user.visible_message(span_notice("[user] has pulled their \the [tool] from [target]'s [affected.name]."), \ + span_notice("You have pulled your [tool] out from [target]'s [affected].")) if(target.op_stage.current_organ) - user.visible_message("[user] has ripped [target]'s [target.op_stage.current_organ] out with \the [tool].", \ - "You have ripped [target]'s [target.op_stage.current_organ] out with \the [tool].") + user.visible_message(span_notice("[user] has ripped [target]'s [target.op_stage.current_organ] out with \the [tool]."), \ + span_notice("You have ripped [target]'s [target.op_stage.current_organ] out with \the [tool].")) var/obj/item/organ/O = target.internal_organs_by_name[target.op_stage.current_organ] if(O && istype(O)) O.removed(user) @@ -227,6 +227,6 @@ /datum/surgery_step/internal/rip_organ/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips, damaging [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_warning("[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!"), \ + span_warning("Your hand slips, damaging [target]'s [affected.name] with \the [tool]!")) affected.createwound(BRUISE, 20) diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index 37f8566176..119baabfcd 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -58,8 +58,8 @@ for(var/obj/item/organ/I in affected.internal_organs) if(I && (I.damage > 0 || I.status == ORGAN_DEAD)) if(!(I.robotic >= ORGAN_ROBOT)) - user.visible_message("[user] starts treating damage to [target]'s [I.name] with [tool_name].", \ - "You start treating damage to [target]'s [I.name] with [tool_name]." ) + user.visible_message(span_filter_notice("[user] starts treating damage to [target]'s [I.name] with [tool_name]."), \ + span_filter_notice("You start treating damage to [target]'s [I.name] with [tool_name].") ) target.custom_pain("The pain in your [affected.name] is living hell!", 100) ..() @@ -78,10 +78,10 @@ for(var/obj/item/organ/internal/I in affected.internal_organs) if(I && (I.damage > 0 || I.status == ORGAN_DEAD)) if(!(I.robotic >= ORGAN_ROBOT)) - user.visible_message("[user] treats damage to [target]'s [I.name] with [tool_name].", \ - "You treat damage to [target]'s [I.name] with [tool_name]." ) + user.visible_message(span_notice("[user] treats damage to [target]'s [I.name] with [tool_name]."), \ + span_notice("You treat damage to [target]'s [I.name] with [tool_name].") ) if(I.organ_tag == O_BRAIN && I.status == ORGAN_DEAD && target.can_defib == 0) //Let people know they still got more work to get the brain back into working order. - to_chat(user, "You fix their [I] but the neurological structure is still heavily damaged and in need of repair.") + to_chat(user, span_warning("You fix their [I] but the neurological structure is still heavily damaged and in need of repair.")) I.damage = 0 I.status = 0 if(I.organ_tag == O_EYES) @@ -94,8 +94,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, getting mess and tearing the inside of [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips, getting mess and tearing the inside of [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_warning("[user]'s hand slips, getting mess and tearing the inside of [target]'s [affected.name] with \the [tool]!"), \ + span_warning("Your hand slips, getting mess and tearing the inside of [target]'s [affected.name] with \the [tool]!")) var/dam_amt = 2 if (istype(tool, /obj/item/stack/medical/advanced/bruise_pack)) @@ -162,8 +162,8 @@ for(var/obj/item/organ/I in affected.internal_organs) if(I && I.damage > 0) if(I.robotic >= ORGAN_ROBOT) - user.visible_message("[user] repairs [target]'s [I.name] with [tool].", \ - "You repair [target]'s [I.name] with [tool]." ) + user.visible_message(span_notice("[user] repairs [target]'s [I.name] with [tool]."), \ + span_notice("You repair [target]'s [I.name] with [tool].") ) I.damage = 0 if(I.organ_tag == O_EYES) target.sdisabilities &= ~BLIND @@ -173,8 +173,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_warning("[user]'s hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!"), \ + span_warning("Your hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!")) target.adjustBruteLoss(5) @@ -233,14 +233,14 @@ /datum/surgery_step/internal/detatch_organ/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts to separate [target]'s [target.op_stage.current_organ] with \the [tool].", \ - "You start to separate [target]'s [target.op_stage.current_organ] with \the [tool]." ) + user.visible_message(span_filter_notice("[user] starts to separate [target]'s [target.op_stage.current_organ] with \the [tool]."), \ + span_filter_notice("You start to separate [target]'s [target.op_stage.current_organ] with \the [tool].") ) target.custom_pain("The pain in your [affected.name] is living hell!", 100) ..() /datum/surgery_step/internal/detatch_organ/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has separated [target]'s [target.op_stage.current_organ] with \the [tool]." , \ - "You have separated [target]'s [target.op_stage.current_organ] with \the [tool].") + user.visible_message(span_notice("[user] has separated [target]'s [target.op_stage.current_organ] with \the [tool].") , \ + span_notice("You have separated [target]'s [target.op_stage.current_organ] with \the [tool].")) var/obj/item/organ/I = target.internal_organs_by_name[target.op_stage.current_organ] if(I && istype(I)) @@ -248,8 +248,8 @@ /datum/surgery_step/internal/detatch_organ/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_warning("[user]'s hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!"), \ + span_warning("Your hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!")) affected.createwound(CUT, rand(30,50), 1) /////////////////////////////////////////////////////////////// @@ -297,27 +297,27 @@ var/organ_to_remove = tgui_input_list(user, "Which organ do you want to remove?", "Organ Choice", removable_organs) if(!organ_to_remove) //They chose cancel! - to_chat(user, "You decide against preparing any organs for removal.") - user.visible_message("[user] starts pulling \the [tool] from [target]'s [affected].", \ - "You start pulling \the [tool] from [target]'s [affected].") + to_chat(user, span_notice("You decide against preparing any organs for removal.")) + user.visible_message(span_filter_notice("[user] starts pulling \the [tool] from [target]'s [affected]."), \ + span_filter_notice("You start pulling \the [tool] from [target]'s [affected].")) target.op_stage.current_organ = organ_to_remove - user.visible_message("[user] starts removing [target]'s [target.op_stage.current_organ] with \the [tool].", \ - "You start removing [target]'s [target.op_stage.current_organ] with \the [tool].") + user.visible_message(span_filter_notice("[user] starts removing [target]'s [target.op_stage.current_organ] with \the [tool]."), \ + span_filter_notice("You start removing [target]'s [target.op_stage.current_organ] with \the [tool].")) target.custom_pain("Someone's ripping out your [target.op_stage.current_organ]!", 100) ..() /datum/surgery_step/internal/remove_organ/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!target.op_stage.current_organ) //They chose to remove their tool instead. - user.visible_message("[user] has removed \the [tool] from [target]'s [affected].", \ - "You have removed \the [tool] from [target]'s [affected].") + user.visible_message(span_notice("[user] has removed \the [tool] from [target]'s [affected]."), \ + span_notice("You have removed \the [tool] from [target]'s [affected].")) // Extract the organ! if(target.op_stage.current_organ) - user.visible_message("[user] has removed [target]'s [target.op_stage.current_organ] with \the [tool].", \ - "You have removed [target]'s [target.op_stage.current_organ] with \the [tool].") + user.visible_message(span_notice("[user] has removed [target]'s [target.op_stage.current_organ] with \the [tool]."), \ + span_notice("You have removed [target]'s [target.op_stage.current_organ] with \the [tool].")) var/obj/item/organ/O = target.internal_organs_by_name[target.op_stage.current_organ] if(O && istype(O)) O.removed(user) @@ -325,8 +325,8 @@ /datum/surgery_step/internal/remove_organ/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips, damaging [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_warning("[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!"), \ + span_warning("Your hand slips, damaging [target]'s [affected.name] with \the [tool]!")) affected.createwound(BRUISE, 20) /////////////////////////////////////////////////////////////// @@ -356,11 +356,11 @@ return 0 if((affected.robotic >= ORGAN_ROBOT) && !(O.robotic >= ORGAN_ROBOT)) - to_chat(user, "You cannot install a naked organ into a robotic body.") + to_chat(user, span_danger("You cannot install a naked organ into a robotic body.")) return SURGERY_FAILURE if(!target.species) - to_chat(user, "You have no idea what species this person is. Report this on the bug tracker.") + to_chat(user, span_danger("You have no idea what species this person is. Report this on the bug tracker.")) return SURGERY_FAILURE var/o_is = (O.gender == PLURAL) ? "are" : "is" @@ -368,43 +368,43 @@ var/o_do = (O.gender == PLURAL) ? "don't" : "doesn't" if(O.damage > (O.max_damage * 0.75)) - to_chat(user, "\The [O.organ_tag] [o_is] in no state to be transplanted.") + to_chat(user, span_warning("\The [O.organ_tag] [o_is] in no state to be transplanted.")) return SURGERY_FAILURE if(!target.internal_organs_by_name[O.organ_tag]) organ_missing = 1 else - to_chat(user, "\The [target] already has [o_a][O.organ_tag].") + to_chat(user, span_warning("\The [target] already has [o_a][O.organ_tag].")) return SURGERY_FAILURE if(O && affected.organ_tag == O.parent_organ) organ_compatible = 1 else - to_chat(user, "\The [O.organ_tag] [o_do] normally go in \the [affected.name].") + to_chat(user, span_warning("\The [O.organ_tag] [o_do] normally go in \the [affected.name].")) return SURGERY_FAILURE return ..() && organ_missing && organ_compatible /datum/surgery_step/internal/replace_organ/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts transplanting \the [tool] into [target]'s [affected.name].", \ - "You start transplanting \the [tool] into [target]'s [affected.name].") + user.visible_message(span_filter_notice("[user] starts transplanting \the [tool] into [target]'s [affected.name]."), \ + span_filter_notice("You start transplanting \the [tool] into [target]'s [affected.name].")) target.custom_pain("Someone's rooting around in your [affected.name]!", 100) ..() /datum/surgery_step/internal/replace_organ/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has transplanted \the [tool] into [target]'s [affected.name].", \ - "You have transplanted \the [tool] into [target]'s [affected.name].") + user.visible_message(span_notice("[user] has transplanted \the [tool] into [target]'s [affected.name]."), \ + span_notice("You have transplanted \the [tool] into [target]'s [affected.name].")) var/obj/item/organ/O = tool if(istype(O)) user.remove_from_mob(O) O.replaced(target,affected) /datum/surgery_step/internal/replace_organ/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user]'s hand slips, damaging \the [tool]!", \ - "Your hand slips, damaging \the [tool]!") + user.visible_message(span_warning("[user]'s hand slips, damaging \the [tool]!"), \ + span_warning("Your hand slips, damaging \the [tool]!")) var/obj/item/organ/I = tool if(istype(I)) I.take_damage(rand(3,5),0) @@ -446,14 +446,14 @@ return ..() /datum/surgery_step/internal/attach_organ/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] begins reattaching [target]'s [target.op_stage.current_organ] with \the [tool].", \ - "You start reattaching [target]'s [target.op_stage.current_organ] with \the [tool].") + user.visible_message(span_filter_notice("[user] begins reattaching [target]'s [target.op_stage.current_organ] with \the [tool]."), \ + span_filter_notice("You start reattaching [target]'s [target.op_stage.current_organ] with \the [tool].")) target.custom_pain("Someone's digging needles into your [target.op_stage.current_organ]!", 100) ..() /datum/surgery_step/internal/attach_organ/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has reattached [target]'s [target.op_stage.current_organ] with \the [tool]." , \ - "You have reattached [target]'s [target.op_stage.current_organ] with \the [tool].") + user.visible_message(span_notice("[user] has reattached [target]'s [target.op_stage.current_organ] with \the [tool].") , \ + span_notice("You have reattached [target]'s [target.op_stage.current_organ] with \the [tool].")) var/obj/item/organ/I = target.internal_organs_by_name[target.op_stage.current_organ] if(I && istype(I)) @@ -461,6 +461,6 @@ /datum/surgery_step/internal/attach_organ/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, damaging the flesh in [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips, damaging the flesh in [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_warning("[user]'s hand slips, damaging the flesh in [target]'s [affected.name] with \the [tool]!"), \ + span_warning("Your hand slips, damaging the flesh in [target]'s [affected.name] with \the [tool]!")) affected.createwound(BRUISE, 20) diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index 89dbce1f28..7b75f82277 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -37,15 +37,15 @@ /datum/surgery_step/fix_vein/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts patching the damaged vein in [target]'s [affected.name] with \the [tool]." , \ - "You start patching the damaged vein in [target]'s [affected.name] with \the [tool].") + user.visible_message(span_filter_notice("[user] starts patching the damaged vein in [target]'s [affected.name] with \the [tool].") , \ + span_filter_notice("You start patching the damaged vein in [target]'s [affected.name] with \the [tool].")) target.custom_pain("The pain in [affected.name] is unbearable!", 100) ..() /datum/surgery_step/fix_vein/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has patched the damaged vein in [target]'s [affected.name] with \the [tool].", \ - "You have patched the damaged vein in [target]'s [affected.name] with \the [tool].") + user.visible_message(span_notice("[user] has patched the damaged vein in [target]'s [affected.name] with \the [tool]."), \ + span_notice("You have patched the damaged vein in [target]'s [affected.name] with \the [tool].")) for(var/datum/wound/W in affected.wounds) if(W.internal) affected.wounds -= W @@ -54,8 +54,8 @@ /datum/surgery_step/fix_vein/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \ - "Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") + user.visible_message(span_danger("[user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") , \ + span_danger("Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!")) affected.take_damage(5, 0) /////////////////////////////////////////////////////////////// @@ -91,21 +91,21 @@ /datum/surgery_step/fix_dead_tissue/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts cutting away necrotic tissue in [target]'s [affected.name] with \the [tool]." , \ - "You start cutting away necrotic tissue in [target]'s [affected.name] with \the [tool].") + user.visible_message(span_filter_notice("[user] starts cutting away necrotic tissue in [target]'s [affected.name] with \the [tool].") , \ + span_filter_notice("You start cutting away necrotic tissue in [target]'s [affected.name] with \the [tool].")) target.custom_pain("The pain in [affected.name] is unbearable!", 100) ..() /datum/surgery_step/fix_dead_tissue/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has cut away necrotic tissue in [target]'s [affected.name] with \the [tool].", \ - "You have cut away necrotic tissue in [target]'s [affected.name] with \the [tool].") + user.visible_message(span_notice("[user] has cut away necrotic tissue in [target]'s [affected.name] with \the [tool]."), \ + span_notice("You have cut away necrotic tissue in [target]'s [affected.name] with \the [tool].")) affected.open = 3 /datum/surgery_step/fix_dead_tissue/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_danger("[user]'s hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!"), \ + span_danger("Your hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!")) affected.createwound(CUT, 20, 1) /////////////////////////////////////////////////////////////// @@ -149,8 +149,8 @@ /datum/surgery_step/treat_necrosis/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts applying medication to the affected tissue in [target]'s [affected.name] with \the [tool]." , \ - "You start applying medication to the affected tissue in [target]'s [affected.name] with \the [tool].") + user.visible_message(span_filter_notice("[user] starts applying medication to the affected tissue in [target]'s [affected.name] with \the [tool].") , \ + span_filter_notice("You start applying medication to the affected tissue in [target]'s [affected.name] with \the [tool].")) target.custom_pain("Something in your [affected.name] is causing you a lot of pain!", 50) ..() @@ -167,8 +167,8 @@ affected.status &= ~ORGAN_DEAD affected.owner.update_icons_body() - user.visible_message("[user] applies [trans] units of the solution to affected tissue in [target]'s [affected.name].", \ - "You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool].") + user.visible_message(span_notice("[user] applies [trans] units of the solution to affected tissue in [target]'s [affected.name]."), \ + span_notice("You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool].")) /datum/surgery_step/treat_necrosis/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -180,8 +180,8 @@ var/trans = container.reagents.trans_to_mob(target, container.amount_per_transfer_from_this, CHEM_BLOOD) - user.visible_message("[user]'s hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.name] with the [tool]!" , \ - "Your hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.name] with the [tool]!") + user.visible_message(span_danger("[user]'s hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.name] with the [tool]!") , \ + span_danger("Your hand slips, applying [trans] units of the solution to the wrong place in [target]'s [affected.name] with the [tool]!")) //no damage or anything, just wastes medicine @@ -219,8 +219,8 @@ rig = target.belt if(!istype(rig)) return - user.visible_message("[user] starts cutting through the support systems of \the [rig] on [target] with \the [tool]." , \ - "You start cutting through the support systems of \the [rig] on [target] with \the [tool].") + user.visible_message(span_filter_notice("[user] starts cutting through the support systems of \the [rig] on [target] with \the [tool].") , \ + span_filter_notice("You start cutting through the support systems of \the [rig] on [target] with \the [tool].")) ..() /datum/surgery_step/hardsuit/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -230,12 +230,12 @@ if(!istype(rig)) return rig.cut_suit() - user.visible_message("[user] has cut through the support systems of \the [rig] on [target] with \the [tool].", \ - "You have cut through the support systems of \the [rig] on [target] with \the [tool].") + user.visible_message(span_notice("[user] has cut through the support systems of \the [rig] on [target] with \the [tool]."), \ + span_notice("You have cut through the support systems of \the [rig] on [target] with \the [tool].")) /datum/surgery_step/hardsuit/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user]'s [tool] can't quite seem to get through the metal...", \ - "\The [tool] can't quite seem to get through the metal. It's weakening, though - try again.") + user.visible_message(span_danger("[user]'s [tool] can't quite seem to get through the metal..."), \ + span_danger("\The [tool] can't quite seem to get through the metal. It's weakening, though - try again.")) /////////////////////////////////////////// // De-Husking Surgery // @@ -272,20 +272,20 @@ return ..() && target.op_stage.dehusk == 0 /datum/surgery_step/dehusk/structinitial/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] begins to create a fleshy but rigid looking mesh over gaps in [target]'s flesh with \the [tool].", \ - "You begin to create a fleshy but rigid looking mesh over gaps in [target]'s flesh with \the [tool].") + user.visible_message(span_notice("[user] begins to create a fleshy but rigid looking mesh over gaps in [target]'s flesh with \the [tool]."), \ + span_notice("You begin to create a fleshy but rigid looking mesh over gaps in [target]'s flesh with \the [tool].")) ..() /datum/surgery_step/dehusk/structinitial/end_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] creates a fleshy but rigid looking mesh over gaps in [target]'s flesh with \the [tool].", \ - "You create a fleshy but rigid looking mesh over gaps in [target]'s flesh with \the [tool].") + user.visible_message(span_notice("[user] creates a fleshy but rigid looking mesh over gaps in [target]'s flesh with \the [tool]."), \ + span_notice("You create a fleshy but rigid looking mesh over gaps in [target]'s flesh with \the [tool].")) target.op_stage.dehusk = 1 ..() /datum/surgery_step/dehusk/structinitial/fail_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, and the mesh falls, with \the [tool] scraping [target]'s body.", \ - "Your hand slips, and the mesh falls, with \the [tool] scraping [target]'s body.") + user.visible_message(span_danger("[user]'s hand slips, and the mesh falls, with \the [tool] scraping [target]'s body."), \ + span_danger("Your hand slips, and the mesh falls, with \the [tool] scraping [target]'s body.")) affected.createwound(CUT, 15) affected.createwound(BRUISE, 10) ..() @@ -304,20 +304,20 @@ return ..() && target.op_stage.dehusk == 1 /datum/surgery_step/dehusk/relocateflesh/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] begins to relocate some of [target]'s flesh with \the [tool], using it to fill in gaps.", \ - "You begin to relocate some of [target]'s flesh with \the [tool], using it to fill in gaps.") + user.visible_message(span_notice("[user] begins to relocate some of [target]'s flesh with \the [tool], using it to fill in gaps."), \ + span_notice("You begin to relocate some of [target]'s flesh with \the [tool], using it to fill in gaps.")) ..() /datum/surgery_step/dehusk/relocateflesh/end_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] relocates some of [target]'s flesh with \the [tool], using it to fill in gaps.", \ - "You relocate some of [target]'s flesh with \the [tool], using it to fill in gaps.") + user.visible_message(span_notice("[user] relocates some of [target]'s flesh with \the [tool], using it to fill in gaps."), \ + span_notice("You relocate some of [target]'s flesh with \the [tool], using it to fill in gaps.")) target.op_stage.dehusk = 2 ..() /datum/surgery_step/dehusk/relocateflesh/fail_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] accidentally rips a massive chunk out of [target]'s flesh with \the [tool], causing massive damage.", \ - "You accidentally rip a massive chunk out of [target]'s flesh with \the [tool], causing massive damage.") + user.visible_message(span_danger("[user] accidentally rips a massive chunk out of [target]'s flesh with \the [tool], causing massive damage."), \ + span_danger("You accidentally rip a massive chunk out of [target]'s flesh with \the [tool], causing massive damage.")) affected.createwound(CUT, 25) affected.createwound(BRUISE, 10) ..() @@ -336,16 +336,16 @@ /datum/surgery_step/dehusk/structfinish/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) if(istype(tool,/obj/item/surgical/bioregen)) - user.visible_message("[user] begins to recreate blood vessels and fill in the gaps in [target]'s flesh with \the [tool].", \ - "You begin to recreate blood vessels and fill in the gaps in [target]'s flesh with \the [tool].") + user.visible_message(span_notice("[user] begins to recreate blood vessels and fill in the gaps in [target]'s flesh with \the [tool]."), \ + span_notice("You begin to recreate blood vessels and fill in the gaps in [target]'s flesh with \the [tool].")) else if(istype(tool,/obj/item/surgical/FixOVein)) - user.visible_message("[user] attempts to recreate blood vessels and fill in the gaps in [target]'s flesh with \the [tool].", \ - "You attempt to recreate blood vessels and fill in the gaps in [target]'s flesh with \the [tool].") + user.visible_message(span_notice("[user] attempts to recreate blood vessels and fill in the gaps in [target]'s flesh with \the [tool]."), \ + span_notice("You attempt to recreate blood vessels and fill in the gaps in [target]'s flesh with \the [tool].")) ..() /datum/surgery_step/dehusk/structfinish/end_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] finishes recreating the missing biological structures and filling in gaps in [target]'s flesh with \the [tool].", \ - "You finish recreating the missing biological structures and filling in gaps in [target]'s flesh with \the [tool].") + user.visible_message(span_notice("[user] finishes recreating the missing biological structures and filling in gaps in [target]'s flesh with \the [tool]."), \ + span_notice("You finish recreating the missing biological structures and filling in gaps in [target]'s flesh with \the [tool].")) target.op_stage.dehusk = 0 target.mutations.Remove(HUSK) target.status_flags &= ~DISFIGURED @@ -355,11 +355,11 @@ /datum/surgery_step/dehusk/structfinish/fail_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) if(istype(tool,/obj/item/surgical/bioregen)) - user.visible_message("[user]'s hand slips, causing \the [tool] to scrape [target]'s body.", \ - "Your hand slips, causing \the [tool] to scrape [target]'s body.") + user.visible_message(span_danger("[user]'s hand slips, causing \the [tool] to scrape [target]'s body."), \ + span_danger("Your hand slips, causing \the [tool] to scrape [target]'s body.")) else if(istype(tool,/obj/item/surgical/FixOVein)) - user.visible_message("[user] fails to finish the structure over the gaps in [target]'s flesh, doing more damage than good.", \ - "You fail to finish the structure over the gaps in [target]'s flesh, doing more damage than good.") + user.visible_message(span_danger("[user] fails to finish the structure over the gaps in [target]'s flesh, doing more damage than good."), \ + span_danger("You fail to finish the structure over the gaps in [target]'s flesh, doing more damage than good.")) affected.createwound(CUT, 15) affected.createwound(BRUISE, 10) ..() @@ -375,13 +375,13 @@ return ..() && target_zone == BP_TORSO && (target.toxloss > 25 || target.oxyloss > 25) /datum/surgery_step/internal/detoxify/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] begins to pull toxins from, and restore oxygen to [target]'s musculature and organs with \the [tool].", \ - "You begin to pull toxins from, and restore oxygen to [target]'s musculature and organs with \the [tool].") + user.visible_message(span_notice("[user] begins to pull toxins from, and restore oxygen to [target]'s musculature and organs with \the [tool]."), \ + span_notice("You begin to pull toxins from, and restore oxygen to [target]'s musculature and organs with \the [tool].")) ..() /datum/surgery_step/internal/detoxify/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] finishes pulling toxins from, and restoring oxygen to [target]'s musculature and organs with \the [tool].", \ - "You finish pulling toxins from, and restoring oxygen to [target]'s musculature and organs with \the [tool].") + user.visible_message(span_notice("[user] finishes pulling toxins from, and restoring oxygen to [target]'s musculature and organs with \the [tool]."), \ + span_notice("You finish pulling toxins from, and restoring oxygen to [target]'s musculature and organs with \the [tool].")) if(target.toxloss>25) target.adjustToxLoss(-20) if(target.oxyloss>25) @@ -390,8 +390,8 @@ /datum/surgery_step/internal/detoxify/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, failing to finish the surgery, and damaging [target] with \the [tool].", \ - "Your hand slips, failing to finish the surgery, and damaging [target] with \the [tool].") + user.visible_message(span_danger("[user]'s hand slips, failing to finish the surgery, and damaging [target] with \the [tool]."), \ + span_danger("Your hand slips, failing to finish the surgery, and damaging [target] with \the [tool].")) affected.createwound(CUT, 15) affected.createwound(BRUISE, 10) ..() diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index 0fe2e47895..40276dece2 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -50,20 +50,20 @@ /datum/surgery_step/robotics/unscrew_hatch/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts to unscrew the maintenance hatch on [target]'s [affected.name] with \the [tool].", \ - "You start to unscrew the maintenance hatch on [target]'s [affected.name] with \the [tool].") + user.visible_message(span_filter_notice("[user] starts to unscrew the maintenance hatch on [target]'s [affected.name] with \the [tool]."), \ + span_filter_notice("You start to unscrew the maintenance hatch on [target]'s [affected.name] with \the [tool].")) ..() /datum/surgery_step/robotics/unscrew_hatch/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has opened the maintenance hatch on [target]'s [affected.name] with \the [tool].", \ - "You have opened the maintenance hatch on [target]'s [affected.name] with \the [tool].",) + user.visible_message(span_notice("[user] has opened the maintenance hatch on [target]'s [affected.name] with \the [tool]."), \ + span_notice("You have opened the maintenance hatch on [target]'s [affected.name] with \the [tool]."),) affected.open = 1 /datum/surgery_step/robotics/unscrew_hatch/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s [tool.name] slips, failing to unscrew [target]'s [affected.name].", \ - "Your [tool] slips, failing to unscrew [target]'s [affected.name].") + user.visible_message(span_warning("[user]'s [tool.name] slips, failing to unscrew [target]'s [affected.name]."), \ + span_warning("Your [tool] slips, failing to unscrew [target]'s [affected.name].")) /////////////////////////////////////////////////////////////// // Open Hatch Surgery @@ -88,20 +88,20 @@ /datum/surgery_step/robotics/open_hatch/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts to pry open the maintenance hatch on [target]'s [affected.name] with \the [tool].", - "You start to pry open the maintenance hatch on [target]'s [affected.name] with \the [tool].") + user.visible_message(span_filter_notice("[user] starts to pry open the maintenance hatch on [target]'s [affected.name] with \the [tool]."), + span_filter_notice("You start to pry open the maintenance hatch on [target]'s [affected.name] with \the [tool].")) ..() /datum/surgery_step/robotics/open_hatch/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] opens the maintenance hatch on [target]'s [affected.name] with \the [tool].", \ - "You open the maintenance hatch on [target]'s [affected.name] with \the [tool].") + user.visible_message(span_notice("[user] opens the maintenance hatch on [target]'s [affected.name] with \the [tool]."), \ + span_notice("You open the maintenance hatch on [target]'s [affected.name] with \the [tool].")) affected.open = 3 /datum/surgery_step/robotics/open_hatch/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s [tool.name] slips, failing to open the hatch on [target]'s [affected.name].", - "Your [tool] slips, failing to open the hatch on [target]'s [affected.name].") + user.visible_message(span_warning("[user]'s [tool.name] slips, failing to open the hatch on [target]'s [affected.name]."), + span_warning("Your [tool] slips, failing to open the hatch on [target]'s [affected.name].")) /////////////////////////////////////////////////////////////// // Close Hatch Surgery @@ -126,21 +126,21 @@ /datum/surgery_step/robotics/close_hatch/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] begins to close and secure the hatch on [target]'s [affected.name] with \the [tool]." , \ - "You begin to close and secure the hatch on [target]'s [affected.name] with \the [tool].") + user.visible_message(span_filter_notice("[user] begins to close and secure the hatch on [target]'s [affected.name] with \the [tool].") , \ + span_filter_notice("You begin to close and secure the hatch on [target]'s [affected.name] with \the [tool].")) ..() /datum/surgery_step/robotics/close_hatch/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] closes and secures the hatch on [target]'s [affected.name] with \the [tool].", \ - "You close and secure the hatch on [target]'s [affected.name] with \the [tool].") + user.visible_message(span_notice("[user] closes and secures the hatch on [target]'s [affected.name] with \the [tool]."), \ + span_notice("You close and secure the hatch on [target]'s [affected.name] with \the [tool].")) affected.open = 0 affected.germ_level = 0 /datum/surgery_step/robotics/close_hatch/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s [tool.name] slips, failing to close the hatch on [target]'s [affected.name].", - "Your [tool.name] slips, failing to close the hatch on [target]'s [affected.name].") + user.visible_message(span_warning("[user]'s [tool.name] slips, failing to close the hatch on [target]'s [affected.name]."), + span_warning("Your [tool.name] slips, failing to close the hatch on [target]'s [affected.name].")) /////////////////////////////////////////////////////////////// // Brute Repair Surgery @@ -167,21 +167,21 @@ /datum/surgery_step/robotics/repair_brute/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] begins to patch damage to [target]'s [affected.name]'s support structure with \the [tool]." , \ - "You begin to patch damage to [target]'s [affected.name]'s support structure with \the [tool].") + user.visible_message(span_filter_notice("[user] begins to patch damage to [target]'s [affected.name]'s support structure with \the [tool].") , \ + span_filter_notice("You begin to patch damage to [target]'s [affected.name]'s support structure with \the [tool].")) ..() /datum/surgery_step/robotics/repair_brute/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] finishes patching damage to [target]'s [affected.name] with \the [tool].", \ - "You finish patching damage to [target]'s [affected.name] with \the [tool].") + user.visible_message(span_notice("[user] finishes patching damage to [target]'s [affected.name] with \the [tool]."), \ + span_notice("You finish patching damage to [target]'s [affected.name] with \the [tool].")) affected.heal_damage(rand(30,50),0,1,1) affected.disfigured = 0 /datum/surgery_step/robotics/repair_brute/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s [tool.name] slips, damaging the internal structure of [target]'s [affected.name].", - "Your [tool.name] slips, damaging the internal structure of [target]'s [affected.name].") + user.visible_message(span_warning("[user]'s [tool.name] slips, damaging the internal structure of [target]'s [affected.name]."), + span_warning("Your [tool.name] slips, damaging the internal structure of [target]'s [affected.name].")) target.apply_damage(rand(5,10), BURN, affected) /////////////////////////////////////////////////////////////// @@ -203,11 +203,11 @@ if(istype(tool, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = tool if(affected.burn_dam == 0) - to_chat(user, "There are no burnt wires here!") + to_chat(user, span_notice("There are no burnt wires here!")) return SURGERY_FAILURE else if(!C.can_use(5)) - to_chat(user, "You need at least five cable pieces to repair this part.") //usage amount made more consistent with regular cable repair + to_chat(user, span_danger("You need at least five cable pieces to repair this part.")) //usage amount made more consistent with regular cable repair return SURGERY_FAILURE else C.use(5) @@ -216,21 +216,21 @@ /datum/surgery_step/robotics/repair_burn/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] begins to splice new cabling into [target]'s [affected.name]." , \ - "You begin to splice new cabling into [target]'s [affected.name].") + user.visible_message(span_filter_notice("[user] begins to splice new cabling into [target]'s [affected.name].") , \ + span_filter_notice("You begin to splice new cabling into [target]'s [affected.name].")) ..() /datum/surgery_step/robotics/repair_burn/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] finishes splicing cable into [target]'s [affected.name].", \ - "You finishes splicing new cable into [target]'s [affected.name].") + user.visible_message(span_notice("[user] finishes splicing cable into [target]'s [affected.name]."), \ + span_notice("You finishes splicing new cable into [target]'s [affected.name].")) affected.heal_damage(0,rand(30,50),1,1) affected.disfigured = 0 /datum/surgery_step/robotics/repair_burn/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] causes a short circuit in [target]'s [affected.name]!", - "You cause a short circuit in [target]'s [affected.name]!") + user.visible_message(span_warning("[user] causes a short circuit in [target]'s [affected.name]!"), + span_warning("You cause a short circuit in [target]'s [affected.name]!")) target.apply_damage(rand(5,10), BURN, affected) /////////////////////////////////////////////////////////////// @@ -269,8 +269,8 @@ for(var/obj/item/organ/I in affected.internal_organs) if(I && I.damage > 0) if(I.robotic >= ORGAN_ROBOT) - user.visible_message("[user] starts mending the damage to [target]'s [I.name]'s mechanisms.", \ - "You start mending the damage to [target]'s [I.name]'s mechanisms." ) + user.visible_message(span_filter_notice("[user] starts mending the damage to [target]'s [I.name]'s mechanisms."), \ + span_filter_notice("You start mending the damage to [target]'s [I.name]'s mechanisms.") ) target.custom_pain("The pain in your [affected.name] is living hell!",1) ..() @@ -283,8 +283,8 @@ for(var/obj/item/organ/I in affected.internal_organs) if(I && I.damage > 0) if(I.robotic >= ORGAN_ROBOT) - user.visible_message("[user] repairs [target]'s [I.name] with [tool].", \ - "You repair [target]'s [I.name] with [tool]." ) + user.visible_message(span_notice("[user] repairs [target]'s [I.name] with [tool]."), \ + span_notice("You repair [target]'s [I.name] with [tool].") ) I.damage = 0 if(I.organ_tag == O_EYES) target.sdisabilities &= ~BLIND @@ -294,8 +294,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user]'s hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!", \ - "Your hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!") + user.visible_message(span_warning("[user]'s hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!"), \ + span_warning("Your hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!")) target.adjustToxLoss(5) affected.createwound(CUT, 5) @@ -345,17 +345,17 @@ var/organ_to_remove = tgui_input_list(user, "Which organ do you want to prepare for removal?", "Organ Choice", attached_organs) if(!organ_to_remove) //They chose cancel! - to_chat(user, "You decide against preparing any organs for removal.") + to_chat(user, span_notice("You decide against preparing any organs for removal.")) return target.op_stage.current_organ = organ_to_remove - user.visible_message("[user] starts to decouple [target]'s [target.op_stage.current_organ] with \the [tool].", \ - "You start to decouple [target]'s [target.op_stage.current_organ] with \the [tool]." ) + user.visible_message(span_filter_notice("[user] starts to decouple [target]'s [target.op_stage.current_organ] with \the [tool]."), \ + span_filter_notice("You start to decouple [target]'s [target.op_stage.current_organ] with \the [tool].") ) ..() /datum/surgery_step/robotics/detatch_organ_robotic/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has decoupled [target]'s [target.op_stage.current_organ] with \the [tool]." , \ - "You have decoupled [target]'s [target.op_stage.current_organ] with \the [tool].") + user.visible_message(span_notice("[user] has decoupled [target]'s [target.op_stage.current_organ] with \the [tool].") , \ + span_notice("You have decoupled [target]'s [target.op_stage.current_organ] with \the [tool].")) var/obj/item/organ/internal/I = target.internal_organs_by_name[target.op_stage.current_organ] if(I && istype(I)) @@ -363,8 +363,8 @@ target.op_stage.current_organ = null /datum/surgery_step/robotics/detatch_organ_robotic/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user]'s hand slips, disconnecting \the [tool].", \ - "Your hand slips, disconnecting \the [tool].") + user.visible_message(span_warning("[user]'s hand slips, disconnecting \the [tool]."), \ + span_warning("Your hand slips, disconnecting \the [tool].")) /////////////////////////////////////////////////////////////// // Robot Organ Attaching Surgery @@ -405,19 +405,19 @@ var/organ_to_replace = tgui_input_list(user, "Which organ do you want to reattach?", "Organ Choice", attachable_organs) if(!organ_to_replace) //They chose cancel! - to_chat(user, "You decide against reattaching any organs.") + to_chat(user, span_notice("You decide against reattaching any organs.")) return target.op_stage.current_organ = organ_to_replace - user.visible_message("[user] begins reattaching [target]'s [target.op_stage.current_organ] with \the [tool].", \ - "You start reattaching [target]'s [target.op_stage.current_organ] with \the [tool].") + user.visible_message(span_filter_notice("[user] begins reattaching [target]'s [target.op_stage.current_organ] with \the [tool]."), \ + span_filter_notice("You start reattaching [target]'s [target.op_stage.current_organ] with \the [tool].")) ..() /datum/surgery_step/robotics/attach_organ_robotic/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] has reattached [target]'s [target.op_stage.current_organ] with \the [tool]." , \ - "You have reattached [target]'s [target.op_stage.current_organ] with \the [tool].") + user.visible_message(span_notice("[user] has reattached [target]'s [target.op_stage.current_organ] with \the [tool].") , \ + span_notice("You have reattached [target]'s [target.op_stage.current_organ] with \the [tool].")) var/obj/item/organ/I = target.internal_organs_by_name[target.op_stage.current_organ] if(I && istype(I)) @@ -425,8 +425,8 @@ target.op_stage.current_organ = null /datum/surgery_step/robotics/attach_organ_robotic/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user]'s hand slips, disconnecting \the [tool].", \ - "Your hand slips, disconnecting \the [tool].") + user.visible_message(span_warning("[user]'s hand slips, disconnecting \the [tool]."), \ + span_warning("Your hand slips, disconnecting \the [tool].")) /////////////////////////////////////////////////////////////// // MMI Insertion Surgery @@ -455,34 +455,34 @@ /* VOREStation Edit - Don't worry about it. We can put these in regardless, because resleeving might make it useful after. if(!M.brainmob || !M.brainmob.client || !M.brainmob.ckey || M.brainmob.stat >= DEAD) - to_chat(user, "That brain is not usable.") + to_chat(user, span_danger("That brain is not usable.")) return SURGERY_FAILURE */ if(!(affected.robotic >= ORGAN_ROBOT)) - to_chat(user, "You cannot install a computer brain into a meat skull.") + to_chat(user, span_danger("You cannot install a computer brain into a meat skull.")) return SURGERY_FAILURE if(!target.should_have_organ("brain")) - to_chat(user, "You're pretty sure [target.species.name_plural] don't normally have a brain.") + to_chat(user, span_danger("You're pretty sure [target.species.name_plural] don't normally have a brain.")) return SURGERY_FAILURE if(!isnull(target.internal_organs["brain"])) - to_chat(user, "Your subject already has a brain.") + to_chat(user, span_danger("Your subject already has a brain.")) return SURGERY_FAILURE return 1 /datum/surgery_step/robotics/install_mmi/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts installing \the [tool] into [target]'s [affected.name].", \ - "You start installing \the [tool] into [target]'s [affected.name].") + user.visible_message(span_filter_notice("[user] starts installing \the [tool] into [target]'s [affected.name]."), \ + span_filter_notice("You start installing \the [tool] into [target]'s [affected.name].")) ..() /datum/surgery_step/robotics/install_mmi/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has installed \the [tool] into [target]'s [affected.name].", \ - "You have installed \the [tool] into [target]'s [affected.name].") + user.visible_message(span_notice("[user] has installed \the [tool] into [target]'s [affected.name]."), \ + span_notice("You have installed \the [tool] into [target]'s [affected.name].")) var/obj/item/mmi/M = tool // VOREstation edit begin - Select the proper mmi holder subtype based on the brain inserted @@ -522,8 +522,8 @@ target.real_name = target.name /datum/surgery_step/robotics/install_mmi/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user]'s hand slips.", \ - "Your hand slips.") + user.visible_message(span_warning("[user]'s hand slips."), \ + span_warning("Your hand slips.")) /* * Install a Diona Nymph into a Nymph Mech @@ -552,37 +552,37 @@ return 0 if(!N.held_mob.client || N.held_mob.stat >= DEAD) - to_chat(user, "That nymph is not viable.") + to_chat(user, span_danger("That nymph is not viable.")) return SURGERY_FAILURE if(!(affected.robotic >= ORGAN_ROBOT)) - to_chat(user, "You cannot install a nymph into a meat puppet.") + to_chat(user, span_danger("You cannot install a nymph into a meat puppet.")) return SURGERY_FAILURE if(!(affected.model != "Skrellian Exoskeleton")) - to_chat(user, "You're fairly certain a nymph can't pilot a normal robot.") + to_chat(user, span_danger("You're fairly certain a nymph can't pilot a normal robot.")) return SURGERY_FAILURE if(!target.should_have_organ("brain")) - to_chat(user, "You're pretty sure [target.species.name_plural] don't normally have a brain.") + to_chat(user, span_danger("You're pretty sure [target.species.name_plural] don't normally have a brain.")) return SURGERY_FAILURE if(!isnull(target.internal_organs["brain"])) - to_chat(user, "Your subject already has a cephalon.") + to_chat(user, span_danger("Your subject already has a cephalon.")) return SURGERY_FAILURE return 1 /datum/surgery_step/robotics/install_nymph/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts setting \the [tool] into [target]'s [affected.name].", \ - "You start setting \the [tool] into [target]'s [affected.name].") + user.visible_message(span_filter_notice("[user] starts setting \the [tool] into [target]'s [affected.name]."), \ + span_filter_notice("You start setting \the [tool] into [target]'s [affected.name].")) ..() /datum/surgery_step/robotics/install_nymph/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] has installed \the [tool] into [target]'s [affected.name].", \ - "You have installed \the [tool] into [target]'s [affected.name].") + user.visible_message(span_notice("[user] has installed \the [tool] into [target]'s [affected.name]."), \ + span_notice("You have installed \the [tool] into [target]'s [affected.name].")) var/obj/item/holder/diona/N = tool var/obj/item/organ/internal/brain/cephalon/cephalon = new(target, 1) @@ -616,5 +616,5 @@ target.real_name = target.name /datum/surgery_step/robotics/install_nymph/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user]'s hand slips.", \ - "Your hand slips.") + user.visible_message(span_warning("[user]'s hand slips."), \ + span_warning("Your hand slips.")) diff --git a/code/modules/surgery/slimes.dm b/code/modules/surgery/slimes.dm index 6b4dcee4cf..95071110b8 100644 --- a/code/modules/surgery/slimes.dm +++ b/code/modules/surgery/slimes.dm @@ -31,13 +31,13 @@ "You start cutting through [target]'s flesh with \the [tool].") /datum/surgery_step/slime/cut_flesh/end_step(mob/living/user, mob/living/simple_mob/slime/target, target_zone, obj/item/tool) - user.visible_message("[user] cuts through [target]'s flesh with \the [tool].", \ - "You cut through [target]'s flesh with \the [tool], revealing its silky innards.") + user.visible_message(span_notice("[user] cuts through [target]'s flesh with \the [tool]."), \ + span_notice("You cut through [target]'s flesh with \the [tool], revealing its silky innards.")) target.core_removal_stage = 1 /datum/surgery_step/slime/cut_flesh/fail_step(mob/living/user, mob/living/simple_mob/slime/target, target_zone, obj/item/tool) - user.visible_message("[user]'s hand slips, tearing [target]'s flesh with \the [tool]!", \ - "Your hand slips, tearing [target]'s flesh with \the [tool]!") + user.visible_message(span_danger("[user]'s hand slips, tearing [target]'s flesh with \the [tool]!"), \ + span_danger("Your hand slips, tearing [target]'s flesh with \the [tool]!")) @@ -60,13 +60,13 @@ "You start cutting [target]'s silky innards apart with \the [tool].") /datum/surgery_step/slime/cut_innards/end_step(mob/living/user, mob/living/simple_mob/slime/target, target_zone, obj/item/tool) - user.visible_message("[user] cuts [target]'s innards apart with \the [tool], exposing the cores.", \ - "You cut [target]'s innards apart with \the [tool], exposing the cores.") + user.visible_message(span_notice("[user] cuts [target]'s innards apart with \the [tool], exposing the cores."), \ + span_notice("You cut [target]'s innards apart with \the [tool], exposing the cores.")) target.core_removal_stage = 2 /datum/surgery_step/slime/cut_innards/fail_step(mob/living/user, mob/living/simple_mob/slime/target, target_zone, obj/item/tool) - user.visible_message("[user]'s hand slips, tearing [target]'s innards with \the [tool]!", \ - "Your hand slips, tearing [target]'s innards with \the [tool]!") + user.visible_message(span_danger("[user]'s hand slips, tearing [target]'s innards with \the [tool]!"), \ + span_danger("Your hand slips, tearing [target]'s innards with \the [tool]!")) @@ -89,8 +89,8 @@ /datum/surgery_step/slime/saw_core/end_step(mob/living/user, mob/living/simple_mob/slime/target, target_zone, obj/item/tool) target.cores-- - user.visible_message("[user] cuts out one of [target]'s cores with \the [tool].",, \ - "You cut out one of [target]'s cores with \the [tool]. [target.cores] cores left.") + user.visible_message(span_notice("[user] cuts out one of [target]'s cores with \the [tool]."),, \ + span_notice("You cut out one of [target]'s cores with \the [tool]. [target.cores] cores left.")) if(target.cores >= 0) new target.coretype(target.loc) @@ -100,5 +100,5 @@ /datum/surgery_step/slime/saw_core/fail_step(mob/living/user, mob/living/simple_mob/slime/target, target_zone, obj/item/tool) var/datum/gender/T = gender_datums[user.get_visible_gender()] - user.visible_message("[user]'s hand slips, causing [T.him] to miss the core!", \ - "Your hand slips, causing you to miss the core!") + user.visible_message(span_danger("[user]'s hand slips, causing [T.him] to miss the core!"), \ + span_danger("Your hand slips, causing you to miss the core!")) diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index 760aa561a4..64b0adbcc7 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -143,7 +143,7 @@ return 0 var/zone = user.zone_sel.selecting if(zone in M.op_stage.in_progress) //Can't operate on someone repeatedly. - to_chat(user, "You can't operate on this area while surgery is already in progress.") + to_chat(user, span_warning("You can't operate on this area while surgery is already in progress.")) return 1 var/obj/surface = M.get_surgery_surface(user) if(!surface || !surface.surgery_odds) // If the surface has a chance of 0% surgery odds (ground), don't even bother trying to do surgery. @@ -179,7 +179,7 @@ // All of this just to make it so you are forced to do bloodless surgery with a laser scalpel. if(M == user) // Once we determine if we can actually do a step at all, give a slight delay to self-surgery to confirm attempts. - to_chat(user, "You focus on attempting to perform surgery upon yourself.") + to_chat(user, span_critical("You focus on attempting to perform surgery upon yourself.")) if(!do_after(user, 3 SECONDS, M)) return 0 @@ -195,9 +195,9 @@ // VOREstation edit start if(istype(selected_surgery,/datum/surgery_step/generic/amputate)) var/obj/item/organ/external/affected = M.get_organ(zone) - to_chat(user, "You are preparing to amputate \the [M]'s [affected.name]!") + to_chat(user, span_danger("You are preparing to amputate \the [M]'s [affected.name]!")) if(!do_after(user, 3 SECONDS, M)) - to_chat(user, "You reconsider performing an amputation...") + to_chat(user, span_warning("You reconsider performing an amputation...")) return 0 // VOREstation edit end M.op_stage.in_progress += zone @@ -217,7 +217,7 @@ var/calc_duration = rand(selected_surgery.min_duration, selected_surgery.max_duration) if(!do_mob(user, M, calc_duration * toolspeed, zone, exclusive = TRUE)) success = FALSE - to_chat(user, "You must remain close to and keep focused on your patient to conduct surgery.") + to_chat(user, span_warning("You must remain close to and keep focused on your patient to conduct surgery.")) if(success) selected_surgery.end_step(user, M, zone, src) diff --git a/code/modules/tables/flipping.dm b/code/modules/tables/flipping.dm index 7602e7e583..29c1a69a9d 100644 --- a/code/modules/tables/flipping.dm +++ b/code/modules/tables/flipping.dm @@ -22,10 +22,10 @@ return if(flipped < 0 || !flip(get_cardinal_dir(usr,src))) - to_chat(usr, "It won't budge.") + to_chat(usr, span_notice("It won't budge.")) return - usr.visible_message("[usr] flips \the [src]!") + usr.visible_message(span_warning("[usr] flips \the [src]!")) if(climbable) structure_shaken() @@ -39,7 +39,7 @@ var/obj/occupied = turf_is_crowded() if(occupied) - to_chat(usr, "There's \a [occupied] in the way.") + to_chat(usr, span_filter_notice("There's \a [occupied] in the way.")) return 0 var/list/L = list() @@ -65,7 +65,7 @@ return if (!unflipping_check()) - to_chat(usr, "It won't budge.") + to_chat(usr, span_notice("It won't budge.")) return unflip() @@ -115,4 +115,4 @@ update_connections(1) update_icon() - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/tables/interactions.dm b/code/modules/tables/interactions.dm index 27055d72b3..4bf70d2411 100644 --- a/code/modules/tables/interactions.dm +++ b/code/modules/tables/interactions.dm @@ -52,10 +52,10 @@ if(prob(chance)) health -= P.damage/2 if (health > 0) - visible_message("[P] hits \the [src]!") + visible_message(span_warning("[P] hits \the [src]!")) return 0 else - visible_message("[src] breaks down!") + visible_message(span_warning("[src] breaks down!")) break_to_parts() return 1 return 1 @@ -96,7 +96,7 @@ var/mob/living/M = G.affecting var/obj/occupied = turf_is_crowded() if(occupied) - to_chat(user, "There's \a [occupied] in the way.") + to_chat(user, span_danger("There's \a [occupied] in the way.")) return if(!user.Adjacent(M)) return @@ -104,7 +104,7 @@ if(user.a_intent == I_HURT) if (prob(15)) M.Weaken(5) M.apply_damage(8,def_zone = BP_HEAD) - visible_message("[G.assailant] slams [G.affecting]'s face against \the [src]!") + visible_message(span_danger("[G.assailant] slams [G.affecting]'s face against \the [src]!")) if(material) playsound(src, material.tableslam_noise, 50, 1) else @@ -113,18 +113,18 @@ // Shards. Extra damage, plus potentially the fact YOU LITERALLY HAVE A PIECE OF GLASS/METAL/WHATEVER IN YOUR FACE for(var/obj/item/material/shard/S in L) if(prob(50)) - M.visible_message("\The [S] slices [M]'s face messily!", - "\The [S] slices your face messily!") + M.visible_message(span_danger("\The [S] slices [M]'s face messily!"), + span_danger("\The [S] slices your face messily!")) M.apply_damage(10, def_zone = BP_HEAD) if(prob(2)) M.embed(S, def_zone = BP_HEAD) else - to_chat(user, "You need a better grip to do that!") + to_chat(user, span_danger("You need a better grip to do that!")) return else if(G.state > GRAB_AGGRESSIVE || world.time >= (G.last_action + UPGRADE_COOLDOWN)) M.forceMove(get_turf(src)) M.Weaken(5) - visible_message("[G.assailant] puts [G.affecting] on \the [src].") + visible_message(span_danger("[G.assailant] puts [G.affecting] on \the [src].")) qdel(W) return @@ -141,17 +141,17 @@ spark_system.start() playsound(src, 'sound/weapons/blade1.ogg', 50, 1) playsound(src, "sparks", 50, 1) - user.visible_message("\The [src] was sliced apart by [user]!") + user.visible_message(span_danger("\The [src] was sliced apart by [user]!")) break_to_parts() return if(istype(W, /obj/item/melee/changeling/arm_blade)) - user.visible_message("\The [src] was sliced apart by [user]!") + user.visible_message(span_danger("\The [src] was sliced apart by [user]!")) break_to_parts() return if(can_plate && !material) - to_chat(user, "There's nothing to put \the [W] on! Try adding plating to \the [src] first.") + to_chat(user, span_warning("There's nothing to put \the [W] on! Try adding plating to \the [src] first.")) return // Placing stuff on tables diff --git a/code/modules/tables/presets.dm b/code/modules/tables/presets.dm index 31b99bb90d..22b67b1902 100644 --- a/code/modules/tables/presets.dm +++ b/code/modules/tables/presets.dm @@ -138,7 +138,7 @@ ..() /obj/structure/table/alien/dismantle(obj/item/tool/wrench/W, mob/user) - to_chat(user, "You cannot dismantle \the [src].") + to_chat(user, span_warning("You cannot dismantle \the [src].")) return //BENCH PRESETS @@ -246,4 +246,4 @@ /obj/structure/table/bench/wooden/holotable/New() material = get_material_by_name("holowood") ..() -*/ \ No newline at end of file +*/ diff --git a/code/modules/tables/presets_vr.dm b/code/modules/tables/presets_vr.dm index 54bbc62d86..6c098f314b 100644 --- a/code/modules/tables/presets_vr.dm +++ b/code/modules/tables/presets_vr.dm @@ -15,7 +15,7 @@ ..() /obj/structure/table/darkglass/dismantle(obj/item/tool/wrench/W, mob/user) - to_chat(user, "You cannot dismantle \the [src].") + to_chat(user, span_warning("You cannot dismantle \the [src].")) return /obj/structure/table/alien/blue icon = 'icons/turf/shuttle_alien_blue.dmi' @@ -38,7 +38,7 @@ ..() /obj/structure/table/fancyblack/dismantle(obj/item/tool/wrench/W, mob/user) - to_chat(user, "You cannot dismantle \the [src].") + to_chat(user, span_warning("You cannot dismantle \the [src].")) return /obj/structure/table/gold @@ -47,4 +47,4 @@ /obj/structure/table/gold/New() material = get_material_by_name(MAT_GOLD) - ..() \ No newline at end of file + ..() diff --git a/code/modules/tables/rack.dm b/code/modules/tables/rack.dm index 7b570e75da..349fc17223 100644 --- a/code/modules/tables/rack.dm +++ b/code/modules/tables/rack.dm @@ -24,5 +24,5 @@ return /obj/structure/table/rack/holorack/dismantle(obj/item/tool/wrench/W, mob/user) - to_chat(user, "You cannot dismantle \the [src].") + to_chat(user, span_warning("You cannot dismantle \the [src].")) return diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index b03b45c5ac..ad96dc3e6f 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -53,7 +53,7 @@ var/list/table_icon_cache = list() amount *= TABLE_BRITTLE_MATERIAL_MULTIPLIER health -= amount if(health <= 0) - visible_message("\The [src] breaks down!") + visible_message(span_warning("\The [src] breaks down!")) return break_to_parts() // if we break and form shards, return them to the caller to do !FUN! things with /obj/structure/table/blob_act() @@ -91,11 +91,11 @@ var/list/table_icon_cache = list() if(health < maxhealth) switch(health / maxhealth) if(0.0 to 0.5) - . += "It looks severely damaged!" + . += span_warning("It looks severely damaged!") if(0.25 to 0.5) - . += "It looks damaged!" + . += span_warning("It looks damaged!") if(0.5 to 1.0) - . += "It has a few scrapes and dents." + . += span_notice("It has a few scrapes and dents.") /obj/structure/table/attackby(obj/item/W, mob/user) @@ -109,7 +109,7 @@ var/list/table_icon_cache = list() if(carpeted && W.has_tool_quality(TOOL_CROWBAR)) user.visible_message("\The [user] removes the carpet from \the [src].", - "You remove the carpet from \the [src].") + span_notice("You remove the carpet from \the [src].")) new carpeted_type(loc) carpeted = 0 update_icon() @@ -119,13 +119,13 @@ var/list/table_icon_cache = list() var/obj/item/stack/tile/carpet/C = W if(C.use(1)) user.visible_message("\The [user] adds \the [C] to \the [src].", - "You add \the [C] to \the [src].") + span_notice("You add \the [C] to \the [src].")) carpeted = 1 carpeted_type = W.type update_icon() return 1 else - to_chat(user, "You don't have enough carpet!") + to_chat(user, span_warning("You don't have enough carpet!")) if(!reinforced && !carpeted && material && W.has_tool_quality(TOOL_WRENCH)) remove_material(W, user) @@ -145,12 +145,12 @@ var/list/table_icon_cache = list() if(health < maxhealth && W.has_tool_quality(TOOL_WELDER)) var/obj/item/weldingtool/F = W.get_welder() if(F.welding) - to_chat(user, "You begin reparing damage to \the [src].") + to_chat(user, span_notice("You begin reparing damage to \the [src].")) playsound(src, F.usesound, 50, 1) if(!do_after(user, 20 * F.toolspeed) || !F.remove_fuel(1, user)) return user.visible_message("\The [user] repairs some damage to \the [src].", - "You repair some damage to \the [src].") + span_notice("You repair some damage to \the [src].")) health = max(health+(maxhealth/5), maxhealth) // 20% repair per application return 1 @@ -174,18 +174,18 @@ var/list/table_icon_cache = list() ..() /obj/structure/table/attack_alien(mob/user as mob) - visible_message("\The [user] tears apart \the [src]!") + visible_message(span_danger("\The [user] tears apart \the [src]!")) src.break_to_parts() /obj/structure/table/attack_generic(mob/user as mob, var/damage) if(damage >= 10) if(reinforced && prob(70)) - visible_message("\The [user] smashes against \the [src]!") + visible_message(span_danger("\The [user] smashes against \the [src]!")) take_damage(damage/2) user.do_attack_animation(src) ..() else - visible_message("\The [user] tears apart \the [src]!") + visible_message(span_danger("\The [user] tears apart \the [src]!")) src.break_to_parts() user.do_attack_animation(src) return 1 @@ -200,19 +200,19 @@ var/list/table_icon_cache = list() /obj/structure/table/proc/reinforce_table(obj/item/stack/material/S, mob/user) if(reinforced) - to_chat(user, "\The [src] is already reinforced!") + to_chat(user, span_warning("\The [src] is already reinforced!")) return if(!can_reinforce) - to_chat(user, "\The [src] cannot be reinforced!") + to_chat(user, span_warning("\The [src] cannot be reinforced!")) return if(!material) - to_chat(user, "Plate \the [src] before reinforcing it!") + to_chat(user, span_warning("Plate \the [src] before reinforcing it!")) return if(flipped) - to_chat(user, "Put \the [src] back in place before reinforcing it!") + to_chat(user, span_warning("Put \the [src] back in place before reinforcing it!")) return reinforced = common_material_add(S, user, "reinforc") @@ -237,36 +237,36 @@ var/list/table_icon_cache = list() /obj/structure/table/proc/common_material_add(obj/item/stack/material/S, mob/user, verb) // Verb is actually verb without 'e' or 'ing', which is added. Works for 'plate'/'plating' and 'reinforce'/'reinforcing'. var/datum/material/M = S.get_material() if(!istype(M)) - to_chat(user, "You cannot [verb]e \the [src] with \the [S].") + to_chat(user, span_warning("You cannot [verb]e \the [src] with \the [S].")) return null if(manipulating) return M manipulating = 1 - to_chat(user, "You begin [verb]ing \the [src] with [M.display_name].") + to_chat(user, span_notice("You begin [verb]ing \the [src] with [M.display_name].")) if(!do_after(user, 20) || !S.use(1)) manipulating = 0 return null - user.visible_message("\The [user] [verb]es \the [src] with [M.display_name].", "You finish [verb]ing \the [src].") + user.visible_message(span_notice("\The [user] [verb]es \the [src] with [M.display_name]."), span_notice("You finish [verb]ing \the [src].")) manipulating = 0 return M // Returns the material to set the table to. /obj/structure/table/proc/common_material_remove(mob/user, datum/material/M, delay, what, type_holding, sound) if(!M.stack_type) - to_chat(user, "You are unable to remove the [what] from this [src]!") + to_chat(user, span_warning("You are unable to remove the [what] from this [src]!")) return M if(manipulating) return M manipulating = 1 user.visible_message("\The [user] begins removing the [type_holding] holding \the [src]'s [M.display_name] [what] in place.", - "You begin removing the [type_holding] holding \the [src]'s [M.display_name] [what] in place.") + span_notice("You begin removing the [type_holding] holding \the [src]'s [M.display_name] [what] in place.")) if(sound) playsound(src, sound, 50, 1) if(!do_after(user, delay)) manipulating = 0 return M user.visible_message("\The [user] removes the [M.display_name] [what] from \the [src].", - "You remove the [M.display_name] [what] from \the [src].") + span_notice("You remove the [M.display_name] [what] from \the [src].")) new M.stack_type(src.loc) manipulating = 0 return null @@ -281,13 +281,13 @@ var/list/table_icon_cache = list() if(manipulating) return manipulating = 1 user.visible_message("\The [user] begins dismantling \the [src].", - "You begin dismantling \the [src].") + span_notice("You begin dismantling \the [src].")) playsound(src, W.usesound, 50, 1) if(!do_after(user, 20 * W.toolspeed)) manipulating = 0 return user.visible_message("\The [user] dismantles \the [src].", - "You dismantle \the [src].") + span_notice("You dismantle \the [src].")) new /obj/item/stack/material/steel(src.loc) qdel(src) return diff --git a/code/modules/telesci/bscyrstal.dm b/code/modules/telesci/bscyrstal.dm index 0676657bd9..271263d1c5 100644 --- a/code/modules/telesci/bscyrstal.dm +++ b/code/modules/telesci/bscyrstal.dm @@ -15,7 +15,7 @@ pixel_y = rand(-5, 5) /obj/item/bluespace_crystal/attack_self(mob/user) - user.visible_message("[user] crushes [src]!", "You crush [src]!") + user.visible_message(span_warning("[user] crushes [src]!"), span_danger("You crush [src]!")) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread() s.set_up(5, 1, get_turf(src)) s.start() @@ -28,7 +28,7 @@ /obj/item/bluespace_crystal/throw_impact(atom/hit_atom) if(!..()) // not caught in mid-air - visible_message("[src] fizzles and disappears upon impact!") + visible_message(span_notice("[src] fizzles and disappears upon impact!")) var/turf/T = get_turf(hit_atom) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread() s.set_up(5, 1, T) diff --git a/code/modules/telesci/quantum_pad.dm b/code/modules/telesci/quantum_pad.dm index 00bde3d0f1..2d4105aff4 100644 --- a/code/modules/telesci/quantum_pad.dm +++ b/code/modules/telesci/quantum_pad.dm @@ -35,15 +35,15 @@ /obj/machinery/power/quantumpad/examine(mob/user) . = ..() - . += "It is [linked_pad ? "currently" : "not"] linked to another pad." + . += span_notice("It is [linked_pad ? "currently" : "not"] linked to another pad.") if(world.time < last_teleport + teleport_cooldown) - . += "[src] is recharging power. A timer on the side reads [round((last_teleport + teleport_cooldown - world.time)/10)] seconds." + . += span_warning("[src] is recharging power. A timer on the side reads [round((last_teleport + teleport_cooldown - world.time)/10)] seconds.") if(boosted) . += span_notice("There appears to be a booster haphazardly jammed into the side of [src]. That looks unsafe.") if(!panel_open) - . += "The panel is screwed in, obstructing the linking device." + . += span_notice("The panel is screwed in, obstructing the linking device.") else - . += "The linking device is now able to be scanned with a multitool." + . += span_notice("The linking device is now able to be scanned with a multitool.") /obj/machinery/power/quantumpad/RefreshParts() var/E = 0 @@ -67,19 +67,19 @@ if(istype(I, /obj/item/multitool)) //VOREStation Addition Start if(istype(get_area(src), /area/shuttle)) - to_chat(user, "This is too unstable a platform for \the [src] to operate on!") + to_chat(user, span_warning("This is too unstable a platform for \the [src] to operate on!")) return //VOREStation Addition End if(panel_open) var/obj/item/multitool/M = I M.connectable = src - to_chat(user, "You save the data in [I]'s buffer.") + to_chat(user, span_notice("You save the data in [I]'s buffer.")) return 1 else var/obj/item/multitool/M = I if(istype(M.connectable, /obj/machinery/power/quantumpad)) linked_pad = M.connectable - to_chat(user, "You link [src] to the one in [I]'s buffer.") + to_chat(user, span_notice("You link [src] to the one in [I]'s buffer.")) update_icon() return 1 @@ -128,11 +128,11 @@ if(.) return if(panel_open) - to_chat(user, "The panel must be closed before operating this machine!") + to_chat(user, span_warning("The panel must be closed before operating this machine!")) return if(istype(get_area(src), /area/shuttle)) - to_chat(user, "This is too unstable a platform for \the [src] to operate on!") + to_chat(user, span_warning("This is too unstable a platform for \the [src] to operate on!")) //VOREStation Addition Start if(linked_pad) linked_pad.linked_pad = null @@ -140,28 +140,28 @@ return if(!powernet) - to_chat(user, "[src] is not attached to a powernet!") + to_chat(user, span_warning("[src] is not attached to a powernet!")) return if(!linked_pad || QDELETED(linked_pad)) if(!map_pad_link_id || !initMappedLink()) - to_chat(user, "There is no linked pad!") + to_chat(user, span_warning("There is no linked pad!")) return if(world.time < last_teleport + teleport_cooldown) - to_chat(user, "[src] is recharging power. Please wait [round((last_teleport + teleport_cooldown - world.time)/10)] seconds.") + to_chat(user, span_warning("[src] is recharging power. Please wait [round((last_teleport + teleport_cooldown - world.time)/10)] seconds.")) return if(teleporting) - to_chat(user, "[src] is charging up. Please wait.") + to_chat(user, span_warning("[src] is charging up. Please wait.")) return if(linked_pad.teleporting) - to_chat(user, "Linked pad is busy. Please wait.") + to_chat(user, span_warning("Linked pad is busy. Please wait.")) return if(linked_pad.inoperable()) - to_chat(user, "Linked pad is not responding to ping.") + to_chat(user, span_warning("Linked pad is not responding to ping.")) return src.add_fingerprint(user) doteleport(user) @@ -186,7 +186,7 @@ return //VOREStation Addition Start if(istype(get_area(src), /area/shuttle)) - to_chat(user, "This is too unstable a platform for \the [src] to operate on!") + to_chat(user, span_warning("This is too unstable a platform for \the [src] to operate on!")) return //VOREStation Addition End playsound(src, 'sound/weapons/flash.ogg', 25, 1) @@ -199,7 +199,7 @@ return // Broken or whatever if(inoperable()) - to_chat(user, "[src] is nonfunctional!") + to_chat(user, span_warning("[src] is nonfunctional!")) teleporting = 0 return // Linked pad or not, we can always re-scatter people @@ -210,12 +210,12 @@ return // Nothing to teleport to if(!linked_pad || QDELETED(linked_pad) || linked_pad.inoperable()) - to_chat(user, "Linked pad is not responding to ping. Teleport aborted.") + to_chat(user, span_warning("Linked pad is not responding to ping. Teleport aborted.")) teleporting = 0 return // Insufficient power if(!use_teleport_power()) - to_chat(user, "Power is not sufficient to complete a teleport. Teleport aborted.") + to_chat(user, span_warning("Power is not sufficient to complete a teleport. Teleport aborted.")) teleporting = 0 return @@ -291,15 +291,15 @@ /obj/machinery/power/quantumpad/proc/gateway_scatter(mob/user) var/obj/effect/landmark/dest = pick(awaydestinations) if(!dest) - to_chat(user, "Nothing happens... maybe there's no signal to the remote pad?") + to_chat(user, span_warning("Nothing happens... maybe there's no signal to the remote pad?")) return // Insufficient power if(!use_teleport_power()) - to_chat(user, "Power is not sufficient to complete a teleport. Teleport aborted.") + to_chat(user, span_warning("Power is not sufficient to complete a teleport. Teleport aborted.")) return sparks() - to_chat(user, "You feel yourself pulled in different directions, before ending up not far from where you started.") + to_chat(user, span_warning("You feel yourself pulled in different directions, before ending up not far from where you started.")) flick("qpad-beam-out", src) transport_objects(get_turf(dest)) diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index ef7ae75e88..b8979bdf34 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -41,7 +41,7 @@ if(istype(W, /obj/item/multitool)) var/obj/item/multitool/M = W M.connectable = src - to_chat(user, "You save the data in the [M.name]'s buffer.") + to_chat(user, span_warning("You save the data in the [M.name]'s buffer.")) return 1 return ..() diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index fb978ca4ee..455c9e817a 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -51,26 +51,26 @@ /obj/machinery/computer/telescience/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/bluespace_crystal)) if(crystals.len >= max_crystals) - to_chat(user, "There are not enough crystal slots.") + to_chat(user, span_warning("There are not enough crystal slots.")) return if(!user.unEquip(W)) return crystals += W W.forceMove(src) - user.visible_message("[user] inserts [W] into \the [src]'s crystal slot.", "You insert [W] into \the [src]'s crystal slot.") + user.visible_message("[user] inserts [W] into \the [src]'s crystal slot.", span_notice("You insert [W] into \the [src]'s crystal slot.")) updateDialog() else if(istype(W, /obj/item/gps)) if(!inserted_gps) inserted_gps = W user.unEquip(W) W.forceMove(src) - user.visible_message("[user] inserts [W] into \the [src]'s GPS device slot.", "You insert [W] into \the [src]'s GPS device slot.") + user.visible_message("[user] inserts [W] into \the [src]'s GPS device slot.", span_notice("You insert [W] into \the [src]'s GPS device slot.")) else if(istype(W, /obj/item/multitool)) var/obj/item/multitool/M = W if(M.connectable && istype(M.connectable, /obj/machinery/telepad)) telepad = M.connectable M.connectable = null - to_chat(user, "You upload the data from the [W.name]'s buffer.") + to_chat(user, span_warning("You upload the data from the [W.name]'s buffer.")) else return ..() @@ -191,7 +191,7 @@ switch(rand(99)) if(0 to 85) sparks() - visible_message("The telepad weakly fizzles.") + visible_message(span_warning("The telepad weakly fizzles.")) return if(86 to 90) // Irradiate everyone in telescience! @@ -200,7 +200,7 @@ sparks() for(var/mob/living/carbon/human/M in viewers(L, null)) M.apply_effect((rand(10, 20)), IRRADIATE, 0) - to_chat(M, "You feel strange.") + to_chat(M, span_warning("You feel strange.")) return if(91 to 98) // They did the mash! (They did the monster mash!) The monster mash! (It was a graveyard smash!) @@ -219,7 +219,7 @@ return if(99) sparks() - visible_message("The telepad changes colors rapidly, and opens a portal, and you see what your mind seems to think is the very threads that hold the pattern of the universe together, and a eerie sense of paranoia creeps into you.") + visible_message(span_warning("The telepad changes colors rapidly, and opens a portal, and you see what your mind seems to think is the very threads that hold the pattern of the universe together, and a eerie sense of paranoia creeps into you.")) spacevine_infestation() return diff --git a/code/modules/tgui/modules/admin_shuttle_controller.dm b/code/modules/tgui/modules/admin_shuttle_controller.dm index d03e78b32d..6be6d05fd0 100644 --- a/code/modules/tgui/modules/admin_shuttle_controller.dm +++ b/code/modules/tgui/modules/admin_shuttle_controller.dm @@ -56,11 +56,11 @@ else if(LAZYLEN(V.restricted_waypoints)) target = V.restricted_waypoints[1] else - to_chat(C, "Unable to jump to [V].") + to_chat(C, span_warning("Unable to jump to [V].")) return var/turf/T = get_turf(target) if(!istype(T)) - to_chat(C, "Unable to jump to [V].") + to_chat(C, span_warning("Unable to jump to [V].")) return C.jumptoturf(T) return TRUE @@ -77,7 +77,7 @@ var/list/possible_d = shuttle.get_possible_destinations() var/D if(!LAZYLEN(possible_d)) - to_chat(usr, "There are no possible destinations for [shuttle] ([shuttle.type])") + to_chat(usr, span_warning("There are no possible destinations for [shuttle] ([shuttle.type])")) return FALSE D = tgui_input_list(usr, "Choose shuttle destination", "Shuttle Destination", possible_d) if(D) @@ -88,9 +88,9 @@ if(tgui_alert(usr, "Are you sure you want to launch [shuttle]?", "Launching Shuttle", list("Yes", "No")) == "Yes") shuttle.launch(src) else - to_chat(usr, "The shuttle control panel isn't quite sure how to move [S] ([S?.type]).") + to_chat(usr, span_notice("The shuttle control panel isn't quite sure how to move [S] ([S?.type]).")) return FALSE - to_chat(usr, "Launching shuttle [S].") + to_chat(usr, span_notice("Launching shuttle [S].")) return TRUE if("overmap_control") var/obj/effect/overmap/visitable/ship/V = locate(params["ref"]) diff --git a/code/modules/tgui/modules/agentcard.dm b/code/modules/tgui/modules/agentcard.dm index d45834c9ab..99f438416e 100644 --- a/code/modules/tgui/modules/agentcard.dm +++ b/code/modules/tgui/modules/agentcard.dm @@ -43,7 +43,7 @@ switch(action) if("electronic_warfare") S.electronic_warfare = !S.electronic_warfare - to_chat(usr, "Electronic warfare [S.electronic_warfare ? "enabled" : "disabled"].") + to_chat(usr, span_notice("Electronic warfare [S.electronic_warfare ? "enabled" : "disabled"].")) . = TRUE if("age") var/new_age = tgui_input_number(usr,"What age would you like to put on this card?","Agent Card Age", S.age) @@ -52,7 +52,7 @@ S.age = initial(S.age) else S.age = new_age - to_chat(usr, "Age has been set to '[S.age]'.") + to_chat(usr, span_notice("Age has been set to '[S.age]'.")) . = TRUE if("appearance") var/datum/card_state/choice = tgui_input_list(usr, "Select the appearance for this card.", "Agent Card Appearance", id_card_states()) @@ -61,13 +61,13 @@ S.item_state = choice.item_state S.sprite_stack = choice.sprite_stack S.update_icon() - to_chat(usr, "Appearance changed to [choice].") + to_chat(usr, span_notice("Appearance changed to [choice].")) . = TRUE if("assignment") var/new_job = sanitize(tgui_input_text(usr,"What assignment would you like to put on this card?\nChanging assignment will not grant or remove any access levels.","Agent Card Assignment", S.assignment)) if(!isnull(new_job) && tgui_status(usr, state) == STATUS_INTERACTIVE) S.assignment = new_job - to_chat(usr, "Occupation changed to '[new_job]'.") + to_chat(usr, span_notice("Occupation changed to '[new_job]'.")) S.update_name() . = TRUE if("bloodtype") @@ -79,7 +79,7 @@ var/new_blood_type = sanitize(tgui_input_text(usr,"What blood type would you like to be written on this card?","Agent Card Blood Type",default)) if(!isnull(new_blood_type) && tgui_status(usr, state) == STATUS_INTERACTIVE) S.blood_type = new_blood_type - to_chat(usr, "Blood type changed to '[new_blood_type]'.") + to_chat(usr, span_notice("Blood type changed to '[new_blood_type]'.")) . = TRUE if("dnahash") var/default = S.dna_hash @@ -90,7 +90,7 @@ var/new_dna_hash = sanitize(tgui_input_text(usr,"What DNA hash would you like to be written on this card?","Agent Card DNA Hash",default)) if(!isnull(new_dna_hash) && tgui_status(usr, state) == STATUS_INTERACTIVE) S.dna_hash = new_dna_hash - to_chat(usr, "DNA hash changed to '[new_dna_hash]'.") + to_chat(usr, span_notice("DNA hash changed to '[new_dna_hash]'.")) . = TRUE if("fingerprinthash") var/default = S.fingerprint_hash @@ -101,30 +101,30 @@ var/new_fingerprint_hash = sanitize(tgui_input_text(usr,"What fingerprint hash would you like to be written on this card?","Agent Card Fingerprint Hash",default)) if(!isnull(new_fingerprint_hash) && tgui_status(usr, state) == STATUS_INTERACTIVE) S.fingerprint_hash = new_fingerprint_hash - to_chat(usr, "Fingerprint hash changed to '[new_fingerprint_hash]'.") + to_chat(usr, span_notice("Fingerprint hash changed to '[new_fingerprint_hash]'.")) . = TRUE if("name") var/new_name = sanitizeName(tgui_input_text(usr,"What name would you like to put on this card?","Agent Card Name", S.registered_name)) if(!isnull(new_name) && tgui_status(usr, state) == STATUS_INTERACTIVE) S.registered_name = new_name S.update_name() - to_chat(usr, "Name changed to '[new_name]'.") + to_chat(usr, span_notice("Name changed to '[new_name]'.")) . = TRUE if("photo") S.set_id_photo(usr) - to_chat(usr, "Photo changed.") + to_chat(usr, span_notice("Photo changed.")) . = TRUE if("sex") var/new_sex = sanitize(tgui_input_text(usr,"What sex would you like to put on this card?","Agent Card Sex", S.sex)) if(!isnull(new_sex) && tgui_status(usr, state) == STATUS_INTERACTIVE) S.sex = new_sex - to_chat(usr, "Sex changed to '[new_sex]'.") + to_chat(usr, span_notice("Sex changed to '[new_sex]'.")) . = TRUE if("species") var/new_species = sanitize(tgui_input_text(usr,"What species would you like to put on this card?","Agent Card Species", S.species)) if(!isnull(new_species) && tgui_status(usr, state) == STATUS_INTERACTIVE) S.species = new_species - to_chat(usr, "Species changed to '[new_species]'.") + to_chat(usr, span_notice("Species changed to '[new_species]'.")) . = TRUE if("factoryreset") if(tgui_alert(usr, "This will factory reset the card, including access and owner. Continue?", "Factory Reset", list("No", "Yes")) == "Yes" && tgui_status(usr, state) == STATUS_INTERACTIVE) @@ -145,5 +145,5 @@ S.sex = initial(S.sex) S.species = initial(S.species) S.update_icon() - to_chat(usr, "All information has been deleted from \the [src].") + to_chat(usr, span_notice("All information has been deleted from \the [src].")) . = TRUE diff --git a/code/modules/tgui/modules/appearance_changer_vr.dm b/code/modules/tgui/modules/appearance_changer_vr.dm index d469f4b292..23a3e86f9b 100644 --- a/code/modules/tgui/modules/appearance_changer_vr.dm +++ b/code/modules/tgui/modules/appearance_changer_vr.dm @@ -26,23 +26,23 @@ switch(flag) if(APPEARANCECHANGER_CHANGED_RACE) - to_chat(M, "You lose sensation of your body, feeling only the warmth of everything around you... ") - to_chat(O, "Your body shifts as you make dramatic changes to your captive's body.") + to_chat(M, span_notice("You lose sensation of your body, feeling only the warmth of everything around you... ")) + to_chat(O, span_notice("Your body shifts as you make dramatic changes to your captive's body.")) if(APPEARANCECHANGER_CHANGED_GENDER) - to_chat(M, "Your body feels very strange...") - to_chat(O, "You feel strange as you alter your captive's gender.") + to_chat(M, span_notice("Your body feels very strange...")) + to_chat(O, span_notice("You feel strange as you alter your captive's gender.")) if(APPEARANCECHANGER_CHANGED_GENDER_ID) - to_chat(M, "You start to feel... [capitalize(M.gender)]?") - to_chat(O, "You feel strange as you alter your captive's gender identity.") + to_chat(M, span_notice("You start to feel... [capitalize(M.gender)]?")) + to_chat(O, span_notice("You feel strange as you alter your captive's gender identity.")) if(APPEARANCECHANGER_CHANGED_SKINTONE, APPEARANCECHANGER_CHANGED_SKINCOLOR) - to_chat(M, "Your body tingles all over...") - to_chat(O, "You tingle as you make noticeable changes to your captive's body.") + to_chat(M, span_notice("Your body tingles all over...")) + to_chat(O, span_notice("You tingle as you make noticeable changes to your captive's body.")) if(APPEARANCECHANGER_CHANGED_HAIRSTYLE, APPEARANCECHANGER_CHANGED_HAIRCOLOR, APPEARANCECHANGER_CHANGED_F_HAIRSTYLE, APPEARANCECHANGER_CHANGED_F_HAIRCOLOR) - to_chat(M, "Your body tingles all over...") - to_chat(O, "You tingle as you make noticeable changes to your captive's body.") + to_chat(M, span_notice("Your body tingles all over...")) + to_chat(O, span_notice("You tingle as you make noticeable changes to your captive's body.")) if(APPEARANCECHANGER_CHANGED_EYES) - to_chat(M, "You feel lightheaded and drowsy...") - to_chat(O, "You feel warm as you make subtle changes to your captive's body.") + to_chat(M, span_notice("You feel lightheaded and drowsy...")) + to_chat(O, span_notice("You feel warm as you make subtle changes to your captive's body.")) // Cocoon Stuff /datum/tgui_module/appearance_changer/cocoon @@ -54,4 +54,4 @@ //if(!istype(owner.loc, /obj/item/storage/vore_egg/bugcocoon)) if(!owner.transforming) return STATUS_CLOSE - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/tgui/modules/communications.dm b/code/modules/tgui/modules/communications.dm index 582ae6c416..5b758ceb45 100644 --- a/code/modules/tgui/modules/communications.dm +++ b/code/modules/tgui/modules/communications.dm @@ -45,7 +45,7 @@ /datum/tgui_module/communications/tgui_interact(mob/user, datum/tgui/ui) if(using_map && !(get_z(user) in using_map.contact_levels)) - to_chat(user, "Unable to establish a connection: You're too far away from the station!") + to_chat(user, span_danger("Unable to establish a connection: You're too far away from the station!")) return FALSE . = ..() @@ -60,7 +60,7 @@ return COMM_AUTHENTICATION_MIN else if(message) - to_chat(user, "Access denied.") + to_chat(user, span_warning("Access denied.")) return COMM_AUTHENTICATION_NONE /datum/tgui_module/communications/proc/change_security_level(new_level) @@ -201,13 +201,13 @@ if(..()) return TRUE if(using_map && !(get_z(usr) in using_map.contact_levels)) - to_chat(usr, "Unable to establish a connection: You're too far away from the station!") + to_chat(usr, span_danger("Unable to establish a connection: You're too far away from the station!")) return FALSE . = TRUE if(action == "auth") if(!ishuman(usr)) - to_chat(usr, "Access denied.") + to_chat(usr, span_warning("Access denied.")) return FALSE // Logout function. if(authenticated != COMM_AUTHENTICATION_NONE) @@ -225,7 +225,7 @@ if(istype(id)) crew_announcement.announcer = GetNameAndAssignmentFromId(id) if(authenticated == COMM_AUTHENTICATION_NONE) - to_chat(usr, "You need to wear your ID.") + to_chat(usr, span_warning("You need to wear your ID.")) // All functions below this point require authentication. if(!is_authenticated(usr)) @@ -238,7 +238,7 @@ if("newalertlevel") if(isAI(usr) || isrobot(usr)) - to_chat(usr, "Firewalls prevent you from changing the alert level.") + to_chat(usr, span_warning("Firewalls prevent you from changing the alert level.")) return else if(isobserver(usr)) var/mob/observer/dead/D = usr @@ -246,25 +246,25 @@ change_security_level(text2num(params["level"])) return TRUE else if(!ishuman(usr)) - to_chat(usr, "Security measures prevent you from changing the alert level.") + to_chat(usr, span_warning("Security measures prevent you from changing the alert level.")) return if(is_authenticated(usr)) change_security_level(text2num(params["level"])) else - to_chat(usr, "You are not authorized to do this.") + to_chat(usr, span_warning("You are not authorized to do this.")) setMenuState(usr, COMM_SCREEN_MAIN) if("announce") if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX) if(message_cooldown > world.time) - to_chat(usr, "Please allow at least one minute to pass between announcements.") + to_chat(usr, span_warning("Please allow at least one minute to pass between announcements.")) return var/input = tgui_input_text(usr, "Please write a message to announce to the station crew.", "Priority Announcement", multiline = TRUE, prevent_enter = TRUE) if(!input || message_cooldown > world.time || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) return if(length(input) < COMM_MSGLEN_MINIMUM) - to_chat(usr, "Message '[input]' is too short. [COMM_MSGLEN_MINIMUM] character minimum.") + to_chat(usr, span_warning("Message '[input]' is too short. [COMM_MSGLEN_MINIMUM] character minimum.")) return crew_announcement.Announce(input) message_cooldown = world.time + 600 //One minute @@ -280,7 +280,7 @@ if("cancelshuttle") if(isAI(usr) || isrobot(usr)) - to_chat(usr, "Firewalls prevent you from recalling the shuttle.") + to_chat(usr, span_warning("Firewalls prevent you from recalling the shuttle.")) return var/response = tgui_alert(usr, "Are you sure you wish to recall the shuttle?", "Confirm", list("Yes", "No")) if(response == "Yes") @@ -335,7 +335,7 @@ if("MessageCentCom") if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX) if(centcomm_message_cooldown > world.time) - to_chat(usr, "Arrays recycling. Please stand by.") + to_chat(usr, span_warning("Arrays recycling. Please stand by.")) return var/input = sanitize(tgui_input_text(usr, "Please choose a message to transmit to [using_map.boss_short] via quantum entanglement. \ Please be aware that this process is very expensive, and abuse will lead to... termination. \ @@ -344,7 +344,7 @@ if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) return if(length(input) < COMM_CCMSGLEN_MINIMUM) - to_chat(usr, "Message '[input]' is too short. [COMM_CCMSGLEN_MINIMUM] character minimum.") + to_chat(usr, span_warning("Message '[input]' is too short. [COMM_CCMSGLEN_MINIMUM] character minimum.")) return CentCom_announce(input, usr) to_chat(usr, span_blue("Message transmitted.")) @@ -362,7 +362,7 @@ if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) return if(length(input) < COMM_CCMSGLEN_MINIMUM) - to_chat(usr, "Message '[input]' is too short. [COMM_CCMSGLEN_MINIMUM] character minimum.") + to_chat(usr, span_warning("Message '[input]' is too short. [COMM_CCMSGLEN_MINIMUM] character minimum.")) return Syndicate_announce(input, usr) to_chat(usr, span_blue("Message transmitted.")) @@ -387,7 +387,7 @@ return if(!universe.OnShuttleCall(usr)) - to_chat(user, "Cannot establish a bluespace connection.") + to_chat(user, span_notice("Cannot establish a bluespace connection.")) return if(deathsquad.deployed) diff --git a/code/modules/tgui/modules/crew_monitor.dm b/code/modules/tgui/modules/crew_monitor.dm index 53f31adec4..579e19cbd8 100644 --- a/code/modules/tgui/modules/crew_monitor.dm +++ b/code/modules/tgui/modules/crew_monitor.dm @@ -16,7 +16,7 @@ var/turf/T = get_turf(usr) if(!T || !(T.z in using_map.player_levels)) - to_chat(usr, "Unable to establish a connection: You're too far away from the station!") + to_chat(usr, span_warning("Unable to establish a connection: You're too far away from the station!")) return FALSE switch(action) @@ -36,7 +36,7 @@ var/list/map_levels = using_map.get_map_levels(z, TRUE, om_range = DEFAULT_OVERMAP_RANGE) if(!map_levels.len) - to_chat(user, "The crew monitor doesn't seem like it'll work here.") + to_chat(user, span_warning("The crew monitor doesn't seem like it'll work here.")) if(ui) ui.close() return null diff --git a/code/modules/tgui/modules/law_manager.dm b/code/modules/tgui/modules/law_manager.dm index 77fe6db546..86cea7cd35 100644 --- a/code/modules/tgui/modules/law_manager.dm +++ b/code/modules/tgui/modules/law_manager.dm @@ -130,15 +130,15 @@ return TRUE if("notify_laws") - to_chat(owner, "Law Notice") + to_chat(owner, span_danger("Law Notice")) owner.laws.show_laws(owner) if(isAI(owner)) var/mob/living/silicon/ai/AI = owner for(var/mob/living/silicon/robot/R in AI.connected_robots) - to_chat(R, "Law Notice") + to_chat(R, span_danger("Law Notice")) R.laws.show_laws(R) if(usr != owner) - to_chat(usr, "Laws displayed.") + to_chat(usr, span_notice("Laws displayed.")) return TRUE /datum/tgui_module/law_manager/tgui_interact(mob/user, datum/tgui/ui) diff --git a/code/modules/tgui/modules/ntos-only/cardmod.dm b/code/modules/tgui/modules/ntos-only/cardmod.dm index 0a329b58d2..f42c29a433 100644 --- a/code/modules/tgui/modules/ntos-only/cardmod.dm +++ b/code/modules/tgui/modules/ntos-only/cardmod.dm @@ -148,7 +148,7 @@ contents += " [get_access_desc(A)]" if(!computer.nano_printer.print_text(contents,"access report")) - to_chat(usr, "Hardware error: Printer was unable to print the file. It may be out of paper.") + to_chat(usr, span_notice("Hardware error: Printer was unable to print the file. It may be out of paper.")) return else computer.visible_message("\The [computer] prints out paper.") @@ -158,7 +158,7 @@ [data_core ? data_core.get_manifest(0) : ""] "} if(!computer.nano_printer.print_text(contents,text("crew manifest ([])", stationtime2text()))) - to_chat(usr, "Hardware error: Printer was unable to print the file. It may be out of paper.") + to_chat(usr, span_notice("Hardware error: Printer was unable to print the file. It may be out of paper.")) return else computer.visible_message("\The [computer] prints out paper.") @@ -181,7 +181,7 @@ if(temp_name) id_card.registered_name = temp_name else - computer.visible_message("[computer] buzzes rudely.") + computer.visible_message(span_notice("[computer] buzzes rudely.")) . = TRUE if("account") if(computer && program.can_run(usr, 1)) @@ -208,7 +208,7 @@ jobdatum = J break if(!jobdatum) - to_chat(usr, "No log exists for this job: [t1]") + to_chat(usr, span_warning("No log exists for this job: [t1]")) return access = jobdatum.get_access() diff --git a/code/modules/tgui/modules/ntos-only/uav.dm b/code/modules/tgui/modules/ntos-only/uav.dm index 5e120506ad..9cc35dfe77 100644 --- a/code/modules/tgui/modules/ntos-only/uav.dm +++ b/code/modules/tgui/modules/ntos-only/uav.dm @@ -45,11 +45,11 @@ if("switch_uav") var/obj/item/uav/U = locate(params["switch_uav"]) //This is a \ref to the UAV itself if(!istype(U)) - to_chat(usr,"Something is blocking the connection to that UAV. In-person investigation is required.") + to_chat(usr,span_warning("Something is blocking the connection to that UAV. In-person investigation is required.")) return FALSE if(!get_signal_to(U)) - to_chat(usr,"The screen freezes for a moment, before returning to the UAV selection menu. It's not able to connect to that UAV.") + to_chat(usr,span_warning("The screen freezes for a moment, before returning to the UAV selection menu. It's not able to connect to that UAV.")) return FALSE set_current(U) @@ -71,7 +71,7 @@ return FALSE if(current_uav.check_eye(usr) < 0) - to_chat(usr,"The screen freezes for a moment, before returning to the UAV selection menu. It's not able to connect to that UAV.") + to_chat(usr,span_warning("The screen freezes for a moment, before returning to the UAV selection menu. It's not able to connect to that UAV.")) else viewing_uav(usr) ? unlook(usr) : look(usr) return TRUE @@ -114,7 +114,7 @@ for(var/datum/weakref/W in viewers) var/M = W.resolve() if(M) - to_chat(M, "You're disconnected from the UAV's camera!") + to_chat(M, span_warning("You're disconnected from the UAV's camera!")) unlook(M) /datum/tgui_module/uav/proc/current_uav_changed_z(old_z, new_z) @@ -195,7 +195,7 @@ /datum/tgui_module/uav/proc/look(mob/user) if(issilicon(user)) //Too complicated for me to want to mess with at the moment - to_chat(user, "Regulations prevent you from controlling several corporeal forms at the same time!") + to_chat(user, span_warning("Regulations prevent you from controlling several corporeal forms at the same time!")) return if(!current_uav) diff --git a/code/modules/tgui/modules/overmap.dm b/code/modules/tgui/modules/overmap.dm index a1d0375312..57a8ec11ab 100644 --- a/code/modules/tgui/modules/overmap.dm +++ b/code/modules/tgui/modules/overmap.dm @@ -90,7 +90,7 @@ // NTOS Path if(!sync_linked()) - to_chat(user, "You don't appear to be on a spaceship...") + to_chat(user, span_warning("You don't appear to be on a spaceship...")) if(ui) ui.close(can_be_suspended = FALSE) if(ntos) @@ -314,7 +314,7 @@ sec_name = "Sector #[known_sectors.len]" R.fields["name"] = sec_name if(sec_name in known_sectors) - to_chat(usr, "Sector with that name already exists, please input a different name.") + to_chat(usr, span_warning("Sector with that name already exists, please input a different name.")) return TRUE switch(params["add"]) if("current") diff --git a/code/modules/turbolift/turbolift.dm b/code/modules/turbolift/turbolift.dm index 78fb4084cd..13b98b014c 100644 --- a/code/modules/turbolift/turbolift.dm +++ b/code/modules/turbolift/turbolift.dm @@ -28,7 +28,7 @@ priority_mode = TRUE cancel_pending_floors() update_ext_panel_icons() - control_panel_interior.audible_message("This turbolift is responding to a priority call. Please exit the lift when it stops and make way.", runemessage = "BUZZ") + control_panel_interior.audible_message(span_info("This turbolift is responding to a priority call. Please exit the lift when it stops and make way."), runemessage = "BUZZ") spawn(time) priority_mode = FALSE update_ext_panel_icons() diff --git a/code/modules/turbolift/turbolift_console.dm b/code/modules/turbolift/turbolift_console.dm index 1ed15ff70d..b8a283b0ec 100644 --- a/code/modules/turbolift/turbolift_console.dm +++ b/code/modules/turbolift/turbolift_console.dm @@ -24,7 +24,7 @@ /obj/structure/lift/proc/pressed(var/mob/user) if(!istype(user, /mob/living/silicon)) if(user.a_intent == I_HURT) - user.visible_message("\The [user] hammers on the lift button!") + user.visible_message(span_danger("\The [user] hammers on the lift button!")) else user.visible_message("\The [user] presses the lift button.") @@ -130,10 +130,10 @@ return lift.update_fire_mode(!lift.fire_mode) if(lift.fire_mode) - audible_message("Firefighter Mode Activated. Door safeties disabled. Manual control engaged.", runemessage = "SCREECH") + audible_message(span_danger("Firefighter Mode Activated. Door safeties disabled. Manual control engaged."), runemessage = "SCREECH") playsound(src, 'sound/machines/airalarm.ogg', 25, 0, 4, volume_channel = VOLUME_CHANNEL_ALARMS) else - audible_message("Firefighter Mode Deactivated. Door safeties enabled. Automatic control engaged.", runemessage = "ding") + audible_message(span_warning("Firefighter Mode Deactivated. Door safeties enabled. Automatic control engaged."), runemessage = "ding") return . = ..() @@ -143,7 +143,7 @@ /obj/structure/lift/panel/interact(var/mob/user) if(!..()) return - + tgui_interact(user) /obj/structure/lift/panel/tgui_interact(mob/user, datum/tgui/ui) @@ -171,7 +171,7 @@ "name" = floor.name, ))) data["floors"] = floors - + return data /obj/structure/lift/panel/tgui_act(action, params) @@ -201,4 +201,4 @@ else icon_state = initial(icon_state) -// End panel. \ No newline at end of file +// End panel. diff --git a/code/modules/turbolift/turbolift_door_vr.dm b/code/modules/turbolift/turbolift_door_vr.dm index ab7ca44993..04b4357024 100644 --- a/code/modules/turbolift/turbolift_door_vr.dm +++ b/code/modules/turbolift/turbolift_door_vr.dm @@ -1,5 +1,5 @@ // Vore specific code for /obj/machinery/door/airlock/lift /obj/machinery/door/airlock/lift/emag_act(var/uses_left, var/mob/user) - to_chat(user, "This door is internally controlled.") + to_chat(user, span_danger("This door is internally controlled.")) return 0 // Prevents the cryptographic sequencer from using a charge fruitlessly diff --git a/code/modules/vchat/vchat_client.dm b/code/modules/vchat/vchat_client.dm index a20f5fa1eb..054fd14773 100644 --- a/code/modules/vchat/vchat_client.dm +++ b/code/modules/vchat/vchat_client.dm @@ -212,7 +212,7 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic too_many_topics++ if(too_many_topics >= topic_spam_limit) log_and_message_admins("Kicking [key_name(owner)] - VChat Topic() spam") - to_chat(owner,"You have been kicked due to VChat sending too many messages to the server. Try reconnecting.") + to_chat(owner,span_danger("You have been kicked due to VChat sending too many messages to the server. Try reconnecting.")) qdel(owner) qdel(src) return @@ -390,17 +390,17 @@ var/to_chat_src set category = "OOC" if(chatOutput.broken) - to_chat(src, "Error: VChat isn't processing your messages!") + to_chat(src, span_warning("Error: VChat isn't processing your messages!")) return var/list/results = vchat_get_messages(ckey) if(!LAZYLEN(results)) - to_chat(src, "Error: No messages found! Please inform a dev if you do have messages!") + to_chat(src, span_warning("Error: No messages found! Please inform a dev if you do have messages!")) return var/o_file = "data/chatlog_tmp/[ckey]_chat_log" if(fexists(o_file) && !fdel(o_file)) - to_chat(src, "Error: Your chat log is already being prepared. Please wait until it's been downloaded before trying to export it again.") + to_chat(src, span_warning("Error: Your chat log is already being prepared. Please wait until it's been downloaded before trying to export it again.")) return // Write the CSS file to the log diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm index c1f3279972..0dd72534d8 100644 --- a/code/modules/vehicles/Securitrain_vr.dm +++ b/code/modules/vehicles/Securitrain_vr.dm @@ -86,7 +86,7 @@ /obj/vehicle/train/security/trolley/attackby(obj/item/W as obj, mob/user as mob) if(open && istype(W, /obj/item/tool/wirecutters)) passenger_allowed = !passenger_allowed - user.visible_message("[user] [passenger_allowed ? "cuts" : "mends"] a cable in [src].","You [passenger_allowed ? "cut" : "mend"] the load limiter cable.") + user.visible_message(span_notice("[user] [passenger_allowed ? "cuts" : "mends"] a cable in [src]."),span_notice("You [passenger_allowed ? "cut" : "mend"] the load limiter cable.")) else ..() @@ -182,8 +182,8 @@ if(is_train_head() && istype(load, /mob/living/carbon/human)) var/mob/living/carbon/human/D = load - to_chat(D, "You ran over \the [M]!" - visible_message("\The [src] ran over \the [M]!") + to_chat(D, span_danger("You ran over \the [M]!") + visible_message(span_danger("\The [src] ran over \the [M]!")) add_attack_logs(D,M,"Ran over with [src.name]") attack_log += text("\[[time_stamp()]\] [span_red("ran over [M.name] ([M.ckey]), driven by [D.name] ([D.ckey])")]") else diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm index 9c24ae9a6a..bb0137fda2 100644 --- a/code/modules/vehicles/bike.dm +++ b/code/modules/vehicles/bike.dm @@ -98,7 +98,7 @@ visible_message("[user] puts up \the [src]'s kickstand.") else if(istype(src.loc,/turf/space) || istype(src.loc, /turf/simulated/floor/water)) - to_chat(usr, " You don't think kickstands work here...") + to_chat(usr, span_warning(" You don't think kickstands work here...")) return visible_message("[user] puts down \the [src]'s kickstand.") if(pulledby) @@ -116,7 +116,7 @@ /obj/vehicle/bike/MouseDrop_T(var/atom/movable/C, var/mob/user as mob) if(!load(C, user)) - to_chat(user, " You were unable to load \the [C] onto \the [src].") + to_chat(user, span_warning(" You were unable to load \the [C] onto \the [src].")) return /obj/vehicle/bike/attack_hand(var/mob/user as mob) @@ -138,7 +138,7 @@ if(on && (!cell || cell.charge < charge_use)) turn_off() - visible_message("\The [src] whines, before its engines wind down.") + visible_message(span_warning("\The [src] whines, before its engines wind down.")) return 0 //these things like space, not turf. Dragging shouldn't weigh you down. diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index 3d3079c113..8a0d567416 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -70,7 +70,7 @@ /obj/vehicle/train/trolley/attackby(obj/item/W as obj, mob/user as mob) if(open && W.has_tool_quality(TOOL_WIRECUTTER)) passenger_allowed = !passenger_allowed - user.visible_message("[user] [passenger_allowed ? "cuts" : "mends"] a cable in [src].","You [passenger_allowed ? "cut" : "mend"] the load limiter cable.") + user.visible_message(span_notice("[user] [passenger_allowed ? "cuts" : "mends"] a cable in [src]."),span_notice("You [passenger_allowed ? "cut" : "mend"] the load limiter cable.")) else ..() diff --git a/code/modules/vehicles/construction.dm b/code/modules/vehicles/construction.dm index acc13e745a..2a0f003c94 100644 --- a/code/modules/vehicles/construction.dm +++ b/code/modules/vehicles/construction.dm @@ -47,12 +47,12 @@ if(istype(W, /obj/item/stack/material/plastic)) var/obj/item/stack/material/plastic/P = W if (P.get_amount() < 8) - to_chat(user, "You need eight sheets of plastic to add tires to \the [src].") + to_chat(user, span_warning("You need eight sheets of plastic to add tires to \the [src].")) return - to_chat(user, "You start to add tires to [src].") + to_chat(user, span_notice("You start to add tires to [src].")) if(do_after(user, 40) && build_stage == 0) if(P.use(8)) - to_chat(user, "You add tires to \the [src].") + to_chat(user, span_notice("You add tires to \the [src].")) increase_step("wheeled [initial(name)]") return @@ -60,7 +60,7 @@ if(istype(W, /obj/item/stock_parts/console_screen)) user.drop_item() qdel(W) - to_chat(user, "You add the lights to \the [src].") + to_chat(user, span_notice("You add the lights to \the [src].")) increase_step() return @@ -68,19 +68,19 @@ if(istype(W, /obj/item/stock_parts/spring)) user.drop_item() qdel(W) - to_chat(user, "You add the control system to \the [src].") + to_chat(user, span_notice("You add the control system to \the [src].")) increase_step() return if(istype(W, /obj/item/stack/material/steel)) var/obj/item/stack/material/steel/S = W if(S.get_amount() < 5) - to_chat(user, "You need five sheets of steel to convert \the [src] into a trailer.") + to_chat(user, span_warning("You need five sheets of steel to convert \the [src] into a trailer.")) if(do_after(user, 80) && build_stage == 2) if(S.use(5)) var/obj/item/vehicle_assembly/quadtrailer/Trailer = new(src) Trailer.forceMove(get_turf(src)) Trailer.increase_step("framed [initial(Trailer.name)]") - to_chat(user, "You convert \the [src] into \the [Trailer].") + to_chat(user, span_notice("You convert \the [src] into \the [Trailer].")) user.drop_from_inventory(src) qdel(src) return @@ -89,12 +89,12 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W if (C.get_amount() < 2) - to_chat(user, "You need two coils of wire to wire [src].") + to_chat(user, span_warning("You need two coils of wire to wire [src].")) return - to_chat(user, "You start to wire [src].") + to_chat(user, span_notice("You start to wire [src].")) if(do_after(user, 40) && build_stage == 3) if(C.use(2)) - to_chat(user, "You wire \the [src].") + to_chat(user, span_notice("You wire \the [src].")) increase_step("wired [initial(name)]") return @@ -103,7 +103,7 @@ user.drop_item() W.forceMove(src) cell = W - to_chat(user, "You add the power supply to \the [src].") + to_chat(user, span_notice("You add the power supply to \the [src].")) increase_step("powered [initial(name)]") return @@ -111,7 +111,7 @@ if(istype(W, /obj/item/stock_parts/motor)) user.drop_item() qdel(W) - to_chat(user, "You add the motor to \the [src].") + to_chat(user, span_notice("You add the motor to \the [src].")) increase_step() return @@ -119,23 +119,23 @@ if(istype(W, /obj/item/stack/material/plasteel)) var/obj/item/stack/material/plasteel/PL = W if (PL.get_amount() < 2) - to_chat(user, "You need two sheets of plasteel to add reinforcement to \the [src].") + to_chat(user, span_warning("You need two sheets of plasteel to add reinforcement to \the [src].")) return - to_chat(user, "You start to add reinforcement to [src].") + to_chat(user, span_notice("You start to add reinforcement to [src].")) if(do_after(user, 40) && build_stage == 6) if(PL.use(2)) - to_chat(user, "You add reinforcement to \the [src].") + to_chat(user, span_notice("You add reinforcement to \the [src].")) increase_step("reinforced [initial(name)]") return if(7) if(W.has_tool_quality(TOOL_WRENCH) || W.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, W.usesound, 50, 1) - to_chat(user, "You begin your finishing touches on \the [src].") + to_chat(user, span_notice("You begin your finishing touches on \the [src].")) if(do_after(user, 20) && build_stage == 7) playsound(src, W.usesound, 30, 1) var/obj/vehicle/train/engine/quadbike/built/product = new(src) - to_chat(user, "You finish \the [product]") + to_chat(user, span_notice("You finish \the [product]")) product.loc = get_turf(src) product.cell = cell cell.forceMove(product) @@ -159,7 +159,7 @@ if(istype(W, /obj/item/vehicle_assembly/quadbike)) var/obj/item/vehicle_assembly/quadbike/Q = W if(Q.build_stage > 2) - to_chat(user, "\The [Q] is too advanced to be of use with \the [src]") + to_chat(user, span_notice("\The [Q] is too advanced to be of use with \the [src]")) return user.drop_item() qdel(W) @@ -169,19 +169,19 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W if (C.get_amount() < 2) - to_chat(user, "You need two coils of wire to wire [src].") + to_chat(user, span_warning("You need two coils of wire to wire [src].")) return - to_chat(user, "You start to wire [src].") + to_chat(user, span_notice("You start to wire [src].")) if(do_after(user, 40) && build_stage == 1) if(C.use(2)) - to_chat(user, "You wire \the [src].") + to_chat(user, span_notice("You wire \the [src].")) increase_step("wired [initial(name)]") return if(2) if(W.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, W.usesound, 50, 1) - to_chat(user, "You close up \the [src].") + to_chat(user, span_notice("You close up \the [src].")) var/obj/vehicle/train/trolley/trailer/product = new(src) product.loc = get_turf(src) user.drop_from_inventory(src) @@ -212,12 +212,12 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W if (C.get_amount() < 2) - to_chat(user, "You need two coils of wire to wire [src].") + to_chat(user, span_warning("You need two coils of wire to wire [src].")) return - to_chat(user, "You start to wire [src].") + to_chat(user, span_notice("You start to wire [src].")) if(do_after(user, 40) && build_stage == 1) if(C.use(2)) - to_chat(user, "You wire \the [src].") + to_chat(user, span_notice("You wire \the [src].")) increase_step("wired [initial(name)]") return @@ -225,12 +225,12 @@ if(istype(W, /obj/item/stack/material/plastic)) var/obj/item/stack/material/plastic/P = W if (P.get_amount() < 3) - to_chat(user, "You need three sheets of plastic to add a seat to \the [src].") + to_chat(user, span_warning("You need three sheets of plastic to add a seat to \the [src].")) return - to_chat(user, "You start to add a seat to [src].") + to_chat(user, span_notice("You start to add a seat to [src].")) if(do_after(user, 40) && build_stage == 2) if(P.use(3)) - to_chat(user, "You add a seat to \the [src].") + to_chat(user, span_notice("You add a seat to \the [src].")) increase_step("seated [initial(name)]") return @@ -238,7 +238,7 @@ if(istype(W, /obj/item/stock_parts/console_screen)) user.drop_item() qdel(W) - to_chat(user, "You add the lights to \the [src].") + to_chat(user, span_notice("You add the lights to \the [src].")) increase_step() return @@ -246,7 +246,7 @@ if(istype(W, /obj/item/stock_parts/spring)) user.drop_item() qdel(W) - to_chat(user, "You add the control system to \the [src].") + to_chat(user, span_notice("You add the control system to \the [src].")) increase_step() return @@ -255,18 +255,18 @@ user.drop_item() W.forceMove(src) cell = W - to_chat(user, "You add the power supply to \the [src].") + to_chat(user, span_notice("You add the power supply to \the [src].")) increase_step("powered [initial(name)]") return if(6) if(W.has_tool_quality(TOOL_WRENCH) || W.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, W.usesound, 50, 1) - to_chat(user, "You begin your finishing touches on \the [src].") + to_chat(user, span_notice("You begin your finishing touches on \the [src].")) if(do_after(user, 20) && build_stage == 6) playsound(src, W.usesound, 30, 1) var/obj/vehicle/bike/built/product = new(src) - to_chat(user, "You finish \the [product]") + to_chat(user, span_notice("You finish \the [product]")) product.loc = get_turf(src) product.cell = cell cell.forceMove(product) @@ -291,12 +291,12 @@ if(istype(W, /obj/item/stack/material/steel)) var/obj/item/stack/material/steel/S = W if (S.get_amount() < 6) - to_chat(user, "You need six sheets of steel to add treads to \the [src].") + to_chat(user, span_warning("You need six sheets of steel to add treads to \the [src].")) return - to_chat(user, "You start to add treads to [src].") + to_chat(user, span_notice("You start to add treads to [src].")) if(do_after(user, 40) && build_stage == 0) if(S.use(6)) - to_chat(user, "You add treads to \the [src].") + to_chat(user, span_notice("You add treads to \the [src].")) increase_step("tracked [initial(name)]") return @@ -304,7 +304,7 @@ if(istype(W, /obj/item/stock_parts/console_screen)) user.drop_item() qdel(W) - to_chat(user, "You add the lights to \the [src].") + to_chat(user, span_notice("You add the lights to \the [src].")) increase_step() return @@ -312,7 +312,7 @@ if(istype(W, /obj/item/stock_parts/spring)) user.drop_item() qdel(W) - to_chat(user, "You add the control system to \the [src].") + to_chat(user, span_notice("You add the control system to \the [src].")) increase_step() return @@ -320,12 +320,12 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W if (C.get_amount() < 2) - to_chat(user, "You need two coils of wire to wire [src].") + to_chat(user, span_warning("You need two coils of wire to wire [src].")) return - to_chat(user, "You start to wire [src].") + to_chat(user, span_notice("You start to wire [src].")) if(do_after(user, 40) && build_stage == 3) if(C.use(2)) - to_chat(user, "You wire \the [src].") + to_chat(user, span_notice("You wire \the [src].")) increase_step("wired [initial(name)]") return @@ -334,7 +334,7 @@ user.drop_item() W.forceMove(src) cell = W - to_chat(user, "You add the power supply to \the [src].") + to_chat(user, span_notice("You add the power supply to \the [src].")) increase_step("powered [initial(name)]") return @@ -342,7 +342,7 @@ if(istype(W, /obj/item/stock_parts/motor)) user.drop_item() qdel(W) - to_chat(user, "You add the motor to \the [src].") + to_chat(user, span_notice("You add the motor to \the [src].")) increase_step() return @@ -350,23 +350,23 @@ if(istype(W, /obj/item/stack/material/plasteel)) var/obj/item/stack/material/plasteel/PL = W if (PL.get_amount() < 2) - to_chat(user, "You need two sheets of plasteel to add reinforcement to \the [src].") + to_chat(user, span_warning("You need two sheets of plasteel to add reinforcement to \the [src].")) return - to_chat(user, "You start to add reinforcement to [src].") + to_chat(user, span_notice("You start to add reinforcement to [src].")) if(do_after(user, 40) && build_stage == 6) if(PL.use(2)) - to_chat(user, "You add reinforcement to \the [src].") + to_chat(user, span_notice("You add reinforcement to \the [src].")) increase_step("reinforced [initial(name)]") return if(7) if(W.has_tool_quality(TOOL_WRENCH) || W.has_tool_quality(TOOL_SCREWDRIVER)) playsound(src, W.usesound, 50, 1) - to_chat(user, "You begin your finishing touches on \the [src].") + to_chat(user, span_notice("You begin your finishing touches on \the [src].")) if(do_after(user, 20) && build_stage == 7) playsound(src, W.usesound, 30, 1) var/obj/vehicle/train/engine/quadbike/snowmobile/built/product = new(src) - to_chat(user, "You finish \the [product]") + to_chat(user, span_notice("You finish \the [product]")) product.loc = get_turf(src) product.cell = cell cell.forceMove(product) diff --git a/code/modules/vehicles/quad.dm b/code/modules/vehicles/quad.dm index 67f9494947..e1b41c914a 100644 --- a/code/modules/vehicles/quad.dm +++ b/code/modules/vehicles/quad.dm @@ -140,7 +140,7 @@ if(istype(A, /mob/living)) var/mob/living/M = A - visible_message("[src] knocks over [M]!") + visible_message(span_danger("[src] knocks over [M]!")) M.apply_effects(2, 2) // Knock people down for a short moment M.apply_damages(8 / move_delay) // Smaller amount of damage than a tug, since this will always be possible because Quads don't have safeties. var/list/throw_dirs = list(1, 2, 4, 8, 5, 6, 9, 10) @@ -154,7 +154,7 @@ M.throw_at(T2, 1, 1, src) if(istype(load, /mob/living/carbon/human)) var/mob/living/D = load - to_chat(D, "You hit [M]!") + to_chat(D, span_danger("You hit [M]!")) add_attack_logs(D,M,"Ran over with [src.name]") @@ -253,7 +253,7 @@ if(istype(A, /mob/living)) var/mob/living/M = A - visible_message("[src] knocks over [M]!") + visible_message(span_danger("[src] knocks over [M]!")) M.apply_effects(1, 1) M.apply_damages(8 / move_delay) if(load) @@ -265,7 +265,7 @@ M.throw_at(T2, 1, 1, src) if(istype(load, /mob/living/carbon/human)) var/mob/living/D = load - to_chat(D, "You hit [M]!") + to_chat(D, span_danger("You hit [M]!")) add_attack_logs(D,M,"Ran over with [src.name]") /obj/vehicle/train/trolley/trailer/update_icon() diff --git a/code/modules/vehicles/rover_vr.dm b/code/modules/vehicles/rover_vr.dm index fb5e5a8168..aeee4758c8 100644 --- a/code/modules/vehicles/rover_vr.dm +++ b/code/modules/vehicles/rover_vr.dm @@ -83,7 +83,7 @@ /obj/vehicle/train/rover/trolley/attackby(obj/item/W as obj, mob/user as mob) if(open && istype(W, /obj/item/tool/wirecutters)) passenger_allowed = !passenger_allowed - user.visible_message("[user] [passenger_allowed ? "cuts" : "mends"] a cable in [src].","You [passenger_allowed ? "cut" : "mend"] the load limiter cable.") + user.visible_message(span_notice("[user] [passenger_allowed ? "cuts" : "mends"] a cable in [src]."),span_notice("You [passenger_allowed ? "cut" : "mend"] the load limiter cable.")) else ..() @@ -180,8 +180,8 @@ if(is_train_head() && istype(load, /mob/living/carbon/human)) var/mob/living/carbon/human/D = load - to_chat(D, "You ran over \the [M]!") - visible_message("\The [src] ran over \the [M]!") + to_chat(D, span_danger("You ran over \the [M]!")) + visible_message(span_danger("\The [src] ran over \the [M]!")) add_attack_logs(D,M,"Ran over with [src.name]") attack_log += text("\[[time_stamp()]\] [span_red("ran over [M.name] ([M.ckey]), driven by [D.name] ([D.ckey])")]") else diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 75e94c9ad7..e696769633 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -100,7 +100,7 @@ if(!locked) open = !open update_icon() - to_chat(user, "Maintenance panel is now [open ? "opened" : "closed"].") + to_chat(user, span_notice("Maintenance panel is now [open ? "opened" : "closed"].")) playsound(src, W.usesound, 50, 1) else if(W.has_tool_quality(TOOL_CROWBAR) && cell && open) remove_cell(user) @@ -117,11 +117,11 @@ playsound(src, T.usesound, 50, 1) user.visible_message(span_red("[user] repairs [src]!"),span_blue("You repair [src]!")) else - to_chat(user, "Unable to repair with the maintenance panel closed.") + to_chat(user, span_notice("Unable to repair with the maintenance panel closed.")) else - to_chat(user, "[src] does not need a repair.") + to_chat(user, span_notice("[src] does not need a repair.")) else - to_chat(user, "Unable to repair while [src] is off.") + to_chat(user, span_notice("Unable to repair while [src] is off.")) else if(hasvar(W,"force") && hasvar(W,"damtype")) user.setClickCooldown(user.get_attack_speed(W)) @@ -226,7 +226,7 @@ emagged = 1 if(locked) locked = 0 - to_chat(user, "You bypass [src]'s controls.") + to_chat(user, span_warning("You bypass [src]'s controls.")) return TRUE /obj/vehicle/proc/explode() @@ -289,7 +289,7 @@ C.forceMove(src) cell = C powercheck() - to_chat(usr, "You install [C] in [src].") + to_chat(usr, span_notice("You install [C] in [src].")) /obj/vehicle/proc/remove_cell(var/mob/living/carbon/human/H) if(!mechanical) @@ -297,7 +297,7 @@ if(!cell) return - to_chat(usr, "You remove [cell] from [src].") + to_chat(usr, span_notice("You remove [cell] from [src].")) cell.forceMove(get_turf(H)) H.put_in_hands(cell) cell = null @@ -405,7 +405,7 @@ /obj/vehicle/attack_generic(var/mob/user, var/damage, var/attack_message) if(!damage) return - visible_message("[user] [attack_message] the [src]!") + visible_message(span_danger("[user] [attack_message] the [src]!")) user.attack_log += text("\[[time_stamp()]\] [span_red("attacked [src.name]")]") user.do_attack_animation(src) src.health -= damage diff --git a/code/modules/ventcrawl/ventcrawl.dm b/code/modules/ventcrawl/ventcrawl.dm index 098fc3c5ee..92d1ba0f06 100644 --- a/code/modules/ventcrawl/ventcrawl.dm +++ b/code/modules/ventcrawl/ventcrawl.dm @@ -27,16 +27,16 @@ var/list/ventcrawl_machinery = list( if(!client) return FALSE if(!(/mob/living/proc/ventcrawl in verbs)) - to_chat(src, "You don't possess the ability to ventcrawl!") + to_chat(src, span_warning("You don't possess the ability to ventcrawl!")) return FALSE if(pulling) - to_chat(src, "You cannot bring \the [pulling] into the vent with you!") + to_chat(src, span_warning("You cannot bring \the [pulling] into the vent with you!")) return FALSE if(incapacitated()) - to_chat(src, "You cannot ventcrawl in your current state!") + to_chat(src, span_warning("You cannot ventcrawl in your current state!")) return FALSE if(buckled) - to_chat(src, "You cannot ventcrawl while buckled!") + to_chat(src, span_warning("You cannot ventcrawl while buckled!")) return FALSE if(restrict_vore_ventcrawl) var/foundstuff = FALSE @@ -45,7 +45,7 @@ var/list/ventcrawl_machinery = list( foundstuff = TRUE break if(foundstuff) - to_chat(src, "You cannot ventcrawl while full!") + to_chat(src, span_warning("You cannot ventcrawl while full!")) return FALSE return ventcrawl_carry() @@ -59,7 +59,7 @@ var/list/ventcrawl_machinery = list( /mob/living/simple_mob/slime/xenobio/can_ventcrawl() if(victim) - to_chat(src, "You cannot ventcrawl while feeding.") + to_chat(src, span_warning("You cannot ventcrawl while feeding.")) return FALSE . = ..() @@ -102,7 +102,7 @@ var/list/ventcrawl_machinery = list( /mob/living/proc/ventcrawl_carry() for(var/atom/A in contents) if(!is_allowed_vent_crawl_item(A)) - to_chat(src, "You can't carry \the [A] while ventcrawling!") + to_chat(src, span_warning("You can't carry \the [A] while ventcrawling!")) return FALSE return TRUE @@ -162,23 +162,23 @@ var/list/ventcrawl_machinery = list( switch(vent_found.air_contents.temperature) if(0 to BODYTEMP_COLD_DAMAGE_LIMIT) - to_chat(src, "You feel a painful freeze coming from the vent!") + to_chat(src, span_danger("You feel a painful freeze coming from the vent!")) if(BODYTEMP_COLD_DAMAGE_LIMIT to T0C) - to_chat(src, "You feel an icy chill coming from the vent.") + to_chat(src, span_warning("You feel an icy chill coming from the vent.")) if(T0C + 40 to BODYTEMP_HEAT_DAMAGE_LIMIT) - to_chat(src, "You feel a hot wash coming from the vent.") + to_chat(src, span_warning("You feel a hot wash coming from the vent.")) if(BODYTEMP_HEAT_DAMAGE_LIMIT to INFINITY) - to_chat(src, "You feel a searing heat coming from the vent!") + to_chat(src, span_danger("You feel a searing heat coming from the vent!")) switch(vent_found.air_contents.return_pressure()) if(0 to HAZARD_LOW_PRESSURE) - to_chat(src, "You feel a rushing draw pulling you into the vent!") + to_chat(src, span_danger("You feel a rushing draw pulling you into the vent!")) if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE) - to_chat(src, "You feel a strong drag pulling you into the vent.") + to_chat(src, span_warning("You feel a strong drag pulling you into the vent.")) if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE) - to_chat(src, "You feel a strong current pushing you away from the vent.") + to_chat(src, span_warning("You feel a strong current pushing you away from the vent.")) if(HAZARD_HIGH_PRESSURE to INFINITY) - to_chat(src, "You feel a roaring wind pushing you away from the vent!") + to_chat(src, span_danger("You feel a roaring wind pushing you away from the vent!")) fade_towards(vent_found,45) prepping_to_ventcrawl = 1 diff --git a/code/modules/virus2/admin.dm b/code/modules/virus2/admin.dm index 9975268162..afde3cbb57 100644 --- a/code/modules/virus2/admin.dm +++ b/code/modules/virus2/admin.dm @@ -215,7 +215,7 @@ spawned_viruses += D - message_admins("[key_name_admin(usr)] infected [key_name_admin(infectee)] with a virus (Info)") + message_admins(span_danger("[key_name_admin(usr)] infected [key_name_admin(infectee)] with a virus (Info)")) log_admin("[key_name_admin(usr)] infected [key_name_admin(infectee)] with a virus!") infect_virus2(infectee, D, forced=1) diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm index 6045284b4c..8f088ee0e6 100644 --- a/code/modules/virus2/effect.dm +++ b/code/modules/virus2/effect.dm @@ -83,14 +83,14 @@ var/mob/living/carbon/human/H = mob var/obj/item/organ/external/O = pick(H.organs) if(prob(25)) - to_chat(mob, "Your [O.name] feels as if it might burst!") + to_chat(mob, span_warning("Your [O.name] feels as if it might burst!")) if(prob(10)) spawn(50) if(O) O.droplimb(0,DROPLIMB_BLUNT) else if(prob(75)) - to_chat(mob, "Your whole body feels like it might fall apart!") + to_chat(mob, span_warning("Your whole body feels like it might fall apart!")) if(prob(10)) mob.adjustBruteLoss(25*multiplier) @@ -151,7 +151,7 @@ var/obj/item/organ/external/E = H.organs_by_name[organ] if (!(E.status & ORGAN_DEAD)) E.status |= ORGAN_DEAD - to_chat(H, "You can't feel your [E.name] anymore...") + to_chat(H, span_notice("You can't feel your [E.name] anymore...")) for (var/obj/item/organ/external/C in E.children) C.status |= ORGAN_DEAD H.update_icons_body() @@ -178,7 +178,7 @@ var/obj/item/organ/internal/O = H.organs_by_name[organ] if (O.robotic != ORGAN_ROBOT) O.damage += (5*multiplier) - to_chat(H, "You feel a cramp in your guts.") + to_chat(H, span_notice("You feel a cramp in your guts.")) /datum/disease2/effect/immortal name = "Hyperaccelerated Aging" @@ -197,7 +197,7 @@ /datum/disease2/effect/immortal/deactivate(var/mob/living/carbon/mob,var/multiplier) if(istype(mob, /mob/living/carbon/human)) var/mob/living/carbon/human/H = mob - to_chat(H, "You suddenly feel hurt and old...") + to_chat(H, span_notice("You suddenly feel hurt and old...")) H.age += 8 var/backlash_amt = 5*multiplier mob.apply_damages(backlash_amt,backlash_amt,backlash_amt,backlash_amt) @@ -228,10 +228,10 @@ var/mob/living/carbon/human/H = mob var/obj/item/organ/external/O = pick(H.organs) if(prob(25)) - to_chat(mob, "It feels like your [O.name] is on fire and your blood is boiling!") + to_chat(mob, span_warning("It feels like your [O.name] is on fire and your blood is boiling!")) H.adjust_fire_stacks(1) if(prob(10)) - to_chat(mob, "Flames erupt from your skin, your entire body is burning!") + to_chat(mob, span_warning("Flames erupt from your skin, your entire body is burning!")) H.adjust_fire_stacks(2) H.IgniteMob() @@ -298,14 +298,14 @@ if(prob(66)) mob.say("*giggle") else - to_chat(mob, "What's so funny?") + to_chat(mob, span_notice("What's so funny?")) /datum/disease2/effect/confusion name = "Topographical Cretinism" stage = 3 /datum/disease2/effect/confusion/activate(var/mob/living/carbon/mob,var/multiplier) - to_chat(mob, "You have trouble telling right and left apart all of a sudden.") + to_chat(mob, span_notice("You have trouble telling right and left apart all of a sudden.")) mob.Confuse(10) /datum/disease2/effect/mutation @@ -326,7 +326,7 @@ else if(istype(mob, /mob/living/carbon/human)) var/mob/living/carbon/human/H = mob var/obj/item/organ/external/E = pick(H.organs) - to_chat(mob, "Your [E] aches.") + to_chat(mob, span_warning("Your [E] aches.")) /datum/disease2/effect/chem_synthesis name = "Chemical Synthesis" @@ -403,7 +403,7 @@ for(var/mob/living/carbon/M in oview(2,mob)) mob.spread_disease_to(M) else - to_chat(mob, "Something gets caught in your throat.") + to_chat(mob, span_warning("Something gets caught in your throat.")) /datum/disease2/effect/hungry name = "Digestive Inefficiency" @@ -428,7 +428,7 @@ if(istype(mob, /mob/living/carbon/human)) var/mob/living/carbon/human/H = mob if(H.species.name == SPECIES_HUMAN && !(H.h_style == "Bald") && !(H.h_style == "Balding Hair")) - to_chat(H, "Your hair starts to fall out in clumps...") + to_chat(H, span_danger("Your hair starts to fall out in clumps...")) spawn(50) H.h_style = "Balding Hair" H.update_hair() @@ -438,7 +438,7 @@ stage = 2 /datum/disease2/effect/stimulant/activate(var/mob/living/carbon/mob,var/multiplier) - to_chat(mob, "You feel a rush of energy inside you!") + to_chat(mob, span_notice("You feel a rush of energy inside you!")) if (mob.reagents.get_reagent_amount("hyperzine") < 10) mob.reagents.add_reagent("hyperzine", 4) if (prob(30)) @@ -452,7 +452,7 @@ /datum/disease2/effect/ringing/activate(var/mob/living/carbon/mob,var/multiplier) if(istype(mob, /mob/living/carbon/human)) var/mob/living/carbon/human/H = mob - to_chat(H, "You hear an awful ringing in your ears.") + to_chat(H, span_notice("You hear an awful ringing in your ears.")) H << 'sound/weapons/flash.ogg' /datum/disease2/effect/vomiting @@ -461,7 +461,7 @@ chance_maxm = 15 /datum/disease2/effect/vomiting/activate(var/mob/living/carbon/mob,var/multiplier) - to_chat(mob, "Your stomach churns!") + to_chat(mob, span_notice("Your stomach churns!")) if (prob(50)) mob.say("*vomit") @@ -474,10 +474,10 @@ /datum/disease2/effect/sneeze/activate(var/mob/living/carbon/mob,var/multiplier) if(prob(20)) - to_chat(mob, "You go to sneeze, but it gets caught in your sinuses!") + to_chat(mob, span_warning("You go to sneeze, but it gets caught in your sinuses!")) else if(prob(80)) if(prob(30)) - to_chat(mob, "You feel like you are about to sneeze!") + to_chat(mob, span_warning("You feel like you are about to sneeze!")) spawn(5) //Sleep may have been hanging Mob controller. mob.say("*sneeze") for(var/mob/living/carbon/M in get_step(mob,mob.dir)) @@ -491,7 +491,7 @@ stage = 1 /datum/disease2/effect/gunck/activate(var/mob/living/carbon/mob,var/multiplier) - to_chat(mob, "Mucous runs down the back of your throat.") + to_chat(mob, span_warning("Mucous runs down the back of your throat.")) /datum/disease2/effect/drool name = "Salivary Gland Stimulation" @@ -517,4 +517,4 @@ stage = 1 /datum/disease2/effect/headache/activate(var/mob/living/carbon/mob,var/multiplier) - to_chat(mob, "Your head hurts a bit.") + to_chat(mob, span_warning("Your head hurts a bit.")) diff --git a/code/modules/virus2/effect_vr.dm b/code/modules/virus2/effect_vr.dm index eee9d2da8a..307111f44e 100644 --- a/code/modules/virus2/effect_vr.dm +++ b/code/modules/virus2/effect_vr.dm @@ -17,9 +17,9 @@ /datum/disease2/effect/spin/activate(var/mob/living/carbon/mob,var/multiplier) if(mob.buckled()) - to_chat(viewers(mob),"[mob.name] struggles violently against their restraints!") + to_chat(viewers(mob),span_warning("[mob.name] struggles violently against their restraints!")) else - to_chat(viewers(mob),"[mob.name] spins around violently!") + to_chat(viewers(mob),span_warning("[mob.name] spins around violently!")) for(var/D in directions) mob.dir = D sleep(1) @@ -47,7 +47,7 @@ /datum/disease2/effect/size/activate(var/mob/living/carbon/mob,var/multiplier) var/newsize = rand (25, 200) mob.resize(newsize/100) - to_chat(viewers(mob),"[mob.name] suddenly changes size!") + to_chat(viewers(mob),span_warning("[mob.name] suddenly changes size!")) /datum/disease2/effect/flip name = "Flipponov's Disease" @@ -59,5 +59,5 @@ var/mob/living/carbon/human/H = mob H.emote("flip") else - to_chat(viewers(mob),"[mob.name] does a backflip!") + to_chat(viewers(mob),span_warning("[mob.name] does a backflip!")) mob.SpinAnimation(7,1) diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm index 280d0e653a..ee9d4b6377 100644 --- a/code/modules/virus2/items_devices.dm +++ b/code/modules/virus2/items_devices.dm @@ -61,7 +61,7 @@ return ..() //VOREstation edit end if(prob(50)) - to_chat(user, "\The [src] shatters!") + to_chat(user, span_danger("\The [src] shatters!")) if(virus2.infectionchance > 0) for(var/mob/living/carbon/target in view(1, get_turf(src))) if(airborne_can_reach(get_turf(src), get_turf(target))) diff --git a/code/modules/vore/chat_healthbars.dm b/code/modules/vore/chat_healthbars.dm index 0ddab45b7a..c96f08e909 100644 --- a/code/modules/vore/chat_healthbars.dm +++ b/code/modules/vore/chat_healthbars.dm @@ -108,9 +108,9 @@ ourbar = span_red("[ourbar] - [digest_mode]ed") if(onExamine) - to_chat(reciever,"[ourbar]") + to_chat(reciever,span_notice("[ourbar]")) else - to_chat(reciever,"[ourbar]") + to_chat(reciever,span_vnotice("[ourbar]")) /mob/living/verb/print_healthbars() set name = "Print Prey Healthbars" @@ -123,7 +123,7 @@ if(istype(amprey)) var/datum/digest_mode/selective/DM_S = GLOB.digest_modes[DM_SELECT] var/digest_mode = amprey.digest_mode == DM_SELECT ? DM_S.get_selective_mode(amprey, src) : amprey.digest_mode - to_chat(src, "[digest_mode] - You are in [amprey.owner]'s [amprey.name]:") + to_chat(src, span_notice("[digest_mode] - You are in [amprey.owner]'s [amprey.name]:")) src.chat_healthbar(src, TRUE, TRUE) nuffin = FALSE @@ -137,10 +137,10 @@ if(!belly_announce) var/datum/digest_mode/selective/DM_S = GLOB.digest_modes[DM_SELECT] var/digest_mode = b.digest_mode == DM_SELECT ? DM_S.get_selective_mode(b, thing) : b.digest_mode - to_chat(src, "[digest_mode] - Within your [b.name]:") //We only want to announce the belly if we found something + to_chat(src, span_notice("[digest_mode] - Within your [b.name]:")) //We only want to announce the belly if we found something belly_announce = TRUE var/mob/living/ourmob = thing ourmob.chat_healthbar(src, TRUE, TRUE) nuffin = FALSE if(nuffin) - to_chat(src, "There are no mobs within any of your bellies to print health bars for, and you are not in a belly yourself.") + to_chat(src, span_warning("There are no mobs within any of your bellies to print health bars for, and you are not in a belly yourself.")) diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index bf45c74d00..804f28a8c5 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -426,14 +426,14 @@ formatted_desc = replacetext(desc, "%belly", lowertext(name)) //replace with this belly's name formatted_desc = replacetext(formatted_desc, "%pred", owner) //replace with this belly's owner formatted_desc = replacetext(formatted_desc, "%prey", thing) //replace with whatever mob entered into this belly - to_chat(thing, "[formatted_desc]") + to_chat(thing, span_notice("[formatted_desc]")) if(OldLoc in contents) return //Someone dropping something (or being stripdigested) //Generic entered message if(!istype(thing, /mob/observer)) //Don't have ghosts announce they're reentering the belly on death - to_chat(owner,"[thing] slides into your [lowertext(name)].") + to_chat(owner,span_vnotice("[thing] slides into your [lowertext(name)].")) //Sound w/ antispam flag setting if(vore_sound && !recent_sound && !istype(thing, /mob/observer)) @@ -463,11 +463,11 @@ formatted_desc = replacetext(raw_desc, "%belly", lowertext(name)) //replace with this belly's name formatted_desc = replacetext(formatted_desc, "%pred", owner) //replace with this belly's owner formatted_desc = replacetext(formatted_desc, "%prey", M) //replace with whatever mob entered into this belly - to_chat(M, "[formatted_desc]") + to_chat(M, span_vnotice("[formatted_desc]")) var/taste if(can_taste && (taste = M.get_taste_message(FALSE))) - to_chat(owner, "[M] tastes of [taste].") + to_chat(owner, span_vnotice("[M] tastes of [taste].")) vore_fx(M) //Stop AI processing in bellies if(M.ai_holder) @@ -542,7 +542,7 @@ if(disable_hud) if(L?.hud_used?.hud_shown) - to_chat(L, "((Your pred has disabled huds in their belly. Turn off vore FX and hit F12 to get it back; or relax, and enjoy the serenity.))") + to_chat(L, span_vnotice("((Your pred has disabled huds in their belly. Turn off vore FX and hit F12 to get it back; or relax, and enjoy the serenity.))")) L.toggle_hud_vis(TRUE) /obj/belly/proc/vore_preview(mob/living/L) @@ -624,7 +624,7 @@ //Print notifications/sound if necessary if(!silent && count) - owner.visible_message("[span_green("[owner] [release_verb] everything from their [lowertext(name)]!")]", range = privacy_range) + owner.visible_message(span_vnotice("[span_green("[owner] [release_verb] everything from their [lowertext(name)]!")]"), range = privacy_range) var/soundfile if(!fancy_vore) soundfile = classic_release_sounds[release_sound] @@ -710,7 +710,7 @@ //Print notifications/sound if necessary if(!silent && !isobserver(M)) - owner.visible_message("[span_green("[owner] [release_verb] [M] from their [lowertext(name)]!")]",range = privacy_range) + owner.visible_message(span_vnotice("[span_green("[owner] [release_verb] [M] from their [lowertext(name)]!")]"),range = privacy_range) var/soundfile if(!fancy_vore) soundfile = classic_release_sounds[release_sound] @@ -1142,8 +1142,8 @@ GLOB.prey_absorbed_roundstat++ - to_chat(M, "[absorb_alert_prey]") - to_chat(owner, "[absorb_alert_owner]") + to_chat(M, span_vnotice("[absorb_alert_prey]")) + to_chat(owner, span_vnotice("[absorb_alert_owner]")) if(M.noisy) //Mute drained absorbee hunger if enabled. M.noisy = FALSE @@ -1181,7 +1181,7 @@ formatted_abs_desc = replacetext(absorbed_desc, "%belly", lowertext(name)) //replace with this belly's name formatted_abs_desc = replacetext(formatted_abs_desc, "%pred", owner) //replace with this belly's owner formatted_abs_desc = replacetext(formatted_abs_desc, "%prey", M) //replace with whatever mob entered into this belly - to_chat(M, "[formatted_abs_desc]") + to_chat(M, span_vnotice("[formatted_abs_desc]")) //Update owner owner.updateVRPanel() @@ -1195,7 +1195,7 @@ dest_belly = B break if(!dest_belly) - to_chat(owner, "Something went wrong with your belly transfer settings. Your [lowertext(name)] has had its transfer location cleared as a precaution.") + to_chat(owner, span_vwarning("Something went wrong with your belly transfer settings. Your [lowertext(name)] has had its transfer location cleared as a precaution.")) transferlocation_absorb = null return @@ -1224,11 +1224,11 @@ M.absorbed = FALSE handle_absorb_langs(M, owner) - to_chat(M, "[unabsorb_alert_prey]") - to_chat(owner, "[unabsorb_alert_owner]") + to_chat(M, span_vnotice("[unabsorb_alert_prey]")) + to_chat(owner, span_vnotice("[unabsorb_alert_owner]")) if(desc) - to_chat(M, "[desc]") + to_chat(M, span_vnotice("[desc]")) //Update owner owner.updateVRPanel() @@ -1317,10 +1317,10 @@ escape_fail_prey_message = replacetext(escape_fail_prey_message, "%countprey", living_count) escape_fail_prey_message = replacetext(escape_fail_prey_message, "%count", contents.len) - escape_attempt_owner_message = "[escape_attempt_owner_message]" - escape_attempt_prey_message = "[escape_attempt_prey_message]" - escape_fail_owner_message = "[escape_fail_owner_message]" - escape_fail_prey_message = "[escape_fail_prey_message]" + escape_attempt_owner_message = span_vwarning("[escape_attempt_owner_message]") + escape_attempt_prey_message = span_vwarning("[escape_attempt_prey_message]") + escape_fail_owner_message = span_vwarning("[escape_fail_owner_message]") + escape_fail_prey_message = span_vnotice("[escape_fail_prey_message]") if(owner.stat) //If owner is stat (dead, KO) we can actually escape escape_attempt_prey_message = replacetext(escape_attempt_prey_message, new/regex("^(]*)?>.*)()$", ""), "$1 (This will take around [escapetime/10] seconds.)$2") @@ -1357,8 +1357,8 @@ struggle_user_message = replacetext(struggle_user_message, "%countprey", living_count) struggle_user_message = replacetext(struggle_user_message, "%count", contents.len) - struggle_outer_message = "[struggle_outer_message]" - struggle_user_message = "[struggle_user_message]" + struggle_outer_message = span_valert("[struggle_outer_message]") + struggle_user_message = span_valert("[struggle_user_message]") for(var/mob/M in hearers(4, owner)) M.show_message(struggle_outer_message, 2) // hearable @@ -1411,9 +1411,9 @@ escape_item_outside_message = replacetext(escape_item_outside_message, "%count", contents.len) escape_item_outside_message = replacetext(escape_item_outside_message, "%item", C) - escape_item_owner_message = "[escape_item_owner_message]" - escape_item_prey_message = "[escape_item_prey_message]" - escape_item_outside_message = "[escape_item_outside_message]" + escape_item_owner_message = span_vwarning("[escape_item_owner_message]") + escape_item_prey_message = span_vwarning("[escape_item_prey_message]") + escape_item_outside_message = span_vwarning("[escape_item_outside_message]") release_specific_contents(C) to_chat(R, escape_item_prey_message) @@ -1444,9 +1444,9 @@ escape_outside_message = replacetext(escape_outside_message, "%countprey", living_count) escape_outside_message = replacetext(escape_outside_message, "%count", contents.len) - escape_owner_message = "[escape_owner_message]" - escape_prey_message = "[escape_prey_message]" - escape_outside_message = "[escape_outside_message]" + escape_owner_message = span_vwarning("[escape_owner_message]") + escape_prey_message = span_vwarning("[escape_prey_message]") + escape_outside_message = span_vwarning("[escape_outside_message]") release_specific_contents(R) to_chat(R, escape_prey_message) to_chat(owner, escape_owner_message) @@ -1468,7 +1468,7 @@ break if(!dest_belly) - to_chat(owner, "Something went wrong with your belly transfer settings. Your [lowertext(name)] has had it's transfer chance and transfer location cleared as a precaution.") + to_chat(owner, span_vwarning("Something went wrong with your belly transfer settings. Your [lowertext(name)] has had it's transfer chance and transfer location cleared as a precaution.")) transferchance = 0 transferlocation = null return @@ -1489,8 +1489,8 @@ primary_transfer_prey_message = replacetext(primary_transfer_prey_message, "%count", contents.len) primary_transfer_prey_message = replacetext(primary_transfer_prey_message, "%dest", transferlocation) - primary_transfer_owner_message = "[primary_transfer_owner_message]" - primary_transfer_prey_message = "[primary_transfer_prey_message]" + primary_transfer_owner_message = span_vwarning("[primary_transfer_owner_message]") + primary_transfer_prey_message = span_vwarning("[primary_transfer_prey_message]") to_chat(R, primary_transfer_prey_message) to_chat(owner, primary_transfer_owner_message) @@ -1508,7 +1508,7 @@ break if(!dest_belly) - to_chat(owner, "Something went wrong with your belly transfer settings. Your [lowertext(name)] has had it's transfer chance and transfer location cleared as a precaution.") + to_chat(owner, span_vwarning("Something went wrong with your belly transfer settings. Your [lowertext(name)] has had it's transfer chance and transfer location cleared as a precaution.")) transferchance_secondary = 0 transferlocation_secondary = null return @@ -1530,8 +1530,8 @@ secondary_transfer_prey_message = replacetext(secondary_transfer_prey_message, "%count", contents.len) secondary_transfer_prey_message = replacetext(secondary_transfer_prey_message, "%dest", transferlocation_secondary) - secondary_transfer_owner_message = "[secondary_transfer_owner_message]" - secondary_transfer_prey_message = "[secondary_transfer_prey_message]" + secondary_transfer_owner_message = span_vwarning("[secondary_transfer_owner_message]") + secondary_transfer_prey_message = span_vwarning("[secondary_transfer_prey_message]") to_chat(R, secondary_transfer_prey_message) to_chat(owner, secondary_transfer_owner_message) @@ -1557,8 +1557,8 @@ absorb_chance_prey_message = replacetext(absorb_chance_prey_message, "%countprey", living_count) absorb_chance_prey_message = replacetext(absorb_chance_prey_message, "%count", contents.len) - absorb_chance_owner_message = "[absorb_chance_owner_message]" - absorb_chance_prey_message = "[absorb_chance_prey_message]" + absorb_chance_owner_message = span_vwarning("[absorb_chance_owner_message]") + absorb_chance_prey_message = span_vwarning("[absorb_chance_prey_message]") to_chat(R, absorb_chance_prey_message) to_chat(owner, absorb_chance_owner_message) @@ -1581,8 +1581,8 @@ digest_chance_prey_message = replacetext(digest_chance_prey_message, "%countprey", living_count) digest_chance_prey_message = replacetext(digest_chance_prey_message, "%count", contents.len) - digest_chance_owner_message = "[digest_chance_owner_message]" - digest_chance_prey_message = "[digest_chance_prey_message]" + digest_chance_owner_message = span_vwarning("[digest_chance_owner_message]") + digest_chance_prey_message = span_vwarning("[digest_chance_prey_message]") to_chat(R, digest_chance_prey_message) to_chat(owner, digest_chance_owner_message) @@ -1604,8 +1604,8 @@ select_chance_prey_message = replacetext(select_chance_prey_message, "%countprey", living_count) select_chance_prey_message = replacetext(select_chance_prey_message, "%count", contents.len) - select_chance_owner_message = "[select_chance_owner_message]" - select_chance_prey_message = "[select_chance_prey_message]" + select_chance_owner_message = span_vwarning("[select_chance_owner_message]") + select_chance_prey_message = span_vwarning("[select_chance_prey_message]") to_chat(R, select_chance_prey_message) to_chat(owner, select_chance_owner_message) @@ -1613,7 +1613,7 @@ else //Nothing interesting happened. to_chat(R, struggle_user_message) - to_chat(owner, "Your prey appears to be unable to make any progress in escaping your [lowertext(name)].") + to_chat(owner, span_vwarning("Your prey appears to be unable to make any progress in escaping your [lowertext(name)].")) return to_chat(R, struggle_user_message) @@ -1641,8 +1641,8 @@ struggle_user_message = replacetext(struggle_user_message, "%belly", lowertext(name)) struggle_user_message = replacetext(struggle_user_message, "%countprey", absorbed_count) - struggle_outer_message = "[struggle_outer_message]" - struggle_user_message = "[struggle_user_message]" + struggle_outer_message = span_valert("[struggle_outer_message]") + struggle_user_message = span_valert("[struggle_user_message]") for(var/mob/M in hearers(4, owner)) M.show_message(struggle_outer_message, 2) // hearable @@ -1683,8 +1683,8 @@ escape_attempt_absorbed_prey_message = replacetext(escape_attempt_absorbed_prey_message, "%countprey", living_count) escape_attempt_absorbed_prey_message = replacetext(escape_attempt_absorbed_prey_message, "%count", contents.len) - escape_attempt_absorbed_owner_message = "[escape_attempt_absorbed_owner_message]" - escape_attempt_absorbed_prey_message = "[escape_attempt_absorbed_prey_message]" + escape_attempt_absorbed_owner_message = span_vwarning("[escape_attempt_absorbed_owner_message]") + escape_attempt_absorbed_prey_message = span_vwarning("[escape_attempt_absorbed_prey_message]") to_chat(R, escape_attempt_absorbed_prey_message) to_chat(owner, escape_attempt_absorbed_owner_message) @@ -1712,9 +1712,9 @@ escape_absorbed_outside_message = replacetext(escape_absorbed_outside_message, "%countprey", living_count) escape_absorbed_outside_message = replacetext(escape_absorbed_outside_message, "%count", contents.len) - escape_absorbed_owner_message = "[escape_absorbed_owner_message]" - escape_absorbed_prey_message = "[escape_absorbed_prey_message]" - escape_absorbed_outside_message = "[escape_absorbed_outside_message]" + escape_absorbed_owner_message = span_vwarning("[escape_absorbed_owner_message]") + escape_absorbed_prey_message = span_vwarning("[escape_absorbed_prey_message]") + escape_absorbed_outside_message = span_vwarning("[escape_absorbed_outside_message]") release_specific_contents(R) to_chat(R, escape_absorbed_prey_message) @@ -1741,8 +1741,8 @@ escape_fail_absorbed_prey_message = replacetext(escape_fail_absorbed_prey_message, "%countprey", living_count) escape_fail_absorbed_prey_message = replacetext(escape_fail_absorbed_prey_message, "%count", contents.len) - escape_fail_absorbed_owner_message = "[escape_fail_absorbed_owner_message]" - escape_fail_absorbed_prey_message = "[escape_fail_absorbed_prey_message]" + escape_fail_absorbed_owner_message = span_vwarning("[escape_fail_absorbed_owner_message]") + escape_fail_absorbed_prey_message = span_vnotice("[escape_fail_absorbed_prey_message]") to_chat(R, escape_fail_absorbed_prey_message) to_chat(owner, escape_fail_absorbed_owner_message) diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 6c9f8d116b..73a8f5ce34 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -125,7 +125,7 @@ formatted_message = replacetext(formatted_message, "%prey", M) formatted_message = replacetext(formatted_message, "%countprey", absorbed_count) if(formatted_message) - to_chat(M, "[formatted_message]") + to_chat(M, span_vnotice("[formatted_message]")) else if (digest_mode == DM_SELECT) var/datum/digest_mode/selective/DM_S = GLOB.digest_modes[DM_SELECT] @@ -141,7 +141,7 @@ formatted_message = replacetext(formatted_message, "%countprey", living_count) formatted_message = replacetext(formatted_message, "%count", contents.len) if(formatted_message) - to_chat(M, "[formatted_message]") + to_chat(M, span_vnotice("[formatted_message]")) if(to_update) updateVRPanels() @@ -284,8 +284,8 @@ digest_alert_prey = replacetext(digest_alert_prey, "%count", contents.len) //Send messages - to_chat(owner, "[digest_alert_owner]") - to_chat(M, "[digest_alert_prey]") + to_chat(owner, span_vnotice("[digest_alert_owner]")) + to_chat(M, span_vnotice("[digest_alert_prey]")) if(M.ckey) GLOB.prey_digested_roundstat++ @@ -317,8 +317,8 @@ if(L.tiredness <= 105) L.tiredness = (L.tiredness + 6) if(L.tiredness <= 90 && L.tiredness >= 75) - to_chat(L, "You are about to fall unconscious!") - to_chat(owner, "[L] is about to fall unconscious!") + to_chat(L, span_warning("You are about to fall unconscious!")) + to_chat(owner, span_warning("[L] is about to fall unconscious!")) if(drainmode == DR_FAKE && istype(L,/mob/living/carbon/human)) //Slowly bring prey to the edge of sleep without crossing it if(L.tiredness <= 93) L.tiredness = (L.tiredness + 6) diff --git a/code/modules/vore/eating/contaminate_vr.dm b/code/modules/vore/eating/contaminate_vr.dm index e74b59607a..39cc0c6094 100644 --- a/code/modules/vore/eating/contaminate_vr.dm +++ b/code/modules/vore/eating/contaminate_vr.dm @@ -67,13 +67,13 @@ var/list/gurgled_overlays = list( /obj/structure/sink/attackby(obj/item/I, mob/user) //Wash the soggy item before it can interact with the sink. if(istype(I) && I.gurgled) - to_chat(user, "You start washing [I].") + to_chat(user, span_notice("You start washing [I].")) busy = TRUE if(do_after(user, 40, src)) I.clean_blood() - user.visible_message("[user] washes [I] using [src].", - "You wash [I] using [src].") + user.visible_message(span_notice("[user] washes [I] using [src]."), + span_notice("You wash [I] using [src].")) busy = FALSE else ..() diff --git a/code/modules/vore/eating/leave_remains_vr.dm b/code/modules/vore/eating/leave_remains_vr.dm index 9855388424..4f07959c5c 100644 --- a/code/modules/vore/eating/leave_remains_vr.dm +++ b/code/modules/vore/eating/leave_remains_vr.dm @@ -116,7 +116,7 @@ /obj/item/digestion_remains/attack_self(var/mob/user) if(user.a_intent == I_HURT) - to_chat(user,"As you squeeze the [name], it crumbles into dust and falls apart into nothing!") + to_chat(user,span_warning("As you squeeze the [name], it crumbles into dust and falls apart into nothing!")) qdel(src) /obj/item/digestion_remains/ribcage diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index f2681de169..54900800d5 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -59,7 +59,7 @@ //We'll load our client's organs if we have one if(client && client.prefs_vr) if(!copy_from_prefs_vr()) - to_chat(src,"ERROR: You seem to have saved VOREStation prefs, but they couldn't be loaded.") + to_chat(src,span_warning("ERROR: You seem to have saved VOREStation prefs, but they couldn't be loaded.")) return FALSE if(LAZYLEN(vore_organs)) vore_selected = vore_organs[1] @@ -124,7 +124,7 @@ if(istype(victim) && !victim.client && !victim.ai_holder) //Check whether the victim is: A carbon mob, has no client, but has a ckey. This should indicate an SSD player. log_and_message_admins("[key_name_admin(attacker)] attempted to force feed themselves to [key_name_admin(G.affecting)] whilst they were AFK ([G.affecting ? ADMIN_JMP(G.affecting) : "null"])") if(!G.affecting.feeding) - to_chat(user, "[G.affecting] isn't willing to be fed.") + to_chat(user, span_vnotice("[G.affecting] isn't willing to be fed.")) log_and_message_admins("[key_name_admin(src)] attempted to feed themselves to [key_name_admin(G.affecting)] against their prefs ([G.affecting ? ADMIN_JMP(G.affecting) : "null"])") return FALSE @@ -143,11 +143,11 @@ log_and_message_admins("[key_name_admin(attacker)] attempted to feed [key_name_admin(G.affecting)] to [key_name_admin(src)] whilst [key_name_admin(src)] was AFK ([G.affecting ? ADMIN_JMP(G.affecting) : "null"])") if(!feeding) - to_chat(user, "[src] isn't willing to be fed.") + to_chat(user, span_vnotice("[src] isn't willing to be fed.")) log_and_message_admins("[key_name_admin(attacker)] attempted to feed [key_name_admin(G.affecting)] to [key_name_admin(src)] against predator's prefs ([src ? ADMIN_JMP(src) : "null"])") return FALSE if(!(G.affecting.devourable)) - to_chat(user, "[G.affecting] isn't able to be devoured.") + to_chat(user, span_vnotice("[G.affecting] isn't able to be devoured.")) log_and_message_admins("[key_name_admin(attacker)] attempted to feed [key_name_admin(G.affecting)] to [key_name_admin(src)] against prey's prefs ([G.affecting ? ADMIN_JMP(G.affecting) : "null"])") return FALSE if(attacker.feed_grabbed_to_other(attacker, G.affecting, src)) @@ -178,8 +178,8 @@ var/obj/belly/B = tgui_input_list(usr, "Which belly?", "Select A Belly", vore_organs) if(!istype(B)) return TRUE - visible_message("[user] is trying to stuff a beacon into [src]'s [lowertext(B.name)]!", - "[user] is trying to stuff a beacon into you!") + visible_message(span_warning("[user] is trying to stuff a beacon into [src]'s [lowertext(B.name)]!"), + span_warning("[user] is trying to stuff a beacon into you!")) if(do_after(user,30,src)) user.drop_item() I.forceMove(B) @@ -228,7 +228,7 @@ /mob/proc/copy_to_prefs_vr() if(!client || !client.prefs_vr) - to_chat(src,"You attempted to save your vore prefs but somehow you're in this character without a client.prefs_vr variable. Tell a dev.") + to_chat(src,span_warning("You attempted to save your vore prefs but somehow you're in this character without a client.prefs_vr variable. Tell a dev.")) return FALSE var/datum/vore_preferences/P = client.prefs_vr @@ -282,7 +282,7 @@ // /mob/proc/copy_from_prefs_vr(var/bellies = TRUE) if(!client || !client.prefs_vr) - to_chat(src,"You attempted to apply your vore prefs but somehow you're in this character without a client.prefs_vr variable. Tell a dev.") + to_chat(src,span_warning("You attempted to apply your vore prefs but somehow you're in this character without a client.prefs_vr variable. Tell a dev.")) return FALSE var/datum/vore_preferences/P = client.prefs_vr @@ -360,7 +360,7 @@ /datum/preferences/proc/load_vore_prefs_from_client(mob/user) if(selecting_slots) - to_chat(user, "You already have a slot selection dialog open!") + to_chat(user, span_warning("You already have a slot selection dialog open!")) return if(!savefile) return @@ -469,7 +469,7 @@ setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - visible_message("[src] licks [tasted]!","You lick [tasted]. They taste rather like [tasted.get_taste_message()].","Slurp!") + visible_message(span_vwarning("[src] licks [tasted]!"),span_vnotice("You lick [tasted]. They taste rather like [tasted.get_taste_message()]."),"Slurp!") /mob/living/proc/get_taste_message(allow_generic = 1) @@ -508,7 +508,7 @@ return setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - visible_message("[src] smells [smelled]!","You smell [smelled]. They smell like [smelled.get_smell_message()].","Sniff!") + visible_message(span_vwarning("[src] smells [smelled]!"),span_vnotice("You smell [smelled]. They smell like [smelled.get_smell_message()]."),"Sniff!") /mob/living/proc/get_smell_message(allow_generic = 1) if(!vore_smell && !allow_generic) @@ -617,7 +617,7 @@ //Don't appear to be in a vore situation else - to_chat(src,"You aren't inside anyone, though, is the thing.") + to_chat(src,span_alert("You aren't inside anyone, though, is the thing.")) // // Eating procs depending on who clicked what @@ -665,11 +665,11 @@ return FALSE if(!prey.devourable) - to_chat(user, "They aren't able to be devoured.") + to_chat(user, span_vnotice("They aren't able to be devoured.")) log_and_message_admins("[key_name_admin(src)] attempted to devour [key_name_admin(prey)] against their prefs ([prey ? ADMIN_JMP(prey) : "null"])") return FALSE if(prey.absorbed || pred.absorbed) - to_chat(user, "They aren't aren't in a state to be devoured.") + to_chat(user, span_vwarning("They aren't aren't in a state to be devoured.")) return FALSE //Determining vore attempt privacy @@ -687,17 +687,17 @@ // Slipnoms from chompstation downstream, credit to cadyn for the original PR. // Prepare messages if(prey.is_slipping) - attempt_msg = "It seems like [prey] is about to slide into [pred]'s [lowertext(belly.name)]!" - success_msg = "[prey] suddenly slides into [pred]'s [lowertext(belly.name)]!" + attempt_msg = span_vwarning("It seems like [prey] is about to slide into [pred]'s [lowertext(belly.name)]!") + success_msg = span_vwarning("[prey] suddenly slides into [pred]'s [lowertext(belly.name)]!") else if(pred.is_slipping) - attempt_msg = "It seems like [prey] is gonna end up inside [pred]'s [lowertext(belly.name)] as [pred] comes sliding over!" - success_msg = "[prey] suddenly slips inside of [pred]'s [lowertext(belly.name)] as [pred] slides into them!" + attempt_msg = span_vwarning("It seems like [prey] is gonna end up inside [pred]'s [lowertext(belly.name)] as [pred] comes sliding over!") + success_msg = span_vwarning("[prey] suddenly slips inside of [pred]'s [lowertext(belly.name)] as [pred] slides into them!") else if(user == pred) //Feeding someone to yourself - attempt_msg = "[pred] is attempting to [lowertext(belly.vore_verb)] [prey] into their [lowertext(belly.name)]!" - success_msg = "[pred] manages to [lowertext(belly.vore_verb)] [prey] into their [lowertext(belly.name)]!" + attempt_msg = span_vwarning("[pred] is attempting to [lowertext(belly.vore_verb)] [prey] into their [lowertext(belly.name)]!") + success_msg = span_vwarning("[pred] manages to [lowertext(belly.vore_verb)] [prey] into their [lowertext(belly.name)]!") else //Feeding someone to another person - attempt_msg = "[user] is attempting to make [pred] [lowertext(belly.vore_verb)] [prey] into their [lowertext(belly.name)]!" - success_msg = "[user] manages to make [pred] [lowertext(belly.vore_verb)] [prey] into their [lowertext(belly.name)]!" + attempt_msg = span_vwarning("[user] is attempting to make [pred] [lowertext(belly.vore_verb)] [prey] into their [lowertext(belly.name)]!") + success_msg = span_vwarning("[user] manages to make [pred] [lowertext(belly.vore_verb)] [prey] into their [lowertext(belly.name)]!") // Announce that we start the attempt! @@ -830,7 +830,7 @@ //If they're passed out, the light won't help them. Same with buckled. Really, I think it's fine to do this whenever. glow_toggle = !glow_toggle - to_chat(src,"You [glow_toggle ? "en" : "dis"]able your body's glow.") + to_chat(src,span_notice("You [glow_toggle ? "en" : "dis"]able your body's glow.")) /mob/living/proc/glow_color() set name = "Glow (Set Color)" @@ -858,38 +858,38 @@ set desc = "Consume held garbage." if(!vore_selected) - to_chat(src,"You either don't have a belly selected, or don't have a belly!") + to_chat(src,span_warning("You either don't have a belly selected, or don't have a belly!")) return var/obj/item/I = get_active_hand() if(!I) - to_chat(src, "You are not holding anything.") + to_chat(src, span_notice("You are not holding anything.")) return if(is_type_in_list(I,item_vore_blacklist) && !adminbus_trash) //If someone has adminbus, they can eat whatever they want. - to_chat(src, "You are not allowed to eat this.") + to_chat(src, span_warning("You are not allowed to eat this.")) return if(!I.trash_eatable) //OOC pref. This /IS/ respected, even if adminbus_trash is enabled - to_chat(src, "You can't eat that so casually!") + to_chat(src, span_warning("You can't eat that so casually!")) return if(istype(I, /obj/item/paicard)) var/obj/item/paicard/palcard = I var/mob/living/silicon/pai/pocketpal = palcard.pai if(pocketpal && (!pocketpal.devourable)) - to_chat(src, "\The [pocketpal] doesn't allow you to eat it.") + to_chat(src, span_warning("\The [pocketpal] doesn't allow you to eat it.")) return if(istype(I, /obj/item/book)) var/obj/item/book/book = I if(book.carved) - to_chat(src, "\The [book] is not worth eating without the filling.") + to_chat(src, span_warning("\The [book] is not worth eating without the filling.")) return if(is_type_in_list(I,edible_trash) | adminbus_trash) if(I.hidden_uplink) - to_chat(src, "You really should not be eating this.") + to_chat(src, span_warning("You really should not be eating this.")) message_admins("[key_name(src)] has attempted to ingest an uplink item. ([src ? ADMIN_JMP(src) : "null"])") return if(istype(I,/obj/item/pda)) @@ -903,15 +903,15 @@ if(!watching) return else - visible_message("[src] is threatening to make [P] disappear!") + visible_message(span_warning("[src] is threatening to make [P] disappear!")) if(P.id) var/confirm = tgui_alert(src, "The PDA you're holding contains a vulnerable ID card. Will you risk it?", "Confirmation", list("Definitely", "Cancel")) if(confirm != "Definitely") return if(!do_after(src, 100, P)) return - visible_message("[src] successfully makes [P] disappear!") - to_chat(src, "You can taste the sweet flavor of delicious technology.") + visible_message(span_warning("[src] successfully makes [P] disappear!")) + to_chat(src, span_notice("You can taste the sweet flavor of delicious technology.")) drop_item() I.forceMove(vore_selected) updateVRPanel() @@ -919,12 +919,12 @@ if(istype(I,/obj/item/clothing/shoes)) var/obj/item/clothing/shoes/S = I if(S.holding) - to_chat(src, "There's something inside!") + to_chat(src, span_warning("There's something inside!")) return if(iscapturecrystal(I)) var/obj/item/capture_crystal/C = I if(!C.bound_mob.devourable) - to_chat(src, "That doesn't seem like a good idea. (\The [C.bound_mob]'s prefs don't allow it.)") + to_chat(src, span_warning("That doesn't seem like a good idea. (\The [C.bound_mob]'s prefs don't allow it.)")) return drop_item() I.forceMove(vore_selected) @@ -933,43 +933,43 @@ log_admin("VORE: [src] used Eat Trash to swallow [I].") if(istype(I,/obj/item/flashlight/flare) || istype(I,/obj/item/flame/match) || istype(I,/obj/item/storage/box/matches)) - to_chat(src, "You can taste the flavor of spicy cardboard.") + to_chat(src, span_notice("You can taste the flavor of spicy cardboard.")) else if(istype(I,/obj/item/flashlight/glowstick)) - to_chat(src, "You found out the glowy juice only tastes like regret.") + to_chat(src, span_notice("You found out the glowy juice only tastes like regret.")) else if(istype(I,/obj/item/trash/cigbutt)) - to_chat(src, "You can taste the flavor of bitter ash. Classy.") + to_chat(src, span_notice("You can taste the flavor of bitter ash. Classy.")) else if(istype(I,/obj/item/clothing/mask/smokable)) var/obj/item/clothing/mask/smokable/C = I if(C.lit) - to_chat(src, "You can taste the flavor of burning ash. Spicy!") + to_chat(src, span_notice("You can taste the flavor of burning ash. Spicy!")) else - to_chat(src, "You can taste the flavor of aromatic rolling paper and funny looks.") + to_chat(src, span_notice("You can taste the flavor of aromatic rolling paper and funny looks.")) else if(istype(I,/obj/item/paper)) - to_chat(src, "You can taste the dry flavor of bureaucracy.") + to_chat(src, span_notice("You can taste the dry flavor of bureaucracy.")) else if(istype(I,/obj/item/book)) - to_chat(src, "You can taste the dry flavor of knowledge.") + to_chat(src, span_notice("You can taste the dry flavor of knowledge.")) else if(istype(I,/obj/item/dice) || istype(I,/obj/item/roulette_ball)) - to_chat(src, "You can taste the bitter flavor of cheating.") + to_chat(src, span_notice("You can taste the bitter flavor of cheating.")) else if(istype(I,/obj/item/lipstick)) - to_chat(src, "You can taste the flavor of couture and style. Toddler at the make-up bag style.") + to_chat(src, span_notice("You can taste the flavor of couture and style. Toddler at the make-up bag style.")) else if(istype(I,/obj/item/soap)) - to_chat(src, "You can taste the bitter flavor of verbal purification.") + to_chat(src, span_notice("You can taste the bitter flavor of verbal purification.")) else if(istype(I,/obj/item/spacecash) || istype(I,/obj/item/storage/wallet)) - to_chat(src, "You can taste the flavor of wealth and reckless waste.") + to_chat(src, span_notice("You can taste the flavor of wealth and reckless waste.")) else if(istype(I,/obj/item/broken_bottle) || istype(I,/obj/item/material/shard)) - to_chat(src, "You can taste the flavor of pain. This can't possibly be healthy for your guts.") + to_chat(src, span_notice("You can taste the flavor of pain. This can't possibly be healthy for your guts.")) else if(istype(I,/obj/item/light)) var/obj/item/light/L = I if(L.status == LIGHT_BROKEN) - to_chat(src, "You can taste the flavor of pain. This can't possibly be healthy for your guts.") + to_chat(src, span_notice("You can taste the flavor of pain. This can't possibly be healthy for your guts.")) else - to_chat(src, "You can taste the flavor of really bad ideas.") + to_chat(src, span_notice("You can taste the flavor of really bad ideas.")) else if(istype(I,/obj/item/bikehorn/tinytether)) - to_chat(src, "You feel a rush of power swallowing such a large, err, tiny structure.") + to_chat(src, span_notice("You feel a rush of power swallowing such a large, err, tiny structure.")) else if(istype(I,/obj/item/mmi/digital/posibrain) || istype(I,/obj/item/aicard)) - to_chat(src, "You can taste the sweet flavor of digital friendship. Or maybe it is something else.") + to_chat(src, span_notice("You can taste the sweet flavor of digital friendship. Or maybe it is something else.")) else if(istype(I,/obj/item/paicard)) - to_chat(src, "You can taste the sweet flavor of digital friendship.") + to_chat(src, span_notice("You can taste the sweet flavor of digital friendship.")) var/obj/item/paicard/ourcard = I if(ourcard.pai && ourcard.pai.client && isbelly(ourcard.loc)) var/obj/belly/B = ourcard.loc @@ -977,23 +977,23 @@ else if(istype(I,/obj/item/reagent_containers/food)) var/obj/item/reagent_containers/food/F = I if(!F.reagents.total_volume) - to_chat(src, "You can taste the flavor of garbage and leftovers. Delicious?") + to_chat(src, span_notice("You can taste the flavor of garbage and leftovers. Delicious?")) else - to_chat(src, "You can taste the flavor of gluttonous waste of food.") + to_chat(src, span_notice("You can taste the flavor of gluttonous waste of food.")) else if (istype(I,/obj/item/clothing/accessory/collar)) - to_chat(src, "You can taste the submissiveness in the wearer of [I]!") + to_chat(src, span_notice("You can taste the submissiveness in the wearer of [I]!")) else if(iscapturecrystal(I)) var/obj/item/capture_crystal/C = I if(C.bound_mob && (C.bound_mob in C.contents)) if(isbelly(C.loc)) var/obj/belly/B = C.loc to_chat(C.bound_mob, "Outside of your crystal, you can see; [B.desc]") - to_chat(src, "You can taste the the power of command.") + to_chat(src, span_notice("You can taste the the power of command.")) else - to_chat(src, "You can taste the flavor of garbage. Delicious.") - visible_message("[src] demonstrates their voracious capabilities by swallowing [I] whole!") + to_chat(src, span_notice("You can taste the flavor of garbage. Delicious.")) + visible_message(span_warning("[src] demonstrates their voracious capabilities by swallowing [I] whole!")) return - to_chat(src, "This item is not appropriate for ethical consumption.") + to_chat(src, span_notice("This item is not appropriate for ethical consumption.")) return /mob/living/proc/toggle_trash_catching() //Ported from chompstation @@ -1001,7 +1001,7 @@ set category = "Abilities" set desc = "Toggle Trash Eater throw vore abilities." trash_catching = !trash_catching - to_chat(src, "Trash catching [trash_catching ? "enabled" : "disabled"].") + to_chat(src, span_warning("Trash catching [trash_catching ? "enabled" : "disabled"].")) /mob/living/proc/eat_minerals() //Actual eating abstracted so the user isn't given a prompt due to an argument in this verb. set name = "Eat Minerals" @@ -1017,16 +1017,16 @@ return if(!vore_selected) - to_chat(src, "You either don't have a belly selected, or don't have a belly!") + to_chat(src, span_warning("You either don't have a belly selected, or don't have a belly!")) return var/obj/item/I = (snack ? snack : feeder.get_active_hand()) if(!I) - to_chat(feeder, "You look longingly at your empty hands, imagining if they held something edible...") + to_chat(feeder, span_notice("You look longingly at your empty hands, imagining if they held something edible...")) return if(!istype(I)) - to_chat(src, "You pause for a moment to examine [I] and realize it's not even worth the energy to chew.") + to_chat(src, span_notice("You pause for a moment to examine [I] and realize it's not even worth the energy to chew.")) return var/list/nom = null @@ -1101,18 +1101,18 @@ if(nom) //Ravenous 1-4, snackage confirmed. Clear for chowdown, over. playsound(src, 'sound/items/eatfood.ogg', rand(10,50), 1) var/T = (istype(M) ? M.hardness/40 : 1) SECONDS //1.5 seconds to eat a sheet of metal. 2.5 for durasteel and diamond & 1 by default (applies to some ores like raw carbon, slag, etc. - to_chat(src, "You start crunching on [I] with your powerful jaws, attempting to tear it apart...") + to_chat(src, span_notice("You start crunching on [I] with your powerful jaws, attempting to tear it apart...")) if(do_after(feeder, T, ignore_movement = TRUE, exclusive = TASK_ALL_EXCLUSIVE)) //Eat on the move, but not multiple things at once. if(feeder != src) - to_chat(feeder, "You feed [I] to [src].") + to_chat(feeder, span_notice("You feed [I] to [src].")) log_admin("VORE: [feeder] fed [src] [I].") else log_admin("VORE: [src] used Eat Minerals to swallow [I].") //Eat the ore using the vorebelly for the sound then get rid of the ore to prevent infinite nutrition. drop_from_inventory(I, vore_selected) //Never touches the ground - straight to the gut. visible_message("[src] crunches [I] to pieces and swallows it down.", - "[nom["remark"]]", - "You hear the gnashing of jaws with some ominous grinding and crunching noises, then... Swallowing?") + span_notice("[nom["remark"]]"), + span_notice("You hear the gnashing of jaws with some ominous grinding and crunching noises, then... Swallowing?")) adjust_nutrition(nom["nutrition"]) qdel(I) @@ -1127,10 +1127,10 @@ return TRUE else - to_chat(src, "You were interrupted while gnawing on [I]!") + to_chat(src, span_notice("You were interrupted while gnawing on [I]!")) else //Not the droids we're looking for. - to_chat(src, "You pause for a moment to examine [I] and realize it's not even worth the energy to chew.") //If it ain't ore or the type of sheets we can eat, bugger off! + to_chat(src, span_notice("You pause for a moment to examine [I] and realize it's not even worth the energy to chew.")) //If it ain't ore or the type of sheets we can eat, bugger off! /mob/living/proc/toggle_stuffing_mode() set name = "Toggle feeding mode" @@ -1138,7 +1138,7 @@ set desc = "Switch whether you will try to feed other people food whole or normally, bite by bite." stuffing_feeder = !stuffing_feeder - to_chat(src, "You will [stuffing_feeder ? "now" : "no longer"] try to feed food whole.") + to_chat(src, span_notice("You will [stuffing_feeder ? "now" : "no longer"] try to feed food whole.")) /mob/living/proc/switch_scaling() set name = "Switch scaling mode" @@ -1241,7 +1241,7 @@ if(result == "Open Panel") var/mob/living/user = usr if(!user) - to_chat(usr,"Mob undefined: [user]") + to_chat(usr,span_notice("Mob undefined: [user]")) return FALSE var/datum/vore_look/export_panel/exportPanel @@ -1249,7 +1249,7 @@ exportPanel = new(usr) if(!exportPanel) - to_chat(user,"Export panel undefined: [exportPanel]") + to_chat(user,span_notice("Export panel undefined: [exportPanel]")) return exportPanel.tgui_interact(user) @@ -1257,126 +1257,126 @@ for(var/belly in vore_organs) if(isbelly(belly)) var/obj/belly/B = belly - to_chat(src, "Belly name: [B.name]") - to_chat(src, "Belly desc: [B.desc]") - to_chat(src, "Belly absorbed desc: [B.absorbed_desc]") - to_chat(src, "Vore verb: [B.vore_verb]") - to_chat(src, "Struggle messages (outside):") + to_chat(src, span_chatexport("Belly name: [B.name]")) + to_chat(src, span_chatexport("Belly desc: [B.desc]")) + to_chat(src, span_chatexport("Belly absorbed desc: [B.absorbed_desc]")) + to_chat(src, span_chatexport("Vore verb: [B.vore_verb]")) + to_chat(src, span_chatexport("Struggle messages (outside):")) for(var/msg in B.struggle_messages_outside) - to_chat(src, "[msg]") - to_chat(src, "Struggle messages (inside):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Struggle messages (inside):")) for(var/msg in B.struggle_messages_inside) - to_chat(src, "[msg]") - to_chat(src, "Absorbed struggle messages (outside):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Absorbed struggle messages (outside):")) for(var/msg in B.absorbed_struggle_messages_outside) - to_chat(src, "[msg]") - to_chat(src, "Absorbed struggle messages (inside):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Absorbed struggle messages (inside):")) for(var/msg in B.absorbed_struggle_messages_inside) - to_chat(src, "[msg]") - to_chat(src, "Escape attempt messages (owner):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Escape attempt messages (owner):")) for(var/msg in B.escape_attempt_messages_owner) - to_chat(src, "[msg]") - to_chat(src, "Escape attempt messages (prey):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Escape attempt messages (prey):")) for(var/msg in B.escape_attempt_messages_prey) - to_chat(src, "[msg]") - to_chat(src, "Escape messages (owner):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Escape messages (owner):")) for(var/msg in B.escape_messages_owner) - to_chat(src, "[msg]") - to_chat(src, "Escape messages (prey):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Escape messages (prey):")) for(var/msg in B.escape_messages_prey) - to_chat(src, "[msg]") - to_chat(src, "Escape messages (outside):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Escape messages (outside):")) for(var/msg in B.escape_messages_outside) - to_chat(src, "[msg]") - to_chat(src, "Escape item messages (owner):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Escape item messages (owner):")) for(var/msg in B.escape_item_messages_owner) - to_chat(src, "[msg]") - to_chat(src, "Escape item messages (prey):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Escape item messages (prey):")) for(var/msg in B.escape_item_messages_prey) - to_chat(src, "[msg]") - to_chat(src, "Escape item messages (outside):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Escape item messages (outside):")) for(var/msg in B.escape_item_messages_outside) - to_chat(src, "[msg]") - to_chat(src, "Escape fail messages (owner):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Escape fail messages (owner):")) for(var/msg in B.escape_fail_messages_owner) - to_chat(src, "[msg]") - to_chat(src, "Escape fail messages (prey):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Escape fail messages (prey):")) for(var/msg in B.escape_fail_messages_prey) - to_chat(src, "[msg]") - to_chat(src, "Absorbed escape attempt messages (owner):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Absorbed escape attempt messages (owner):")) for(var/msg in B.escape_attempt_absorbed_messages_owner) - to_chat(src, "[msg]") - to_chat(src, "Absorbed escape attempt messages (prey):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Absorbed escape attempt messages (prey):")) for(var/msg in B.escape_attempt_absorbed_messages_prey) - to_chat(src, "[msg]") - to_chat(src, "Absorbed escape messages (owner):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Absorbed escape messages (owner):")) for(var/msg in B.escape_absorbed_messages_owner) - to_chat(src, "[msg]") - to_chat(src, "Absorbed escape messages (prey):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Absorbed escape messages (prey):")) for(var/msg in B.escape_absorbed_messages_prey) - to_chat(src, "[msg]") - to_chat(src, "Absorbed escape messages (outside):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Absorbed escape messages (outside):")) for(var/msg in B.escape_absorbed_messages_outside) - to_chat(src, "[msg]") - to_chat(src, "Absorbed escape fail messages (owner):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Absorbed escape fail messages (owner):")) for(var/msg in B.escape_fail_absorbed_messages_owner) - to_chat(src, "[msg]") - to_chat(src, "Absorbed escape fail messages (prey):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Absorbed escape fail messages (prey):")) for(var/msg in B.escape_fail_absorbed_messages_prey) - to_chat(src, "[msg]") - to_chat(src, "Primary transfer messages (owner):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Primary transfer messages (owner):")) for(var/msg in B.primary_transfer_messages_owner) - to_chat(src, "[msg]") - to_chat(src, "Primary transfer messages (prey):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Primary transfer messages (prey):")) for(var/msg in B.primary_transfer_messages_prey) - to_chat(src, "[msg]") - to_chat(src, "Secondary transfer messages (owner):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Secondary transfer messages (owner):")) for(var/msg in B.secondary_transfer_messages_owner) - to_chat(src, "[msg]") - to_chat(src, "Secondary transfer messages (prey):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Secondary transfer messages (prey):")) for(var/msg in B.secondary_transfer_messages_prey) - to_chat(src, "[msg]") - to_chat(src, "Digest chance messages (owner):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Digest chance messages (owner):")) for(var/msg in B.digest_chance_messages_owner) - to_chat(src, "[msg]") - to_chat(src, "Digest chance messages (prey):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Digest chance messages (prey):")) for(var/msg in B.digest_chance_messages_prey) - to_chat(src, "[msg]") - to_chat(src, "Absorb chance messages (owner):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Absorb chance messages (owner):")) for(var/msg in B.absorb_chance_messages_owner) - to_chat(src, "[msg]") - to_chat(src, "Absorb chance messages (prey):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Absorb chance messages (prey):")) for(var/msg in B.absorb_chance_messages_prey) - to_chat(src, "[msg]") - to_chat(src, "Digest messages (owner):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Digest messages (owner):")) for(var/msg in B.digest_messages_owner) - to_chat(src, "[msg]") - to_chat(src, "Digest messages (prey):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Digest messages (prey):")) for(var/msg in B.digest_messages_prey) - to_chat(src, "[msg]") - to_chat(src, "Absorb messages (owner):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Absorb messages (owner):")) for(var/msg in B.absorb_messages_owner) - to_chat(src, "[msg]") - to_chat(src, "Absorb messages (prey):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Absorb messages (prey):")) for(var/msg in B.absorb_messages_prey) - to_chat(src, "[msg]") - to_chat(src, "Unabsorb messages (owner):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Unabsorb messages (owner):")) for(var/msg in B.unabsorb_messages_owner) - to_chat(src, "[msg]") - to_chat(src, "Unabsorb messages (prey):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Unabsorb messages (prey):")) for(var/msg in B.unabsorb_messages_prey) - to_chat(src, "[msg]") - to_chat(src, "Examine messages (when full):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Examine messages (when full):")) for(var/msg in B.examine_messages) - to_chat(src, "[msg]") - to_chat(src, "Examine messages (with absorbed victims):") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Examine messages (with absorbed victims):")) for(var/msg in B.examine_messages_absorbed) - to_chat(src, "[msg]") - to_chat(src, "Emote lists:") + to_chat(src, span_chatexport("[msg]")) + to_chat(src, span_chatexport("Emote lists:")) for(var/EL in B.emote_lists) - to_chat(src, "[EL]:") + to_chat(src, span_chatexport("[EL]:")) for(var/msg in B.emote_lists[EL]) - to_chat(src, "[msg]") + to_chat(src, span_chatexport("[msg]")) /** * Small helper component to manage the vore panel HUD icon diff --git a/code/modules/vore/eating/silicon_vr.dm b/code/modules/vore/eating/silicon_vr.dm index d6622039ed..cc80329ea7 100644 --- a/code/modules/vore/eating/silicon_vr.dm +++ b/code/modules/vore/eating/silicon_vr.dm @@ -19,7 +19,7 @@ bellied = prey prey.forceMove(src) visible_message("[src] entirely engulfs [prey] in hardlight holograms!") - to_chat(usr, "You completely engulf [prey] in hardlight holograms!") //Can't be part of the above, because the above is from the hologram. + to_chat(usr, span_vnotice("You completely engulf [prey] in hardlight holograms!")) //Can't be part of the above, because the above is from the hologram. desc = "[initial(desc)] It seems to have hardlight mode enabled and someone inside." pass_flags = 0 @@ -46,7 +46,7 @@ // Wrong state if (!eyeobj || !holo) - to_chat(usr, "You can only use this when holo-projecting!") + to_chat(usr, span_vwarning("You can only use this when holo-projecting!")) return //Holopads have this 'masters' list where the keys are AI names and the values are the hologram effects @@ -68,11 +68,11 @@ return //Probably cancelled if(!istype(prey)) - to_chat(usr, "Invalid mob choice!") + to_chat(usr, span_vwarning("Invalid mob choice!")) return hologram.visible_message("[hologram] starts engulfing [prey] in hardlight holograms!") - to_chat(src, "You begin engulfing [prey] in hardlight holograms.") //Can't be part of the above, because the above is from the hologram. + to_chat(src, span_vnotice("You begin engulfing [prey] in hardlight holograms.")) //Can't be part of the above, because the above is from the hologram. if(do_after(user=eyeobj,delay=50,target=prey,needhand=0) && holo && hologram && !hologram.bellied) //Didn't move and still projecting and effect exists and no other bellied people hologram.get_prey(prey) diff --git a/code/modules/vore/eating/simple_animal_vr.dm b/code/modules/vore/eating/simple_animal_vr.dm index d7ee2ada0b..954df2ea36 100644 --- a/code/modules/vore/eating/simple_animal_vr.dm +++ b/code/modules/vore/eating/simple_animal_vr.dm @@ -18,7 +18,7 @@ // Mice can't eat logged out players! return if(client && IsAdvancedToolUser()) - to_chat(src, "Put your hands to good use instead!") + to_chat(src, span_warning("Put your hands to good use instead!")) return feed_grabbed_to_self(src,T) update_icon() @@ -37,10 +37,10 @@ if(!istype(user) || user.stat) return if(!vore_selected) - to_chat(user, "[src] isn't planning on eating anything much less digesting it.") + to_chat(user, span_warning("[src] isn't planning on eating anything much less digesting it.")) return if(ai_holder.retaliate || (ai_holder.hostile && faction != user.faction)) - to_chat(user, "This predator isn't friendly, and doesn't give a shit about your opinions of it digesting you.") + to_chat(user, span_warning("This predator isn't friendly, and doesn't give a shit about your opinions of it digesting you.")) return if(vore_selected.digest_mode == DM_HOLD) var/confirm = tgui_alert(user, "Enabling digestion on [name] will cause it to digest all stomach contents. Using this to break OOC prefs is against the rules. Digestion will reset after 20 minutes.", "Enabling [name]'s Digestion", list("Enable", "Cancel")) @@ -62,7 +62,7 @@ var/mob/living/user = usr //I mean, At least ghosts won't use it. if(!istype(user) || user.stat) return if(!vore_selected) - to_chat(user, "[src] isn't vore capable.") + to_chat(user, span_warning("[src] isn't vore capable.")) return vore_selected.fancy_vore = !vore_selected.fancy_vore @@ -83,7 +83,7 @@ //AttackTarget() //VOREStation AI Temporary Removal //LoseTarget() // only make one attempt at an attack rather than going into full rage mode else - user.visible_message("[user] swats [src] with [O]!") + user.visible_message(span_info("[user] swats [src] with [O]!")) release_vore_contents() for(var/mob/living/L in living_mobs(0)) //add everyone on the tile to the do-not-eat list for a while if(!(LAZYFIND(prey_excludes, L))) // Unless they're already on it, just to avoid fuckery. @@ -91,7 +91,7 @@ addtimer(CALLBACK(src, PROC_REF(removeMobFromPreyExcludes), WEAKREF(L)), 5 MINUTES) else if(istype(O, /obj/item/healthanalyzer)) var/healthpercent = health/maxHealth*100 - to_chat(user, "[src] seems to be [healthpercent]% healthy.") + to_chat(user, span_notice("[src] seems to be [healthpercent]% healthy.")) else ..() diff --git a/code/modules/vore/eating/stumblevore_vr.dm b/code/modules/vore/eating/stumblevore_vr.dm index 491f1c85e8..992bc1712c 100644 --- a/code/modules/vore/eating/stumblevore_vr.dm +++ b/code/modules/vore/eating/stumblevore_vr.dm @@ -32,13 +32,13 @@ M.Weaken(4) M.stop_flying() if(CanStumbleVore(M)) - visible_message("[M] flops carelessly into [src]!") + visible_message(span_vwarning("[M] flops carelessly into [src]!")) perform_the_nom(src,M,src,src.vore_selected,1) else if(M.CanStumbleVore(src)) - visible_message("[M] flops carelessly into [src]!") + visible_message(span_vwarning("[M] flops carelessly into [src]!")) perform_the_nom(M,src,M,M.vore_selected,1) else if(istype(S) && S.species.lightweight == 1) - visible_message("[M] carelessly bowls [src] over!") + visible_message(span_vwarning("[M] carelessly bowls [src] over!")) M.forceMove(get_turf(src)) M.apply_damage(0.5, BRUTE) Weaken(4) @@ -46,9 +46,9 @@ apply_damage(0.5, BRUTE) else if(round(weight) > 474) var/throwtarget = get_edge_target_turf(M, reverse_direction(M.dir)) - visible_message("[M] bounces backwards off of [src]'s plush body!") + visible_message(span_vwarning("[M] bounces backwards off of [src]'s plush body!")) M.throw_at(throwtarget, 2, 1) else - visible_message("[M] trips over [src]!") + visible_message(span_vwarning("[M] trips over [src]!")) M.forceMove(get_turf(src)) M.apply_damage(1, BRUTE) diff --git a/code/modules/vore/eating/transforming_vr.dm b/code/modules/vore/eating/transforming_vr.dm index 638aa1d599..53938c2305 100644 --- a/code/modules/vore/eating/transforming_vr.dm +++ b/code/modules/vore/eating/transforming_vr.dm @@ -11,5 +11,5 @@ M.forceMove(egg) egg.name = egg_name if(message) - to_chat(M, "You lose sensation of your body, feeling only the warmth around you as you're encased in an egg.") - to_chat(O, "Your body shifts as you encase [M] in an egg.") + to_chat(M, span_vnotice("You lose sensation of your body, feeling only the warmth around you as you're encased in an egg.")) + to_chat(O, span_vnotice("Your body shifts as you encase [M] in an egg.")) diff --git a/code/modules/vore/eating/vertical_nom_vr.dm b/code/modules/vore/eating/vertical_nom_vr.dm index 658f6496cf..f819fa5138 100644 --- a/code/modules/vore/eating/vertical_nom_vr.dm +++ b/code/modules/vore/eating/vertical_nom_vr.dm @@ -4,11 +4,11 @@ set category = "Abilities" if(stat == DEAD || paralysis || weakened || stunned) - to_chat(src, "You cannot do that while in your current state.") + to_chat(src, span_notice("You cannot do that while in your current state.")) return if(!(src.vore_selected)) - to_chat(src, "No selected belly found.") + to_chat(src, span_notice("No selected belly found.")) return var/list/targets = list() @@ -23,7 +23,7 @@ targets += L if(!(targets.len)) - to_chat(src, "No eligible targets found.") + to_chat(src, span_notice("No eligible targets found.")) return var/mob/living/target = tgui_input_list(src, "Please select a target.", "Victim", targets) @@ -31,17 +31,17 @@ if(!target) return - to_chat(target, "You feel yourself being pulled up by something... Or someone?!") + to_chat(target, span_vwarning("You feel yourself being pulled up by something... Or someone?!")) var/starting_loc = target.loc if(do_after(src, 50)) if(target.loc != starting_loc) - to_chat(target, "You have interrupted whatever that was...") - to_chat(src, "They got away.") + to_chat(target, span_vwarning("You have interrupted whatever that was...")) + to_chat(src, span_vnotice("They got away.")) return if(target.buckled) target.buckled.unbuckle_mob() - target.visible_message("\The [target] suddenly disappears somewhere above!",\ - "You are dragged above and feel yourself slipping directly into \the [src]'s [vore_selected]!") - to_chat(src, "You successfully snatch \the [target], slipping them into your [vore_selected].") + target.visible_message(span_vwarning("\The [target] suddenly disappears somewhere above!"),\ + span_vdanger("You are dragged above and feel yourself slipping directly into \the [src]'s [vore_selected]!")) + to_chat(src, span_vnotice("You successfully snatch \the [target], slipping them into your [vore_selected].")) target.forceMove(src.vore_selected) diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 91d8ad6e7b..8aac1d5a09 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -411,7 +411,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if("move_belly") var/dir = text2num(params["dir"]) if(LAZYLEN(host.vore_organs) <= 1) - to_chat(usr, "You can't sort bellies with only one belly to sort...") + to_chat(usr, span_warning("You can't sort bellies with only one belly to sort...")) return TRUE var/current_index = host.vore_organs.Find(host.vore_selected) @@ -436,7 +436,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if(!host.save_vore_prefs()) tgui_alert_async(usr, "ERROR: Virgo-specific preferences failed to save!","Error") else - to_chat(usr, "Virgo-specific preferences saved!") + to_chat(usr, span_notice("Virgo-specific preferences saved!")) unsaved_changes = FALSE return TRUE if("reloadprefs") @@ -446,7 +446,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if(!host.apply_vore_prefs()) tgui_alert_async(usr, "ERROR: Virgo-specific preferences failed to apply!","Error") else - to_chat(usr,"Virgo-specific preferences applied from active slot!") + to_chat(usr,span_notice("Virgo-specific preferences applied from active slot!")) unsaved_changes = FALSE return TRUE if("loadprefsfromslot") @@ -456,13 +456,13 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if(!host.load_vore_prefs_from_slot()) tgui_alert_async(usr, "ERROR: Virgo-specific preferences failed to apply!","Error") else - to_chat(usr,"Virgo-specific preferences applied from active slot!") + to_chat(usr,span_notice("Virgo-specific preferences applied from active slot!")) unsaved_changes = TRUE return TRUE if("exportpanel") var/mob/living/user = usr if(!user) - to_chat(usr,"Mob undefined: [user]") + to_chat(usr,span_notice("Mob undefined: [user]")) return FALSE var/datum/vore_look/export_panel/exportPanel @@ -470,7 +470,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", exportPanel = new(usr) if(!exportPanel) - to_chat(user,"Export panel undefined: [exportPanel]") + to_chat(user,span_notice("Export panel undefined: [exportPanel]")) return FALSE exportPanel.open_export_panel(user) @@ -701,7 +701,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if("Use Hand") if(host.stat) - to_chat(user, "You can't do that in your state!") + to_chat(user, span_warning("You can't do that in your state!")) return TRUE host.ClickOn(target) @@ -714,43 +714,43 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", switch(intent) if("Help Out") //Help the inside-mob out if(host.stat || host.absorbed || M.absorbed) - to_chat(user, "You can't do that in your state!") + to_chat(user, span_warning("You can't do that in your state!")) return TRUE to_chat(user,"[span_green("You begin to push [M] to freedom!")]") to_chat(M,"[host] begins to push you to freedom!") - to_chat(OB.owner,"Someone is trying to escape from inside you!") + to_chat(OB.owner,span_vwarning("Someone is trying to escape from inside you!")) sleep(50) if(prob(33)) OB.release_specific_contents(M) to_chat(user,"[span_green("You manage to help [M] to safety!")]") to_chat(M, "[span_green("[host] pushes you free!")]") - to_chat(OB.owner,"[M] forces free of the confines of your body!") + to_chat(OB.owner,span_valert("[M] forces free of the confines of your body!")) else - to_chat(user,"[M] slips back down inside despite your efforts.") - to_chat(M," Even with [host]'s help, you slip back inside again.") + to_chat(user,span_valert("[M] slips back down inside despite your efforts.")) + to_chat(M,span_valert(" Even with [host]'s help, you slip back inside again.")) to_chat(OB.owner,"[span_green("Your body efficiently shoves [M] back where they belong.")]") return TRUE if("Devour") //Eat the inside mob if(host.absorbed || host.stat) - to_chat(user,"You can't do that in your state!") + to_chat(user,span_warning("You can't do that in your state!")) return TRUE if(!host.vore_selected) - to_chat(user,"Pick a belly on yourself first!") + to_chat(user,span_warning("Pick a belly on yourself first!")) return TRUE var/obj/belly/TB = host.vore_selected - to_chat(user,"You begin to [lowertext(TB.vore_verb)] [M] into your [lowertext(TB.name)]!") - to_chat(M,"[host] begins to [lowertext(TB.vore_verb)] you into their [lowertext(TB.name)]!") - to_chat(OB.owner,"Someone inside you is eating someone else!") + to_chat(user,span_vwarning("You begin to [lowertext(TB.vore_verb)] [M] into your [lowertext(TB.name)]!")) + to_chat(M,span_vwarning("[host] begins to [lowertext(TB.vore_verb)] you into their [lowertext(TB.name)]!")) + to_chat(OB.owner,span_vwarning("Someone inside you is eating someone else!")) sleep(TB.nonhuman_prey_swallow_time) //Can't do after, in a stomach, weird things abound. if((host in OB) && (M in OB)) //Make sure they're still here. - to_chat(user,"You manage to [lowertext(TB.vore_verb)] [M] into your [lowertext(TB.name)]!") - to_chat(M,"[host] manages to [lowertext(TB.vore_verb)] you into their [lowertext(TB.name)]!") - to_chat(OB.owner,"Someone inside you has eaten someone else!") + to_chat(user,span_vwarning("You manage to [lowertext(TB.vore_verb)] [M] into your [lowertext(TB.name)]!")) + to_chat(M,span_vwarning("[host] manages to [lowertext(TB.vore_verb)] you into their [lowertext(TB.name)]!")) + to_chat(OB.owner,span_vwarning("Someone inside you has eaten someone else!")) if(M.absorbed) M.absorbed = FALSE OB.handle_absorb_langs(M, OB.owner) @@ -768,7 +768,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if("Eject all") if(host.stat) - to_chat(user,"You can't do that in your state!") + to_chat(user,span_warning("You can't do that in your state!")) return TRUE host.vore_selected.release_all_contents() @@ -776,7 +776,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if("Move all") if(host.stat) - to_chat(user,"You can't do that in your state!") + to_chat(user,span_warning("You can't do that in your state!")) return TRUE var/obj/belly/choice = tgui_input_list(user, "Move all where?","Select Belly", host.vore_organs) @@ -784,7 +784,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", return FALSE for(var/atom/movable/target in host.vore_selected) - to_chat(target,"You're squished from [host]'s [lowertext(host.vore_selected)] to their [lowertext(choice.name)]!") + to_chat(target,span_vwarning("You're squished from [host]'s [lowertext(host.vore_selected)] to their [lowertext(choice.name)]!")) host.vore_selected.transfer_contents(target, choice, 1) return TRUE return @@ -814,7 +814,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if("Eject") if(host.stat) - to_chat(user,"You can't do that in your state!") + to_chat(user,span_warning("You can't do that in your state!")) return TRUE host.vore_selected.release_specific_contents(target) @@ -822,18 +822,18 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if("Move") if(host.stat) - to_chat(user,"You can't do that in your state!") + to_chat(user,span_warning("You can't do that in your state!")) return TRUE var/obj/belly/choice = tgui_input_list(usr, "Move [target] where?","Select Belly", host.vore_organs) if(!choice || !(target in host.vore_selected)) return TRUE - to_chat(target,"You're squished from [host]'s [lowertext(host.vore_selected.name)] to their [lowertext(choice.name)]!") + to_chat(target,span_vwarning("You're squished from [host]'s [lowertext(host.vore_selected.name)] to their [lowertext(choice.name)]!")) host.vore_selected.transfer_contents(target, choice) if("Transfer") if(host.stat) - to_chat(user,"You can't do that in your state!") + to_chat(user,span_warning("You can't do that in your state!")) return TRUE var/mob/living/belly_owner = host @@ -844,7 +844,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if(candidate.vore_organs.len && candidate.feeding && !candidate.no_vore) viable_candidates += candidate if(!viable_candidates.len) - to_chat(user, "There are no viable candidates around you!") + to_chat(user, span_notice("There are no viable candidates around you!")) return TRUE belly_owner = tgui_input_list(user, "Who do you want to receive the target?", "Select Predator", viable_candidates) @@ -856,24 +856,24 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", return TRUE if(belly_owner != host) - to_chat(user, "Transfer offer sent. Await their response.") + to_chat(user, span_vnotice("Transfer offer sent. Await their response.")) var/accepted = tgui_alert(belly_owner, "[host] is trying to transfer [target] from their [lowertext(host.vore_selected.name)] into your [lowertext(choice.name)]. Do you accept?", "Feeding Offer", list("Yes", "No")) if(accepted != "Yes") - to_chat(user, "[belly_owner] refused the transfer!!") + to_chat(user, span_vwarning("[belly_owner] refused the transfer!!")) return TRUE if(!belly_owner || !(belly_owner in range(1, host))) return TRUE - to_chat(target,"You're squished from [host]'s [lowertext(host.vore_selected.name)] to [belly_owner]'s [lowertext(choice.name)]!") - to_chat(belly_owner,"[target] is squished from [host]'s [lowertext(host.vore_selected.name)] to your [lowertext(choice.name)]!") + to_chat(target,span_vwarning("You're squished from [host]'s [lowertext(host.vore_selected.name)] to [belly_owner]'s [lowertext(choice.name)]!")) + to_chat(belly_owner,span_vwarning("[target] is squished from [host]'s [lowertext(host.vore_selected.name)] to your [lowertext(choice.name)]!")) host.vore_selected.transfer_contents(target, choice) else - to_chat(target,"You're squished from [host]'s [lowertext(host.vore_selected.name)] to their [lowertext(choice.name)]!") + to_chat(target,span_vwarning("You're squished from [host]'s [lowertext(host.vore_selected.name)] to their [lowertext(choice.name)]!")) host.vore_selected.transfer_contents(target, choice) return TRUE if("Transform") if(host.stat) - to_chat(user,"You can't do that in your state!") + to_chat(user,span_warning("You can't do that in your state!")) return TRUE var/mob/living/carbon/human/H = target @@ -1526,10 +1526,10 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", return FALSE if(new_bulge == 0) //Disable. host.vore_selected.bulge_size = 0 - to_chat(user,"Your stomach will not be seen on examine.") + to_chat(user,span_notice("Your stomach will not be seen on examine.")) else if (!ISINRANGE(new_bulge,25,200)) host.vore_selected.bulge_size = 0.25 //Set it to the default. - to_chat(user,"Invalid size.") + to_chat(user,span_notice("Invalid size.")) else if(new_bulge) host.vore_selected.bulge_size = (new_bulge/100) . = TRUE @@ -1542,7 +1542,7 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", return FALSE if (!ISINRANGE(new_grow,25,200)) host.vore_selected.shrink_grow_size = 1 //Set it to the default - to_chat(user,"Invalid size.") + to_chat(user,span_notice("Invalid size.")) else if(new_grow) host.vore_selected.shrink_grow_size = (new_grow*0.01) . = TRUE @@ -1615,10 +1615,10 @@ var/global/list/belly_colorable_only_fullscreens = list("a_synth_flesh_mono", if("b_escapable") if(host.vore_selected.escapable == 0) //Possibly escapable and special interactions. host.vore_selected.escapable = 1 - to_chat(usr,"Prey now have special interactions with your [lowertext(host.vore_selected.name)] depending on your settings.") + to_chat(usr,span_warning("Prey now have special interactions with your [lowertext(host.vore_selected.name)] depending on your settings.")) else if(host.vore_selected.escapable == 1) //Never escapable. host.vore_selected.escapable = 0 - to_chat(usr,"Prey will not be able to have special interactions with your [lowertext(host.vore_selected.name)].") + to_chat(usr,span_warning("Prey will not be able to have special interactions with your [lowertext(host.vore_selected.name)].")) else tgui_alert_async(usr, "Something went wrong. Your stomach will now not have special interactions. Press the button enable them again and tell a dev.","Error") //If they somehow have a varable that's not 0 or 1 host.vore_selected.escapable = 0 diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index cd5da01057..f9321ba9b1 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -91,10 +91,10 @@ if(ishuman(loc)) var/mob/living/carbon/human/H = loc if(H.wear_suit != src) - to_chat(H, "You must be wearing [src] to put up the hood!") + to_chat(H, span_warning("You must be wearing [src] to put up the hood!")) return if(H.head) - to_chat(H, "You're already wearing something on your head!") + to_chat(H, span_warning("You're already wearing something on your head!")) return else H.equip_to_slot_if_possible(hood,slot_head,0,0,1) @@ -612,7 +612,7 @@ /obj/item/clothing/head/helmet/space/void/engineering/hazmat/fluff/screehelm/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) if(..()) if(H.ckey != "scree") - to_chat(H, "Your face and whoever is meant for this helmet are too different.") + to_chat(H, span_warning("Your face and whoever is meant for this helmet are too different.")) return 0 else return 1 @@ -635,7 +635,7 @@ /obj/item/clothing/suit/space/void/engineering/hazmat/fluff/screespess/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) if(..()) if(H.ckey != "scree") - to_chat(H, "The gloves only have three fingers, not to mention the accommodation for extra limbs.") + to_chat(H, span_warning("The gloves only have three fingers, not to mention the accommodation for extra limbs.")) return 0 else return 1 @@ -689,7 +689,7 @@ /obj/item/clothing/under/fluff/aluranevines/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) if(..()) if(H.ckey != "natje") - to_chat(H, "Wrapping vines around yourself is a quite an... Odd idea. You decide otherwise.") + to_chat(H, span_warning("Wrapping vines around yourself is a quite an... Odd idea. You decide otherwise.")) return 0 else return 1 @@ -854,7 +854,7 @@ /obj/item/clothing/head/helmet/space/fluff/joan/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) if(..()) if(H.ckey != "joanrisu") - to_chat(H, "You try to fit on the helmet, but it doesn't fit.") + to_chat(H, span_warning("You try to fit on the helmet, but it doesn't fit.")) return 0 else return 1 @@ -881,7 +881,7 @@ /obj/item/clothing/suit/space/fluff/joan/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) if(..()) if(H.ckey != "joanrisu") - to_chat(H, "You try to fit into the suit, to no avail.") + to_chat(H, span_warning("You try to fit into the suit, to no avail.")) return 0 else return 1 @@ -1320,7 +1320,7 @@ Departamental Swimsuits, for general use if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf)) return ..() else - to_chat(H, "You need to have a wolf-taur half to wear this.") + to_chat(H, span_warning("You need to have a wolf-taur half to wear this.")) return 0 //samanthafyre:Kateryna Petrovitch @@ -1337,7 +1337,7 @@ Departamental Swimsuits, for general use if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf)) return ..() else - to_chat(H, "You need to have a wolf-taur half to wear this.") + to_chat(H, span_warning("You need to have a wolf-taur half to wear this.")) return 0 //samanthafyre:Kateryna Petrovitch @@ -1367,7 +1367,7 @@ Departamental Swimsuits, for general use /obj/item/clothing/head/helmet/space/fluff/kate/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) if(..()) if(H.ckey != "samanthafyre") - to_chat(H, "You try to fit on the helmet, but it doesn't fit.") + to_chat(H, span_warning("You try to fit on the helmet, but it doesn't fit.")) return 0 else return 1 @@ -1564,10 +1564,10 @@ Departamental Swimsuits, for general use if(ishuman(loc)) var/mob/living/carbon/human/H = loc if(H.wear_suit != src) - to_chat(H, "You must be wearing [src] to put up the hood!") + to_chat(H, span_warning("You must be wearing [src] to put up the hood!")) return if(H.head) - to_chat(H, "You're already wearing something on your head!") + to_chat(H, span_warning("You're already wearing something on your head!")) return else H.equip_to_slot_if_possible(hood,slot_head,0,0,1) @@ -1757,7 +1757,7 @@ Departamental Swimsuits, for general use /obj/item/clothing/head/helmet/space/void/security/hasd/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) if(..()) if(H.ckey != "silencedmp5a5") - to_chat(H, "...The faceplate is clearly not made for your anatomy, thus, does not fit.") + to_chat(H, span_warning("...The faceplate is clearly not made for your anatomy, thus, does not fit.")) return 0 else return 1 @@ -1776,7 +1776,7 @@ Departamental Swimsuits, for general use if(..() && istype(H) && H.ckey == "silencedmp5a5") return 1 else - to_chat(H, "This suit is not designed for you.") + to_chat(H, span_warning("This suit is not designed for you.")) return 0 //Zigfe:Zaoozaoo Xrimxuqmqixzix @@ -2031,7 +2031,7 @@ Departamental Swimsuits, for general use if (M.ckey == "ryumi") return 1 else if (M.get_active_hand() == src) - to_chat(M, "What the heck? \The [src] doesn't fit!") + to_chat(M, span_warning("What the heck? \The [src] doesn't fit!")) return 0 /obj/item/clothing/shoes/fluff/nikki @@ -2047,7 +2047,7 @@ Departamental Swimsuits, for general use if (M.ckey == "ryumi") return 1 else if (M.get_active_hand() == src) - to_chat(M, "What the heck? \The [src] doesn't fit!") + to_chat(M, span_warning("What the heck? \The [src] doesn't fit!")) return 0 /obj/item/clothing/suit/fluff/nikki //see /obj/item/rig/nikki @@ -2112,27 +2112,27 @@ Departamental Swimsuits, for general use /obj/item/clothing/head/fluff/nikki/proc/teleport_fail(mob/user, mob/target) if (target != user) - user.visible_message("[user] harmlessly bops [target] with \the [src].", \ - "\The [src] harmlessly bops [target]. The hat seems... unwilling?") + user.visible_message(span_notice("[user] harmlessly bops [target] with \the [src]."), \ + span_notice("\The [src] harmlessly bops [target]. The hat seems... unwilling?")) else user.visible_message("\The [src] flops over [user]'s' head for a moment, but they seem alright.", \ - "\The [src] flops over your head for a moment, but you correct it without issue. There we go!") + span_notice("\The [src] flops over your head for a moment, but you correct it without issue. There we go!")) /obj/item/clothing/head/fluff/nikki/proc/hat_warp_checks(var/mob/living/target, mob/user, proximity_flag) if (!proximity_flag) return 0 if (!translocator) - to_chat(user, "\The [src] doesn't have a translocator inside it yet, you goof!") + to_chat(user, span_warning("\The [src] doesn't have a translocator inside it yet, you goof!")) return 0 if (target.ckey == owner && target != user) // ur not getting me that easy sonny jim...... - to_chat(user, "You think to turn \the [src] on its creator?! FOOOOOOOOL.") - to_chat(user, "From seemingly nowhere you hear echoing, derisive laughter, accompanied by a stock laugh track and... Are those bike horns?") + to_chat(user, span_warning("You think to turn \the [src] on its creator?! FOOOOOOOOL.")) + to_chat(user, span_notice("From seemingly nowhere you hear echoing, derisive laughter, accompanied by a stock laugh track and... Are those bike horns?")) return 0 if (!istype(target)) - to_chat(user, "\The [src] isn't a valid target!") + to_chat(user, span_warning("\The [src] isn't a valid target!")) return 0 // Because other mobs (i.e. monkeys) apparently have dropnom prey set to 0, we check SPECIFICALLY for humans' dropnom setting. @@ -2148,11 +2148,11 @@ Departamental Swimsuits, for general use /obj/item/clothing/head/fluff/nikki/attackby(obj/item/I as obj, mob/user as mob) if (istype(I, /obj/item/perfect_tele) && user.get_inactive_hand() == src) if (translocator) - visible_message("[user] starts to pull \a [translocator] out of \the [src] to swap it out with \the [I]...", \ - "You start pulling \the [translocator] pops out of its compartment with a soft 'click' as you replace it with \the [I]....") + visible_message(span_notice("[user] starts to pull \a [translocator] out of \the [src] to swap it out with \the [I]..."), \ + span_notice("You start pulling \the [translocator] pops out of its compartment with a soft 'click' as you replace it with \the [I]....")) else - visible_message("[user] begins slipping \the [I] into \the [src]...", \ - "You begin to snap \the [I] into a small, hidden compartment inside \the [src]...") + visible_message(span_notice("[user] begins slipping \the [I] into \the [src]..."), \ + span_notice("You begin to snap \the [I] into a small, hidden compartment inside \the [src]...")) // This works for both adding and replacing a translocator translocator_equip(I, user) return @@ -2201,8 +2201,8 @@ Departamental Swimsuits, for general use // hey, are we actually able to teleport this poor person? if (hat_warp_checks(user, user, proximity_flag = 1)) // YOU FOOL! YOU HAVE ACTIVATED MY STAND, 「ＶＯＲＥ　ＢＹ　ＨＡＴã€ï¼ - src.visible_message("\The [src] falls over [user]'s head... and somehow falls over the rest of their body, causing them to vanish inside. Where did they go?!", \ - "The hat falls over your head as you put it on, enveloping you in a bright green light! Uh oh.") + src.visible_message(span_danger("\The [src] falls over [user]'s head... and somehow falls over the rest of their body, causing them to vanish inside. Where did they go?!"), \ + span_danger("The hat falls over your head as you put it on, enveloping you in a bright green light! Uh oh.")) var/uh_oh = pick(translocator.beacons) user.remove_from_mob(src, get_turf(user)) translocator.destination = translocator.beacons[uh_oh] @@ -2216,18 +2216,18 @@ Departamental Swimsuits, for general use // Silly fluffed up styles of teleporting people based on user intent. switch (user.a_intent) if (I_HELP) - user.visible_message("[user] guides \the [target] to the bottomless hole within \the [src]. They begin to climb inside...") + user.visible_message(span_notice("[user] guides \the [target] to the bottomless hole within \the [src]. They begin to climb inside...")) if (do_after(user, 5 SECONDS, target)) translocator.afterattack(target, user, proximity_flag) if (I_DISARM) - user.visible_message("[user] plops \the [src] onto \the [target]'s head!") + user.visible_message(span_danger("[user] plops \the [src] onto \the [target]'s head!")) translocator.afterattack(target, user, proximity_flag) if (I_GRAB) - user.visible_message("[user] begins stuffing [target] into \the [src]!") + user.visible_message(span_danger("[user] begins stuffing [target] into \the [src]!")) if (do_after(user, 5 SECONDS, target)) translocator.afterattack(target, user, proximity_flag) if (I_HURT) - user.visible_message("[user] swipes \the [src] over \the [target]!") + user.visible_message(span_danger("[user] swipes \the [src] over \the [target]!")) translocator.afterattack(target, user, proximity_flag) add_attack_logs(user, target, "Teleported [target] with via \the [src]'s [translocator]!") @@ -2376,10 +2376,10 @@ Departamental Swimsuits, for general use if(ishuman(loc)) var/mob/living/carbon/human/H = loc if(H.wear_suit != src) - to_chat(H, "You must be wearing [src] to put up the hood!") + to_chat(H, span_warning("You must be wearing [src] to put up the hood!")) return if(H.head) - to_chat(H, "You're already wearing something on your head!") + to_chat(H, span_warning("You're already wearing something on your head!")) return else H.equip_to_slot_if_possible(hood,slot_head,0,0,1) @@ -2434,10 +2434,10 @@ Departamental Swimsuits, for general use if(ishuman(loc)) var/mob/living/carbon/human/H = loc if(H.wear_suit != src) - to_chat(H, "You must be wearing [src] to put up the hood!") + to_chat(H, span_warning("You must be wearing [src] to put up the hood!")) return if(H.head) - to_chat(H, "You're already wearing something on your head!") + to_chat(H, span_warning("You're already wearing something on your head!")) return else H.equip_to_slot_if_possible(hood,slot_head,0,0,1) diff --git a/code/modules/vore/fluffstuff/custom_implants_vr.dm b/code/modules/vore/fluffstuff/custom_implants_vr.dm index d14d369de3..345359cb30 100644 --- a/code/modules/vore/fluffstuff/custom_implants_vr.dm +++ b/code/modules/vore/fluffstuff/custom_implants_vr.dm @@ -111,7 +111,7 @@ /obj/item/implant/reagent_generator/roiz/post_implant(mob/living/carbon/source) START_PROCESSING(SSobj, src) - to_chat(source, "You implant [source] with \the [src].") + to_chat(source, span_notice("You implant [source] with \the [src].")) source.verbs |= assigned_proc return 1 @@ -139,7 +139,7 @@ break if (rimplant) if(rimplant.reagents.total_volume <= rimplant.transfer_amount) - to_chat(src, "[pick(rimplant.empty_message)]") + to_chat(src, span_notice("[pick(rimplant.empty_message)]")) return new /obj/item/reagent_containers/food/snacks/egg/roiz(get_turf(src)) @@ -150,13 +150,13 @@ var/emote = rimplant.emote_descriptor[index] var/verb_desc = rimplant.verb_descriptor[index] var/self_verb_desc = rimplant.self_verb_descriptor[index] - usr.visible_message("[usr] [verb_desc] [emote]", - "You [self_verb_desc] [emote]") + usr.visible_message(span_notice("[usr] [verb_desc] [emote]"), + span_notice("You [self_verb_desc] [emote]")) else - visible_message("[src] [pick(rimplant.short_emote_descriptor)] an egg.", - "You [pick(rimplant.self_emote_descriptor)] an egg.") + visible_message(span_notice("[src] [pick(rimplant.short_emote_descriptor)] an egg."), + span_notice("You [pick(rimplant.self_emote_descriptor)] an egg.")) if(prob(15)) - visible_message("[src] [pick(rimplant.random_emote)].") // M-mlem. + visible_message(span_notice("[src] [pick(rimplant.random_emote)].")) // M-mlem. rimplant.reagents.remove_any(rimplant.transfer_amount) @@ -180,7 +180,7 @@ /obj/item/implant/reagent_generator/jasmine/post_implant(mob/living/carbon/source) START_PROCESSING(SSobj, src) - to_chat(source, "You implant [source] with \the [src].") + to_chat(source, span_notice("You implant [source] with \the [src].")) source.verbs |= assigned_proc return 1 @@ -208,7 +208,7 @@ break if (rimplant) if(rimplant.reagents.total_volume <= rimplant.transfer_amount) - to_chat(src, "[pick(rimplant.empty_message)]") + to_chat(src, span_notice("[pick(rimplant.empty_message)]")) return new /obj/item/reagent_containers/food/snacks/egg/roiz(get_turf(src)) @@ -219,13 +219,13 @@ var/emote = rimplant.emote_descriptor[index] var/verb_desc = rimplant.verb_descriptor[index] var/self_verb_desc = rimplant.self_verb_descriptor[index] - usr.visible_message("[usr] [verb_desc] [emote]", - "You [self_verb_desc] [emote]") + usr.visible_message(span_notice("[usr] [verb_desc] [emote]"), + span_notice("You [self_verb_desc] [emote]")) else - visible_message("[src] [pick(rimplant.short_emote_descriptor)] an egg.", - "You [pick(rimplant.self_emote_descriptor)] an egg.") + visible_message(span_notice("[src] [pick(rimplant.short_emote_descriptor)] an egg."), + span_notice("You [pick(rimplant.self_emote_descriptor)] an egg.")) if(prob(15)) - visible_message("[src] [pick(rimplant.random_emote)].") + visible_message(span_notice("[src] [pick(rimplant.random_emote)].")) rimplant.reagents.remove_any(rimplant.transfer_amount) @@ -249,7 +249,7 @@ /obj/item/implant/reagent_generator/yonra/post_implant(mob/living/carbon/source) START_PROCESSING(SSobj, src) - to_chat(source, "You implant [source] with \the [src].") + to_chat(source, span_notice("You implant [source] with \the [src].")) source.verbs |= assigned_proc return 1 @@ -277,7 +277,7 @@ break if (rimplant) if(rimplant.reagents.total_volume <= rimplant.transfer_amount) - to_chat(src, "[pick(rimplant.empty_message)]") + to_chat(src, span_notice("[pick(rimplant.empty_message)]")) return new /obj/item/reagent_containers/food/snacks/egg/teshari(get_turf(src)) @@ -288,13 +288,13 @@ var/emote = rimplant.emote_descriptor[index] var/verb_desc = rimplant.verb_descriptor[index] var/self_verb_desc = rimplant.self_verb_descriptor[index] - usr.visible_message("[usr] [verb_desc] [emote]", - "You [self_verb_desc] [emote]") + usr.visible_message(span_notice("[usr] [verb_desc] [emote]"), + span_notice("You [self_verb_desc] [emote]")) else - visible_message("[src] [pick(rimplant.short_emote_descriptor)] an egg.", - "You [pick(rimplant.self_emote_descriptor)] an egg.") + visible_message(span_notice("[src] [pick(rimplant.short_emote_descriptor)] an egg."), + span_notice("You [pick(rimplant.self_emote_descriptor)] an egg.")) if(prob(15)) - visible_message("[src] [pick(rimplant.random_emote)].") + visible_message(span_notice("[src] [pick(rimplant.random_emote)].")) rimplant.reagents.remove_any(rimplant.transfer_amount) @@ -334,7 +334,7 @@ /obj/item/implant/reagent_generator/rischi/post_implant(mob/living/carbon/source) START_PROCESSING(SSobj, src) - to_chat(source, "You implant [source] with \the [src].") + to_chat(source, span_notice("You implant [source] with \the [src].")) source.verbs |= assigned_proc return 1 @@ -362,7 +362,7 @@ break if (rimplant) if(rimplant.reagents.total_volume <= rimplant.transfer_amount) - to_chat(src, "[pick(rimplant.empty_message)]") + to_chat(src, span_notice("[pick(rimplant.empty_message)]")) return new /obj/item/reagent_containers/food/snacks/egg/teshari/tesh2(get_turf(src)) @@ -373,13 +373,13 @@ var/emote = rimplant.emote_descriptor[index] var/verb_desc = rimplant.verb_descriptor[index] var/self_verb_desc = rimplant.self_verb_descriptor[index] - usr.visible_message("[usr] [verb_desc] [emote]", - "You [self_verb_desc] [emote]") + usr.visible_message(span_notice("[usr] [verb_desc] [emote]"), + span_notice("You [self_verb_desc] [emote]")) else - visible_message("[src] falls to her knees as the urge to lay overwhelms her, letting out a whimper as she [pick(rimplant.short_emote_descriptor)] an egg from between her legs.", - "You fall to your knees as the urge to lay overwhelms you, letting out a whimper as you [pick(rimplant.self_emote_descriptor)] an egg from between your legs.") + visible_message(span_notice("[src] falls to her knees as the urge to lay overwhelms her, letting out a whimper as she [pick(rimplant.short_emote_descriptor)] an egg from between her legs."), + span_notice("You fall to your knees as the urge to lay overwhelms you, letting out a whimper as you [pick(rimplant.self_emote_descriptor)] an egg from between your legs.")) if(prob(15)) - visible_message("[src] [pick(rimplant.random_emote)].") + visible_message(span_notice("[src] [pick(rimplant.random_emote)].")) rimplant.reagents.remove_any(rimplant.transfer_amount) @@ -420,10 +420,10 @@ var/clr = C.colourName if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow"))) - to_chat(user, "The egg refuses to take on this color!") + to_chat(user, span_warning("The egg refuses to take on this color!")) return - to_chat(user, "You color \the [src] [clr]") + to_chat(user, span_notice("You color \the [src] [clr]")) icon_state = "egg_roiz_[clr]" desc = "It's a large lizard egg. It has been colored [clr]!" if (clr == "rainbow") @@ -485,7 +485,7 @@ /obj/item/implant/reagent_generator/evian/post_implant(mob/living/carbon/source) START_PROCESSING(SSobj, src) - to_chat(source, "You implant [source] with \the [src].") + to_chat(source, span_notice("You implant [source] with \the [src].")) source.verbs |= assigned_proc return 1 @@ -513,7 +513,7 @@ break if (rimplant) if(rimplant.reagents.total_volume <= rimplant.transfer_amount) - to_chat(src, "[pick(rimplant.empty_message)]") + to_chat(src, span_notice("[pick(rimplant.empty_message)]")) return new /obj/item/reagent_containers/food/snacks/egg/roiz/evian(get_turf(src)) //Roiz/evian so it gets all the functionality @@ -524,13 +524,13 @@ var/emote = rimplant.emote_descriptor[index] var/verb_desc = rimplant.verb_descriptor[index] var/self_verb_desc = rimplant.self_verb_descriptor[index] - usr.visible_message("[usr] [verb_desc] [emote]", - "You [self_verb_desc] [emote]") + usr.visible_message(span_notice("[usr] [verb_desc] [emote]"), + span_notice("You [self_verb_desc] [emote]")) else - visible_message("[src] [pick(rimplant.short_emote_descriptor)] an egg.", - "You [pick(rimplant.self_emote_descriptor)] an egg.") + visible_message(span_notice("[src] [pick(rimplant.short_emote_descriptor)] an egg."), + span_notice("You [pick(rimplant.self_emote_descriptor)] an egg.")) if(prob(15)) - visible_message("[src] [pick(rimplant.random_emote)].") // M-mlem. + visible_message(span_notice("[src] [pick(rimplant.random_emote)].")) // M-mlem. rimplant.reagents.remove_any(rimplant.transfer_amount) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index b1f3c77034..7993be8e43 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -61,10 +61,10 @@ if(istype(O,/obj/item/clothing/suit/space/void/) && !can_repair) //check if we're a voidsuit and if we're allowed to repair var/obj/item/clothing/suit/space/void/SS = O if(LAZYLEN(SS.breaches)) - to_chat(user, "You should probably repair that before you start tinkering with it.") + to_chat(user, span_warning("You should probably repair that before you start tinkering with it.")) return if(O.blood_DNA || O.contaminated) //check if we're bloody or gooey or whatever, so modkits can't be used to hide crimes easily. - to_chat(user, "You should probably clean that up before you start tinkering with it.") + to_chat(user, span_warning("You should probably clean that up before you start tinkering with it.")) return //we have to check that it's not the original type first, because otherwise it might convert wrong based on pathing; the subtype can still count as the basetype if(istype(O,to_helmet) && can_revert) @@ -74,7 +74,7 @@ cost = to_suit_cost to_type = from_suit else if(!can_revert && (istype(O,to_helmet) || istype (O,to_suit))) - to_chat(user, "This kit doesn't seem to have the tools necessary to revert changes to modified items.") + to_chat(user, span_warning("This kit doesn't seem to have the tools necessary to revert changes to modified items.")) return else if(istype(O,from_helmet)) cost = from_helmet_cost @@ -87,23 +87,23 @@ else return if(!isturf(O.loc)) - to_chat(user, "You need to put \the [O] on the ground, a table, or other worksurface before modifying it.") + to_chat(user, span_warning("You need to put \the [O] on the ground, a table, or other worksurface before modifying it.")) return if(!skip_content_check && O.contents.len) //check if we're loaded/modified, in the event of gun/suit kits, to avoid purging stuff like ammo, badges, armbands, or suit helmets - to_chat(user, "You should probably remove any attached items or loaded ammunition before trying to modify that!") + to_chat(user, span_warning("You should probably remove any attached items or loaded ammunition before trying to modify that!")) return if(cost > parts) - to_chat(user, "The kit doesn't have enough parts left to modify that.") + to_chat(user, span_warning("The kit doesn't have enough parts left to modify that.")) if(can_revert && ((to_helmet_cost || to_suit_cost) < 0)) - to_chat(user, " You can recover parts by using the kit on an already-modified item.") + to_chat(user, span_notice(" You can recover parts by using the kit on an already-modified item.")) return if(keycheck && owner_ckey) //check if we're supposed to care if(user.ckey != owner_ckey) //ERROR: UNAUTHORIZED USER - to_chat(user, "You probably shouldn't mess with all these strange tools and parts...") //give them a slightly fluffy explanation as to why it didn't work + to_chat(user, span_warning("You probably shouldn't mess with all these strange tools and parts...")) //give them a slightly fluffy explanation as to why it didn't work return playsound(src, 'sound/items/Screwdriver.ogg', 100, 1) var/obj/N = new to_type(O.loc) - user.visible_message("[user] opens \the [src] and modifies \the [O] into \the [N].","You open \the [src] and modify \the [O] into \the [N].") + user.visible_message(span_notice("[user] opens \the [src] and modifies \the [O] into \the [N]."),span_notice("You open \the [src] and modify \the [O] into \the [N].")) //crude, but transfer prints and fibers to avoid forensics abuse, same as the bloody/gooey check above N.fingerprints = O.fingerprints @@ -178,7 +178,7 @@ /obj/item/sword/fluff/joanaria/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(75)) - user.visible_message("\The [user] parries [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!")) playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 @@ -191,7 +191,7 @@ /obj/item/material/knife/tacknife/combatknife/fluff/katarina/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(75)) - user.visible_message("\The [user] parries [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!")) playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 @@ -226,11 +226,11 @@ /obj/item/card/id/centcom/station/fluff/joanbadge/attack_self(mob/user as mob) if(isliving(user)) - user.visible_message("[user] flashes their golden security badge.\nIt reads:NT Security.","You display the faded badge.\nIt reads: NT Security.") + user.visible_message(span_warning("[user] flashes their golden security badge.\nIt reads:NT Security."),span_warning("You display the faded badge.\nIt reads: NT Security.")) /obj/item/card/id/centcom/station/fluff/joanbadge/attack(mob/living/carbon/human/M, mob/living/user) if(isliving(user)) - user.visible_message("[user] invades [M]'s personal space, thrusting [src] into their face insistently.","You invade [M]'s personal space, thrusting [src] into their face insistently.") + user.visible_message(span_warning("[user] invades [M]'s personal space, thrusting [src] into their face insistently."),span_warning("You invade [M]'s personal space, thrusting [src] into their face insistently.")) //JoanRisu:Joan Risu /obj/item/pda/heads/hos/joanpda @@ -294,11 +294,11 @@ /obj/item/flag/attack_self(mob/user as mob) if(isliving(user)) - user.visible_message("[user] waves their Banner around!","You wave your Banner around.") + user.visible_message(span_warning("[user] waves their Banner around!"),span_warning("You wave your Banner around.")) /obj/item/flag/attack(mob/living/carbon/human/M, mob/living/user) if(isliving(user)) - user.visible_message("[user] invades [M]'s personal space, thrusting [src] into their face insistently.","You invade [M]'s personal space, thrusting [src] into their face insistently.") + user.visible_message(span_warning("[user] invades [M]'s personal space, thrusting [src] into their face insistently."),span_warning("You invade [M]'s personal space, thrusting [src] into their face insistently.")) /obj/item/flag/federation @@ -400,13 +400,13 @@ //O.icon = icon // just in case we're using custom sprite paths with fluff items. O.icon_state = new_icon // Changes the icon without changing the access. playsound(src, 'sound/items/polaroid2.ogg', 100, 1) - user.visible_message(" [user] reprints their ID.") + user.visible_message(span_warning(" [user] reprints their ID.")) qdel(src) else if(O.icon_state == new_icon) - to_chat(user, "[O] already has been reprinted.") + to_chat(user, span_notice("[O] already has been reprinted.")) return else - to_chat(user, "This isn't even an ID card you idiot.") + to_chat(user, span_warning("This isn't even an ID card you idiot.")) return //arokha:Aronai Sieyes - Centcom ID (Medical dept) @@ -423,7 +423,7 @@ if(user.mind && user.mind.initial_account) associated_account_number = user.mind.initial_account.account_number configured = 1 - to_chat(user, "Card settings set.") + to_chat(user, span_notice("Card settings set.")) //Swat43:Fortune Bloise /obj/item/storage/backpack/satchel/fluff/swat43bag @@ -458,7 +458,7 @@ if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf)) return ..() else - to_chat(H, "You need to have a wolf-taur half to wear this.") + to_chat(H, span_warning("You need to have a wolf-taur half to wear this.")) return 0 /obj/item/clothing/head/serdyhelmet //SilencedMP5A5's specialty helmet. @@ -545,24 +545,24 @@ /obj/item/clothing/accessory/collar/khcrystal/attack_self(mob/user as mob) if(state > 0) //Can't re-pair, one time only, for security reasons. - to_chat(user, "The [name] doesn't do anything.") + to_chat(user, span_notice("The [name] doesn't do anything.")) return 0 owner = user //We're paired to this guy owner_c = user.client //This is his client update_state(1) - to_chat(user, "The [name] glows pleasantly blue.") + to_chat(user, span_notice("The [name] glows pleasantly blue.")) START_PROCESSING(SSobj, src) /obj/item/clothing/accessory/collar/khcrystal/proc/check_owner() //He's dead, jim if((state == 1) && owner && (owner.stat == DEAD)) update_state(2) - visible_message("The [name] begins flashing red.") + visible_message(span_warning("The [name] begins flashing red.")) sleep(30) - visible_message("The [name] shatters into dust!") + visible_message(span_warning("The [name] shatters into dust!")) if(owner_c) - to_chat(owner_c, "The HAVENS system is notified of your demise via \the [name].") + to_chat(owner_c, span_notice("The HAVENS system is notified of your demise via \the [name].")) update_state(3) name = "broken [initial(name)]" desc = "This seems like a necklace, but the actual pendant is missing." @@ -660,13 +660,13 @@ O.icon_state = new_icon_state // Changes the icon without changing the access. O.desc = new_desc playsound(src, 'sound/items/polaroid2.ogg', 100, 1) - user.visible_message(" [user] reprints their ID.") + user.visible_message(span_warning(" [user] reprints their ID.")) qdel(src) else if(O.icon_state == new_icon) - to_chat(user, "[O] already has been reprinted.") + to_chat(user, span_notice("[O] already has been reprinted.")) return else - to_chat(user, "This isn't even an ID card you idiot.") + to_chat(user, span_warning("This isn't even an ID card you idiot.")) return //WickedTempest: Chakat Tempest @@ -832,7 +832,7 @@ /obj/item/clothing/accessory/badge/holo/detective/ruda/attack(mob/living/carbon/human/M, mob/living/user) if(isliving(user)) - user.visible_message("[user] invades [M]'s personal space, thrusting [src] into their face with an insistent huff.","You invade [M]'s personal space, thrusting [src] into their face with an insistent huff.") + user.visible_message(span_danger("[user] invades [M]'s personal space, thrusting [src] into their face with an insistent huff."),span_danger("You invade [M]'s personal space, thrusting [src] into their face with an insistent huff.")) user.do_attack_animation(M) user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //to prevent spam @@ -845,9 +845,9 @@ if(isliving(user)) if(stored_name) - user.visible_message("[user] displays their [src].\nIt reads: [stored_name], [badge_string].","You display your [src].\nIt reads: [stored_name], [badge_string].") + user.visible_message(span_notice("[user] displays their [src].\nIt reads: [stored_name], [badge_string]."),span_notice("You display your [src].\nIt reads: [stored_name], [badge_string].")) else - user.visible_message("[user] displays their [src].\nIt reads: [badge_string].","You display your [src]. It reads: [badge_string].") + user.visible_message(span_notice("[user] displays their [src].\nIt reads: [badge_string]."),span_notice("You display your [src]. It reads: [badge_string].")) /obj/item/card/id/fluff/xennith name = "\improper Amy Lessen's Central Command ID (Xenobiology Director)" @@ -878,7 +878,7 @@ H.monkeyize() qdel(src) //One time use. else //If not, do nothing. - to_chat(user, "You are unable to inject other people.") + to_chat(user, span_warning("You are unable to inject other people.")) /obj/item/fluff/injector/numb_bite name = "Numbing Venom Injector" @@ -892,7 +892,7 @@ H.species.give_numbing_bite() //This was annoying, but this is the easiest way of performing it. qdel(src) //One time use. else //If not, do nothing. - to_chat(user, "You are unable to inject other people.") + to_chat(user, span_warning("You are unable to inject other people.")) //For 2 handed fluff weapons. /obj/item/material/twohanded/fluff //Twohanded fluff items. @@ -950,7 +950,7 @@ /obj/item/melee/baton/fluff/stunstaff/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(wielded && default_parry_check(user, attacker, damage_source) && prob(30)) - user.visible_message("\The [user] parries [attack_text] with \the [src]!") + user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!")) playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1) return 1 return 0 @@ -973,14 +973,14 @@ /obj/item/melee/baton/fluff/stunstaff/attack_self(mob/user) if(bcell && bcell.charge > hitcost) status = !status - to_chat(user, "[src] is now [status ? "on" : "off"].") + to_chat(user, span_notice("[src] is now [status ? "on" : "off"].")) if(status == 0) playsound(src, 'sound/weapons/saberoff.ogg', 50, 1) else playsound(src, 'sound/weapons/saberon.ogg', 50, 1) else status = 0 - to_chat(user, "[src] is out of charge.") + to_chat(user, span_warning("[src] is out of charge.")) update_held_icon() add_fingerprint(user) @@ -1042,8 +1042,8 @@ /obj/item/melee/fluffstuff/attack_self(mob/living/user as mob) if (active) if ((CLUMSY in user.mutations) && prob(50)) - user.visible_message("\The [user] accidentally cuts \himself with \the [src].",\ - "You accidentally cut yourself with \the [src].") + user.visible_message(span_danger("\The [user] accidentally cuts \himself with \the [src]."),\ + span_danger("You accidentally cut yourself with \the [src].")) user.take_organ_damage(5,5) deactivate(user) else @@ -1084,7 +1084,7 @@ /obj/item/melee/fluffstuff/wolfgirlsword/activate(mob/living/user) if(!active) - to_chat(user, "The [src] is now sharpened. It will cut!") + to_chat(user, span_notice("The [src] is now sharpened. It will cut!")) ..() attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -1096,7 +1096,7 @@ /obj/item/melee/fluffstuff/wolfgirlsword/deactivate(mob/living/user) if(active) - to_chat(user, "The [src] grows dull!") + to_chat(user, span_notice("The [src] grows dull!")) ..() attack_verb = list("bapped", "thwapped", "bonked", "whacked") icon_state = initial(icon_state) @@ -1176,7 +1176,7 @@ /obj/item/clothing/glasses/welding/tiemgogs/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) if(..()) if(H.ckey != "radiantaurora") - to_chat(H, "These don't look like they were made to fit you...") + to_chat(H, span_warning("These don't look like they were made to fit you...")) return 0 else return 1 @@ -1215,7 +1215,7 @@ /obj/item/rig/nikki/attackby(obj/item/W, mob/living/user) //This thing accepts ONLY mounted sizeguns. That's IT. Nothing else! if(open && istype(W,/obj/item/rig_module) && !istype(W,/obj/item/rig_module/mounted/sizegun)) - to_chat(user, "\The [src] only accepts mounted size gun modules.") + to_chat(user, span_danger("\The [src] only accepts mounted size gun modules.")) return ..() @@ -1224,7 +1224,7 @@ if (M.ckey == "ryumi") return 1 else if (M.get_active_hand() == src) - to_chat(M, "For some reason, the necklace seems to never quite get past your head when you try to put it on... Weird, it looked like it would fit.") + to_chat(M, span_warning("For some reason, the necklace seems to never quite get past your head when you try to put it on... Weird, it looked like it would fit.")) return 0 //Nickcrazy - Damon Bones Xrim @@ -1319,13 +1319,13 @@ like a sponge scrubbing away a stain.") user.hair_accessory_style = null for(var/datum/sprite_accessory/hair_accessory/verie_hair_glow/V in user) - to_chat(user, "found a V to delete!") + to_chat(user, span_warning("found a V to delete!")) qdel(V) user.update_hair() else - to_chat(user, "\The [src] isn't compatible with your body as it is now.") + to_chat(user, span_warning("\The [src] isn't compatible with your body as it is now.")) // Astra - // Astra /obj/item/material/knife/ritual/fluff/astra @@ -1432,7 +1432,7 @@ desc = "A hard drive containing knowledge of various languages." /obj/item/implant/language/fluff/m41l/post_implant(mob/M) - to_chat(M,"LANGUAGES - LOADING") + to_chat(M,span_notice("LANGUAGES - LOADING")) M.add_language(LANGUAGE_SKRELLIAN) M.add_language(LANGUAGE_UNATHI) M.add_language(LANGUAGE_SIIK) @@ -1449,7 +1449,7 @@ M.add_language(LANGUAGE_SPACER) M.add_language(LANGUAGE_TAVAN) M.add_language(LANGUAGE_ECHOSONG) - to_chat(M,"LANGUAGES - INITIALISED") + to_chat(M,span_notice("LANGUAGES - INITIALISED")) //thedavestdave - Lucky /obj/item/clothing/suit/armor/combat/crusader_costume/lucky @@ -1542,16 +1542,16 @@ if(world.time - last_message <= 5 SECONDS) return if(user.a_intent == I_HELP) - user.visible_message("\The [user] hugs [src]!","You hug [src]!") + user.visible_message(span_notice("\The [user] hugs [src]!"),span_notice("You hug [src]!")) icon_state = "pandorba" else if (user.a_intent == I_HURT) - user.visible_message("\The [user] punches [src]!","You punch [src]!") + user.visible_message(span_warning("\The [user] punches [src]!"),span_warning("You punch [src]!")) icon_state = "pandorba_h" else if (user.a_intent == I_GRAB) - user.visible_message("\The [user] attempts to strangle [src]!","You attempt to strangle [src]!") + user.visible_message(span_warning("\The [user] attempts to strangle [src]!"),span_warning("You attempt to strangle [src]!")) icon_state = "pandorba_g" else - user.visible_message("\The [user] pokes [src].","You poke [src].") + user.visible_message(span_notice("\The [user] pokes [src]."),span_notice("You poke [src].")) icon_state = "pandorba_d" playsound(src, 'sound/items/drop/plushie.ogg', 25, 0) visible_message("[src] says, \"[pokephrase]\"") diff --git a/code/modules/vore/mouseray.dm b/code/modules/vore/mouseray.dm index e2822094e9..902275cef9 100644 --- a/code/modules/vore/mouseray.dm +++ b/code/modules/vore/mouseray.dm @@ -32,11 +32,11 @@ if(!choice) return tf_type = tf_possible_types[choice] - to_chat(usr, "You selected [choice].") + to_chat(usr, span_notice("You selected [choice].")) /obj/item/gun/energy/mouseray/Fire(atom/target, mob/living/user, clickparams, pointblank, reflex) if(world.time < cooldown) - to_chat(usr, "\The [src] isn't ready yet.") + to_chat(usr, span_warning("\The [src] isn't ready yet.")) return . = ..() @@ -300,7 +300,7 @@ return if(target != firer) //If you shot yourself, you probably want to be TFed so don't bother with prefs. if(!M.allow_spontaneous_tf && !tf_admin_pref_override) - firer.visible_message("\The [src] buzzes impolitely.") + firer.visible_message(span_warning("\The [src] buzzes impolitely.")) return if(M.tf_mob_holder) var/mob/living/ourmob = M.tf_mob_holder @@ -330,10 +330,10 @@ M.drop_from_inventory(W) qdel(target) - firer.visible_message("\The [shot_from] boops pleasantly.") + firer.visible_message(span_notice("\The [shot_from] boops pleasantly.")) return else - firer.visible_message("\The [shot_from] buzzes impolitely.") + firer.visible_message(span_warning("\The [shot_from] buzzes impolitely.")) /obj/item/gun/energy/mouseray/admin //NEVER GIVE THIS TO ANYONE name = "experimental metamorphosis ray" @@ -428,7 +428,7 @@ /obj/item/gun/energy/mouseray/metamorphosis/advanced/random/Fire(atom/target, mob/living/user, clickparams, pointblank, reflex) if(world.time < cooldown) - to_chat(usr, "\The [src] isn't ready yet.") + to_chat(usr, span_warning("\The [src] isn't ready yet.")) return var/choice = pick(tf_possible_types) tf_type = tf_possible_types[choice] diff --git a/code/modules/vore/resizing/crackers.dm b/code/modules/vore/resizing/crackers.dm index 2eee4266b7..0c88a65f8e 100644 --- a/code/modules/vore/resizing/crackers.dm +++ b/code/modules/vore/resizing/crackers.dm @@ -41,20 +41,20 @@ if(target.stat) return if(target == user) - to_chat(user, "You can't pull \the [src] by yourself, that would just be sad!") + to_chat(user, span_notice("You can't pull \the [src] by yourself, that would just be sad!")) return - to_chat(user, "You offer \the [src] to \the [target] to pull and wait to see how whether they do.") + to_chat(user, span_notice("You offer \the [src] to \the [target] to pull and wait to see how whether they do.")) var/check_pull = tgui_alert(target, "\The [user] is offering to pull \the [src] with you, do you want to pull it?", "Pull Cracker", list("Yes", "No")) if(!check_pull || check_pull == "No") - to_chat(user, "\The [target] chose not to pull \the [src]!") + to_chat(user, span_notice("\The [target] chose not to pull \the [src]!")) return if(!adjacent) - to_chat(user, "\The [target] is not standing close enough to pull \the [src]!") + to_chat(user, span_notice("\The [target] is not standing close enough to pull \the [src]!")) return var/obj/item/check_hand = user.get_active_hand() if(check_hand != src) - to_chat(user, "\The [src] is no longer in-hand!") - to_chat(target, "\The [src] is no longer in-hand!") + to_chat(user, span_notice("\The [src] is no longer in-hand!")) + to_chat(target, span_notice("\The [src] is no longer in-hand!")) return var/prize = pick(prizes) var/joke = pick(jokes) @@ -77,7 +77,7 @@ var/spawnloc = get_turf(winner) - winner.visible_message("\The [winner] wins the cracker prize!","You win the cracker prize!") + winner.visible_message(span_notice("\The [winner] wins the cracker prize!"),span_notice("You win the cracker prize!")) if(prize == "shrinking") winner.resize(0.25) winner.visible_message("\The [winner] shrinks suddenly!") diff --git a/code/modules/vore/resizing/holder_micro_vr.dm b/code/modules/vore/resizing/holder_micro_vr.dm index fe3b799963..55a1ba0792 100644 --- a/code/modules/vore/resizing/holder_micro_vr.dm +++ b/code/modules/vore/resizing/holder_micro_vr.dm @@ -32,7 +32,7 @@ H.help_shake_act(user) if(isanimal(L)) var/mob/living/simple_mob/S = L - user.visible_message("[user] [S.response_help] \the [S].") + user.visible_message(span_notice("[user] [S.response_help] \the [S].")) //Egg features. /obj/item/holder/attack_hand(mob/living/user as mob) diff --git a/code/modules/vore/resizing/holder_vr.dm b/code/modules/vore/resizing/holder_vr.dm index f66085aeee..473200425c 100644 --- a/code/modules/vore/resizing/holder_vr.dm +++ b/code/modules/vore/resizing/holder_vr.dm @@ -15,10 +15,10 @@ if (user.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - to_chat(user, "You try to move your [temp.name], but cannot!") + to_chat(user, span_notice("You try to move your [temp.name], but cannot!")) return if(!temp) - to_chat(user, "You try to use your hand, but realize it is no longer attached!") + to_chat(user, span_notice("You try to use your hand, but realize it is no longer attached!")) return if(held_mob == user) return // No picking your own micro self up diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index ce16860517..54b3bff78a 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -190,7 +190,7 @@ return 0 if(size_diff >= 0.50 || mob_size < MOB_SMALL || size_diff >= get_effective_size() || ignore_size) if(buckled) - to_chat(usr,"You have to unbuckle \the [src] before you pick them up.") + to_chat(usr,span_notice("You have to unbuckle \the [src] before you pick them up.")) return 0 holder_type = /obj/item/holder/micro var/obj/item/holder/m_holder = get_scooped(M, G) @@ -244,9 +244,9 @@ tmob_message = tail.msg_owner_stepunder if(src_message) - to_chat(src, "[STEP_TEXT_OWNER(src_message)]") + to_chat(src, span_filter_notice("[STEP_TEXT_OWNER(src_message)]")) if(tmob_message) - to_chat(tmob, "[STEP_TEXT_PREY(tmob_message)]") + to_chat(tmob, span_filter_notice("[STEP_TEXT_PREY(tmob_message)]")) return TRUE return FALSE @@ -307,8 +307,8 @@ return FALSE if(tmob.a_intent != I_HELP && prob(35)) - to_chat(pred, "[prey] dodges out from under your foot!") - to_chat(prey, "You narrowly avoid [pred]'s foot!") + to_chat(pred, span_danger("[prey] dodges out from under your foot!")) + to_chat(prey, span_danger("You narrowly avoid [pred]'s foot!")) return FALSE now_pushing = 0 @@ -396,8 +396,8 @@ prey.drip(3) add_attack_logs(pred, prey, "Crushed underfoot (walk, about [calculated_damage] damage)") - to_chat(pred, "[message_pred]") - to_chat(prey, "[message_prey]") + to_chat(pred, span_danger("[message_pred]")) + to_chat(prey, span_danger("[message_prey]")) return TRUE /mob/living/verb/toggle_pickups() @@ -406,7 +406,7 @@ set category = "IC" pickup_active = !pickup_active - to_chat(src, "You will [pickup_active ? "now" : "no longer"] attempt to pick up mobs when clicking them with help intent.") + to_chat(src, span_filter_notice("You will [pickup_active ? "now" : "no longer"] attempt to pick up mobs when clicking them with help intent.")) #undef STEP_TEXT_OWNER #undef STEP_TEXT_PREY diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index d1f2b4715f..12186f1332 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -39,7 +39,7 @@ set src in view(1) size_set_to = (rand(25,200)) /100 - usr.visible_message("\The [usr] spins the size dial to a random value!","You spin the dial to a random value!") + usr.visible_message(span_warning("\The [usr] spins the size dial to a random value!"),span_notice("You spin the dial to a random value!")) /obj/item/gun/energy/sizegun/consume_next_projectile() . = ..() @@ -58,9 +58,9 @@ //We do valid resize testing in actual firings because people move after setting these things. //Just a basic clamp here to the valid ranges. size_set_to = clamp((size_select/100), RESIZE_MINIMUM_DORMS, RESIZE_MAXIMUM_DORMS) - to_chat(usr, "You set the size to [size_select]%") + to_chat(usr, span_notice("You set the size to [size_select]%")) if(size_set_to < RESIZE_MINIMUM || size_set_to > RESIZE_MAXIMUM) - to_chat(usr, "Note: Resizing limited to 25-200% automatically while outside dormatory areas.") //hint that we clamp it in resize + to_chat(usr, span_notice("Note: Resizing limited to 25-200% automatically while outside dormatory areas.")) //hint that we clamp it in resize /obj/item/gun/energy/sizegun/update_icon(var/ignore_inhands) var/grow_mode = "shrink" @@ -82,7 +82,7 @@ /obj/item/gun/energy/sizegun/examine(mob/user) . = ..() - . += "It is currently set at [size_set_to*100]%" + . += span_info("It is currently set at [size_set_to*100]%") /obj/item/gun/energy/sizegun/admin name = "modified size gun" @@ -132,14 +132,14 @@ if(!size_select) return //cancelled size_set_to = clamp((size_select/100), 0, 1000) //eheh - to_chat(usr, "You set the size to [size_select]%") + to_chat(usr, span_notice("You set the size to [size_select]%")) /obj/item/gun/energy/sizegun/afterattack(atom/A, mob/living/user, adjacent, params) if(adjacent) return //A is adjacent, is the user, or is on the user's person if(backfire) if(prob(50)) - to_chat(user, "\The [src] backfires and consumes its entire charge!") + to_chat(user, span_notice("\The [src] backfires and consumes its entire charge!")) Fire(user, user) power_supply.charge = 0 var/mob/living/M = loc // TGMC Ammo HUD @@ -154,7 +154,7 @@ /obj/item/gun/energy/sizegun/attack(atom/A, mob/living/user, adjacent, params) if(backfire) if(prob(50)) - to_chat(user, "\The [src] backfires and consumes its entire charge!") + to_chat(user, span_notice("\The [src] backfires and consumes its entire charge!")) Fire(user, user) power_supply.charge = 0 var/mob/living/M = loc // TGMC Ammo HUD @@ -170,11 +170,11 @@ /obj/item/gun/energy/sizegun/attackby(var/obj/item/A as obj, mob/user as mob) if(A.has_tool_quality(TOOL_WIRECUTTER)) if(backfire) - to_chat(user, "You repair the damage to the \the [src].") + to_chat(user, span_warning("You repair the damage to the \the [src].")) backfire = 0 name = "size gun" else - to_chat(user, "You snip a wire on \the [src], making it less reliable.") + to_chat(user, span_warning("You snip a wire on \the [src], making it less reliable.")) backfire = 1 name = "unstable size gun" ..() @@ -210,7 +210,7 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(istype(H.gloves, /obj/item/clothing/gloves/bluespace)) - M.visible_message("\The [H]'s bracelet flashes and absorbs the beam!","Your bracelet flashes and absorbs the beam!") + M.visible_message(span_warning("\The [H]'s bracelet flashes and absorbs the beam!"),span_notice("Your bracelet flashes and absorbs the beam!")) return if(!M.resize(set_size, uncapped = M.has_large_resize_bounds(), ignore_prefs = ignoring_prefs)) to_chat(M, span_blue("The beam fires into your body, changing your size!")) @@ -227,9 +227,9 @@ var/very_big = is_extreme_size(set_size) if(very_big && can_be_big) // made an extreme size in an area that allows it, don't assume adminbuse - to_chat(firer, "[M] will lose this size upon moving into an area where this size is not allowed.") + to_chat(firer, span_warning("[M] will lose this size upon moving into an area where this size is not allowed.")) else if(very_big) // made an extreme size in an area that doesn't allow it, assume adminbuse - to_chat(firer, "[M] will retain this normally unallowed size outside this area.") + to_chat(firer, span_warning("[M] will retain this normally unallowed size outside this area.")) M.resize(set_size, uncapped = TRUE, ignore_prefs = TRUE) // Always ignores prefs, caution is advisable diff --git a/code/modules/vore/smoleworld/smoleworld_vr.dm b/code/modules/vore/smoleworld/smoleworld_vr.dm index 5a97010ac7..f1a4003425 100644 --- a/code/modules/vore/smoleworld/smoleworld_vr.dm +++ b/code/modules/vore/smoleworld/smoleworld_vr.dm @@ -116,7 +116,7 @@ if(user.a_intent == I_DISARM) if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction)) return - to_chat(user, "[src] was dismantaled into bricks.") + to_chat(user, span_notice("[src] was dismantaled into bricks.")) playsound(src, 'sound/items/smolesmallbuild.ogg', 50, 1, -1, volume_channel = VOLUME_CHANNEL_MASTER) var/turf/simulated/floor/F = get_turf(src) if(istype(F)) @@ -213,7 +213,7 @@ if(user.a_intent == I_DISARM) if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction)) return - to_chat(user, "[src] was dismantaled into bricks.") + to_chat(user, span_notice("[src] was dismantaled into bricks.")) playsound(src, 'sound/items/smolesmallbuild.ogg', 50, 1, -1, volume_channel = VOLUME_CHANNEL_MASTER) if(!isnull(loc)) new /obj/item/stack/material/smolebricks(loc) @@ -228,8 +228,8 @@ take_damage() playsound(src, 'sound/items/smolebuildinghit2.ogg', 50, 1) user.do_attack_animation(src) - usr.visible_message("\The [usr] bangs against \the [src]!", - "You bang against \the [src]!", + usr.visible_message(span_danger("\The [usr] bangs against \the [src]!"), + span_danger("You bang against \the [src]!"), "You hear a banging sound.") else usr.visible_message("[usr.name] knocks on the [src.name].", @@ -248,7 +248,7 @@ return //results of attacks will remove building and spawn in ruins. /obj/structure/smolebuilding/proc/dismantle() - visible_message("\The [src] falls apart!") + visible_message(span_danger("\The [src] falls apart!")) playsound(src, 'sound/items/smolebuildingdestoryed.ogg', 50, 1, -1, volume_channel = VOLUME_CHANNEL_MASTER) new /obj/structure/smoleruins(loc) qdel(src) @@ -264,7 +264,7 @@ return //is the same as dismaintal but instead of ruins it just makes it all explode /obj/structure/smolebuilding/proc/displode() - visible_message("\The [src] explodes into pieces!") + visible_message(span_danger("\The [src] explodes into pieces!")) playsound(src, 'sound/items/smolebuildingdestoryedshort.ogg', 50, 1, -1, volume_channel = VOLUME_CHANNEL_MASTER) new /obj/item/stack/material/smolebricks(loc) new /obj/item/stack/material/smolebricks(loc) @@ -276,7 +276,7 @@ if(user.a_intent == I_DISARM) if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction)) return - to_chat(user, "[src] was dismantaled into bricks.") + to_chat(user, span_notice("[src] was dismantaled into bricks.")) playsound(src, 'sound/items/smolelargeunbuild.ogg', 50, 1, volume_channel = VOLUME_CHANNEL_MASTER) if(!isnull(loc)) new /obj/item/stack/material/smolebricks(loc) @@ -293,7 +293,7 @@ return /obj/structure/smoleruins/proc/displode() - visible_message("\The [src] explodes into pieces!") + visible_message(span_danger("\The [src] explodes into pieces!")) playsound(src, 'sound/items/smolebuildingdestoryedshort.ogg', 50, 1, -1, volume_channel = VOLUME_CHANNEL_MASTER) new /obj/item/stack/material/smolebricks(loc) new /obj/item/stack/material/smolebricks(loc) diff --git a/code/modules/vore/weight/fitness_machines_vr.dm b/code/modules/vore/weight/fitness_machines_vr.dm index 2f09e9a36f..83462efdca 100644 --- a/code/modules/vore/weight/fitness_machines_vr.dm +++ b/code/modules/vore/weight/fitness_machines_vr.dm @@ -13,10 +13,10 @@ /obj/machinery/fitness/attack_hand(mob/living/user) if(user.nutrition < 70) - to_chat(user, "You need more energy to workout with the [src]!") + to_chat(user, span_notice("You need more energy to workout with the [src]!")) else if(user.weight < 70) - to_chat(user, "You're too skinny to risk losing any more weight!") + to_chat(user, span_notice("You're too skinny to risk losing any more weight!")) else //If they have enough nutrition and body weight, they can exercise. user.setClickCooldown(cooldown) @@ -24,7 +24,7 @@ user.weight -= 0.025 * weightloss_power * (0.01 * user.weight_loss) flick("[icon_state]2", src) var/message = pick(messages) - to_chat(user, "[message].") + to_chat(user, span_notice("[message].")) for(var/s in workout_sounds) playsound(src, s, 50, 1) @@ -57,18 +57,18 @@ /obj/machinery/fitness/heavy/attackby(obj/item/W, mob/living/user) if(W.has_tool_quality(TOOL_WRENCH)) add_fingerprint(user) - user.visible_message("[user] has [anchored ? "un" : ""]secured \the [src].", "You [anchored ? "un" : ""]secure \the [src].") + user.visible_message(span_warning("[user] has [anchored ? "un" : ""]secured \the [src]."), span_notice("You [anchored ? "un" : ""]secure \the [src].")) anchored = !anchored playsound(src, 'sound/items/Ratchet.ogg', 50, 1) return /obj/machinery/fitness/heavy/attack_hand(mob/living/user) if(!anchored) - to_chat(user, "For safety reasons, you are required to have this equipment wrenched down before using it!") + to_chat(user, span_notice("For safety reasons, you are required to have this equipment wrenched down before using it!")) return else if(user.loc != loc) - to_chat(user, "For safety reasons, you need to be sitting in the [src] for it to work!") + to_chat(user, span_notice("For safety reasons, you need to be sitting in the [src] for it to work!")) return else @@ -94,8 +94,8 @@ /obj/machinery/scale/attack_hand(var/mob/living/user) if(user.loc != loc) - to_chat(user, "You need to be standing on top of the scale for it to work!") + to_chat(user, span_notice("You need to be standing on top of the scale for it to work!")) return if(user.weight) //Just in case. var/kilograms = round(text2num(user.weight),4) / 2.20463 - visible_message("[src] displays a reading of [user.weight]lb / [kilograms]kg when [user] stands on it.") + visible_message(span_notice("[src] displays a reading of [user.weight]lb / [kilograms]kg when [user] stands on it.")) diff --git a/code/modules/xenoarcheaology/artifacts/autocloner.dm b/code/modules/xenoarcheaology/artifacts/autocloner.dm index 61f4975a02..d7205ac151 100644 --- a/code/modules/xenoarcheaology/artifacts/autocloner.dm +++ b/code/modules/xenoarcheaology/artifacts/autocloner.dm @@ -45,17 +45,17 @@ if(!previous_power_state) previous_power_state = 1 icon_state = "cellold1" - src.visible_message("[icon2html(src,viewers(src))] [src] suddenly comes to life!") + src.visible_message(span_notice("[icon2html(src,viewers(src))] [src] suddenly comes to life!")) //slowly grow a mob if(prob(5)) - src.visible_message("[icon2html(src,viewers(src))] [src] [pick("gloops","glugs","whirrs","whooshes","hisses","purrs","hums","gushes")].") + src.visible_message(span_notice("[icon2html(src,viewers(src))] [src] [pick("gloops","glugs","whirrs","whooshes","hisses","purrs","hums","gushes")].")) //if we've finished growing... if(time_spent_spawning >= time_per_spawn) time_spent_spawning = 0 update_use_power(USE_POWER_IDLE) - src.visible_message("[icon2html(src,viewers(src))] [src] pings!") + src.visible_message(span_notice("[icon2html(src,viewers(src))] [src] pings!")) icon_state = "cellold1" desc = "It's full of a bubbling viscous liquid, and is lit by a mysterious glow." if(spawn_type) @@ -76,7 +76,7 @@ if(previous_power_state) previous_power_state = 0 icon_state = "cellold0" - src.visible_message("[icon2html(src,viewers(src))] [src] suddenly shuts down.") + src.visible_message(span_notice("[icon2html(src,viewers(src))] [src] suddenly shuts down.")) //cloned mob slowly breaks down time_spent_spawning = max(time_spent_spawning + last_process - world.time, 0) diff --git a/code/modules/xenoarcheaology/artifacts/gigadrill.dm b/code/modules/xenoarcheaology/artifacts/gigadrill.dm index 5579f3d9a6..99c9bb9005 100644 --- a/code/modules/xenoarcheaology/artifacts/gigadrill.dm +++ b/code/modules/xenoarcheaology/artifacts/gigadrill.dm @@ -13,11 +13,11 @@ if(active) active = 0 icon_state = "gigadrill" - to_chat(user, "You press a button and \the [src] slowly spins down.") + to_chat(user, span_notice("You press a button and \the [src] slowly spins down.")) else active = 1 icon_state = "gigadrill_mov" - to_chat(user, "You press a button and \the [src] shudders to life.") + to_chat(user, span_notice("You press a button and \the [src] shudders to life.")) /obj/machinery/giga_drill/Bump(atom/A) if(active && !drilling_turf) diff --git a/code/modules/xenoarcheaology/artifacts/replicator.dm b/code/modules/xenoarcheaology/artifacts/replicator.dm index 2687497dfa..dbd427fda1 100644 --- a/code/modules/xenoarcheaology/artifacts/replicator.dm +++ b/code/modules/xenoarcheaology/artifacts/replicator.dm @@ -110,7 +110,7 @@ if(spawning_types.len && powered()) spawn_progress_time += world.time - last_process_time if(spawn_progress_time > max_spawn_time) - src.visible_message("[icon2html(src,viewers(src))] [src] pings!") + src.visible_message(span_notice("[icon2html(src,viewers(src))] [src] pings!")) var/obj/source_material = pop(stored_materials) var/spawn_type = pop(spawning_types) @@ -133,7 +133,7 @@ icon_state = "borgcharger0(old)" else if(prob(5)) - src.visible_message("[icon2html(src,viewers(src))] [src] [pick("clicks","whizzes","whirrs","whooshes","clanks","clongs","clonks","bangs")].") + src.visible_message(span_notice("[icon2html(src,viewers(src))] [src] [pick("clicks","whizzes","whirrs","whooshes","clanks","clongs","clonks","bangs")].")) last_process_time = world.time @@ -161,9 +161,9 @@ if(key in construction) if(LAZYLEN(stored_materials) > LAZYLEN(spawning_types)) if(LAZYLEN(spawning_types)) - visible_message("[icon2html(src,viewers(src))] a [pick("light","dial","display","meter","pad")] on [src]'s front [pick("blinks","flashes")] [pick("red","yellow","blue","orange","purple","green","white")].") + visible_message(span_notice("[icon2html(src,viewers(src))] a [pick("light","dial","display","meter","pad")] on [src]'s front [pick("blinks","flashes")] [pick("red","yellow","blue","orange","purple","green","white")].")) else - visible_message("[icon2html(src,viewers(src))] [src]'s front compartment slides shut.") + visible_message(span_notice("[icon2html(src,viewers(src))] [src]'s front compartment slides shut.")) spawning_types.Add(construction[key]) spawn_progress_time = 0 update_use_power(USE_POWER_ACTIVE) @@ -173,9 +173,9 @@ /obj/machinery/replicator/attackby(obj/item/W as obj, mob/living/user as mob) if(!W.canremove || !user.canUnEquip(W)) //No armblades, no grabs. No other-thing-I-didn't-think-of. - to_chat(user, "You cannot put \the [W] into the machine.") + to_chat(user, span_notice("You cannot put \the [W] into the machine.")) return user.drop_item() W.loc = src stored_materials.Add(W) - src.visible_message("\The [user] inserts \the [W] into \the [src].") + src.visible_message(span_notice("\The [user] inserts \the [W] into \the [src].")) diff --git a/code/modules/xenoarcheaology/artifacts/replicator_vr.dm b/code/modules/xenoarcheaology/artifacts/replicator_vr.dm index b6d1672f3f..d7ac940140 100644 --- a/code/modules/xenoarcheaology/artifacts/replicator_vr.dm +++ b/code/modules/xenoarcheaology/artifacts/replicator_vr.dm @@ -71,7 +71,7 @@ if(spawning_types.len && powered()) spawn_progress_time += world.time - last_process_time if(spawn_progress_time > max_spawn_time) - src.visible_message("[icon2html(src,viewers(src))] [src] pings!") + src.visible_message(span_notice("[icon2html(src,viewers(src))] [src] pings!")) var/obj/source_material = pop(stored_materials) var/spawn_type = pop(spawning_types) @@ -200,66 +200,66 @@ icon_state = "borgcharger0(old)" else if(prob(5)) - src.visible_message("[icon2html(src,viewers(src))] [src] [pick("clicks","whizzes","whirrs","whooshes","clanks","clongs","clonks","bangs")].") + src.visible_message(span_notice("[icon2html(src,viewers(src))] [src] [pick("clicks","whizzes","whirrs","whooshes","clanks","clongs","clonks","bangs")].")) last_process_time = world.time /obj/machinery/replicator/vore/attackby(obj/item/W as obj, mob/living/user as mob) if(!W.canremove || !user.canUnEquip(W) || W.possessed_voice || is_type_in_list(W,item_vore_blacklist)) //No armblades, no putting possessed items in it! - to_chat(user, "You cannot put \the [W] into the machine.") + to_chat(user, span_notice("You cannot put \the [W] into the machine.")) return if(istype(W, /obj/item/holder/micro)) //Are you putting a micro in it? var/obj/item/holder/micro/micro_holder = W var/mob/living/inserted_mob = micro_holder.held_mob //Get the actual mob. if(!inserted_mob.allow_spontaneous_tf) //Do they allow TF? - to_chat(user, "You cannot put \the [W] into the machine. ((The prefs of the micro forbid this action.))") + to_chat(user, span_notice("You cannot put \the [W] into the machine. ((The prefs of the micro forbid this action.))")) return if(inserted_mob.stat == DEAD) //Hey medical... - to_chat(user, "[W] is dead.") + to_chat(user, span_notice("[W] is dead.")) return if(inserted_mob.tf_mob_holder) - to_chat(user, "[W] must be in their original form.") + to_chat(user, span_notice("[W] must be in their original form.")) return if(inserted_mob.client) var/response //Let's see if they are SURE they accept the fact they will be a clothing, plushie, or something else. response = tgui_alert(inserted_mob, "Are you -sure- you want to be put in this machine?\n(This machine will turn you into one of the various types of mobs in the game.)", "WARNING: Are you sure you want to be put in the machine and transformed?", list("No", "Certain")) if(response != "Certain") //If they don't agree, stop. - to_chat(user, "[W] stops you from placing them in the machine.") + to_chat(user, span_notice("[W] stops you from placing them in the machine.")) return else //If they /do/ agree, give them one last chance. response = tgui_alert(inserted_mob, "This is the last warning: Are you absolutely certain you want to be transformed into a mob?", "WARNING: FINAL CHANCE!", list("No", "Certain")) if(response != "Certain") - to_chat(user, "[W] stops you from placing them in the machine.") + to_chat(user, span_notice("[W] stops you from placing them in the machine.")) return if(istype(inserted_mob, /mob/living/voice) || W.loc == src) //Sanity. return log_and_message_admins("[user] has just placed [inserted_mob] into a mob transformation machine.", user) else - to_chat(user, "You cannot put \the [W] into the machine. ((The micro must be connected to the server.))") + to_chat(user, span_notice("You cannot put \the [W] into the machine. ((The micro must be connected to the server.))")) return else if(istype(W,/obj/item/grab)) //Is someone being shoved into the machine? var/obj/item/grab/the_grab = W var/mob/living/inserted_mob = the_grab.affecting //Get the mob that is grabbed. if(!inserted_mob.allow_spontaneous_tf) - to_chat(user, "You cannot put \the [W] into the machine. ((The prefs of the micro forbid this action.))") + to_chat(user, span_notice("You cannot put \the [W] into the machine. ((The prefs of the micro forbid this action.))")) return if(inserted_mob.stat == DEAD) - to_chat(user, "[W] is dead.") + to_chat(user, span_notice("[W] is dead.")) return if(inserted_mob.tf_mob_holder) - to_chat(user, "[W] must be in their original form.") + to_chat(user, span_notice("[W] must be in their original form.")) return if(inserted_mob.client) var/response response = tgui_alert(inserted_mob, "Are you -sure- you want to be put in this machine?\n(This machine will turn you into one of the various types of mobs in the game.)", "WARNING: Are you sure you want to be put in the machine and transformed?", list("No", "Certain")) if(response != "Certain") - to_chat(user, "[W] stops you from placing them in the machine.") + to_chat(user, span_notice("[W] stops you from placing them in the machine.")) return else response = tgui_alert(inserted_mob, "This is the last warning: Are you absolutely certain you want to be transformed into a mob?", "WARNING: FINAL CHANCE!", list("No", "Certain")) if(response != "Certain") - to_chat(user, "[W] stops you from placing them in the machine.") + to_chat(user, span_notice("[W] stops you from placing them in the machine.")) return if(istype(inserted_mob, /mob/living/voice) || W.loc == src) return @@ -275,13 +275,13 @@ inserted_human.drop_from_inventory(I) inserted_mob.loc = src stored_materials.Add(inserted_mob) - src.visible_message("\The [user] inserts \the [inserted_mob] into \the [src].") + src.visible_message(span_filter_notice("\The [user] inserts \the [inserted_mob] into \the [src].")) return else - to_chat(user, "You cannot put \the [W] into the machine. ((The micro must be connected to the server.))") + to_chat(user, span_notice("You cannot put \the [W] into the machine. ((The micro must be connected to the server.))")) return else if(istype(W, /obj/item/holder/mouse)) //No you can't turn your army of mice into giant rats. - to_chat(user, "You cannot put \the [W] into the machine. The machine reads 'NOT ENOUGH BIOMASS'.") + to_chat(user, span_notice("You cannot put \the [W] into the machine. The machine reads 'NOT ENOUGH BIOMASS'.")) return user.drop_item() //Put the micro on the floor (or drop the item) if(istype(W, /obj/item/holder/micro)) //I hate this but it's the only way to get their stuff to drop. @@ -296,7 +296,7 @@ //Now that we've dropped all the items they have, let's shove them back into the micro holder. W.loc = src stored_materials.Add(W) - src.visible_message("\The [user] inserts \the [W] into \the [src].") + src.visible_message(span_filter_notice("\The [user] inserts \the [W] into \the [src].")) /obj/machinery/replicator/vore/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() @@ -313,9 +313,9 @@ if(key in created_mobs) if(LAZYLEN(stored_materials) > LAZYLEN(spawning_types)) if(LAZYLEN(spawning_types)) - visible_message("[icon2html(src,viewers(src))] a [pick("light","dial","display","meter","pad")] on [src]'s front [pick("blinks","flashes")] [pick("red","yellow","blue","orange","purple","green","white")].") + visible_message(span_notice("[icon2html(src,viewers(src))] a [pick("light","dial","display","meter","pad")] on [src]'s front [pick("blinks","flashes")] [pick("red","yellow","blue","orange","purple","green","white")].")) else - visible_message("[icon2html(src,viewers(src))] [src]'s front compartment slides shut.") + visible_message(span_notice("[icon2html(src,viewers(src))] [src]'s front compartment slides shut.")) spawning_types.Add(created_mobs[key]) spawn_progress_time = 0 update_use_power(USE_POWER_ACTIVE) @@ -424,7 +424,7 @@ if(spawning_types.len && powered()) spawn_progress_time += world.time - last_process_time if(spawn_progress_time > max_spawn_time) - src.visible_message("[icon2html(src,viewers(src))] [src] pings!") + src.visible_message(span_notice("[icon2html(src,viewers(src))] [src] pings!")) var/obj/source_material = pop(stored_materials) var/spawn_type = pop(spawning_types) @@ -469,65 +469,65 @@ icon_state = "borgcharger0(old)" else if(prob(5)) - src.visible_message("[icon2html(src,viewers(src))] [src] [pick("clicks","whizzes","whirrs","whooshes","clanks","clongs","clonks","bangs")].") + src.visible_message(span_notice("[icon2html(src,viewers(src))] [src] [pick("clicks","whizzes","whirrs","whooshes","clanks","clongs","clonks","bangs")].")) last_process_time = world.time /obj/machinery/replicator/clothing/attackby(obj/item/W as obj, mob/living/user as mob) if(!W.canremove || !user.canUnEquip(W) || W.possessed_voice || is_type_in_list(W,item_vore_blacklist)) //No armblades, no putting already possessed items in it! - to_chat(user, "You cannot put \the [W] into the machine.") + to_chat(user, span_notice("You cannot put \the [W] into the machine.")) return if(istype(W, /obj/item/holder/micro) || istype(W, /obj/item/holder/mouse)) //Are you putting a micro/mouse in it? var/obj/item/holder/micro/micro_holder = W var/mob/living/inserted_mob = micro_holder.held_mob //Get the actual mob. if(!inserted_mob.allow_spontaneous_tf) //Do they allow TF? - to_chat(user, "You cannot put \the [W] into the machine. ((The prefs of the micro forbid this action.))") + to_chat(user, span_notice("You cannot put \the [W] into the machine. ((The prefs of the micro forbid this action.))")) return if(inserted_mob.stat == DEAD) //Hey medical... - to_chat(user, "[W] is dead.") + to_chat(user, span_notice("[W] is dead.")) return if(inserted_mob.tf_mob_holder) //No recursion!!! - to_chat(user, "[W] must be in their original form.") + to_chat(user, span_notice("[W] must be in their original form.")) return if(inserted_mob.client) var/response //Let's see if they are SURE they accept the fact they will be a clothing, plushie, or something else. response = tgui_alert(inserted_mob, "Are you -sure- you want to be put in this machine?\n(This machine can turn you into various clothing, footwear, plushies, and other miscellaneous objects. This means that more likely than not, you will be used as whatever object is used. Make certain your preferences align with this possibility.)", "WARNING: Are you sure you want to be put in the machine and transformed?", list("No", "Certain")) if(response != "Certain") //If they don't agree, stop. - to_chat(user, "[W] stops you from placing them in the machine.") + to_chat(user, span_notice("[W] stops you from placing them in the machine.")) return else //If they /do/ agree, give them one last chance. response = tgui_alert(inserted_mob, "This is the last warning: Are you absolutely certain you want to be transformed into an object and have the possibility of being used as such?", "WARNING: FINAL CHANCE!", list("No", "I accept the possibilities")) if(response != "I accept the possibilities") - to_chat(user, "[W] stops you from placing them in the machine.") + to_chat(user, span_notice("[W] stops you from placing them in the machine.")) return if(istype(inserted_mob, /mob/living/voice) || W.loc == src) //This is a sanity check to keep them from entering it multiple times. return log_and_message_admins("[user] has just placed [inserted_mob] into an item transformation machine.", user) else - to_chat(user, "You cannot put \the [W] into the machine. ((The micro must be connected to the server.))") + to_chat(user, span_notice("You cannot put \the [W] into the machine. ((The micro must be connected to the server.))")) return else if(istype(W,/obj/item/grab)) //Is someone being shoved into the machine? var/obj/item/grab/the_grab = W var/mob/living/inserted_mob = the_grab.affecting //Get the mob that is grabbed. if(!inserted_mob.allow_spontaneous_tf) - to_chat(user, "You cannot put \the [W] into the machine. ((The prefs of the micro forbid this action.))") + to_chat(user, span_notice("You cannot put \the [W] into the machine. ((The prefs of the micro forbid this action.))")) return if(inserted_mob.stat == DEAD) - to_chat(user, "[W] is dead.") + to_chat(user, span_notice("[W] is dead.")) return if(inserted_mob.tf_mob_holder) - to_chat(user, "[W] must be in their original form.") + to_chat(user, span_notice("[W] must be in their original form.")) return if(inserted_mob.client) var/response response = tgui_alert(inserted_mob, "Are you -sure- you want to be put in this machine?\n(This machine can turn you into various clothing, footwear, plushies, and other miscellaneous objects. This means that more likely than not, you will be used as whatever object is used. Make certain your preferences align with this possibility.)", "WARNING: Are you sure you want to be put in the machine and transformed?", list("No", "Certain")) if(response != "Certain") - to_chat(user, "[W] stops you from placing them in the machine.") + to_chat(user, span_notice("[W] stops you from placing them in the machine.")) return else response = tgui_alert(inserted_mob, "This is the last warning: Are you absolutely certain you want to be transformed into an object and have the possibility of being used as such?", "WARNING: FINAL CHANCE!", list("No", "I accept the possibilities")) if(response != "I accept the possibilities") - to_chat(user, "[W] stops you from placing them in the machine.") + to_chat(user, span_notice("[W] stops you from placing them in the machine.")) return if(istype(inserted_mob, /mob/living/voice) || W.loc == src) return @@ -543,10 +543,10 @@ inserted_human.drop_from_inventory(I) inserted_mob.loc = src stored_materials.Add(inserted_mob) - src.visible_message("\The [user] inserts \the [inserted_mob] into \the [src].") + src.visible_message(span_filter_notice("\The [user] inserts \the [inserted_mob] into \the [src].")) return else - to_chat(user, "You cannot put \the [W] into the machine. ((They must be connected to the server.))") + to_chat(user, span_notice("You cannot put \the [W] into the machine. ((They must be connected to the server.))")) return user.drop_item() //Put the micro on the floor (or drop the item) @@ -562,7 +562,7 @@ //Now that we've dropped all the items they have, let's shove them back into the micro holder. W.loc = src stored_materials.Add(W) - src.visible_message("\The [user] inserts \the [W] into \the [src].") + src.visible_message(span_filter_notice("\The [user] inserts \the [W] into \the [src].")) /obj/machinery/replicator/clothing/tgui_interact(mob/user, datum/tgui/ui) //This creates the menu. @@ -586,9 +586,9 @@ if(key in created_items) if(LAZYLEN(stored_materials) > LAZYLEN(spawning_types)) if(LAZYLEN(spawning_types)) - visible_message("[icon2html(src,viewers(src))] a [pick("light","dial","display","meter","pad")] on [src]'s front [pick("blinks","flashes")] [pick("red","yellow","blue","orange","purple","green","white")].") + visible_message(span_notice("[icon2html(src,viewers(src))] a [pick("light","dial","display","meter","pad")] on [src]'s front [pick("blinks","flashes")] [pick("red","yellow","blue","orange","purple","green","white")].")) else - visible_message("[icon2html(src,viewers(src))] [src]'s front compartment slides shut.") + visible_message(span_notice("[icon2html(src,viewers(src))] [src]'s front compartment slides shut.")) spawning_types.Add(created_items[key]) spawn_progress_time = 0 update_use_power(USE_POWER_ACTIVE) diff --git a/code/modules/xenoarcheaology/boulder.dm b/code/modules/xenoarcheaology/boulder.dm index 9024f76198..842f644069 100644 --- a/code/modules/xenoarcheaology/boulder.dm +++ b/code/modules/xenoarcheaology/boulder.dm @@ -35,16 +35,16 @@ C.depth_scanner.scan_atom(user, src) return else - user.visible_message("\The [user] extends \the [C] over \the [src], a flurry of red beams scanning \the [src]'s surface!", "You extend \the [C] over \the [src], a flurry of red beams scanning \the [src]'s surface!") + user.visible_message("\The [user] extends \the [C] over \the [src], a flurry of red beams scanning \the [src]'s surface!", span_notice("You extend \the [C] over \the [src], a flurry of red beams scanning \the [src]'s surface!")) if(do_after(user, 15)) - to_chat(user, "\The [src] has been excavated to a depth of [2 * src.excavation_level]cm.") + to_chat(user, span_notice("\The [src] has been excavated to a depth of [2 * src.excavation_level]cm.")) return if(istype(I, /obj/item/measuring_tape)) var/obj/item/measuring_tape/P = I - user.visible_message("\The [user] extends \the [P] towards \the [src].", "You extend \the [P] towards \the [src].") + user.visible_message("\The [user] extends \the [P] towards \the [src].", span_notice("You extend \the [P] towards \the [src].")) if(do_after(user, 15)) - to_chat(user, "\The [src] has been excavated to a depth of [2 * src.excavation_level]cm.") + to_chat(user, span_notice("\The [src] has been excavated to a depth of [2 * src.excavation_level]cm.")) return if(istype(I, /obj/item/pickaxe)) @@ -54,17 +54,17 @@ return last_act = world.time - to_chat(user, "You start [P.drill_verb] [src].") + to_chat(user, span_warning("You start [P.drill_verb] [src].")) if(!do_after(user, P.digspeed)) return - to_chat(user, "You finish [P.drill_verb] [src].") + to_chat(user, span_notice("You finish [P.drill_verb] [src].")) excavation_level += P.excavation_amount if(excavation_level > 100) //failure - user.visible_message("\The [src] suddenly crumbles away.", "\The [src] has disintegrated under your onslaught, any secrets it was holding are long gone.") + user.visible_message(span_warning("\The [src] suddenly crumbles away."), span_warning("\The [src] has disintegrated under your onslaught, any secrets it was holding are long gone.")) qdel(src) return @@ -78,9 +78,9 @@ if(X.artifact_master) X.artifact_master.artifact_id = artifact_find.artifact_id O.anchored = FALSE // Anchored finds are lame. - src.visible_message("\The [src] suddenly crumbles away.") + src.visible_message(span_warning("\The [src] suddenly crumbles away.")) else - user.visible_message("\The [src] suddenly crumbles away.", "\The [src] has been whittled away under your careful excavation, but there was nothing of interest inside.") + user.visible_message(span_warning("\The [src] suddenly crumbles away."), span_notice("\The [src] has been whittled away under your careful excavation, but there was nothing of interest inside.")) qdel(src) /obj/structure/boulder/Bumped(AM) diff --git a/code/modules/xenoarcheaology/effect.dm b/code/modules/xenoarcheaology/effect.dm index 29665fa660..f17f0d7b17 100644 --- a/code/modules/xenoarcheaology/effect.dm +++ b/code/modules/xenoarcheaology/effect.dm @@ -92,7 +92,7 @@ var/atom/toplevelholder = target while(!istype(toplevelholder.loc, /turf)) toplevelholder = toplevelholder.loc - toplevelholder.visible_message("[span_red("[icon2html(toplevelholder, viewers(toplevelholder))] [toplevelholder] [display_msg]")]") + toplevelholder.visible_message(span_filter_notice("[span_red("[icon2html(toplevelholder, viewers(toplevelholder))] [toplevelholder] [display_msg]")]")) /datum/artifact_effect/proc/DoEffectTouch(var/mob/user) /datum/artifact_effect/proc/DoEffectAura(var/atom/holder) diff --git a/code/modules/xenoarcheaology/effect_master.dm b/code/modules/xenoarcheaology/effect_master.dm index 91c266bd91..e07cb358ca 100644 --- a/code/modules/xenoarcheaology/effect_master.dm +++ b/code/modules/xenoarcheaology/effect_master.dm @@ -108,7 +108,7 @@ my_effects += my_effect else - to_chat(usr, "This effect can not be applied to this atom type.") + to_chat(usr, span_filter_notice("This effect can not be applied to this atom type.")) qdel(my_effect) /datum/component/artifact_master/proc/remove_effect() @@ -237,7 +237,7 @@ warn = 1 if(warn && isliving(bumped)) - to_chat(bumped, "You accidentally touch \the [holder] as it hits you.") + to_chat(bumped, span_filter_notice("You accidentally touch \the [holder] as it hits you.")) /datum/component/artifact_master/proc/on_bumped() var/atom/movable/M = args[2] @@ -258,7 +258,7 @@ warn = 1 if(warn && isliving(M)) - to_chat(M, "You accidentally touch \the [holder].") + to_chat(M, span_filter_notice("You accidentally touch \the [holder].")) /datum/component/artifact_master/proc/on_attack_hand() var/mob/living/user = args[2] @@ -266,10 +266,10 @@ return if (get_dist(user, holder) > 1) - to_chat(user, "[span_red("You can't reach [holder] from here.")]") + to_chat(user, span_filter_notice("[span_red("You can't reach [holder] from here.")]")) return if(ishuman(user) && user:gloves) - to_chat(user, "You touch [holder] with your gloved hands, [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].") + to_chat(user, span_filter_notice("You touch [holder] with your gloved hands, [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].")) return var/triggered = FALSE @@ -285,10 +285,10 @@ my_effect.DoEffectTouch(user) if(triggered) - to_chat(user, "You touch [holder].") + to_chat(user, span_filter_notice("You touch [holder].")) else - to_chat(user, "You touch [holder], [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].") + to_chat(user, span_filter_notice("You touch [holder], [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].")) /datum/component/artifact_master/proc/on_attackby() diff --git a/code/modules/xenoarcheaology/effects/animate_anomaly.dm b/code/modules/xenoarcheaology/effects/animate_anomaly.dm index 7cf3e408e9..52ab0cf495 100644 --- a/code/modules/xenoarcheaology/effects/animate_anomaly.dm +++ b/code/modules/xenoarcheaology/effects/animate_anomaly.dm @@ -39,7 +39,7 @@ if(target && istype(T) && istype(O.loc, /turf)) O.Move(T) - O.visible_message("\The [holder] lurches away from [user]") + O.visible_message(span_alien("\The [holder] lurches away from [user]")) /datum/artifact_effect/animate_anomaly/DoEffectAura() var/obj/O = get_master_holder() @@ -58,7 +58,7 @@ if(istype(O.loc, /turf)) if(get_dist(O.loc, target.loc) > 1) O.Move(get_step_to(O, target)) - O.visible_message("\The [O] lurches toward [target]") + O.visible_message(span_alien("\The [O] lurches toward [target]")) /datum/artifact_effect/animate_anomaly/DoEffectPulse() DoEffectAura() diff --git a/code/modules/xenoarcheaology/effects/berserk.dm b/code/modules/xenoarcheaology/effects/berserk.dm index 4965747909..e82e75604d 100644 --- a/code/modules/xenoarcheaology/effects/berserk.dm +++ b/code/modules/xenoarcheaology/effects/berserk.dm @@ -13,13 +13,13 @@ return FALSE // Drons are presumably deaf to any psionic things. if(L.add_modifier(/datum/modifier/berserk, 30 SECONDS)) - to_chat(L, "An otherworldly feeling seems to enter your mind, and it ignites your mind in fury!") + to_chat(L, span_danger("An otherworldly feeling seems to enter your mind, and it ignites your mind in fury!")) L.adjustBrainLoss(3) // Playing with berserking alien psychic artifacts isn't good for the mind. - to_chat(L, "The inside of your head hurts...") + to_chat(L, span_danger("The inside of your head hurts...")) return TRUE else if(L.has_modifier_of_type(/datum/modifier/berserk)) // Already angry. - to_chat(L, "An otherworldly feeling seems to enter your mind again, and it fans your inner flame, extending your rage.") + to_chat(L, span_warning("An otherworldly feeling seems to enter your mind again, and it fans your inner flame, extending your rage.")) else // Exhausted or something. to_chat(L, "An otherworldly feeling seems to enter your mind, and you briefly feel an intense anger, but \ it quickly passes.") @@ -45,4 +45,4 @@ var/turf/T = get_turf(holder) for(var/mob/living/L in range(src.effectrange,T)) apply_berserk(L) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/modules/xenoarcheaology/effects/electric_field.dm b/code/modules/xenoarcheaology/effects/electric_field.dm index 1ba181bb45..706daf4664 100644 --- a/code/modules/xenoarcheaology/effects/electric_field.dm +++ b/code/modules/xenoarcheaology/effects/electric_field.dm @@ -19,7 +19,7 @@ for(var/mob/living/L in nearby_mobs) if(L.isSynthetic()) - to_chat(L, "ERROR: Electrical fault detected!") + to_chat(L, span_danger("ERROR: Electrical fault detected!")) L.stuttering += 3 if(ishuman(L)) @@ -41,7 +41,7 @@ for(var/mob/living/L in nearby_mobs) if(L.isSynthetic()) - to_chat(L, "ERROR: Electrical fault detected!") + to_chat(L, span_danger("ERROR: Electrical fault detected!")) L.stuttering += 3 if(ishuman(L)) @@ -63,7 +63,7 @@ for(var/mob/living/L in nearby_mobs) if(L.isSynthetic()) - to_chat(L, "ERROR: Electrical fault detected!") + to_chat(L, span_danger("ERROR: Electrical fault detected!")) L.stuttering += 3 if(ishuman(L)) diff --git a/code/modules/xenoarcheaology/effects/feysight.dm b/code/modules/xenoarcheaology/effects/feysight.dm index 70bceb7bcc..dee42c22bd 100644 --- a/code/modules/xenoarcheaology/effects/feysight.dm +++ b/code/modules/xenoarcheaology/effects/feysight.dm @@ -13,13 +13,13 @@ return FALSE // Drons are presumably deaf to any psionic things. if(L.add_modifier(/datum/modifier/feysight, 30 SECONDS)) - to_chat(L, "An otherworldly feeling seems to enter your mind, and you feel at peace.") + to_chat(L, span_alien("An otherworldly feeling seems to enter your mind, and you feel at peace.")) L.adjustHalLoss(10) - to_chat(L, "The inside of your head hurts...") + to_chat(L, span_danger("The inside of your head hurts...")) return TRUE else if(L.has_modifier_of_type(/datum/modifier/feysight)) - to_chat(L, "An otherworldly feeling seems to enter your mind again, and it holds the visions in place.") + to_chat(L, span_warning("An otherworldly feeling seems to enter your mind again, and it holds the visions in place.")) else to_chat(L, "An otherworldly feeling seems to enter your mind, and you briefly feel peace, but \ it quickly passes.") @@ -45,4 +45,4 @@ var/turf/T = get_turf(holder) for(var/mob/living/L in range(src.effectrange,T)) apply_modifier(L) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/modules/xenoarcheaology/effects/gaia.dm b/code/modules/xenoarcheaology/effects/gaia.dm index 42869fd556..75d184016d 100644 --- a/code/modules/xenoarcheaology/effects/gaia.dm +++ b/code/modules/xenoarcheaology/effects/gaia.dm @@ -33,7 +33,7 @@ /datum/artifact_effect/gaia/DoEffectTouch(var/mob/user) var/atom/holder = get_master_holder() - to_chat(user, "You feel the presence of something long forgotten.") + to_chat(user, span_alien("You feel the presence of something long forgotten.")) for(var/obj/machinery/portable_atmospherics/hydroponics/Tray in view(world.view,get_turf(holder))) age_plantlife(Tray) if(prob(30)) diff --git a/code/modules/xenoarcheaology/effects/gravitational_waves.dm b/code/modules/xenoarcheaology/effects/gravitational_waves.dm index c22eb87167..b9541fe766 100644 --- a/code/modules/xenoarcheaology/effects/gravitational_waves.dm +++ b/code/modules/xenoarcheaology/effects/gravitational_waves.dm @@ -28,13 +28,13 @@ var/seconds_since_last_pull = max(0, round((last_wave_pull - world.time) / 10)) if(prob(10 + seconds_since_last_pull)) - holder.visible_message("\The [holder] distorts as local gravity intensifies, and shifts toward it.") + holder.visible_message(span_alien("\The [holder] distorts as local gravity intensifies, and shifts toward it.")) last_wave_pull = world.time gravwave(get_turf(holder), effectrange, pull_power) /datum/artifact_effect/extreme/gravity_wave/DoEffectPulse() var/atom/holder = get_master_holder() - holder.visible_message("\The [holder] distorts as local gravity intensifies, and shifts toward it.") + holder.visible_message(span_alien("\The [holder] distorts as local gravity intensifies, and shifts toward it.")) gravwave(get_turf(holder), effectrange, pull_power) /datum/artifact_effect/extreme/gravity_wave/proc/gravwave(var/atom/target, var/pull_range = 7, var/pull_power = STAGE_TWO) diff --git a/code/modules/xenoarcheaology/effects/hurt.dm b/code/modules/xenoarcheaology/effects/hurt.dm index a2c8d54163..52ef861231 100644 --- a/code/modules/xenoarcheaology/effects/hurt.dm +++ b/code/modules/xenoarcheaology/effects/hurt.dm @@ -9,7 +9,7 @@ var/weakness = GetAnomalySusceptibility(toucher) if(iscarbon(toucher) && prob(weakness * 100)) var/mob/living/carbon/C = toucher - to_chat(C, "A painful discharge of energy strikes you!") + to_chat(C, span_danger("A painful discharge of energy strikes you!")) C.adjustOxyLoss(rand(5,25) * weakness) C.adjustToxLoss(rand(5,25) * weakness) C.adjustBruteLoss(rand(5,25) * weakness) @@ -29,7 +29,7 @@ var/weakness = GetAnomalySusceptibility(C) if(prob(weakness * 100)) if(prob(10)) - to_chat(C, "You feel a painful force radiating from something nearby.") + to_chat(C, span_danger("You feel a painful force radiating from something nearby.")) C.adjustBruteLoss(1 * weakness) C.adjustFireLoss(1 * weakness) C.adjustToxLoss(1 * weakness) @@ -44,7 +44,7 @@ for (var/mob/living/carbon/C in range(effectrange, T)) var/weakness = GetAnomalySusceptibility(C) if(prob(weakness * 100)) - to_chat(C, "A wave of painful energy strikes you!") + to_chat(C, span_danger("A wave of painful energy strikes you!")) C.adjustBruteLoss(3 * weakness) C.adjustFireLoss(3 * weakness) C.adjustToxLoss(3 * weakness) diff --git a/code/modules/xenoarcheaology/effects/poltergeist.dm b/code/modules/xenoarcheaology/effects/poltergeist.dm index c0cc034938..7cf80bfd3d 100644 --- a/code/modules/xenoarcheaology/effects/poltergeist.dm +++ b/code/modules/xenoarcheaology/effects/poltergeist.dm @@ -15,7 +15,7 @@ if(valid_targets.len) var/obj/obj_to_throw = pick(valid_targets) - obj_to_throw.visible_message("\The [obj_to_throw] levitates, before hurtling toward [target]!") + obj_to_throw.visible_message(span_alien("\The [obj_to_throw] levitates, before hurtling toward [target]!")) obj_to_throw.throw_at(target, world.view, min(40, damage * GetAnomalySusceptibility(target))) /datum/artifact_effect/poltergeist/DoEffectTouch(var/mob/user) diff --git a/code/modules/xenoarcheaology/effects/resurrect.dm b/code/modules/xenoarcheaology/effects/resurrect.dm index 0fb7c1b88f..176eaec451 100644 --- a/code/modules/xenoarcheaology/effects/resurrect.dm +++ b/code/modules/xenoarcheaology/effects/resurrect.dm @@ -51,7 +51,7 @@ living_mob_list += SM SM.update_icon() SM.revive() - holder.visible_message("\The [SM]'s eyes open in a flash of light!") + holder.visible_message(span_alien("\The [SM]'s eyes open in a flash of light!")) else if(ishuman(L)) var/mob/living/carbon/human/H = L @@ -73,7 +73,7 @@ living_mob_list += H H.timeofdeath = null - holder.visible_message("\The [H]'s eyes open in a flash of light!") + holder.visible_message(span_alien("\The [H]'s eyes open in a flash of light!")) /datum/artifact_effect/resurrect/DoEffectTouch(var/mob/user) var/atom/holder = get_master_holder() diff --git a/code/modules/xenoarcheaology/effects/vampire.dm b/code/modules/xenoarcheaology/effects/vampire.dm index 0548a2e355..f46aec3388 100644 --- a/code/modules/xenoarcheaology/effects/vampire.dm +++ b/code/modules/xenoarcheaology/effects/vampire.dm @@ -20,7 +20,7 @@ var/target = pick(M.organs_by_name) M.apply_damage(rand(5, 10), SEARING, target) - to_chat(M, "The skin on your [parse_zone(target)] feels like it's ripping apart, and a stream of blood flies out.") + to_chat(M, span_critical("The skin on your [parse_zone(target)] feels like it's ripping apart, and a stream of blood flies out.")) var/obj/effect/decal/cleanable/blood/splatter/animated/B = new(M.loc) B.basecolor = M.species.get_blood_colour(M) B.color = M.species.get_blood_colour(M) @@ -83,7 +83,7 @@ if(charges >= 0.1) if(prob(5)) - holder.visible_message("[icon2html(holder,viewers(holder))] \The [holder] gleams a bloody red!") + holder.visible_message(span_alien("[icon2html(holder,viewers(holder))] \The [holder] gleams a bloody red!")) charges -= 0.1 /datum/artifact_effect/vampire/DoEffectPulse() diff --git a/code/modules/xenoarcheaology/finds/finds.dm b/code/modules/xenoarcheaology/finds/finds.dm index 3bed21facc..2dd956bc27 100644 --- a/code/modules/xenoarcheaology/finds/finds.dm +++ b/code/modules/xenoarcheaology/finds/finds.dm @@ -35,9 +35,9 @@ var/obj/item/inside = locate() in src if(inside) inside.loc = get_turf(src) - visible_message("\The [src] is brushed away, revealing \the [inside].") + visible_message(span_info("\The [src] is brushed away, revealing \the [inside].")) else - visible_message("\The [src] is brushed away into nothing.") + visible_message(span_info("\The [src] is brushed away into nothing.")) qdel(src) return @@ -48,13 +48,13 @@ var/obj/item/inside = locate() in src if(inside) inside.loc = get_turf(src) - visible_message("\The [src] burns away revealing \the [inside].") + visible_message(span_info("\The [src] burns away revealing \the [inside].")) else - visible_message("\The [src] burns away into nothing.") + visible_message(span_info("\The [src] burns away into nothing.")) qdel(src) W.remove_fuel(2) else - visible_message("A few sparks fly off \the [src], but nothing else happens.") + visible_message(span_info("A few sparks fly off \the [src], but nothing else happens.")) W.remove_fuel(1) return @@ -66,5 +66,5 @@ ..() if(prob(33)) - src.visible_message("[src] crumbles away, leaving some dust and gravel behind.") + src.visible_message(span_warning("[src] crumbles away, leaving some dust and gravel behind.")) qdel(src) diff --git a/code/modules/xenoarcheaology/sampling.dm b/code/modules/xenoarcheaology/sampling.dm index a1866140d6..26cc628d96 100644 --- a/code/modules/xenoarcheaology/sampling.dm +++ b/code/modules/xenoarcheaology/sampling.dm @@ -95,19 +95,19 @@ /obj/item/core_sampler/examine(var/mob/user) . = ..() if(get_dist(user, src) <= 2) - . += "Used to extract geological core samples - this one is [sampled_turf ? "full" : "empty"], and has [num_stored_bags] bag[num_stored_bags != 1 ? "s" : ""] remaining." + . += span_notice("Used to extract geological core samples - this one is [sampled_turf ? "full" : "empty"], and has [num_stored_bags] bag[num_stored_bags != 1 ? "s" : ""] remaining.") /obj/item/core_sampler/attackby(var/obj/item/I, var/mob/living/user) if(istype(I, /obj/item/evidencebag)) if(I.contents.len) - to_chat(user, "\The [I] is full.") + to_chat(user, span_warning("\The [I] is full.")) return if(num_stored_bags < 10) qdel(I) num_stored_bags += 1 - to_chat(user, "You insert \the [I] into \the [src].") + to_chat(user, span_notice("You insert \the [I] into \the [src].")) else - to_chat(user, "\The [src] can not fit any more bags.") + to_chat(user, span_warning("\The [src] can not fit any more bags.")) else return ..() @@ -124,9 +124,9 @@ if(geo_data) if(filled_bag) - to_chat(user, "The core sampler is full.") + to_chat(user, span_warning("The core sampler is full.")) else if(num_stored_bags < 1) - to_chat(user, "The core sampler is out of sample bags.") + to_chat(user, span_warning("The core sampler is out of sample bags.")) else //create a new sample bag which we'll fill with rock samples filled_bag = new /obj/item/evidencebag(src) @@ -147,13 +147,13 @@ add_overlay("evidence") filled_bag.w_class = ITEMSIZE_TINY - to_chat(user, "You take a core sample of the [item_to_sample].") + to_chat(user, span_notice("You take a core sample of the [item_to_sample].")) else - to_chat(user, "You are unable to take a sample of [item_to_sample].") + to_chat(user, span_warning("You are unable to take a sample of [item_to_sample].")) /obj/item/core_sampler/attack_self(var/mob/living/user) if(filled_bag) - to_chat(user, "You eject the full sample bag.") + to_chat(user, span_notice("You eject the full sample bag.")) var/success = 0 if(istype(src.loc, /mob)) var/mob/M = src.loc @@ -163,4 +163,4 @@ filled_bag = null icon_state = "sampler0" else - to_chat(user, "The core sampler is empty.") + to_chat(user, span_warning("The core sampler is empty.")) diff --git a/code/modules/xenoarcheaology/tools/ano_device_battery.dm b/code/modules/xenoarcheaology/tools/ano_device_battery.dm index bacf96e6ab..bc336d4ea7 100644 --- a/code/modules/xenoarcheaology/tools/ano_device_battery.dm +++ b/code/modules/xenoarcheaology/tools/ano_device_battery.dm @@ -109,7 +109,7 @@ time_end = world.time + duration last_process = world.time else - to_chat(usr, "[src] is unable to start due to no anomolous power source inserted/remaining.") + to_chat(usr, span_warning("[src] is unable to start due to no anomolous power source inserted/remaining.")) return TRUE if("shutdown") activated = FALSE diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm index 10cb0b7137..15b66fc664 100644 --- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm +++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm @@ -61,7 +61,7 @@ /obj/machinery/radiocarbon_spectrometer/attackby(var/obj/I as obj, var/mob/user as mob) if(scanning) - to_chat(user, "You can't do that while [src] is scanning!") + to_chat(user, span_warning("You can't do that while [src] is scanning!")) else if(istype(I, /obj/item/stack/nanopaste)) var/choice = tgui_alert(usr, "What do you want to do with the nanopaste?","Radiometric Scanner",list("Scan nanopaste","Fix seal integrity")) @@ -83,13 +83,13 @@ if(choice == "Add coolant") var/amount_transferred = min(src.reagents.maximum_volume - src.reagents.total_volume, G.reagents.total_volume) var/trans = G.reagents.trans_to_obj(src, amount_transferred) - to_chat(user, "You empty [trans ? trans : 0]u of coolant into [src].") + to_chat(user, span_info("You empty [trans ? trans : 0]u of coolant into [src].")) update_coolant() return else if(choice == "Empty coolant") var/amount_transferred = min(G.reagents.maximum_volume - G.reagents.total_volume, src.reagents.total_volume) var/trans = src.reagents.trans_to(G, amount_transferred) - to_chat(user, "You remove [trans ? trans : 0]u of coolant from [src].") + to_chat(user, span_info("You remove [trans ? trans : 0]u of coolant from [src].")) update_coolant() return if(scanned_item) @@ -175,11 +175,11 @@ scanner_progress = 0 scanning = 1 t_left_radspike = pick(5,10,15) - to_chat(usr, "Scan initiated.") + to_chat(usr, span_notice("Scan initiated.")) else - to_chat(usr, "Could not initiate scan, seal requires replacing.") + to_chat(usr, span_warning("Could not initiate scan, seal requires replacing.")) else - to_chat(usr, "Insert an item to scan.") + to_chat(usr, span_warning("Insert an item to scan.")) return TRUE if("maserWavelength") diff --git a/code/modules/xenoarcheaology/tools/suspension_generator.dm b/code/modules/xenoarcheaology/tools/suspension_generator.dm index 4720360905..be52793006 100644 --- a/code/modules/xenoarcheaology/tools/suspension_generator.dm +++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm @@ -24,7 +24,7 @@ M.Weaken(3) cell.charge -= power_use if(prob(5)) - to_chat(M, "[pick("You feel tingly","You feel like floating","It is hard to speak","You can barely move")].") + to_chat(M, span_warning("[pick("You feel tingly","You feel like floating","It is hard to speak","You can barely move")].")) for(var/obj/item/I in T) if(!suspension_field.contents.len) @@ -45,7 +45,7 @@ icon_state = "suspension" cell = null - to_chat(user, "You remove the power cell") + to_chat(user, span_info("You remove the power cell")) /obj/machinery/suspension_gen/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) @@ -78,7 +78,7 @@ if(anchored) activate() else - to_chat(usr, "You are unable to activate [src] until it is properly secured on the ground.") + to_chat(usr, span_warning("You are unable to activate [src] until it is properly secured on the ground.")) else deactivate() return TRUE @@ -98,7 +98,7 @@ else anchored = 1 playsound(src, W.usesound, 50, 1) - to_chat(user, "You wrench the stabilising bolts [anchored ? "into place" : "loose"].") + to_chat(user, span_info("You wrench the stabilising bolts [anchored ? "into place" : "loose"].")) if(anchored) desc = "Its tracks are held firmly in place with securing bolts." icon_state = "suspension_wrenched" @@ -108,26 +108,26 @@ playsound(loc, 'sound/items/Ratchet.ogg', 40) update_icon() else - to_chat(user, "You are unable to secure [src] while it is active!") + to_chat(user, span_warning("You are unable to secure [src] while it is active!")) else if (istype(W, /obj/item/cell)) if(panel_open) if(cell) - to_chat(user, "There is a power cell already installed.") + to_chat(user, span_warning("There is a power cell already installed.")) else user.drop_item() W.loc = src cell = W - to_chat(user, "You insert the power cell.") + to_chat(user, span_info("You insert the power cell.")) icon_state = "suspension" else if(istype(W, /obj/item/card)) var/obj/item/card/I = W if(!auth_card) if(attempt_unlock(I, user)) - to_chat(user, "You swipe [I], the console flashes \'Access granted.\'") + to_chat(user, span_info("You swipe [I], the console flashes \'Access granted.\'")) else - to_chat(user, "You swipe [I], console flashes \'Access denied.\'") + to_chat(user, span_warning("You swipe [I], console flashes \'Access denied.\'")) else - to_chat(user, "Remove [auth_card] first.") + to_chat(user, span_warning("Remove [auth_card] first.")) /obj/machinery/suspension_gen/proc/attempt_unlock(var/obj/item/card/C, var/mob/user) if(!panel_open) @@ -177,7 +177,7 @@ var/turf/T = get_turf(suspension_field) for(var/mob/living/M in T) - to_chat(M, "You no longer feel like floating.") + to_chat(M, span_info("You no longer feel like floating.")) M.Weaken(3) visible_message(span_blue("[icon2html(src,viewers(src))] [src] deactivates with a gentle shudder.")) diff --git a/code/modules/xenoarcheaology/tools/tools.dm b/code/modules/xenoarcheaology/tools/tools.dm index 30a01eedb8..74a652e193 100644 --- a/code/modules/xenoarcheaology/tools/tools.dm +++ b/code/modules/xenoarcheaology/tools/tools.dm @@ -131,7 +131,7 @@ positive_locations.Add(D) - to_chat(user, "[icon2html(src, user.client)] [src] pings.") + to_chat(user, span_notice("[icon2html(src, user.client)] [src] pings.")) else if(istype(A, /obj/structure/boulder)) var/obj/structure/boulder/B = A @@ -149,7 +149,7 @@ positive_locations.Add(D) - to_chat(user, "[icon2html(src, user.client)] [src] pings [pick("madly","wildly","excitedly","crazily")]!") + to_chat(user, span_notice("[icon2html(src, user.client)] [src] pings [pick("madly","wildly","excitedly","crazily")]!")) /obj/item/depth_scanner/attack_self(var/mob/living/user) tgui_interact(user) diff --git a/code/modules/xenoarcheaology/tools/tools_pickaxe.dm b/code/modules/xenoarcheaology/tools/tools_pickaxe.dm index 31a2a07428..caffe30682 100644 --- a/code/modules/xenoarcheaology/tools/tools_pickaxe.dm +++ b/code/modules/xenoarcheaology/tools/tools_pickaxe.dm @@ -176,10 +176,10 @@ /obj/item/pickaxe/excavationdrill/attack_self(mob/user as mob) var/depth = tgui_input_number(usr, "Put the desired depth (1-30 centimeters).", "Set Depth", 30, 30, 1) if(depth>30 || depth<1) - to_chat(user, "Invalid depth.") + to_chat(user, span_notice("Invalid depth.")) return excavation_amount = depth - to_chat(user, "You set the depth to [depth]cm.") + to_chat(user, span_notice("You set the depth to [depth]cm.")) switch(depth) if(1 to 5) icon_state = "excavationdrill0" @@ -196,4 +196,4 @@ /obj/item/pickaxe/excavationdrill/examine(mob/user) . = ..() - . += "It is currently set at [excavation_amount]cms." + . += span_info("It is currently set at [excavation_amount]cms.") diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm index 1bfc5fce39..98783dff9f 100644 --- a/code/modules/xenobio/items/extracts.dm +++ b/code/modules/xenobio/items/extracts.dm @@ -24,9 +24,9 @@ /obj/item/slime_extract/attackby(obj/item/O, mob/user) if(istype(O, /obj/item/slimepotion/enhancer)) if(enhanced) - to_chat(user, "You cannot enhance this extract further!") + to_chat(user, span_warning("You cannot enhance this extract further!")) return ..() - to_chat(user, "You apply the enhancer to the slime extract. It may now be reused one more time.") + to_chat(user, span_notice("You apply the enhancer to the slime extract. It may now be reused one more time.")) playsound(src, 'sound/effects/bubbles.ogg', 50, 1) uses += 2 enhanced = TRUE @@ -78,7 +78,7 @@ required = /obj/item/slime_extract/grey /decl/chemical_reaction/instant/slime/grey_new_slime/on_reaction(var/datum/reagents/holder) - holder.my_atom.visible_message("Infused with phoron, the core begins to quiver and grow, and soon a new baby slime emerges from it!") + holder.my_atom.visible_message(span_warning("Infused with phoron, the core begins to quiver and grow, and soon a new baby slime emerges from it!")) new /mob/living/simple_mob/slime/xenobio(get_turf(holder.my_atom)) ..() @@ -324,7 +324,7 @@ /decl/chemical_reaction/instant/slime/orange_fire/on_reaction(var/datum/reagents/holder) log_and_message_admins("Orange extract reaction (fire) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]") - holder.my_atom.visible_message("\The [src] begins to vibrate violently!") + holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!")) playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1) spawn(5 SECONDS) if(holder && holder.my_atom) @@ -361,7 +361,7 @@ /decl/chemical_reaction/instant/slime/yellow_emp/on_reaction(var/datum/reagents/holder) log_and_message_admins("Yellow extract reaction (emp) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]") - holder.my_atom.visible_message("\The [src] begins to vibrate violently!") + holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!")) playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1) spawn(5 SECONDS) if(holder && holder.my_atom) @@ -500,10 +500,10 @@ if(istype(L, /mob/living/simple_mob/slime)) var/mob/living/simple_mob/slime/S = L if(S.cold_resist >= 1) // Immune to cold. - to_chat(S, "A chill is felt around you, however it cannot harm you.") + to_chat(S, span_warning("A chill is felt around you, however it cannot harm you.")) continue if(S.client) // Don't instantly kill player slimes. - to_chat(S, "You feel your body crystalize as an intense chill overwhelms you!") + to_chat(S, span_danger("You feel your body crystalize as an intense chill overwhelms you!")) S.inflict_cold_damage(100) else S.inflict_cold_damage(200) // Metal slimes can survive this 'slime nuke'. @@ -518,9 +518,9 @@ H.bodytemperature = between(50, (H.bodytemperature - ((H.bodytemperature - 50) * cold_factor) ), H.bodytemperature) if(protection < 0.7) - to_chat(L, "A chilling wave of cold overwhelms you!") + to_chat(L, span_danger("A chilling wave of cold overwhelms you!")) else - to_chat(L, "A chilling wave of cold passes by you, as your armor protects you from it.") + to_chat(L, span_warning("A chilling wave of cold passes by you, as your armor protects you from it.")) continue // Now make it very cold. @@ -568,12 +568,12 @@ S.add_modifier(/datum/modifier/berserk, 30 SECONDS) if(S.client) // Player slimes always have free will. - to_chat(S, "An intense wave of rage is felt from inside, but you remain in control of yourself.") + to_chat(S, span_warning("An intense wave of rage is felt from inside, but you remain in control of yourself.")) for(var/mob/living/carbon/human/H in view(get_turf(holder.my_atom))) if(H.species.name == SPECIES_PROMETHEAN) H.add_modifier(/datum/modifier/berserk, 30 SECONDS) - to_chat(H, "An intense wave of rage is felt from inside, but you remain in control of yourself.") + to_chat(H, span_warning("An intense wave of rage is felt from inside, but you remain in control of yourself.")) log_and_message_admins("Red extract reaction (enrage) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]") @@ -699,7 +699,7 @@ E.uses = 0 playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1) - holder.my_atom.visible_message("\The [holder.my_atom] begins to vibrate violently!") + holder.my_atom.visible_message(span_danger("\The [holder.my_atom] begins to vibrate violently!")) log_and_message_admins("Oil extract reaction (explosion) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]") spawn(5 SECONDS) @@ -850,8 +850,8 @@ desc = "You feel much stronger than usual." mob_overlay_state = "pink_sparkles" - on_created_text = "Twinkling spores of goo surround you. It makes you feel stronger and more robust." - on_expired_text = "The spores of goo have faded, and you feel your strength returning to what it was before." + on_created_text = span_warning("Twinkling spores of goo surround you. It makes you feel stronger and more robust.") + on_expired_text = span_notice("The spores of goo have faded, and you feel your strength returning to what it was before.") stacks = MODIFIER_STACK_EXTEND max_health_flat = 50 @@ -898,8 +898,8 @@ desc = "You feel much faster than usual." mob_overlay_state = "green_sparkles" - on_created_text = "Twinkling spores of goo surround you. It makes you feel fast and more agile." - on_expired_text = "The spores of goo have faded, and you feel your agility returning to what it was before." + on_created_text = span_warning("Twinkling spores of goo surround you. It makes you feel fast and more agile.") + on_expired_text = span_notice("The spores of goo have faded, and you feel your agility returning to what it was before.") stacks = MODIFIER_STACK_EXTEND evasion = 30 diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm index bac8ef3e1a..2f3992ec63 100644 --- a/code/modules/xenobio/items/extracts_vr.dm +++ b/code/modules/xenobio/items/extracts_vr.dm @@ -23,16 +23,16 @@ /obj/item/slime_extract/attackby(obj/item/O, mob/user) if(istype(O, /obj/item/slimepotion/enhancer)) if(enhanced) - to_chat(user, "You cannot enhance this extract further!") + to_chat(user, span_warning("You cannot enhance this extract further!")) return ..() - to_chat(user, "You apply the enhancer to the slime extract. It may now be reused one more time.") + to_chat(user, span_notice("You apply the enhancer to the slime extract. It may now be reused one more time.")) playsound(src, 'sound/effects/bubbles.ogg', 50, 1) uses += 2 enhanced = TRUE name = initial(name) // To remove the 'inert' part of the name. qdel(O) else if(istype(O, /obj/item/slimepotion/reinvigoration)) - to_chat(user, "You apply the reinvigorator to the slime extract. It rapidly expands, creating a brand new slime!") + to_chat(user, span_notice("You apply the reinvigorator to the slime extract. It rapidly expands, creating a brand new slime!")) playsound(src, 'sound/effects/bubbles.ogg', 50, 1) new slime_type(get_turf(src)) qdel(O) @@ -85,7 +85,7 @@ required = /obj/item/slime_extract/grey /decl/chemical_reaction/instant/slime/grey_new_slime/on_reaction(var/datum/reagents/holder) - holder.my_atom.visible_message("Infused with phoron, the core begins to quiver and grow, and soon a new baby slime emerges from it!") + holder.my_atom.visible_message(span_warning("Infused with phoron, the core begins to quiver and grow, and soon a new baby slime emerges from it!")) new /mob/living/simple_mob/slime/xenobio(get_turf(holder.my_atom)) ..() @@ -233,12 +233,12 @@ S.remove_modifiers_of_type(/datum/modifier/berserk) if(S.client) // Player slimes always have free will. - to_chat(S, "An intense wave of relaxing calm is felt from inside, but you remain in control of yourself.") + to_chat(S, span_warning("An intense wave of relaxing calm is felt from inside, but you remain in control of yourself.")) for(var/mob/living/carbon/human/H in view(get_turf(holder.my_atom))) if(H.species.name == SPECIES_PROMETHEAN) H.remove_modifiers_of_type(/datum/modifier/berserk) - to_chat(H, "An intense wave of relaxing calm is felt from inside, but you remain in control of yourself.") + to_chat(H, span_warning("An intense wave of relaxing calm is felt from inside, but you remain in control of yourself.")) playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1) ..() @@ -333,7 +333,7 @@ /decl/chemical_reaction/instant/slime/orange_fire/on_reaction(var/datum/reagents/holder) log_and_message_admins("Orange extract reaction (fire) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]") - holder.my_atom.visible_message("\The [src] begins to vibrate violently!") + holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!")) playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1) spawn(5 SECONDS) if(holder && holder.my_atom) @@ -392,9 +392,9 @@ H.bodytemperature = between(50, (H.bodytemperature - ((H.bodytemperature + 50) * cold_factor) ), H.bodytemperature) if(protection < 0.7) - to_chat(L, "A scalding wave of heat overwhelms you!") + to_chat(L, span_danger("A scalding wave of heat overwhelms you!")) else - to_chat(L, "A scalding wave of heat passes by you, as your armor protects you from it.") + to_chat(L, span_warning("A scalding wave of heat passes by you, as your armor protects you from it.")) continue // Now make it very cold. @@ -454,7 +454,7 @@ /decl/chemical_reaction/instant/slime/yellow_lightning/on_reaction(var/datum/reagents/holder) log_and_message_admins("Yellow extract reaction (lightning) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]") - holder.my_atom.visible_message("\The [src] begins to vibrate violently!") + holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!")) playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1) spawn(5 SECONDS) if(holder && holder.my_atom) @@ -483,7 +483,7 @@ /decl/chemical_reaction/instant/slime/yellow_emp/on_reaction(var/datum/reagents/holder) log_and_message_admins("Yellow extract reaction (emp) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]") - holder.my_atom.visible_message("\The [src] begins to vibrate violently!") + holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!")) playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1) spawn(5 SECONDS) if(holder && holder.my_atom) @@ -738,10 +738,10 @@ if(istype(L, /mob/living/simple_mob/slime)) var/mob/living/simple_mob/slime/S = L if(S.cold_resist >= 1) // Immune to cold. - to_chat(S, "A chill is felt around you, however it cannot harm you.") + to_chat(S, span_warning("A chill is felt around you, however it cannot harm you.")) continue if(S.client) // Don't instantly kill player slimes. - to_chat(S, "You feel your body crystalize as an intense chill overwhelms you!") + to_chat(S, span_danger("You feel your body crystalize as an intense chill overwhelms you!")) S.inflict_cold_damage(100) else S.inflict_cold_damage(200) // Metal slimes can survive this 'slime nuke'. @@ -756,9 +756,9 @@ H.bodytemperature = between(50, (H.bodytemperature - ((H.bodytemperature - 50) * cold_factor) ), H.bodytemperature) if(protection < 0.7) - to_chat(L, "A chilling wave of cold overwhelms you!") + to_chat(L, span_danger("A chilling wave of cold overwhelms you!")) else - to_chat(L, "A chilling wave of cold passes by you, as your armor protects you from it.") + to_chat(L, span_warning("A chilling wave of cold passes by you, as your armor protects you from it.")) continue // Now make it very cold. @@ -789,8 +789,8 @@ desc = "You feel immune to heat and cold." mob_overlay_state = "corona" - on_created_text = "A shield of goo surround you. It makes you feel protected against temperature." - on_expired_text = "The shield of goo has faded, and you feel vulnerable to temperature again." + on_created_text = span_warning("A shield of goo surround you. It makes you feel protected against temperature.") + on_expired_text = span_notice("The shield of goo has faded, and you feel vulnerable to temperature again.") stacks = MODIFIER_STACK_EXTEND incoming_fire_damage_percent = 0.5 @@ -865,12 +865,12 @@ S.add_modifier(/datum/modifier/berserk, 30 SECONDS) if(S.client) // Player slimes always have free will. - to_chat(S, "An intense wave of rage is felt from inside, but you remain in control of yourself.") + to_chat(S, span_warning("An intense wave of rage is felt from inside, but you remain in control of yourself.")) for(var/mob/living/carbon/human/H in view(get_turf(holder.my_atom))) if(H.species.name == SPECIES_PROMETHEAN) H.add_modifier(/datum/modifier/berserk, 30 SECONDS) - to_chat(H, "An intense wave of rage is felt from inside, but you remain in control of yourself.") + to_chat(H, span_warning("An intense wave of rage is felt from inside, but you remain in control of yourself.")) log_and_message_admins("Red extract reaction (enrage) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]") @@ -920,7 +920,7 @@ /decl/chemical_reaction/instant/slime/green_radpulse/on_reaction(var/datum/reagents/holder) log_and_message_admins("Green extract reaction (radiation pulse) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]") playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1) - holder.my_atom.visible_message("\The [holder.my_atom] begins to vibrate violently!") + holder.my_atom.visible_message(span_danger("\The [holder.my_atom] begins to vibrate violently!")) spawn(5 SECONDS) SSradiation.flat_radiate(src, 30, 7, TRUE) ..() @@ -1007,7 +1007,7 @@ /decl/chemical_reaction/instant/slime/pink_heal_pulse/on_reaction(var/datum/reagents/holder) for(var/mob/living/carbon/C in viewers(get_turf(holder.my_atom), null)) - to_chat(C, "A wave of energy suddenly invigorates you.") + to_chat(C, span_notice("A wave of energy suddenly invigorates you.")) C.adjustBruteLoss(-25) C.adjustFireLoss(-25) C.adjustToxLoss(-25) @@ -1076,7 +1076,7 @@ E.uses = 0 playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1) - holder.my_atom.visible_message("\The [holder.my_atom] begins to vibrate violently!") + holder.my_atom.visible_message(span_danger("\The [holder.my_atom] begins to vibrate violently!")) log_and_message_admins("Oil extract reaction (explosion) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]") spawn(5 SECONDS) @@ -1379,8 +1379,8 @@ desc = "You feel much stronger than usual." mob_overlay_state = "pink_sparkles" - on_created_text = "Twinkling spores of goo surround you. It makes you feel stronger and more robust." - on_expired_text = "The spores of goo have faded, and you feel your strength returning to what it was before." + on_created_text = span_warning("Twinkling spores of goo surround you. It makes you feel stronger and more robust.") + on_expired_text = span_notice("The spores of goo have faded, and you feel your strength returning to what it was before.") stacks = MODIFIER_STACK_EXTEND max_health_flat = 50 @@ -1468,8 +1468,8 @@ desc = "You feel much more agile than usual." mob_overlay_state = "green_sparkles" - on_created_text = "Twinkling spores of goo surround you. It makes you feel more agile." - on_expired_text = "The spores of goo have faded, and you feel your agility returning to what it was before." + on_created_text = span_warning("Twinkling spores of goo surround you. It makes you feel more agile.") + on_expired_text = span_notice("The spores of goo have faded, and you feel your agility returning to what it was before.") stacks = MODIFIER_STACK_EXTEND evasion = 45 @@ -1494,8 +1494,8 @@ desc = "You feel much faster than usual." mob_overlay_state = "haste" - on_created_text = "Twinkling spores of goo surround you. It makes you feel very fast." - on_expired_text = "The spores of goo have faded, and you feel your speed returning to what it was before." + on_created_text = span_warning("Twinkling spores of goo surround you. It makes you feel very fast.") + on_expired_text = span_notice("The spores of goo have faded, and you feel your speed returning to what it was before.") stacks = MODIFIER_STACK_EXTEND slowdown = -3 diff --git a/code/modules/xenobio/items/slime_objects.dm b/code/modules/xenobio/items/slime_objects.dm index 0bc9724400..c527a8c964 100644 --- a/code/modules/xenobio/items/slime_objects.dm +++ b/code/modules/xenobio/items/slime_objects.dm @@ -9,7 +9,7 @@ /obj/item/slime_cube/attack_self(mob/user as mob) if(!searching) - to_chat(user, "You stare at the slimy cube, watching as some activity occurs.") + to_chat(user, span_warning("You stare at the slimy cube, watching as some activity occurs.")) icon_state = "slime cube active" searching = 1 request_player() @@ -45,7 +45,7 @@ searching = 0 var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) - M.show_message("The activity in the cube dies down. Maybe it will spark another time.") + M.show_message(span_warning("The activity in the cube dies down. Maybe it will spark another time.")) /obj/item/slime_cube/proc/transfer_personality(var/mob/candidate) announce_ghost_joinleave(candidate, 0, "They are a promethean now.") @@ -56,7 +56,7 @@ S.mind.assigned_role = JOB_PROMETHEAN S.set_species("Promethean") S.shapeshifter_set_colour("#2398FF") - visible_message("The monkey cube suddenly takes the shape of a humanoid!") + visible_message(span_warning("The monkey cube suddenly takes the shape of a humanoid!")) var/newname = sanitize(tgui_input_text(S, "You are a Promethean. Would you like to change your name to something else?", "Name change", null, MAX_NAME_LEN), MAX_NAME_LEN) if(newname) S.real_name = newname @@ -80,12 +80,12 @@ force = 1 //Needs a token force to ensure you can attack because for some reason you can't attack with 0 force things /obj/item/slime_crystal/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) - target.visible_message("\The [target] has been teleported with \the [src] by \the [user]!") + target.visible_message(span_warning("\The [target] has been teleported with \the [src] by \the [user]!")) safe_blink(target, 14) qdel(src) /obj/item/slime_crystal/attack_self(mob/user) - user.visible_message("\The [user] teleports themselves with \the [src]!") + user.visible_message(span_warning("\The [user] teleports themselves with \the [src]!")) safe_blink(user, 14) qdel(src) @@ -96,7 +96,7 @@ if(AM.anchored) return - AM.visible_message("\The [AM] has been teleported with \the [src]!") + AM.visible_message(span_warning("\The [AM] has been teleported with \the [src]!")) safe_blink(AM, 14) qdel(src) diff --git a/code/modules/xenobio/items/slimepotions.dm b/code/modules/xenobio/items/slimepotions.dm index 7c1e70cd89..453c4bce5d 100644 --- a/code/modules/xenobio/items/slimepotions.dm +++ b/code/modules/xenobio/items/slimepotions.dm @@ -23,16 +23,16 @@ /obj/item/slimepotion/stabilizer/attack(mob/living/simple_mob/slime/xenobio/M, mob/user) if(!istype(M)) - to_chat(user, "The stabilizer only works on slimes!") + to_chat(user, span_warning("The stabilizer only works on slimes!")) return ..() if(M.stat == DEAD) - to_chat(user, "The slime is dead!") + to_chat(user, span_warning("The slime is dead!")) return ..() if(M.mutation_chance == 0) - to_chat(user, "The slime already has no chance of mutating!") + to_chat(user, span_warning("The slime already has no chance of mutating!")) return ..() - to_chat(user, "You feed the slime the stabilizer. It is now less likely to mutate.") + to_chat(user, span_notice("You feed the slime the stabilizer. It is now less likely to mutate.")) M.mutation_chance = between(0, M.mutation_chance - 15, 100) playsound(src, 'sound/effects/bubbles.ogg', 50, 1) qdel(src) @@ -47,16 +47,16 @@ /obj/item/slimepotion/mutator/attack(mob/living/simple_mob/slime/xenobio/M, mob/user) if(!istype(M)) - to_chat(user, "The mutator only works on slimes!") + to_chat(user, span_warning("The mutator only works on slimes!")) return ..() if(M.stat == DEAD) - to_chat(user, "The slime is dead!") + to_chat(user, span_warning("The slime is dead!")) return ..() if(M.mutation_chance == 100) - to_chat(user, "The slime is already guaranteed to mutate!") + to_chat(user, span_warning("The slime is already guaranteed to mutate!")) return ..() - to_chat(user, "You feed the slime the mutator. It is now more likely to mutate.") + to_chat(user, span_notice("You feed the slime the mutator. It is now more likely to mutate.")) M.mutation_chance = between(0, M.mutation_chance + 12, 100) playsound(src, 'sound/effects/bubbles.ogg', 50, 1) qdel(src) @@ -72,10 +72,10 @@ /obj/item/slimepotion/docility/attack(mob/living/simple_mob/M, mob/user) if(!istype(M)) - to_chat(user, "The agent only works on creatures!") + to_chat(user, span_warning("The agent only works on creatures!")) return ..() if(M.stat == DEAD) - to_chat(user, "\The [M] is dead!") + to_chat(user, span_warning("\The [M] is dead!")) return ..() if(!M.has_AI()) to_chat(user, span_warning("\The [M] is too strongly willed for this to affect them.")) // Most likely player controlled. @@ -91,27 +91,27 @@ if(istype(M, /mob/living/simple_mob/slime/xenobio)) var/mob/living/simple_mob/slime/xenobio/S = M if(S.harmless) - to_chat(user, "The slime is already docile!") + to_chat(user, span_warning("The slime is already docile!")) return ..() S.pacify() S.nutrition = 700 - to_chat(M, "You absorb the agent and feel your intense desire to feed melt away.") - to_chat(user, "You feed the slime the agent, removing its hunger and calming it.") + to_chat(M, span_warning("You absorb the agent and feel your intense desire to feed melt away.")) + to_chat(user, span_notice("You feed the slime the agent, removing its hunger and calming it.")) // Simple Mobs. else if(istype(M, /mob/living/simple_mob)) var/mob/living/simple_mob/SM = M if(!(SM.mob_class & MOB_CLASS_SLIME|MOB_CLASS_ANIMAL)) // So you can't use this on Russians/syndies/hivebots/etc. - to_chat(user, "\The [SM] only works on slimes and animals.") + to_chat(user, span_warning("\The [SM] only works on slimes and animals.")) return ..() if(!AI.hostile) - to_chat(user, "\The [SM] is already passive!") + to_chat(user, span_warning("\The [SM] is already passive!")) return ..() AI.hostile = FALSE - to_chat(M, "You consume the agent and feel a serene sense of peace.") - to_chat(user, "You feed \the [SM] the agent, calming it.") + to_chat(M, span_warning("You consume the agent and feel a serene sense of peace.")) + to_chat(user, span_notice("You feed \the [SM] the agent, calming it.")) playsound(src, 'sound/effects/bubbles.ogg', 50, 1) AI.remove_target() // So hostile things stop attacking people even if not hostile anymore. @@ -133,19 +133,19 @@ /obj/item/slimepotion/steroid/attack(mob/living/simple_mob/slime/xenobio/M, mob/user) if(!istype(M)) - to_chat(user, "The steroid only works on slimes!") + to_chat(user, span_warning("The steroid only works on slimes!")) return ..() if(M.stat == DEAD) - to_chat(user, "The slime is dead!") + to_chat(user, span_warning("The slime is dead!")) return ..() if(M.is_adult) //Can't steroidify adults - to_chat(user, "Only baby slimes can use the steroid!") + to_chat(user, span_warning("Only baby slimes can use the steroid!")) return ..() if(M.cores >= 5) - to_chat(user, "The slime already has the maximum amount of extract!") + to_chat(user, span_warning("The slime already has the maximum amount of extract!")) return ..() - to_chat(user, "You feed the slime the steroid. It will now produce one more extract.") + to_chat(user, span_notice("You feed the slime the steroid. It will now produce one more extract.")) M.cores++ playsound(src, 'sound/effects/bubbles.ogg', 50, 1) qdel(src) @@ -161,16 +161,16 @@ /obj/item/slimepotion/unity/attack(mob/living/simple_mob/slime/M, mob/user) if(!istype(M)) - to_chat(user, "The agent only works on slimes!") + to_chat(user, span_warning("The agent only works on slimes!")) return ..() if(M.stat == DEAD) - to_chat(user, "The slime is dead!") + to_chat(user, span_warning("The slime is dead!")) return ..() if(M.unity == TRUE) - to_chat(user, "The slime is already unified!") + to_chat(user, span_warning("The slime is already unified!")) return ..() - to_chat(user, "You feed the slime the agent. It will now be friendly to all other slimes.") + to_chat(user, span_notice("You feed the slime the agent. It will now be friendly to all other slimes.")) to_chat(M, "\The [user] feeds you \the [src], and you suspect that all the other slimes will be \ your friends, at least if you don't attack them first.") M.unify() @@ -187,16 +187,16 @@ /obj/item/slimepotion/loyalty/attack(mob/living/simple_mob/M, mob/user) if(!istype(M)) - to_chat(user, "The agent only works on creatures!") + to_chat(user, span_warning("The agent only works on creatures!")) return ..() if(!(M.mob_class & MOB_CLASS_SLIME|MOB_CLASS_ANIMAL)) // So you can't use this on Russians/syndies/hivebots/etc. - to_chat(user, "\The [M] only works on slimes and animals.") + to_chat(user, span_warning("\The [M] only works on slimes and animals.")) return ..() if(M.stat == DEAD) - to_chat(user, "The animal is dead!") + to_chat(user, span_warning("The animal is dead!")) return ..() if(M.faction == user.faction) - to_chat(user, "\The [M] is already loyal to your species!") + to_chat(user, span_warning("\The [M] is already loyal to your species!")) return ..() if(!M.has_AI()) to_chat(user, span_warning("\The [M] is too strong-willed for this to affect them.")) @@ -204,8 +204,8 @@ var/datum/ai_holder/AI = M.ai_holder - to_chat(user, "You feed \the [M] the agent. It will now try to murder things that want to murder you instead.") - to_chat(M, "\The [user] feeds you \the [src], and feel that the others will regard you as an outsider now.") + to_chat(user, span_notice("You feed \the [M] the agent. It will now try to murder things that want to murder you instead.")) + to_chat(M, span_notice("\The [user] feeds you \the [src], and feel that the others will regard you as an outsider now.")) M.faction = user.faction AI.remove_target() // So hostile things stop attacking people even if not hostile anymore. playsound(src, 'sound/effects/bubbles.ogg', 50, 1) @@ -222,16 +222,16 @@ /obj/item/slimepotion/friendship/attack(mob/living/simple_mob/M, mob/user) if(!istype(M)) - to_chat(user, "The agent only works on creatures!") + to_chat(user, span_warning("The agent only works on creatures!")) return ..() if(!(M.mob_class & MOB_CLASS_SLIME|MOB_CLASS_ANIMAL)) // So you can't use this on Russians/syndies/hivebots/etc. - to_chat(user, "\The [M] only works on slimes and animals.") + to_chat(user, span_warning("\The [M] only works on slimes and animals.")) return ..() if(M.stat == DEAD) - to_chat(user, "\The [M] is dead!") + to_chat(user, span_warning("\The [M] is dead!")) return ..() if(user in M.friends) - to_chat(user, "\The [M] is already loyal to you!") + to_chat(user, span_warning("\The [M] is already loyal to you!")) return ..() if(!M.has_AI()) to_chat(user, span_warning("\The [M] is too strong-willed for this to affect them.")) @@ -239,8 +239,8 @@ var/datum/ai_holder/AI = M.ai_holder - to_chat(user, "You feed \the [M] the agent. It will now be your best friend.") - to_chat(M, "\The [user] feeds you \the [src], and feel that \the [user] wants to be best friends with you.") + to_chat(user, span_notice("You feed \the [M] the agent. It will now be your best friend.")) + to_chat(M, span_notice("\The [user] feeds you \the [src], and feel that \the [user] wants to be best friends with you.")) M.friends.Add(user) AI.remove_target() // So hostile things stop attacking people even if not hostile anymore. playsound(src, 'sound/effects/bubbles.ogg', 50, 1) @@ -256,13 +256,13 @@ /obj/item/slimepotion/feeding/attack(mob/living/simple_mob/slime/xenobio/M, mob/user) if(!istype(M)) - to_chat(user, "The feeding agent only works on slimes!") + to_chat(user, span_warning("The feeding agent only works on slimes!")) return ..() if(M.stat == DEAD) - to_chat(user, "The slime is dead!") + to_chat(user, span_warning("The slime is dead!")) return ..() - to_chat(user, "You feed the slime the feeding agent. It will now instantly reproduce.") + to_chat(user, span_notice("You feed the slime the feeding agent. It will now instantly reproduce.")) M.amount_grown = 10 M.make_adult() M.amount_grown = 10 diff --git a/code/modules/xenobio/items/slimepotions_vr.dm b/code/modules/xenobio/items/slimepotions_vr.dm index 0bd4db66f7..1de0ee69f8 100644 --- a/code/modules/xenobio/items/slimepotions_vr.dm +++ b/code/modules/xenobio/items/slimepotions_vr.dm @@ -1,6 +1,6 @@ /obj/item/slimepotion/attackby(obj/item/O, mob/user) if(istype(O, /obj/item/slimepotion/mimic)) - to_chat(user, "You apply the mimic to the slime potion as it copies it's effects.") + to_chat(user, span_notice("You apply the mimic to the slime potion as it copies it's effects.")) playsound(src, 'sound/effects/bubbles.ogg', 50, 1) var/newtype = src.type new newtype(get_turf(src)) @@ -16,16 +16,16 @@ /obj/item/slimepotion/infertility/attack(mob/living/simple_mob/slime/xenobio/M, mob/user) if(!istype(M)) - to_chat(user, "The agent only works on slimes!") + to_chat(user, span_warning("The agent only works on slimes!")) return ..() if(M.stat == DEAD) - to_chat(user, "The slime is dead!") + to_chat(user, span_warning("The slime is dead!")) return ..() if(M.split_amount <= 2) - to_chat(user, "The slime cannot get any less fertile!") + to_chat(user, span_warning("The slime cannot get any less fertile!")) return ..() - to_chat(user, "You feed the slime the infertility agent. It will now have less offspring.") + to_chat(user, span_notice("You feed the slime the infertility agent. It will now have less offspring.")) M.split_amount = between(2, M.split_amount - 2, 6) playsound(src, 'sound/effects/bubbles.ogg', 50, 1) qdel(src) @@ -38,16 +38,16 @@ /obj/item/slimepotion/fertility/attack(mob/living/simple_mob/slime/xenobio/M, mob/user) if(!istype(M)) - to_chat(user, "The agent only works on slimes!") + to_chat(user, span_warning("The agent only works on slimes!")) return ..() if(M.stat == DEAD) - to_chat(user, "The slime is dead!") + to_chat(user, span_warning("The slime is dead!")) return ..() if(M.split_amount >= 6) - to_chat(user, "The slime cannot get any more fertile!") + to_chat(user, span_warning("The slime cannot get any more fertile!")) return ..() - to_chat(user, "You feed the slime the fertility agent. It will now have more offspring.") + to_chat(user, span_notice("You feed the slime the fertility agent. It will now have more offspring.")) M.split_amount = between(2, M.split_amount + 2, 6) playsound(src, 'sound/effects/bubbles.ogg', 50, 1) qdel(src) @@ -60,16 +60,16 @@ /obj/item/slimepotion/shrink/attack(mob/living/simple_mob/slime/xenobio/M, mob/user) if(!istype(M)) - to_chat(user, "The agent only works on slimes!") + to_chat(user, span_warning("The agent only works on slimes!")) return ..() if(M.stat == DEAD) - to_chat(user, "The slime is dead!") + to_chat(user, span_warning("The slime is dead!")) return ..() if(!(M.is_adult)) - to_chat(user, "The slime is already a baby!") + to_chat(user, span_warning("The slime is already a baby!")) return ..() - to_chat(user, "You feed the slime the shrinking agent. It is now back to being a baby.") + to_chat(user, span_notice("You feed the slime the shrinking agent. It is now back to being a baby.")) M.make_baby() playsound(src, 'sound/effects/bubbles.ogg', 50, 1) qdel(src) @@ -82,13 +82,13 @@ /obj/item/slimepotion/death/attack(mob/living/simple_mob/slime/xenobio/M, mob/user) if(!istype(M)) - to_chat(user, "The agent only works on slimes!") + to_chat(user, span_warning("The agent only works on slimes!")) return ..() if(M.stat == DEAD) - to_chat(user, "The slime is already dead!") + to_chat(user, span_warning("The slime is already dead!")) return ..() - to_chat(user, "You feed the slime the death agent. Its face flashes pain of betrayal before it goes still.") + to_chat(user, span_notice("You feed the slime the death agent. Its face flashes pain of betrayal before it goes still.")) M.adjustToxLoss(500) playsound(src, 'sound/effects/bubbles.ogg', 50, 1) qdel(src) @@ -101,16 +101,16 @@ /obj/item/slimepotion/ferality/attack(mob/living/simple_mob/slime/xenobio/M, mob/user) if(!istype(M)) - to_chat(user, "The agent only works on slimes!") + to_chat(user, span_warning("The agent only works on slimes!")) return ..() if(M.stat == DEAD) - to_chat(user, "The slime is already dead!") + to_chat(user, span_warning("The slime is already dead!")) return ..() if(M.untamable && M.untamable_inheirit) - to_chat(user, "The slime is already untamable!") + to_chat(user, span_warning("The slime is already untamable!")) return ..() - to_chat(user, "You feed the slime the death agent. It will now only get angrier at taming attempts.") + to_chat(user, span_notice("You feed the slime the death agent. It will now only get angrier at taming attempts.")) M.untamable = TRUE M.untamable_inheirit = TRUE playsound(src, 'sound/effects/bubbles.ogg', 50, 1) @@ -130,7 +130,7 @@ /obj/item/slimepotion/mimic/attackby(obj/item/O, mob/user) if(istype(O, /obj/item/slimepotion/mimic)) - to_chat(user, "You apply the mimic to the mimic, resulting a mimic that copies a mimic that copies a mimic that copies a mimic that-") + to_chat(user, span_warning("You apply the mimic to the mimic, resulting a mimic that copies a mimic that copies a mimic that copies a mimic that-")) var/location = get_turf(src) playsound(location, 'sound/weapons/gauss_shoot.ogg', 50, 1) var/datum/effect/effect/system/grav_pull/s = new /datum/effect/effect/system/grav_pull @@ -149,19 +149,19 @@ /obj/item/slimepotion/sapience/attack(mob/living/simple_mob/M, mob/user) if(!istype(M)) - to_chat(user, "The agent only works on creatures!") + to_chat(user, span_warning("The agent only works on creatures!")) return ..() if(M.stat == DEAD) - to_chat(user, "The creature is dead!") + to_chat(user, span_warning("The creature is dead!")) return ..() if(M.ghostjoin) - to_chat(user, "The creature is already developing sapience.") + to_chat(user, span_warning("The creature is already developing sapience.")) return ..() if(M.ckey) - to_chat(user, "The creature is already sapient!") + to_chat(user, span_warning("The creature is already sapient!")) return ..() - to_chat(user, "You feed \the [M] the agent. It may now eventually develop proper sapience.") + to_chat(user, span_notice("You feed \the [M] the agent. It may now eventually develop proper sapience.")) M.ghostjoin = 1 active_ghost_pods |= M if(!M.vore_active) @@ -179,13 +179,13 @@ /obj/item/slimepotion/obedience/attack(mob/living/simple_mob/slime/xenobio/M, mob/user) if(!istype(M)) - to_chat(user, "The agent only works on slimes!") + to_chat(user, span_warning("The agent only works on slimes!")) return ..() if(M.stat == DEAD) - to_chat(user, "The slime is dead!") + to_chat(user, span_warning("The slime is dead!")) return ..() - to_chat(user, "You feed the slime the agent. It has been disciplined, for better or worse...") + to_chat(user, span_notice("You feed the slime the agent. It has been disciplined, for better or worse...")) var/justified = M.is_justified_to_discipline() M.adjust_discipline(10) var/datum/ai_holder/simple_mob/xenobio_slime/AI = M.ai_holder diff --git a/code/modules/xenobio/items/weapons_vr.dm b/code/modules/xenobio/items/weapons_vr.dm index 5debc9bd27..ca46f7c7c8 100644 --- a/code/modules/xenobio/items/weapons_vr.dm +++ b/code/modules/xenobio/items/weapons_vr.dm @@ -17,7 +17,7 @@ /obj/item/xenobio/attack_hand(mob/user as mob) if(user.get_inactive_hand() == src && loaded_item) user.put_in_hands(loaded_item) - user.visible_message("[user] removes [loaded_item] from [src].", "You remove [loaded_item] from [src].") + user.visible_message(span_notice("[user] removes [loaded_item] from [src]."), span_notice("You remove [loaded_item] from [src].")) loaded_item = null playsound(src, 'sound/weapons/empty.ogg', 50, 1) else @@ -32,14 +32,14 @@ user.drop_item() I.loc = src loaded_item = I - user.visible_message("[user] inserts [I] into [src].", "You slot [I] into [src].") + user.visible_message(span_notice("[user] inserts [I] into [src]."), span_notice("You slot [I] into [src].")) return 1 ..() /obj/item/xenobio/attack_self(mob/living/user as mob) if(loaded_item) user.put_in_hands(loaded_item) - user.visible_message("[user] removes [loaded_item] from [src].", "You remove [loaded_item] from [src].") + user.visible_message(span_notice("[user] removes [loaded_item] from [src]."), span_notice("You remove [loaded_item] from [src].")) loaded_item = null playsound(src, 'sound/weapons/empty.ogg', 50, 1) @@ -54,7 +54,7 @@ playsound(src, 'sound/weapons/wave.ogg', 60, 1) - user.visible_message("[user] fires \the [src]!","You fire \the [src]!") + user.visible_message(span_warning("[user] fires \the [src]!"),span_warning("You fire \the [src]!")) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(4, 1, A) @@ -151,9 +151,9 @@ if(processing) return if(!can_insert(M)) - to_chat(user, "\The [src] cannot process \the [M] at this time.") + to_chat(user, span_warning("\The [src] cannot process \the [M] at this time.")) playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1) return extract(M, user) - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/xenobio/machinery/processor.dm b/code/modules/xenobio/machinery/processor.dm index 6b0d56b4fe..79c055dfca 100644 --- a/code/modules/xenobio/machinery/processor.dm +++ b/code/modules/xenobio/machinery/processor.dm @@ -20,13 +20,13 @@ /obj/machinery/processor/attack_hand(mob/living/user) if(processing) - to_chat(user, "The processor is in the process of processing!") + to_chat(user, span_warning("The processor is in the process of processing!")) return if(to_be_processed.len) spawn(1) begin_processing() else - to_chat(user, "The processor is empty.") + to_chat(user, span_warning("The processor is empty.")) playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1) return @@ -53,7 +53,7 @@ if(!Adjacent(AM)) return if(!can_insert(AM)) - to_chat(user, "\The [src] cannot process \the [AM] at this time.") + to_chat(user, span_warning("\The [src] cannot process \the [AM] at this time.")) playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1) return to_be_processed.Add(AM) @@ -115,4 +115,4 @@ /obj/machinery/processor/MouseDrop_T(var/atom/movable/AM, var/mob/living/user) if(user.stat || user.incapacitated(INCAPACITATION_DISABLED) || !istype(user)) return - insert(AM, user) \ No newline at end of file + insert(AM, user) diff --git a/code/modules/xenobio2/machinery/core_extractor.dm b/code/modules/xenobio2/machinery/core_extractor.dm index 21356198da..3ec567e038 100644 --- a/code/modules/xenobio2/machinery/core_extractor.dm +++ b/code/modules/xenobio2/machinery/core_extractor.dm @@ -35,7 +35,7 @@ return if(panel_open) - to_chat(user, "Close the panel first!") + to_chat(user, span_warning("Close the panel first!")) var/obj/item/grab/G = W @@ -43,7 +43,7 @@ return ..() if(G.state < 2) - to_chat(user, "You need a better grip to do that!") + to_chat(user, span_danger("You need a better grip to do that!")) return move_into_extractor(user,G.affecting) @@ -56,26 +56,26 @@ /obj/machinery/slime/extractor/proc/move_into_extractor(var/mob/user,var/mob/living/victim) if(src.occupant) - to_chat(user, "The core extractor is full, empty it first!") + to_chat(user, span_danger("The core extractor is full, empty it first!")) return if(inuse) - to_chat(user, "The core extractor is locked and running, wait for it to finish.") + to_chat(user, span_danger("The core extractor is locked and running, wait for it to finish.")) return if(!(istype(victim, /mob/living/simple_mob/xeno/slime))) - to_chat(user, "This is not a suitable subject for the core extractor!") + to_chat(user, span_danger("This is not a suitable subject for the core extractor!")) return var/mob/living/simple_mob/xeno/slime/S = victim if(S.is_child) - to_chat(user, "This subject is not developed enough for the core extractor!") + to_chat(user, span_danger("This subject is not developed enough for the core extractor!")) return - user.visible_message("[user] starts to put [victim] into the core extractor!") + user.visible_message(span_danger("[user] starts to put [victim] into the core extractor!")) src.add_fingerprint(user) if(do_after(user, 30) && victim.Adjacent(src) && user.Adjacent(src) && victim.Adjacent(user) && !occupant) - user.visible_message("[user] stuffs [victim] into the core extractor!") + user.visible_message(span_danger("[user] stuffs [victim] into the core extractor!")) if(victim.client) victim.client.perspective = EYE_PERSPECTIVE victim.client.eye = src diff --git a/code/modules/xenobio2/machinery/gene_manipulators.dm b/code/modules/xenobio2/machinery/gene_manipulators.dm index 35eddb274f..c019d83572 100644 --- a/code/modules/xenobio2/machinery/gene_manipulators.dm +++ b/code/modules/xenobio2/machinery/gene_manipulators.dm @@ -277,7 +277,7 @@ occupant = X to_chat(user, "You load [X] into [src]." else - to_chat(user, "This specimen is incompatible with the machinery!") + to_chat(user, span_danger("This specimen is incompatible with the machinery!")) return ..() @@ -360,21 +360,21 @@ /obj/machinery/xenobio/editor/proc/move_into_editor(var/mob/user,var/mob/living/victim) if(src.occupant) - to_chat(user, "The [src] is full, empty it first!") + to_chat(user, span_danger("The [src] is full, empty it first!")) return if(in_use) - to_chat(user, "The [src] is locked and running, wait for it to finish.") + to_chat(user, span_danger("The [src] is locked and running, wait for it to finish.")) return if(!(istype(victim, /mob/living/simple_mob/xeno/slime)) ) - to_chat(user, "This is not a suitable subject for the [src]!") + to_chat(user, span_danger("This is not a suitable subject for the [src]!")) return - user.visible_message("[user] starts to put [victim] into the [src]!") + user.visible_message(span_danger("[user] starts to put [victim] into the [src]!")) src.add_fingerprint(user) if(do_after(user, 30) && victim.Adjacent(src) && user.Adjacent(src) && victim.Adjacent(user) && !occupant) - user.visible_message("[user] stuffs [victim] into the [src]!") + user.visible_message(span_danger("[user] stuffs [victim] into the [src]!")) if(victim.client) victim.client.perspective = EYE_PERSPECTIVE victim.client.eye = src diff --git a/code/modules/xenobio2/machinery/injector.dm b/code/modules/xenobio2/machinery/injector.dm index 4595acd71f..9fd64a9962 100644 --- a/code/modules/xenobio2/machinery/injector.dm +++ b/code/modules/xenobio2/machinery/injector.dm @@ -43,17 +43,17 @@ /obj/machinery/xenobio2/manualinjector/proc/move_into_injector(var/mob/user,var/mob/living/victim) if(src.occupant) - to_chat(user, "The injector is full, empty it first!") + to_chat(user, span_danger("The injector is full, empty it first!")) return if(!(istype(victim, /mob/living/simple_mob/xeno)) && !emagged) - to_chat(user, "This is not a suitable subject for the injector!") + to_chat(user, span_danger("This is not a suitable subject for the injector!")) return - user.visible_message("[user] starts to put [victim] into the injector!") + user.visible_message(span_danger("[user] starts to put [victim] into the injector!")) src.add_fingerprint(user) if(do_after(user, 30) && victim.Adjacent(src) && user.Adjacent(src) && victim.Adjacent(user) && !occupant) - user.visible_message("[user] stuffs [victim] into the injector!") + user.visible_message(span_danger("[user] stuffs [victim] into the injector!")) if(victim.client) victim.client.perspective = EYE_PERSPECTIVE victim.client.eye = src @@ -111,14 +111,14 @@ var/obj/machinery/computer/xenobio2/C = P.connectable computer = C C.injector = src - to_chat(user, " You link the [src] to the [P.connectable]!") + to_chat(user, span_warning(" You link the [src] to the [P.connectable]!")) else - to_chat(user, " You store the [src] in the [P]'s buffer!") + to_chat(user, span_warning(" You store the [src] in the [P]'s buffer!")) P.connectable = src return if(panel_open) - to_chat(user, "Close the panel first!") + to_chat(user, span_warning("Close the panel first!")) var/obj/item/grab/G = W @@ -126,7 +126,7 @@ return ..() if(G.state < 2) - to_chat(user, "You need a better grip to do that!") + to_chat(user, span_danger("You need a better grip to do that!")) return move_into_injector(user,G.affecting) @@ -137,4 +137,4 @@ build_path = /obj/machinery/xenobio2/manualinjector board_type = /datum/frame/frame_types/machine origin_tech = list() //To be filled, - req_components = list() //To be filled, \ No newline at end of file + req_components = list() //To be filled, diff --git a/code/modules/xenobio2/machinery/injector_computer.dm b/code/modules/xenobio2/machinery/injector_computer.dm index a184a2b36f..aa9a237991 100644 --- a/code/modules/xenobio2/machinery/injector_computer.dm +++ b/code/modules/xenobio2/machinery/injector_computer.dm @@ -38,9 +38,9 @@ var/obj/machinery/xenobio2/manualinjector/I = P.connectable injector = I I.computer = src - to_chat(user, " You link the [src] to the [P.connectable]!") + to_chat(user, span_warning(" You link the [src] to the [P.connectable]!")) else - to_chat(user, " You store the [src] in the [P]'s buffer!") + to_chat(user, span_warning(" You store the [src] in the [P]'s buffer!")) P.connectable = src return diff --git a/code/modules/xenobio2/machinery/slime_replicator.dm b/code/modules/xenobio2/machinery/slime_replicator.dm index 8dc015e650..c493a47c97 100644 --- a/code/modules/xenobio2/machinery/slime_replicator.dm +++ b/code/modules/xenobio2/machinery/slime_replicator.dm @@ -38,10 +38,10 @@ return ..() if(core) - to_chat(user, "[src] is already filled!") + to_chat(user, span_warning("[src] is already filled!")) return if(panel_open) - to_chat(user, "Close the panel first!") + to_chat(user, span_warning("Close the panel first!")) core = G user.drop_from_inventory(G) G.forceMove(src) diff --git a/code/modules/xenobio2/mob/slime/slime_monkey.dm b/code/modules/xenobio2/mob/slime/slime_monkey.dm index c8201f2158..c9f0ce14b1 100644 --- a/code/modules/xenobio2/mob/slime/slime_monkey.dm +++ b/code/modules/xenobio2/mob/slime/slime_monkey.dm @@ -10,7 +10,7 @@ Slime cube lives here. /obj/item/slime_cube/attack_self(mob/user as mob) if(!searching) - to_chat(user, "You stare at the slimy cube, watching as some activity occurs.") + to_chat(user, span_warning("You stare at the slimy cube, watching as some activity occurs.")) request_player() /obj/item/slime_cube/proc/request_player() @@ -31,7 +31,7 @@ Slime cube lives here. searching = 0 var/turf/T = get_turf_or_move(src.loc) for(var/mob/M in viewers(T)) - M.show_message("The activity in the cube dies down. Maybe it will spark another time.") + M.show_message(span_warning("The activity in the cube dies down. Maybe it will spark another time.")) /obj/item/slime_cube/proc/transfer_personality(var/mob/candidate) announce_ghost_joinleave(candidate, 0, "They are a promethean now.") @@ -43,7 +43,7 @@ Slime cube lives here. S.set_species("Promethean") S.shapeshifter_set_colour("#05FF9B") for(var/mob/M in viewers(get_turf_or_move(loc))) - M.show_message("The monkey cube suddenly takes the shape of a humanoid!") + M.show_message(span_warning("The monkey cube suddenly takes the shape of a humanoid!")) var/newname = sanitize(tgui_input_text(S, "You are a Promethean. Would you like to change your name to something else?", "Name change"), MAX_NAME_LEN) if(newname) S.real_name = newname diff --git a/code/modules/xenobio2/mob/xeno procs.dm b/code/modules/xenobio2/mob/xeno procs.dm index 1fd17c964b..f2b48b8091 100644 --- a/code/modules/xenobio2/mob/xeno procs.dm +++ b/code/modules/xenobio2/mob/xeno procs.dm @@ -134,7 +134,7 @@ Divergence proc, used in mutation to make unique datums. /mob/living/simple_mob/xeno/bullet_act(var/obj/item/projectile/P) //Shamelessly stolen from ablative armor. if((traitdat.traits[TRAIT_XENO_CHROMATIC]) && istype(P, /obj/item/projectile/beam)) - visible_message(")\The beam reflects off of the [src]!") + visible_message(span_danger(")\The beam reflects off of the [src]!")) // Find a turf near or on the original location to bounce to var/new_x = P.starting.x + pick(0, -1, 1, -2, 2) var/new_y = P.starting.y + pick(0, -1, 1, -2, 2) diff --git a/code/modules/xenobio2/tools/xeno_trait_scanner.dm b/code/modules/xenobio2/tools/xeno_trait_scanner.dm index 8335000c1f..191aecd6e2 100644 --- a/code/modules/xenobio2/tools/xeno_trait_scanner.dm +++ b/code/modules/xenobio2/tools/xeno_trait_scanner.dm @@ -65,12 +65,12 @@ prod_reagents = P.reagents if(!trait_info) - to_chat(user, "[src] can tell you nothing about \the [target].") + to_chat(user, span_danger("[src] can tell you nothing about \the [target].")) return form_title = "[targetName]" var/dat = "

    Biological data for [form_title]

    " - user.visible_message("[user] runs the scanner over \the [target].") + user.visible_message(span_notice("[user] runs the scanner over \the [target].")) dat += "

    General Data

    " @@ -182,4 +182,4 @@ dat += "

    \[print report\]" user << browse(dat,"window=xeno_analyzer") - return \ No newline at end of file + return diff --git a/interface/interface.dm b/interface/interface.dm index 120f6614de..ce707db26c 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -9,11 +9,11 @@ var/output = replacetext(config.wikisearchurl, "%s", url_encode(query)) src << link(output) else - to_chat(src, " The wiki search URL is not set in the server configuration.") + to_chat(src, span_warning(" The wiki search URL is not set in the server configuration.")) else src << link(config.wikiurl) else - to_chat(src, "The wiki URL is not set in the server configuration.") + to_chat(src, span_warning("The wiki URL is not set in the server configuration.")) return /client/verb/forum() @@ -25,7 +25,7 @@ return src << link(config.forumurl) else - to_chat(src, "The forum URL is not set in the server configuration.") + to_chat(src, span_warning("The forum URL is not set in the server configuration.")) return /client/verb/rules() @@ -38,7 +38,7 @@ return src << link(config.rulesurl) else - to_chat(src, "The rules URL is not set in the server configuration.") + to_chat(src, span_danger("The rules URL is not set in the server configuration.")) return /client/verb/map() @@ -51,7 +51,7 @@ return src << link(config.mapurl) else - to_chat(src, "The map URL is not set in the server configuration.") + to_chat(src, span_danger("The map URL is not set in the server configuration.")) return /client/verb/github() @@ -64,7 +64,7 @@ return src << link(config.githuburl) else - to_chat(src, "The GitHub URL is not set in the server configuration.") + to_chat(src, span_danger("The GitHub URL is not set in the server configuration.")) return /client/verb/discord() @@ -77,7 +77,7 @@ return src << link(config.discordurl) else - to_chat(src, "The Discord URL is not set in the server configuration.") + to_chat(src, span_danger("The Discord URL is not set in the server configuration.")) return /client/verb/patreon() @@ -90,7 +90,7 @@ return src << link(config.patreonurl) else - to_chat(src, "The Patreon URL is not set in the server configuration.") + to_chat(src, span_danger("The Patreon URL is not set in the server configuration.")) return /client/verb/hotkeys_help() diff --git a/maps/expedition_vr/alienship/_alienship.dm b/maps/expedition_vr/alienship/_alienship.dm index bc2413f1ed..7d2aaa9bbc 100644 --- a/maps/expedition_vr/alienship/_alienship.dm +++ b/maps/expedition_vr/alienship/_alienship.dm @@ -170,7 +170,7 @@ L.Paralyse(10) L.forceMove(get_turf(pick(teleport_to))) L << 'sound/effects/bamf.ogg' - to_chat(L,"You're starting to come to. You feel like you've been out for a few minutes, at least...") + to_chat(L,span_warning("You're starting to come to. You feel like you've been out for a few minutes, at least...")) /area/tether_away/alienship name = "\improper Away Mission - Unknown Vessel" diff --git a/maps/expedition_vr/beach/_beach.dm b/maps/expedition_vr/beach/_beach.dm index f7e9b9b498..ea0a4fd85c 100644 --- a/maps/expedition_vr/beach/_beach.dm +++ b/maps/expedition_vr/beach/_beach.dm @@ -42,13 +42,13 @@ deep_count++ // Sanity check. if(surface_count < 100) - admin_notice("Insufficient surface minerals. Rerolling...", R_DEBUG) + admin_notice(span_danger("Insufficient surface minerals. Rerolling..."), R_DEBUG) return 0 else if(rare_count < 50) - admin_notice("Insufficient rare minerals. Rerolling...", R_DEBUG) + admin_notice(span_danger("Insufficient rare minerals. Rerolling..."), R_DEBUG) return 0 else if(deep_count < 50) - admin_notice("Insufficient deep minerals. Rerolling...", R_DEBUG) + admin_notice(span_danger("Insufficient deep minerals. Rerolling..."), R_DEBUG) return 0 else return 1 diff --git a/maps/gateway_archive_vr/wildwest.dm b/maps/gateway_archive_vr/wildwest.dm index 58d813d94e..155e1d8af3 100644 --- a/maps/gateway_archive_vr/wildwest.dm +++ b/maps/gateway_archive_vr/wildwest.dm @@ -48,16 +48,16 @@ to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.") if (!(LASER in user.mutations)) user.mutations.Add(LASER) - to_chat(user, "You feel pressure building behind your eyes.") + to_chat(user, span_notice("You feel pressure building behind your eyes.")) if (!(COLD_RESISTANCE in user.mutations)) user.mutations.Add(COLD_RESISTANCE) - to_chat(user, "Your body feels warm.") + to_chat(user, span_notice("Your body feels warm.")) if (!(XRAY in user.mutations)) user.mutations.Add(XRAY) user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) user.see_in_dark = 8 user.see_invisible = SEE_INVISIBLE_LEVEL_TWO - to_chat(user, "The walls suddenly disappear.") + to_chat(user, span_notice("The walls suddenly disappear.")) user.dna.mutantrace = "shadow" user.update_mutantrace() if("Wealth") @@ -148,9 +148,9 @@ var/mob/living/carbon/C = usr if(!C.stat) - to_chat(C, "You're not dead yet!") + to_chat(C, span_notice("You're not dead yet!")) return - to_chat(C, "Death is not your end!") + to_chat(C, span_notice("Death is not your end!")) spawn(rand(800,1200)) if(C.stat == DEAD) @@ -167,7 +167,7 @@ C.radiation = 0 C.heal_overall_damage(C.getBruteLoss(), C.getFireLoss()) C.reagents.clear_reagents() - to_chat(C, "You have regenerated.") - C.visible_message("[usr] appears to wake from the dead, having healed all wounds.") + to_chat(C, span_notice("You have regenerated.")) + C.visible_message(span_warning("[usr] appears to wake from the dead, having healed all wounds.")) C.update_canmove() return 1 diff --git a/maps/gateway_vr/wildwest.dm b/maps/gateway_vr/wildwest.dm index eaf56213ff..f7c14b2dde 100644 --- a/maps/gateway_vr/wildwest.dm +++ b/maps/gateway_vr/wildwest.dm @@ -52,16 +52,16 @@ to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.") if (!(LASER in user.mutations)) user.mutations.Add(LASER) - to_chat(user, "You feel pressure building behind your eyes.") + to_chat(user, span_notice("You feel pressure building behind your eyes.")) if (!(COLD_RESISTANCE in user.mutations)) user.mutations.Add(COLD_RESISTANCE) - to_chat(user, "Your body feels warm.") + to_chat(user, span_notice("Your body feels warm.")) if (!(XRAY in user.mutations)) user.mutations.Add(XRAY) user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) user.see_in_dark = 8 user.see_invisible = SEE_INVISIBLE_LEVEL_TWO - to_chat(user, "The walls suddenly disappear.") + to_chat(user, span_notice("The walls suddenly disappear.")) user.dna.mutantrace = "shadow" user.update_mutantrace() if("Wealth") @@ -152,9 +152,9 @@ var/mob/living/carbon/C = usr if(!C.stat) - to_chat(C, "You're not dead yet!") + to_chat(C, span_notice("You're not dead yet!")) return - to_chat(C, "Death is not your end!") + to_chat(C, span_notice("Death is not your end!")) spawn(rand(800,1200)) if(C.stat == DEAD) @@ -171,8 +171,8 @@ C.radiation = 0 C.heal_overall_damage(C.getBruteLoss(), C.getFireLoss()) C.reagents.clear_reagents() - to_chat(C, "You have regenerated.") - C.visible_message("[usr] appears to wake from the dead, having healed all wounds.") + to_chat(C, span_notice("You have regenerated.")) + C.visible_message(span_warning("[usr] appears to wake from the dead, having healed all wounds.")) C.update_canmove() return 1 */ diff --git a/maps/redgate/facility_items.dm b/maps/redgate/facility_items.dm index 81fcc02eac..26a42ecef7 100644 --- a/maps/redgate/facility_items.dm +++ b/maps/redgate/facility_items.dm @@ -10,7 +10,7 @@ return /obj/item/card/id/keycard/read() - to_chat(usr, "It is a red keycard, it must unlock something.") + to_chat(usr, span_notice("It is a red keycard, it must unlock something.")) /obj/item/card/id/keycard/attack_self(mob/living/user as mob) return @@ -45,9 +45,9 @@ crystal = 1 user.drop_item() qdel(W) - to_chat(usr, "You insert the crystal into the receptacle.") + to_chat(usr, span_notice("You insert the crystal into the receptacle.")) else - to_chat(usr, "There isn't a slot for that.") + to_chat(usr, span_notice("There isn't a slot for that.")) /obj/machinery/crystalexperimenter name = "crystal experimenter" @@ -114,4 +114,3 @@ light_power = 1 light_color = "#ffffff" light_on = TRUE - diff --git a/maps/redgate/fantasy_items.dm b/maps/redgate/fantasy_items.dm index dc6f706065..a6092b8ac4 100644 --- a/maps/redgate/fantasy_items.dm +++ b/maps/redgate/fantasy_items.dm @@ -71,10 +71,10 @@ /obj/structure/bed/bath/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/mop) || istype(I, /obj/item/soap)) //VOREStation Edit - "Allows soap and rags to be used on mopbuckets" if(reagents.total_volume < 1) - to_chat(user, "\The [src] is out of water!") + to_chat(user, span_warning("\The [src] is out of water!")) else reagents.trans_to_obj(I, 5) - to_chat(user, "You wet \the [I] in \the [src].") + to_chat(user, span_notice("You wet \the [I] in \the [src].")) playsound(src, 'sound/effects/slosh.ogg', 25, 1) if(istype(I, /obj/item/reagent_containers/glass)) update_icon() @@ -83,17 +83,17 @@ var/obj/item/grab/G = I var/mob/living/affecting = G.affecting if(has_buckled_mobs()) //Handles trying to buckle someone else to a chair when someone else is on it - to_chat(user, "\The [src] already has someone buckled to it.") + to_chat(user, span_notice("\The [src] already has someone buckled to it.")) return - user.visible_message("[user] attempts to buckle [affecting] into \the [src]!") + user.visible_message(span_notice("[user] attempts to buckle [affecting] into \the [src]!")) if(do_after(user, 20, G.affecting)) affecting.loc = loc spawn(0) if(buckle_mob(affecting)) affecting.visible_message(\ - "[affecting.name] is buckled to [src] by [user.name]!",\ - "You are buckled to [src] by [user.name]!",\ - "You hear metal clanking.") + span_danger("[affecting.name] is buckled to [src] by [user.name]!"),\ + span_danger("You are buckled to [src] by [user.name]!"),\ + span_notice("You hear metal clanking.")) qdel(I) @@ -150,28 +150,28 @@ if(G.state>1) if(!GM.loc == get_turf(src)) - to_chat(user, "[GM.name] needs to be on the toilet.") + to_chat(user, span_notice("[GM.name] needs to be on the toilet.")) return if(open && !swirlie) - user.visible_message("[user] starts to give [GM.name] a swirlie!", "You start to give [GM.name] a swirlie!") + user.visible_message(span_danger("[user] starts to give [GM.name] a swirlie!"), span_notice("You start to give [GM.name] a swirlie!")) swirlie = GM if(do_after(user, 30, GM)) - user.visible_message("[user] gives [GM.name] a swirlie!", "You give [GM.name] a swirlie!", "You hear a toilet flushing.") + user.visible_message(span_danger("[user] gives [GM.name] a swirlie!"), span_notice("You give [GM.name] a swirlie!"), "You hear a toilet flushing.") if(!GM.internal) GM.adjustOxyLoss(5) swirlie = null else - user.visible_message("[user] slams [GM.name] into the [src]!", "You slam [GM.name] into the [src]!") + user.visible_message(span_danger("[user] slams [GM.name] into the [src]!"), span_notice("You slam [GM.name] into the [src]!")) GM.adjustBruteLoss(5) else - to_chat(user, "You need a tighter grip.") + to_chat(user, span_notice("You need a tighter grip.")) if(cistern && !istype(user,/mob/living/silicon/robot)) //STOP PUTTING YOUR MODULES IN THE TOILET. if(I.w_class > 3) - to_chat(user, "\The [I] does not fit.") + to_chat(user, span_notice("\The [I] does not fit.")) return if(w_items + I.w_class > 5) - to_chat(user, "The cistern is full.") + to_chat(user, span_notice("The cistern is full.")) return user.drop_item() I.loc = src @@ -195,7 +195,7 @@ desc = "An old fashioned cooking pot above some logs." /obj/machinery/microwave/cookingpot/start() - src.visible_message("The cooking pot starts cooking.", "You hear a fire roar.") + src.visible_message(span_notice("The cooking pot starts cooking."), span_notice("You hear a fire roar.")) src.operating = TRUE src.icon_state = "cookingpot1" SStgui.update_uis(src) @@ -218,43 +218,43 @@ if(src.broken == 2 && O.is_screwdriver()) // If it's broken and they're using a screwdriver user.visible_message( \ "\The [user] starts to fix part of the cooking pot.", \ - "You start to fix part of the cooking pot." \ + span_notice("You start to fix part of the cooking pot.") \ ) playsound(src, O.usesound, 50, 1) if (do_after(user,20 * O.toolspeed)) user.visible_message( \ "\The [user] fixes part of the cooking pot.", \ - "You have fixed part of the cooking pot." \ + span_notice("You have fixed part of the cooking pot.") \ ) src.broken = 1 // Fix it a bit else if(src.broken == 1 && O.is_wrench()) // If it's broken and they're doing the wrench user.visible_message( \ "\The [user] starts to fix part of the cooking pot.", \ - "You start to fix part of the cooking pot." \ + span_notice("You start to fix part of the cooking pot.") \ ) if (do_after(user,20 * O.toolspeed)) user.visible_message( \ "\The [user] fixes the cooking pot.", \ - "You have fixed the cooking pot." \ + span_notice("You have fixed the cooking pot.") \ ) src.icon_state = "cookingpot" src.broken = 0 // Fix it! src.dirty = 0 // just to be sure src.flags = OPENCONTAINER | NOREACT else - to_chat(user, "It's broken!") + to_chat(user, span_warning("It's broken!")) return 1 else if(src.dirty==100) // The microwave is all dirty so can't be used! if(istype(O, /obj/item/reagent_containers/spray/cleaner) || istype(O, /obj/item/soap)) // If they're trying to clean it then let them user.visible_message( \ "\The [user] starts to clean the cooking pot.", \ - "You start to clean the cooking pot." \ + span_notice("You start to clean the cooking pot.") \ ) if (do_after(user,20)) user.visible_message( \ - "\The [user] has cleaned the cooking pot.", \ - "You have cleaned the cooking pot." \ + span_notice("\The [user] has cleaned the cooking pot."), \ + span_notice("You have cleaned the cooking pot.") \ ) src.dirty = 0 // It's clean! src.broken = 0 // just to be sure @@ -262,27 +262,27 @@ src.flags = OPENCONTAINER | NOREACT SStgui.update_uis(src) else //Otherwise bad luck!! - to_chat(user, "It's dirty!") + to_chat(user, span_warning("It's dirty!")) return 1 else if(is_type_in_list(O,acceptable_items)) var/list/workingList = cookingContents() if(workingList.len>=(max_n_of_items + circuit_item_capacity)) //Adds component_parts to the maximum number of items. changed 1 to actually just be the circuit item capacity var. - to_chat(user, "This [src] is full of ingredients, you cannot put more.") + to_chat(user, span_warning("This [src] is full of ingredients, you cannot put more.")) return 1 if(istype(O, /obj/item/stack) && O:get_amount() > 1) // This is bad, but I can't think of how to change it var/obj/item/stack/S = O new O.type (src) S.use(1) user.visible_message( \ - "\The [user] has added one of [O] to \the [src].", \ - "You add one of [O] to \the [src].") + span_notice("\The [user] has added one of [O] to \the [src]."), \ + span_notice("You add one of [O] to \the [src].")) return else // user.remove_from_mob(O) //This just causes problems so far as I can tell. -Pete - Man whoever you are, it's been years. o7 user.drop_from_inventory(O,src) user.visible_message( \ - "\The [user] has added \the [O] to \the [src].", \ - "You add \the [O] to \the [src].") + span_notice("\The [user] has added \the [O] to \the [src]."), \ + span_notice("You add \the [O] to \the [src].")) SStgui.update_uis(src) return else if (istype(O,/obj/item/storage/bag/plants)) // There might be a better way about making plant bags dump their contents into a microwave, but it works. @@ -293,7 +293,7 @@ continue failed = 0 if(contents.len>=(max_n_of_items + component_parts.len + circuit_item_capacity)) - to_chat(user, "This [src] is full of ingredients, you cannot put more.") + to_chat(user, span_warning("This [src] is full of ingredients, you cannot put more.")) return 0 else bag.remove_from_storage(G, src) @@ -321,12 +321,12 @@ return 1 for (var/datum/reagent/R in O.reagents.reagent_list) if (!(R.id in acceptable_reagents)) - to_chat(user, "Your [O] contains components unsuitable for cookery.") + to_chat(user, span_warning("Your [O] contains components unsuitable for cookery.")) return 1 return else if(istype(O,/obj/item/grab)) var/obj/item/grab/G = O - to_chat(user, "This is ridiculous. You can not fit \the [G.affecting] in this [src].") + to_chat(user, span_warning("This is ridiculous. You can not fit \the [G.affecting] in this [src].")) return 1 else if(O.is_screwdriver()) default_deconstruction_screwdriver(user, O) @@ -336,30 +336,30 @@ return else user.visible_message( \ - "\The [user] begins [src.anchored ? "unsecuring" : "securing"] the cooking pot.", \ - "You attempt to [src.anchored ? "unsecure" : "secure"] the cooking pot." + span_notice("\The [user] begins [src.anchored ? "unsecuring" : "securing"] the cooking pot."), \ + span_notice("You attempt to [src.anchored ? "unsecure" : "secure"] the cooking pot.") ) if (do_after(user,20/O.toolspeed)) user.visible_message( \ - "\The [user] [src.anchored ? "unsecures" : "secures"] the cooking pot.", \ - "You [src.anchored ? "unsecure" : "secure"] the cooking pot." + span_notice("\The [user] [src.anchored ? "unsecures" : "secures"] the cooking pot."), \ + span_notice("You [src.anchored ? "unsecure" : "secure"] the cooking pot.") ) src.anchored = !src.anchored else - to_chat(user, "You decide not to do that.") + to_chat(user, span_notice("You decide not to do that.")) else if(default_part_replacement(user, O)) return else if(istype(O, /obj/item/paicard)) if(!paicard) insertpai(user, O) else - to_chat(user, "You have no idea what you can cook with this [O].") + to_chat(user, span_warning("You have no idea what you can cook with this [O].")) ..() SStgui.update_uis(src) /obj/machinery/microwave/cookingpot/broke() src.icon_state = "cookingpotb" // Make it look all busted up and shit - src.visible_message("The cooking pot breaks!") //Let them know they're stupid + src.visible_message(span_warning("The cooking pot breaks!")) //Let them know they're stupid src.broken = 2 // Make it broken so it can't be used util fixed src.flags = null //So you can't add condiments src.operating = 0 // Turn it off again aferwards @@ -374,7 +374,7 @@ src.dirty++ src.reagents.clear_reagents() if(message) - to_chat(usr, "You dispose of the cooking pot contents.") + to_chat(usr, span_notice("You dispose of the cooking pot contents.")) SStgui.update_uis(src) /obj/machinery/microwave/cookingpot/muck_start() @@ -382,7 +382,7 @@ src.icon_state = "cookingpotbloody1" // Make it look dirty!! /obj/machinery/microwave/cookingpot/muck_finish() - src.visible_message("The cooking pot gets covered in muck!") + src.visible_message(span_warning("The cooking pot gets covered in muck!")) src.dirty = 100 // Make it dirty so it can't be used util cleaned src.flags = null //So you can't add condiments src.icon_state = "cookingpotbloody0" // Make it look dirty too @@ -498,7 +498,7 @@ This device records all warnings given and teleport events for admin review in c else if(choice == "New Beacon") if(beacons_left <= 0) - to_chat(user, "The tome can't support any more pages!") + to_chat(user, span_warning("The tome can't support any more pages!")) return var/new_name = html_encode(tgui_input_text(user,"New pages's name (2-20 char):","[src]",null,20)) @@ -506,11 +506,11 @@ This device records all warnings given and teleport events for admin review in c return if(length(new_name) > 20 || length(new_name) < 2) - to_chat(user, "Entered name length invalid (must be longer than 2, no more than than 20).") + to_chat(user, span_warning("Entered name length invalid (must be longer than 2, no more than than 20).")) return if(new_name in beacons) - to_chat(user, "No duplicate names, please. '[new_name]' exists already.") + to_chat(user, span_warning("No duplicate names, please. '[new_name]' exists already.")) return var/obj/item/perfect_tele_beacon/magic/nb = new(get_turf(src)) diff --git a/maps/submaps/_helpers.dm b/maps/submaps/_helpers.dm index 5ff6dc8eb2..83ea7b9530 100644 --- a/maps/submaps/_helpers.dm +++ b/maps/submaps/_helpers.dm @@ -63,7 +63,7 @@ if(FS._stair_tag == _stair_tag) target = FS if(!target && mapload) - to_world("Fake stairs at [x],[y],[z] couldn't get a target!") + to_world(span_danger("Fake stairs at [x],[y],[z] couldn't get a target!")) /obj/structure/fake_stairs/Destroy() if(target) diff --git a/maps/submaps/engine_submaps/engine.dm b/maps/submaps/engine_submaps/engine.dm index 63a0552c6d..faf12a7a86 100644 --- a/maps/submaps/engine_submaps/engine.dm +++ b/maps/submaps/engine_submaps/engine.dm @@ -21,7 +21,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/engine_loader) /obj/effect/landmark/engine_loader/proc/annihilate_bounds() var/deleted_atoms = 0 - admin_notice("Annihilating objects in engine loading location.", R_DEBUG) + admin_notice(span_danger("Annihilating objects in engine loading location."), R_DEBUG) var/list/turfs_to_clean = get_turfs_to_clean() if(turfs_to_clean.len) for(var/x in 1 to 2) // Requires two passes to get everything. @@ -29,4 +29,4 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/engine_loader) for(var/atom/movable/AM in T) ++deleted_atoms qdel(AM) - admin_notice("Annihilated [deleted_atoms] objects.", R_DEBUG) + admin_notice(span_danger("Annihilated [deleted_atoms] objects."), R_DEBUG) diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm index c294d1daaf..69f575033e 100644 --- a/maps/tether/tether_shuttles.dm +++ b/maps/tether/tether_shuttles.dm @@ -167,18 +167,18 @@ if(!istype(WT)) return 0 if(wear <= 20) - to_chat(user,"\The [src] doesn't seem to need repairs right now.") + to_chat(user,span_notice("\The [src] doesn't seem to need repairs right now.")) return 1 if(!WT.remove_fuel(0, user)) - to_chat(user,"\The [WT] must be on to complete this task.") + to_chat(user,span_warning("\The [WT] must be on to complete this task.")) return 1 playsound(src, 'sound/items/Welder.ogg', 50, 1) - user.visible_message("\The [user] begins \the [src] overhaul.","You begin an overhaul of \the [src].") + user.visible_message(span_notice("\The [user] begins \the [src] overhaul."),span_notice("You begin an overhaul of \the [src].")) if(!do_after(user, wear SECONDS, src)) return 1 if(!src || !WT.isOn()) return 1 - user.visible_message("\The [user] has overhauled \the [src].","You complete \the [src] overhaul.") + user.visible_message(span_notice("\The [user] has overhauled \the [src]."),span_notice("You complete \the [src] overhaul.")) wear = 20 update_icon() return 1 diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index b06e1f1a82..34f280139c 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -115,7 +115,7 @@ /obj/effect/step_trigger/lost_in_space/Trigger(var/atom/movable/A) //replacement for shuttle dump zones because there's no empty space levels to dump to if(ismob(A)) - to_chat(A, "[deathmessage]") + to_chat(A, span_danger("[deathmessage]")) qdel(A) /obj/effect/step_trigger/lost_in_space/bluespace diff --git a/tgui/packages/tgui-panel/chat/constants.ts b/tgui/packages/tgui-panel/chat/constants.ts index e7fbc7cbe5..99469de03c 100644 --- a/tgui/packages/tgui-panel/chat/constants.ts +++ b/tgui/packages/tgui-panel/chat/constants.ts @@ -209,7 +209,7 @@ export const MESSAGE_TYPES = [ type: MESSAGE_TYPE_ADMINLOG, name: 'Admin Log', description: 'ADMIN LOG: Urist McAdmin has jumped to coordinates X, Y, Z', - selector: '.log_message', + selector: '.log_message, .filter_adminlog', admin: true, }, { @@ -222,6 +222,7 @@ export const MESSAGE_TYPES = [ type: MESSAGE_TYPE_DEBUG, name: 'Debug Log', description: 'DEBUG: SSPlanets subsystem Recover().', + selector: '.filter_debuglogs', admin: true, }, ];