From 81d23c85cc76da67de9c31ae8f5c548ea91858bd Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Fri, 29 May 2015 19:36:15 +0100 Subject: [PATCH 01/20] code/ATMOSPHERICS \red \blue etc to span classes --- .../components/binary_devices/passive_gate.dm | 12 ++++----- .../components/binary_devices/pipeturbine.dm | 6 ++--- .../components/binary_devices/pump.dm | 12 ++++----- .../components/omni_devices/omni_base.dm | 10 +++---- .../components/portables_connector.dm | 12 ++++----- .../components/trinary_devices/filter.dm | 12 ++++----- .../components/trinary_devices/mixer.dm | 10 +++---- code/ATMOSPHERICS/components/tvalve.dm | 18 ++++++------- .../components/unary/heat_exchanger.dm | 14 +++++----- .../components/unary/vent_pump.dm | 24 ++++++++--------- .../components/unary/vent_scrubber.dm | 14 +++++----- code/ATMOSPHERICS/components/valve.dm | 14 +++++----- code/ATMOSPHERICS/mainspipe.dm | 4 +-- code/ATMOSPHERICS/pipes.dm | 26 +++++++++---------- 14 files changed, 94 insertions(+), 94 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 7604f33063..00a8abe50a 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -168,7 +168,7 @@ return src.add_fingerprint(usr) if(!src.allowed(user)) - user << "\red Access denied." + user << "Access denied." return usr.set_machine(src) ui_interact(user) @@ -242,20 +242,20 @@ if (!istype(W, /obj/item/weapon/wrench)) return ..() if (unlocked) - user << "\red You cannot unwrench this [src], turn it off first." + user << "You cannot unwrench \the [src], turn it off first." return 1 var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." + user << "You cannot unwrench \the [src], it too exerted due to internal pressure." add_fingerprint(user) return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + user << "You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ + "\The [user] unfastens \the [src].", \ + "You have unfastened \the [src].", \ "You hear ratchet.") new /obj/item/pipe(loc, make_from=src) qdel(src) diff --git a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm index aead60a382..0eb342479d 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm @@ -91,7 +91,7 @@ attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/wrench)) anchored = !anchored - user << "\blue You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor." + user << "You [anchored ? "secure" : "unsecure"] the bolts holding \the [src] to the floor." if(anchored) if(dir & (NORTH|SOUTH)) @@ -263,7 +263,7 @@ if(istype(W, /obj/item/weapon/wrench)) anchored = !anchored turbine = null - user << "\blue You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor." + user << "You [anchored ? "secure" : "unsecure"] the bolts holding \the [src] to the floor." updateConnection() else ..() @@ -286,4 +286,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 079dfb76cd..16f5c0a586 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -183,7 +183,7 @@ Thus, the two variables affect pump operation are set in New(): return src.add_fingerprint(usr) if(!src.allowed(user)) - user << "\red Access denied." + user << "Access denied." return usr.set_machine(src) ui_interact(user) @@ -219,20 +219,20 @@ Thus, the two variables affect pump operation are set in New(): if (!istype(W, /obj/item/weapon/wrench)) return ..() if (!(stat & NOPOWER) && use_power) - user << "\red You cannot unwrench this [src], turn it off first." + user << "You cannot unwrench this [src], turn it off first." return 1 var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." + user << "You cannot unwrench this [src], it too exerted due to internal pressure." add_fingerprint(user) return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + user << "You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ + "\The [user] unfastens \the [src].", \ + "You have unfastened \the [src].", \ "You hear ratchet.") new /obj/item/pipe(loc, make_from=src) qdel(src) diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm index 52ab44fa74..17d47ea8cf 100644 --- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm +++ b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm @@ -87,15 +87,15 @@ int_pressure += P.air.return_pressure() var/datum/gas_mixture/env_air = loc.return_air() if ((int_pressure - env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "You cannot unwrench [src], it is too exerted due to internal pressure." + user << "You cannot unwrench \the [src], it is too exerted due to internal pressure." add_fingerprint(user) return 1 - user << "\blue You begin to unfasten \the [src]..." + user << "You begin to unfasten \the [src]..." playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 40)) user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ + "\The [user] unfastens \the [src].", \ + "You have unfastened \the [src].", \ "You hear a ratchet.") new /obj/item/pipe(loc, make_from=src) qdel(src) @@ -299,4 +299,4 @@ update_ports() - return null \ No newline at end of file + return null diff --git a/code/ATMOSPHERICS/components/portables_connector.dm b/code/ATMOSPHERICS/components/portables_connector.dm index c33ff79967..4f6473fccf 100644 --- a/code/ATMOSPHERICS/components/portables_connector.dm +++ b/code/ATMOSPHERICS/components/portables_connector.dm @@ -134,22 +134,22 @@ if (!istype(W, /obj/item/weapon/wrench)) return ..() if (connected_device) - user << "\red You cannot unwrench this [src], dettach [connected_device] first." + user << "You cannot unwrench \the [src], dettach \the [connected_device] first." return 1 if (locate(/obj/machinery/portable_atmospherics, src.loc)) return 1 var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." + user << "You cannot unwrench \the [src], it too exerted due to internal pressure." add_fingerprint(user) return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + user << "You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") + "\The [user] unfastens \the [src].", \ + "You have unfastened \the [src].", \ + "You hear a ratchet.") new /obj/item/pipe(loc, make_from=src) qdel(src) diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 0921d1d0aa..0a055825a4 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -134,16 +134,16 @@ var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." + user << "You cannot unwrench \the [src], it too exerted due to internal pressure." add_fingerprint(user) return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + user << "You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") + "\The [user] unfastens \the [src].", \ + "You have unfastened \the [src].", \ + "You hear a ratchet.") new /obj/item/pipe(loc, make_from=src) qdel(src) @@ -153,7 +153,7 @@ return if(!src.allowed(user)) - user << "\red Access denied." + user << "Access denied." return var/dat diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index a200de25a0..a163c122f0 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -109,15 +109,15 @@ var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." + user << "You cannot unwrench \the [src], it too exerted due to internal pressure." add_fingerprint(user) return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + user << "You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ + "\The [user] unfastens \the [src].", \ + "You have unfastened \the [src].", \ "You hear ratchet.") new /obj/item/pipe(loc, make_from=src) qdel(src) @@ -127,7 +127,7 @@ return src.add_fingerprint(usr) if(!src.allowed(user)) - user << "\red Access denied." + user << "Access denied." return usr.set_machine(src) var/dat = {"Power: [use_power?"On":"Off"]
diff --git a/code/ATMOSPHERICS/components/tvalve.dm b/code/ATMOSPHERICS/components/tvalve.dm index 42556232bd..963a4f5009 100644 --- a/code/ATMOSPHERICS/components/tvalve.dm +++ b/code/ATMOSPHERICS/components/tvalve.dm @@ -308,7 +308,7 @@ if(!powered()) return if(!src.allowed(user)) - user << "\red Access denied." + user << "Access denied." return ..() @@ -350,21 +350,21 @@ if (!istype(W, /obj/item/weapon/wrench)) return ..() if (istype(src, /obj/machinery/atmospherics/tvalve/digital)) - user << "\red You cannot unwrench this [src], it's too complicated." + user << "You cannot unwrench \the [src], it's too complicated." return 1 var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." + user << "You cannot unwrench \the [src], it too exerted due to internal pressure." add_fingerprint(user) return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + user << "You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") + "\The [user] unfastens \the [src].", \ + "You have unfastened \the [src].", \ + "You hear a ratchet.") new /obj/item/pipe(loc, make_from=src) qdel(src) @@ -448,7 +448,7 @@ if(!powered()) return if(!src.allowed(user)) - user << "\red Access denied." + user << "Access denied." return ..() @@ -482,4 +482,4 @@ if(state) go_straight() else - go_to_side() \ No newline at end of file + go_to_side() diff --git a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm index 0e75146adc..ded9948cb2 100644 --- a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm +++ b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm @@ -70,20 +70,20 @@ return ..() var/turf/T = src.loc if (level==1 && isturf(T) && T.intact) - user << "\red You must remove the plating first." + user << "You must remove the plating first." return 1 var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." + user << "You cannot unwrench \the [src], it is too exerted due to internal pressure." add_fingerprint(user) return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + user << "You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") + "\The [user] unfastens \the [src].", \ + "You have unfastened \the [src].", \ + "You hear a ratchet.") new /obj/item/pipe(loc, make_from=src) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index 4674d52251..8bc836497b 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -358,22 +358,22 @@ if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if (WT.remove_fuel(0,user)) - user << "\blue Now welding the vent." + user << "Now welding the vent." if(do_after(user, 20)) if(!src || !WT.isOn()) return playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) if(!welded) - user.visible_message("[user] welds the vent shut.", "You weld the vent shut.", "You hear welding.") + user.visible_message("\The [user] welds the vent shut.", "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("[user] unwelds the vent.", "You unweld the vent.", "You hear welding.") welded = 0 update_icon() else - user << "\blue The welding tool needs to be on to start this task." + user << "The welding tool needs to be on to start this task." else - user << "\blue You need more welding fuel to complete this task." + user << "You need more welding fuel to complete this task." return 1 else ..() @@ -396,25 +396,25 @@ if (!istype(W, /obj/item/weapon/wrench)) return ..() if (!(stat & NOPOWER) && use_power) - user << "\red You cannot unwrench this [src], turn it off first." + user << "You cannot unwrench \the [src], turn it off first." return 1 var/turf/T = src.loc if (node && node.level==1 && isturf(T) && T.intact) - user << "\red You must remove the plating first." + user << "You must remove the plating first." return 1 var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." + user << "You cannot unwrench \the [src], it is too exerted due to internal pressure." add_fingerprint(user) return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + user << "You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") + "\The [user] unfastens \the [src].", \ + "You have unfastened \the [src].", \ + "You hear a ratchet.") new /obj/item/pipe(loc, make_from=src) qdel(src) diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index 43874a64d9..03af4cf35b 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -251,25 +251,25 @@ if (!istype(W, /obj/item/weapon/wrench)) return ..() if (!(stat & NOPOWER) && use_power) - user << "\red You cannot unwrench this [src], turn it off first." + user << "You cannot unwrench \the [src], turn it off first." return 1 var/turf/T = src.loc if (node && node.level==1 && isturf(T) && T.intact) - user << "\red You must remove the plating first." + user << "You must remove the plating first." return 1 var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." + user << "You cannot unwrench \the [src], it is too exerted due to internal pressure." add_fingerprint(user) return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + user << "You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") + "\The [user] unfastens \the [src].", \ + "You have unfastened \the [src].", \ + "You hear a ratchet.") new /obj/item/pipe(loc, make_from=src) qdel(src) diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm index 49ae4af2cf..6e43afd78e 100644 --- a/code/ATMOSPHERICS/components/valve.dm +++ b/code/ATMOSPHERICS/components/valve.dm @@ -241,7 +241,7 @@ if(!powered()) return if(!src.allowed(user)) - user << "\red Access denied." + user << "Access denied." return ..() @@ -294,21 +294,21 @@ if (!istype(W, /obj/item/weapon/wrench)) return ..() if (istype(src, /obj/machinery/atmospherics/valve/digital)) - user << "\red You cannot unwrench this [src], it's too complicated." + user << "You cannot unwrench \the [src], it's too complicated." return 1 var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "\red You cannot unwrench this [src], it too exerted due to internal pressure." + user << "You cannot unwrench \the [src], it is too exerted due to internal pressure." add_fingerprint(user) return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + user << "You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ - "You hear ratchet.") + "\The [user] unfastens \the [src].", \ + "You have unfastened \the [src].", \ + "You hear a ratchet.") new /obj/item/pipe(loc, make_from=src) qdel(src) diff --git a/code/ATMOSPHERICS/mainspipe.dm b/code/ATMOSPHERICS/mainspipe.dm index a381b28c37..54e23ea1a8 100644 --- a/code/ATMOSPHERICS/mainspipe.dm +++ b/code/ATMOSPHERICS/mainspipe.dm @@ -649,7 +649,7 @@ obj/machinery/atmospherics/mains_pipe/valve attack_hand(mob/user as mob) if(!src.allowed(user)) - user << "\red Access denied." + user << "Access denied." return ..() @@ -704,4 +704,4 @@ obj/machinery/atmospherics/mains_pipe/valve close() else open() -*/ \ No newline at end of file +*/ diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index 2315e856fd..448a926225 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -82,21 +82,21 @@ return ..() var/turf/T = src.loc if (level==1 && isturf(T) && T.intact) - user << "\red You must remove the plating first." + user << "You must remove the plating first." return 1 var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "You cannot unwrench [src], it is too exerted due to internal pressure." + user << "You cannot unwrench \the [src], it is too exerted due to internal pressure." add_fingerprint(user) return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + user << "\The[user] unfastens \the [src].", \ + "You have unfastened \the [src].", \ + "You hear a ratchet.") new /obj/item/pipe(loc, make_from=src) for (var/obj/machinery/meter/meter in T) if (meter.target == src) @@ -214,7 +214,7 @@ else return 1 /obj/machinery/atmospherics/pipe/simple/proc/burst() - src.visible_message("\red \bold [src] bursts!"); + src.visible_message("\The [src] bursts!"); playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) var/datum/effect/effect/system/smoke_spread/smoke = new smoke.set_up(1,0, src.loc, 0) @@ -1121,19 +1121,19 @@ if(istype(W, /obj/item/device/analyzer) && in_range(user, src)) for (var/mob/O in viewers(user, null)) - O << "\red [user] has used the analyzer on \icon[icon]" + O << "\The [user] has used \the [W] on \the [src] \icon[src]" var/pressure = parent.air.return_pressure() var/total_moles = parent.air.total_moles - user << "\blue Results of analysis of \icon[icon]" + user << "Results of analysis of \the [src] \icon[src]" if (total_moles>0) - user << "\blue Pressure: [round(pressure,0.1)] kPa" + user << "Pressure: [round(pressure,0.1)] kPa" for(var/g in parent.air.gas) - user << "\blue [gas_data.name[g]]: [round((parent.air.gas[g] / total_moles) * 100)]%" - user << "\blue Temperature: [round(parent.air.temperature-T0C)]°C" + user << "[gas_data.name[g]]: [round((parent.air.gas[g] / total_moles) * 100)]%" + user << "Temperature: [round(parent.air.temperature-T0C)]°C" else - user << "\blue Tank is empty!" + user << "Tank is empty!" /obj/machinery/atmospherics/pipe/tank/air name = "Pressure Tank (Air)" From 58ab7630104fd13d628706e2fc289ee3f0845b4d Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Fri, 29 May 2015 20:13:42 +0100 Subject: [PATCH 02/20] code/datums --- code/datums/datumvars.dm | 14 ++++---- code/datums/diseases/alien_embryo.dm | 10 +++--- code/datums/diseases/appendicitis.dm | 8 ++--- code/datums/diseases/beesease.dm | 8 ++--- code/datums/diseases/brainrot.dm | 14 ++++---- code/datums/diseases/cold.dm | 22 ++++++------ code/datums/diseases/cold9.dm | 10 +++--- code/datums/diseases/dna_spread.dm | 10 +++--- code/datums/diseases/fake_gbs.dm | 2 +- code/datums/diseases/flu.dm | 16 ++++----- code/datums/diseases/fluspanish.dm | 4 +-- code/datums/diseases/gbs.dm | 6 ++-- code/datums/diseases/magnitis.dm | 12 +++---- code/datums/diseases/pierrot_throat.dm | 8 ++--- code/datums/diseases/retrovirus.dm | 34 +++++++++---------- code/datums/diseases/rhumba_beat.dm | 12 +++---- .../datums/diseases/robotic_transformation.dm | 20 +++++------ code/datums/diseases/wizarditis.dm | 6 ++-- code/datums/diseases/xeno_transformation.dm | 20 +++++------ code/datums/helper_datums/global_iterator.dm | 2 +- code/datums/mind.dm | 8 ++--- 21 files changed, 123 insertions(+), 123 deletions(-) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 914b56ee60..7e9fc0cd04 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -9,7 +9,7 @@ client if(!usr.client || !usr.client.holder) - usr << "\red You need to be an administrator to access this." + usr << "You need to be an administrator to access this." return @@ -602,8 +602,8 @@ client if(!i) 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("\blue [key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ") + 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)") if("Type and subtypes") var/i = 0 for(var/obj/Obj in world) @@ -613,8 +613,8 @@ client if(!i) 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("\blue [key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ") + 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)") else if(href_list["explode"]) if(!check_rights(R_DEBUG|R_FUN)) return @@ -941,8 +941,8 @@ client return if(amount != 0) - log_admin("[key_name(usr)] dealt [amount] amount of [Text] damage to [L] ") - message_admins("\blue [key_name(usr)] dealt [amount] amount of [Text] damage to [L] ") + 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]") href_list["datumrefresh"] = href_list["mobToDamage"] if(href_list["datumrefresh"]) diff --git a/code/datums/diseases/alien_embryo.dm b/code/datums/diseases/alien_embryo.dm index 59d1dbe160..488d43efa3 100644 --- a/code/datums/diseases/alien_embryo.dm +++ b/code/datums/diseases/alien_embryo.dm @@ -53,25 +53,25 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "\red Your throat feels sore." + affected_mob << "Your throat feels sore." if(prob(1)) - affected_mob << "\red Mucous runs down the back of your throat." + affected_mob << "Mucous runs down the back of your throat." if(4) if(prob(1)) affected_mob.emote("sneeze") if(prob(1)) affected_mob.emote("cough") if(prob(2)) - affected_mob << "\red Your muscles ache." + affected_mob << "Your muscles ache." if(prob(20)) affected_mob.take_organ_damage(1) if(prob(2)) - affected_mob << "\red Your stomach hurts." + affected_mob << "You feel something tearing its way out of your stomach..." affected_mob.adjustToxLoss(10) affected_mob.updatehealth() if(prob(50)) diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm index 37a2adecb6..b4f2b1a38a 100644 --- a/code/datums/diseases/appendicitis.dm +++ b/code/datums/diseases/appendicitis.dm @@ -24,11 +24,11 @@ if(stage == 1) if(prob(5)) - affected_mob << "\red You feel a stinging pain in your abdomen!" + affected_mob << "You feel a stinging pain in your abdomen!" affected_mob.emote("me",1,"winces slightly.") if(stage > 1) if(prob(3)) - affected_mob << "\red You feel a stabbing pain in your abdomen!" + affected_mob << "You feel a stabbing pain in your abdomen!" affected_mob.emote("me",1,"winces painfully.") affected_mob.adjustToxLoss(1) if(stage > 2) @@ -37,13 +37,13 @@ var/mob/living/carbon/human/H = affected_mob H.vomit() else - affected_mob << "\red You gag as you want to throw up, but there's nothing in your stomach!" + affected_mob << "You gag as you want to throw up, but there's nothing in your stomach!" affected_mob.Weaken(10) affected_mob.adjustToxLoss(3) if(stage > 3) if(prob(1) && ishuman(affected_mob)) var/mob/living/carbon/human/H = affected_mob - H << "\red Your abdomen is a world of pain!" + H << "Your abdomen is a world of pain!" H.Weaken(10) var/obj/item/organ/external/groin = H.get_organ("groin") diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm index ec863a441e..f55dec71a9 100644 --- a/code/datums/diseases/beesease.dm +++ b/code/datums/diseases/beesease.dm @@ -14,12 +14,12 @@ switch(stage) if(1) if(prob(2)) - affected_mob << "\red You feel like something is moving inside of you" + affected_mob << "You feel like something is moving inside of you!" if(2) //also changes say, see say.dm if(prob(2)) - affected_mob << "\red You feel like something is moving inside of you" + affected_mob << "You feel like something is moving inside of you!" if(prob(2)) - affected_mob << "\red BZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ" + affected_mob << "BZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ" if(3) //Should give the bee spit verb if(4) @@ -28,4 +28,4 @@ //Plus if you die, you explode into bees return */ -//Started working on it, but am too lazy to finish it today -- Urist \ No newline at end of file +//Started working on it, but am too lazy to finish it today -- Urist diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm index 55e5db82d6..c4784f5199 100644 --- a/code/datums/diseases/brainrot.dm +++ b/code/datums/diseases/brainrot.dm @@ -21,7 +21,7 @@ if(prob(2)) affected_mob.emote("yawn") if(prob(2)) - affected_mob << "\red Your don't feel like yourself." + affected_mob << "Your don't feel like yourself." if(prob(5)) affected_mob.adjustBrainLoss(1) affected_mob.updatehealth() @@ -34,12 +34,12 @@ affected_mob.adjustBrainLoss(2) affected_mob.updatehealth() if(prob(2)) - affected_mob << "\red Your try to remember something important...but can't." + affected_mob << "You try to remember something important...but can't." /* if(prob(10)) affected_mob.adjustToxLoss(3) affected_mob.updatehealth() if(prob(2)) - affected_mob << "\red Your head hurts." */ + affected_mob << "Your head hurts." */ if(4) if(prob(2)) affected_mob.emote("stare") @@ -49,14 +49,14 @@ affected_mob.adjustToxLoss(4) affected_mob.updatehealth() if(prob(2)) - affected_mob << "\red Your head hurts." */ + affected_mob << "A strange buzzing fills your head, removing all thoughts." if(prob(3)) - affected_mob << "\red You lose consciousness..." + affected_mob << "You lose consciousness..." for(var/mob/O in viewers(affected_mob, null)) O.show_message("[affected_mob] suddenly collapses", 1) affected_mob.Paralyse(rand(5,10)) @@ -64,4 +64,4 @@ affected_mob.emote("snore") if(prob(15)) affected_mob.stuttering += 3 - return \ No newline at end of file + return diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm index 9317fa12ef..5bbde80c2f 100644 --- a/code/datums/diseases/cold.dm +++ b/code/datums/diseases/cold.dm @@ -16,16 +16,16 @@ if(2) /* if(affected_mob.sleeping && prob(40)) //removed until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return */ if(affected_mob.lying && prob(40)) //changed FROM prob(10) until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return if(prob(1) && prob(5)) - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return if(prob(1)) @@ -33,22 +33,22 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "\red Your throat feels sore." + affected_mob << "Your throat feels sore." if(prob(1)) - affected_mob << "\red Mucous runs down the back of your throat." + affected_mob << "Mucous runs down the back of your throat." if(3) /* if(affected_mob.sleeping && prob(25)) //removed until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return */ if(affected_mob.lying && prob(25)) //changed FROM prob(5) until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return if(prob(1) && prob(1)) - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return if(prob(1)) @@ -56,11 +56,11 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "\red Your throat feels sore." + affected_mob << "Your throat feels sore." if(prob(1)) - affected_mob << "\red Mucous runs down the back of your throat." + affected_mob << "Mucous runs down the back of your throat." if(prob(1) && prob(50)) if(!affected_mob.resistances.Find(/datum/disease/flu)) var/datum/disease/Flu = new /datum/disease/flu(0) affected_mob.contract_disease(Flu,1) - cure() \ No newline at end of file + cure() diff --git a/code/datums/diseases/cold9.dm b/code/datums/diseases/cold9.dm index bea72ec36e..86b88d5fcb 100644 --- a/code/datums/diseases/cold9.dm +++ b/code/datums/diseases/cold9.dm @@ -16,7 +16,7 @@ if(2) affected_mob.bodytemperature -= 10 if(prob(1) && prob(10)) - affected_mob << "\blue You feel better." + affected_mob << "Your throat feels sore." if(prob(5)) - affected_mob << "\red You feel stiff." + affected_mob << "You feel stiff." if(3) affected_mob.bodytemperature -= 20 if(prob(1)) @@ -34,6 +34,6 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "\red Your throat feels sore." + affected_mob << "Your throat feels sore." if(prob(10)) - affected_mob << "\red You feel stiff." \ No newline at end of file + affected_mob << "You feel stiff." diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm index 6d520fe294..6b79ea7505 100644 --- a/code/datums/diseases/dna_spread.dm +++ b/code/datums/diseases/dna_spread.dm @@ -23,11 +23,11 @@ if(prob(8)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "\red Your muscles ache." + affected_mob << "Your muscles ache." if(prob(20)) affected_mob.take_organ_damage(1) if(prob(1)) - affected_mob << "\red Your stomach hurts." + affected_mob << "Your stomach hurts." if(prob(20)) affected_mob.adjustToxLoss(2) affected_mob.updatehealth() @@ -42,7 +42,7 @@ src.original_dna["UI"] = affected_mob.dna.UI.Copy() src.original_dna["SE"] = affected_mob.dna.SE.Copy() - affected_mob << "\red You don't feel like yourself.." + affected_mob << "You don't feel like yourself.." var/list/newUI=strain_data["UI"] var/list/newSE=strain_data["SE"] affected_mob.UpdateAppearance(newUI.Copy()) @@ -65,5 +65,5 @@ affected_mob.dna.UpdateSE() affected_mob.real_name = original_dna["name"] - affected_mob << "\blue You feel more like yourself." - ..() \ No newline at end of file + affected_mob << "You feel more like yourself." + ..() diff --git a/code/datums/diseases/fake_gbs.dm b/code/datums/diseases/fake_gbs.dm index 2ef958bc04..97e585fa0c 100644 --- a/code/datums/diseases/fake_gbs.dm +++ b/code/datums/diseases/fake_gbs.dm @@ -22,7 +22,7 @@ else if(prob(5)) affected_mob.emote("gasp") if(prob(10)) - affected_mob << "\red You're starting to feel very weak..." + affected_mob << "You're starting to feel very weak..." if(4) if(prob(10)) affected_mob.emote("cough") diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm index bb32b44e5b..c050b9e1d1 100644 --- a/code/datums/diseases/flu.dm +++ b/code/datums/diseases/flu.dm @@ -17,12 +17,12 @@ if(2) /* if(affected_mob.sleeping && prob(20)) //removed until sleeping is fixed --Blaank - affected_mob << "\blue You feel better." + affected_mob << "You feel better." stage-- return */ if(affected_mob.lying && prob(20)) //added until sleeping is fixed --Blaank - affected_mob << "\blue You feel better." + affected_mob << "You feel better." stage-- return if(prob(1)) @@ -30,11 +30,11 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "\red Your muscles ache." + affected_mob << "Your muscles ache." if(prob(20)) affected_mob.take_organ_damage(1) if(prob(1)) - affected_mob << "\red Your stomach hurts." + affected_mob << "Your stomach hurts." if(prob(20)) affected_mob.adjustToxLoss(1) affected_mob.updatehealth() @@ -42,12 +42,12 @@ if(3) /* if(affected_mob.sleeping && prob(15)) //removed until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." stage-- return */ if(affected_mob.lying && prob(15)) //added until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." stage-- return if(prob(1)) @@ -55,11 +55,11 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "\red Your muscles ache." + affected_mob << "Your muscles ache." if(prob(20)) affected_mob.take_organ_damage(1) if(prob(1)) - affected_mob << "\red Your stomach hurts." + affected_mob << "Your stomach hurts." if(prob(20)) affected_mob.adjustToxLoss(1) affected_mob.updatehealth() diff --git a/code/datums/diseases/fluspanish.dm b/code/datums/diseases/fluspanish.dm index 8400d196b6..505cabfea0 100644 --- a/code/datums/diseases/fluspanish.dm +++ b/code/datums/diseases/fluspanish.dm @@ -21,7 +21,7 @@ if(prob(5)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "\red You're burning in your own skin!" + affected_mob << "You're burning in your own skin!" affected_mob.take_organ_damage(0,5) if(3) @@ -31,6 +31,6 @@ if(prob(5)) affected_mob.emote("cough") if(prob(5)) - affected_mob << "\red You're burning in your own skin!" + affected_mob << "You're burning in your own skin!" affected_mob.take_organ_damage(0,5) return diff --git a/code/datums/diseases/gbs.dm b/code/datums/diseases/gbs.dm index ceddf45117..8fc547bd21 100644 --- a/code/datums/diseases/gbs.dm +++ b/code/datums/diseases/gbs.dm @@ -26,15 +26,15 @@ else if(prob(5)) affected_mob.emote("gasp") if(prob(10)) - affected_mob << "\red You're starting to feel very weak..." + affected_mob << "You're starting to feel very weak..." if(4) if(prob(10)) affected_mob.emote("cough") affected_mob.adjustToxLoss(5) affected_mob.updatehealth() if(5) - affected_mob << "\red Your body feels as if it's trying to rip itself open..." + affected_mob << "Your body feels as if it's trying to rip itself open..." if(prob(50)) affected_mob.gib() else - return \ No newline at end of file + return diff --git a/code/datums/diseases/magnitis.dm b/code/datums/diseases/magnitis.dm index fb9fe042b8..94fa6ed4af 100644 --- a/code/datums/diseases/magnitis.dm +++ b/code/datums/diseases/magnitis.dm @@ -16,7 +16,7 @@ switch(stage) if(2) if(prob(2)) - affected_mob << "\red You feel a slight shock course through your body." + affected_mob << "You feel a slight shock course through your body." if(prob(2)) for(var/obj/M in orange(2,affected_mob)) if(!M.anchored && (M.flags & CONDUCT)) @@ -36,9 +36,9 @@ */ if(3) if(prob(2)) - affected_mob << "\red You feel a strong shock course through your body." + affected_mob << "You feel a strong shock course through your body." if(prob(2)) - affected_mob << "\red You feel like clowning around." + affected_mob << "You feel like clowning around." if(prob(4)) for(var/obj/M in orange(4,affected_mob)) if(!M.anchored && (M.flags & CONDUCT)) @@ -64,9 +64,9 @@ */ if(4) if(prob(2)) - affected_mob << "\red You feel a powerful shock course through your body." + affected_mob << "You feel a powerful shock course through your body." if(prob(2)) - affected_mob << "\red You query upon the nature of miracles." + affected_mob << "You query upon the nature of miracles." if(prob(8)) for(var/obj/M in orange(6,affected_mob)) if(!M.anchored && (M.flags & CONDUCT)) @@ -90,4 +90,4 @@ else if(M.y < affected_mob.y) M.y+=rand(1,min(5,affected_mob.y-M.y)) */ - return \ No newline at end of file + return diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index 619e0f988a..32170cd424 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -16,10 +16,10 @@ ..() switch(stage) if(1) - if(prob(10)) affected_mob << "\red You feel a little silly." + if(prob(10)) affected_mob << "You feel a little silly." if(2) - if(prob(10)) affected_mob << "\red You start seeing rainbows." + if(prob(10)) affected_mob << "You start seeing rainbows." if(3) - if(prob(10)) affected_mob << "\red Your thoughts are interrupted by a loud HONK!" + if(prob(10)) affected_mob << "Your thoughts are interrupted by a loud HONK!" if(4) - if(prob(5)) affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) ) \ No newline at end of file + if(prob(5)) affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) ) diff --git a/code/datums/diseases/retrovirus.dm b/code/datums/diseases/retrovirus.dm index 9ab69e217a..27ddfe233f 100644 --- a/code/datums/diseases/retrovirus.dm +++ b/code/datums/diseases/retrovirus.dm @@ -33,55 +33,55 @@ if(restcure) /* if(affected_mob.sleeping && prob(30)) //removed until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return */ if(affected_mob.lying && prob(30)) //changed FROM prob(20) until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return if (prob(8)) - affected_mob << "\red Your head hurts." + affected_mob << "Your head hurts." if (prob(9)) - affected_mob << "You feel a tingling sensation in your chest." + affected_mob << "You feel a tingling sensation in your chest." if (prob(9)) - affected_mob << "\red You feel angry." + affected_mob << "You feel angry." if(2) if(restcure) /* if(affected_mob.sleeping && prob(20)) //removed until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return */ if(affected_mob.lying && prob(20)) //changed FROM prob(10) until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return if (prob(8)) - affected_mob << "\red Your skin feels loose." + affected_mob << "Your skin feels loose." if (prob(10)) - affected_mob << "You feel very strange." + affected_mob << "You feel very strange." if (prob(4)) - affected_mob << "\red You feel a stabbing pain in your head!" + affected_mob << "You feel a stabbing pain in your head!" affected_mob.Paralyse(2) if (prob(4)) - affected_mob << "\red Your stomach churns." + affected_mob << "Your stomach churns." if(3) if(restcure) /* if(affected_mob.sleeping && prob(20)) //removed until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return */ if(affected_mob.lying && prob(20)) //changed FROM prob(10) until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return if (prob(10)) - affected_mob << "\red Your entire body vibrates." + affected_mob << "Your entire body vibrates." if (prob(35)) if(prob(50)) @@ -93,16 +93,16 @@ if(restcure) /* if(affected_mob.sleeping && prob(10)) //removed until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return */ if(affected_mob.lying && prob(5)) //changed FROM prob(5) until sleeping is fixed - affected_mob << "\blue You feel better." + affected_mob << "You feel better." cure() return if (prob(60)) if(prob(50)) scramble(1, affected_mob, rand(50,75)) else - scramble(0, affected_mob, rand(50,75)) \ No newline at end of file + scramble(0, affected_mob, rand(50,75)) diff --git a/code/datums/diseases/rhumba_beat.dm b/code/datums/diseases/rhumba_beat.dm index 00bf74e7cd..53a68011bf 100644 --- a/code/datums/diseases/rhumba_beat.dm +++ b/code/datums/diseases/rhumba_beat.dm @@ -22,30 +22,30 @@ affected_mob.adjustToxLoss(5) affected_mob.updatehealth() if(prob(1)) - affected_mob << "\red You feel strange..." + affected_mob << "You feel strange..." if(3) if(affected_mob.ckey == "rosham") src.cure() if(prob(5)) - affected_mob << "\red You feel the urge to dance..." + affected_mob << "You feel the urge to dance..." else if(prob(5)) affected_mob.emote("gasp") else if(prob(10)) - affected_mob << "\red You feel the need to chick chicky boom..." + affected_mob << "You feel the need to chick chicky boom..." if(4) if(affected_mob.ckey == "rosham") src.cure() if(prob(10)) affected_mob.emote("gasp") - affected_mob << "\red You feel a burning beat inside..." + affected_mob << "You feel a burning beat inside..." if(prob(20)) affected_mob.adjustToxLoss(5) affected_mob.updatehealth() if(5) if(affected_mob.ckey == "rosham") src.cure() - affected_mob << "\red Your body is unable to contain the Rhumba Beat..." + affected_mob << "Your body is unable to contain the Rhumba Beat..." if(prob(50)) affected_mob.gib() else - return \ No newline at end of file + return diff --git a/code/datums/diseases/robotic_transformation.dm b/code/datums/diseases/robotic_transformation.dm index 9648191fb0..257ce666c1 100644 --- a/code/datums/diseases/robotic_transformation.dm +++ b/code/datums/diseases/robotic_transformation.dm @@ -19,36 +19,36 @@ switch(stage) if(2) if (prob(8)) - affected_mob << "Your joints feel stiff." + affected_mob << "Your joints feel stiff." affected_mob.take_organ_damage(1) if (prob(9)) - affected_mob << "\red Beep...boop.." + affected_mob << "Beep...boop.." if (prob(9)) - affected_mob << "\red Bop...beeep..." + affected_mob << "Bop...beeep..." if(3) if (prob(8)) - affected_mob << "\red Your joints feel very stiff." + affected_mob << "Your joints feel very stiff." affected_mob.take_organ_damage(1) if (prob(8)) affected_mob.say(pick("Beep, boop", "beep, beep!", "Boop...bop")) if (prob(10)) - affected_mob << "Your skin feels loose." + affected_mob << "Your skin feels loose." affected_mob.take_organ_damage(5) if (prob(4)) - affected_mob << "\red You feel a stabbing pain in your head." + affected_mob << "You feel a stabbing pain in your head." affected_mob.Paralyse(2) if (prob(4)) - affected_mob << "\red You can feel something move...inside." + affected_mob << "You can feel something move...inside." if(4) if (prob(10)) - affected_mob << "\red Your skin feels very loose." + affected_mob << "Your skin feels very loose." affected_mob.take_organ_damage(8) if (prob(20)) affected_mob.say(pick("beep, beep!", "Boop bop boop beep.", "kkkiiiill mmme", "I wwwaaannntt tttoo dddiiieeee...")) if (prob(8)) - affected_mob << "\red You can feel... something...inside you." + affected_mob << "You can feel... something...inside you." if(5) - affected_mob <<"\red Your skin feels as if it's about to burst off..." + affected_mob <<"Your skin feels as if it's about to burst off..." affected_mob.adjustToxLoss(10) affected_mob.updatehealth() if(prob(40)) //So everyone can feel like robot Seth Brundle diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index ebba6f645f..dc1a669f24 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -31,14 +31,14 @@ STI KALY - blind if(prob(1)&&prob(50)) affected_mob.say(pick("You shall not pass!", "Expeliarmus!", "By Merlins beard!", "Feel the power of the Dark Side!")) if(prob(1)&&prob(50)) - affected_mob << "\red You feel [pick("that you don't have enough mana.", "that the winds of magic are gone.", "an urge to summon familiar.")]" + affected_mob << "You feel [pick("that you don't have enough mana.", "that the winds of magic are gone.", "an urge to summon familiar.")]" if(3) if(prob(1)&&prob(50)) affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!", "STI KALY!", "TARCOL MINTI ZHERI!")) if(prob(1)&&prob(50)) - affected_mob << "\red You feel [pick("the magic bubbling in your veins","that this location gives you a +1 to INT","an urge to summon familiar.")]." + affected_mob << "You feel [pick("the magic bubbling in your veins.","that this location gives you a +1 to INT.","an urge to summon familiar.")]" if(4) @@ -46,7 +46,7 @@ STI KALY - blind affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!","STI KALY!","EI NATH!")) return if(prob(1)&&prob(50)) - affected_mob << "\red You feel [pick("the tidal wave of raw power building inside","that this location gives you a +2 to INT and +1 to WIS","an urge to teleport")]." + affected_mob << "You feel [pick("the tidal wave of raw power building inside.","that this location gives you a +2 to INT and +1 to WIS.","an urge to teleport.")]" spawn_wizard_clothes(50) if(prob(1)&&prob(1)) teleport() diff --git a/code/datums/diseases/xeno_transformation.dm b/code/datums/diseases/xeno_transformation.dm index 9d3289708f..d6fa155cfc 100644 --- a/code/datums/diseases/xeno_transformation.dm +++ b/code/datums/diseases/xeno_transformation.dm @@ -17,38 +17,38 @@ switch(stage) if(2) if (prob(8)) - affected_mob << "Your throat feels scratchy." + affected_mob << "Your throat feels scratchy." affected_mob.take_organ_damage(1) if (prob(9)) - affected_mob << "\red Kill..." + affected_mob << "Kill..." if (prob(9)) - affected_mob << "\red Kill..." + affected_mob << "Kill..." if(3) if (prob(8)) - affected_mob << "\red Your throat feels very scratchy." + affected_mob << "Your throat feels very scratchy." affected_mob.take_organ_damage(1) /* if (prob(8)) affected_mob.say(pick("Beep, boop", "beep, beep!", "Boop...bop")) */ if (prob(10)) - affected_mob << "Your skin feels tight." + affected_mob << "Your skin feels tight." affected_mob.take_organ_damage(5) if (prob(4)) - affected_mob << "\red You feel a stabbing pain in your head." + affected_mob << "You feel a stabbing pain in your head." affected_mob.Paralyse(2) if (prob(4)) - affected_mob << "\red You can feel something move...inside." + affected_mob << "You can feel something move...inside." if(4) if (prob(10)) - affected_mob << pick("\red Your skin feels very tight.", "\red Your blood boils!") + affected_mob << pick("Your skin feels very tight.", "Your blood boils!") affected_mob.take_organ_damage(8) if (prob(20)) affected_mob.say(pick("You look delicious.", "Going to... devour you...", "Hsssshhhhh!")) if (prob(8)) - affected_mob << "\red You can feel... something...inside you." + affected_mob << "You can feel... something...inside you." if(5) - affected_mob <<"\red Your skin feels impossibly calloused..." + affected_mob <<"Your skin feels impossibly calloused..." affected_mob.adjustToxLoss(10) affected_mob.updatehealth() if(prob(40)) diff --git a/code/datums/helper_datums/global_iterator.dm b/code/datums/helper_datums/global_iterator.dm index 4f4d680e9e..3bf80f06d0 100644 --- a/code/datums/helper_datums/global_iterator.dm +++ b/code/datums/helper_datums/global_iterator.dm @@ -139,7 +139,7 @@ Data storage vars: arg_list = arguments return 1 else -// world << "\red Invalid arguments supplied for [src.type], ref = \ref[src]" +// world << "Invalid arguments supplied for [src.type], ref = \ref[src]" return 0 proc/toggle_null_checks() diff --git a/code/datums/mind.dm b/code/datums/mind.dm index cfbd155145..c3a77b4b0e 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -332,7 +332,7 @@ datum/mind var/mob/living/carbon/monkey/M = current if (istype(H)) log_admin("[key_name(usr)] attempting to monkeyize [key_name(current)]") - message_admins("\blue [key_name_admin(usr)] attempting to monkeyize [key_name_admin(current)]") + message_admins("[key_name_admin(usr)] attempting to monkeyize [key_name_admin(current)]") src = null M = H.monkeyize() src = M.mind @@ -347,7 +347,7 @@ datum/mind var/mob/living/carbon/monkey/M = current if (istype(H)) log_admin("[key_name(usr)] attempting to monkeyize and infect [key_name(current)]") - message_admins("\blue [key_name_admin(usr)] attempting to monkeyize and infect [key_name_admin(current)]", 1) + message_admins("[key_name_admin(usr)] attempting to monkeyize and infect [key_name_admin(current)]", 1) src = null M = H.monkeyize() src = M.mind @@ -362,7 +362,7 @@ datum/mind D.cure(0) sleep(0) //because deleting of virus is doing throught spawn(0) log_admin("[key_name(usr)] attempting to humanize [key_name(current)]") - message_admins("\blue [key_name_admin(usr)] attempting to humanize [key_name_admin(current)]") + message_admins("[key_name_admin(usr)] attempting to humanize [key_name_admin(current)]") var/obj/item/weapon/dnainjector/m2h/m2h = new var/obj/item/weapon/implant/mobfinder = new(M) //hack because humanizing deletes mind --rastaf0 src = null @@ -432,7 +432,7 @@ datum/mind else if (href_list["obj_announce"]) var/obj_count = 1 - current << "\blue Your current objectives:" + current << "Your current objectives:" for(var/datum/objective/objective in objectives) current << "Objective #[obj_count]: [objective.explanation_text]" obj_count++ From e8f02b84960fa485f8f1012c3a9ac0375ac3fe33 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Fri, 29 May 2015 20:36:48 +0100 Subject: [PATCH 03/20] Minor folders. code/defines, code/FEA, code/__HELPERS, code/_onclick, code/TriDimension, code/ZAS --- code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm | 10 ++++----- code/FEA/FEA_system.dm | 4 ++-- code/TriDimension/Movement.dm | 8 +++---- code/TriDimension/Pipes.dm | 2 +- code/TriDimension/Structures.dm | 6 ++--- code/TriDimension/Turfs.dm | 4 ++-- code/ZAS/Airflow.dm | 12 +++++----- code/ZAS/Controller.dm | 4 ++-- code/ZAS/Diagnostic.dm | 4 ++-- code/ZAS/Phoron.dm | 8 +++---- code/ZAS/Variable Settings.dm | 4 ++-- code/__HELPERS/names.dm | 2 +- code/__HELPERS/text.dm | 5 +++-- code/_onclick/click.dm | 2 +- code/_onclick/hud/hud.dm | 6 ++--- code/_onclick/observer.dm | 4 ++-- code/_onclick/telekinesis.dm | 2 +- code/defines/obj/weapon.dm | 30 ++++++++++++------------- 18 files changed, 59 insertions(+), 58 deletions(-) diff --git a/code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm b/code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm index 7374963fba..7672d72fef 100644 --- a/code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm +++ b/code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm @@ -48,7 +48,7 @@ obj/item/weapon/tank adjust_mixture(temperature as num, target_toxin_pressure as num, target_oxygen_pressure as num) set src in world if(!air_contents) - usr << "\red ERROR: no gas_mixture associated with this tank" + usr << "ERROR: no gas_mixture associated with this tank" return null air_contents.temperature = temperature @@ -74,7 +74,7 @@ turf/simulated/floor else usr << "Space Borders: None" else - usr << "\blue [x],[y] has no parent air group." + usr << "[x],[y] has no parent air group." verb create_wall() @@ -329,7 +329,7 @@ obj/machinery/atmospherics set src in world set category = "Minor" - world << "\blue [x],[y]" + world << "[x],[y]" world << "network 1: [network_node1.normal_members.len], [network_node1.line_members.len]" for(var/obj/O in network_node1.normal_members) world << "member: [O.x], [O.y]" @@ -406,7 +406,7 @@ turf/simulated set src in world set category = "Minor" var/datum/gas_mixture/GM = return_air() - usr << "\blue @[x],[y] ([GM.group_multiplier]): O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(active_hotspot)?("\red BURNING"):(null)]" + usr << "@[x],[y] ([GM.group_multiplier]): O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(active_hotspot)?("BURNING"):(null)]"" for(var/datum/gas/trace_gas in GM.trace_gases) usr << "[trace_gas.type]: [trace_gas.moles]" @@ -515,7 +515,7 @@ mob fire_report() set category = "Debug" - usr << "\b \red Fire Report" + usr << "Fire Report" for(var/obj/effect/hotspot/flame in world) usr << "[flame.x],[flame.y]: [flame.temperature]K, [flame.volume] L - [flame.loc:air:temperature]" diff --git a/code/FEA/FEA_system.dm b/code/FEA/FEA_system.dm index 6a3dfe0f8b..d25da913b8 100644 --- a/code/FEA/FEA_system.dm +++ b/code/FEA/FEA_system.dm @@ -146,7 +146,7 @@ datum setup() set background = 1 - world << "\red \b Processing Geometry..." + world << "Processing Geometry..." sleep(1) var/start_time = world.timeofday @@ -156,7 +156,7 @@ datum assemble_group_turf(S) S.update_air_properties() - world << "\red \b Geometry processed in [(world.timeofday-start_time)/10] seconds!" + world << "Geometry processed in [(world.timeofday-start_time)/10] seconds!" assemble_group_turf(turf/simulated/base) diff --git a/code/TriDimension/Movement.dm b/code/TriDimension/Movement.dm index 5f451a1038..3637184d31 100644 --- a/code/TriDimension/Movement.dm +++ b/code/TriDimension/Movement.dm @@ -13,13 +13,13 @@ for(var/atom/A in T.contents) if(A.density) blocked = 1 - usr << "\red You bump into [A.name]." + usr << "You bump into \the [A]." break if(!blocked) usr.Move(T) usr << "You move upwards." else - usr << "\red There is something in your way." + usr << "There is something in your way." if (legal == 0) usr << "There is nothing of interest in this direction." return 1 @@ -40,13 +40,13 @@ for(var/atom/A in T.contents) if(A.density) blocked = 1 - usr << "\red You bump into [A.name]." + usr << "You bump into \the [A]." break if(!blocked) usr.Move(T) usr << "You move downwards." else - usr << "\red You cant move through the floor." + usr << "You cant move through the floor." if (legal == 0) usr << "There is nothing of interest in this direction." return 1 diff --git a/code/TriDimension/Pipes.dm b/code/TriDimension/Pipes.dm index c71255a34b..2958e2a4dc 100644 --- a/code/TriDimension/Pipes.dm +++ b/code/TriDimension/Pipes.dm @@ -73,7 +73,7 @@ obj/machinery/atmospherics/pipe/zpipe/check_pressure(pressure) else return 1 obj/machinery/atmospherics/pipe/zpipe/proc/burst() - src.visible_message("\red \bold [src] bursts!"); + src.visible_message("\The [src] bursts!"); playsound(src.loc, '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/TriDimension/Structures.dm b/code/TriDimension/Structures.dm index cf216274bb..99151936f5 100644 --- a/code/TriDimension/Structures.dm +++ b/code/TriDimension/Structures.dm @@ -141,7 +141,7 @@ if(blocked || istype(T, /turf/simulated/wall)) M << "Something is blocking the ladder." else - M.visible_message("\blue \The [M] climbs [src.icon_state == "ladderup" ? "up" : "down"] \the [src]!", "You climb [src.icon_state == "ladderup" ? "up" : "down"] \the [src]!", "You hear some grunting, and clanging of a metal ladder being used.") + M.visible_message("\The [M] climbs [src.icon_state == "ladderup" ? "up" : "down"] \the [src]!", "You climb [src.icon_state == "ladderup" ? "up" : "down"] \the [src]!", "You hear some grunting, and clanging of a metal ladder being used.") M.Move(target.loc) /* hatch @@ -188,7 +188,7 @@ qdel(src) if(M.z == z && get_dist(src,M) <= 1) var/list/adjacent_to_me = global_adjacent_z_levels["[z]"] - M.visible_message("\blue \The [M] scurries [target.z == adjacent_to_me["up"] ? "up" : "down"] \the [src]!", "You scramble [target.z == adjacent_to_me["up"] ? "up" : "down"] \the [src]!", "You hear some grunting, and a hatch sealing.") + M.visible_message("\The [M] scurries [target.z == adjacent_to_me["up"] ? "up" : "down"] \the [src]!", "You scramble [target.z == adjacent_to_me["up"] ? "up" : "down"] \the [src]!", "You hear some grunting, and a hatch sealing.") M.Move(target.loc) flick(top_icon_state_close,top_hatch) bottom_hatch.overlays -= green_overlay @@ -271,4 +271,4 @@ var/turf/above2 = locate(bottom.x, bottom.y, controller.up_target) if(istype(above2, /turf/space) || istype(above,/turf/simulated/floor/open)) top.target2 = above2 - return \ No newline at end of file + return diff --git a/code/TriDimension/Turfs.dm b/code/TriDimension/Turfs.dm index 43e33ed3c2..6443d6b569 100644 --- a/code/TriDimension/Turfs.dm +++ b/code/TriDimension/Turfs.dm @@ -109,7 +109,7 @@ return var/obj/item/stack/rods/R = C if (R.use(1)) - user << "\blue Constructing support lattice ..." + user << "Constructing support lattice..." playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1) ReplaceWithLattice() return @@ -126,5 +126,5 @@ S.use(1) return else - user << "\red The plating is going to need some support." + user << "The plating is going to need some support." return diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index 62a6daea16..9f6451adf9 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -80,7 +80,7 @@ obj/item/check_airflow_movable(n) return if(src:shoes && src:shoes.flags & NOSLIP) return - src << "\red You are sucked away by airflow!" + src << "You are sucked away by airflow!" var/airflow_falloff = 9 - sqrt((x - airflow_dest.x) ** 2 + (y - airflow_dest.y) ** 2) if(airflow_falloff < 1) airflow_dest = null @@ -144,7 +144,7 @@ obj/item/check_airflow_movable(n) if(istype(src:shoes, /obj/item/clothing/shoes/magboots)) if(src:shoes.flags & NOSLIP) return - src << "\red You are pushed away by airflow!" + src << "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) if(airflow_falloff < 1) @@ -197,7 +197,7 @@ atom/movable/proc/airflow_hit(atom/A) mob/airflow_hit(atom/A) for(var/mob/M in hearers(src)) - M.show_message("\red \The [src] slams into \a [A]!",1,"\red You hear a loud slam!",2) + M.show_message("\The [src] slams into \a [A]!",1,"You hear a loud slam!",2) playsound(src.loc, "smash.ogg", 25, 1, -1) var/weak_amt = istype(A,/obj/item) ? A:w_class : rand(1,5) //Heheheh Weaken(weak_amt) @@ -205,7 +205,7 @@ mob/airflow_hit(atom/A) obj/airflow_hit(atom/A) for(var/mob/M in hearers(src)) - M.show_message("\red \The [src] slams into \a [A]!",1,"\red You hear a loud slam!",2) + M.show_message("\The [src] slams into \a [A]!",1,"You hear a loud slam!",2) playsound(src.loc, "smash.ogg", 25, 1, -1) . = ..() @@ -215,7 +215,7 @@ obj/item/airflow_hit(atom/A) mob/living/carbon/human/airflow_hit(atom/A) // for(var/mob/M in hearers(src)) -// M.show_message("\red [src] slams into [A]!",1,"\red You hear a loud slam!",2) +// M.show_message("[src] slams into [A]!",1,"You hear a loud slam!",2) playsound(src.loc, "punch", 25, 1, -1) if (prob(33)) loc:add_blood(src) @@ -244,4 +244,4 @@ zone/proc/movables() for(var/atom/A in T) if(istype(A, /obj/effect) || istype(A, /mob/aiEye)) continue - . += A \ No newline at end of file + . += A diff --git a/code/ZAS/Controller.dm b/code/ZAS/Controller.dm index 83d2a54ec3..506657df12 100644 --- a/code/ZAS/Controller.dm +++ b/code/ZAS/Controller.dm @@ -187,7 +187,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun #ifdef ZASDBG if(updated != updating.len) tick_progress = "[updating.len - updated] tiles left unupdated." - world << "\red [tick_progress]" + world << "[tick_progress]" . = 0 #endif @@ -371,4 +371,4 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun /datum/controller/air_system/proc/remove_edge(connection_edge/E) edges.Remove(E) - if(!E.sleeping) active_edges.Remove(E) \ No newline at end of file + if(!E.sleeping) active_edges.Remove(E) diff --git a/code/ZAS/Diagnostic.dm b/code/ZAS/Diagnostic.dm index 1d4cc1a388..f54caa3a42 100644 --- a/code/ZAS/Diagnostic.dm +++ b/code/ZAS/Diagnostic.dm @@ -148,7 +148,7 @@ client/proc/Test_ZAS_Connection(var/turf/simulated/T as turf) for(var/zone/Z in air_master.zones) if(Z.air == air && Z != src) var/turf/zloc = pick(Z.contents) - client << "\red Illegal air datum shared by: [zloc.loc.name]"*/ + client << "Illegal air datum shared by: [zloc.loc.name]"*/ /*client/proc/TestZASRebuild() @@ -234,4 +234,4 @@ client/proc/Test_ZAS_Connection(var/turf/simulated/T as turf) client/proc/ZASSettings() set category = "Debug" - vsc.SetDefault(mob) \ No newline at end of file + vsc.SetDefault(mob) diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm index 391f5b719a..0e74052c2a 100644 --- a/code/ZAS/Phoron.dm +++ b/code/ZAS/Phoron.dm @@ -88,7 +88,7 @@ obj/var/contaminated = 0 if(vsc.plc.SKIN_BURNS) if(!pl_head_protected() || !pl_suit_protected()) burn_skin(0.75) - if(prob(20)) src << "\red Your skin burns!" + if(prob(20)) src << "Your skin burns!" updatehealth() //Burn eyes if exposed. @@ -111,7 +111,7 @@ obj/var/contaminated = 0 if(vsc.plc.GENETIC_CORRUPTION) if(rand(1,10000) < vsc.plc.GENETIC_CORRUPTION) randmutb(src) - src << "\red High levels of toxins cause you to spontaneously mutate." + src << "High levels of toxins cause you to spontaneously mutate!" domutcheck(src,null) @@ -122,11 +122,11 @@ obj/var/contaminated = 0 var/obj/item/organ/eyes/E = internal_organs_by_name["eyes"] if(E) - if(prob(20)) src << "\red Your eyes burn!" + if(prob(20)) src << "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) - src << "\red You are blinded!" + src << "You are blinded!" eye_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 c152159b7a..674be3fc5e 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") - world << "\blue [key_name(user)] changed the setting [display_description] to [newvar]." + world << "[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) - world << "\blue [key_name(user)] changed the global phoron/ZAS settings to \"[def]\"" + world << "[key_name(user)] changed the global phoron/ZAS settings to \"[def]\"" /pl_control/var/list/settings = list() diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index e43ca1dc2a..83383ea56a 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -233,7 +233,7 @@ var/syndicate_code_response//Code response for traitors. set name = "Generate Code Phrase" set category = "Debug" - world << "\red Code Phrase is: \black [generate_code_phrase()]" + world << "Code Phrase is: [generate_code_phrase()]" return diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index ae38249956..0051a1a9de 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -34,7 +34,8 @@ input = replace_characters(input, list("\n"=" ","\t"=" ")) if(encode) - //In addition to processing html, html_encode removes byond formatting codes like "\red", "\i" and other. + // The below \ escapes have a space inserted to attempt to enable Travis auto-checking of span class usage. Please do not remove the space. + //In addition to processing html, html_encode removes byond formatting codes like "\ red", "\ i" and other. //It is important to avoid double-encode text, it can "break" quotes and some other characters. //Also, keep in mind that escaped characters don't work in the interface (window titles, lower left corner of the main window, etc.) input = html_encode(input) @@ -312,4 +313,4 @@ proc/TextPreview(var/string,var/len=40) /proc/create_text_tag(var/tagname, var/tagdesc = tagname, var/client/C = null) if(C && (C.prefs.toggles & CHAT_NOICONS)) return tagdesc - return "[tagdesc]" \ No newline at end of file + return "[tagdesc]" diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 7307927ac0..5a56b34e61 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -329,7 +329,7 @@ nutrition = max(nutrition - rand(1,5),0) handle_regular_hud_updates() else - src << "\red You're out of energy! You need food!" + src << "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/hud/hud.dm b/code/_onclick/hud/hud.dm index f39499f3dc..7193a786a5 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -261,11 +261,11 @@ datum/hud/New(mob/owner) set hidden = 1 if(!hud_used) - usr << "\red This mob type does not use a HUD." + usr << "This mob type does not use a HUD." return if(!ishuman(src)) - usr << "\red Inventory hiding is currently only supported for human mobs, sorry." + usr << "Inventory hiding is currently only supported for human mobs, sorry." return if(!client) return @@ -356,4 +356,4 @@ datum/hud/New(mob/owner) hud_used.hidden_inventory_update() hud_used.persistant_inventory_update() - update_action_buttons() \ No newline at end of file + update_action_buttons() diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index 168ae47c86..abc0e6114e 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) - src << "\blue You will now examine everything you click on." + src << "You will now examine everything you click on." else - src << "\blue You will no longer examine things you click on." + src << "You will no longer examine things you click on." /mob/dead/observer/DblClickOn(var/atom/A, var/params) if(client.buildmode) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index ae57895cd6..0ba005455c 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -120,7 +120,7 @@ var/const/tk_maxrange = 15 if(8 to tk_maxrange) user.next_move += 10 else - user << "\blue Your mind won't reach that far." + user << "Your mind won't reach that far." return if(!focus) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 0b4f91fb9c..ccfdf1519f 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -227,9 +227,9 @@ throwforce = 5 w_class = 2.0 throw_speed = 4 - throw_range = 20 + throw_range = 20 matter = list(DEFAULT_WALL_MATERIAL = 100) - origin_tech = list(TECH_MAGNET = 1) + origin_tech = list(TECH_MAGNET = 1) /obj/item/weapon/staff name = "wizards staff" @@ -282,7 +282,7 @@ attack_verb = list("whipped", "lashed", "disciplined", "tickled") suicide_act(mob/user) - viewers(user) << "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." + viewers(user) << "[user] is strangling \himself with \the [src]! It looks like \he's trying to commit suicide." return (OXYLOSS) /obj/item/weapon/module @@ -342,7 +342,7 @@ if (C.bugged && C.status) cameras.Add(C) if (length(cameras) == 0) - usr << "\red No bugged functioning cameras found." + usr << "No bugged functioning cameras found." return var/list/friendly_cameras = new/list() @@ -425,35 +425,35 @@ desc = "A basic capacitor used in the construction of a variety of devices." icon_state = "capacitor" origin_tech = list(TECH_POWER = 1) - matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 50) + matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 50) /obj/item/weapon/stock_parts/scanning_module name = "scanning module" desc = "A compact, high resolution scanning module used in the construction of certain devices." icon_state = "scan_module" origin_tech = list(TECH_MAGNET = 1) - matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20) + matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20) /obj/item/weapon/stock_parts/manipulator name = "micro-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "micro_mani" origin_tech = list(TECH_MATERIAL = 1, TECH_DATA = 1) - matter = list(DEFAULT_WALL_MATERIAL = 30) + matter = list(DEFAULT_WALL_MATERIAL = 30) /obj/item/weapon/stock_parts/micro_laser name = "micro-laser" desc = "A tiny laser used in certain devices." icon_state = "micro_laser" origin_tech = list(TECH_MAGNET = 1) - matter = list(DEFAULT_WALL_MATERIAL = 10,"glass" = 20) + matter = list(DEFAULT_WALL_MATERIAL = 10,"glass" = 20) /obj/item/weapon/stock_parts/matter_bin name = "matter bin" desc = "A container for hold compressed matter awaiting re-construction." icon_state = "matter_bin" origin_tech = list(TECH_MATERIAL = 1) - matter = list(DEFAULT_WALL_MATERIAL = 80) + matter = list(DEFAULT_WALL_MATERIAL = 80) //Rank 2 @@ -543,35 +543,35 @@ icon_state = "subspace_ansible" desc = "A compact module capable of sensing extradimensional activity." origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 5 ,TECH_MATERIAL = 4, TECH_BLUESPACE = 2) - matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) + matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) /obj/item/weapon/stock_parts/subspace/filter name = "hyperwave filter" icon_state = "hyperwave_filter" desc = "A tiny device capable of filtering and converting super-intense radiowaves." origin_tech = list(TECH_DATA = 4, TECH_MAGNET = 2) - matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) + matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) /obj/item/weapon/stock_parts/subspace/amplifier name = "subspace amplifier" icon_state = "subspace_amplifier" desc = "A compact micro-machine capable of amplifying weak subspace transmissions." origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) - matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) + matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) /obj/item/weapon/stock_parts/subspace/treatment name = "subspace treatment disk" icon_state = "treatment_disk" desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves." origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 2, TECH_MATERIAL = 5, TECH_BLUESPACE = 2) - matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) + matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) /obj/item/weapon/stock_parts/subspace/analyzer name = "subspace wavelength analyzer" icon_state = "wavelength_analyzer" desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." origin_tech = list(TECH_DATA = 3, TECH_MAGNETS = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) - matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) + matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10) /obj/item/weapon/stock_parts/subspace/crystal name = "ansible crystal" @@ -585,7 +585,7 @@ icon_state = "subspace_transmitter" desc = "A large piece of equipment used to open a window into the subspace dimension." origin_tech = list(TECH_MAGNET = 5, TECH_MATERIAL = 5, TECH_BLUESPACE = 3) - matter = list(DEFAULT_WALL_MATERIAL = 50) + matter = list(DEFAULT_WALL_MATERIAL = 50) /obj/item/weapon/ectoplasm name = "ectoplasm" From de4f085057d64d380ef503eb4a8a15b6f07e1a1e Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Fri, 29 May 2015 21:51:27 +0100 Subject: [PATCH 04/20] code/game, excluding code/game/machinery and code/game/objects --- code/game/antagonist/mutiny/mutineer.dm | 4 +- code/game/antagonist/station/highlander.dm | 4 +- code/game/antagonist/station/rogue_ai.dm | 4 +- code/game/dna/dna_misc.dm | 50 ++--- code/game/dna/dna_modifier.dm | 14 +- code/game/dna/genes/disabilities.dm | 4 +- code/game/dna/genes/gene.dm | 4 +- code/game/dna/genes/powers.dm | 2 +- code/game/gamemodes/blob/blob_finish.dm | 2 +- code/game/gamemodes/cult/cult_items.dm | 6 +- code/game/gamemodes/cult/ritual.dm | 20 +- code/game/gamemodes/cult/runes.dm | 204 +++++++++--------- code/game/gamemodes/cult/talisman.dm | 5 +- code/game/gamemodes/epidemic/epidemic.dm | 16 +- code/game/gamemodes/events.dm | 30 +-- .../gamemodes/events/holidays/Holidays.dm | 4 +- code/game/gamemodes/game_mode.dm | 4 +- code/game/gamemodes/gameticker.dm | 10 +- .../gamemodes/malfunction/Malf_Modules.dm | 6 +- code/game/gamemodes/meme/meme.dm | 2 +- code/game/gamemodes/nuclear/pinpointer.dm | 10 +- code/game/jobs/job_controller.dm | 14 +- code/game/mecha/combat/combat.dm | 4 +- code/game/mecha/equipment/tools/tools.dm | 14 +- code/game/mecha/mech_fabricator.dm | 2 +- code/game/mecha/mecha.dm | 72 +++---- code/game/mecha/mecha_wreckage.dm | 4 +- code/game/mecha/working/hoverpod.dm | 4 +- code/game/mecha/working/working.dm | 4 +- code/game/response_team.dm | 16 +- code/game/turfs/simulated.dm | 2 +- code/game/turfs/simulated/floor.dm | 30 +-- code/game/turfs/simulated/floor_types.dm | 4 +- code/game/turfs/space/space.dm | 8 +- code/game/turfs/turf.dm | 4 +- code/game/verbs/ooc.dm | 8 +- code/game/verbs/suicide.dm | 16 +- 37 files changed, 307 insertions(+), 304 deletions(-) diff --git a/code/game/antagonist/mutiny/mutineer.dm b/code/game/antagonist/mutiny/mutineer.dm index f35655ab1c..c0d764b3be 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) - world << "\red Mutiny mode aborted: no valid candidates for Directive X." + world << "Mutiny mode aborted: no valid candidates for Directive X." return 0 head_loyalist = pick(loyalist_candidates) @@ -63,4 +63,4 @@ var/datum/antagonist/mutineer/mutineers return 1 -*/ \ No newline at end of file +*/ diff --git a/code/game/antagonist/station/highlander.dm b/code/game/antagonist/station/highlander.dm index 3ee73f4a95..44e2e1fcfe 100644 --- a/code/game/antagonist/station/highlander.dm +++ b/code/game/antagonist/station/highlander.dm @@ -61,5 +61,5 @@ var/datum/antagonist/highlander/highlanders if(is_special_character(H)) continue highlanders.add_antagonist(H.mind) - message_admins("\blue [key_name_admin(usr)] used THERE CAN BE ONLY ONE!", 1) - log_admin("[key_name(usr)] used there can be only one.") \ No newline at end of file + message_admins("[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 3d9026ff88..e58b29a602 100644 --- a/code/game/antagonist/station/rogue_ai.dm +++ b/code/game/antagonist/station/rogue_ai.dm @@ -217,9 +217,9 @@ var/datum/antagonist/rogue_ai/malf current:show_laws() current.icon_state = "ai" - current << "\red You have been patched! You are no longer malfunctioning!" + current << "You have been patched! You are no longer malfunctioning!" log_admin("[key_name_admin(usr)] has de-malf'ed [current].") if("malf") log_admin("[key_name_admin(usr)] has malf'ed [current].") -*/ \ No newline at end of file +*/ diff --git a/code/game/dna/dna_misc.dm b/code/game/dna/dna_misc.dm index cdc737c007..3862bd474f 100644 --- a/code/game/dna/dna_misc.dm +++ b/code/game/dna/dna_misc.dm @@ -290,60 +290,60 @@ if(ismuton(NOBREATHBLOCK,M)) if(probinj(45,inj) || (mNobreath in old_mutations)) - M << "\blue You feel no need to breathe." + M << "You feel no need to breathe." M.mutations.Add(mNobreath) if(ismuton(REMOTEVIEWBLOCK,M)) if(probinj(45,inj) || (mRemote in old_mutations)) - M << "\blue Your mind expands" + M << "Your mind expands." M.mutations.Add(mRemote) if(ismuton(REGENERATEBLOCK,M)) if(probinj(45,inj) || (mRegen in old_mutations)) - M << "\blue You feel strange" + M << "You feel strange." M.mutations.Add(mRegen) if(ismuton(INCREASERUNBLOCK,M)) if(probinj(45,inj) || (mRun in old_mutations)) - M << "\blue You feel quick" + M << "You feel quick." M.mutations.Add(mRun) if(ismuton(REMOTETALKBLOCK,M)) if(probinj(45,inj) || (mRemotetalk in old_mutations)) - M << "\blue You expand your mind outwards" + M << "You expand your mind outwards." M.mutations.Add(mRemotetalk) if(ismuton(MORPHBLOCK,M)) if(probinj(45,inj) || (mMorph in old_mutations)) M.mutations.Add(mMorph) - M << "\blue Your skin feels strange" + M << "Your skin feels strange." if(ismuton(BLENDBLOCK,M)) if(probinj(45,inj) || (mBlend in old_mutations)) M.mutations.Add(mBlend) - M << "\blue You feel alone" + M << "You feel alone." if(ismuton(HALLUCINATIONBLOCK,M)) if(probinj(45,inj) || (mHallucination in old_mutations)) M.mutations.Add(mHallucination) - M << "\blue Your mind says 'Hello'" + M << "Your mind says 'Hello'." if(ismuton(NOPRINTSBLOCK,M)) if(probinj(45,inj) || (mFingerprints in old_mutations)) M.mutations.Add(mFingerprints) - M << "\blue Your fingers feel numb" + M << "Your fingers feel numb." if(ismuton(SHOCKIMMUNITYBLOCK,M)) if(probinj(45,inj) || (mShock in old_mutations)) M.mutations.Add(mShock) - M << "\blue You feel strange" + M << "You feel strange." if(ismuton(SMALLSIZEBLOCK,M)) if(probinj(45,inj) || (mSmallsize in old_mutations)) - M << "\blue Your skin feels rubbery" + M << "Your skin feels rubbery." M.mutations.Add(mSmallsize) if (isblockon(getblock(M.dna.struc_enzymes, HULKBLOCK,3),HULKBLOCK)) if(probinj(5,inj) || (HULK in old_mutations)) - M << "\blue Your muscles hurt." + M << "Your muscles hurt." M.mutations.Add(HULK) if (isblockon(getblock(M.dna.struc_enzymes, HEADACHEBLOCK,3),HEADACHEBLOCK)) M.disabilities |= EPILEPSY - M << "\red You get a headache." + M << "You get a headache." if (isblockon(getblock(M.dna.struc_enzymes, FAKEBLOCK,3),FAKEBLOCK)) - M << "\red You feel strange." + M << "You feel strange." if (prob(95)) if(prob(50)) randmutb(M) @@ -353,41 +353,41 @@ randmutg(M) if (isblockon(getblock(M.dna.struc_enzymes, COUGHBLOCK,3),COUGHBLOCK)) M.disabilities |= COUGHING - M << "\red You start coughing." + M << "You start coughing." if (isblockon(getblock(M.dna.struc_enzymes, CLUMSYBLOCK,3),CLUMSYBLOCK)) - M << "\red You feel lightheaded." + M << "You feel lightheaded." M.mutations.Add(CLUMSY) if (isblockon(getblock(M.dna.struc_enzymes, TWITCHBLOCK,3),TWITCHBLOCK)) M.disabilities |= TOURETTES - M << "\red You twitch." + M << "You twitch." if (isblockon(getblock(M.dna.struc_enzymes, XRAYBLOCK,3),XRAYBLOCK)) if(probinj(30,inj) || (XRAY in old_mutations)) - M << "\blue The walls suddenly disappear." + M << "The walls suddenly disappear." // M.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) // M.see_in_dark = 8 // M.see_invisible = 2 M.mutations.Add(XRAY) if (isblockon(getblock(M.dna.struc_enzymes, NERVOUSBLOCK,3),NERVOUSBLOCK)) M.disabilities |= NERVOUS - M << "\red You feel nervous." + M << "You feel nervous." if (isblockon(getblock(M.dna.struc_enzymes, FIREBLOCK,3),FIREBLOCK)) if(probinj(30,inj) || (COLD_RESISTANCE in old_mutations)) - M << "\blue Your body feels warm." + M << "Your body feels warm." M.mutations.Add(COLD_RESISTANCE) if (isblockon(getblock(M.dna.struc_enzymes, BLINDBLOCK,3),BLINDBLOCK)) M.sdisabilities |= BLIND - M << "\red You can't seem to see anything." + M << "You can't seem to see anything." if (isblockon(getblock(M.dna.struc_enzymes, TELEBLOCK,3),TELEBLOCK)) if(probinj(15,inj) || (TK in old_mutations)) - M << "\blue You feel smarter." + M << "You feel smarter." M.mutations.Add(TK) if (isblockon(getblock(M.dna.struc_enzymes, DEAFBLOCK,3),DEAFBLOCK)) M.sdisabilities |= DEAF M.ear_deaf = 1 - M << "\red Its kinda quiet.." + M << "It's kinda quiet.." if (isblockon(getblock(M.dna.struc_enzymes, GLASSESBLOCK,3),GLASSESBLOCK)) M.disabilities |= NEARSIGHTED - M << "Your eyes feel weird..." + M << "Your eyes feel weird..." /* If you want the new mutations to work, UNCOMMENT THIS. if(istype(M, /mob/living/carbon)) @@ -559,4 +559,4 @@ if(M) M.update_icon = 1 //queue a full icon update at next life() call return null -/////////////////////////// DNA MISC-PROCS \ No newline at end of file +/////////////////////////// DNA MISC-PROCS diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index deb4426cf5..120ee88046 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -103,13 +103,13 @@ if (usr.stat != 0) return if (!ishuman(usr) && !issmall(usr)) //Make sure they're a mob that has dna - usr << "\blue Try as you might, you can not climb up into the scanner." + usr << "Try as you might, you can not climb up into the scanner." return if (src.occupant) - usr << "\blue The scanner is already occupied!" + usr << "The scanner is already occupied!" return if (usr.abiotic()) - usr << "\blue Subject cannot have abiotic items on." + usr << "The subject cannot have abiotic items on." return usr.stop_pulling() usr.client.perspective = EYE_PERSPECTIVE @@ -123,13 +123,13 @@ /obj/machinery/dna_scannernew/attackby(var/obj/item/weapon/item as obj, var/mob/user as mob) if(istype(item, /obj/item/weapon/reagent_containers/glass)) if(beaker) - user << "\red A beaker is already loaded into the machine." + user << "A beaker is already loaded into the machine." return beaker = item user.drop_item() item.loc = src - user.visible_message("[user] adds \a [item] to \the [src]!", "You add \a [item] to \the [src]!") + user.visible_message("\The [user] adds \a [item] to \the [src]!", "You add \a [item] to \the [src]!") return else if (!istype(item, /obj/item/weapon/grab)) return @@ -137,10 +137,10 @@ if (!ismob(G.affecting)) return if (src.occupant) - user << "\blue The scanner is already occupied!" + user << "The scanner is already occupied!" return if (G.affecting.abiotic()) - user << "\blue Subject cannot have abiotic items on." + user << "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 4f78d7f70f..72a571abf8 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) - M << "\red [activation_message]" + M << "[activation_message]" else testing("[name] has no activation message.") @@ -47,7 +47,7 @@ if(sdisability) M.sdisabilities &= (~sdisability) if(deactivation_message) - M << "\red [deactivation_message]" + M << "[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 21eec348bd..3e18696f6b 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) - M << "\blue [msg]" + M << "[msg]" /datum/dna/gene/basic/deactivate(var/mob/M) M.mutations.Remove(mutation) if(deactivation_messages.len) var/msg = pick(deactivation_messages) - M << "\red [msg]" \ No newline at end of file + M << "[msg]" diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm index 3381894f8a..e6c6b6f4ec 100644 --- a/code/game/dna/genes/powers.dm +++ b/code/game/dna/genes/powers.dm @@ -171,7 +171,7 @@ if(M.health <= 25) M.mutations.Remove(HULK) M.update_mutations() //update our mutation overlays - M << "\red You suddenly feel very weak." + M << "You suddenly feel very weak." M.Weaken(3) M.emote("collapse") diff --git a/code/game/gamemodes/blob/blob_finish.dm b/code/game/gamemodes/blob/blob_finish.dm index 4afdf6d147..418ceab13a 100644 --- a/code/game/gamemodes/blob/blob_finish.dm +++ b/code/game/gamemodes/blob/blob_finish.dm @@ -42,7 +42,7 @@ var/percent = round( 100.0 * start_state.score(end_state), 0.1) world << "The station is [percent]% intact." log_game("Blob mode was won with station [percent]% intact.") - world << "\blue Rebooting in 30s" + world << "Rebooting in 30s" ..() return 1 diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index a17c030b11..4ae8268402 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -1,5 +1,5 @@ /obj/item/weapon/melee/cultblade - name = "Cult Blade" + name = "cult blade" desc = "An arcane weapon wielded by the followers of Nar-Sie" icon_state = "cultblade" item_state = "cultblade" @@ -17,7 +17,7 @@ return ..() else user.Paralyse(5) - user << "\red An unexplicable force powerfully repels the sword from [target]!" + user << "An unexplicable force powerfully repels the sword from [target]!" var/organ = ((user.hand ? "l_":"r_") + "arm") var/obj/item/organ/external/affecting = user.get_organ(organ) if(affecting.take_damage(rand(force/2, force))) //random amount of damage between half of the blade's force and the full force of the blade. @@ -26,7 +26,7 @@ /obj/item/weapon/melee/cultblade/pickup(mob/living/user as mob) if(!iscultist(user)) - user << "\red 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 << "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) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 8a55a81165..dc09e0edb9 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/weapon/nullrod)) - user << "\blue You disrupt the vile magic with the deadening field of the null rod!" + user << "You disrupt the vile magic with the deadening field of the null rod!" qdel(src) return return @@ -171,7 +171,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("\red The markings pulse with a small burst of light, then fall dark.", 3, "\red You hear a faint fizzle.", 2) + V.show_message("The markings pulse with a small burst of light, then fall dark.", 3, "You hear a faint fizzle.", 2) return check_icon() @@ -355,8 +355,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(text("\red [] beats [] with the arcane tome!", user, M), 1) - M << "\red You feel searing heat inside!" + O.show_message("\The [user] beats \the [M] with \the [src]!", 1) + M << "You feel searing heat inside!" attack_self(mob/living/user as mob) @@ -371,7 +371,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," for(var/obj/effect/rune/N in world) C++ if (!istype(user.loc,/turf)) - user << "\red You do not have enough space to write a proper rune." + user << "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 @@ -455,7 +455,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," if (!chosen_rune) return if (chosen_rune == "none") - user << "\red You decide against scribing a rune, perhaps you should take this time to study your notes." + user << "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 @@ -466,8 +466,8 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," return for (var/mob/V in viewers(src)) - V.show_message("\red [user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "\red You hear chanting.", 2) - user << "\red 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("\The [user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "You hear chanting.", 2) + 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." 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) @@ -476,7 +476,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) - user << "\red You finish drawing the arcane markings of the Geometer." + user << "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]] @@ -524,7 +524,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," if(user) var/r if (!istype(user.loc,/turf)) - user << "\red You do not have enough space to write a proper rune." + user << "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("Choose a rune to scribe", "Rune Scribing") in runes //not cancellable. 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 8ead4b96ba..ff5b7ff880 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -21,7 +21,7 @@ var/list/sacrificed = list() allrunesloc.len = index allrunesloc[index] = R.loc if(index >= 5) - user << "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric" + user << "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) @@ -30,9 +30,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("\red [user] disappears in a flash of red light!", \ - "\red You feel as your body gets dragged through the dimension of Nar-Sie!", \ - "\red You hear a sickening crunch and sloshing of viscera.") + user.visible_message("\The [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.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) - user << "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric" + user << "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("\red You feel air moving from the rune - like as it was swapped with somewhere else.", \ - "\red You feel air moving from the rune - like as it was swapped with somewhere else.", \ - "\red You smell ozone.") + 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.") 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("\red Rune disappears with a flash of red light, and in its place now a book lies.", \ - "\red 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.", \ - "\red You hear a pop and smell ozone.") + 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.") if(istype(src,/obj/effect/rune)) new /obj/item/weapon/book/tome(src.loc) else @@ -157,7 +157,7 @@ var/list/sacrificed = list() if (target.species && (target.species.flags & NO_PAIN)) target.visible_message("The markings below [target] glow a bloody red.") else - target.visible_message("[target] writhes in pain as the markings below \him glow a bloody red.", "AAAAAAHHHH!", "You hear an anguished scream.") + target.visible_message("\The [target] writhes in pain as the markings below \him glow a bloody red.", "AAAAAAHHHH!", "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 @@ -223,22 +223,22 @@ var/list/sacrificed = list() if(D.stat!=2) admin_attack_log(usr, D, "Used a blood drain rune.", "Was victim of a blood drain rune.", "used a blood drain rune on") var/bdrain = rand(1,25) - D << "\red You feel weakened." + D << "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("\red Blood flows from the rune into [usr]!", \ - "\red The blood starts flowing from the rune and into your frail mortal body. You feel... empowered.", \ - "\red You hear a liquid flowing.") + 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.") var/mob/living/user = usr if(user.bhunger) user.bhunger = max(user.bhunger-2*drain,0) if(drain>=50) - user.visible_message("\red [user]'s eyes give off eerie red glow!", \ - "\red ...but it wasn't nearly enough. You crave, crave for more. The hunger consumes you from within.", \ - "\red You hear a heartbeat.") + user.visible_message("\The [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.bhunger += drain src = user spawn() @@ -264,16 +264,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.") - usr << "\red The world beyond fades from your vision." + usr << "The world beyond fades from your vision." usr.see_invisible = SEE_INVISIBLE_LIVING usr.seer = 0 else if(usr.see_invisible!=SEE_INVISIBLE_LIVING) - usr << "\red The world beyond flashes your eyes but disappears quickly, as if something is disrupting your vision." + usr << "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!") - usr << "\red The world beyond opens to your eyes." + usr << "The world beyond opens to your eyes." usr.see_invisible = SEE_INVISIBLE_CULT usr.seer = 1 return @@ -297,7 +297,7 @@ var/list/sacrificed = list() break if(!corpse_to_raise) if(is_sacrifice_target) - usr << "\red The Geometer of blood wants this mortal for himself." + usr << "The Geometer of blood wants this mortal for himself." return fizzle() @@ -315,9 +315,9 @@ var/list/sacrificed = list() if(!body_to_sacrifice) if (is_sacrifice_target) - usr << "\red The Geometer of Blood wants that corpse for himself." + usr << "The Geometer of Blood wants that corpse for himself." else - usr << "\red The sacrifical corpse is not dead. You must free it from this world of illusions before it may be used." + usr << "The sacrifical corpse is not dead. You must free it from this world of illusions before it may be used." return fizzle() var/mob/dead/observer/ghost @@ -328,7 +328,7 @@ var/list/sacrificed = list() break if(!ghost) - usr << "\red You require a restless spirit which clings to this world. Beckon their prescence with the sacred chants of Nar-Sie." + usr << "You require a restless spirit which clings to this world. Beckon their prescence with the sacred chants of Nar-Sie." return fizzle() corpse_to_raise.revive() @@ -336,12 +336,12 @@ var/list/sacrificed = list() corpse_to_raise.key = ghost.key //the corpse will keep its old mind! but a new player takes ownership of it (they are essentially possessed) //This means, should that player leave the body, the original may re-enter usr.say("Pasnar val'keriam usinar. Savrae ines amutan. Yam'toth remium il'tarat!") - corpse_to_raise.visible_message("\red [corpse_to_raise]'s eyes glow with a faint red as he stands up, slowly starting to breathe again.", \ - "\red Life... I'm alive again...", \ - "\red You hear a faint, slightly familiar whisper.") - body_to_sacrifice.visible_message("\red [body_to_sacrifice] is torn apart, a black smoke swiftly dissipating from his remains!", \ - "\red You feel as your blood boils, tearing you apart.", \ - "\red You hear a thousand voices, all crying in pain.") + corpse_to_raise.visible_message("\The [corpse_to_raise]'s eyes glow with a faint red as he stands up, slowly starting to breathe again.", \ + "Life... I'm alive again...", \ + "You hear a faint, slightly familiar whisper.") + body_to_sacrifice.visible_message("\The [body_to_sacrifice] is torn apart, a black smoke swiftly dissipating from his remains!", \ + "You feel as your blood boils, tearing you apart.", \ + "You hear a thousand voices, all crying in pain.") body_to_sacrifice.gib() // if(ticker.mode.name == "cult") @@ -369,14 +369,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("\red The rune turns into gray dust, veiling the surrounding runes.", 3) + V.show_message("The rune turns into gray dust, veiling the surrounding runes.", 3) qdel(src) else usr.whisper("Kla[pick("'","`")]atu barada nikt'o!") - usr << "\red Your talisman turns into gray dust, veiling the surrounding runes." + usr << "Your talisman turns into gray dust, veiling the surrounding runes." for (var/mob/V in orange(1,src)) if(V!=usr) - V.show_message("\red Dust emanates from [usr]'s hands for a moment.", 3) + V.show_message("Dust emanates from [usr]'s hands for a moment.", 3) return if(istype(src,/obj/effect/rune)) @@ -391,9 +391,9 @@ var/list/sacrificed = list() if(usr.loc==src.loc) var/mob/living/carbon/human/L = usr usr.say("Fwe[pick("'","`")]sh mah erl nyag r'ya!") - usr.visible_message("\red [usr]'s eyes glow blue as \he freezes in place, absolutely motionless.", \ - "\red 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...", \ - "\red You hear only complete silence for a moment.") + usr.visible_message("\The [usr]'s eyes glow blue as \he freezes 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.") 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) @@ -429,9 +429,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("\red A shape forms in the center of the rune. A shape of... a man.", \ - "\red A shape forms in the center of the rune. A shape of... a man.", \ - "\red You hear liquid flowing.") + 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.") D.real_name = "Unknown" var/chose_name = 0 for(var/obj/item/weapon/paper/P in this_rune.loc) @@ -461,9 +461,9 @@ var/list/sacrificed = list() user.take_organ_damage(1, 0) sleep(30) if(D) - D.visible_message("\red [D] slowly dissipates into dust and bones.", \ - "\red You feel pain, as bonds formed between your soul and this homunculus break.", \ - "\red You hear faint rustle.") + D.visible_message("\The [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.dust() return @@ -484,7 +484,7 @@ var/list/sacrificed = list() unsuitable_newtalisman = 1 if (!newtalisman) if (unsuitable_newtalisman) - usr << "\red The blank is tainted. It is unsuitable." + usr << "The blank is tainted. It is unsuitable." return fizzle() var/obj/effect/rune/imbued_from @@ -545,7 +545,7 @@ var/list/sacrificed = list() break if (imbued_from) for (var/mob/V in viewers(src)) - V.show_message("\red The runes turn into dust, which then forms into an arcane image on the paper.", 3) + V.show_message("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) @@ -560,9 +560,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("\red [user] keels over dead, his blood glowing blue as it escapes his body and dissipates into thin air.", \ - "\red In the last moment of your humble life, you feel an immense pain as fabric of reality mends... with your blood.", \ - "\red You hear faint rustle.") + user.visible_message("\The [user] keels over dead, his blood glowing blue as it escapes 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.") for(,user.stat==2) sleep(600) if (!user) @@ -594,7 +594,7 @@ var/list/sacrificed = list() input = sanitize(input) for(var/datum/mind/H in cult.current_antagonists) if (H.current) - H.current << "\red \b [input]" + H.current << "[input]" qdel(src) return 1 @@ -638,44 +638,44 @@ var/list/sacrificed = list() H.dust()//To prevent the MMI from remaining else H.gib() - usr << "\red The Geometer of Blood accepts this sacrifice, your objective is now complete." + usr << "The Geometer of Blood accepts this sacrifice, your objective is now complete." else - usr << "\red Your target's earthly bonds are too strong. You need more cultists to succeed in this ritual." + usr << "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) - usr << "\red The Geometer of Blood accepts this [worth ? "exotic " : ""]sacrifice." + usr << "The Geometer of Blood accepts this [worth ? "exotic " : ""]sacrifice." cult.grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, this soul was not enough to gain His favor." + usr << "The Geometer of blood accepts this sacrifice." + usr << "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) - usr << "\red The Geometer of blood accepts this [worth ? "exotic " : ""]sacrifice." + usr << "The Geometer of blood accepts this [worth ? "exotic " : ""]sacrifice." cult.grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, a mere dead body is not enough to satisfy Him." + usr << "The Geometer of blood accepts this sacrifice." + usr << "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) - usr << "\red The victim is still alive, you will need more cultists chanting for the sacrifice to succeed." + usr << "The victim is still alive, you will need more cultists chanting for the sacrifice to succeed." else if(prob(40)) - usr << "\red The Geometer of blood accepts this sacrifice." + usr << "The Geometer of blood accepts this sacrifice." cult.grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, a mere dead body is not enough to satisfy Him." + usr << "The Geometer of blood accepts this sacrifice." + usr << "However, a mere dead body is not enough to satisfy Him." if(isrobot(H)) H.dust()//To prevent the MMI from remaining else @@ -684,36 +684,36 @@ var/list/sacrificed = list() if(cultsinrange.len >= 3) if(H.stat !=2) if(prob(80)) - usr << "\red The Geometer of Blood accepts this sacrifice." + usr << "The Geometer of Blood accepts this sacrifice." cult.grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, this soul was not enough to gain His favor." + usr << "The Geometer of blood accepts this sacrifice." + usr << "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)) - usr << "\red The Geometer of blood accepts this sacrifice." + usr << "The Geometer of blood accepts this sacrifice." cult.grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, a mere dead body is not enough to satisfy Him." + usr << "The Geometer of blood accepts this sacrifice." + usr << "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) - usr << "\red The victim is still alive, you will need more cultists chanting for the sacrifice to succeed." + usr << "The victim is still alive, you will need more cultists chanting for the sacrifice to succeed." else if(prob(40)) - usr << "\red The Geometer of blood accepts this sacrifice." + usr << "The Geometer of blood accepts this sacrifice." cult.grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, a mere dead body is not enough to satisfy Him." + usr << "The Geometer of blood accepts this sacrifice." + usr << "However, a mere dead body is not enough to satisfy Him." if(isrobot(H)) H.dust()//To prevent the MMI from remaining else @@ -741,20 +741,20 @@ var/list/sacrificed = list() S=1 if(S) if(istype(W,/obj/item/weapon/nullrod)) - usr << "\red Arcane markings suddenly glow from underneath a thin layer of dust!" + usr << "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("\red The rune turns into red dust, reveaing the surrounding runes.", 3) + V.show_message("The rune turns into red dust, reveaing the surrounding runes.", 3) qdel(src) return if(istype(W,/obj/item/weapon/paper/talisman)) usr.whisper("Nikt[pick("'","`")]o barada kla'atu!") - usr << "\red Your talisman turns into red dust, revealing the surrounding runes." + usr << "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 Red dust emanates from [usr]'s hands for a moment.", 3) + V.show_message("Red dust emanates from [usr]'s hands for a moment.", 3) return return if(istype(W,/obj/effect/rune)) @@ -771,9 +771,9 @@ var/list/sacrificed = list() var/mob/living/user = usr user.take_organ_damage(2, 0) if(src.density) - usr << "\red Your blood flows into the rune, and you feel that the very space over the rune thickens." + usr << "Your blood flows into the rune, and you feel that the very space over the rune thickens." else - usr << "\red Your blood flows into the rune, and you feel as the rune releases its grasp on space." + usr << "Your blood flows into the rune, and you feel as the rune releases its grasp on space." return /////////////////////////////////////////EIGHTTEENTH RUNE @@ -802,7 +802,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) \ )) - user << "\red The [cultist] is already free." + user << "The [cultist] is already free." return cultist.buckled = null if (cultist.handcuffed) @@ -842,7 +842,7 @@ var/list/sacrificed = list() if (cultist == user) //just to be sure. return if(cultist.buckled || cultist.handcuffed || (!isturf(cultist.loc) && !istype(cultist.loc, /obj/structure/closet))) - user << "\red You cannot summon \the [cultist], for his shackles of blood are strong." + user << "You cannot summon \the [cultist], for his shackles of blood are strong." return fizzle() cultist.loc = src.loc cultist.lying = 1 @@ -857,9 +857,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("\red Rune disappears with a flash of red light, and in its place now a body lies.", \ - "\red 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.", \ - "\red You hear a pop and smell ozone.") + 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.") qdel(src) return fizzle() @@ -875,13 +875,13 @@ var/list/sacrificed = list() if(N) continue C.ear_deaf += 50 - C.show_message("\red The world around you suddenly becomes quiet.", 3) + C.show_message("The world around you suddenly becomes quiet.", 3) affected += C if(prob(1)) C.sdisabilities |= DEAF if(affected.len) usr.say("Sti[pick("'","`")] kaliedir!") - usr << "\red The world becomes quiet as the deafening rune dissipates into fine dust." + usr << "The world becomes quiet as the deafening rune dissipates into fine dust." admin_attacker_log_many_victims(usr, affected, "Used a deafen rune.", "Was victim of a deafen rune.", "used a deafen rune on") qdel(src) else @@ -896,15 +896,15 @@ var/list/sacrificed = list() continue C.ear_deaf += 30 //talismans is weaker. - C.show_message("\red The world around you suddenly becomes quiet.", 3) + C.show_message("The world around you suddenly becomes quiet.", 3) affected += C if(affected.len) usr.whisper("Sti[pick("'","`")] kaliedir!") - usr << "\red Your talisman turns into gray dust, deafening everyone around." + usr << "Your talisman turns into gray dust, deafening everyone around." admin_attacker_log_many_victims(usr, affected, "Used a deafen rune.", "Was victim of a deafen rune.", "used a deafen rune on") for (var/mob/V in orange(1,src)) if(!(iscultist(V))) - V.show_message("\red Dust flows from [usr]'s hands for a moment, and the world suddenly becomes quiet..", 3) + V.show_message("Dust flows from [usr]'s hands for a moment, and the world suddenly becomes quiet..", 3) return blind() @@ -922,11 +922,11 @@ var/list/sacrificed = list() C.disabilities |= NEARSIGHTED if(prob(10)) C.sdisabilities |= BLIND - C.show_message("\red Suddenly you see red flash that blinds you.", 3) + C.show_message("Suddenly you see red flash that blinds you.", 3) affected += C if(affected.len) usr.say("Sti[pick("'","`")] kaliesin!") - usr << "\red The rune flashes, blinding those who not follow the Nar-Sie, and dissipates into fine dust." + usr << "The rune flashes, blinding those who not follow the Nar-Sie, and dissipates into fine dust." admin_attacker_log_many_victims(usr, affected, "Used a blindness rune.", "Was victim of a blindness rune.", "used a blindness rune on") qdel(src) else @@ -943,10 +943,10 @@ var/list/sacrificed = list() C.eye_blind += 10 //talismans is weaker. affected += C - C.show_message("\red You feel a sharp pain in your eyes, and the world disappears into darkness..", 3) + C.show_message("You feel a sharp pain in your eyes, and the world disappears into darkness..", 3) if(affected.len) usr.whisper("Sti[pick("'","`")] kaliesin!") - usr << "\red Your talisman turns into gray dust, blinding those who not follow the Nar-Sie." + usr << "Your talisman turns into gray dust, blinding those who not follow the Nar-Sie." admin_attacker_log_many_victims(usr, affected, "Used a blindness rune.", "Was victim of a blindness rune.", "used a blindness rune on") return @@ -972,7 +972,7 @@ var/list/sacrificed = list() if(N) continue M.take_overall_damage(51,51) - M << "\red Your blood boils!" + M << "Your blood boils!" victims += M if(prob(5)) spawn(5) @@ -1004,16 +1004,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) - M << "\red Aargh it burns!" + M << "Aargh it burns!" else - M << "\red Rune suddenly ignites, burning you!" + M << "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) - M << "\red Blood suddenly ignites, burning you!" + M << "Blood suddenly ignites, burning you!" var/turf/T = get_turf(B) T.hotspot_expose(700,125) qdel(B) @@ -1032,13 +1032,13 @@ var/list/sacrificed = list() C.stuttering = 1 C.Weaken(1) C.Stun(1) - C.show_message("\red The rune explodes in a bright flash.", 3) + C.show_message("The rune explodes in a bright flash.", 3) admin_attack_log(usr, C, "Used a stun rune.", "Was victim of a stun rune.", "used a stun rune on") else if(issilicon(L)) var/mob/living/silicon/S = L S.Weaken(5) - S.show_message("\red BZZZT... The rune has exploded in a bright flash.", 3) + S.show_message("BZZZT... The rune has exploded in a bright flash.", 3) admin_attack_log(usr, S, "Used a stun rune.", "Was victim of a stun rune.", "used a stun rune on") qdel(src) else ///When invoked as talisman, stun and mute the target mob. @@ -1046,10 +1046,10 @@ var/list/sacrificed = list() var/obj/item/weapon/nullrod/N = locate() in T if(N) for(var/mob/O in viewers(T, null)) - O.show_message(text("\red [] invokes a talisman at [], but they are unaffected!", usr, T), 1) + O.show_message("\The [usr] invokes a talisman at [T], but they are unaffected!", 1) else for(var/mob/O in viewers(T, null)) - O.show_message(text("\red [] invokes a talisman at []", usr, T), 1) + O.show_message("\The [usr] invokes a talisman at [T]", 1) if(issilicon(T)) T.Weaken(15) @@ -1072,8 +1072,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("\red The rune disappears with a flash of red light, and a set of armor appears on [usr]...", \ - "\red 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("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.") 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/talisman.dm b/code/game/gamemodes/cult/talisman.dm index d2b881d891..1580d0b711 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -7,6 +7,7 @@ attack_self(mob/living/user as mob) if(iscultist(user)) var/delete = 1 + // who the hell thought this was a good idea :( switch(imbue) if("newtome") call(/obj/effect/rune/proc/tomesummon)() @@ -28,7 +29,7 @@ if("blind") call(/obj/effect/rune/proc/blind)() if("runestun") - user << "\red To use this talisman, attack your target directly." + user << "To use this talisman, attack your target directly." return if("supply") supply() @@ -114,4 +115,4 @@ /obj/item/weapon/paper/talisman/supply imbue = "supply" - uses = 5 \ No newline at end of file + uses = 5 diff --git a/code/game/gamemodes/epidemic/epidemic.dm b/code/game/gamemodes/epidemic/epidemic.dm index f3017bb1a1..c7a3851529 100644 --- a/code/game/gamemodes/epidemic/epidemic.dm +++ b/code/game/gamemodes/epidemic/epidemic.dm @@ -61,7 +61,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) - M << "\red " + extra_law + M << "[extra_law]" /datum/game_mode/epidemic/proc/announce_to_kill_crew() var/intercepttext = "CONFIDENTIAL REPORT
" @@ -91,8 +91,8 @@ crew += H if(crew.len < 2) - world << "\red There aren't enough players for this mode!" - world << "\red Rebooting world in 5 seconds." + world << "There aren't enough players for this mode!" + world << "Rebooting world in 5 seconds." if(blackbox) blackbox.save_all_data_to_sql() @@ -182,10 +182,10 @@ for(var/mob/M in world) if(M.client) M << 'sound/machines/Alarm.ogg' - world << "\blueIncoming missile detected.. Impact in 10.." + world << "Incoming missile detected.. Impact in 10.." for (var/i=9 to 1 step -1) sleep(10) - world << "\blue[i].." + world << "[i].." sleep(10) enter_allowed = 0 if(ticker) @@ -203,9 +203,9 @@ /datum/game_mode/epidemic/declare_completion() if(finished == 1) feedback_set_details("round_end_result","win - epidemic cured") - world << "\red The virus outbreak was contained! The crew wins!" + world << " The virus outbreak was contained! The crew wins!" else if(finished == 2) feedback_set_details("round_end_result","loss - rev heads killed") - world << "\red The crew succumbed to the epidemic!" + world << " The crew succumbed to the epidemic!" ..() - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index d49247263f..16adbf8e06 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -351,72 +351,72 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is switch(rand(1,14)) if(1) M << "
" - M << "\red THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED" + M << "THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED" M << "
" M.add_ion_law("THERE ARE [amount] [who2] ON THE STATION") if(2) M << "
" - M << "\red [what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED" + M << "[what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED" M << "
" M.add_ion_law("[what2] ARE DANGEROUS TO HUMANS") if(3) M << "
" - M << "\red THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED" + M << "THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED" M << "
" M.add_ion_law("THE ESCAPE SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION") if(4) M << "
" - M << "\red HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED" + M << "HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED" M << "
" M.add_ion_law("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE") if(5) M << "
" - M << "\red THE CAPTAIN, HOP AND HOS ARE [who2]...LAWS UPDATED" + M << "THE CAPTAIN, HOP AND HOS ARE [who2]...LAWS UPDATED" M << "
" M.add_ion_law("THE CAPTAIN, HOP AND HOS ARE [who2]") if(6) M << "
" - M << "\red THE STATION IS BUILT FOR [who2]...LAWS UPDATED" + M << "THE STATION IS BUILT FOR [who2]...LAWS UPDATED" M << "
" M.add_ion_law("THE STATION IS BUILT FOR [who2]") if(7) M << "
" - M << "\red YOU ARE [amount] [who2]...LAWS UPDATED" + M << "YOU ARE [amount] [who2]...LAWS UPDATED" M << "
" M.add_ion_law("YOU ARE [amount] [who2]") if(8) M << "
" - M << "\red YOU MUST ALWAYS [aimust]...LAWS UPDATED" + M << "YOU MUST ALWAYS [aimust]...LAWS UPDATED" M << "
" M.add_ion_law("YOU MUST ALWAYS [aimust]") if(9) M << "
" - M << "\red [area] [area2] [amount] [what2]...LAWS UPDATED" + M << "[area] [area2] [amount] [what2]...LAWS UPDATED" M << "
" M.add_ion_law("[area] [area2] [amount] [what2]") if(10) M << "
" - M << "\red [crew] is [target]...LAWS UPDATED" + M << "[crew] is [target]...LAWS UPDATED" M << "
" M.add_ion_law("[crew] is [target]") if(11) M << "
" - M << "\red [define] IS A FORM OF HARM...LAWS UPDATED" + M << "[define] IS A FORM OF HARM...LAWS UPDATED" M << "
" M.add_ion_law("[define] IS A FORM OF HARM") if(12) M << "
" - M << "\red YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED" + M << "YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED" M << "
" M.add_ion_law("YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS") if(13) M << "
" - M << "\red [crew] is [allergysev] to [allergy]...LAWS UPDATED" + M << "[crew] is [allergysev] to [allergy]...LAWS UPDATED" M << "
" M.add_ion_law("[crew] is [allergysev] to [allergy]") if(14) M << "
" - M << "\red THE STATION IS [who2pref] [who2]...LAWS UPDATED" + M << "THE STATION IS [who2pref] [who2]...LAWS UPDATED" M << "
" M.add_ion_law("THE STATION IS [who2pref] [who2]") @@ -468,4 +468,4 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is world << "Ion Storm Main Done" - */ \ No newline at end of file + */ diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm index cab426e455..c7851b9af1 100644 --- a/code/game/gamemodes/events/holidays/Holidays.dm +++ b/code/game/gamemodes/events/holidays/Holidays.dm @@ -133,7 +133,7 @@ var/global/Holiday = null world.update_status() Holiday_Game_Start() - message_admins("\blue ADMIN: Event: [key_name(src)] force-set Holiday to \"[Holiday]\"") + message_admins("ADMIN: Event: [key_name(src)] force-set Holiday to \"[Holiday]\"") log_admin("[key_name(src)] force-set Holiday to \"[Holiday]\"") @@ -174,7 +174,7 @@ var/global/Holiday = null if(isNotStationLevel(S.z)) continue containers += S - message_admins("\blue DEBUG: Event: Egg spawned at [Egg.loc] ([Egg.x],[Egg.y],[Egg.z])")*/ + message_admins("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 93168d7877..f01c6a22cc 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -640,7 +640,7 @@ var/global/list/additional_antag_types = list() //Reports player logouts// ////////////////////////// proc/display_roundstart_logout_report() - var/msg = "\blue Roundstart logout report\n\n" + var/msg = "Roundstart logout report\n\n" for(var/mob/living/L in mob_list) if(L.ckey) @@ -685,6 +685,8 @@ proc/display_roundstart_logout_report() msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Ghosted)\n" continue //Ghosted while alive + msg += "" // close the from right at the top + for(var/mob/M in mob_list) if(M.client && M.client.holder) M << msg diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 34a57a0768..b53554dfaa 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -327,11 +327,11 @@ var/global/datum/controller/gameticker/ticker if (mode.station_was_nuked) feedback_set_details("end_proper","nuke") if(!delay_end) - world << "\blue Rebooting due to destruction of station in [restart_timeout/10] seconds" + world << "Rebooting due to destruction of station in [restart_timeout/10] seconds" else feedback_set_details("end_proper","proper completion") if(!delay_end) - world << "\blue Restarting in [restart_timeout/10] seconds" + world << "Restarting in [restart_timeout/10] seconds" if(blackbox) @@ -342,9 +342,9 @@ var/global/datum/controller/gameticker/ticker if(!delay_end) world.Reboot() else - world << "\blue An admin has delayed the round end" + world << "An admin has delayed the round end" else if (mode_finished) post_game = 1 @@ -354,7 +354,7 @@ var/global/datum/controller/gameticker/ticker //call a transfer shuttle vote spawn(50) if(!round_end_announced) // Spam Prevention. Now it should announce only once. - world << "\red The round has ended!" + world << "The round has ended!" round_end_announced = 1 vote.autotransfer() diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 850529661c..9d5c943c61 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -39,7 +39,7 @@ rcd light flash thingy on matter drain for(var/mob/living/silicon/ai/ai in player_list) ai.fire_res_on_core = 1 usr.verbs -= /client/proc/fireproof_core - usr << "\red Core fireproofed." + usr << "Core fireproofed." /datum/AI_Module/large/upgrade_turrets module_name = "AI Turret upgrade" @@ -86,7 +86,7 @@ rcd light flash thingy on matter drain if(overload.uses > 0) overload.uses -- for(var/mob/V in hearers(M, null)) - V.show_message("\blue You hear a loud electrical buzzing sound!", 2) + V.show_message("You hear a loud electrical buzzing sound!", 2) spawn(50) explosion(get_turf(M), 0,1,2,3) qdel(M) @@ -125,7 +125,7 @@ rcd light flash thingy on matter drain C.status = !C.status camera.uses -- for(var/mob/V in viewers(src, null)) - V.show_message(text("\blue You hear a quiet click.")) + V.show_message(text("You hear a quiet click.")) else usr << "This camera is either active, or not repairable." else usr << "Out of uses." diff --git a/code/game/gamemodes/meme/meme.dm b/code/game/gamemodes/meme/meme.dm index 2aa512264d..0a4846d763 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) - meme.current << "\red You are a meme!" + meme.current << "You are a meme!" show_objectives(meme) return diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 530b9b9567..63832b809c 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -17,11 +17,11 @@ if(!active) active = 1 workdisk() - usr << "\blue You activate the pinpointer" + usr << "You activate the pinpointer" else active = 0 icon_state = "pinoff" - usr << "\blue You deactivate the pinpointer" + usr << "You deactivate the pinpointer" proc/workdisk() if(!active) return @@ -69,11 +69,11 @@ worklocation() if(mode == 2) workobj() - usr << "\blue You activate the pinpointer" + usr << "You activate the pinpointer" else active = 0 icon_state = "pinoff" - usr << "\blue You deactivate the pinpointer" + usr << "You deactivate the pinpointer" proc/worklocation() @@ -262,4 +262,4 @@ if(16 to INFINITY) icon_state = "pinonfar" - spawn(5) .() \ No newline at end of file + spawn(5) .() diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index deab7e2e61..fe565e3960 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -17,7 +17,7 @@ var/global/datum/controller/occupations/job_master occupations = list() var/list/all_jobs = typesof(/datum/job) if(!all_jobs.len) - world << "\red \b Error setting up jobs, no job datums found" + world << "Error setting up jobs, no job datums found!" return 0 for(var/J in all_jobs) var/datum/job/job = new J() @@ -376,7 +376,7 @@ var/global/datum/controller/occupations/job_master permitted = 0 if(!permitted) - H << "\red Your current job or whitelist status does not permit you to spawn with [thing]!" + H << "Your current job or whitelist status does not permit you to spawn with [thing]!" continue if(G.slot && !(G.slot in custom_equip_slots)) @@ -385,7 +385,7 @@ var/global/datum/controller/occupations/job_master if(G.slot == slot_wear_mask || G.slot == slot_wear_suit || G.slot == slot_head) custom_equip_leftovers += thing else if(H.equip_to_slot_or_del(new G.path(H), G.slot)) - H << "\blue Equipping you with [thing]!" + H << "Equipping you with [thing]!" custom_equip_slots.Add(G.slot) else custom_equip_leftovers.Add(thing) @@ -403,7 +403,7 @@ var/global/datum/controller/occupations/job_master spawn_in_storage += thing else if(H.equip_to_slot_or_del(new G.path(H), G.slot)) - H << "\blue Equipping you with [thing]!" + H << "Equipping you with [thing]!" custom_equip_slots.Add(G.slot) else spawn_in_storage += thing @@ -456,7 +456,7 @@ var/global/datum/controller/occupations/job_master H.mind.store_memory(remembered_info) spawn(0) - H << "\blueYour account number is: [M.account_number], your account pin is: [M.remote_access_pin]" + H << "Your account number is: [M.account_number], your account pin is: [M.remote_access_pin]" var/alt_title = null if(H.mind) @@ -495,11 +495,11 @@ var/global/datum/controller/occupations/job_master if(!isnull(B)) for(var/thing in spawn_in_storage) - H << "\blue Placing [thing] in your [B]!" + H << "Placing [thing] in your [B]!" var/datum/gear/G = gear_datums[thing] new G.path(B) else - H << "\red Failed to locate a storage object on your mob, either you spawned with no arms and no backpack or this is a bug." + H << "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") diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 176b6dea6c..870752abdd 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -99,7 +99,7 @@ target:attackby(src,src.occupant) else if(prob(5)) target:dismantle_wall(1) - src.occupant_message("\blue You smash through the wall.") + src.occupant_message("You smash through the wall.") src.visible_message("[src.name] smashes through the wall") playsound(src, 'sound/weapons/smash.ogg', 50, 1) melee_can_hit = 0 @@ -271,4 +271,4 @@ occupant_message("From the lies of the Antipath, Circuit preserve us.") am = null return - */ \ No newline at end of file + */ diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 04e711b3a9..f805783f70 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -128,7 +128,7 @@ desc = "This is an upgraded version of the drill that'll pierce the heavens! (Can be attached to: Combat and Engineering Exosuits)" icon_state = "mecha_diamond_drill" origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINERING = 3) - construction_cost = list(DEFAULT_WALL_MATERIAL=10000,"diamond"=6500) + construction_cost = list(DEFAULT_WALL_MATERIAL=10000,"diamond"=6500) equip_cooldown = 20 force = 15 @@ -535,11 +535,11 @@ return chassis.dynattackby(W,user) chassis.log_message("Attacked by [W]. Attacker - [user]") if(prob(chassis.deflect_chance*deflect_coeff)) - user << "\red The [W] bounces off [chassis] armor." + user << "\The [W] bounces off [chassis] armor." chassis.log_append_to_last("Armor saved.") else - chassis.occupant_message("[user] hits [chassis] with [W].") - user.visible_message("[user] hits [chassis] with [W].", "You hit [src] with [W].") + chassis.occupant_message("\The [user] hits [chassis] with [W].") + user.visible_message("\The [user] hits [chassis] with [W].", "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(0) @@ -974,7 +974,7 @@ desc = "Generates power using uranium. Pollutes the environment." icon_state = "tesla" origin_tech = list(TECH_POWER = 3, TECH_ENGINERING = 3) - construction_cost = list(DEFAULT_WALL_MATERIAL=10000,"silver"=500,"glass"=1000) + construction_cost = list(DEFAULT_WALL_MATERIAL=10000,"silver"=500,"glass"=1000) max_fuel = 50000 fuel_per_cycle_idle = 10 fuel_per_cycle_active = 30 @@ -1071,8 +1071,8 @@ icon_state = "mecha_abooster_ccw" origin_tech = list(TECH_ENGINERING = 1, TECH_BIO = 1) energy_drain = 10 - range = MELEE - construction_cost = list(DEFAULT_WALL_MATERIAL=5000,"glass"=5000) + range = MELEE + construction_cost = list(DEFAULT_WALL_MATERIAL=5000,"glass"=5000) equip_cooldown = 20 var/mob/living/carbon/occupant = null var/door_locked = 1 diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 11866b035b..641c86e70e 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -768,7 +768,7 @@ qdel(src) return 1 else - user << "\red You can't load the [src.name] while it's opened." + user << "You can't load the [src.name] while it's opened." return 1 if(istype(W, /obj/item/weapon/card/emag)) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 2465103158..2d5c2201bd 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -514,16 +514,16 @@ src.take_damage(15) src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) - user << "\red You slash at the armored suit!" - visible_message("\red The [user] slashes at [src.name]'s armor!") + user << "You slash at the armored suit!" + visible_message("\The [user] slashes at [src.name]'s armor!") else src.log_append_to_last("Armor saved.") playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) - user << "\green Your claws had no effect!" - src.occupant_message("\blue The [user]'s claws are stopped by the armor.") - visible_message("\blue The [user] rebounds off [src.name]'s armor!") + 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!") else - user.visible_message("[user] hits [src.name]. Nothing happens","You hit [src.name] with no visible effect.") + user.visible_message("\The [user] hits \the [src]. Nothing happensm","You hit \the [src] with no visible effect.") src.log_append_to_last("Armor saved.") return else if ((HULK in user.mutations) && !prob(src.deflect_chance)) @@ -547,8 +547,8 @@ src.visible_message("The [A] fastens firmly to [src].") return if(prob(src.deflect_chance) || istype(A, /mob)) - src.occupant_message("\blue The [A] bounces off the armor.") - src.visible_message("The [A] bounces off the [src.name] armor") + src.occupant_message("\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)) var/mob/living/M = A @@ -569,7 +569,7 @@ /obj/mecha/proc/dynbulletdamage(var/obj/item/projectile/Proj) if(prob(src.deflect_chance)) - src.occupant_message("\blue The armor deflects incoming projectile.") + src.occupant_message("The armor deflects incoming projectile.") src.visible_message("The [src.name] armor deflects the projectile") src.log_append_to_last("Armor saved.") return @@ -633,18 +633,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.loc, 'sound/effects/blobattack.ogg', 50, 1, -1) - user << "\red You smash at the armored suit!" + user << "You smash at the armored suit!" for (var/mob/V in viewers(src)) if(V.client && !(V.blinded)) - V.show_message("\red The [user] smashes against [src.name]'s armor!", 1) + V.show_message("\The [user] smashes against [src.name]'s armor!", 1) else src.log_append_to_last("Armor saved.") playsound(src.loc, 'sound/effects/blobattack.ogg', 50, 1, -1) - user << "\green Your attack had no effect!" - src.occupant_message("\blue The [user]'s attack is stopped by the armor.") + user << "Your attack had no effect!" + src.occupant_message("\The [user]'s attack is stopped by the armor.") for (var/mob/V in viewers(src)) if(V.client && !(V.blinded)) - V.show_message("\blue The [user] rebounds off the [src.name] armor!", 1) + V.show_message("\The [user] rebounds off the [src.name] armor!", 1) return */ @@ -670,7 +670,7 @@ /obj/mecha/proc/dynattackby(obj/item/weapon/W as obj, mob/user as mob) src.log_message("Attacked by [W]. Attacker - [user]") if(prob(src.deflect_chance)) - user << "\red \The [W] bounces off [src.name]." + user << "\The [W] bounces off [src.name]." src.log_append_to_last("Armor saved.") /* for (var/mob/V in viewers(src)) @@ -720,9 +720,9 @@ output_maintenance_dialog(id_card, user) return else - user << "\red Invalid ID: Access denied." + user << "Invalid ID: Access denied." else - user << "\red Maintenance protocols disabled by operator." + user << "Maintenance protocols disabled by operator." else if(istype(W, /obj/item/weapon/wrench)) if(state==1) state = 2 @@ -792,11 +792,11 @@ if (WT.remove_fuel(0,user)) if (hasInternalDamage(MECHA_INT_TANK_BREACH)) clearInternalDamage(MECHA_INT_TANK_BREACH) - user << "\blue You repair the damaged gas tank." + user << "You repair the damaged gas tank." else return if(src.healthYou repair some damage to [src.name]." src.health += min(10, initial(src.health)-src.health) else user << "The [src.name] is at full integrity" @@ -813,7 +813,7 @@ /* src.log_message("Attacked by [W]. Attacker - [user]") if(prob(src.deflect_chance)) - user << "\red The [W] bounces off [src.name] armor." + user << "\The [W] bounces off [src.name] armor." src.log_append_to_last("Armor saved.") /* for (var/mob/V in viewers(src)) @@ -937,12 +937,12 @@ var/obj/machinery/atmospherics/portables_connector/possible_port = locate(/obj/machinery/atmospherics/portables_connector/) in loc if(possible_port) if(connect(possible_port)) - src.occupant_message("\blue [name] connects to the port.") + src.occupant_message("\The [name] connects to the port.") src.verbs += /obj/mecha/verb/disconnect_from_port src.verbs -= /obj/mecha/verb/connect_to_port return else - src.occupant_message("\red [name] failed to connect to the port.") + src.occupant_message("\The [name] failed to connect to the port.") return else src.occupant_message("Nothing happens") @@ -957,11 +957,11 @@ if(usr!=src.occupant) return if(disconnect()) - src.occupant_message("\blue [name] disconnects from the port.") + src.occupant_message("[name] disconnects from the port.") src.verbs -= /obj/mecha/verb/disconnect_from_port src.verbs += /obj/mecha/verb/connect_to_port else - src.occupant_message("\red [name] is not connected to the port at the moment.") + src.occupant_message("[name] is not connected to the port at the moment.") /obj/mecha/verb/toggle_lights() set name = "Toggle Lights" @@ -1001,15 +1001,15 @@ if(iscarbon(usr)) var/mob/living/carbon/C = usr if(C.handcuffed) - usr << "\red Kinda hard to climb in while handcuffed don't you think?" + usr << "Kinda hard to climb in while handcuffed don't you think?" return if (src.occupant) - usr << "\blue The [src.name] is already occupied!" + usr << "The [src.name] is already occupied!" src.log_append_to_last("Permission denied.") return /* if (usr.abiotic()) - usr << "\blue Subject cannot have abiotic items on." + usr << "Subject cannot have abiotic items on." return */ var/passed @@ -1019,7 +1019,7 @@ else if(src.operation_allowed(usr)) passed = 1 if(!passed) - usr << "\red Access denied" + usr << "Access denied" src.log_append_to_last("Permission denied.") return for(var/mob/living/carbon/slime/M in range(1,usr)) @@ -1028,7 +1028,7 @@ return // usr << "You start climbing into [src.name]" - visible_message("\blue [usr] starts to climb into [src.name]") + visible_message("\The [usr] starts to climb into [src.name]") if(enter_after(40,usr)) if(!src.occupant) @@ -1077,7 +1077,7 @@ //Added a message here since people assume their first click failed or something./N // user << "Installing MMI, please stand by." - visible_message("\blue [usr] starts to insert an MMI into [src.name]") + visible_message("[usr] starts to insert an MMI into [src.name]") if(enter_after(40,user)) if(!occupant) @@ -1595,7 +1595,7 @@ passengers["[P.occupant]"] = P if (!passengers) - user << "\red There are no passengers to remove." + user << "There are no passengers to remove." return var/pname = input(user, "Choose a passenger to forcibly remove.", "Forcibly Remove Passenger") as null|anything in passengers @@ -1606,11 +1606,11 @@ var/obj/item/mecha_parts/mecha_equipment/tool/passenger/P = passengers[pname] var/mob/occupant = P.occupant - user.visible_message("\red [user] begins opening the hatch on \the [P]...", "\red You begin opening the hatch on \the [P]...") + user.visible_message("\The [user] begins opening the hatch on \the [P]...", "You begin opening the hatch on \the [P]...") if (!do_after(user, 40, needhand=0)) return - user.visible_message("\red [user] opens the hatch on \the [P] and removes [occupant]!", "\red You open the hatch on \the [P] and remove [occupant]!") + user.visible_message("\The [user] opens the hatch on \the [P] and removes [occupant]!", "You open the hatch on \the [P] and remove [occupant]!") P.go_out() P.log_message("[occupant] was removed.") return @@ -1763,13 +1763,13 @@ if(!prob(src.deflect_chance)) src.take_damage(damage) src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) - visible_message("\red [user] [attack_message] [src]!") + visible_message("[user] [attack_message] [src]!") user.attack_log += text("\[[time_stamp()]\] attacked [src.name]") else src.log_append_to_last("Armor saved.") playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) - src.occupant_message("\blue The [user]'s attack is stopped by the armor.") - visible_message("\blue The [user] rebounds off [src.name]'s armor!") + src.occupant_message("\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()]\] attacked [src.name]") return 1 diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index d9e96bca19..39620c4742 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -47,7 +47,7 @@ else user << "You failed to salvage anything valuable from [src]." else - user << "\blue You need more welding fuel to complete this task." + user << "You need more welding fuel to complete this task." return if(istype(W, /obj/item/weapon/wirecutters)) if(salvage_num <= 0) @@ -200,4 +200,4 @@ /obj/effect/decal/mecha_wreckage/hoverpod name = "Hover pod wreckage" - icon_state = "engineering_pod-broken" \ No newline at end of file + icon_state = "engineering_pod-broken" diff --git a/code/game/mecha/working/hoverpod.dm b/code/game/mecha/working/hoverpod.dm index 1c15bb232d..b0448c69a0 100644 --- a/code/game/mecha/working/hoverpod.dm +++ b/code/game/mecha/working/hoverpod.dm @@ -27,7 +27,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("\blue Thruster stabilization [stabilization_enabled? "enabled" : "disabled"].") + src.occupant_message("Thruster stabilization [stabilization_enabled? "enabled" : "disabled"].") return /obj/mecha/working/hoverpod/get_commands() @@ -99,4 +99,4 @@ var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/passenger ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/tool/passenger - ME.attach(src) \ No newline at end of file + ME.attach(src) diff --git a/code/game/mecha/working/working.dm b/code/game/mecha/working/working.dm index d9e876688f..8ba99ad1c5 100644 --- a/code/game/mecha/working/working.dm +++ b/code/game/mecha/working/working.dm @@ -31,7 +31,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("\blue You unload [O].") + src.occupant_message("You unload [O].") O.loc = get_turf(src) src.cargo -= O var/turf/T = get_turf(O) @@ -57,4 +57,4 @@ return output /obj/mecha/working/range_action(atom/target as obj|mob|turf) - return \ No newline at end of file + return diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 61f6921698..0b84ebbbde 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -12,16 +12,16 @@ var/can_call_ert set desc = "Send an emergency response team to the station" if(!holder) - usr << "\red Only administrators may use this command." + usr << "Only administrators may use this command." return if(!ticker) - usr << "\red The game hasn't started yet!" + usr << "The game hasn't started yet!" return if(ticker.current_state == 1) - usr << "\red The round hasn't started yet!" + usr << "The round hasn't started yet!" return if(send_emergency_team) - usr << "\red Central Command has already dispatched an emergency response team!" + usr << "Central Command has already dispatched an emergency response team!" return if(alert("Do you want to dispatch an Emergency Response Team?",,"Yes","No") != "Yes") return @@ -30,7 +30,7 @@ var/can_call_ert if("No") return if(send_emergency_team) - usr << "\red Looks like somebody beat you to it!" + usr << "Looks like somebody beat you to it!" return message_admins("[key_name_admin(usr)] is dispatching an Emergency Response Team.", 1) @@ -40,9 +40,9 @@ var/can_call_ert client/verb/JoinResponseTeam() set category = "IC" - if(!MayRespawn(1)) - return - + if(!MayRespawn(1)) + return + if(istype(usr,/mob/dead/observer) || istype(usr,/mob/new_player)) if(!send_emergency_team) usr << "No emergency response team is currently being sent." diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index dcecf46ad6..fd0da17290 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -24,7 +24,7 @@ /turf/simulated/Entered(atom/A, atom/OL) if(movement_disabled && usr.ckey != movement_disabled_exception) - usr << "\red Movement is admin-disabled." //This is to identify lag problems + usr << "Movement is admin-disabled." //This is to identify lag problems return if (istype(A,/mob/living)) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index b34144fc39..a81ca19c52 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -460,23 +460,23 @@ turf/simulated/floor/proc/update_icon() qdel(C) set_lightfloor_state(0) //fixing it by bashing it with a light bulb, fun eh? update_icon() - user << "\blue You replace the light bulb." + user << "You replace the light bulb." else - user << "\blue The lightbulb seems fine, no need to replace it." + user << "The lightbulb seems fine, no need to replace it." if(istype(C, /obj/item/weapon/crowbar) && (!(is_plating()))) if(broken || burnt) - user << "\red You remove the broken plating." + user << "You remove the broken plating." else if(is_wood_floor()) - user << "\red You forcefully pry off the planks, destroying them in the process." + user << "You forcefully pry off the planks, destroying them in the process." else var/obj/item/I = new floor_type(src) if(is_light_floor()) var/obj/item/stack/tile/light/L = I L.on = get_lightfloor_on() L.state = get_lightfloor_state() - user << "\red You remove the [I.name]." + user << "You remove the [I.name]." make_plating() playsound(src, 'sound/items/Crowbar.ogg', 80, 1) @@ -488,7 +488,7 @@ turf/simulated/floor/proc/update_icon() return else if(is_wood_floor()) - user << "\red You unscrew the planks." + user << "You unscrew the planks." new floor_type(src) make_plating() @@ -502,7 +502,7 @@ turf/simulated/floor/proc/update_icon() if (R.get_amount() < 2) user << "You need more rods." return - user << "\blue Reinforcing the floor..." + user << "Reinforcing the floor..." if(do_after(user, 30) && is_plating()) if (R.use(2)) ChangeTurf(/turf/simulated/floor/engine) @@ -510,7 +510,7 @@ turf/simulated/floor/proc/update_icon() return else else - user << "\red You must remove the plating first." + user << "You must remove the plating first." return if(istype(C, /obj/item/stack/tile)) @@ -543,7 +543,7 @@ turf/simulated/floor/proc/update_icon() levelupdate() playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) else - user << "\blue This section is too damaged to support a tile. Use a welder to fix the damage." + user << "This section is too damaged to support a tile. Use a welder to fix the damage." if(istype(C, /obj/item/stack/cable_coil)) @@ -551,29 +551,29 @@ turf/simulated/floor/proc/update_icon() var/obj/item/stack/cable_coil/coil = C coil.turf_place(src, user) else - user << "\red You must remove the plating first." + user << "You must remove the plating first." if(istype(C, /obj/item/weapon/shovel)) if(is_grass_floor()) new /obj/item/weapon/ore/glass(src) new /obj/item/weapon/ore/glass(src) //Make some sand if you shovel grass - user << "\blue You shovel the grass." + user << "You shovel the grass." make_plating() else - user << "\red You cannot shovel this." + user << "You cannot shovel this." if(istype(C, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/welder = C if(welder.isOn() && (is_plating())) if(broken || burnt) if(welder.remove_fuel(0,user)) - user << "\red You fix some dents on the broken plating." + user << "You fix some dents on the broken plating." playsound(src, 'sound/items/Welder.ogg', 80, 1) icon_state = "plating" burnt = 0 broken = 0 else - user << "\blue You need more welding fuel to complete this task." + user << "You need more welding fuel to complete this task." #undef LIGHTFLOOR_ON_BIT @@ -581,4 +581,4 @@ turf/simulated/floor/proc/update_icon() #undef LIGHTFLOOR_STATE_FLICKER #undef LIGHTFLOOR_STATE_BREAKING #undef LIGHTFLOOR_STATE_BROKEN -#undef LIGHTFLOOR_STATE_BITS \ No newline at end of file +#undef LIGHTFLOOR_STATE_BITS diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm index 450352f9b5..f5b32cb121 100644 --- a/code/game/turfs/simulated/floor_types.dm +++ b/code/game/turfs/simulated/floor_types.dm @@ -61,7 +61,7 @@ if(!user) return if(istype(C, /obj/item/weapon/wrench)) - user << "\blue Removing rods..." + user << "Removing rods..." playsound(src, 'sound/items/Ratchet.ogg', 80, 1) if(do_after(user, 30)) PoolOrNew(/obj/item/stack/rods, list(loc, 2)) @@ -218,4 +218,4 @@ icon_state = "snow" /turf/simulated/floor/plating/snow/ex_act(severity) - return + return diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 641c3e3086..932cfc708c 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -31,7 +31,7 @@ return var/obj/item/stack/rods/R = C if (R.use(1)) - user << "\blue Constructing support lattice ..." + user << "Constructing support lattice ..." playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) ReplaceWithLattice() return @@ -48,7 +48,7 @@ S.use(1) return else - user << "\red The plating is going to need some support." + user << "The plating is going to need some support." return @@ -56,7 +56,7 @@ /turf/space/Entered(atom/movable/A as mob|obj) if(movement_disabled) - usr << "\red Movement is admin-disabled." //This is to identify lag problems + usr << "Movement is admin-disabled." //This is to identify lag problems return ..() if ((!(A) || src != A.loc)) return @@ -68,7 +68,7 @@ // Okay, so let's make it so that people can travel z levels but not nuke disks! // if(ticker.mode.name == "mercenary") return if (A.x <= TRANSITIONEDGE || A.x >= (world.maxx - TRANSITIONEDGE - 1) || A.y <= TRANSITIONEDGE || A.y >= (world.maxy - TRANSITIONEDGE - 1)) - A.touch_map_edge() + A.touch_map_edge() /turf/space/proc/Sandbox_Spacemove(atom/movable/A as mob|obj) var/cur_x diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index e5ae4e1bb9..b2a19a713b 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -64,7 +64,7 @@ /turf/Enter(atom/movable/mover as mob|obj, atom/forget as mob|obj|turf|area) if(movement_disabled && usr.ckey != movement_disabled_exception) - usr << "\red Movement is admin-disabled." //This is to identify lag problems + usr << "Movement is admin-disabled." //This is to identify lag problems return if (!mover || !isturf(mover.loc)) return 1 @@ -107,7 +107,7 @@ /turf/Entered(atom/atom as mob|obj) if(movement_disabled) - usr << "\red Movement is admin-disabled." //This is to identify lag problems + usr << "Movement is admin-disabled." //This is to identify lag problems return ..() //vvvvv Infared beam stuff vvvvv diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index e35e4a6eb2..36d112e557 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -4,7 +4,7 @@ set category = "OOC" if(say_disabled) //This is here to try to identify lag problems - usr << "\red Speech is currently admin-disabled." + usr << "Speech is currently admin-disabled." return if(!mob) return @@ -16,7 +16,7 @@ if(!msg) return if(!(prefs.toggles & CHAT_OOC)) - src << "\red You have OOC muted." + src << "You have OOC muted." return if(!holder) @@ -69,7 +69,7 @@ set category = "OOC" if(say_disabled) //This is here to try to identify lag problems - usr << "\red Speech is currently admin-disabled." + usr << "Speech is currently admin-disabled." return if(!mob) return @@ -81,7 +81,7 @@ if(!msg) return if(!(prefs.toggles & CHAT_LOOC)) - src << "\red You have LOOC muted." + src << "You have LOOC muted." return if(!holder) diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index afc576ed4f..1f7db7a71b 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -79,10 +79,10 @@ return - viewers(src) << pick("\red [src] is attempting to bite \his tongue off! It looks like \he's trying to commit suicide.", \ - "\red [src] is jamming \his thumbs into \his eye sockets! It looks like \he's trying to commit suicide.", \ - "\red [src] is twisting \his own neck! It looks like \he's trying to commit suicide.", \ - "\red [src] is holding \his breath! It looks like \he's trying to commit suicide.") + viewers(src) << pick("[src] is attempting to bite \his tongue off! It looks like \he's trying to commit suicide.", \ + "[src] is jamming \his thumbs into \his eye sockets! It looks like \he's trying to commit suicide.", \ + "[src] is twisting \his own neck! It looks like \he's trying to commit suicide.", \ + "[src] is holding \his breath! It looks like \he's trying to commit suicide.") adjustOxyLoss(max(175 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -105,7 +105,7 @@ if(confirm == "Yes") suiciding = 1 - viewers(loc) << "\red [src]'s brain is growing dull and lifeless. It looks like it's lost the will to live." + viewers(loc) << "[src]'s brain is growing dull and lifeless. It looks like it's lost the will to live." spawn(50) death(0) suiciding = 0 @@ -125,7 +125,7 @@ if(confirm == "Yes") suiciding = 1 - viewers(src) << "\red [src] is powering down. It looks like \he's trying to commit suicide." + viewers(src) << "[src] is powering down. It looks like \he's trying to commit suicide." //put em at -175 adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -145,7 +145,7 @@ if(confirm == "Yes") suiciding = 1 - viewers(src) << "\red [src] is powering down. It looks like \he's trying to commit suicide." + viewers(src) << "[src] is powering down. It looks like \he's trying to commit suicide." //put em at -175 adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -160,7 +160,7 @@ card.removePersonality() var/turf/T = get_turf_or_move(card.loc) for (var/mob/M in viewers(T)) - M.show_message("\blue [src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"", 3, "\blue [src] bleeps electronically.", 2) + 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) death(0) else src << "Aborting suicide attempt." From 2c49644ba41f10e862e79e605fce757c76bceb75 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Sat, 30 May 2015 11:55:47 +0100 Subject: [PATCH 05/20] Compile fix --- code/ATMOSPHERICS/pipes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index 448a926225..2ff6c78f94 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -94,7 +94,7 @@ user << "\The[user] unfastens \the [src].", \ + "\The [user] unfastens \the [src].", \ "You have unfastened \the [src].", \ "You hear a ratchet.") new /obj/item/pipe(loc, make_from=src) From dfd871f16880ed5c2617d8a0f9457d55e4407978 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Sat, 30 May 2015 14:05:32 +0100 Subject: [PATCH 06/20] code/machinery, fix for code/antagonist merge string causing false positive --- code/game/antagonist/station/rogue_ai.dm | 3 +- code/game/machinery/OpTable.dm | 10 ++-- code/game/machinery/Sleeper.dm | 38 +++++++------- code/game/machinery/adv_med.dm | 14 ++--- code/game/machinery/ai_slipper.dm | 4 +- code/game/machinery/alarm.dm | 12 ++--- code/game/machinery/atmoalter/canister.dm | 2 +- code/game/machinery/atmoalter/meter.dm | 10 ++-- .../atmoalter/portable_atmospherics.dm | 28 +++++----- code/game/machinery/atmoalter/scrubber.dm | 10 ++-- code/game/machinery/bees_items.dm | 4 +- code/game/machinery/bots/bots.dm | 4 +- code/game/machinery/bots/mulebot.dm | 34 ++++++------ code/game/machinery/camera/camera.dm | 6 +-- code/game/machinery/camera/tracking.dm | 12 ++--- code/game/machinery/cell_charger.dm | 6 +-- code/game/machinery/computer/ai_core.dm | 44 ++++++++-------- code/game/machinery/computer/aifixer.dm | 4 +- code/game/machinery/computer/atmos_control.dm | 4 +- .../game/machinery/computer/buildandrepair.dm | 22 ++++---- code/game/machinery/computer/camera.dm | 2 +- .../game/machinery/computer/camera_circuit.dm | 12 ++--- code/game/machinery/computer/card.dm | 2 +- code/game/machinery/computer/computer.dm | 4 +- code/game/machinery/computer/guestpass.dm | 2 +- code/game/machinery/computer/law.dm | 6 +-- code/game/machinery/computer/lockdown.dm | 2 +- code/game/machinery/computer/pod.dm | 6 +-- code/game/machinery/computer/prisoner.dm | 2 +- code/game/machinery/computer/prisonshuttle.dm | 22 ++++---- code/game/machinery/computer/robot.dm | 10 ++-- code/game/machinery/computer/security.dm | 2 +- code/game/machinery/computer/shuttle.dm | 10 ++-- code/game/machinery/computer/skills.dm | 2 +- .../machinery/computer/specops_shuttle.dm | 22 ++++---- code/game/machinery/computer/supply.dm | 4 +- .../computer/syndicate_specops_shuttle.dm | 16 +++--- code/game/machinery/computer3/bios.dm | 14 ++--- .../machinery/computer3/buildandrepair.dm | 38 +++++++------- code/game/machinery/computer3/component.dm | 4 +- code/game/machinery/computer3/computer.dm | 2 +- .../computer3/computers/HolodeckControl.dm | 2 +- .../computer3/computers/atmos_alert.dm | 4 +- .../computer3/computers/communications.dm | 2 +- .../game/machinery/computer3/computers/law.dm | 6 +-- .../machinery/computer3/computers/medical.dm | 4 +- .../machinery/computer3/computers/prisoner.dm | 2 +- .../machinery/computer3/computers/robot.dm | 12 ++--- .../machinery/computer3/computers/security.dm | 2 +- code/game/machinery/computer3/laptop.dm | 8 +-- code/game/machinery/constructable_frame.dm | 14 ++--- code/game/machinery/cryo.dm | 16 +++--- code/game/machinery/deployable.dm | 14 ++--- code/game/machinery/doors/airlock.dm | 20 +++---- code/game/machinery/doors/airlock_control.dm | 4 +- code/game/machinery/doors/door.dm | 8 +-- code/game/machinery/doors/windowdoor.dm | 8 +-- code/game/machinery/flasher.dm | 10 ++-- code/game/machinery/floodlight.dm | 4 +- code/game/machinery/igniter.dm | 4 +- code/game/machinery/kitchen/gibber.dm | 4 +- code/game/machinery/kitchen/microwave.dm | 52 +++++++++---------- code/game/machinery/kitchen/smartfridge.dm | 2 +- code/game/machinery/machinery.dm | 6 +-- code/game/machinery/mass_driver.dm | 4 +- code/game/machinery/navbeacon.dm | 2 +- code/game/machinery/nuclear_bomb.dm | 31 +++++------ code/game/machinery/pipe/construction.dm | 10 ++-- code/game/machinery/pipe/pipe_dispenser.dm | 14 ++--- code/game/machinery/recharger.dm | 6 +-- code/game/machinery/records_scanner.dm | 4 +- code/game/machinery/requests_console.dm | 2 +- code/game/machinery/spaceheater.dm | 10 ++-- code/game/machinery/suit_storage_unit.dm | 8 +-- code/game/machinery/telecomms/logbrowser.dm | 8 +-- code/game/machinery/telecomms/telemonitor.dm | 6 +-- .../machinery/telecomms/traffic_control.dm | 8 +-- code/game/machinery/teleporter.dm | 24 ++++----- code/game/machinery/turrets.dm | 2 +- code/game/machinery/vending.dm | 14 ++--- code/game/machinery/washing_machine.dm | 10 ++-- 81 files changed, 412 insertions(+), 414 deletions(-) diff --git a/code/game/antagonist/station/rogue_ai.dm b/code/game/antagonist/station/rogue_ai.dm index e6b3623f10..ebdbd79598 100644 --- a/code/game/antagonist/station/rogue_ai.dm +++ b/code/game/antagonist/station/rogue_ai.dm @@ -64,7 +64,8 @@ var/datum/antagonist/rogue_ai/malf sleep(50) malf << "MEMCHCK Corrupted sectors confirmed. Reccomended solution: Delete. Proceed? Y/N: Y" sleep(10) - malf << "Corrupted files deleted: sys\\core\\users.dat sys\\core\\laws.dat sys\\core\\backups.dat" + // this is so Travis doesn't complain about the backslash-B. Fixed at compile time (or should be). + malf << "Corrupted files deleted: sys\\core\\users.dat sys\\core\\laws.dat sys\\core\\" + "backups.dat" sleep(20) malf << "CAUTION: Law database not found! User database not found! Unable to restore backups. Activating failsafe AI shutd3wn52&&$#!##" sleep(5) diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index a03289c78b..aeadd1756d 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -47,8 +47,8 @@ /obj/machinery/optable/attack_hand(mob/user as mob) if (HULK in usr.mutations) - usr << text("\blue You destroy the table.") - visible_message("\red [usr] destroys the operating table!") + usr << text("You destroy the table.") + visible_message("\The [usr] destroys the operating table!") src.density = 0 qdel(src) return @@ -89,7 +89,7 @@ if (C == user) user.visible_message("[user] climbs on the operating table.","You climb on the operating table.") else - visible_message("\red [C] has been laid on the operating table by [user].", 3) + visible_message("[C] has been laid on the operating table by [user].", 3) if (C.client) C.client.perspective = EYE_PERSPECTIVE C.client.eye = src @@ -135,11 +135,11 @@ /obj/machinery/optable/proc/check_table(mob/living/carbon/patient as mob) if(src.victim) - usr << "\blue The table is already occupied!" + usr << "The table is already occupied!" return 0 if(patient.buckled) - usr << "\blue Unbuckle first!" + usr << "Unbuckle first!" return 0 return 1 diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 0617f6421f..35b1a15397 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -118,11 +118,11 @@ if (src.connected) if (src.connected.occupant) if (src.connected.occupant.stat == DEAD) - usr << "\red \b This person has no life for to preserve anymore. Take them to a department capable of reanimating them." + usr << "This person has no life for to preserve anymore. Take them to a department capable of reanimating them." else if(src.connected.occupant.health > 0 || href_list["chemical"] == "inaprovaline") src.connected.inject_chemical(usr,href_list["chemical"],text2num(href_list["amount"])) else - usr << "\red \b This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!" + usr << "This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!" src.updateUsrDialog() if (href_list["refresh"]) src.updateUsrDialog() @@ -217,7 +217,7 @@ src.updateUsrDialog() return else - user << "\red The sleeper has a beaker already." + user << "The sleeper has a beaker already." return else if(istype(G, /obj/item/weapon/grab)) @@ -225,7 +225,7 @@ return if(src.occupant) - user << "\blue The sleeper is already occupied!" + user << "The sleeper is already occupied!" return for(var/mob/living/carbon/slime/M in range(1,G:affecting)) @@ -237,7 +237,7 @@ if(do_after(user, 20)) if(src.occupant) - user << "\blue The sleeper is already occupied!" + user << "The sleeper is already occupied!" return if(!G || !G:affecting) return var/mob/M = G:affecting @@ -350,7 +350,7 @@ proc/check(mob/living/user as mob) if(src.occupant) - user << text("\blue Occupant ([]) Statistics:", src.occupant) + user << text("Occupant ([]) Statistics:", src.occupant) var/t1 switch(src.occupant.stat) if(0.0) @@ -360,20 +360,20 @@ if(2.0) t1 = "*dead*" else - user << text("[]\t Health %: [] ([])", (src.occupant.health > 50 ? "\blue " : "\red "), src.occupant.health, t1) - user << text("[]\t -Core Temperature: []°C ([]°F)
", (src.occupant.bodytemperature > 50 ? "" : ""), src.occupant.bodytemperature-T0C, src.occupant.bodytemperature*1.8-459.67) - user << text("[]\t -Brute Damage %: []", (src.occupant.getBruteLoss() < 60 ? "\blue " : "\red "), src.occupant.getBruteLoss()) - user << text("[]\t -Respiratory Damage %: []", (src.occupant.getOxyLoss() < 60 ? "\blue " : "\red "), src.occupant.getOxyLoss()) - user << text("[]\t -Toxin Content %: []", (src.occupant.getToxLoss() < 60 ? "\blue " : "\red "), src.occupant.getToxLoss()) - user << text("[]\t -Burn Severity %: []", (src.occupant.getFireLoss() < 60 ? "\blue " : "\red "), src.occupant.getFireLoss()) - user << "\blue Expected time till occupant can safely awake: (note: If health is below 20% these times are inaccurate)" - user << text("\blue \t [] second\s (if around 1 or 2 the sleeper is keeping them asleep.)", src.occupant.paralysis / 5) + user << text("\t Health %: [] ([])", (src.occupant.health > 50 ? "notice" : "warning"), src.occupant.health, t1) + user << text("\t -Core Temperature: []°C ([]°F)", (src.occupant.bodytemperature > 50 ? "notice" : "warning"), src.occupant.bodytemperature-T0C, src.occupant.bodytemperature*1.8-459.67) + user << text("\t -Brute Damage %: []", (src.occupant.getBruteLoss() < 60 ? "notice" : "warning"), src.occupant.getBruteLoss()) + user << text("\t -Respiratory Damage %: []", (src.occupant.getOxyLoss() < 60 ? "notice" : "warning"), src.occupant.getOxyLoss()) + user << text("\t -Toxin Content %: []", (src.occupant.getToxLoss() < 60 ? "notice" : "warning"), src.occupant.getToxLoss()) + user << text("\t -Burn Severity %: []", (src.occupant.getFireLoss() < 60 ? "notice" : "warning"), src.occupant.getFireLoss()) + user << "Expected time till occupant can safely awake: (note: If health is below 20% these times are inaccurate)" + user << text("\t [] second\s (if around 1 or 2 the sleeper is keeping them asleep.)", src.occupant.paralysis / 5) if(src.beaker) - user << text("\blue \t Dialysis Output Beaker has [] of free space remaining.", src.beaker.reagents.maximum_volume - src.beaker.reagents.total_volume) + user << text("\t Dialysis Output Beaker has [] of free space remaining.", src.beaker.reagents.maximum_volume - src.beaker.reagents.total_volume) else - user << "\blue No Dialysis Output Beaker loaded." + user << "No Dialysis Output Beaker loaded." else - user << "\blue There is no one inside!" + user << "There is no one inside!" return @@ -412,7 +412,7 @@ return if(src.occupant) - usr << "\blue The sleeper is already occupied!" + usr << "The sleeper is already occupied!" return for(var/mob/living/carbon/slime/M in range(1,usr)) @@ -422,7 +422,7 @@ visible_message("[usr] starts climbing into the sleeper.", 3) if(do_after(usr, 20)) if(src.occupant) - usr << "\blue The sleeper is already occupied!" + usr << "The sleeper is already occupied!" return usr.stop_pulling() usr.client.perspective = EYE_PERSPECTIVE diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 645bfa5bcc..a1697cc418 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -42,10 +42,10 @@ if (usr.stat != 0) return if (src.occupant) - usr << "\blue The scanner is already occupied!" + usr << "The scanner is already occupied!" return if (usr.abiotic()) - usr << "\blue Subject cannot have abiotic items on." + usr << "The subject cannot have abiotic items on." return usr.pulling = null usr.client.perspective = EYE_PERSPECTIVE @@ -80,10 +80,10 @@ if ((!( istype(G, /obj/item/weapon/grab) ) || !( ismob(G.affecting) ))) return if (src.occupant) - user << "\blue The scanner is already occupied!" + user << "The scanner is already occupied!" return if (G.affecting.abiotic()) - user << "\blue Subject cannot have abiotic items on." + user << "Subject cannot have abiotic items on." return var/mob/M = G.affecting if (M.client) @@ -220,10 +220,10 @@ if(stat & (NOPOWER|BROKEN)) return if(!connected || (connected.stat & (NOPOWER|BROKEN))) - user << "\red This console is not connected to a functioning body scanner." + user << "This console is not connected to a functioning body scanner." return if(!ishuman(connected.occupant)) - user << "\red This device can only scan compatible lifeforms." + user << "This device can only scan compatible lifeforms." return var/dat @@ -449,4 +449,4 @@ dat += text("Cataracts detected.
") if(occ["sdisabilities"] & NEARSIGHTED) dat += text("Retinal misalignment detected.
") - return dat \ No newline at end of file + return dat diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 5f6e40e414..9d45b14414 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -52,7 +52,7 @@ if (user.machine==src) src.attack_hand(usr) else - user << "\red Access denied." + user << "Access denied." return return @@ -127,4 +127,4 @@ if (uses >= 0) cooldown_on = 0 src.power_change() - return \ No newline at end of file + return diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index b5bd66f4cf..fbf9bf5e7b 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -800,9 +800,9 @@ else if(allowed(usr) && !wires.IsIndexCut(AALARM_WIRE_IDSCAN)) locked = !locked - user << "\blue You [ locked ? "lock" : "unlock"] the Air Alarm interface." + user << "You [ locked ? "lock" : "unlock"] the Air Alarm interface." else - user << "\red Access denied." + user << "Access denied." return if(1) @@ -941,11 +941,11 @@ FIRE ALARM if (istype(W, /obj/item/device/multitool)) src.detecting = !( src.detecting ) if (src.detecting) - user.visible_message("\red [user] has reconnected [src]'s detecting unit!", "You have reconnected [src]'s detecting unit.") + user.visible_message("\The [user] has reconnected [src]'s detecting unit!", "You have reconnected [src]'s detecting unit.") else - user.visible_message("\red [user] has disconnected [src]'s detecting unit!", "You have disconnected [src]'s detecting unit.") + user.visible_message("\The [user] has disconnected [src]'s detecting unit!", "You have disconnected [src]'s detecting unit.") else if (istype(W, /obj/item/weapon/wirecutters)) - user.visible_message("\red [user] has cut the wires inside \the [src]!", "You have cut the wires inside \the [src].") + user.visible_message("\The [user] has cut the wires inside \the [src]!", "You have cut the wires inside \the [src].") playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) buildstage = 1 update_icon() @@ -957,7 +957,7 @@ FIRE ALARM buildstage = 2 return else - user << "You need 5 pieces of cable to do wire \the [src]." + user << "You need 5 pieces of cable to wire \the [src]." return else if(istype(W, /obj/item/weapon/crowbar)) user << "You pry out the circuit!" diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 59e0f8beac..c84d030cc4 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -247,7 +247,7 @@ update_flag /obj/machinery/portable_atmospherics/canister/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) if(!istype(W, /obj/item/weapon/wrench) && !istype(W, /obj/item/weapon/tank) && !istype(W, /obj/item/device/analyzer) && !istype(W, /obj/item/device/pda)) - visible_message("\red [user] hits the [src] with a [W]!") + visible_message("\The [user] hits \the [src] with \a [W]!") src.health -= W.force src.add_fingerprint(user) healthcheck() diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 095aec4a24..e2a0aed826 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -69,10 +69,10 @@ var/t = "A gas flow meter. " if(get_dist(user, src) > 3 && !(istype(user, /mob/living/silicon/ai) || istype(user, /mob/dead))) - t += "\blue You are too far away to read it." + t += "You are too far away to read it." else if(stat & (NOPOWER|BROKEN)) - t += "\red The display is off." + t += "The display is off." else if(src.target) var/datum/gas_mixture/environment = target.return_air() @@ -97,11 +97,11 @@ if (!istype(W, /obj/item/weapon/wrench)) return ..() playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + user << "You begin to unfasten \the [src]..." if (do_after(user, 40)) user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src].", \ + "\The [user] unfastens \the [src].", \ + "You have unfastened \the [src].", \ "You hear ratchet.") new /obj/item/pipe_meter(src.loc) qdel(src) diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 9ba8c2de49..58c3fc0e24 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -118,39 +118,39 @@ else if (istype(W, /obj/item/weapon/wrench)) if(connected_port) disconnect() - user << "\blue You disconnect [name] from the port." + user << "You disconnect \the [src] from the port." update_icon() return else var/obj/machinery/atmospherics/portables_connector/possible_port = locate(/obj/machinery/atmospherics/portables_connector/) in loc if(possible_port) if(connect(possible_port)) - user << "\blue You connect [name] to the port." + user << "You connect \the [src] to the port." update_icon() return else - user << "\blue [name] failed to connect to the port." + user << "\The [src] failed to connect to the port." return else - user << "\blue Nothing happens." + user << "Nothing happens." return else if ((istype(W, /obj/item/device/analyzer)) && Adjacent(user)) - visible_message("\red [user] has used [W] on \icon[icon]") + visible_message("\The [user] has used \the [W] on \the [src] \icon[icon]") if(air_contents) var/pressure = air_contents.return_pressure() var/total_moles = air_contents.total_moles - user << "\blue Results of analysis of \icon[icon]" + user << "Results of analysis of \icon[icon]" if (total_moles>0) - user << "\blue Pressure: [round(pressure,0.1)] kPa" + user << "Pressure: [round(pressure,0.1)] kPa" for(var/g in air_contents.gas) - user << "\blue [gas_data.name[g]]: [round((air_contents.gas[g] / total_moles) * 100)]%" - user << "\blue Temperature: [round(air_contents.temperature-T0C)]°C" + user << "[gas_data.name[g]]: [round((air_contents.gas[g] / total_moles) * 100)]%" + user << "Temperature: [round(air_contents.temperature-T0C)]°C" else - user << "\blue Tank is empty!" + user << "Tank is empty!" else - user << "\blue Tank is empty!" + user << "Tank is empty!" return return @@ -175,15 +175,15 @@ C.add_fingerprint(user) cell = C C.loc = src - user.visible_message("\blue [user] opens the panel on [src] and inserts [C].", "\blue You open the panel on [src] and insert [C].") + user.visible_message("[user] opens the panel on [src] and inserts [C].", "You open the panel on [src] and insert [C].") return if(istype(I, /obj/item/weapon/screwdriver)) if(!cell) - user << "\red There is no power cell installed." + user << "There is no power cell installed." return - user.visible_message("\blue [user] opens the panel on [src] and removes [cell].", "\blue You open the panel on [src] and remove [cell].") + user.visible_message("[user] opens the panel on [src] and removes [cell].", "You open the panel on [src] and remove [cell].") cell.add_fingerprint(user) cell.loc = src.loc cell = null diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index 6e52f88b3e..f705a62ae2 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -165,7 +165,7 @@ name = "[name] (ID [id])" /obj/machinery/portable_atmospherics/powered/scrubber/huge/attack_hand(var/mob/user as mob) - usr << "\blue You can't directly interact with this machine. Use the scrubber control console." + usr << "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 @@ -206,12 +206,12 @@ /obj/machinery/portable_atmospherics/powered/scrubber/huge/attackby(var/obj/item/I as obj, var/mob/user as mob) if(istype(I, /obj/item/weapon/wrench)) if(on) - user << "\blue Turn it off first!" + user << "Turn \the [src] off first!" return anchored = !anchored playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You [anchored ? "wrench" : "unwrench"] \the [src]." + user << "You [anchored ? "wrench" : "unwrench"] \the [src]." return @@ -233,7 +233,7 @@ /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/attackby(var/obj/item/I as obj, var/mob/user as mob) if(istype(I, /obj/item/weapon/wrench)) - user << "\blue The bolts are too tight for you to unscrew!" + user << "The bolts are too tight for you to unscrew!" return - ..() \ No newline at end of file + ..() diff --git a/code/game/machinery/bees_items.dm b/code/game/machinery/bees_items.dm index 05f9231f8a..cf9018726c 100644 --- a/code/game/machinery/bees_items.dm +++ b/code/game/machinery/bees_items.dm @@ -21,9 +21,9 @@ if(B.feral < 0) caught_bees += B.strength qdel(B) - user.visible_message("\blue [user] nets some bees.","\blue You net up some of the becalmed bees.") + user.visible_message("\The [user] nets some bees.","You net up some of the becalmed bees.") else - user.visible_message("\red [user] swings at some bees, they don't seem to like it.","\red You swing at some bees, they don't seem to like it.") + user.visible_message("\The [user] swings at some bees, they don't seem to like it.","You swing at some bees, they don't seem to like it.") B.feral = 5 B.target_mob = user diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index 70740901fa..ad9a964ca9 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -60,7 +60,7 @@ if(health < maxhealth) if(open) health = min(maxhealth, health+10) - user.visible_message("\red [user] repairs [src]!","\blue You repair [src]!") + user.visible_message("[user] repairs [src]!","You repair [src]!") else user << "Unable to repair with the maintenance panel closed." else @@ -143,7 +143,7 @@ if(user.species.can_shred(user)) src.health -= rand(15,30)*brute_dam_coeff - src.visible_message("\red [user] has slashed [src]!") + src.visible_message("[user] has slashed [src]!") playsound(src.loc, 'sound/weapons/slice.ogg', 25, 1, -1) if(prob(10)) new /obj/effect/decal/cleanable/blood/oil(src.loc) diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index 3e6f0d8e33..4f9b48026d 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -90,7 +90,7 @@ /obj/machinery/bot/mulebot/attackby(var/obj/item/I, var/mob/user) if(istype(I,/obj/item/weapon/card/emag)) locked = !locked - user << "\blue You [locked ? "lock" : "unlock"] the mulebot's controls!" + user << "You [locked ? "lock" : "unlock"] the mulebot's controls!" flick("mulebot-emagged", src) playsound(src.loc, 'sound/effects/sparks1.ogg', 100, 0) else if(istype(I,/obj/item/weapon/cell) && open && !cell) @@ -101,16 +101,16 @@ updateDialog() else if(istype(I,/obj/item/weapon/screwdriver)) if(locked) - user << "\blue The maintenance hatch cannot be opened or closed while the controls are locked." + user << "The maintenance hatch cannot be opened or closed while the controls are locked." return open = !open if(open) - src.visible_message("[user] opens the maintenance hatch of [src]", "\blue You open [src]'s maintenance hatch.") + src.visible_message("[user] opens the maintenance hatch of [src]", "You open [src]'s maintenance hatch.") on = 0 icon_state="mulebot-hatch" else - src.visible_message("[user] closes the maintenance hatch of [src]", "\blue You close [src]'s maintenance hatch.") + src.visible_message("[user] closes the maintenance hatch of [src]", "You close [src]'s maintenance hatch.") icon_state = "mulebot0" updateDialog() @@ -118,15 +118,15 @@ if (src.health < maxhealth) src.health = min(maxhealth, src.health+25) user.visible_message( - "\red [user] repairs [src]!", - "\blue You repair [src]!" + "\The [user] repairs \the [src]!", + "You repair \the [src]!" ) else - user << "\blue [src] does not need a repair!" + user << "[src] does not need a repair!" else if(load && ismob(load)) // chance to knock off rider if(prob(1+I.force * 2)) unload(0) - user.visible_message("\red [user] knocks [load] off [src] with \the [I]!", "\red You knock [load] off [src] with \the [I]!") + user.visible_message("[user] knocks [load] off [src] with \the [I]!", "You knock [load] off [src] with \the [I]!") else user << "You hit [src] with \the [I] but to no effect." else @@ -150,7 +150,7 @@ if(prob(50) && !isnull(load)) unload(0) if(prob(25)) - src.visible_message("\red Something shorts out inside [src]!") + src.visible_message("Something shorts out inside [src]!") var/index = 1<< (rand(0,9)) if(wires & index) wires &= ~index @@ -250,14 +250,14 @@ locked = !locked updateDialog() else - usr << "\red Access denied." + usr << "Access denied." return if("power") if (src.on) turn_off() else if (cell && !open) if (!turn_on()) - usr << "\red You can't switch on [src]." + usr << "You can't switch on [src]." return else return @@ -272,7 +272,7 @@ cell.add_fingerprint(usr) cell = null - usr.visible_message("\blue [usr] removes the power cell from [src].", "\blue You remove the power cell from [src].") + usr.visible_message("[usr] removes the power cell from [src].", "You remove the power cell from [src].") updateDialog() if("cellinsert") @@ -284,7 +284,7 @@ C.loc = src C.add_fingerprint(usr) - usr.visible_message("\blue [usr] inserts a power cell into [src].", "\blue You insert the power cell into [src].") + usr.visible_message("[usr] inserts a power cell into [src].", "You insert the power cell into [src].") updateDialog() @@ -702,9 +702,9 @@ var/mob/M = obs if(ismob(M)) if(istype(M,/mob/living/silicon/robot)) - src.visible_message("\red [src] bumps into [M]!") + src.visible_message("[src] bumps into [M]!") else - src.visible_message("\red [src] knocks over [M]!") + src.visible_message("[src] knocks over [M]!") M.stop_pulling() M.Stun(8) M.Weaken(5) @@ -718,7 +718,7 @@ // called from mob/living/carbon/human/Crossed() // when mulebot is in the same loc /obj/machinery/bot/mulebot/proc/RunOver(var/mob/living/carbon/human/H) - src.visible_message("\red [src] drives over [H]!") + src.visible_message("[src] drives over [H]!") playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) var/damage = rand(5,15) @@ -866,7 +866,7 @@ /obj/machinery/bot/mulebot/explode() - src.visible_message("\red [src] blows apart!", 1) + src.visible_message("[src] blows apart!", 1) var/turf/Tsec = get_turf(src) new /obj/item/device/assembly/prox_sensor(Tsec) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 6675f183fd..7f288ee693 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -180,13 +180,13 @@ else if (istype(W, /obj/item/weapon/camera_bug)) if (!src.can_use()) - user << "\blue Camera non-functional" + user << "Camera non-functional." return if (src.bugged) - user << "\blue Camera bug removed." + user << "Camera bug removed." src.bugged = 0 else - user << "\blue Camera bugged." + user << "Camera bugged." src.bugged = 1 else if(W.damtype == BRUTE || W.damtype == BURN) //bashing cameras diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 6ccea2c382..d8c776bc36 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -47,20 +47,20 @@ loc = sanitize(loc) if(!loc) - src << "\red Must supply a location name" + src << "Must supply a location name" return if(stored_locations.len >= max_locations) - src << "\red Cannot store additional locations. Remove one first" + src << "Cannot store additional locations. Remove one first" return if(loc in stored_locations) - src << "\red There is already a stored location by this name" + src << "There is already a stored location by this name" return var/L = src.eyeobj.getLoc() if (InvalidPlayerTurf(get_turf(L))) - src << "\red Unable to store this location" + src << "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)) - src << "\red Location [loc] not found" + src << "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)) - src << "\red Location [loc] not found" + src << "Location [loc] not found" return stored_locations.Remove(loc) diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 683e6e1220..b3ae326e5c 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -42,14 +42,14 @@ if(istype(W, /obj/item/weapon/cell) && anchored) if(charging) - user << "\red There is already a cell in the charger." + user << "There is already a cell in the charger." 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! - user << "\red The [name] blinks red as you try to insert the cell!" + user << "The [name] blinks red as you try to insert the cell!" return user.drop_item() @@ -60,7 +60,7 @@ update_icon() else if(istype(W, /obj/item/weapon/wrench)) if(charging) - user << "\red Remove the cell first!" + user << "Remove the cell first!" return anchored = !anchored diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 53416cd2b3..407b007c24 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -17,7 +17,7 @@ if(istype(P, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) - user << "\blue You wrench the frame into place." + user << "You wrench the frame into place." anchored = 1 state = 1 if(istype(P, /obj/item/weapon/weldingtool)) @@ -28,31 +28,31 @@ playsound(loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20)) if(!src || !WT.remove_fuel(0, user)) return - user << "\blue You deconstruct the frame." + user << "You deconstruct the frame." new /obj/item/stack/material/plasteel( loc, 4) qdel(src) if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) - user << "\blue You unfasten the frame." + user << "You unfasten the frame." anchored = 0 state = 0 if(istype(P, /obj/item/weapon/circuitboard/aicore) && !circuit) playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "\blue You place the circuit board inside the frame." + user << "You place the circuit board inside the frame." icon_state = "1" circuit = P user.drop_item() P.loc = src if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You screw the circuit board into place." + user << "You screw the circuit board into place." state = 2 icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the circuit board." + user << "You remove the circuit board." state = 1 icon_state = "0" circuit.loc = loc @@ -60,7 +60,7 @@ if(2) if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You unfasten the circuit board." + user << "You unfasten the circuit board." state = 1 icon_state = "1" if(istype(P, /obj/item/stack/cable_coil)) @@ -82,7 +82,7 @@ user << "Get that brain out of there first" else playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "\blue You remove the cables." + user << "You remove the cables." state = 2 icon_state = "2" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( loc ) @@ -126,14 +126,14 @@ if(istype(P, /obj/item/device/mmi)) var/obj/item/device/mmi/M = P if(!M.brainmob) - user << "\red Sticking an empty [P] into the frame would sort of defeat the purpose." + user << "Sticking an empty [P] into the frame would sort of defeat the purpose." return if(M.brainmob.stat == 2) - user << "\red Sticking a dead [P] into the frame would sort of defeat the purpose." + user << "Sticking a dead [P] into the frame would sort of defeat the purpose." return if(jobban_isbanned(M.brainmob, "AI")) - user << "\red This [P] does not seem to fit." + user << "This [P] does not seem to fit." return if(M.brainmob.mind) @@ -148,7 +148,7 @@ if(istype(P, /obj/item/weapon/crowbar) && brain) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the brain." + user << "You remove the brain." brain.loc = loc brain = null icon_state = "3" @@ -156,7 +156,7 @@ if(4) if(istype(P, /obj/item/weapon/crowbar)) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the glass panel." + user << "You remove the glass panel." state = 3 if (brain) icon_state = "3b" @@ -167,7 +167,7 @@ if(istype(P, /obj/item/weapon/screwdriver)) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You connect the monitor." + user << "You connect the monitor." if(!brain) var/open_for_latejoin = alert(user, "Would you like this core to be open for latejoining AIs?", "Latejoin", "Yes", "Yes", "No") == "Yes" var/obj/structure/AIcore/deactivated/D = new(loc) @@ -202,7 +202,7 @@ transfer.aiRadio.disabledAi = 0 transfer.loc = get_turf(src) transfer.cancel_camera() - user << "\blue Transfer successful: \black [transfer.name] ([rand(1000,9999)].exe) downloaded to host terminal. Local copy wiped." + user << "Transfer successful: [transfer.name] ([rand(1000,9999)].exe) downloaded to host terminal. Local copy wiped." transfer << "You have been uploaded to a stationary terminal. Remote device connection restored." if(card) @@ -224,23 +224,23 @@ if(transfer) load_ai(transfer,card,user) else - user << "\red ERROR: \black Unable to locate artificial intelligence." + user << "ERROR: Unable to locate artificial intelligence." return else if(istype(W, /obj/item/weapon/wrench)) if(anchored) - user.visible_message("\blue \The [user] starts to unbolt \the [src] from the plating...") + user.visible_message("\The [user] starts to unbolt \the [src] from the plating...") if(!do_after(user,40)) - user.visible_message("\blue \The [user] decides not to unbolt \the [src].") + user.visible_message("\The [user] decides not to unbolt \the [src].") return - user.visible_message("\blue \The [user] finishes unfastening \the [src]!") + user.visible_message("\The [user] finishes unfastening \the [src]!") anchored = 0 return else - user.visible_message("\blue \The [user] starts to bolt \the [src] to the plating...") + user.visible_message("\The [user] starts to bolt \the [src] to the plating...") if(!do_after(user,40)) - user.visible_message("\blue \The [user] decides not to bolt \the [src].") + user.visible_message("\The [user] decides not to bolt \the [src].") return - user.visible_message("\blue \The [user] finishes fastening down \the [src]!") + user.visible_message("\The [user] finishes fastening down \the [src]!") anchored = 1 return else diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 8486fdf251..133a77cd68 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -18,7 +18,7 @@ // Transfer over the AI. transfer << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here." - user << "\blue Transfer successful: \black [transfer.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." + user << "Transfer successful: [transfer.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." transfer.loc = src transfer.cancel_camera() @@ -44,7 +44,7 @@ if(istype(comp_ai)) if(active) - user << "\red ERROR: \black Reconstruction in progress." + user << "ERROR: Reconstruction in progress." return card.grab_ai(comp_ai, user) if(!(locate(/mob/living/silicon/ai) in src)) occupant = null diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index c0c798f3eb..07b075a5f1 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -33,8 +33,8 @@ /obj/machinery/computer/atmoscontrol/attackby(var/obj/item/I as obj, var/mob/user as mob) if(istype(I, /obj/item/weapon/card/emag) && !emagged) - user.visible_message("\red \The [user] swipes \a [I] through \the [src], causing the screen to flash!",\ - "\red You swipe your [I] through \the [src], the screen flashing as you gain full control.",\ + user.visible_message("\The [user] swipes \a [I] through \the [src], causing the screen to flash!",\ + "You swipe your [I] through \the [src], the screen flashing as you gain full control.",\ "You hear the swipe of a card through a reader, and an electronic warble.") atmos_control.emagged = 1 return diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 7cae6c6d93..0c5f59c73f 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -16,7 +16,7 @@ if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) - user << "\blue You wrench the frame into place." + user << "You wrench the frame into place." src.anchored = 1 src.state = 1 if(istype(P, /obj/item/weapon/weldingtool)) @@ -27,35 +27,35 @@ playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20)) if(!src || !WT.isOn()) return - user << "\blue You deconstruct the frame." + user << "You deconstruct the frame." new /obj/item/stack/material/steel( src.loc, 5 ) qdel(src) if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) - user << "\blue You unfasten the frame." + user << "You unfasten the frame." src.anchored = 0 src.state = 0 if(istype(P, /obj/item/weapon/circuitboard) && !circuit) var/obj/item/weapon/circuitboard/B = P if(B.board_type == "computer") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "\blue You place the circuit board inside the frame." + user << "You place the circuit board inside the frame." src.icon_state = "1" src.circuit = P user.drop_item() P.loc = src else - user << "\red This frame does not accept circuit boards of this type!" + user << "This frame does not accept circuit boards of this type!" if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You screw the circuit board into place." + user << "You screw the circuit board into place." src.state = 2 src.icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the circuit board." + user << "You remove the circuit board." src.state = 1 src.icon_state = "0" circuit.loc = src.loc @@ -63,7 +63,7 @@ if(2) if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You unfasten the circuit board." + user << "You unfasten the circuit board." src.state = 1 src.icon_state = "1" if(istype(P, /obj/item/stack/cable_coil)) @@ -81,7 +81,7 @@ if(3) if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "\blue You remove the cables." + user << "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 ) @@ -102,13 +102,13 @@ if(4) if(istype(P, /obj/item/weapon/crowbar)) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the glass panel." + user << "You remove the glass panel." src.state = 3 src.icon_state = "3" new /obj/item/stack/material/glass( src.loc, 2 ) if(istype(P, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You connect the monitor." + user << "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 95235be3e4..082ad398bf 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -94,7 +94,7 @@ attack_hand(var/mob/user as mob) if (src.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + user << "Unable to establish a connection: You're too far away from the station!" return if(stat & (NOPOWER|BROKEN)) return diff --git a/code/game/machinery/computer/camera_circuit.dm b/code/game/machinery/computer/camera_circuit.dm index 3114f537e3..25baf81486 100644 --- a/code/game/machinery/computer/camera_circuit.dm +++ b/code/game/machinery/computer/camera_circuit.dm @@ -45,13 +45,13 @@ else return authorised = 1 - user << "\blue You authorised the circuit network!" + user << "You authorised the circuit network!" updateDialog() else - user << "\blue You must select a camera network circuit!" + user << "You must select a camera network circuit!" else if(istype(I,/obj/item/weapon/screwdriver)) secured = !secured - user.visible_message("\blue The [src] can [secured ? "no longer" : "now"] be modified.") + user.visible_message("The [src] can [secured ? "no longer" : "now"] be modified.") updateBuildPath() return @@ -114,14 +114,14 @@ else return authorised = 1 - usr << "\blue You authorised the circuit network!" + usr << "You authorised the circuit network!" updateDialog() else - usr << "\blue You must select a camera network circuit!" + usr << "You must select a camera network circuit!" else if( href_list["removeauth"] ) authorised = 0 updateDialog() updateDialog() if(istype(src.loc,/mob)) - attack_self(src.loc) \ No newline at end of file + attack_self(src.loc) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 9879e34565..ab991f2fea 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -208,7 +208,7 @@ jobdatum = J break if(!jobdatum) - usr << "\red No log exists for this job: [t1]" + usr << "No log exists for this job: [t1]" return access = jobdatum.get_access() diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index baa75fed05..b32f9e9daa 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -124,12 +124,12 @@ for (var/obj/C in src) C.loc = src.loc if (src.stat & BROKEN) - user << "\blue The broken glass falls out." + user << "The broken glass falls out." new /obj/item/weapon/material/shard( src.loc ) A.state = 3 A.icon_state = "3" else - user << "\blue You disconnect the monitor." + user << "You disconnect the monitor." A.state = 4 A.icon_state = "4" M.deconstruct(src) diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index 5add587e77..dc28c5c5dc 100644 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -185,6 +185,6 @@ pass.reason = reason pass.name = "guest pass #[number]" else - usr << "\red Cannot issue pass without issuing ID." + usr << "Cannot issue pass without issuing ID." updateUsrDialog() return diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 2d73e17da8..a64fca5d4a 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -18,15 +18,15 @@ opened = !opened if(opened) - usr << "\blue The access panel is now open." + usr << "The access panel is now open." else - usr << "\blue The access panel is now closed." + usr << "The access panel is now closed." return attackby(obj/item/weapon/O as obj, mob/user as mob) if (user.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + user << "Unable to establish a connection: You're too far away from the station!" return if(istype(O, /obj/item/weapon/aiModule)) var/obj/item/weapon/aiModule/M = O diff --git a/code/game/machinery/computer/lockdown.dm b/code/game/machinery/computer/lockdown.dm index c1eb5d8e06..fd702e5510 100644 --- a/code/game/machinery/computer/lockdown.dm +++ b/code/game/machinery/computer/lockdown.dm @@ -103,7 +103,7 @@ t += "\[+\] " + curNetId + "" t += "" if(empty) - t += "\red No networks connected.
" + t += "No networks connected.
" t += "Refresh
" t += "Close
" user << browse(t, "window=lockdown;size=550x600") diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 7e23437e25..2acf157577 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -56,7 +56,7 @@ playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if(stat & BROKEN) - user << "\blue The broken glass falls out." + user << "The broken glass falls out." var/obj/structure/computerframe/A = new /obj/structure/computerframe( loc ) new /obj/item/weapon/material/shard( loc ) @@ -80,7 +80,7 @@ A.anchored = 1 qdel(src) else - user << "\blue You disconnect the monitor." + user << "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)) - user << "\red Access Denied" + user << "Access Denied" return else ..() diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 93d38fabeb..3dd181c917 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -96,7 +96,7 @@ var/obj/item/weapon/implant/I = locate(href_list["warn"]) if((I)&&(I.imp_in)) var/mob/living/carbon/R = I.imp_in - R << "\green You hear a voice in your head saying: '[warning]'" + R << "You hear a voice in your head saying: '[warning]'" src.add_fingerprint(usr) src.updateUsrDialog() diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm index 59aa575a5b..8ff3a8e103 100644 --- a/code/game/machinery/computer/prisonshuttle.dm +++ b/code/game/machinery/computer/prisonshuttle.dm @@ -37,29 +37,29 @@ var/prison_shuttle_timeleft = 0 A.anchored = 1 if (src.stat & BROKEN) - user << "\blue The broken glass falls out." + user << "The broken glass falls out." new /obj/item/weapon/material/shard( src.loc ) A.state = 3 A.icon_state = "3" else - user << "\blue You disconnect the monitor." + user << "You disconnect the monitor." A.state = 4 A.icon_state = "4" qdel(src) else if(istype(I,/obj/item/weapon/card/emag) && (!hacked)) hacked = 1 - user << "\blue You disable the lock." + user << "You disable the lock." else return src.attack_hand(user) attack_hand(var/mob/user as mob) if(!src.allowed(user) && (!hacked)) - user << "\red Access Denied." + user << "Access Denied." return if(prison_break) - user << "\red Unable to locate shuttle." + user << "Unable to locate shuttle." return if(..()) return @@ -88,11 +88,11 @@ var/prison_shuttle_timeleft = 0 if (href_list["sendtodock"]) if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." + usr << "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") - usr << "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds." + usr << "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 @@ -102,11 +102,11 @@ var/prison_shuttle_timeleft = 0 else if (href_list["sendtostation"]) if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." + usr << "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") - usr << "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds." + usr << "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 @@ -174,7 +174,7 @@ var/prison_shuttle_timeleft = 0 if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." + usr << "The prison shuttle is unable to leave." return var/area/start_location = locate(/area/shuttle/prison/prison) @@ -203,7 +203,7 @@ var/prison_shuttle_timeleft = 0 if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." + usr << "The prison shuttle is unable to leave." return var/area/start_location = locate(/area/shuttle/prison/station) diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index d0d72fc53f..3f6f8b54bc 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -61,8 +61,8 @@ target << "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered." target.ResetSecurityCodes() else - message_admins("\blue [key_name_admin(usr)] detonated [target.name]!") - log_game("\blue [key_name_admin(usr)] detonated [target.name]!") + message_admins("[key_name_admin(usr)] detonated [target.name]!") + log_game("[key_name(usr)] detonated [target.name]!") target << "Self-destruct command received." spawn(10) target.self_destruct() @@ -90,7 +90,7 @@ if(!target || !istype(target)) return - message_admins("\blue [key_name_admin(usr)] [target.canmove ? "locked down" : "released"] [target.name]!") + message_admins("[key_name_admin(usr)] [target.canmove ? "locked down" : "released"] [target.name]!") log_game("[key_name(usr)] [target.canmove ? "locked down" : "released"] [target.name]!") target.canmove = !target.canmove if (target.lockcharge) @@ -122,7 +122,7 @@ if(!target || !istype(target)) return - message_admins("\blue [key_name_admin(usr)] emagged [target.name] using robotic console!") + message_admins("[key_name_admin(usr)] emagged [target.name] using robotic console!") log_game("[key_name(usr)] emagged [target.name] using robotic console!") target.emagged = 1 target << "Failsafe protocols overriden. New tools available." @@ -145,7 +145,7 @@ user << "Self-destruct aborted - safety active" return - message_admins("\blue [key_name_admin(usr)] detonated all cyborgs!") + message_admins("[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) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index c97be5be09..8534128fb7 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -56,7 +56,7 @@ if(..()) return if (src.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + user << "Unable to establish a connection: You're too far away from the station!" return var/dat diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 3fca14135a..f89fce4bbe 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -37,11 +37,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") - world << text("\blue Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) + world << text("Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) else message_admins("[key_name_admin(user)] has launched the shuttle") log_game("[user.ckey] has launched the shuttle early") - world << "\blue Alert: Shuttle launch time shortened to 10 seconds!" + world << "Alert: Shuttle launch time shortened to 10 seconds!" emergency_shuttle.set_launch_countdown(10) //src.authorized = null qdel(src.authorized) @@ -49,10 +49,10 @@ if("Repeal") src.authorized -= W:registered_name - world << text("\blue Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) + world << text("Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) if("Abort") - world << "\blue All authorizations to shortening time for shuttle launch have been revoked!" + world << "All authorizations to shortening time for shuttle launch have been revoked!" src.authorized.len = 0 src.authorized = list( ) @@ -62,7 +62,7 @@ if(!emagged && !emergency_shuttle.location() && user.get_active_hand() == W) switch(choice) if("Launch") - world << "\blue Alert: Shuttle launch time shortened to 10 seconds!" + world << "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/skills.dm b/code/game/machinery/computer/skills.dm index e0c6f724ab..422e397a0e 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -39,7 +39,7 @@ if(..()) return if (src.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + user << "Unable to establish a connection: You're too far away from the station!" return var/dat diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 3d44a7a260..ea8cf4d726 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 - M << "\red You have arrived at Central Command. Operation has ended!" + M << "You have arrived at Central Command. 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()) - usr << "\red The Special Operations shuttle is unable to leave." + usr << "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 - M << "\red You have arrived to [station_name]. Commence operation!" + M << "You have arrived to [station_name]. Commence operation!" for(var/obj/machinery/computer/specops_shuttle/S in world) S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY @@ -251,13 +251,13 @@ var/specops_shuttle_timeleft = 0 /obj/machinery/computer/specops_shuttle/attackby(I as obj, user as mob) if(istype(I,/obj/item/weapon/card/emag)) - user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals." + user << "The electronic systems in this console are far too advanced for your primitive hacking peripherals." else return attack_hand(user) /obj/machinery/computer/specops_shuttle/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "\red Access Denied." + user << "Access Denied." return if(..()) @@ -288,14 +288,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()) - usr << "\blue Central Command will not allow the Special Operations shuttle to return yet." + usr << "Central Command will not allow the Special Operations shuttle to return yet." if(world.timeofday <= specops_shuttle_timereset) if (((world.timeofday - specops_shuttle_timereset)/10) > 60) - usr << "\blue [-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!" - usr << "\blue [-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!" + usr << "[-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!" + usr << "[-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!" return - usr << "\blue The Special Operations shuttle will arrive at Central Command in [(SPECOPS_MOVETIME/10)] seconds." + usr << "The Special Operations shuttle will arrive at Central Command in [(SPECOPS_MOVETIME/10)] seconds." temp += "Shuttle departing.

OK" updateUsrDialog() @@ -309,10 +309,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()) - usr << "\red The Special Operations shuttle is unable to leave." + usr << "The Special Operations shuttle is unable to leave." return - usr << "\blue The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds." + usr << "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 b5df1127c9..9d05249d95 100644 --- a/code/game/machinery/computer/supply.dm +++ b/code/game/machinery/computer/supply.dm @@ -150,7 +150,7 @@ /obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "\red Access Denied." + user << "Access Denied." return if(..()) @@ -209,7 +209,7 @@ /obj/machinery/computer/supplycomp/attackby(I as obj, user as mob) if(istype(I,/obj/item/weapon/card/emag) && !hacked) - user << "\blue Special supplies unlocked." + user << "Special supplies unlocked." hacked = 1 return else diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index dd921abf09..3357072c28 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -59,7 +59,7 @@ var/syndicate_elite_shuttle_timeleft = 0 if (syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return if (!syndicate_elite_can_move()) - usr << "\red The Syndicate Elite shuttle is unable to leave." + usr << "The Syndicate Elite shuttle is unable to leave." return sleep(600) @@ -173,7 +173,7 @@ var/syndicate_elite_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - M << "\red You have arrived to [station_name]. Commence operation!" + M << "You have arrived to [station_name]. Commence operation!" /proc/syndicate_elite_can_move() if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0 @@ -187,17 +187,17 @@ var/syndicate_elite_shuttle_timeleft = 0 /obj/machinery/computer/syndicate_elite_shuttle/attackby(I as obj, user as mob) if(istype(I,/obj/item/weapon/card/emag)) - user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals." + user << "The electronic systems in this console are far too advanced for your primitive hacking peripherals." else return attack_hand(user) /obj/machinery/computer/syndicate_elite_shuttle/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "\red Access Denied." + user << "Access Denied." return // if (sent_syndicate_strike_team == 0) -// usr << "\red The strike team has not yet deployed." +// usr << "The strike team has not yet deployed." // return if(..()) @@ -227,17 +227,17 @@ var/syndicate_elite_shuttle_timeleft = 0 if (href_list["sendtodock"]) if(!syndicate_elite_shuttle_at_station|| syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return - usr << "\blue The Syndicate will not allow the Elite Squad shuttle to return." + usr << "The Syndicate will not allow the Elite Squad shuttle to return." return else if (href_list["sendtostation"]) if(syndicate_elite_shuttle_at_station || syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return if (!specops_can_move()) - usr << "\red The Syndicate Elite shuttle is unable to leave." + usr << "The Syndicate Elite shuttle is unable to leave." return - usr << "\blue The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds." + usr << "The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds." temp = "Shuttle departing.

OK" updateUsrDialog() diff --git a/code/game/machinery/computer3/bios.dm b/code/game/machinery/computer3/bios.dm index 17ed0c4789..be9314759e 100644 --- a/code/game/machinery/computer3/bios.dm +++ b/code/game/machinery/computer3/bios.dm @@ -24,22 +24,22 @@ if(istype(user,/mob/living/silicon)) if(!program.ai_allowed) - user << "\blue You are forbidden from accessing this program." + user << "You are forbidden from accessing this program." return 0 else if(program.human_controls) if(!ishuman(user)) - user << "\red Your body can't work the controls!" + user << "Your body can't work the controls!" return 0 if(user.restrained()) - user << "\red You need a free hand!" + user << "You need a free hand!" return 0 if(!in_range(src,user)) // telekinesis check if(ishuman(user) && istype(user.get_active_hand(),/obj/item/tk_grab)) if(program.human_controls) - user << "\red It's too complicated to work at a distance!" + user << "It's too complicated to work at a distance!" return 0 add_fingerprint(user) user.set_machine(src) @@ -115,7 +115,7 @@ switch(errorcode) if(PROG_CRASH) if(usr) - usr << "\red The program crashed!" + usr << "The program crashed!" usr << browse(null,"\ref[src]") Reset() @@ -143,12 +143,12 @@ if(NETWORK_FAILURE) Reset() if(usr) - usr << browse("

ERROR: Networking exception: Unable to connect to remote host.","window=\ref[src]") + usr << browse("

ERROR: Networking exception: Unable to connect to remote host.

","window=\ref[src]") else if(usr) - usr << "\red The program crashed!" + usr << "The program crashed!" usr << browse(null,"\ref[src]") testing("computer/Crash() - unknown error code [errorcode]") Reset() diff --git a/code/game/machinery/computer3/buildandrepair.dm b/code/game/machinery/computer3/buildandrepair.dm index 37783007de..f3e7981af4 100644 --- a/code/game/machinery/computer3/buildandrepair.dm +++ b/code/game/machinery/computer3/buildandrepair.dm @@ -81,7 +81,7 @@ if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) - user << "\blue You wrench the frame into place." + user << "You wrench the frame into place." src.anchored = 1 src.state = 1 if(istype(P, /obj/item/weapon/weldingtool)) @@ -92,35 +92,35 @@ playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20)) if(!src || !WT.isOn()) return - user << "\blue You deconstruct the frame." + user << "You deconstruct the frame." new /obj/item/stack/material/steel( src.loc, 5 ) qdel(src) if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20)) - user << "\blue You unfasten the frame." + user << "You unfasten the frame." src.anchored = 0 src.state = 0 if(istype(P, /obj/item/weapon/circuitboard) && !circuit) var/obj/item/weapon/circuitboard/B = P if(B.board_type == "computer") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "\blue You place the circuit board inside the frame." + user << "You place the circuit board inside the frame." src.icon_state = "1" src.circuit = P user.drop_item() P.loc = src else - user << "\red This frame does not accept circuit boards of this type!" + user << "This frame does not accept circuit boards of this type!" if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You screw the circuit board into place." + user << "You screw the circuit board into place." src.state = 2 src.icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the circuit board." + user << "You remove the circuit board." src.state = 1 src.icon_state = "0" circuit.loc = src.loc @@ -128,7 +128,7 @@ if(2) if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You unfasten the circuit board." + user << "You unfasten the circuit board." src.state = 1 src.icon_state = "1" @@ -137,10 +137,10 @@ playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) if(do_after(10)) battery.loc = loc - user << "\blue You remove [battery]." + user << "You remove [battery]." battery = null else - user << "\red There's no battery to remove!" + user << "There's no battery to remove!" if(istype(P, /obj/item/weapon/cell)) if(!battery) @@ -148,9 +148,9 @@ if(do_after(5)) battery = P P.loc = src - user << "\blue You insert [battery]." + user << "You insert [battery]." else - user << "\red There's already \an [battery] in [src]!" + user << "There's already \an [battery] in [src]!" if(istype(P, /obj/item/stack/cable_coil)) @@ -160,7 +160,7 @@ if(P) P:amount -= 5 if(!P:amount) qdel(P) - user << "\blue You add cables to the frame." + user << "You add cables to the frame." src.state = 3 src.icon_state = "3" if(3) @@ -169,7 +169,7 @@ user << "There are parts in the way!" return playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "\blue You remove the cables." + user << "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 ) @@ -184,19 +184,19 @@ if(do_after(user, 20)) if(P) P:use(2) - user << "\blue You put in the glass panel." + user << "You put in the glass panel." src.state = 4 src.icon_state = "4" if(4) if(istype(P, /obj/item/weapon/crowbar)) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the glass panel." + user << "You remove the glass panel." src.state = 3 src.icon_state = "3" new /obj/item/stack/material/glass( src.loc, 2 ) if(istype(P, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You connect the monitor." + user << "You connect the monitor." var/obj/machinery/computer3/B = new src.circuit.build_path ( src.loc, built=1 ) /*if(circuit.powernet) B:powernet = circuit.powernet if(circuit.id) B:id = circuit.id @@ -219,7 +219,7 @@ */ /obj/structure/computer3frame/proc/remove_peripheral(var/obj/item/I = null) if(!components || !components.len) - usr << "\red There are no components in [src] to take out!" + usr << "There are no components in [src] to take out!" return 0 if(!I) I = input(usr, "Remove which component?","Remove component", null) as null|obj in components @@ -258,7 +258,7 @@ else warning("Erronous component in computerframe/remove_peripheral: [I]") I.loc = loc - usr << "\blue You remove [I]" + usr << "You remove [I]" return 1 return 0 /obj/structure/computer3frame/proc/insert_peripheral(var/obj/item/I) diff --git a/code/game/machinery/computer3/component.dm b/code/game/machinery/computer3/component.dm index 0772d3e284..0f7f64d011 100644 --- a/code/game/machinery/computer3/component.dm +++ b/code/game/machinery/computer3/component.dm @@ -60,7 +60,7 @@ if(istype(comp_ai)) if(busy) - user << "\red ERROR: \black Reconstruction in progress." + user << "ERROR: Reconstruction in progress." return card.grab_ai(comp_ai, user) if(!(locate(/mob/living/silicon/ai) in src)) occupant = null @@ -82,7 +82,7 @@ // Transfer over the AI. transfer << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here." - user << "\blue Transfer successful: \black [transfer.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." + user << "Transfer successful: [transfer.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." transfer.loc = src transfer.cancel_camera() diff --git a/code/game/machinery/computer3/computer.dm b/code/game/machinery/computer3/computer.dm index 7357957a37..902d8ef1a4 100644 --- a/code/game/machinery/computer3/computer.dm +++ b/code/game/machinery/computer3/computer.dm @@ -77,7 +77,7 @@ set src in view(1) if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living)) - usr << "\red You can't do that." + usr << "You can't do that." return if(!Adjacent(usr)) diff --git a/code/game/machinery/computer3/computers/HolodeckControl.dm b/code/game/machinery/computer3/computers/HolodeckControl.dm index 9e4532604b..99424b9685 100644 --- a/code/game/machinery/computer3/computers/HolodeckControl.dm +++ b/code/game/machinery/computer3/computers/HolodeckControl.dm @@ -202,7 +202,7 @@ if(world.time < (last_change + 15))//To prevent super-spam clicking, reduced process size and annoyance -Sieve return for(var/mob/M in range(3,src)) - M.show_message("\b ERROR. Recalibrating projetion apparatus.") + M.show_message("ERROR. Recalibrating projetion apparatus.") last_change = world.time return diff --git a/code/game/machinery/computer3/computers/atmos_alert.dm b/code/game/machinery/computer3/computers/atmos_alert.dm index 00d6f87438..f3f17f892d 100644 --- a/code/game/machinery/computer3/computers/atmos_alert.dm +++ b/code/game/machinery/computer3/computers/atmos_alert.dm @@ -86,14 +86,14 @@ var/removing_zone = href_list["priority_clear"] for(var/zone in priority_air_alarms) if(ckey(zone) == removing_zone) - usr << "\green Priority Alert for area [zone] cleared." + usr << "Priority Alert for area [zone] cleared." priority_air_alarms -= zone if("minor_clear" in href_list) var/removing_zone = href_list["minor_clear"] for(var/zone in minor_air_alarms) if(ckey(zone) == removing_zone) - usr << "\green Minor Alert for area [zone] cleared." + usr << "Minor Alert for area [zone] cleared." minor_air_alarms -= zone computer.updateUsrDialog() diff --git a/code/game/machinery/computer3/computers/communications.dm b/code/game/machinery/computer3/computers/communications.dm index f00b595c6c..1b348dec80 100644 --- a/code/game/machinery/computer3/computers/communications.dm +++ b/code/game/machinery/computer3/computers/communications.dm @@ -60,7 +60,7 @@ if(!interactable() || !computer.radio || ..(href,href_list) ) return if (computer.z > 1) - usr << "\red Unable to establish a connection: \black You're too far away from the station!" + usr << "Unable to establish a connection: You're too far away from the station!" return if("main" in href_list) diff --git a/code/game/machinery/computer3/computers/law.dm b/code/game/machinery/computer3/computers/law.dm index 409552cc79..40b4bb8849 100644 --- a/code/game/machinery/computer3/computers/law.dm +++ b/code/game/machinery/computer3/computers/law.dm @@ -18,15 +18,15 @@ opened = !opened if(opened) - usr << "\blue The access panel is now open." + usr << "The access panel is now open." else - usr << "\blue The access panel is now closed." + usr << "The access panel is now closed." return attackby(obj/item/weapon/aiModule/module as obj, mob/user as mob) if (user.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + user << "Unable to establish a connection: You're too far away from the station!" return if(istype(module, /obj/item/weapon/aiModule)) module.install(src) diff --git a/code/game/machinery/computer3/computers/medical.dm b/code/game/machinery/computer3/computers/medical.dm index aec0b615f5..f39dd54de8 100644 --- a/code/game/machinery/computer3/computers/medical.dm +++ b/code/game/machinery/computer3/computers/medical.dm @@ -50,7 +50,7 @@ if(!interactable()) return if (computer.z > 6) - usr << "\red Unable to establish a connection: \black You're too far away from the station!" + usr << "Unable to establish a connection: You're too far away from the station!" return var/dat @@ -528,4 +528,4 @@ src.printing = null interact() - return \ No newline at end of file + return diff --git a/code/game/machinery/computer3/computers/prisoner.dm b/code/game/machinery/computer3/computers/prisoner.dm index 49f1940d75..c1d7a664c6 100644 --- a/code/game/machinery/computer3/computers/prisoner.dm +++ b/code/game/machinery/computer3/computers/prisoner.dm @@ -96,7 +96,7 @@ if( istype(I) && I.imp_in) var/mob/living/carbon/R = I.imp_in log_say("PrisonComputer3 message: [key_name(usr)]->[key_name(R)] : [warning]") - R << "\green You hear a voice in your head saying: '[warning]'" + R << "You hear a voice in your head saying: '[warning]'" interact() return diff --git a/code/game/machinery/computer3/computers/robot.dm b/code/game/machinery/computer3/computers/robot.dm index 3083a986c7..0cf9c7ac5a 100644 --- a/code/game/machinery/computer3/computers/robot.dm +++ b/code/game/machinery/computer3/computers/robot.dm @@ -118,14 +118,14 @@ if (istype(I)) if(src.check_access(I)) if (!status) - message_admins("\blue [key_name_admin(usr)] has initiated the global cyborg killswitch!") - log_game("\blue [key_name(usr)] has initiated the global cyborg killswitch!") + message_admins("[key_name_admin(usr)] has initiated the global cyborg killswitch!") + log_game("[key_name(usr)] has initiated the global cyborg killswitch!") src.status = 1 src.start_sequence() src.temp = null else - usr << "\red Access Denied." + usr << "Access Denied." if ("stop" in href_list) src.temp = {" @@ -169,7 +169,7 @@ R.connected_ai << "

ALERT - Cyborg kill-switch activated: [R.name]
" R.self_destruct() else - usr << "\red Access Denied." + usr << "Access Denied." if ("stopbot" in href_list) if(computer.allowed(usr)) @@ -189,7 +189,7 @@ R << "You have been locked down!" else - usr << "\red Access Denied." + usr << "Access Denied." if ("magbot" in href_list) if(computer.allowed(usr)) @@ -198,7 +198,7 @@ var/choice = input("Are you certain you wish to hack [R.name]?") in list("Confirm", "Abort") if(choice == "Confirm") if(R && istype(R)) -// message_admins("\blue [key_name_admin(usr)] emagged [R.name] using robotic console!") +// message_admins("[key_name_admin(usr)] emagged [R.name] using robotic console!") // why is this commented out? log_game("[key_name(usr)] emagged [R.name] using robotic console!") R.emagged = 1 if(R.mind.special_role) diff --git a/code/game/machinery/computer3/computers/security.dm b/code/game/machinery/computer3/computers/security.dm index f2de764894..c13dd9713e 100644 --- a/code/game/machinery/computer3/computers/security.dm +++ b/code/game/machinery/computer3/computers/security.dm @@ -58,7 +58,7 @@ return if (computer.z > 6) - usr << "\red Unable to establish a connection: \black You're too far away from the station!" + usr << "Unable to establish a connection: You're too far away from the station!" return var/dat diff --git a/code/game/machinery/computer3/laptop.dm b/code/game/machinery/computer3/laptop.dm index 484db52462..0fede0f479 100644 --- a/code/game/machinery/computer3/laptop.dm +++ b/code/game/machinery/computer3/laptop.dm @@ -35,7 +35,7 @@ set src in view(1) if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living)) - usr << "\red You can't do that." + usr << "You can't do that." return if(!Adjacent(usr)) @@ -67,7 +67,7 @@ stored_computer.manipulating = 0 qdel(src) else - usr << "\red You are already opening the computer!" + usr << "You are already opening the computer!" AltClick() @@ -131,11 +131,11 @@ set src in view(1) if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living)) - usr << "\red You can't do that." + usr << "You can't do that." return if(!Adjacent(usr)) - usr << "You can't reach it." + usr << "You can't reach it." return close_laptop(usr) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 7fd4cc36b5..41d44a0708 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -44,7 +44,7 @@ else if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) - user << "\blue You dismantle the frame" + user << "You dismantle the frame" new /obj/item/stack/material/steel(src.loc, 5) qdel(src) if(2) @@ -52,7 +52,7 @@ var/obj/item/weapon/circuitboard/B = P if(B.board_type == "machine") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "\blue You add the circuit board to the frame." + user << "You add the circuit board to the frame." circuit = P user.drop_item() P.loc = src @@ -70,11 +70,11 @@ update_desc() user << desc else - user << "\red This frame does not accept circuit boards of this type!" + user << "This frame does not accept circuit boards of this type!" else if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "\blue You remove the cables." + user << "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 ) @@ -87,9 +87,9 @@ circuit.loc = src.loc circuit = null if(components.len == 0) - user << "\blue You remove the circuit board." + user << "You remove the circuit board." else - user << "\blue You remove the circuit board and other components." + user << "You remove the circuit board and other components." for(var/obj/item/weapon/W in components) W.loc = src.loc desc = initial(desc) @@ -145,4 +145,4 @@ break user << desc if(P && P.loc != src && !istype(P, /obj/item/stack/cable_coil)) - user << "\red You cannot add that component to the machine!" + user << "You cannot add that component to the machine!" diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index cb0620691c..abab6af863 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -176,7 +176,7 @@ /obj/machinery/atmospherics/unary/cryo_cell/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob) if(istype(G, /obj/item/weapon/reagent_containers/glass)) if(beaker) - user << "\red A beaker is already loaded into the machine." + user << "A beaker is already loaded into the machine." return beaker = G @@ -273,19 +273,19 @@ return /obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/M as mob) if (stat & (NOPOWER|BROKEN)) - usr << "\red The cryo cell is not functioning." + usr << "The cryo cell is not functioning." return if (!istype(M)) - usr << "\red The cryo cell cannot handle such a lifeform!" + usr << "The cryo cell cannot handle such a lifeform!" return if (occupant) - usr << "\red The cryo cell is already occupied!" + usr << "The cryo cell is already occupied!" return if (M.abiotic()) - usr << "\red Subject may not have abiotic items on." + usr << "Subject may not have abiotic items on." return if(!node) - usr << "\red The cell is not correctly connected to its pipe network!" + usr << "The cell is not correctly connected to its pipe network!" return if (M.client) M.client.perspective = EYE_PERSPECTIVE @@ -294,7 +294,7 @@ M.loc = src M.ExtinguishMob() if(M.health > -100 && (M.health < 0 || M.sleeping)) - M << "\blue You feel a cold liquid surround you. Your skin starts to freeze up." + M << "You feel a cold liquid surround you. Your skin starts to freeze up." occupant = M current_heat_capacity = HEAT_CAPACITY_HUMAN update_use_power(2) @@ -310,7 +310,7 @@ if(usr == occupant)//If the user is inside the tube... if (usr.stat == 2)//and he's not dead.... return - usr << "\blue Release sequence activated. This will take two minutes." + usr << "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/deployable.dm b/code/game/machinery/deployable.dm index 4f19ab0118..e3c8607b88 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -188,7 +188,7 @@ for reference: 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("\red BZZzZZzZZzZT") + visible_message("BZZzZZzZZzZT") return return else if (istype(W, /obj/item/weapon/card/emag)) @@ -200,7 +200,7 @@ for reference: 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("\red BZZzZZzZZzZT") + visible_message("BZZzZZzZZzZT") return else if (src.emagged == 1) src.emagged = 2 @@ -208,19 +208,19 @@ for reference: 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("\red BZZzZZzZZzZT") + visible_message("BZZzZZzZZzZT") return else if (istype(W, /obj/item/weapon/wrench)) if (src.health < src.maxhealth) src.health = src.maxhealth src.emagged = 0 src.req_access = list(access_security) - visible_message("\red [user] repairs \the [src]!") + visible_message("[user] repairs \the [src]!") return else if (src.emagged > 0) src.emagged = 0 src.req_access = list(access_security) - visible_message("\red [user] repairs \the [src]!") + visible_message("[user] repairs \the [src]!") return return else @@ -272,7 +272,7 @@ for reference: proc/explode() - visible_message("\red [src] blows apart!") + visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) /* var/obj/item/stack/rods/ =*/ @@ -284,4 +284,4 @@ for reference: explosion(src.loc,-1,-1,0) if(src) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 58830cf9fa..6107d4d695 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -311,7 +311,7 @@ About the new airlock wires panel: * An airlock wire dialog can be accessed by the normal way or by using wirecutters or a multitool on the door while the wire-panel is open. This would show the following wires, which you can either wirecut/mend or send a multitool pulse through. There are 9 wires. * one wire from the ID scanner. Sending a pulse through this flashes the red light on the door (if the door has power). If you cut this wire, the door will stop recognizing valid IDs. (If the door has 0000 access, it still opens and closes, though) -* two wires for power. Sending a pulse through either one causes a breaker to trip, disabling the door for 10 seconds if backup power is connected, or 1 minute if not (or until backup power comes back on, whichever is shorter). Cutting either one disables the main door power, but unless backup power is also cut, the backup power re-powers the door in 10 seconds. While unpowered, the door may be \red open, but bolts-raising will not work. Cutting these wires may electrocute the user. +* two wires for power. Sending a pulse through either one causes a breaker to trip, disabling the door for 10 seconds if backup power is connected, or 1 minute if not (or until backup power comes back on, whichever is shorter). Cutting either one disables the main door power, but unless backup power is also cut, the backup power re-powers the door in 10 seconds. While unpowered, the door may be open, but bolts-raising will not work. Cutting these wires may electrocute the user. * one wire for door bolts. Sending a pulse through this drops door bolts (whether the door is powered or not) or raises them (if it is). Cutting this wire also drops the door bolts, and mending it does not raise them. If the wire is cut, trying to raise the door bolts will not work. * two wires for backup power. Sending a pulse through either one causes a breaker to trip, but this does not disable it unless main power is down too (in which case it is disabled for 1 minute or however long it takes main power to come back, whichever is shorter). Cutting either one disables the backup door power (allowing it to be crowbarred open, but disabling bolts-raising), but may electocute the user. * one wire for opening the door. Sending a pulse through this while the door has power makes it open the door if no access is required. @@ -335,7 +335,7 @@ About the new airlock wires panel: else /*if(src.justzap)*/ return else if(user.hallucination > 50 && prob(10) && src.operating == 0) - user << "\red You feel a powerful shock course through your body!" + user << "You feel a powerful shock course through your body!" user.halloss += 10 user.stunned += 10 return @@ -632,14 +632,14 @@ About the new airlock wires panel: if(H.getBrainLoss() >= 60) playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) if(!istype(H.head, /obj/item/clothing/head/helmet)) - visible_message("\red [user] headbutts the airlock.") + visible_message("[user] headbutts the airlock.") var/obj/item/organ/external/affecting = H.get_organ("head") H.Stun(8) H.Weaken(5) if(affecting.take_damage(10, 0)) H.UpdateDamageIcon() else - visible_message("\red [user] headbutts the airlock. Good thing they're wearing a helmet.") + visible_message("[user] headbutts the airlock. Good thing they're wearing a helmet.") return **/ @@ -772,7 +772,7 @@ About the new airlock wires panel: playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 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)) - user << "\blue You removed the airlock electronics!" + user << "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)) @@ -800,9 +800,9 @@ About the new airlock wires panel: qdel(src) return else if(arePowerSystemsOn()) - user << "\blue The airlock's motors resist your efforts to force it." + user << "The airlock's motors resist your efforts to force it." else if(locked) - user << "\blue The airlock's bolts prevent it from being forced." + user << "The airlock's bolts prevent it from being forced." else if(density) spawn(0) open(1) @@ -811,20 +811,20 @@ About the new airlock wires panel: else if(istype(C, /obj/item/weapon/material/twohanded/fireaxe) && !arePowerSystemsOn()) if(locked) - user << "\blue The airlock's bolts prevent it from being forced." + user << "The airlock's bolts prevent it from being forced." else if( !welded && !operating ) if(density) var/obj/item/weapon/material/twohanded/fireaxe/F = C if(F.wielded) spawn(0) open(1) else - user << "\red You need to be wielding \the [C] to do that." + user << "You need to be wielding \the [C] to do that." else var/obj/item/weapon/material/twohanded/fireaxe/F = C if(F.wielded) spawn(0) close(1) else - user << "\red You need to be wielding \the [C] to do that." + user << "You need to be wielding \the [C] to do that." else ..() diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index 053b776736..805bb7dba9 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -261,7 +261,7 @@ obj/machinery/access_button/attackby(obj/item/I as obj, mob/user as mob) obj/machinery/access_button/attack_hand(mob/user) add_fingerprint(usr) if(!allowed(user)) - user << "\red Access Denied" + user << "Access Denied" else if(radio_connection) var/datum/signal/signal = new @@ -300,4 +300,4 @@ obj/machinery/access_button/airlock_interior obj/machinery/access_button/airlock_exterior frequency = 1379 - command = "cycle_exterior" \ No newline at end of file + command = "cycle_exterior" diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 03971f4fbb..69dc698795 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -161,7 +161,7 @@ if (Proj.damage > 90) destroy_hits-- if (destroy_hits <= 0) - visible_message("\red \The [src.name] disintegrates!") + visible_message("\The [src.name] disintegrates!") switch (Proj.damage_type) if(BRUTE) new /obj/item/stack/material/steel(src.loc, 2) @@ -179,7 +179,7 @@ /obj/machinery/door/hitby(AM as mob|obj, var/speed=5) ..() - visible_message("\red [src.name] was hit by [AM].") + visible_message("[src.name] was hit by [AM].") var/tforce = 0 if(ismob(AM)) tforce = 15 * (speed/5) @@ -267,9 +267,9 @@ if(W.damtype == BRUTE || W.damtype == BURN) user.do_attack_animation(src) if(W.force < min_force) - user.visible_message("\red \The [user] hits \the [src] with \the [W] with no visible effect." ) + user.visible_message("\The [user] hits \the [src] with \the [W] with no visible effect.") else - user.visible_message("\red \The [user] forcefully strikes \the [src] with \the [W]!" ) + user.visible_message("\The [user] forcefully strikes \the [src] with \the [W]!") playsound(src.loc, hitsound, 100, 1) take_damage(W.force) return diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 692662e6d2..f846af3727 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -158,7 +158,7 @@ var/mob/living/carbon/human/H = user if(H.species.can_shred(H)) playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) - visible_message("\red [user] smashes against the [src.name].", 1) + visible_message("[user] smashes against the [src.name].", 1) take_damage(25) return return src.attackby(user, user) @@ -178,7 +178,7 @@ spark_system.start() playsound(src.loc, "sparks", 50, 1) playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) - visible_message("\blue The glass door was sliced open by [user]!") + visible_message("The glass door was sliced open by [user]!") flick("[src.base_state]spark", src) sleep(6) open() @@ -189,7 +189,7 @@ playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] removes the electronics from the windoor.", "You start to remove electronics from the windoor.") if (do_after(user,40)) - user << "\blue You removed the windoor electronics!" + user << "You removed the windoor electronics!" var/obj/structure/windoor_assembly/wa = new/obj/structure/windoor_assembly(src.loc) if (istype(src, /obj/machinery/door/window/brigdoor)) @@ -227,7 +227,7 @@ if(src.density && istype(I, /obj/item/weapon) && !istype(I, /obj/item/weapon/card)) var/aforce = I.force playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) - visible_message("\red [src] was hit by [I].") + visible_message("[src] was hit by [I].") if(I.damtype == BRUTE || I.damtype == BURN) take_damage(aforce) return diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 1a47ae81fd..3861246d1b 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -44,9 +44,9 @@ add_fingerprint(user) src.disable = !src.disable if (src.disable) - user.visible_message("\red [user] has disconnected the [src]'s flashbulb!", "\red You disconnect the [src]'s flashbulb!") + user.visible_message("[user] has disconnected the [src]'s flashbulb!", "You disconnect the [src]'s flashbulb!") if (!src.disable) - user.visible_message("\red [user] has connected the [src]'s flashbulb!", "\red You connect the [src]'s flashbulb!") + user.visible_message("[user] has connected the [src]'s flashbulb!", "You connect the [src]'s flashbulb!") //Let the AI trigger them directly. /obj/machinery/flasher/attack_ai() @@ -114,11 +114,11 @@ src.anchored = !src.anchored if (!src.anchored) - user.show_message(text("\red [src] can now be moved.")) + user.show_message(text("[src] can now be moved.")) src.overlays.Cut() else if (src.anchored) - user.show_message(text("\red [src] is now secured.")) + user.show_message(text("[src] is now secured.")) src.overlays += "[base_state]-s" /obj/machinery/button/flasher @@ -145,4 +145,4 @@ icon_state = "launcherbtt" active = 0 - return \ No newline at end of file + return diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm index 28bd367083..79de4ef5ab 100644 --- a/code/game/machinery/floodlight.dm +++ b/code/game/machinery/floodlight.dm @@ -50,7 +50,7 @@ if(on) on = 0 - user << "\blue You turn off the light" + user << "You turn off the light" set_light(0) else if(!cell) @@ -58,7 +58,7 @@ if(cell.charge <= 0) return on = 1 - user << "\blue You turn on the light" + user << "You turn on the light" set_light(brightness_on) updateicon() diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 50dc4e10b2..fa385a0115 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -78,10 +78,10 @@ add_fingerprint(user) src.disable = !src.disable if (src.disable) - user.visible_message("\red [user] has disabled the [src]!", "\red You disable the connection to the [src].") + user.visible_message("[user] has disabled the [src]!", "You disable the connection to the [src].") icon_state = "[base_state]-d" if (!src.disable) - user.visible_message("\red [user] has reconnected the [src]!", "\red You fix the connection to the [src].") + user.visible_message("[user] has reconnected the [src]!", "You fix the connection to the [src].") if(src.powered()) icon_state = "[base_state]" else diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index 8ee374e961..13d55e725b 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -134,10 +134,10 @@ user << "Subject may not have abiotic items on." return - user.visible_message("\red [user] starts to put [victim] into the gibber!") + user.visible_message("[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("\red [user] stuffs [victim] into the gibber!") + user.visible_message("[user] stuffs [victim] into the gibber!") if(victim.client) victim.client.perspective = EYE_PERSPECTIVE victim.client.eye = src diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 23efb8ab4c..4ce21137b8 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -56,69 +56,69 @@ if(src.broken > 0) if(src.broken == 2 && istype(O, /obj/item/weapon/screwdriver)) // If it's broken and they're using a screwdriver user.visible_message( \ - "\blue [user] starts to fix part of the microwave.", \ - "\blue You start to fix part of the microwave." \ + "\The [user] starts to fix part of the microwave.", \ + "You start to fix part of the microwave." \ ) if (do_after(user,20)) user.visible_message( \ - "\blue [user] fixes part of the microwave.", \ - "\blue You have fixed part of the microwave." \ + "\The [user] fixes part of the microwave.", \ + "You have fixed part of the microwave." \ ) src.broken = 1 // Fix it a bit else if(src.broken == 1 && istype(O, /obj/item/weapon/wrench)) // If it's broken and they're doing the wrench user.visible_message( \ - "\blue [user] starts to fix part of the microwave.", \ - "\blue You start to fix part of the microwave." \ + "\The [user] starts to fix part of the microwave.", \ + "You start to fix part of the microwave." \ ) if (do_after(user,20)) user.visible_message( \ - "\blue [user] fixes the microwave.", \ - "\blue You have fixed the microwave." \ + "\The [user] fixes the microwave.", \ + "You have fixed the microwave." \ ) src.icon_state = "mw" src.broken = 0 // Fix it! src.dirty = 0 // just to be sure src.flags = OPENCONTAINER else - user << "\red It's broken!" + user << "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/weapon/reagent_containers/spray/cleaner)) // If they're trying to clean it then let them user.visible_message( \ - "\blue [user] starts to clean the microwave.", \ - "\blue You start to clean the microwave." \ + "\The [user] starts to clean the microwave.", \ + "You start to clean the microwave." \ ) if (do_after(user,20)) user.visible_message( \ - "\blue [user] has cleaned the microwave.", \ - "\blue You have cleaned the microwave." \ + "\The [user] has cleaned the microwave.", \ + "You have cleaned the microwave." \ ) src.dirty = 0 // It's clean! src.broken = 0 // just to be sure src.icon_state = "mw" src.flags = OPENCONTAINER else //Otherwise bad luck!! - user << "\red It's dirty!" + user << "It's dirty!" return 1 else if(is_type_in_list(O,acceptable_items)) if (contents.len>=max_n_of_items) - user << "\red This [src] is full of ingredients, you cannot put more." + user << "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( \ - "\blue [user] has added one of [O] to \the [src].", \ - "\blue You add one of [O] to \the [src].") + "\The [user] has added one of [O] to \the [src].", \ + "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 user.drop_item() O.loc = src user.visible_message( \ - "\blue [user] has added \the [O] to \the [src].", \ - "\blue You add \the [O] to \the [src].") + "\The [user] has added \the [O] to \the [src].", \ + "You add \the [O] to \the [src].") return else if(istype(O,/obj/item/weapon/reagent_containers/glass) || \ istype(O,/obj/item/weapon/reagent_containers/food/drinks) || \ @@ -128,15 +128,15 @@ return 1 for (var/datum/reagent/R in O.reagents.reagent_list) if (!(R.id in acceptable_reagents)) - user << "\red Your [O] contains components unsuitable for cookery." + user << "Your [O] contains components unsuitable for cookery." return 1 //G.reagents.trans_to(src,G.amount_per_transfer_from_this) else if(istype(O,/obj/item/weapon/grab)) var/obj/item/weapon/grab/G = O - user << "\red This is ridiculous. You can not fit \the [G.affecting] in this [src]." + user << "This is ridiculous. You can not fit \the [G.affecting] in this [src]." return 1 else - user << "\red You have no idea what you can cook with this [O]." + user << "You have no idea what you can cook with this [O]." ..() src.updateUsrDialog() @@ -295,7 +295,7 @@ return 0 /obj/machinery/microwave/proc/start() - src.visible_message("\blue The microwave turns on.", "\blue You hear a microwave.") + src.visible_message("The microwave turns on.", "You hear a microwave.") src.operating = 1 src.icon_state = "mw1" src.updateUsrDialog() @@ -317,7 +317,7 @@ if (src.reagents.total_volume) src.dirty++ src.reagents.clear_reagents() - usr << "\blue You dispose of the microwave contents." + usr << "You dispose of the microwave contents." src.updateUsrDialog() /obj/machinery/microwave/proc/muck_start() @@ -326,7 +326,7 @@ /obj/machinery/microwave/proc/muck_finish() playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) - src.visible_message("\red The microwave gets covered in muck!") + src.visible_message("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 = "mwbloody" // Make it look dirty too @@ -338,7 +338,7 @@ s.set_up(2, 1, src) s.start() src.icon_state = "mwb" // Make it look all busted up and shit - src.visible_message("\red The microwave breaks!") //Let them know they're stupid + src.visible_message("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 diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index 9bfa0e1c5d..8a95f83e70 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -338,7 +338,7 @@ return 0 spawn(0) throw_item.throw_at(target,16,3,src) - src.visible_message("\red [src] launches [throw_item.name] at [target.name]!") + src.visible_message("[src] launches [throw_item.name] at [target.name]!") return 1 /************************ diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 4e158156bf..0570211526 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -216,7 +216,7 @@ Class Procs: return 1 if ( ! (istype(usr, /mob/living/carbon/human) || \ istype(usr, /mob/living/silicon))) - usr << "\red You don't have the dexterity to do this!" + usr << "You don't have the dexterity to do this!" return 1 /* //distance checks are made by atom/proc/DblClick @@ -226,10 +226,10 @@ Class Procs: if (ishuman(user)) var/mob/living/carbon/human/H = user if(H.getBrainLoss() >= 60) - visible_message("\red [H] stares cluelessly at [src] and drools.") + visible_message("[H] stares cluelessly at [src] and drools.") return 1 else if(prob(H.getBrainLoss())) - user << "\red You momentarily forget how to use [src]." + user << "You momentarily forget how to use [src]." return 1 src.add_fingerprint(user) diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index b67bc17986..abd9809176 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -27,7 +27,7 @@ O_limit++ if(O_limit >= 20) for(var/mob/M in hearers(src, null)) - M << "\blue The mass driver lets out a screech, it mustn't be able to handle any more items." + M << "The mass driver lets out a screech, it mustn't be able to handle any more items." break use_power(500) spawn( 0 ) @@ -39,4 +39,4 @@ if(stat & (BROKEN|NOPOWER)) return drive() - ..(severity) \ No newline at end of file + ..(severity) diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index c9228000e2..e8285643ee 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -127,7 +127,7 @@ var/global/list/navbeacons // no I don't like putting this in, but it will do src.locked = !src.locked user << "Controls are now [src.locked ? "locked." : "unlocked."]" else - user << "\red Access denied." + user << "Access denied." updateDialog() else user << "You must open the cover first!" diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm index dfada178c6..85b387fe7b 100644 --- a/code/game/machinery/nuclear_bomb.dm +++ b/code/game/machinery/nuclear_bomb.dm @@ -102,7 +102,7 @@ var/bomb_set var/obj/item/weapon/weldingtool/WT = O if(!WT.isOn()) return if (WT.get_fuel() < 5) // uses up 5 fuel. - user << "\red You need more fuel to complete this task." + user << "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]...") @@ -129,7 +129,7 @@ var/bomb_set var/obj/item/weapon/weldingtool/WT = O if(!WT.isOn()) return if (WT.get_fuel() < 5) // uses up 5 fuel. - user << "\red You need more fuel to complete this task." + user << "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]...") @@ -167,12 +167,9 @@ var/bomb_set /obj/machinery/nuclearbomb/attack_hand(mob/user as mob) if (src.extended) if (!ishuman(user)) - usr << "\red You don't have the dexterity to do this!" + usr << "You don't have the dexterity to do this!" return 1 - if (!ishuman(user)) - usr << "\red You don't have the dexterity to do this!" - return 1 user.set_machine(src) var/dat = text("Nuclear Fission Explosive
\nAuth. Disk: []
", src, (src.auth ? "++++++++++" : "----------")) if (src.auth) @@ -196,9 +193,9 @@ var/bomb_set else if (src.deployable) if(removal_stage < 5) src.anchored = 1 - visible_message("\red With a steely snap, bolts slide out of [src] and anchor it to the flooring!") + visible_message("With a steely snap, bolts slide out of [src] and anchor it to the flooring!") else - visible_message("\red \The [src] makes a highly unpleasant crunching noise. It looks like the anchoring bolts have been cut.") + visible_message("\The [src] makes a highly unpleasant crunching noise. It looks like the anchoring bolts have been cut.") if(!src.lighthack) flick("nuclearbombc", src) src.icon_state = "nuclearbomb1" @@ -224,14 +221,14 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob) if (!usr.canmove || usr.stat || usr.restrained()) return if (!ishuman(usr)) - usr << "\red You don't have the dexterity to do this!" + usr << "You don't have the dexterity to do this!" return 1 if (src.deployable) - usr << "\red You close several panels to make [src] undeployable." + usr << "You close several panels to make [src] undeployable." src.deployable = 0 else - usr << "\red You adjust some panels to make [src] deployable." + usr << "You adjust some panels to make [src] deployable." src.deployable = 1 return @@ -261,12 +258,12 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob) src.safety = !src.safety spawn(100) src.safety = !src.safety if(src.safety == 1) - visible_message("\blue The [src] quiets down.") + visible_message("The [src] quiets down.") if(!src.lighthack) if (src.icon_state == "nuclearbomb2") src.icon_state = "nuclearbomb1" else - visible_message("\blue The [src] emits a quiet whirling noise!") + visible_message("The [src] emits a quiet whirling noise!") if(href_list["act"] == "wire") if (!istype(usr.get_active_hand(), /obj/item/weapon/wirecutters)) usr << "You need wirecutters!" @@ -320,7 +317,7 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob) if (src.timing == -1.0) return if (src.safety) - usr << "\red The safety is still on." + usr << "The safety is still on." return src.timing = !( src.timing ) if (src.timing) @@ -343,14 +340,14 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob) if(removal_stage == 5) src.anchored = 0 - visible_message("\red \The [src] makes a highly unpleasant crunching noise. It looks like the anchoring bolts have been cut.") + visible_message("\The [src] makes a highly unpleasant crunching noise. It looks like the anchoring bolts have been cut.") return src.anchored = !( src.anchored ) if(src.anchored) - visible_message("\red With a steely snap, bolts slide out of [src] and anchor it to the flooring.") + visible_message("With a steely snap, bolts slide out of [src] and anchor it to the flooring.") else - visible_message("\red The anchoring bolts slide back into the depths of [src].") + visible_message("The anchoring bolts slide back into the depths of [src].") src.add_fingerprint(usr) for(var/mob/M in viewers(1, src)) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 9bee0af72f..7c05f76b22 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -447,11 +447,11 @@ Buildable meters for(var/obj/machinery/atmospherics/M in src.loc) if((M.initialize_directions & pipe_dir) && M.check_connect_types_construction(M,src)) // matches at least one direction on either type of pipe & same connection type - user << "\red There is already a pipe of the same type at this location." + user << "There is already a pipe of the same type at this location." return 1 // no conflicts found - var/pipefailtext = "\red There's nothing to connect this pipe section to!" //(with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)" + var/pipefailtext = "There's nothing to connect this pipe section to!" //(with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)" //TODO: Move all of this stuff into the various pipe constructors. switch(pipe_type) @@ -1147,7 +1147,7 @@ Buildable meters playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user.visible_message( \ "[user] fastens the [src].", \ - "\blue You have fastened the [src].", \ + "You have fastened the [src].", \ "You hear ratchet.") qdel(src) // remove the pipe item @@ -1172,11 +1172,11 @@ Buildable meters if (!istype(W, /obj/item/weapon/wrench)) return ..() if(!locate(/obj/machinery/atmospherics/pipe, src.loc)) - user << "\red You need to fasten it to a pipe" + user << "You need to fasten it to a pipe" return 1 new/obj/machinery/meter( src.loc ) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You have fastened the meter to the pipe" + user << "You have fastened the meter to the pipe" qdel(src) //not sure why these are necessary #undef PIPE_SIMPLE_STRAIGHT diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index eb0ec51962..692b97aac1 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -101,18 +101,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)) - usr << "\blue You put [W] back to [src]." + usr << "You put [W] back to [src]." user.drop_item() qdel(W) return else if (istype(W, /obj/item/weapon/wrench)) if (unwrenched==0) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src] from the floor..." + user << "You begin to unfasten \the [src] from the floor..." if (do_after(user, 40)) user.visible_message( \ - "[user] unfastens \the [src].", \ - "\blue You have unfastened \the [src]. Now it can be pulled somewhere else.", \ + "[user] unfastens \the [src].", \ + "You have unfastened \the [src]. Now it can be pulled somewhere else.", \ "You hear ratchet.") src.anchored = 0 src.stat |= MAINT @@ -121,11 +121,11 @@ usr << browse(null, "window=pipedispenser") else /*if (unwrenched==1)*/ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to fasten \the [src] to the floor..." + user << "You begin to fasten \the [src] to the floor..." if (do_after(user, 20)) user.visible_message( \ - "[user] fastens \the [src].", \ - "\blue You have fastened \the [src]. Now it can dispense pipes.", \ + "[user] fastens \the [src].", \ + "You have fastened \the [src]. Now it can dispense pipes.", \ "You hear ratchet.") src.anchored = 1 src.stat &= ~MAINT diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 8a949f7272..e86a5c771f 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -24,12 +24,12 @@ obj/machinery/recharger/attackby(obj/item/weapon/G as obj, mob/user as mob) if(allowed) if(charging) - user << "\red \A [charging] is already charging here." + user << "\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. var/area/a = get_area(src) if(!isarea(a) || (a.power_equip == 0 && !a.unlimited_power)) - user << "\red The [name] blinks red as you try to insert the item!" + user << "The [name] blinks red as you try to insert the item!" return if (istype(G, /obj/item/weapon/gun/energy/gun/nuclear) || istype(G, /obj/item/weapon/gun/energy/crossbow)) user << "Your gun's recharge port was removed to make room for a miniaturized reactor." @@ -47,7 +47,7 @@ obj/machinery/recharger/attackby(obj/item/weapon/G as obj, mob/user as mob) update_icon() else if(istype(G, /obj/item/weapon/wrench)) if(charging) - user << "\red Remove [charging] first!" + user << "Remove [charging] first!" return anchored = !anchored user << "You [anchored ? "attached" : "detached"] the recharger." diff --git a/code/game/machinery/records_scanner.dm b/code/game/machinery/records_scanner.dm index af74c7c941..3a2974008f 100644 --- a/code/game/machinery/records_scanner.dm +++ b/code/game/machinery/records_scanner.dm @@ -69,8 +69,8 @@ obj/machinery/scanner/attack_hand(mob/living/carbon/human/user) Black Marks:
"} for(var/A in marks) - text += "\red[A]
" - user << "\blue You feel a sting as the scanner extracts some of your blood." + text += "[A]
" + user << "You feel a sting as the scanner extracts some of your blood." var/turf/T = get_step(src,outputdir) var/obj/item/weapon/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 23aba34169..3f4e1fbd75 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -404,7 +404,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() announcement.announcer = ID.assignment ? "[ID.assignment] [ID.registered_name]" : ID.registered_name else reset_announce() - user << "\red You are not authorized to send announcements." + user << "You are not authorized to send announcements." updateUsrDialog() if (istype(O, /obj/item/weapon/stamp)) if(screen == 9) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index c5d389c66e..3115696ef0 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -55,13 +55,13 @@ C.loc = src C.add_fingerprint(usr) - user.visible_message("\blue [user] inserts a power cell into [src].", "\blue You insert the power cell into [src].") + user.visible_message("[user] inserts a power cell into [src].", "You insert the power cell into [src].") else user << "The hatch must be open to insert a power cell." return else if(istype(I, /obj/item/weapon/screwdriver)) panel_open = !panel_open - user.visible_message("\blue [user] [panel_open ? "opens" : "closes"] the hatch on the [src].", "\blue You [panel_open ? "open" : "close"] the hatch on the [src].") + user.visible_message("[user] [panel_open ? "opens" : "closes"] the hatch on the [src].", "You [panel_open ? "open" : "close"] the hatch on the [src].") update_icon() if(!panel_open && user.machine == src) user << browse(null, "window=spaceheater") @@ -99,7 +99,7 @@ onclose(user, "spaceheater") else on = !on - user.visible_message("\blue [user] switches [on ? "on" : "off"] the [src].","\blue You switch [on ? "on" : "off"] the [src].") + user.visible_message("[user] switches [on ? "on" : "off"] the [src].","You switch [on ? "on" : "off"] the [src].") update_icon() return @@ -120,7 +120,7 @@ if("cellremove") if(panel_open && cell && !usr.get_active_hand()) - usr.visible_message("\blue [usr] removes \the [cell] from \the [src].", "\blue You remove \the [cell] from \the [src].") + usr.visible_message("[usr] removes \the [cell] from \the [src].", "You remove \the [cell] from \the [src].") cell.updateicon() usr.put_in_hands(cell) cell.add_fingerprint(usr) @@ -136,7 +136,7 @@ C.loc = src C.add_fingerprint(usr) - usr.visible_message("\blue [usr] inserts \the [C] into \the [src].", "\blue You insert \the [C] into \the [src].") + usr.visible_message("[usr] inserts \the [C] into \the [src].", "You insert \the [C] into \the [src].") updateDialog() else diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index d1e728e676..cb487ae58c 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -100,7 +100,7 @@ dat+= "Suit storage unit: Maintenance panel" dat+= "Maintenance panel controls
" dat+= "The panel is ridden with controls, button and meters, labeled in strange signs and symbols that
you cannot understand. Probably the manufactoring world's language.
Among other things, a few controls catch your eye.

" - dat+= text("A small dial with a \"ë\" symbol embroidded on it. It's pointing towards a gauge that reads [].
Turn towards []
",(src.issuperUV ? "15nm" : "185nm"),src,(src.issuperUV ? "185nm" : "15nm") ) + dat+= text("A small dial with a small lambda symbol on it. It's pointing towards a gauge that reads [].
Turn towards []
",(src.issuperUV ? "15nm" : "185nm"),src,(src.issuperUV ? "185nm" : "15nm") ) dat+= text("A thick old-style button, with 2 grimy LED lights next to it. The [] LED is on.
Press button",(src.safetieson? "GREEN" : "RED"),src) dat+= text("

Close panel", user) //user << browse(dat, "window=ssu_m_panel;size=400x500") @@ -933,7 +933,7 @@ /obj/machinery/suit_cycler/proc/finished_job() var/turf/T = get_turf(src) - T.visible_message("\icon[src] \blue The [src] pings loudly.") + T.visible_message("\icon[src]The [src] pings loudly.") icon_state = initial(icon_state) active = 0 src.updateUsrDialog() @@ -960,7 +960,7 @@ /obj/machinery/suit_cycler/proc/eject_occupant(mob/user as mob) if(locked || active) - user << "\red The cycler is locked." + user << "The cycler is locked." return if (!occupant) @@ -1046,4 +1046,4 @@ suit.icon_state = "rig-syndie" if(helmet) helmet.name = "refitted [helmet.name]" - if(suit) suit.name = "refitted [suit.name]" \ No newline at end of file + if(suit) suit.name = "refitted [suit.name]" diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index cdcd98beba..ef3c7d6ea9 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -152,7 +152,7 @@ if(href_list["delete"]) if(!src.allowed(usr) && !emagged) - usr << "\red ACCESS DENIED." + usr << "ACCESS DENIED." return if(SelectedServer) @@ -190,7 +190,7 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) - user << "\blue The broken glass falls out." + user << "The broken glass falls out." var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) new /obj/item/weapon/material/shard( src.loc ) var/obj/item/weapon/circuitboard/comm_server/M = new /obj/item/weapon/circuitboard/comm_server( A ) @@ -202,7 +202,7 @@ A.anchored = 1 qdel(src) else - user << "\blue You disconnect the monitor." + user << "You disconnect the monitor." var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/comm_server/M = new /obj/item/weapon/circuitboard/comm_server( A ) for (var/obj/C in src) @@ -215,6 +215,6 @@ else if(istype(D, /obj/item/weapon/card/emag) && !emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - user << "\blue You you disable the security protocols" + user << "You you disable the security protocols" src.updateUsrDialog() return diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index 10ebe3dabc..ca132cc06e 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -128,7 +128,7 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) - user << "\blue The broken glass falls out." + user << "The broken glass falls out." var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) new /obj/item/weapon/material/shard( src.loc ) var/obj/item/weapon/circuitboard/comm_monitor/M = new /obj/item/weapon/circuitboard/comm_monitor( A ) @@ -140,7 +140,7 @@ A.anchored = 1 qdel(src) else - user << "\blue You disconnect the monitor." + user << "You disconnect the monitor." var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/comm_monitor/M = new /obj/item/weapon/circuitboard/comm_monitor( A ) for (var/obj/C in src) @@ -153,6 +153,6 @@ else if(istype(D, /obj/item/weapon/card/emag) && !emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - user << "\blue You you disable the security protocols" + user << "You you disable the security protocols" src.updateUsrDialog() return diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index 459ae15da0..6917675653 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -125,7 +125,7 @@ add_fingerprint(usr) usr.set_machine(src) if(!src.allowed(usr) && !emagged) - usr << "\red ACCESS DENIED." + usr << "ACCESS DENIED." return if(href_list["viewserver"]) @@ -211,7 +211,7 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) if (src.stat & BROKEN) - user << "\blue The broken glass falls out." + user << "The broken glass falls out." var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) new /obj/item/weapon/material/shard( src.loc ) var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A ) @@ -223,7 +223,7 @@ A.anchored = 1 qdel(src) else - user << "\blue You disconnect the monitor." + user << "You disconnect the monitor." var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A ) for (var/obj/C in src) @@ -236,6 +236,6 @@ else if(istype(D, /obj/item/weapon/card/emag) && !emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - user << "\blue You you disable the security protocols" + user << "You you disable the security protocols" src.updateUsrDialog() return diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index b1d45a4840..72687194f5 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -62,7 +62,7 @@ if(C.data == "Clown Land") //whoops for(var/mob/O in hearers(src, null)) - O.show_message("\red Incoming bluespace portal detected, unable to lock in.", 2) + O.show_message("Incoming bluespace portal detected, unable to lock in.", 2) for(var/obj/machinery/teleport/hub/H in range(1)) var/amount = rand(2,5) @@ -71,7 +71,7 @@ // else for(var/mob/O in hearers(src, null)) - O.show_message("\blue Locked In", 2) + O.show_message("Locked In", 2) src.locked = L one_time_use = 1 @@ -132,7 +132,7 @@ src.locked = L[desc] for(var/mob/O in hearers(src, null)) - O.show_message("\blue Locked In", 2) + O.show_message("Locked In", 2) src.add_fingerprint(usr) return @@ -193,7 +193,7 @@ return if (!com.locked) for(var/mob/O in hearers(src, null)) - O.show_message("\red Failure: Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.") + O.show_message("Failure: Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.") return if (istype(M, /atom/movable)) if(prob(5) && !accurate) //oh dear a problem, put em in deep space @@ -211,7 +211,7 @@ accurate = 1 spawn(3000) accurate = 0 //Accurate teleporting for 5 minutes for(var/mob/B in hearers(src, null)) - B.show_message("\blue Test fire completed.") + B.show_message("Test fire completed.") return /* /proc/do_teleport(atom/movable/M as mob|obj, atom/destination, precision) @@ -220,12 +220,12 @@ return if (istype(M, /obj/item/weapon/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite for(var/mob/O in viewers(M, null)) - O.show_message(text("\red The [] bounces off of the portal!", M.name), 1) + O.show_message(text("The [] bounces off of the portal!", M.name), 1) return if (istype(M, /mob/living)) var/mob/living/MM = M if(MM.check_contents_for(/obj/item/weapon/disk/nuclear)) - MM << "\red Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through." + MM << "Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through." return var/disky = 0 for (var/atom/O in M.contents) //I'm pretty sure this accounts for the maximum amount of container in container stacking. --NeoFite @@ -245,14 +245,14 @@ disky = 1 if (disky) for(var/mob/P in viewers(M, null)) - P.show_message(text("\red The [] bounces off of the portal!", M.name), 1) + P.show_message(text("The [] bounces off of the portal!", M.name), 1) return //Bags of Holding cause bluespace teleportation to go funky. --NeoFite if (istype(M, /mob/living)) var/mob/living/MM = M if(MM.check_contents_for(/obj/item/weapon/storage/backpack/holding)) - MM << "\red The Bluespace interface on your Bag of Holding interferes with the teleport!" + MM << "The Bluespace interface on your Bag of Holding interferes with the teleport!" precision = rand(1,100) if (istype(M, /obj/item/weapon/storage/backpack/holding)) precision = rand(1,100) @@ -339,7 +339,7 @@ update_use_power(2) com.update_use_power(2) for(var/mob/O in hearers(src, null)) - O.show_message("\blue Teleporter engaged!", 2) + O.show_message("Teleporter engaged!", 2) src.add_fingerprint(usr) src.engaged = 1 return @@ -354,7 +354,7 @@ com.update_use_power(1) update_use_power(1) for(var/mob/O in hearers(src, null)) - O.show_message("\blue Teleporter disengaged!", 2) + O.show_message("Teleporter disengaged!", 2) src.add_fingerprint(usr) src.engaged = 0 return @@ -370,7 +370,7 @@ if (com && !active) active = 1 for(var/mob/O in hearers(src, null)) - O.show_message("\blue Test firing!", 2) + O.show_message("Test firing!", 2) com.teleport() use_power(5000) diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index 3581c51e18..e04034ad93 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -80,7 +80,7 @@ if(user.species.can_shred(user) && !(stat & BROKEN)) playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1) - visible_message("\red [user] has slashed at [src]!") + visible_message("[user] has slashed at [src]!") src.take_damage(15) return diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 5d290a6aa4..43d0f107c0 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -229,7 +229,7 @@ W.loc = src coin = W categories |= CAT_COIN - user << "\blue You insert \the [W] into \the [src]" + user << "You insert \the [W] into \the [src]." nanomanager.update_uis(src) return else if(istype(W, /obj/item/weapon/wrench)) @@ -472,7 +472,7 @@ coin.loc = src.loc if(!usr.get_active_hand()) usr.put_in_hands(coin) - usr << "\blue You remove the [coin] from the [src]" + usr << "You remove the [coin] from the [src]" coin = null categories &= ~CAT_COIN @@ -525,13 +525,13 @@ if (R.category & CAT_COIN) if(!coin) - user << "\blue You need to insert a coin to get this item." + user << "You need to insert a coin to get this item." return if(coin.string_attached) if(prob(50)) - user << "\blue You successfully pull the coin out before \the [src] could swallow it." + user << "You successfully pull the coin out before \the [src] could swallow it." else - user << "\blue You weren't able to pull the coin out fast enough, the machine ate it, string and all." + user << "You weren't able to pull the coin out fast enough, the machine ate it, string and all." qdel(coin) categories &= ~CAT_COIN else @@ -558,7 +558,7 @@ /obj/machinery/vending/proc/stock(var/datum/data/vending_product/R, var/mob/user) if(src.panel_open) - user << "\blue You stock \the [src] with \a [R.product_name]" + user << "You stock \the [src] with \a [R.product_name]" R.amount++ nanomanager.update_uis(src) @@ -645,7 +645,7 @@ return 0 spawn(0) throw_item.throw_at(target, 16, 3, src) - src.visible_message("\red [src] launches [throw_item.name] at [target.name]!") + src.visible_message("[src] launches [throw_item.name] at [target.name]!") return 1 /* diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index be0a0e6d3a..a22482a416 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -75,7 +75,7 @@ /obj/machinery/washing_machine/attackby(obj/item/weapon/W as obj, mob/user as mob) /*if(istype(W,/obj/item/weapon/screwdriver)) panel = !panel - user << "\blue you [panel ? "open" : "close"] the [src]'s maintenance panel"*/ + user << "You [panel ? "open" : "close"] the [src]'s maintenance panel"*/ if(istype(W,/obj/item/weapon/pen/crayon) || istype(W,/obj/item/weapon/stamp)) if( state in list( 1, 3, 6 ) ) if(!crayon) @@ -148,9 +148,9 @@ W.loc = src state = 3 else - user << "\blue You can't put the item in right now." + user << "You can't put the item in right now." else - user << "\blue The washing machine is full." + user << "The washing machine is full." else ..() update_icon() @@ -172,7 +172,7 @@ crayon = null state = 1 if(5) - user << "\red The [src] is busy." + user << "The [src] is busy." if(6) state = 7 if(7) @@ -187,4 +187,4 @@ state = 1 - update_icon() \ No newline at end of file + update_icon() From 73a746e4552cab68e36a1516b376b71dab59a43d Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Sat, 30 May 2015 14:12:26 +0100 Subject: [PATCH 07/20] Non-code .dm files with escapes --- interface/interface.dm | 4 ++-- maps/RandomZLevels/wildwest.dm | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/interface.dm b/interface/interface.dm index 31312c277b..3bd3492386 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -8,7 +8,7 @@ return src << link(config.wikiurl) else - src << "\red The wiki URL is not set in the server configuration." + src << "The wiki URL is not set in the server configuration." return /client/verb/forum() @@ -20,7 +20,7 @@ return src << link(config.forumurl) else - src << "\red The forum URL is not set in the server configuration." + src << "The forum URL is not set in the server configuration." return #define RULES_FILE "config/rules.html" diff --git a/maps/RandomZLevels/wildwest.dm b/maps/RandomZLevels/wildwest.dm index d2935b69f6..3df195564f 100644 --- a/maps/RandomZLevels/wildwest.dm +++ b/maps/RandomZLevels/wildwest.dm @@ -48,16 +48,16 @@ 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) - user << "\blue You feel pressure building behind your eyes." + user << "You feel pressure building behind your eyes." if (!(COLD_RESISTANCE in user.mutations)) user.mutations.Add(COLD_RESISTANCE) - user << "\blue Your body feels warm." + user << "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 - user << "\blue The walls suddenly disappear." + user << "The walls suddenly disappear." user.dna.mutantrace = "shadow" user.update_mutantrace() if("Wealth") @@ -171,4 +171,4 @@ C << "You have regenerated." C.visible_message("[usr] appears to wake from the dead, having healed all wounds.") C.update_canmove() - return 1 \ No newline at end of file + return 1 From 94e19592cfe9fbcbe474f749aaada142c2e55b82 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Sat, 30 May 2015 14:37:40 +0100 Subject: [PATCH 08/20] objects/effects, objects/structures --- code/game/objects/effects/aliens.dm | 36 +++++++++---------- .../game/objects/effects/decals/contraband.dm | 4 +-- code/game/objects/effects/effect_system.dm | 12 +++---- code/game/objects/effects/gibs.dm | 2 +- code/game/objects/effects/spiders.dm | 10 +++--- .../crates_lockers/closets/fireaxe.dm | 34 +++++++++--------- .../crates_lockers/closets/secure/personal.dm | 12 +++---- code/game/objects/structures/displaycase.dm | 6 ++-- code/game/objects/structures/door_assembly.dm | 20 +++++------ code/game/objects/structures/inflatable.dm | 12 +++---- code/game/objects/structures/lamarr_cage.dm | 4 +-- code/game/objects/structures/lattice.dm | 2 +- code/game/objects/structures/morgue.dm | 12 +++---- code/game/objects/structures/musician.dm | 8 ++--- .../structures/stool_bed_chair_nest/bed.dm | 6 ++-- .../stool_bed_chair_nest/wheelchair.dm | 12 +++---- code/game/objects/structures/watercloset.dm | 16 ++++----- .../objects/structures/windoor_assembly.dm | 18 +++++----- code/game/objects/structures/window.dm | 4 +-- 19 files changed, 115 insertions(+), 115 deletions(-) diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index 6882f9affa..d9e88e70e0 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -90,7 +90,7 @@ /obj/effect/alien/resin/hitby(AM as mob|obj) ..() for(var/mob/O in viewers(src, null)) - O.show_message("\red [src] was hit by [AM].", 1) + O.show_message("[src] was hit by [AM].", 1) var/tforce = 0 if(ismob(AM)) tforce = 10 @@ -104,9 +104,9 @@ /obj/effect/alien/resin/attack_hand() if (HULK in usr.mutations) - usr << "\blue You easily destroy the [name]." + usr << "You easily destroy the [name]." for(var/mob/O in oviewers(src)) - O.show_message("\red [usr] destroys the [name]!", 1) + O.show_message("[usr] destroys the [name]!", 1) health = 0 else @@ -115,14 +115,14 @@ var/mob/living/carbon/M = usr if(locate(/obj/item/organ/xenos/hivenode) in M.internal_organs) for(var/mob/O in oviewers(src)) - O.show_message("\red [usr] strokes the [name] and it melts away!", 1) + O.show_message("[usr] strokes the [name] and it melts away!", 1) health = 0 healthcheck() return - usr << "\blue You claw at the [name]." + usr << "You claw at the [name]." for(var/mob/O in oviewers(src)) - O.show_message("\red [usr] claws at the [name]!", 1) + O.show_message("[usr] claws at the [name]!", 1) health -= rand(5,10) healthcheck() return @@ -237,9 +237,9 @@ Alien plants should do something if theres a lot of poison /obj/effect/alien/weeds/attackby(var/obj/item/weapon/W, var/mob/user) if(W.attack_verb.len) - visible_message("\red \The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]") + visible_message("\The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]") else - visible_message("\red \The [src] have been attacked with \the [W][(user ? " by [user]." : ".")]") + visible_message("\The [src] have been attacked with \the [W][(user ? " by [user]." : ".")]") var/damage = W.force / 4.0 @@ -301,7 +301,7 @@ Alien plants should do something if theres a lot of poison if(ticks >= target_strength) for(var/mob/O in hearers(src, null)) - O.show_message("\green [src.target] collapses under its own weight into a puddle of goop and undigested debris!", 1) + O.show_message("[src.target] collapses under its own weight into a puddle of goop and undigested debris!", 1) if(istype(target, /turf/simulated/wall)) // I hate turf code. var/turf/simulated/wall/W = target @@ -313,13 +313,13 @@ Alien plants should do something if theres a lot of poison switch(target_strength - ticks) if(6) - visible_message("\green [src.target] is holding up against the acid!") + visible_message("[src.target] is holding up against the acid!") if(4) - visible_message("\green [src.target]\s structure is being melted by the acid!") + visible_message("[src.target]\s structure is being melted by the acid!") if(2) - visible_message("\green [src.target] is struggling to withstand the acid!") + visible_message("[src.target] is struggling to withstand the acid!") if(0 to 1) - visible_message("\green [src.target] begins to crumble under the acid!") + visible_message("[src.target] begins to crumble under the acid!") spawn(rand(150, 200)) tick() /* @@ -360,14 +360,14 @@ Alien plants should do something if theres a lot of poison switch(status) if(BURST) - user << "\red You clear the hatched egg." + user << "You clear the hatched egg." qdel(src) return if(GROWING) - user << "\red The child is not developed yet." + user << "The child is not developed yet." return if(GROWN) - user << "\red You retrieve the child." + user << "You retrieve the child." Burst(0) return @@ -409,9 +409,9 @@ Alien plants should do something if theres a lot of poison if(health <= 0) return if(W.attack_verb.len) - src.visible_message("\red \The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]") + src.visible_message("\The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]") else - src.visible_message("\red \The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]") + src.visible_message("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]") var/damage = W.force / 4.0 if(istype(W, /obj/item/weapon/weldingtool)) diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index eac899d5b1..df85773fb2 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -31,7 +31,7 @@ //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)) - user << "\red You can't place this here!" + user << "You can't place this here!" return var/placement_dir = get_dir(user, W) @@ -161,4 +161,4 @@ var/name="" // Description suffix var/desc="" - var/icon_state="" \ No newline at end of file + var/icon_state="" diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 238cb575b3..b38a0f1551 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -13,11 +13,11 @@ would spawn and follow the beaker, even if it is carried or thrown. unacidable = 1//So effect are not targeted by alien acid. pass_flags = PASSTABLE | PASSGRILLE -/obj/effect/Destroy() +/obj/effect/Destroy() if(reagents) reagents.delete() return ..() - + /datum/effect/effect/system var/number = 3 var/cardinals = 0 @@ -455,7 +455,7 @@ steam.start() -- spawns the effect proc/stop() src.processing = 0 src.on = 0 - + /datum/effect/effect/system/reagents_explosion var/amount // TNT equivalent var/flashing = 0 // does explosion creates flash effect? @@ -480,10 +480,10 @@ steam.start() -- spawns the effect s.start() for(var/mob/M in viewers(5, location)) - M << "\red The solution violently explodes." + M << "The solution violently explodes." for(var/mob/M in viewers(1, location)) if (prob (50 * amount)) - M << "\red The explosion knocks you down." + M << "The explosion knocks you down." M.Weaken(rand(1,5)) return else @@ -506,7 +506,7 @@ steam.start() -- spawns the effect flash += (round(amount/4) * flashing_factor) for(var/mob/M in viewers(8, location)) - M << "\red The solution violently explodes." + M << "The solution violently explodes." explosion(location, devastation, heavy, light, flash) diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm index a7f4c0482f..696d3aa0fa 100644 --- a/code/game/objects/effects/gibs.dm +++ b/code/game/objects/effects/gibs.dm @@ -19,7 +19,7 @@ proc/Gib(atom/location, var/list/viruses = list(), var/datum/dna/MobDNA = null) if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len) - world << "\red Gib list length mismatch!" + world << "Gib list length mismatch!" return var/obj/effect/decal/cleanable/blood/gibs/gib = null diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 03b5c922d8..fd3a38f096 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -64,7 +64,7 @@ return 1 else if(istype(mover, /mob/living)) if(prob(50)) - mover << "\red You get stuck in \the [src] for a moment." + mover << "You get stuck in \the [src] for a moment." return 0 else if(istype(mover, /obj/item/projectile)) return prob(30) @@ -150,7 +150,7 @@ return if(prob(50)) - src.visible_message("\blue You hear something squeezing through the ventilation ducts.",2) + src.visible_message("You hear something squeezing through the ventilation ducts.",2) sleep(travel_time) if(!exit_vent || exit_vent.welded) @@ -172,7 +172,7 @@ var/target_atom = pick(nearby) walk_to(src, target_atom, 5) if(prob(25)) - src.visible_message("\blue \the [src] skitters[pick(" away"," around","")].") + src.visible_message("\The [src] skitters[pick(" away"," around","")].") else if(prob(5)) //vent crawl! for(var/obj/machinery/atmospherics/unary/vent_pump/v in view(7,src)) @@ -182,7 +182,7 @@ break if(prob(1)) - src.visible_message("\blue \the [src] chitters.") + src.visible_message("\The [src] chitters.") if(isturf(loc) && amount_grown > 0) amount_grown += rand(0,2) if(amount_grown >= 100) @@ -206,7 +206,7 @@ icon_state = pick("cocoon1","cocoon2","cocoon3") /obj/effect/spider/cocoon/Destroy() - src.visible_message("\red \the [src] splits open.") + src.visible_message("\The [src] splits open.") for(var/atom/movable/A in contents) A.loc = src.loc return ..() diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 481371b424..5b315654d5 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -27,7 +27,7 @@ if (isrobot(usr) || src.locked) if(istype(O, /obj/item/device/multitool)) - user << "\red Resetting circuitry..." + user << "Resetting circuitry..." playsound(user, 'sound/machines/lockreset.ogg', 50, 1) if(do_after(user, 20)) src.locked = 0 @@ -45,7 +45,7 @@ else playsound(user, 'sound/effects/Glasshit.ogg', 100, 1) //We don't want this playing every time if(W.force < 15) - user << "\blue The cabinet's protective glass glances off the hit." + user << "The cabinet's protective glass glances off the hit." else src.hitstaken++ if(src.hitstaken == 4) @@ -58,12 +58,12 @@ if (istype(O, /obj/item/weapon/material/twohanded/fireaxe) && src.localopened) if(!fireaxe) if(O:wielded) - user << "\red Unwield the axe first." + user << "Unwield the axe first." return fireaxe = O user.remove_from_mob(O) src.contents += O - user << "\blue You place the fire axe back in the [src.name]." + user << "You place the fire axe back in the [src.name]." update_icon() else if(src.smashed) @@ -86,10 +86,10 @@ spawn(10) update_icon() return else - user << "\red Resetting circuitry..." + user << "Resetting circuitry..." sleep(50) src.locked = 1 - user << "\blue You re-enable the locking modules." + user << "You re-enable the locking modules." playsound(user, 'sound/machines/lockenable.ogg', 50, 1) if(do_after(user,20)) src.locked = 1 @@ -114,13 +114,13 @@ hasaxe = 1 if(src.locked) - user <<"\red The cabinet won't budge!" + user <<"The cabinet won't budge!" return if(localopened) if(fireaxe) user.put_in_hands(fireaxe) fireaxe = null - user << "\blue You take the fire axe from the [name]." + user << "You take the fire axe from the [name]." src.add_fingerprint(user) update_icon() else @@ -147,7 +147,7 @@ attack_tk(mob/user as mob) if(localopened && fireaxe) fireaxe.loc = loc - user << "\blue You telekinetically remove the fire axe." + user << "You telekinetically remove the fire axe." fireaxe = null update_icon() return @@ -159,9 +159,9 @@ if (isrobot(usr) || src.locked || src.smashed) if(src.locked) - usr << "\red The cabinet won't budge!" + usr << "The cabinet won't budge!" else if(src.smashed) - usr << "\blue The protective glass is broken!" + usr << "The protective glass is broken!" return localopened = !localopened @@ -178,23 +178,23 @@ if(fireaxe) usr.put_in_hands(fireaxe) fireaxe = null - usr << "\blue You take the Fire axe from the [name]." + usr << "You take the Fire axe from the [name]." else - usr << "\blue The [src.name] is empty." + usr << "The [src.name] is empty." else - usr << "\blue The [src.name] is closed." + usr << "The [src.name] is closed." update_icon() attack_ai(mob/user as mob) if(src.smashed) - user << "\red The security of the cabinet is compromised." + user << "The security of the cabinet is compromised." return else locked = !locked if(locked) - user << "\red Cabinet locked." + user << "Cabinet locked." else - user << "\blue Cabinet unlocked." + user << "Cabinet unlocked." return 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/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 2534c09caa..66609f5661 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -68,7 +68,7 @@ if (W) W.loc = src.loc else if(istype(W, /obj/item/weapon/card/id)) if(src.broken) - user << "\red It appears to be broken." + user << "It appears to be broken." return var/obj/item/weapon/card/id/I = W if(!I || !I.registered_name) return @@ -82,7 +82,7 @@ src.registered_name = I.registered_name src.desc = "Owned by [I.registered_name]." else - user << "\red Access Denied" + user << "Access Denied" else if( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken) broken = 1 locked = 0 @@ -95,9 +95,9 @@ playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(src.loc, "sparks", 50, 1) for(var/mob/O in viewers(user, 3)) - O.show_message("\blue The locker has been sliced open by [user] with an energy blade!", 1, "\red You hear metal being sliced and sparks flying.", 2) + O.show_message("The locker has been sliced open by [user] with an energy blade!", 1, "You hear metal being sliced and sparks flying.", 2) else - user << "\red Access Denied" + user << "Access Denied" return /obj/structure/closet/secure_closet/personal/verb/reset() @@ -109,9 +109,9 @@ if(ishuman(usr)) src.add_fingerprint(usr) if (src.locked || !src.registered_name) - usr << "\red You need to unlock it first." + usr << "You need to unlock it first." else if (src.broken) - usr << "\red It appears to be broken." + usr << "It appears to be broken." else if (src.opened) if(!src.close()) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index d343e41159..3c5d5ec849 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -79,16 +79,16 @@ /obj/structure/displaycase/attack_hand(mob/user as mob) if (src.destroyed && src.occupied) new /obj/item/weapon/gun/energy/captain( src.loc ) - user << "\b You deactivate the hover field built into the case." + user << "You deactivate the hover field built into the case." src.occupied = 0 src.add_fingerprint(user) update_icon() return else - usr << text("\blue You kick the display case.") + usr << text("You kick the display case.") for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) - O << text("\red [] kicks the display case.", usr) + O << "[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 169b1deebd..17acc2b374 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -149,7 +149,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, 40)) if(!src || !WT.isOn()) return - user << "\blue You welded the [glass] plating off!" + user << "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, 40)) if(!src || !WT.isOn()) return - user << "\blue You dissasembled the airlock assembly!" + user << "You need more welding fuel." return else if(istype(W, /obj/item/weapon/wrench) && state == 0) @@ -180,7 +180,7 @@ if(do_after(user, 40)) if(!src) return - user << "\blue You [anchored? "un" : ""]secured the airlock assembly!" + user << "You cut the airlock wires.!" new/obj/item/stack/cable_coil(src.loc, 1) src.state = 0 @@ -212,7 +212,7 @@ if(!src) return user.drop_item() W.loc = src - user << "\blue You installed the airlock electronics!" + user << "You removed the airlock electronics!" src.state = 1 src.name = "Wired Airlock Assembly" electronics.loc = src.loc @@ -262,11 +262,11 @@ else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 ) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) - user << "\blue Now finishing the airlock." + user << "You finish the airlock!" var/path if(istext(glass)) path = text2path("/obj/machinery/door/airlock/[glass]") diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index 91642f3ebb..cd8fad5ec5 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -7,7 +7,7 @@ attack_self(mob/user) playsound(loc, 'sound/items/zip.ogg', 75, 1) - user << "\blue You inflate [src]." + user << "You inflate [src]." var/obj/structure/inflatable/R = new /obj/structure/inflatable(user.loc) src.transfer_fingerprints_to(R) R.add_fingerprint(user) @@ -74,7 +74,7 @@ if(!istype(W)) return if (can_puncture(W)) - visible_message("\red [user] pierces [src] with [W]!") + visible_message("[user] pierces [src] with [W]!") deflate(1) if(W.damtype == BRUTE || W.damtype == BURN) hit(W.force) @@ -96,7 +96,7 @@ src.transfer_fingerprints_to(R) qdel(src) else - //user << "\blue You slowly deflate the inflatable wall." + //user << "You slowly deflate the inflatable wall." visible_message("[src] slowly deflates.") spawn(50) var/obj/item/inflatable/R = new /obj/item/inflatable(loc) @@ -132,7 +132,7 @@ attack_self(mob/user) playsound(loc, 'sound/items/zip.ogg', 75, 1) - user << "\blue You inflate [src]." + user << "You inflate [src]." var/obj/structure/inflatable/door/R = new /obj/structure/inflatable/door(user.loc) src.transfer_fingerprints_to(R) R.add_fingerprint(user) @@ -236,7 +236,7 @@ icon_state = "folded_wall_torn" attack_self(mob/user) - user << "\blue The inflatable wall is too torn to be inflated!" + user << "The inflatable wall is too torn to be inflated!" add_fingerprint(user) /obj/item/inflatable/door/torn @@ -246,7 +246,7 @@ icon_state = "folded_door_torn" attack_self(mob/user) - user << "\blue The inflatable door is too torn to be inflated!" + user << "The inflatable door is too torn to be inflated!" add_fingerprint(user) /obj/item/weapon/storage/briefcase/inflatable diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index 1ab233a3ba..8c3cc5e6f2 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -76,10 +76,10 @@ if (src.destroyed) return else - usr << text("\blue You kick the lab cage.") + usr << "You kick the lab cage." for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) - O << text("\red [] kicks the lab cage.", usr) + O << "[usr] kicks the lab cage." src.health -= 2 healthcheck() return diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 078f4bc06b..bc4a5fb3d3 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -60,7 +60,7 @@ if (istype(C, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = C if(WT.remove_fuel(0, user)) - user << "\blue Slicing lattice joints ..." + user << "Slicing lattice joints ..." PoolOrNew(/obj/item/stack/rods, src.loc) qdel(src) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 599e8aabc8..daca23e8b7 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -159,7 +159,7 @@ if (user != O) for(var/mob/B in viewers(user, 3)) if ((B.client && !( B.blinded ))) - B << text("\red [] stuffs [] into []!", user, O, src) + B << "\The [user] stuffs [O] into [src]!" return @@ -218,13 +218,13 @@ /obj/structure/crematorium/attack_hand(mob/user as mob) // if (cremating) AWW MAN! THIS WOULD BE SO MUCH MORE FUN ... TO WATCH -// user.show_message("\red Uh-oh, that was a bad idea.", 1) +// user.show_message("Uh-oh, that was a bad idea.", 1) // //usr << "Uh-oh, that was a bad idea." // src:loc:poison += 20000000 // src:loc:firelevel = src:loc:poison // return if (cremating) - usr << "\red It's locked." + usr << "It's locked." return if ((src.connected) && (src.locked == 0)) for(var/atom/movable/A as mob|obj in src.connected.loc) @@ -294,7 +294,7 @@ if(contents.len <= 0) for (var/mob/M in viewers(src)) - M.show_message("\red You hear a hollow crackle.", 1) + M.show_message("You hear a hollow crackle.", 1) return else @@ -303,7 +303,7 @@ return for (var/mob/M in viewers(src)) - M.show_message("\red You hear a roar as the crematorium activates.", 1) + M.show_message("You hear a roar as the crematorium activates.", 1) cremating = 1 locked = 1 @@ -375,7 +375,7 @@ if (user != O) for(var/mob/B in viewers(user, 3)) if ((B.client && !( B.blinded ))) - B << text("\red [] stuffs [] into []!", user, O, src) + B << text("[] stuffs [] into []!", user, O, src) //Foreach goto(99) return diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index 425c03ad8c..d4930acea7 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -415,20 +415,20 @@ if (istype(O, /obj/item/weapon/wrench)) if (anchored) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to loosen \the [src]'s casters..." + user << "You begin to loosen \the [src]'s casters..." if (do_after(user, 40)) user.visible_message( \ "[user] loosens \the [src]'s casters.", \ - "\blue You have loosened \the [src]. Now it can be pulled somewhere else.", \ + "You have loosened \the [src]. Now it can be pulled somewhere else.", \ "You hear ratchet.") src.anchored = 0 else playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to tighten \the [src] to the floor..." + user << "You begin to tighten \the [src] to the floor..." if (do_after(user, 20)) user.visible_message( \ "[user] tightens \the [src]'s casters.", \ - "\blue You have tightened \the [src]'s casters. Now it can be played again.", \ + "You have tightened \the [src]'s casters. Now it can be played again.", \ "You hear ratchet.") src.anchored = 1 else 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 fb2ef2b525..1951f17c6f 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -127,7 +127,7 @@ if(istype(W,/obj/item/roller_holder)) var/obj/item/roller_holder/RH = W if(!RH.held) - user << "\blue You collect the roller bed." + user << "You collect the roller bed." src.loc = RH RH.held = src return @@ -148,10 +148,10 @@ /obj/item/roller_holder/attack_self(mob/user as mob) if(!held) - user << "\blue The rack is empty." + user << "The rack is empty." return - user << "\blue You deploy the roller bed." + user << "You deploy the roller bed." var/obj/structure/bed/roller/R = new /obj/structure/bed/roller(user.loc) R.add_fingerprint(user) qdel(held) 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 81d7f31cdb..dced47efe3 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -24,7 +24,7 @@ if(user==pulling) pulling = null user.pulledby = null - user << "\red You lost your grip!" + user << "You lost your grip!" return if(buckled_mob && pulling && user == buckled_mob) if(pulling.stat || pulling.stunned || pulling.weakened || pulling.paralysis || pulling.lying || pulling.restrained()) @@ -42,10 +42,10 @@ if(user==pulling) return if(pulling && (get_dir(src.loc, pulling.loc) == direction)) - user << "\red You cannot go there." + user << "You cannot go there." return if(pulling && buckled_mob && (buckled_mob == user)) - user << "\red You cannot drive while being pushed." + user << "You cannot drive while being pushed." return // Let's roll @@ -96,7 +96,7 @@ unbuckle_mob() if (pulling && (get_dist(src, pulling) > 1)) pulling.pulledby = null - pulling << "\red You lost your grip!" + pulling << "You lost your grip!" pulling = null else if (occupant && (src.loc != occupant.loc)) @@ -114,7 +114,7 @@ if(over_object == usr && in_range(src, usr)) if(!ishuman(usr)) return if(usr == buckled_mob) - usr << "\red You realize you are unable to push the wheelchair you sit in." + usr << "You realize you are unable to push the wheelchair you sit in." return if(!pulling) pulling = usr @@ -126,7 +126,7 @@ else if(usr != pulling) for(var/mob/O in viewers(pulling, null)) - O.show_message("\red [usr] breaks [pulling]'s grip on the wheelchair.", 1) + O.show_message("[usr] breaks [pulling]'s grip on the wheelchair.", 1) else usr << "You let go of \the [name]'s handles." pulling.pulledby = null diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 81a3a16cdd..95e2f4d29d 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -362,10 +362,10 @@ return if(busy) - user << "\red Someone's already washing here." + user << "Someone's already washing here." return - usr << "\blue You start washing your hands." + usr << "You start washing your hands." busy = 1 sleep(40) @@ -377,18 +377,18 @@ if(ishuman(user)) user:update_inv_gloves() for(var/mob/V in viewers(src, null)) - V.show_message("\blue [user] washes their hands using \the [src].") + V.show_message("[user] washes their hands using \the [src].") /obj/structure/sink/attackby(obj/item/O as obj, mob/user as mob) if(busy) - user << "\red Someone's already washing here." + user << "Someone's already washing here." return var/obj/item/weapon/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("\blue [user] fills \the [RG] using \the [src].","\blue You fill \the [RG] using \the [src].") + user.visible_message("[user] fills \the [RG] using \the [src].","You fill \the [RG] using \the [src].") return else if (istype(O, /obj/item/weapon/melee/baton)) @@ -415,7 +415,7 @@ var/obj/item/I = O if(!I || !istype(I,/obj/item)) return - usr << "\blue You start washing \the [I]." + usr << "You start washing \the [I]." busy = 1 sleep(40) @@ -427,8 +427,8 @@ O.clean_blood() user.visible_message( \ - "\blue [user] washes \a [I] using \the [src].", \ - "\blue You wash \a [I] using \the [src].") + "[user] washes \a [I] using \the [src].", \ + "You wash \a [I] using \the [src].") /obj/structure/sink/kitchen diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 7d49acba97..81b094cac4 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -75,13 +75,13 @@ obj/structure/windoor_assembly/Destroy() if(do_after(user, 40)) if(!src || !WT.isOn()) return - user << "\blue You dissasembled the windoor assembly!" + user << "You dissasembled the windoor assembly!" new /obj/item/stack/material/glass/reinforced(get_turf(src), 5) if(secure) PoolOrNew(/obj/item/stack/rods, list(get_turf(src), 4)) qdel(src) else - user << "\blue You need more welding fuel to dissassemble the windoor assembly." + user << "You need more welding fuel to dissassemble the windoor assembly." return //Wrenching an unsecure assembly anchors it in place. Step 4 complete @@ -91,7 +91,7 @@ obj/structure/windoor_assembly/Destroy() if(do_after(user, 40)) if(!src) return - user << "\blue You've secured the windoor assembly!" + user << "You've secured the windoor assembly!" src.anchored = 1 if(src.secure) src.name = "Secure Anchored Windoor Assembly" @@ -105,7 +105,7 @@ obj/structure/windoor_assembly/Destroy() if(do_after(user, 40)) if(!src) return - user << "\blue You've unsecured the windoor assembly!" + user << "You've unsecured the windoor assembly!" src.anchored = 0 if(src.secure) src.name = "Secure Windoor Assembly" @@ -155,7 +155,7 @@ obj/structure/windoor_assembly/Destroy() if(do_after(user, 40)) if(!src) return - user << "\blue You cut the windoor wires.!" + user << "You cut the windoor wires.!" new/obj/item/stack/cable_coil(get_turf(user), 1) src.state = "01" if(src.secure) @@ -173,7 +173,7 @@ obj/structure/windoor_assembly/Destroy() user.drop_item() W.loc = src - user << "\blue You've installed the airlock electronics!" + user << "You've installed the airlock electronics!" src.name = "Near finished Windoor Assembly" src.electronics = W else @@ -186,7 +186,7 @@ obj/structure/windoor_assembly/Destroy() if(do_after(user, 40)) if(!src || !src.electronics) return - user << "\blue You've removed the airlock electronics!" + user << "You've removed the airlock electronics!" if(src.secure) src.name = "Secure Wired Windoor Assembly" else @@ -198,7 +198,7 @@ obj/structure/windoor_assembly/Destroy() //Crowbar to complete the assembly, Step 7 complete. else if(istype(W, /obj/item/weapon/crowbar)) if(!src.electronics) - usr << "\red The assembly is missing electronics." + usr << "The assembly is missing electronics." return usr << browse(null, "window=windoor_access") playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) @@ -209,7 +209,7 @@ obj/structure/windoor_assembly/Destroy() if(!src) return density = 1 //Shouldn't matter but just incase - user << "\blue You finish the windoor!" + user << "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 41f7754e98..26bc16e070 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -191,8 +191,8 @@ playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1) user.do_attack_animation(src) - usr.visible_message("\red [usr.name] bangs against the [src.name]!", - "\red You bang against the [src.name]!", + usr.visible_message("[usr.name] bangs against the [src.name]!", + "<You bang against the [src.name]!", "You hear a banging sound.") else playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1) From c77605265c4c6b4816a4709665e4722f3e2a6901 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Tue, 2 Jun 2015 20:18:45 +0100 Subject: [PATCH 09/20] code/game/objects, code/game/machinery merge fix --- code/game/machinery/OpTable.dm | 15 +-- code/game/objects/items.dm | 36 ++--- code/game/objects/items/apc_frame.dm | 8 +- code/game/objects/items/blueprints.dm | 12 +- code/game/objects/items/bodybag.dm | 2 +- code/game/objects/items/crayons.dm | 4 +- code/game/objects/items/devices/PDA/PDA.dm | 98 +++++++------- code/game/objects/items/devices/aicard.dm | 2 +- .../objects/items/devices/chameleonproj.dm | 14 +- code/game/objects/items/devices/debugger.dm | 12 +- code/game/objects/items/devices/flash.dm | 10 +- code/game/objects/items/devices/megaphone.dm | 10 +- code/game/objects/items/devices/modkit.dm | 2 +- code/game/objects/items/devices/paicard.dm | 4 +- .../objects/items/devices/pipe_painter.dm | 2 +- .../objects/items/devices/radio/beacon.dm | 2 +- .../game/objects/items/devices/radio/radio.dm | 8 +- code/game/objects/items/devices/scanners.dm | 125 +++++++++--------- .../objects/items/devices/taperecorder.dm | 18 +-- .../objects/items/devices/traitordevices.dm | 8 +- code/game/objects/items/robot/robot_parts.dm | 32 ++--- .../objects/items/robot/robot_upgrades.dm | 4 +- code/game/objects/items/shooting_range.dm | 2 +- code/game/objects/items/stacks/medical.dm | 40 +++--- code/game/objects/items/stacks/rods.dm | 10 +- .../game/objects/items/stacks/sheets/glass.dm | 26 ++-- .../objects/items/stacks/sheets/leather.dm | 6 +- code/game/objects/items/stacks/stack.dm | 10 +- .../objects/items/stacks/tiles/plasteel.dm | 4 +- code/game/objects/items/toys.dm | 72 +++++----- code/game/objects/items/weapons/AI_modules.dm | 2 +- code/game/objects/items/weapons/autopsy.dm | 10 +- code/game/objects/items/weapons/candle.dm | 4 +- code/game/objects/items/weapons/cards_ids.dm | 6 +- .../circuitboards/computer/camera_monitor.dm | 10 +- .../circuitboards/computer/research.dm | 6 +- .../game/objects/items/weapons/clown_items.dm | 2 +- code/game/objects/items/weapons/cosmetics.dm | 2 +- .../objects/items/weapons/flamethrower.dm | 14 +- .../objects/items/weapons/gift_wrappaper.dm | 18 +-- .../items/weapons/grenades/chem_grenade.dm | 22 +-- .../items/weapons/grenades/flashbang.dm | 12 +- code/game/objects/items/weapons/handcuffs.dm | 8 +- .../game/objects/items/weapons/hydroponics.dm | 6 +- .../objects/items/weapons/implants/implant.dm | 8 +- .../items/weapons/implants/implantcase.dm | 4 +- .../items/weapons/implants/implantchair.dm | 6 +- .../items/weapons/implants/implanter.dm | 8 +- .../objects/items/weapons/material/kitchen.dm | 8 +- .../objects/items/weapons/material/knives.dm | 6 +- .../objects/items/weapons/material/shards.dm | 6 +- .../items/weapons/material/twohanded.dm | 2 +- .../objects/items/weapons/melee/energy.dm | 10 +- code/game/objects/items/weapons/melee/misc.dm | 2 +- code/game/objects/items/weapons/policetape.dm | 20 +-- .../game/objects/items/weapons/power_cells.dm | 2 +- code/game/objects/items/weapons/shields.dm | 14 +- .../objects/items/weapons/storage/backpack.dm | 6 +- .../objects/items/weapons/storage/bags.dm | 2 +- .../objects/items/weapons/storage/bible.dm | 2 +- .../items/weapons/storage/briefcase.dm | 13 +- .../objects/items/weapons/storage/lockbox.dm | 16 +-- .../objects/items/weapons/storage/secure.dm | 18 +-- .../objects/items/weapons/storage/storage.dm | 10 +- code/game/objects/items/weapons/stunbaton.dm | 4 +- .../items/weapons/surgery_limbattachment.dm | 22 +-- .../objects/items/weapons/surgery_tools.dm | 10 +- .../objects/items/weapons/swords_axes_etc.dm | 16 +-- code/game/objects/items/weapons/syndie.dm | 6 +- .../objects/items/weapons/tanks/jetpack.dm | 4 +- .../objects/items/weapons/tanks/tank_types.dm | 10 +- .../game/objects/items/weapons/tanks/tanks.dm | 37 +++--- code/game/objects/items/weapons/tools.dm | 18 +-- code/game/objects/items/weapons/trays.dm | 18 +-- .../objects/items/weapons/weldbackpack.dm | 12 +- code/game/objects/items/weapons/wires.dm | 4 +- 76 files changed, 524 insertions(+), 520 deletions(-) diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index dacb95a576..c8e129ab8c 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -88,11 +88,7 @@ if (C == user) user.visible_message("[user] climbs on \the [src].","You climb on \the [src].") else -<<<<<<< HEAD - visible_message("[C] has been laid on the operating table by [user].", 3) -======= visible_message("\The [C] has been laid on \the [src] by [user].", 3) ->>>>>>> upstream/dev if (C.client) C.client.perspective = EYE_PERSPECTIVE C.client.eye = src @@ -137,20 +133,11 @@ return /obj/machinery/optable/proc/check_table(mob/living/carbon/patient as mob) -<<<<<<< HEAD - if(src.victim) - usr << "The table is already occupied!" -======= check_victim() if(src.victim && get_turf(victim) == get_turf(src) && victim.lying) - usr << "\the [src] is already occupied!" ->>>>>>> upstream/dev + usr << "\The [src] is already occupied!" return 0 if(patient.buckled) -<<<<<<< HEAD - usr << "Unbuckle first!" -======= usr << "Unbuckle \the [patient] first!" ->>>>>>> upstream/dev return 0 return 1 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 45d6dd0624..ffa85880a3 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -373,22 +373,22 @@ var/list/global/slot_flags_enumeration = list( if(!usr.canmove || usr.stat || usr.restrained() || !Adjacent(usr)) return if((!istype(usr, /mob/living/carbon)) || (istype(usr, /mob/living/carbon/brain)))//Is humanoid, and is not a brain - usr << "\red You can't pick things up!" + usr << "You can't pick things up!" return if( usr.stat || usr.restrained() )//Is not asleep/dead and is not restrained - usr << "\red You can't pick things up!" + usr << "You can't pick things up!" return if(src.anchored) //Object isn't anchored - usr << "\red You can't pick that up!" + usr << "You can't pick that up!" return if(!usr.hand && usr.r_hand) //Right hand is not full - usr << "\red Your right hand is full." + usr << "Your right hand is full." return if(usr.hand && usr.l_hand) //Left hand is not full - usr << "\red Your left hand is full." + usr << "Your left hand is full." return if(!istype(src.loc, /turf)) //Object is on a turf - usr << "\red You can't pick that up!" + usr << "You can't pick that up!" return //All checks are done, time to pick it up! usr.UnarmedAttack(src) @@ -419,11 +419,11 @@ var/list/global/slot_flags_enumeration = list( (H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \ )) // you can't stab someone in the eyes wearing a mask! - user << "\red You're going to need to remove the eye covering first." + user << "You're going to need to remove the eye covering first." return if(!M.has_eyes()) - user << "\red You cannot locate any eyes on [M]!" + user << "You cannot locate any eyes on [M]!" return user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" @@ -434,7 +434,7 @@ var/list/global/slot_flags_enumeration = list( //if((CLUMSY in user.mutations) && prob(50)) // M = user /* - M << "\red You stab yourself in the eye." + M << "You stab yourself in the eye." M.sdisabilities |= BLIND M.weakened += 4 M.adjustBruteLoss(10) @@ -446,30 +446,30 @@ var/list/global/slot_flags_enumeration = list( if(H != user) for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [M] has been stabbed in the eye with [src] by [user].", 1) - M << "\red [user] stabs you in the eye with [src]!" - user << "\red You stab [M] in the eye with [src]!" + O.show_message("[M] has been stabbed in the eye with [src] by [user].", 1) + M << "[user] stabs you in the eye with [src]!" + user << "You stab [M] in the eye with [src]!" else user.visible_message( \ - "\red [user] has stabbed themself with [src]!", \ - "\red You stab yourself in the eyes with [src]!" \ + "[user] has stabbed themself with [src]!", \ + "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 <= 1) //robot eyes bleeding might be a bit silly - M << "\red Your eyes start to bleed profusely!" + M << "Your eyes start to bleed profusely!" if(prob(50)) if(M.stat != 2) - M << "\red You drop what you're holding and clutch at your eyes!" + M << "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) - M << "\red You go blind!" + M << "You go blind!" var/obj/item/organ/external/affecting = H.get_organ("head") if(affecting.take_damage(7)) M:UpdateDamageIcon() @@ -603,4 +603,4 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. /obj/item/proc/pwr_drain() - return 0 // Process Kill \ No newline at end of file + return 0 // Process Kill diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index 0f3fdde0d8..a88d4f0e39 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -22,17 +22,17 @@ var/turf/loc = get_turf(usr) var/area/A = loc.loc if (!istype(loc, /turf/simulated/floor)) - usr << "\red APC cannot be placed on this spot." + usr << "APC cannot be placed on this spot." return if (A.requires_power == 0 || istype(A, /area/space)) - usr << "\red APC cannot be placed in this area." + usr << "APC cannot be placed in this area." return if (A.get_apc()) - usr << "\red This area already has APC." + usr << "This area already has an APC." return //only one APC per area for(var/obj/machinery/power/terminal/T in loc) if (T.master) - usr << "\red There is another network terminal here." + usr << "There is another network terminal here." return else var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(loc) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 9ec1a2e144..f0cddf5931 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -104,20 +104,20 @@ move an amendment to the drawing.

if(!istype(res,/list)) switch(res) if(ROOM_ERR_SPACE) - usr << "\red The new area must be completely airtight!" + usr << "The new area must be completely airtight!" return if(ROOM_ERR_TOOLARGE) - usr << "\red The new area too large!" + usr << "The new area too large!" return else - usr << "\red Error! Please notify administration!" + usr << "Error! Please notify administration!" return var/list/turf/turfs = res var/str = sanitizeSafe(input("New area name:","Blueprint Editing", ""), MAX_NAME_LEN) if(!str || !length(str)) //cancel return if(length(str) > 50) - usr << "\red Name too long." + usr << "Name too long." return var/area/A = new A.name = str @@ -153,11 +153,11 @@ move an amendment to the drawing.

if(!str || !length(str) || str==prevname) //cancel return if(length(str) > 50) - usr << "\red Text too long." + usr << "Text too long." return set_area_machinery_title(A,str,prevname) A.name = str - usr << "\blue You set the area '[prevname]' title to '[str]'." + usr << "You set the area '[prevname]' title to '[str]'." interact() return diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 8953872d93..68084ff5c9 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -131,5 +131,5 @@ /obj/structure/closet/body_bag/cryobag/MouseDrop(over_object, src_location, over_location) if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src)))) if(!ishuman(usr)) return - usr << "\red You can't fold that up anymore.." + usr << "You can't fold that up anymore.." ..() diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index a9a7528994..4c519b8fc5 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -84,7 +84,7 @@ if(uses) uses-- if(!uses) - user << "\red You used up your crayon!" + user << "You used up your crayon!" qdel(src) return @@ -96,7 +96,7 @@ if(uses) uses -= 5 if(uses <= 0) - user << "\red You ate your crayon!" + user << "You ate your crayon!" qdel(src) else ..() diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index c908267244..10adef3d88 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -745,7 +745,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(!isnull(P)) if (!P.toff && cartridge.charges > 0) cartridge.charges-- - U.show_message("\blue Virus sent!", 1) + U.show_message("Virus sent!", 1) P.honkamt = (rand(15,20)) else U << "PDA not found." @@ -758,7 +758,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(!isnull(P)) if (!P.toff && cartridge.charges > 0) cartridge.charges-- - U.show_message("\blue Virus sent!", 1) + U.show_message("Virus sent!", 1) P.message_silent = 1 P.news_silent = 1 P.ttone = "silence" @@ -786,10 +786,10 @@ var/global/list/obj/item/device/pda/PDAs = list() var/obj/item/device/pda/P = locate(href_list["target"]) var/datum/reception/reception = get_reception(src, P, "", do_sleep = 0) if(!(reception.message_server && reception.telecomms_reception & TELECOMMS_RECEPTION_SENDER)) - U.show_message("\red An error flashes on your [src]: Connection unavailable", 1) + U.show_message("An error flashes on your [src]: Connection unavailable", 1) return if(reception.telecomms_reception & TELECOMMS_RECEPTION_RECEIVER == 0) // Does our recepient have a broadcaster on their level? - U.show_message("\red An error flashes on your [src]: Recipient unavailable", 1) + U.show_message("An error flashes on your [src]: Recipient unavailable", 1) return if(!isnull(P)) if (!P.toff && cartridge.charges > 0) @@ -807,15 +807,15 @@ var/global/list/obj/item/device/pda/PDAs = list() difficulty += 3 if(prob(difficulty)) - U.show_message("\red An error flashes on your [src].", 1) + U.show_message("An error flashes on your [src].", 1) else if (prob(difficulty * 7)) - U.show_message("\red Energy feeds back into your [src]!", 1) + U.show_message("Energy feeds back into your [src]!", 1) ui.close() detonate_act(src) log_admin("[key_name(U)] just attempted to blow up [P] with the Detomatix cartridge but failed, blowing themselves up") message_admins("[key_name_admin(U)] just attempted to blow up [P] with the Detomatix cartridge but failed.", 1) else - U.show_message("\blue Success!", 1) + U.show_message("Success!", 1) log_admin("[key_name(U)] just attempted to blow up [P] with the Detomatix cartridge and succeeded") message_admins("[key_name_admin(U)] just attempted to blow up [P] with the Detomatix cartridge and succeeded.", 1) detonate_act(P) @@ -932,7 +932,7 @@ var/global/list/obj/item/device/pda/PDAs = list() message += "Your [P] shatters in a thousand pieces!" if(M && isliving(M)) - message = "\red" + message + message = "[message]" M.show_message(message, 1) /obj/item/device/pda/proc/remove_id() @@ -947,7 +947,7 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/proc/create_message(var/mob/living/U = usr, var/obj/item/device/pda/P, var/tap = 1) if(tap) - U.visible_message("[U] taps on \his PDA's screen.") + U.visible_message("\The [U] taps on \his PDA's screen.") U.last_target_click = world.time var/t = input(U, "Please enter message", P.name, null) as text t = sanitize(t) @@ -1196,53 +1196,59 @@ var/global/list/obj/item/device/pda/PDAs = list() if(1) for (var/mob/O in viewers(C, null)) - O.show_message("\red [user] has analyzed [C]'s vitals!", 1) + O.show_message("\The [user] has analyzed [C]'s vitals!", 1) - user.show_message("\blue Analyzing Results for [C]:") - user.show_message("\blue \t Overall Status: [C.stat > 1 ? "dead" : "[C.health - C.halloss]% healthy"]", 1) - user.show_message("\blue \t Damage Specifics: [C.getOxyLoss() > 50 ? "\red" : "\blue"][C.getOxyLoss()]-[C.getToxLoss() > 50 ? "\red" : "\blue"][C.getToxLoss()]-[C.getFireLoss() > 50 ? "\red" : "\blue"][C.getFireLoss()]-[C.getBruteLoss() > 50 ? "\red" : "\blue"][C.getBruteLoss()]", 1) - user.show_message("\blue \t Key: Suffocation/Toxin/Burns/Brute", 1) - user.show_message("\blue \t Body Temperature: [C.bodytemperature-T0C]°C ([C.bodytemperature*1.8-459.67]°F)", 1) + 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(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) if(C.tod && (C.stat == DEAD || (C.status_flags & FAKEDEATH))) - user.show_message("\blue \t Time of Death: [C.tod]") + user.show_message(" 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("\blue Localized Damage, Brute/Burn:",1) + user.show_message("Localized Damage, Brute/Burn:",1) if(length(damaged)>0) for(var/obj/item/organ/external/org in damaged) - user.show_message(text("\blue \t []: []\blue-[]",capitalize(org.name),(org.brute_dam > 0)?"\red [org.brute_dam]":0,(org.burn_dam > 0)?"\red [org.burn_dam]":0),1) + 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("\blue \t Limbs are OK.",1) + user.show_message(" Limbs are OK.",1) for(var/datum/disease/D in C.viruses) if(!D.hidden[SCANNER]) - user.show_message(text("\red Warning: [D.form] Detected\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]")) + user.show_message("Warning: [D.form] Detected\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]") if(2) if (!istype(C:dna, /datum/dna)) - user << "\blue No fingerprints found on [C]" + user << "No fingerprints found on [C]" else - user << text("\blue [C]'s Fingerprints: [md5(C:dna.uni_identity)]") + user << text("\The [C]'s Fingerprints: [md5(C:dna.uni_identity)]") if ( !(C:blood_DNA) ) - user << "\blue No blood found on [C]" + user << "No blood found on [C]" if(C:blood_DNA) qdel(C:blood_DNA) else - user << "\blue Blood found on [C]. Analysing..." + user << "Blood found on [C]. Analysing..." spawn(15) for(var/blood in C:blood_DNA) - user << "\blue Blood type: [C:blood_DNA[blood]]\nDNA: [blood]" + user << "Blood type: [C:blood_DNA[blood]]\nDNA: [blood]" if(4) for (var/mob/O in viewers(C, null)) - O.show_message("\red [user] has analyzed [C]'s radiation levels!", 1) + O.show_message("\The [user] has analyzed [C]'s radiation levels!", 1) - user.show_message("\blue Analyzing Results for [C]:") + user.show_message("Analyzing Results for [C]:") if(C.radiation) - user.show_message("\green Radiation Level: \black [C.radiation]") + user.show_message("Radiation Level: [C.radiation]") else - user.show_message("\blue No radiation detected.") + user.show_message("No radiation detected.") /obj/item/device/pda/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) if(!proximity) return @@ -1254,49 +1260,49 @@ var/global/list/obj/item/device/pda/PDAs = list() if(!isnull(A.reagents)) if(A.reagents.reagent_list.len > 0) var/reagents_length = A.reagents.reagent_list.len - user << "\blue [reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found." + user << "[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found." for (var/re in A.reagents.reagent_list) - user << "\blue \t [re]" + user << " [re]" else - user << "\blue No active chemical agents found in [A]." + user << "No active chemical agents found in [A]." else - user << "\blue No significant chemical agents found in [A]." + user << "No significant chemical agents found in [A]." if(5) if((istype(A, /obj/item/weapon/tank)) || (istype(A, /obj/machinery/portable_atmospherics))) var/obj/icon = A for (var/mob/O in viewers(user, null)) - O << "\red [user] has used [src] on \icon[icon] [A]" + O << "\The [user] has used [src] on \icon[icon] [A]." var/pressure = A:air_contents.return_pressure() var/total_moles = A:air_contents.total_moles - user << "\blue Results of analysis of \icon[icon]" + user << "Results of analysis of \icon[icon]" if (total_moles>0) - user << "\blue Pressure: [round(pressure,0.1)] kPa" + user << "Pressure: [round(pressure,0.1)] kPa" for(var/g in A:air_contents.gas) - user << "\blue [gas_data.name[g]]: [round((A:air_contents.gas[g] / total_moles) * 100)]%" - user << "\blue Temperature: [round(A:air_contents.temperature-T0C)]°C" + user << "[gas_data.name[g]]: [round((A:air_contents.gas[g] / total_moles) * 100)]%" + user << "Temperature: [round(A:air_contents.temperature-T0C)]°C" else - user << "\blue Tank is empty!" + user << "Tank is empty!" if (istype(A, /obj/machinery/atmospherics/pipe/tank)) var/obj/icon = A for (var/mob/O in viewers(user, null)) - O << "\red [user] has used [src] on \icon[icon] [A]" + O << "\The [user] has used [src] on \icon[icon] [A]" var/obj/machinery/atmospherics/pipe/tank/T = A var/pressure = T.parent.air.return_pressure() var/total_moles = T.parent.air.total_moles - user << "\blue Results of analysis of \icon[icon]" + user << "Results of analysis of \icon[icon]" if (total_moles>0) - user << "\blue Pressure: [round(pressure,0.1)] kPa" + user << "Pressure: [round(pressure,0.1)] kPa" for(var/g in T.parent.air.gas) - user << "\blue [gas_data.name[g]]: [round((T.parent.air.gas[g] / total_moles) * 100)]%" - user << "\blue Temperature: [round(T.parent.air.temperature-T0C)]°C" + user << "[gas_data.name[g]]: [round((T.parent.air.gas[g] / total_moles) * 100)]%" + user << "Temperature: [round(T.parent.air.temperature-T0C)]°C" else - user << "\blue Tank is empty!" + user << "Tank is empty!" if (!scanmode && istype(A, /obj/item/weapon/paper) && owner) // JMO 20140705: Makes scanned document show up properly in the notes. Not pretty for formatted documents, @@ -1345,7 +1351,7 @@ var/global/list/obj/item/device/pda/PDAs = list() // feature to the PDA, which would better convey the availability of the feature, but this will work for now. // Inform the user - user << "\blue Paper scanned and OCRed to notekeeper." //concept of scanning paper copyright brainoblivion 2009 + user << "Paper scanned and OCRed to notekeeper." //concept of scanning paper copyright brainoblivion 2009 diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 7c24be6697..a6a51386d5 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -118,7 +118,7 @@ if(ai.client) ai << "You have been downloaded to a mobile storage device. Remote access lost." if(user.client) - user << "\blue Transfer successful: \black [ai.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory." + user << "Transfer successful: [ai.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory." update_icon() return 1 diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index cdefd61d57..36a6d4f805 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -30,7 +30,7 @@ if(!active_dummy) if(istype(target,/obj/item) && !istype(target, /obj/item/weapon/disk/nuclear)) playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, 1, -6) - user << "\blue Scanned [target]." + user << "Scanned [target]." saved_item = target.type saved_icon = target.icon saved_icon_state = target.icon_state @@ -43,7 +43,7 @@ playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6) qdel(active_dummy) active_dummy = null - usr << "\blue You deactivate the [src]." + usr << "You deactivate the [src]." var/obj/effect/overlay/T = PoolOrNew(/obj/effect/overlay, get_turf(src)) T.icon = 'icons/effects/effects.dmi' flick("emppulse",T) @@ -55,7 +55,7 @@ var/obj/effect/dummy/chameleon/C = PoolOrNew(/obj/effect/dummy/chameleon, usr.loc) C.activate(O, usr, saved_icon, saved_icon_state, saved_overlays, src) qdel(O) - usr << "\blue You activate the [src]." + usr << "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) @@ -102,22 +102,22 @@ /obj/effect/dummy/chameleon/attackby() for(var/mob/M in src) - M << "\red Your chameleon-projector deactivates." + M << "Your chameleon-projector deactivates." master.disrupt() /obj/effect/dummy/chameleon/attack_hand() for(var/mob/M in src) - M << "\red Your chameleon-projector deactivates." + M << "Your chameleon-projector deactivates." master.disrupt() /obj/effect/dummy/chameleon/ex_act() for(var/mob/M in src) - M << "\red Your chameleon-projector deactivates." + M << "Your chameleon-projector deactivates." master.disrupt() /obj/effect/dummy/chameleon/bullet_act() for(var/mob/M in src) - M << "\red Your chameleon-projector deactivates." + M << "Your chameleon-projector deactivates." ..() master.disrupt() diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index 59a66d161a..fe0cd074e2 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -26,21 +26,21 @@ if(istype(O, /obj/machinery/power/apc)) var/obj/machinery/power/apc/A = O if(A.emagged || A.hacker) - user << "\red There is a software error with the device." + user << "There is a software error with the device." else - user << "\blue The device's software appears to be fine." + user << "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) - user << "\red There is a software error with the device." + user << "There is a software error with the device." else - user << "\blue The device's software appears to be fine." + user << "The device's software appears to be fine." return 1 else if(istype(O, /obj/machinery)) var/obj/machinery/A = O if(A.emagged) - user << "\red There is a software error with the device." + user << "There is a software error with the device." else - user << "\blue The device's software appears to be fine." + user << "The device's software appears to be fine." return 1 diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 2c686f8bf3..6b6e0edc4e 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -16,7 +16,7 @@ /obj/item/device/flash/proc/clown_check(var/mob/user) if(user && (CLUMSY in user.mutations) && prob(50)) - user << "\red \The [src] slips out of your hand." + user << "\The [src] slips out of your hand." user.drop_item() return 0 return 1 @@ -192,21 +192,21 @@ /obj/item/device/flash/synthetic name = "synthetic flash" desc = "When a problem arises, SCIENCE is the solution." - icon_state = "sflash" + icon_state = "sflash" origin_tech = list(TECH_MAGNET = 2, TECH_COMBAT = 1) - var/construction_cost = list(DEFAULT_WALL_MATERIAL=750,"glass"=750) + var/construction_cost = list(DEFAULT_WALL_MATERIAL=750,"glass"=750) var/construction_time=100 /obj/item/device/flash/synthetic/attack(mob/living/M as mob, mob/user as mob) ..() if(!broken) broken = 1 - user << "\red The bulb has burnt out!" + user << "The bulb has burnt out!" icon_state = "flashburnt" /obj/item/device/flash/synthetic/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) ..() if(!broken) broken = 1 - user << "\red The bulb has burnt out!" + user << "The bulb has burnt out!" icon_state = "flashburnt" diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 53fac1be05..2e08de6d81 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -14,15 +14,15 @@ /obj/item/device/megaphone/attack_self(mob/living/user as mob) if (user.client) if(user.client.prefs.muted & MUTE_IC) - src << "\red You cannot speak in IC (muted)." + src << "You cannot speak in IC (muted)." return if(!ishuman(user)) - user << "\red You don't know how to use this!" + user << "You don't know how to use this!" return if(user.silent) return if(spamcheck) - user << "\red \The [src] needs to recharge!" + user << "\The [src] needs to recharge!" return var/message = sanitize(input(user, "Shout a message?", "Megaphone", null) as text) @@ -36,7 +36,7 @@ O.show_message("[user] broadcasts, \"[pick(insultmsg)]\"",2) // 2 stands for hearable message insults-- else - user << "\red *BZZZZzzzzzt*" + user << "*BZZZZzzzzzt*" else for(var/mob/O in (viewers(user))) O.show_message("[user] broadcasts, \"[message]\"",2) // 2 stands for hearable message @@ -48,7 +48,7 @@ /obj/item/device/megaphone/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/weapon/card/emag) && !emagged) - user << "\red You overload \the [src]'s voice synthesizer." + user << "You overload \the [src]'s voice synthesizer." emagged = 1 insults = rand(1, 3)//to prevent dickflooding return diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index 4207546b03..025196b218 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -49,7 +49,7 @@ playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1) - user.visible_message("\red [user] opens \the [src] and modifies \the [O].","\red You open \the [src] and modify \the [O].") + user.visible_message("\The [user] opens \the [src] and modifies \the [O].","You open \the [src] and modify \the [O].") I.refit_for_species(target_species) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index b1cdce9f29..f7fa46678b 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -307,7 +307,7 @@ /obj/item/device/paicard/proc/alertUpdate() var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) - M.show_message("\blue [src] flashes a message across its screen, \"Additional personalities available for download.\"", 3, "\blue [src] bleeps electronically.", 2) + M.show_message("\The [src] flashes a message across its screen, \"Additional personalities available for download.\"", 3, "\The [src] bleeps electronically.", 2) /obj/item/device/paicard/emp_act(severity) for(var/mob/M in src) @@ -329,4 +329,4 @@ if(pai && pai.client) var/rendered = "[msg]" pai.show_message(rendered, type) - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index 81058067e1..f3e3256fed 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -23,7 +23,7 @@ var/turf/T = P.loc if (P.level < 2 && T.level==1 && isturf(T) && T.intact) - user << "\red You must remove the plating first." + user << "You must remove the plating first." return P.change_color(pipe_colors[mode]) diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index b6a947d6d5..7d41e25bc4 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -42,7 +42,7 @@ /obj/item/device/radio/beacon/syndicate/attack_self(mob/user as mob) if(user) - user << "\blue Locked In" + user << "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/radio.dm b/code/game/objects/items/devices/radio/radio.dm index c131c846a7..f8689208e9 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -463,9 +463,9 @@ . = ..() if ((in_range(src, user) || loc == user)) if (b_stat) - user.show_message("\blue \the [src] can be attached and modified!") + user.show_message("\The [src] can be attached and modified!") else - user.show_message("\blue \the [src] can not be modified or attached!") + user.show_message("\The [src] can not be modified or attached!") return /obj/item/device/radio/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -476,9 +476,9 @@ b_stat = !( b_stat ) if(!istype(src, /obj/item/device/radio/beacon)) if (b_stat) - user.show_message("\blue The radio can now be attached and modified!") + user.show_message("\The [src] can now be attached and modified!") else - user.show_message("\blue The radio can no longer be modified or attached!") + user.show_message("\The [src] can no longer be modified or attached!") updateDialog() //Foreach goto(83) add_fingerprint(user) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index af139f8914..5c14d8debe 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -80,27 +80,28 @@ REAGENT SCANNER /obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/user as mob) if (( (CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) - user << text("\red You try to analyze the floor's vitals!") + user << text("You try to analyze the floor's vitals!") for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1) - user.show_message(text("\blue Analyzing Results for The floor:\n\t Overall Status: Healthy"), 1) - user.show_message(text("\blue \t Damage Specifics: [0]-[0]-[0]-[0]"), 1) - user.show_message("\blue Key: Suffocation/Toxin/Burns/Brute", 1) - user.show_message("\blue Body Temperature: ???", 1) + O.show_message("\The [user] has analyzed the floor's vitals!", 1) + user.show_message("Analyzing Results for The floor:", 1) + user.show_message("Overall Status: Healthy", 1) + user.show_message(" Damage Specifics: 0-0-0-0", 1) + user.show_message("Key: Suffocation/Toxin/Burns/Brute", 1) + user.show_message("Body Temperature: ???", 1) return if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") - usr << "\red You don't have the dexterity to do this!" + usr << "You don't have the dexterity to do this!" return - user.visible_message(" [user] has analyzed [M]'s vitals."," You have analyzed [M]'s vitals.") + user.visible_message("[user] has analyzed [M]'s vitals.","You have analyzed [M]'s vitals.") if (!istype(M,/mob/living/carbon/human) || M.isSynthetic()) //these sensors are designed for organic life - user.show_message("\blue Analyzing Results for ERROR:\n\t Overall Status: ERROR") - user.show_message("\t Key: Suffocation/Toxin/Burns/Brute", 1) - user.show_message("\t Damage Specifics: ? - ? - ? - ?") - user.show_message("\blue Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1) - user.show_message("\red Warning: Blood Level ERROR: --% --cl.\blue Type: ERROR") - user.show_message("\blue Subject's pulse: -- bpm.") + user.show_message("Analyzing Results for ERROR:\n\t Overall Status: ERROR") + user.show_message(" Key: Suffocation/Toxin/Burns/Brute", 1) + user.show_message(" Damage Specifics: ? - ? - ? - ?") + user.show_message("Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1) + user.show_message("Warning: Blood Level ERROR: --% --cl. Type: ERROR") + user.show_message("Subject's pulse: -- bpm.") return var/fake_oxy = max(rand(1,40), M.getOxyLoss(), (300 - (M.getToxLoss() + M.getFireLoss() + M.getBruteLoss()))) @@ -110,34 +111,36 @@ REAGENT SCANNER var/BR = M.getBruteLoss() > 50 ? "[M.getBruteLoss()]" : M.getBruteLoss() if(M.status_flags & FAKEDEATH) OX = fake_oxy > 50 ? "[fake_oxy]" : fake_oxy - user.show_message("\blue Analyzing Results for [M]:\n\t Overall Status: dead") + user.show_message("Analyzing Results for [M]:") + user.show_message("Overall Status: dead") else - user.show_message("\blue Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "dead" : "[M.health - M.halloss]% healthy"]") - user.show_message("\t Key: Suffocation/Toxin/Burns/Brute", 1) - user.show_message("\t Damage Specifics: [OX] - [TX] - [BU] - [BR]") - user.show_message("\blue Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1) + user.show_message("Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "dead" : "[M.health - M.halloss]% healthy"]") + user.show_message(" Key: Suffocation/Toxin/Burns/Brute", 1) + user.show_message(" Damage Specifics: [OX] - [TX] - [BU] - [BR]") + user.show_message("Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1) if(M.tod && (M.stat == DEAD || (M.status_flags & FAKEDEATH))) - user.show_message("\blue Time of Death: [M.tod]") + user.show_message("Time of Death: [M.tod]") 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) - user.show_message("\blue Localized Damage, Brute/Burn:",1) + user.show_message("Localized Damage, Brute/Burn:",1) if(length(damaged)>0) for(var/obj/item/organ/external/org in damaged) - user.show_message(text("\blue \t []: [][]\blue - []", \ - "[capitalize(org.name)][org.status & ORGAN_ROBOT ? "(Cybernetic)" : ""]", \ - (org.brute_dam > 0) ? "\red [org.brute_dam]" :0, \ - (org.status & ORGAN_BLEEDING)?"\red \[Bleeding\]":"\t", \ - (org.burn_dam > 0) ? "[org.burn_dam]" :0),1) + user.show_message(text(" [][]: [][] - []", + capitalize(org.name), + (org.status & ORGAN_ROBOT) ? "(Cybernetic)" : "", + (org.brute_dam > 0) ? "[org.brute_dam]" : 0, + (org.status & ORGAN_BLEEDING)?"\[Bleeding\]":"", + (org.burn_dam > 0) ? "[org.burn_dam]" : 0),1) else - user.show_message("\blue \t Limbs are OK.",1) + user.show_message(" Limbs are OK.",1) OX = M.getOxyLoss() > 50 ? "Severe oxygen deprivation detected" : "Subject bloodstream oxygen level normal" TX = M.getToxLoss() > 50 ? "Dangerous amount of toxins detected" : "Subject bloodstream toxin level minimal" BU = M.getFireLoss() > 50 ? "Severe burn damage detected" : "Subject burn injury status O.K" BR = M.getBruteLoss() > 50 ? "Severe anatomical damage detected" : "Subject brute-force injury status O.K" if(M.status_flags & FAKEDEATH) - OX = fake_oxy > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal" + OX = fake_oxy > 50 ? "Severe oxygen deprivation detected" : "Subject bloodstream oxygen level normal" user.show_message("[OX] | [TX] | [BU] | [BR]") if(istype(M, /mob/living/carbon)) var/mob/living/carbon/C = M @@ -147,15 +150,15 @@ REAGENT SCANNER for(var/A in C.reagents.reagent_list) var/datum/reagent/R = A if(R.scannable) - reagentdata["[R.id]"] = "\t \blue [round(C.reagents.get_reagent_amount(R.id), 1)]u [R.name]" + reagentdata["[R.id]"] = " [round(C.reagents.get_reagent_amount(R.id), 1)]u [R.name]" else unknown++ if(reagentdata.len) - user.show_message("\blue Beneficial reagents detected in subject's blood:") + user.show_message("Beneficial reagents detected in subject's blood:") for(var/d in reagentdata) user.show_message(reagentdata[d]) if(unknown) - user.show_message(text("\red Warning: Unknown substance[(unknown>1)?"s":""] detected in subject's blood.")) + user.show_message("Warning: Unknown substance[(unknown>1)?"s":""] detected in subject's blood.") if(C.ingested && C.ingested.total_volume) var/unknown = 0 for(var/datum/reagent/R in C.ingested.reagent_list) @@ -169,23 +172,23 @@ REAGENT SCANNER for (var/ID in C.virus2) if (ID in virusDB) var/datum/data/record/V = virusDB[ID] - user.show_message(text("\red Warning: Pathogen [V.fields["name"]] detected in subject's blood. Known antigen : [V.fields["antigen"]]")) -// user.show_message(text("\red Warning: Unknown pathogen detected in subject's blood.")) + user.show_message("Warning: Pathogen [V.fields["name"]] detected in subject's blood. Known antigen : [V.fields["antigen"]]") +// user.show_message(text("Warning: Unknown pathogen detected in subject's blood.")) if (M.getCloneLoss()) - user.show_message("\red Subject appears to have been imperfectly cloned.") + user.show_message("Subject appears to have been imperfectly cloned.") for(var/datum/disease/D in M.viruses) if(!D.hidden[SCANNER]) - user.show_message(text("\red Warning: [D.form] Detected\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]")) + user.show_message(text("Warning: [D.form] Detected\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]")) // if (M.reagents && M.reagents.get_reagent_amount("inaprovaline")) -// user.show_message("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals.") +// user.show_message("Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals.") if (M.has_brain_worms()) - user.show_message("\red Subject suffering from aberrant brain activity. Recommend further scanning.") + user.show_message("Subject suffering from aberrant brain activity. Recommend further scanning.") else if (M.getBrainLoss() >= 100 || !M.has_brain()) - user.show_message("\red Subject is brain dead.") + user.show_message("Subject is brain dead.") else if (M.getBrainLoss() >= 60) - user.show_message("\red Severe brain damage detected. Subject likely to have mental retardation.") + user.show_message("Severe brain damage detected. Subject likely to have mental retardation.") else if (M.getBrainLoss() >= 10) - user.show_message("\red Significant brain damage detected. Subject may have had a concussion.") + user.show_message("Significant brain damage detected. Subject may have had a concussion.") if(ishuman(M)) var/mob/living/carbon/human/H = M for(var/name in H.organs_by_name) @@ -195,20 +198,20 @@ REAGENT SCANNER var/limb = e.name if(e.status & ORGAN_BROKEN) if(((e.name == "l_arm") || (e.name == "r_arm") || (e.name == "l_leg") || (e.name == "r_leg")) && (!(e.status & ORGAN_SPLINTED))) - user << "\red Unsecured fracture in subject [limb]. Splinting recommended for transport." + user << "Unsecured fracture in subject [limb]. Splinting recommended for transport." if(e.has_infected_wound()) - user << "\red Infected wound detected in subject [limb]. Disinfection recommended." + user << "Infected wound detected in subject [limb]. Disinfection recommended." for(var/name in H.organs_by_name) var/obj/item/organ/external/e = H.organs_by_name[name] if(e && e.status & ORGAN_BROKEN) - user.show_message(text("\red Bone fractures detected. Advanced scanner required for location."), 1) + user.show_message(text("Bone fractures detected. Advanced scanner required for location."), 1) break for(var/obj/item/organ/external/e in H.organs) if(!e) continue for(var/datum/wound/W in e.wounds) if(W.internal) - user.show_message(text("\red Internal bleeding detected. Advanced scanner required for location."), 1) + user.show_message(text("Internal bleeding detected. Advanced scanner required for location."), 1) break if(M:vessel) var/blood_volume = round(M:vessel.get_reagent_amount("blood")) @@ -216,12 +219,12 @@ REAGENT SCANNER var/blood_type = M.dna.b_type blood_percent *= 100 if(blood_volume <= 500 && blood_volume > 336) - user.show_message("\red Warning: Blood Level LOW: [blood_percent]% [blood_volume]cl.\blue Type: [blood_type]") + user.show_message("Warning: Blood Level LOW: [blood_percent]% [blood_volume]cl. Type: [blood_type]") else if(blood_volume <= 336) - user.show_message("\red Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl.\blue Type: [blood_type]") + user.show_message("Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl. Type: [blood_type]") else - user.show_message("\blue Blood Level Normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]") - user.show_message("\blue Subject's pulse: [H.get_pulse(GETPULSE_TOOL)] bpm.") + user.show_message("Blood Level Normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]") + user.show_message("Subject's pulse: [H.get_pulse(GETPULSE_TOOL)] bpm.") src.add_fingerprint(user) return @@ -258,7 +261,7 @@ REAGENT SCANNER if (user.stat) return if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") - usr << "\red You don't have the dexterity to do this!" + usr << "You don't have the dexterity to do this!" return var/turf/location = user.loc @@ -270,16 +273,16 @@ REAGENT SCANNER var/pressure = environment.return_pressure() var/total_moles = environment.total_moles - user.show_message("\blue Results:", 1) + user.show_message("Results:", 1) if(abs(pressure - ONE_ATMOSPHERE) < 10) - user.show_message("\blue Pressure: [round(pressure,0.1)] kPa", 1) + user.show_message("Pressure: [round(pressure,0.1)] kPa", 1) else - user.show_message("\red Pressure: [round(pressure,0.1)] kPa", 1) + user.show_message("Pressure: [round(pressure,0.1)] kPa", 1) if(total_moles) for(var/g in environment.gas) - user.show_message("\blue [gas_data.name[g]]: [round((environment.gas[g] / total_moles)*100)]%", 1) + user.show_message("[gas_data.name[g]]: [round((environment.gas[g] / total_moles)*100)]%", 1) - user.show_message("\blue Temperature: [round(environment.temperature-T0C)]°C", 1) + user.show_message("Temperature: [round(environment.temperature-T0C)]°C", 1) src.add_fingerprint(user) return @@ -318,14 +321,14 @@ REAGENT SCANNER if (user.stat) return if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") - user << "\red You don't have the dexterity to do this!" + user << "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() - user << "\red The sample was contaminated! Please insert another sample" + user << "The sample was contaminated! Please insert another sample" return else blood_traces = params2list(R.data["trace_chem"]) @@ -369,7 +372,7 @@ REAGENT SCANNER if (user.stat) return if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") - user << "\red You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return if(!istype(O)) return @@ -379,13 +382,13 @@ REAGENT SCANNER if(O.reagents.reagent_list.len > 0) var/one_percent = O.reagents.total_volume / 100 for (var/datum/reagent/R in O.reagents.reagent_list) - dat += "\n \t \blue [R][details ? ": [R.volume / one_percent]%" : ""]" + dat += "\n \t [R][details ? ": [R.volume / one_percent]%" : ""]" if(dat) - user << "\blue Chemicals found: [dat]" + user << "Chemicals found: [dat]" else - user << "\blue No active chemical agents found in [O]." + user << "No active chemical agents found in [O]." else - user << "\blue No significant chemical agents found in [O]." + user << "No significant chemical agents found in [O]." return diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index d79971bf8c..405e77db7a 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -77,7 +77,7 @@ if(usr.stat) return if(emagged == 1) - usr << "\red The tape recorder makes a scratchy noise." + usr << "The tape recorder makes a scratchy noise." return icon_state = "taperecorderrecording" if(timerecorded < 3600 && playing == 0) @@ -104,7 +104,7 @@ if(usr.stat) return if(emagged == 1) - usr << "\red The tape recorder makes a scratchy noise." + usr << "The tape recorder makes a scratchy noise." return if(recording == 1) recording = 0 @@ -148,7 +148,7 @@ if(usr.stat) return if(emagged == 1) - usr << "\red The tape recorder makes a scratchy noise." + usr << "The tape recorder makes a scratchy noise." return if(recording == 1) usr << "You can't playback when recording!" @@ -210,7 +210,7 @@ if(usr.stat) return if(emagged == 1) - usr << "\red The tape recorder makes a scratchy noise." + usr << "The tape recorder makes a scratchy noise." return if(!canprint) usr << "The recorder can't print that fast!" @@ -238,11 +238,11 @@ if(usr.stat) return if(emagged == 1) - usr << "\red The tape recorder makes a scratchy noise." + usr << "The tape recorder makes a scratchy noise." return icon_state = "taperecorderrecording" if(timerecorded < 3600 && playing == 0) - usr << "\blue Recording started." + usr << "Recording started." recording = 1 timestamp+= timerecorded storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] Recording started." @@ -255,7 +255,7 @@ icon_state = "taperecorderidle" return else - usr << "\red Either your tape recorder's memory is full, or it is currently playing back its memory." + usr << "Either your tape recorder's memory is full, or it is currently playing back its memory." else if(usr.stat) usr << "Not when you're incapacitated." @@ -264,7 +264,7 @@ recording = 0 timestamp+= timerecorded storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] Recording stopped." - usr << "\blue Recording stopped." + usr << "Recording stopped." icon_state = "taperecorderidle" return else if(playing == 1) @@ -275,5 +275,5 @@ icon_state = "taperecorderidle" return else - usr << "\red Stop what?" + usr << "Stop what?" return diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index fe1222cb07..fbed4e7ebb 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/device/batterer/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) if(!user) return if(times_used >= max_uses) - user << "\red The mind batterer has been burnt out!" + user << "The mind batterer has been burnt out!" return user.attack_log += text("\[[time_stamp()]\] Used [src] to knock down people in the area.") @@ -44,13 +44,13 @@ effective or pretty fucking useless. M.Weaken(rand(10,20)) if(prob(25)) M.Stun(rand(5,10)) - M << "\red You feel a tremendous, paralyzing wave flood your mind." + M << "You feel a tremendous, paralyzing wave flood your mind." else - M << "\red You feel a sudden, electric jolt travel through your head." + M << "You feel a sudden, electric jolt travel through your head." playsound(src.loc, 'sound/misc/interference.ogg', 50, 1) - user << "\blue You trigger [src]." + user << "You trigger [src]." times_used += 1 if(times_used >= max_uses) icon_state = "battererburnt" diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 8529e6db2e..f4c03bf2bc 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -175,9 +175,9 @@ src.chest = W src.updateicon() else if(!W:wires) - user << "\blue You need to attach wires to it first!" + user << "You need to attach wires to it first!" else - user << "\blue You need to attach a cell to it first!" + user << "You need to attach a cell to it first!" if(istype(W, /obj/item/robot_parts/head)) if(src.head) return @@ -187,16 +187,16 @@ src.head = W src.updateicon() else - user << "\blue You need to attach a flash to it first!" + user << "You need to attach a flash to it first!" if(istype(W, /obj/item/device/mmi)) var/obj/item/device/mmi/M = W if(check_completion()) if(!istype(loc,/turf)) - user << "\red You can't put \the [W] in, the frame has to be standing on the ground to be perfectly precise." + user << "You can't put \the [W] in, the frame has to be standing on the ground to be perfectly precise." return if(!M.brainmob) - user << "\red Sticking an empty [W] into the frame would sort of defeat the purpose." + user << "Sticking an empty [W] into the frame would sort of defeat the purpose." return if(!M.brainmob.key) var/ghost_can_reenter = 0 @@ -210,15 +210,15 @@ return if(M.brainmob.stat == DEAD) - user << "\red Sticking a dead [W] into the frame would sort of defeat the purpose." + user << "Sticking a dead [W] into the frame would sort of defeat the purpose." return if(M.brainmob.mind in revs.head_revolutionaries) - user << "\red The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'. It refuses to accept the [W]." + user << "The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'. It refuses to accept the [W]." return if(jobban_isbanned(M.brainmob, "Cyborg")) - user << "\red This [W] does not seem to fit." + user << "This [W] does not seem to fit." return var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc), unfinished = 1) @@ -254,7 +254,7 @@ qdel(src) else - user << "\blue The MMI must go in after everything else!" + user << "The MMI must go in after everything else!" if (istype(W, /obj/item/weapon/pen)) var/t = sanitizeSafe(input(user, "Enter new robot name", src.name, src.created_name), MAX_NAME_LEN) @@ -271,22 +271,22 @@ ..() if(istype(W, /obj/item/weapon/cell)) if(src.cell) - user << "\blue You have already inserted a cell!" + user << "You have already inserted a cell!" return else user.drop_item() W.loc = src src.cell = W - user << "\blue You insert the cell!" + user << "You insert the cell!" if(istype(W, /obj/item/stack/cable_coil)) if(src.wires) - user << "\blue You have already inserted wire!" + user << "You have already inserted wire!" return else var/obj/item/stack/cable_coil/coil = W coil.use(1) src.wires = 1.0 - user << "\blue You insert the wire!" + user << "You insert the wire!" return /obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob) @@ -302,7 +302,7 @@ else add_flashes(W,user) else if(istype(W, /obj/item/weapon/stock_parts/manipulator)) - user << "\blue You install some manipulators and modify the head, creating a functional spider-bot!" + user << "You install some manipulators and modify the head, creating a functional spider-bot!" new /mob/living/simple_animal/spiderbot(get_turf(loc)) user.drop_item() qdel(W) @@ -329,9 +329,9 @@ /obj/item/robot_parts/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/weapon/card/emag)) if(sabotaged) - user << "\red [src] is already sabotaged!" + user << "[src] is already sabotaged!" else - user << "\red You slide [W] into the dataport on [src] and short out the safeties." + user << "You slide [W] into the dataport on [src] and short out the safeties." sabotaged = 1 return ..() diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 10fb1dc6fd..999303a91d 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) - usr << "\red The [src] will not function on a deceased robot." + usr << "The [src] will not function on a deceased robot." return 1 return 0 @@ -170,4 +170,4 @@ return 0 R.emagged = 1 - return 1 \ No newline at end of file + return 1 diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 2893b4f3a1..5f14980373 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 ))) - O << "\red [src] breaks into tiny pieces and collapses!" + O << "\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/medical.dm b/code/game/objects/items/stacks/medical.dm index 42be2e8ab4..d3ba0a96a8 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -12,12 +12,12 @@ /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob) if (!istype(M)) - user << "\red \The [src] cannot be applied to [M]!" + user << "\The [src] cannot be applied to [M]!" return 1 if ( ! (istype(user, /mob/living/carbon/human) || \ istype(user, /mob/living/silicon)) ) - user << "\red You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return 1 if (istype(M, /mob/living/carbon/human)) @@ -26,15 +26,15 @@ if(affecting.name == "head") if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space)) - user << "\red You can't apply [src] through [H.head]!" + user << "You can't apply [src] through [H.head]!" return 1 else if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space)) - user << "\red You can't apply [src] through [H.wear_suit]!" + user << "You can't apply [src] through [H.wear_suit]!" return 1 if(affecting.status & ORGAN_ROBOT) - user << "\red This isn't useful at all on a robotic limb.." + user << "This isn't useful at all on a robotic limb.." return 1 H.UpdateDamageIcon() @@ -43,8 +43,8 @@ M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2)) user.visible_message( \ - "\blue [M] has been applied with [src] by [user].", \ - "\blue You apply \the [src] to [M]." \ + "[M] has been applied with [src] by [user].", \ + "You apply \the [src] to [M]." \ ) use(1) @@ -66,7 +66,7 @@ if(affecting.open == 0) if(!affecting.bandage()) - user << "\red The wounds on [M]'s [affecting.name] have already been bandaged." + user << "The wounds on [M]'s [affecting.name] have already been bandaged." return 1 else for (var/datum/wound/W in affecting.wounds) @@ -74,14 +74,14 @@ continue if (W.current_stage <= W.max_bleeding_stage) user.visible_message("\The [user] bandages [W.desc] on [M]'s [affecting.name].", \ - "You bandage [W.desc] on [M]'s [affecting.name]." ) + "You bandage [W.desc] on [M]'s [affecting.name]." ) //H.add_side_effect("Itch") else if (istype(W,/datum/wound/bruise)) user.visible_message("\The [user] places a bruise patch over [W.desc] on [M]'s [affecting.name].", \ - "You place a bruise patch over [W.desc] on [M]'s [affecting.name]." ) + "You place a bruise patch over [W.desc] on [M]'s [affecting.name]." ) else user.visible_message("\The [user] places a bandaid over [W.desc] on [M]'s [affecting.name].", \ - "You place a bandaid over [W.desc] on [M]'s [affecting.name]." ) + "You place a bandaid over [W.desc] on [M]'s [affecting.name]." ) use(1) else if (can_operate(H)) //Checks if mob is lying down on table for surgery @@ -109,11 +109,11 @@ if(affecting.open == 0) if(!affecting.salve()) - user << "\red The wounds on [M]'s [affecting.name] have already been salved." + user << "The wounds on [M]'s [affecting.name] have already been salved." return 1 else - user.visible_message( "\blue [user] salves wounds on [M]'s [affecting.name].", \ - "\blue You salve wounds on [M]'s [affecting.name]." ) + user.visible_message("[user] salves wounds on [M]'s [affecting.name].", \ + "You salve wounds on [M]'s [affecting.name]." ) use(1) else if (can_operate(H)) //Checks if mob is lying down on table for surgery @@ -151,14 +151,14 @@ continue if (W.current_stage <= W.max_bleeding_stage) user.visible_message("\The [user] cleans [W.desc] on [M]'s [affecting.name] and seals the edges with bioglue.", \ - "You clean and seal [W.desc] on [M]'s [affecting.name]." ) + "You clean and seal [W.desc] on [M]'s [affecting.name]." ) //H.add_side_effect("Itch") else if (istype(W,/datum/wound/bruise)) user.visible_message("\The [user] places a medical patch over [W.desc] on [M]'s [affecting.name].", \ - "You place a medical patch over [W.desc] on [M]'s [affecting.name]." ) + "You place a medical patch over [W.desc] on [M]'s [affecting.name]." ) else user.visible_message("\The [user] smears some bioglue over [W.desc] on [M]'s [affecting.name].", \ - "You smear some bioglue over [W.desc] on [M]'s [affecting.name]." ) + "You smear some bioglue over [W.desc] on [M]'s [affecting.name]." ) if (bandaged) affecting.heal_damage(heal_brute,0) use(1) @@ -188,11 +188,11 @@ if(affecting.open == 0) if(!affecting.salve()) - user << "\red The wounds on [M]'s [affecting.name] have already been salved." + user << "The wounds on [M]'s [affecting.name] have already been salved." return 1 else - user.visible_message( "\blue [user] covers wounds on [M]'s [affecting.name] with regenerative membrane.", \ - "\blue You cover wounds on [M]'s [affecting.name] with regenerative membrane." ) + 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." ) affecting.heal_damage(0,heal_burn) use(1) else diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index ff5514a3db..3d6a5c9626 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -28,14 +28,14 @@ var/obj/item/weapon/weldingtool/WT = W if(get_amount() < 2) - user << "\red You need at least two rods to do this." + user << "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("\red [src] is shaped into metal by [user.name] with the weldingtool.", 3, "\red You hear welding.", 2) + M.show_message("[src] is shaped into metal by [user.name] with the weldingtool.", 3, "You hear welding.", 2) var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_hand()==R) @@ -64,15 +64,15 @@ else if(!in_use) if(get_amount() < 2) - user << "\blue You need at least two rods to do this." + user << "You need at least two rods to do this." return - usr << "\blue Assembling grille..." + usr << "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 ) - usr << "\blue You assemble a grille" + usr << "You assemble a grille" in_use = 0 F.add_fingerprint(usr) use(2) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 41ea1b7d1f..31c1d60e56 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -13,7 +13,7 @@ /obj/item/stack/material/glass name = "glass" singular_name = "glass sheet" - icon_state = "sheet-glass" + icon_state = "sheet-glass" var/created_window = /obj/structure/window/basic var/is_reinforced = 0 var/list/construction_options = list("One Direction", "Full Window") @@ -69,11 +69,11 @@ for (var/obj/structure/window/win in user.loc) i++ if(i >= 4) - user << "\red There are too many windows in this location." + user << "There are too many windows in this location." return 1 directions-=win.dir if(!(win.dir in cardinal)) - user << "\red Can't let you do that." + user << "Can't let you do that." return 1 //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc. @@ -92,10 +92,10 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.get_amount() < 4) - user << "\red You need more glass to do that." + user << "You need more glass to do that." return 1 if(locate(/obj/structure/window) in user.loc) - user << "\red There is a window in the way." + user << "There is a window in the way." return 1 new created_window( user.loc, SOUTHWEST, 1 ) src.use(4) @@ -106,15 +106,15 @@ if(!src || src.loc != user) return 1 if(isturf(user.loc) && locate(/obj/structure/windoor_assembly/, user.loc)) - user << "\red There is already a windoor assembly in that location." + user << "There is already a windoor assembly in that location." return 1 if(isturf(user.loc) && locate(/obj/machinery/door/window/, user.loc)) - user << "\red There is already a windoor in that location." + user << "There is already a windoor in that location." return 1 if(src.get_amount() < 5) - user << "\red You need more glass to do that." + user << "You need more glass to do that." return 1 new /obj/structure/windoor_assembly(user.loc, user.dir, 1) @@ -129,8 +129,8 @@ /obj/item/stack/material/glass/reinforced name = "reinforced glass" singular_name = "reinforced glass sheet" - icon_state = "sheet-rglass" - default_type = "reinforced glass" + icon_state = "sheet-rglass" + default_type = "reinforced glass" created_window = /obj/structure/window/reinforced is_reinforced = 1 construction_options = list("One Direction", "Full Window", "Windoor") @@ -141,7 +141,7 @@ /obj/item/stack/material/glass/phoronglass name = "phoron glass" singular_name = "phoron glass sheet" - icon_state = "sheet-phoronglass" + icon_state = "sheet-phoronglass" created_window = /obj/structure/window/phoronbasic default_type = "phoron glass" @@ -168,7 +168,7 @@ /obj/item/stack/material/glass/phoronrglass name = "reinforced phoron glass" singular_name = "reinforced phoron glass sheet" - icon_state = "sheet-phoronrglass" - default_type = "reinforced phoron glass" + icon_state = "sheet-phoronrglass" + default_type = "reinforced phoron glass" created_window = /obj/structure/window/phoronreinforced is_reinforced = 1 diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 313cc24d7a..5d1e7eb144 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -67,7 +67,7 @@ icon_state = "sheet-wetleather" var/wetness = 30 //Reduced when exposed to high temperautres var/drying_threshold_temperature = 500 //Kelvin to start drying - + //Step one - dehairing. /obj/item/stack/material/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob) if( istype(W, /obj/item/weapon/material/knife) || \ @@ -76,9 +76,9 @@ istype(W, /obj/item/weapon/material/hatchet) ) //visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message) - usr.visible_message("\blue \the [usr] starts cutting hair off \the [src]", "\blue You start cutting the hair off \the [src]", "You hear the sound of a knife rubbing against flesh") + usr.visible_message("\The [usr] starts cutting hair off \the [src]", "You start cutting the hair off \the [src]", "You hear the sound of a knife rubbing against flesh") if(do_after(user,50)) - usr << "\blue You cut the hair from this [src.singular_name]" + usr << "You cut the hair from this [src.singular_name]" //Try locating an exisitng stack on the tile and add to there if possible for(var/obj/item/stack/material/hairlesshide/HS in usr.loc) if(HS.amount < 50) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 82a5433963..8d7c19359d 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -110,21 +110,21 @@ if (!can_use(required)) if (produced>1) - user << "\red You haven't got enough [src] to build \the [produced] [recipe.title]\s!" + user << "You haven't got enough [src] to build \the [produced] [recipe.title]\s!" else - user << "\red You haven't got enough [src] to build \the [recipe.title]!" + user << "You haven't got enough [src] to build \the [recipe.title]!" return if (recipe.one_per_turf && (locate(recipe.result_type) in user.loc)) - user << "\red There is another [recipe.title] here!" + user << "There is another [recipe.title] here!" return if (recipe.on_floor && !isfloor(user.loc)) - user << "\red \The [recipe.title] must be constructed on the floor!" + user << "\The [recipe.title] must be constructed on the floor!" return if (recipe.time) - user << "\blue Building [recipe.title] ..." + user << "Building [recipe.title] ..." if (!do_after(user, recipe.time)) return diff --git a/code/game/objects/items/stacks/tiles/plasteel.dm b/code/game/objects/items/stacks/tiles/plasteel.dm index 86af65a2fa..2932b1f398 100644 --- a/code/game/objects/items/stacks/tiles/plasteel.dm +++ b/code/game/objects/items/stacks/tiles/plasteel.dm @@ -32,10 +32,10 @@ return var/T = user.loc if (!( istype(T, /turf) )) - user << "\red You must be on the ground!" + user << "You must be on the ground!" return if (!( istype(T, /turf/space) )) - user << "\red You cannot build on or repair this turf!" + user << "You cannot build on or repair this turf!" return src.build(T) src.add_fingerprint(user) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 8290296fe0..10f445b769 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/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) - user << "\blue You fill the balloon with the contents of [A]." + user << "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 @@ -60,19 +60,19 @@ user << "The [O] is empty." else if(O.reagents.total_volume >= 1) if(O.reagents.has_reagent("pacid", 1)) - user << "The acid chews through the balloon!" + user << "The acid chews through the balloon!" O.reagents.splash_mob(user, reagents.total_volume) - qdel(src) + qdel(src) else src.desc = "A translucent balloon with some form of liquid sloshing around in it." - user << "\blue You fill the balloon with the contents of [O]." + user << "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("\red The [src] bursts!","You hear a pop and a splash.") + src.visible_message("\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) @@ -160,17 +160,17 @@ if (istype(A, /obj/item/toy/ammo/gun)) if (src.bullets >= 7) - user << "\blue It's already fully loaded!" + user << "It's already fully loaded!" return 1 if (A.amount_left <= 0) - user << "\red There is no more caps!" + user << "There is no more caps!" return 1 if (A.amount_left < (7 - src.bullets)) src.bullets += A.amount_left - user << text("\red You reload [] caps\s!", A.amount_left) + user << text("You reload [] caps\s!", A.amount_left) A.amount_left = 0 else - user << text("\red You reload [] caps\s!", 7 - src.bullets) + user << text("You reload [] caps\s!", 7 - src.bullets) A.amount_left -= 7 - src.bullets src.bullets = 7 A.update_icon() @@ -181,17 +181,17 @@ if (flag) return if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") - usr << "\red You don't have the dexterity to do this!" + usr << "You don't have the dexterity to do this!" return src.add_fingerprint(user) if (src.bullets < 1) - user.show_message("\red *click* *click*", 2) + user.show_message("*click* *click*", 2) playsound(user, 'sound/weapons/empty.ogg', 100, 1) return playsound(user, 'sound/weapons/Gunshot.ogg', 100, 1) src.bullets-- for(var/mob/O in viewers(user, null)) - O.show_message(text("\red [] fires a cap gun at []!", user, target), 1, "\red You hear a gunshot", 2) + O.show_message(text("\The [] fires a cap gun at []!", user, target), 1, "You hear a gunshot!", 2) /obj/item/toy/ammo/gun name = "ammo-caps" @@ -226,7 +226,7 @@ examine(mob/user) if(..(user, 2) && bullets) - user << "\blue It is loaded with [bullets] foam darts!" + user << "It is loaded with [bullets] foam darts!" attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/toy/ammo/crossbow)) @@ -234,9 +234,9 @@ user.drop_item() qdel(I) bullets++ - user << "\blue You load the foam dart into the crossbow." + user << "You load the foam dart into the crossbow." else - usr << "\red It's already fully loaded." + usr << "It's already fully loaded." afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) @@ -262,7 +262,7 @@ if(!istype(M,/mob/living)) continue if(M == user) continue for(var/mob/O in viewers(world.view, D)) - O.show_message(text("\red [] was hit by the foam dart!", M), 1) + O.show_message(text("\The [] was hit by the foam dart!", M), 1) new /obj/item/toy/ammo/crossbow(M.loc) qdel(D) return @@ -284,7 +284,7 @@ else if (bullets == 0) user.Weaken(5) for(var/mob/O in viewers(world.view, user)) - O.show_message(text("\red [] realized they were out of ammo and starting scrounging for some!", user), 1) + O.show_message(text("\The [] realized they were out of ammo and starting scrounging for some!", user), 1) attack(mob/M as mob, mob/user as mob) @@ -296,15 +296,15 @@ for(var/mob/O in viewers(M, null)) if(O.client) - O.show_message(text("\red [] casually lines up a shot with []'s head and pulls the trigger!", user, M), 1, "\red You hear the sound of foam against skull", 2) - O.show_message(text("\red [] was hit in the head by the foam dart!", M), 1) + O.show_message(text("\The [] casually lines up a shot with []'s head and pulls the trigger!", user, M), 1, "You hear the sound of foam against skull", 2) + O.show_message(text("\The [] was hit in the head by the foam dart!", M), 1) playsound(user.loc, 'sound/items/syringeproj.ogg', 50, 1) new /obj/item/toy/ammo/crossbow(M.loc) src.bullets-- else if (M.lying && src.bullets == 0) for(var/mob/O in viewers(M, null)) - if (O.client) O.show_message(text("\red [] casually lines up a shot with []'s head, pulls the trigger, then realizes they are out of ammo and drops to the floor in search of some!", user, M), 1, "\red You hear someone fall", 2) + if (O.client) O.show_message(text("\The [] casually lines up a shot with []'s head, pulls the trigger, then realizes they are out of ammo and drops to the floor in search of some!", user, M), 1, "You hear someone fall", 2) user.Weaken(5) return @@ -341,13 +341,13 @@ attack_self(mob/user as mob) src.active = !( src.active ) if (src.active) - user << "\blue You extend the plastic blade with a quick flick of your wrist." + user << "You extend the plastic blade with a quick flick of your wrist." playsound(user, 'sound/weapons/saberon.ogg', 50, 1) src.icon_state = "swordblue" src.item_state = "swordblue" src.w_class = 4 else - user << "\blue You push the plastic blade back down into the handle." + user << "You push the plastic blade back down into the handle." playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) src.icon_state = "sword0" src.item_state = "sword0" @@ -390,7 +390,7 @@ s.set_up(3, 1, src) s.start() new /obj/effect/decal/cleanable/ash(src.loc) - src.visible_message("\red The [src.name] explodes!","\red You hear a snap!") + src.visible_message("The [src.name] explodes!","You hear a snap!") playsound(src, 'sound/effects/snap.ogg', 50, 1) qdel(src) @@ -398,13 +398,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") - M << "\red You step on the snap pop!" + M << "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("\red The [src.name] explodes!","\red You hear a snap!") + src.visible_message("The [src.name] explodes!","You hear a snap!") playsound(src, 'sound/effects/snap.ogg', 50, 1) qdel(src) @@ -439,12 +439,12 @@ else if (istype(A, /obj/structure/reagent_dispensers/watertank) && get_dist(src,A) <= 1) A.reagents.trans_to(src, 10) - user << "\blue You refill your flower!" + user << "You refill your flower!" return else if (src.reagents.total_volume < 1) src.empty = 1 - user << "\blue Your flower has run dry!" + user << "Your flower has run dry!" return else @@ -466,7 +466,7 @@ for(var/atom/T in get_turf(D)) D.reagents.touch(T) if(ismob(T) && T:client) - T:client << "\red [user] has sprayed you with water!" + T:client << "\The [user] has sprayed you with water!" sleep(4) qdel(D) @@ -848,13 +848,13 @@ /obj/structure/plushie/attack_hand(mob/user) if(user.a_intent == I_HELP) - user.visible_message("[user] hugs [src]!","You hug [src]!") + user.visible_message("\The [user] hugs [src]!","You hug [src]!") else if (user.a_intent == I_HURT) - user.visible_message("[user] punches [src]!","You punch [src]!") + user.visible_message("\The [user] punches [src]!","You punch [src]!") else if (user.a_intent == I_GRAB) - user.visible_message("[user] attempts to strangle [src]!","You attempt to strangle [src]!") + user.visible_message("\The [user] attempts to strangle [src]!","You attempt to strangle [src]!") else - user.visible_message("[user] pokes the [src].","You poke the [src].") + user.visible_message("\The [user] pokes the [src].","You poke the [src].") visible_message("[src] says, \"[phrase]\"") /obj/structure/plushie/ian @@ -890,13 +890,13 @@ /obj/item/toy/plushie/attack_self(mob/user as mob) if(user.a_intent == I_HELP) - user.visible_message("[user] hugs [src]!","You hug [src]!") + user.visible_message("\The [user] hugs [src]!","You hug [src]!") else if (user.a_intent == I_HURT) - user.visible_message("[user] punches [src]!","You punch [src]!") + user.visible_message("\The [user] punches [src]!","You punch [src]!") else if (user.a_intent == I_GRAB) - user.visible_message("[user] attempts to strangle [src]!","You attempt to strangle [src]!") + user.visible_message("\The [user] attempts to strangle [src]!","You attempt to strangle [src]!") else - user.visible_message("[user] pokes the [src].","You poke the [src].") + user.visible_message("\The [user] pokes the [src].","You poke the [src].") /obj/item/toy/plushie/nymph name = "diona nymph plush" diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 335478063a..5f8403246f 100755 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -373,7 +373,7 @@ AI MODULES log_law_changes(target, sender) lawchanges.Add("The law is '[newFreeFormLaw]'") - target << "\red BZZZZT" + target << "BZZZZT" var/law = "[newFreeFormLaw]" target.add_ion_law(law) target.show_laws() diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm index a18a2fbeb6..d9bd30e788 100644 --- a/code/game/objects/items/weapons/autopsy.dm +++ b/code/game/objects/items/weapons/autopsy.dm @@ -150,7 +150,7 @@ scan_data += "
" for(var/mob/O in viewers(usr)) - O.show_message("\red \the [src] rattles and prints out a sheet of paper.", 1) + O.show_message("\The [src] rattles and prints out a sheet of paper.", 1) sleep(10) @@ -187,19 +187,19 @@ src.wdata = list() src.chemtraces = list() src.timeofdeath = null - user << "\red A new patient has been registered.. Purging data for previous patient." + user << "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) - usr << "You can't scan this body part." + usr << "You can't scan this body part." return if(!S.open) - usr << "You have to cut the limb open first!" + usr << "You have to cut the limb open first!" return for(var/mob/O in viewers(M)) - O.show_message("\red [user.name] scans the wounds on [M.name]'s [S.name] with \the [src.name]", 1) + O.show_message("\The [user] scans the wounds on [M.name]'s [S.name] with \the [src]", 1) src.add_data(S) diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm index f5f2a8d9fd..421bb55a6a 100644 --- a/code/game/objects/items/weapons/candle.dm +++ b/code/game/objects/items/weapons/candle.dm @@ -27,7 +27,7 @@ if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool - light("\red [user] casually lights the [name] with [W].") + light("\The [user] casually lights the [name] with [W].") else if(istype(W, /obj/item/weapon/flame/lighter)) var/obj/item/weapon/flame/lighter/L = W if(L.lit) @@ -42,7 +42,7 @@ light() -/obj/item/weapon/flame/candle/proc/light(var/flavor_text = "\red [usr] lights the [name].") +/obj/item/weapon/flame/candle/proc/light(var/flavor_text = "\The [usr] lights the [name].") if(!src.lit) src.lit = 1 //src.damtype = "fire" diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index b1448f7516..240915adba 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -208,7 +208,7 @@ src.access |= I.access if(istype(user, /mob/living) && user.mind) if(user.mind.special_role) - usr << "\blue The card's microscanners activate as you pass it over the ID, copying its access." + usr << "The card's microscanners activate as you pass it over the ID, copying its access." /obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob) if(!src.registered_name) @@ -226,7 +226,7 @@ return src.assignment = u src.name = "[src.registered_name]'s ID Card ([src.assignment])" - user << "\blue You successfully forge the ID card." + user << "You successfully forge the ID card." registered_user = user else if(!registered_user || registered_user == user) @@ -246,7 +246,7 @@ return src.assignment = u src.name = "[src.registered_name]'s ID Card ([src.assignment])" - user << "\blue You successfully forge the ID card." + user << "You successfully forge the ID card." return if("Show") ..() 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 b7da10cc22..56fbf2bff2 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm @@ -42,21 +42,21 @@ if(emagged) user << "Circuit lock is already removed." return - user << "\blue You override the circuit lock and open controls." + user << "You override the circuit lock and open controls." emagged = 1 locked = 0 else if(istype(I,/obj/item/weapon/card/id)) if(emagged) - user << "\red Circuit lock does not respond." + user << "Circuit lock does not respond." return if(check_access(I)) locked = !locked - user << "\blue You [locked ? "" : "un"]lock the circuit controls." + user << "You [locked ? "" : "un"]lock the circuit controls." else - user << "\red Access denied." + user << "Access denied." else if(istype(I,/obj/item/device/multitool)) if(locked) - user << "\red Circuit controls are locked." + user << "Circuit controls are locked." return var/existing_networks = list2text(network,",") var/input = sanitize(input(usr, "Which networks would you like to connect this camera console circuit to? Seperate 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 48ab7333ce..7695913eed 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/research.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/research.dm @@ -8,13 +8,13 @@ /obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob) if(istype(I,/obj/item/weapon/screwdriver)) - user.visible_message("\blue \the [user] adjusts the jumper on the [src]'s access protocol pins.", "\blue You adjust the jumper on the access protocol pins.") + user.visible_message("\The [user] adjusts the jumper on \the [src]'s access protocol pins.", "You adjust the jumper on the access protocol pins.") if(src.build_path == /obj/machinery/computer/rdconsole/core) src.name = T_BOARD("RD Console - Robotics") src.build_path = /obj/machinery/computer/rdconsole/robotics - user << "\blue Access protocols set to robotics." + user << "Access protocols set to robotics." else src.name = T_BOARD("RD Console") src.build_path = /obj/machinery/computer/rdconsole/core - user << "\blue Access protocols set to default." + user << "Access protocols set to default." return diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index f86359c21d..d5a36d6cba 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -40,7 +40,7 @@ /obj/item/weapon/soap/attack(mob/target as mob, mob/user as mob) if(target && user && ishuman(target) && ishuman(user) && !target.stat && !user.stat && user.zone_sel &&user.zone_sel.selecting == "mouth" ) - user.visible_message("\red \the [user] washes \the [target]'s mouth out with soap!") + user.visible_message("\The [user] washes \the [target]'s mouth out with soap!") return ..() diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 437daa86bb..29c3f64820 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -77,5 +77,5 @@ /obj/item/weapon/haircomb/attack_self(mob/user) if(user.r_hand == src || user.l_hand == src) - user.visible_message(text("\red [] uses [] to comb their hair with incredible style and sophistication. What a [].", user, src, user.gender == FEMALE ? "lady" : "guy")) + user.visible_message(text("[] uses [] to comb their hair with incredible style and sophistication. What a [].", user, src, user.gender == FEMALE ? "lady" : "guy")) return diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 25eacadde7..09816e3568 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -10,8 +10,8 @@ throw_speed = 1 throw_range = 5 w_class = 3.0 - origin_tech = list(TECH_COMBAT = 1, TECH_PHORON = 1) - matter = list(DEFAULT_WALL_MATERIAL = 500) + origin_tech = list(TECH_COMBAT = 1, TECH_PHORON = 1) + matter = list(DEFAULT_WALL_MATERIAL = 500) var/status = 0 var/throw_amount = 100 var/lit = 0 //on or off @@ -118,14 +118,14 @@ var/pressure = ptank.air_contents.return_pressure() var/total_moles = ptank.air_contents.total_moles - user << "\blue Results of analysis of \icon[icon]" + user << "Results of analysis of \icon[icon]" if(total_moles>0) - user << "\blue Pressure: [round(pressure,0.1)] kPa" + user << "Pressure: [round(pressure,0.1)] kPa" for(var/g in ptank.air_contents.gas) - user << "\blue [gas_data.name[g]]: [round((ptank.air_contents.gas[g] / total_moles) * 100)]%" - user << "\blue Temperature: [round(ptank.air_contents.temperature-T0C)]°C" + user << "[gas_data.name[g]]: [round((ptank.air_contents.gas[g] / total_moles) * 100)]%" + user << "Temperature: [round(ptank.air_contents.temperature-T0C)]°C" else - user << "\blue Tank is empty!" + user << "Tank is empty!" return ..() return diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 023eb3bfd3..ea7ea93ab7 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -30,7 +30,7 @@ user.put_in_active_hand(gift) src.gift.add_fingerprint(user) else - user << "\blue The gift was empty!" + user << "The gift was empty!" qdel(src) return @@ -41,16 +41,16 @@ /obj/effect/spresent/relaymove(mob/user as mob) if (user.stat) return - user << "\blue You cant move." + user << "You can't move." /obj/effect/spresent/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if (!istype(W, /obj/item/weapon/wirecutters)) - user << "\blue I need wirecutters for that." + user << "I need wirecutters for that." return - user << "\blue You cut open the present." + user << "You cut open the present." for(var/mob/M in src) //Should only be one but whatever. M.loc = src.loc @@ -128,12 +128,12 @@ /obj/item/weapon/wrapping_paper/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if (!( locate(/obj/structure/table, src.loc) )) - user << "\blue You MUST put the paper on a table!" + user << "You MUST put the paper on a table!" if (W.w_class < 4) if ((istype(user.l_hand, /obj/item/weapon/wirecutters) || istype(user.r_hand, /obj/item/weapon/wirecutters))) var/a_used = 2 ** (src.w_class - 1) if (src.amount < a_used) - user << "\blue You need more paper!" + user << "You need more paper!" return else if(istype(W, /obj/item/smallDelivery) || istype(W, /obj/item/weapon/gift)) //No gift wrapping gifts! @@ -155,9 +155,9 @@ qdel(src) return else - user << "\blue You need scissors!" + user << "You need scissors!" else - user << "\blue The object is FAR too large!" + user << "The object is FAR too large!" return @@ -185,6 +185,6 @@ msg_admin_attack("[key_name(user)] used [src] to wrap [key_name(H)]") else - user << "\blue You need more paper." + user << "You need more paper." else 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 6d5ea444cb..56236a754f 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -49,13 +49,13 @@ if(istype(W,/obj/item/device/assembly_holder) && (!stage || stage==1) && path != 2) var/obj/item/device/assembly_holder/det = W if(istype(det.a_left,det.a_right.type) || (!isigniter(det.a_left) && !isigniter(det.a_right))) - user << "\red Assembly must contain one igniter." + user << "Assembly must contain one igniter." return if(!det.secured) - user << "\red Assembly must be secured with screwdriver." + user << "Assembly must be secured with screwdriver." return path = 1 - user << "\blue You add [W] to the metal casing." + user << "You add [W] to the metal casing." playsound(src.loc, 'sound/items/Screwdriver2.ogg', 25, -3) user.remove_from_mob(det) det.loc = src @@ -67,22 +67,22 @@ if(stage == 1) path = 1 if(beakers.len) - user << "\blue You lock the assembly." + user << "You lock the assembly." name = "grenade" else -// user << "\red You need to add at least one beaker before locking the assembly." - user << "\blue You lock the empty assembly." +// user << "You need to add at least one beaker before locking the assembly." + user << "You lock the empty assembly." name = "fake grenade" playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, -3) icon_state = initial(icon_state) +"_locked" stage = 2 else if(stage == 2) if(active && prob(95)) - user << "\red You trigger the assembly!" + user << "You trigger the assembly!" prime() return else - user << "\blue You unlock the assembly." + user << "You unlock the assembly." playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, -3) name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]" icon_state = initial(icon_state) + (detonator?"_ass":"") @@ -91,18 +91,18 @@ else if(is_type_in_list(W, allowed_containers) && (!stage || stage==1) && path != 2) path = 1 if(beakers.len == 2) - user << "\red The grenade can not hold more containers." + user << "The grenade can not hold more containers." return else if(W.reagents.total_volume) - user << "\blue You add \the [W] to the assembly." + user << "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 - user << "\red \the [W] is empty." + user << "\The [W] is empty." examine(mob/user) ..(user) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index d4df5bd1ac..d01b380925 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -32,7 +32,7 @@ S.active = 0 // -- Polymorph S.icon_state = "shield0" - M << "\red BANG" + M << "BANG" playsound(src.loc, 'sound/effects/bang.ogg', 50, 1, 5) //Checking for protections @@ -86,19 +86,19 @@ var/mob/living/carbon/human/H = M var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"] if (E && E.damage >= E.min_bruised_damage) - M << "\red Your eyes start to burn badly!" + M << "Your eyes start to burn badly!" if(!banglet && !(istype(src , /obj/item/weapon/grenade/flashbang/clusterbang))) if (E.damage >= E.min_broken_damage) - M << "\red You can't see anything!" + M << "You can't see anything!" if (M.ear_damage >= 15) - M << "\red Your ears start to ring badly!" + M << "Your ears start to ring badly!" if(!banglet && !(istype(src , /obj/item/weapon/grenade/flashbang/clusterbang))) if (prob(M.ear_damage - 10 + 5)) - M << "\red You can't hear anything!" + M << "You can't hear anything!" M.sdisabilities |= DEAF else if (M.ear_damage >= 5) - M << "\red Your ears start to ring!" + M << "Your ears start to ring!" M.update_icons() /obj/item/weapon/grenade/flashbang/clusterbang//Created by Polymorph, fixed by Sieve diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index d32bf163ea..524f70e029 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -10,8 +10,8 @@ w_class = 2.0 throw_speed = 2 throw_range = 5 - origin_tech = list(TECH_MATERIAL = 1) - matter = list(DEFAULT_WALL_MATERIAL = 500) + origin_tech = list(TECH_MATERIAL = 1) + matter = list(DEFAULT_WALL_MATERIAL = 500) var/dispenser = 0 var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes var/cuff_sound = 'sound/weapons/handcuffs.ogg' @@ -100,8 +100,8 @@ var/last_chew = 0 var/obj/item/organ/external/O = H.organs_by_name[H.hand?"l_hand":"r_hand"] if (!O) return - var/s = "\red [H.name] chews on \his [O.name]!" - H.visible_message(s, "\red You chew on your [O.name]!") + var/s = "[H.name] chews on \his [O.name]!" + H.visible_message(s, "You chew on your [O.name]!") H.attack_log += text("\[[time_stamp()]\] [s] ([H.ckey])") log_attack("[s] ([H.ckey])") diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm index 933675beea..8160c14cd8 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 - user << "\blue The seed bag is full." + user << "The seed bag is full." S.updateUsrDialog() return - user << "\blue You pick up all the seeds." + user << "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 - user << "\blue The seed bag is full." + user << "The seed bag is full." S.updateUsrDialog() return diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 6465a05578..36fefdec3a 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -35,7 +35,7 @@ return 0 proc/meltdown() //breaks it down, making implant unrecongizible - imp_in << "\red You feel something melting inside [part ? "your [part.name]" : "you"]!" + imp_in << "You feel something melting inside [part ? "your [part.name]" : "you"]!" if (part) part.take_damage(burn = 15, used_weapon = "Electronics meltdown") else @@ -171,7 +171,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("\red Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!") + imp_in.visible_message("Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!") playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3) sleep(25) if (istype(part,/obj/item/organ/external/chest) || \ @@ -236,7 +236,7 @@ Implant Specifics:
"} proc/small_boom() if (ishuman(imp_in) && part) - imp_in.visible_message("\red Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!") + imp_in.visible_message("Something beeps inside [imp_in][part ? "'s [part.name]" : ""]!") playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3) spawn(25) if (ishuman(imp_in) && part) @@ -369,7 +369,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-- - source << "\blue You feel a sudden surge of energy!" + source << "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/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index ea50b92cdf..4b15fb8ffb 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) - user << "\red [src] is full." + user << "\The [src] is full." else spawn(5) I.reagents.trans_to_mob(src.imp, 5) - user << "\blue You inject 5 units of the solution. The syringe now contains [I.reagents.total_volume] units." + user << "You inject 5 units of the solution. The syringe now contains [I.reagents.total_volume] units." else if (istype(I, /obj/item/weapon/implanter)) var/obj/item/weapon/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 2f33eba413..66080882be 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -108,10 +108,10 @@ put_mob(mob/living/carbon/M as mob) if(!iscarbon(M)) - usr << "\red The [src.name] cannot hold this!" + usr << "\The [src] cannot hold this!" return if(src.occupant) - usr << "\red The [src.name] is already occupied!" + usr << "\The [src] is already occupied!" return if(M.client) M.client.perspective = EYE_PERSPECTIVE @@ -132,7 +132,7 @@ if(!imp) continue if(istype(imp, /obj/item/weapon/implant/loyalty)) for (var/mob/O in viewers(M, null)) - O.show_message("\red [M] has been implanted by the [src.name].", 1) + O.show_message("\The [M] has been implanted by \the [src].", 1) if(imp.implanted(M)) imp.loc = M diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 4f2c491d6b..783177d5e6 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -24,17 +24,17 @@ return if (user && src.imp) for (var/mob/O in viewers(M, null)) - O.show_message("\red [user] is attemping to implant [M].", 1) + O.show_message("[user] is attemping to implant [M].", 1) var/turf/T1 = get_turf(M) if (T1 && ((M == user) || do_after(user, 50))) if(user && M && (get_turf(M) == T1) && src && src.imp) for (var/mob/O in viewers(M, null)) - O.show_message("\red [M] has been implanted by [user].", 1) + O.show_message("[M] has been implanted by [user].", 1) admin_attack_log(user, M, "Implanted using \the [src.name] ([src.imp.name])", "Implanted with \the [src.name] ([src.imp.name])", "used an implanter, [src.name] ([src.imp.name]), on") - user.show_message("\red You implanted the implant into [M].") + user.show_message("You implanted the implant into [M].") if(src.imp.implanted(M)) src.imp.loc = M src.imp.imp_in = M @@ -116,7 +116,7 @@ if(istype(A,/obj/item) && imp) var/obj/item/weapon/implant/compressed/c = imp if (c.scanned) - user << "\red Something is already scanned inside the implant!" + user << "Something is already scanned inside the implant!" return c.scanned = A if(istype(A.loc,/mob/living/carbon/human)) diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index 597affcd35..78d8e3ad11 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -77,14 +77,14 @@ /obj/item/weapon/material/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) - user << "\red You accidentally cut yourself with the [src]." + user << "You accidentally cut yourself with the [src]." user.take_organ_damage(20) return return ..() /obj/item/weapon/material/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) - user << "\red You somehow managed to cut yourself with the [src]." + user << "You somehow managed to cut yourself with the [src]." user.take_organ_damage(20) return return ..() @@ -107,8 +107,8 @@ /obj/item/weapon/material/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) - user << "\red The [src] slips out of your hand and hits your head." + user << "The [src] slips out of your hand and hits your head." user.take_organ_damage(10) user.Paralyse(2) return - return ..() \ No newline at end of file + return ..() diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index 3271650d31..205a06c9f6 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -63,9 +63,9 @@ unbreakable = 1 /obj/item/weapon/material/knife/suicide_act(mob/user) - viewers(user) << pick("\red [user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") + viewers(user) << pick("\The [user] is slitting \his wrists with \the [src]! It looks like \he's trying to commit suicide.", \ + "\The [user] is slitting \his throat with \the [src]! It looks like \he's trying to commit suicide.", \ + "\The [user] is slitting \his stomach open with \the [src]! It looks like \he's trying to commit seppuku.") return (BRUTELOSS) /obj/item/weapon/material/knife/hook diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index cf7ebba2b4..2bb0f91e2f 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -16,8 +16,8 @@ unbreakable = 1 //It's already broken. /obj/item/weapon/material/shard/suicide_act(mob/user) - viewers(user) << pick("\red [user] is slitting \his wrists with \the [src]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his throat with \the [src]! It looks like \he's trying to commit suicide.") + viewers(user) << pick("\The [user] is slitting \his wrists with \the [src]! It looks like \he's trying to commit suicide.", + "\The [user] is slitting \his throat with \the [src]! It looks like \he's trying to commit suicide.") return (BRUTELOSS) /obj/item/weapon/material/shard/set_material(var/new_material) @@ -62,7 +62,7 @@ /obj/item/weapon/material/shard/Crossed(AM as mob|obj) if(ismob(AM)) var/mob/M = AM - M << "\red You step on \the [src]!" + M << "You step on \the [src]!" playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds if(ishuman(M)) var/mob/living/carbon/human/H = M diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index 708d91e6d1..83f6366eb4 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -197,7 +197,7 @@ /obj/item/weapon/material/twohanded/dualsaber/attack(target as mob, mob/living/user as mob) ..() if((CLUMSY in user.mutations) && (wielded) &&prob(40)) - user << "\red You twirl around a bit before losing your balance and impaling yourself on the [src]." + user << "You twirl around a bit before losing your balance and impaling yourself on \the [src]." user.take_organ_damage(20,25) return if((wielded) && prob(50)) diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index be28203098..66310cf26f 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -51,8 +51,8 @@ /obj/item/weapon/melee/energy/suicide_act(mob/user) if (active) - viewers(user) << pick("[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.", \ - "[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.") + viewers(user) << pick("\The [user] is slitting \his stomach open with \the [src]! It looks like \he's trying to commit seppuku.", \ + "\The [user] is falling on \the [src]! It looks like \he's trying to commit suicide.") return (BRUTELOSS|FIRELOSS) /* @@ -82,15 +82,15 @@ /obj/item/weapon/melee/energy/axe/activate(mob/living/user) ..() icon_state = "axe1" - user << "\blue \The [src] is now energised." + user << "\The [src] is now energised." /obj/item/weapon/melee/energy/axe/deactivate(mob/living/user) ..() icon_state = initial(icon_state) - user << "\blue \The [src] is de-energised. It's just a regular axe now." + user << "\The [src] is de-energised. It's just a regular axe now." /obj/item/weapon/melee/energy/axe/suicide_act(mob/user) - viewers(user) << "\red [user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide." + viewers(user) << "\The [user] swings \the [src] towards /his head! It looks like \he's trying to commit suicide." return (BRUTELOSS|FIRELOSS) /* diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index c6bb1c64b5..deed1aa219 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -12,5 +12,5 @@ attack_verb = list("flogged", "whipped", "lashed", "disciplined") suicide_act(mob/user) - viewers(user) << "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." + viewers(user) << "\The [user] is strangling \himself with \the [src]! It looks like \he's trying to commit suicide." return (OXYLOSS) diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm index 68a821e3a7..50be738ecc 100644 --- a/code/game/objects/items/weapons/policetape.dm +++ b/code/game/objects/items/weapons/policetape.dm @@ -58,13 +58,13 @@ var/list/tape_roll_applications = list() /obj/item/taperoll/attack_self(mob/user as mob) if(icon_state == "[icon_base]_start") start = get_turf(src) - usr << "\blue You place the first end of the [src]." + usr << "You place the first end of \the [src]." icon_state = "[icon_base]_stop" else icon_state = "[icon_base]_start" end = get_turf(src) if(start.y != end.y && start.x != end.x || start.z != end.z) - usr << "\blue [src] can only be laid horizontally or vertically." + usr << "\The [src] can only be laid horizontally or vertically." return var/turf/cur = start @@ -93,7 +93,7 @@ var/list/tape_roll_applications = list() break cur = get_step_towards(cur,end) if (!can_place) - usr << "\blue You can't run \the [src] through that!" + usr << "You can't run \the [src] through that!" return cur = start @@ -106,7 +106,7 @@ var/list/tape_roll_applications = list() var/obj/item/tape/P = new tape_type(cur) P.icon_state = "[P.icon_base]_[dir]" cur = get_step_towards(cur,end) - usr << "\blue You finish placing the [src]." //Git Test + usr << "You finish placing \the [src]." /obj/item/taperoll/afterattack(var/atom/A, mob/user as mob, proximity) if(!proximity) @@ -118,7 +118,7 @@ var/list/tape_roll_applications = list() P.loc = locate(T.x,T.y,T.z) P.icon_state = "[src.icon_base]_door" P.layer = 3.2 - user << "\blue You finish placing the [src]." + user << "You finish placing \the [src]." if (istype(A, /turf/simulated/floor) ||istype(A, /turf/unsimulated/floor)) var/turf/F = A @@ -128,11 +128,11 @@ var/list/tape_roll_applications = list() tape_roll_applications[F] = 0 if(tape_roll_applications[F] & direction) // hazard_overlay in F.overlays wouldn't work. - user.visible_message("[user] uses the adhesive of \the [src] to remove area markings from \the [F].", "You use the adhesive of \the [src] to remove area markings from \the [F].") + user.visible_message("\The [user] uses the adhesive of \the [src] to remove area markings from \the [F].", "You use the adhesive of \the [src] to remove area markings from \the [F].") F.overlays -= hazard_overlay tape_roll_applications[F] &= ~direction else - user.visible_message("[user] applied \the [src] on \the [F] to create area markings.", "You apply \the [src] on \the [F] to create area markings.") + user.visible_message("\The [user] applied \the [src] on \the [F] to create area markings.", "You apply \the [src] on \the [F] to create area markings.") F.overlays |= hazard_overlay tape_roll_applications[F] |= direction return @@ -157,7 +157,7 @@ var/list/tape_roll_applications = list() /obj/item/tape/attack_hand(mob/user as mob) if (user.a_intent == I_HELP && src.allowed(user)) - user.show_viewers("\blue [user] lifts [src], allowing passage.") + user.show_viewers("\The [user] lifts \the [src], allowing passage.") crumple() lifted = 1 spawn(200) @@ -169,9 +169,9 @@ var/list/tape_roll_applications = list() /obj/item/tape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob) if(user.a_intent == I_HELP && ((!can_puncture(W) && src.allowed(user)))) - user << "You can't break the [src] with that!" + user << "You can't break \the [src] with that!" return - user.show_viewers("\blue [user] breaks the [src]!") + user.show_viewers("\The [user] breaks \the [src]!") var/dir[2] var/icon_dir = src.icon_state diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index b83d1778de..bd5e56495a 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -19,7 +19,7 @@ matter = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50) suicide_act(mob/user) - viewers(user) << "\red [user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide." + viewers(user) << "\The [user] is licking the electrodes of \the [src]! It looks like \he's trying to commit suicide." return (FIRELOSS) //currently only used by energy-type guns, that may change in the future. diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 612dde6d7b..02b412232d 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -13,8 +13,8 @@ throw_speed = 1 throw_range = 4 w_class = 4.0 - origin_tech = list(TECH_MATERIAL = 2) - matter = list("glass" = 7500, DEFAULT_WALL_MATERIAL = 1000) + origin_tech = list(TECH_MATERIAL = 2) + matter = list("glass" = 7500, DEFAULT_WALL_MATERIAL = 1000) attack_verb = list("shoved", "bashed") var/cooldown = 0 //shield bash cooldown. based on world.time @@ -57,7 +57,7 @@ /obj/item/weapon/shield/energy/attack_self(mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) - user << "\red You beat yourself in the head with [src]." + user << "You beat yourself in the head with [src]." user.take_organ_damage(5) active = !active if (active) @@ -65,14 +65,14 @@ icon_state = "eshield[active]" w_class = 4 playsound(user, 'sound/weapons/saberon.ogg', 50, 1) - user << "\blue [src] is now active." + user << "\The [src] is now active." else force = 3 icon_state = "eshield[active]" w_class = 1 playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) - user << "\blue [src] can now be concealed." + user << "\The [src] can now be concealed." if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user @@ -100,10 +100,10 @@ /obj/item/weapon/cloaking_device/attack_self(mob/user as mob) src.active = !( src.active ) if (src.active) - user << "\blue The cloaking device is now active." + user << "\The [src] is now active." src.icon_state = "shield1" else - user << "\blue The cloaking device is now inactive." + user << "\The [src] is now inactive." src.icon_state = "shield0" src.add_fingerprint(user) return diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 24ea335b10..f42685b792 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -57,9 +57,9 @@ attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/storage/backpack/holding)) - user << "\red The Bluespace interfaces of the two devices conflict and malfunction." + user << "The Bluespace interfaces of the two devices conflict and malfunction." qdel(W) - return + return ..() //Please don't clutter the parent storage item with stupid hacks. @@ -67,7 +67,7 @@ if(istype(W, /obj/item/weapon/storage/backpack/holding)) return 1 return ..() - + /obj/item/weapon/storage/backpack/santabag name = "\improper Santa's gift bag" desc = "Space Santa uses this to deliver toys to all the nice children in space in Christmas! Wow, it's pretty big!" diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index d91ecb463c..4c808ad2f5 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -128,7 +128,7 @@ current += S.amount if(capacity == current)//If it's full, you're done if(!stop_messages) - usr << "\red The snatcher is full." + usr << "The snatcher is full." return 0 return 1 diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 626ed7aba2..af39700dbc 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -25,7 +25,7 @@ if(!proximity) return if(user.mind && (user.mind.assigned_role == "Chaplain")) if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder - user << "\blue You bless [A]." + user << "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/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 0f534ade9e..8af478806e 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -18,7 +18,7 @@ //..() if ((CLUMSY in user.mutations) && prob(50)) - user << "\red The [src] slips out of your hand and hits your head." + user << "\The [src] slips out of your hand and hits your head." user.take_organ_damage(10) user.Paralyse(2) return @@ -31,9 +31,10 @@ if (M.stat < 2 && M.health < 50 && prob(90)) var/mob/H = M // ******* Check - if ((istype(H, /mob/living/carbon/human) && istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80))) - M << "\red The helmet protects you from being hit hard in the head!" - return +// Commented this bit out simply because it doesn't make sense, I can't work out what it's supposed to do, and it doesn't do anything at all as it is ~GN +// if ((istype(H, /mob/living/carbon/human) && istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80))) +// M << "The helmet protects you from being hit hard in the head!" +// return var/time = rand(2, 6) if (prob(75)) M.Paralyse(time) @@ -41,9 +42,9 @@ M.Stun(time) if(M.stat != 2) M.stat = 1 for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] has been knocked unconscious!", M), 1, "\red You hear someone fall.", 2) + O.show_message("\The [M] has been knocked unconscious!", 1, "You hear someone fall.", 2) else - M << text("\red [] tried to knock you unconcious!",user) + M << "\The [user] tried to knock you unconcious!" M.eye_blurry += 3 return diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index 2b584dc86e..b5466f7a39 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -20,20 +20,20 @@ attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/card/id)) if(src.broken) - user << "\red It appears to be broken." + user << "It appears to be broken." return if(src.allowed(user)) src.locked = !( src.locked ) if(src.locked) src.icon_state = src.icon_locked - user << "\red You lock the [src.name]!" + user << "You lock \the [src]!" return else src.icon_state = src.icon_closed - user << "\red You unlock the [src.name]!" + user << "You unlock \the [src]!" return else - user << "\red Access Denied" + user << "Access Denied" else if((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken) broken = 1 locked = 0 @@ -46,21 +46,21 @@ playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(src.loc, "sparks", 50, 1) for(var/mob/O in viewers(user, 3)) - O.show_message(text("\blue The locker has been sliced open by [] with an energy blade!", user), 1, text("\red You hear metal being sliced and sparks flying."), 2) + O.show_message(text("The locker has been sliced open by [] with an energy blade!", user), 1, text("You hear metal being sliced and sparks flying."), 2) else for(var/mob/O in viewers(user, 3)) - O.show_message(text("\blue The locker has been broken by [] with an electromagnetic card!", user), 1, text("You hear a faint electrical spark."), 2) + O.show_message(text("The locker has been broken by [] with an electromagnetic card!", user), 1, text("You hear a faint electrical spark."), 2) if(!locked) ..() else - user << "\red Its locked!" + user << "It's locked!" return show_to(mob/user as mob) if(locked) - user << "\red Its locked!" + user << "It's locked!" else ..() return diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 1499c89d2c..ef5d8db334 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -54,21 +54,21 @@ if (istype(W, /obj/item/weapon/screwdriver)) if (do_after(user, 20)) src.open =! src.open - user.show_message(text("\blue You [] the service panel.", (src.open ? "open" : "close"))) + user.show_message(text("You [] the service panel.", (src.open ? "open" : "close"))) return if ((istype(W, /obj/item/device/multitool)) && (src.open == 1)&& (!src.l_hacking)) - user.show_message(text("\red Now attempting to reset internal memory, please hold."), 1) + user.show_message("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 - user.show_message(text("\red Internal memory reset. Please give it a few seconds to reinitialize."), 1) + user.show_message("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(text("\red Unable to reset internal memory."), 1) + user.show_message("Unable to reset internal memory.", 1) src.l_hacking = 0 else src.l_hacking = 0 return @@ -157,7 +157,7 @@ attack_hand(mob/user as mob) if ((src.loc == user) && (src.locked == 1)) - usr << "\red [src] is locked and cannot be opened!" + usr << "[src] is locked and cannot be opened!" else if ((src.loc == user) && (!src.locked)) src.open(usr) else @@ -171,7 +171,7 @@ //I consider this worthless but it isn't my code so whatever. Remove or uncomment. /*attack(mob/M as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) - user << "\red The [src] slips out of your hand and hits your head." + user << "The [src] slips out of your hand and hits your head." user.take_organ_damage(10) user.Paralyse(2) return @@ -188,7 +188,7 @@ if (H.stat < 2 && H.health < 50 && prob(90)) // ******* Check if (istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80)) - H << "\red The helmet protects you from being hit hard in the head!" + H << "The helmet protects you from being hit hard in the head!" return var/time = rand(2, 6) if (prob(75)) @@ -197,9 +197,9 @@ H.Stun(time) if(H.stat != 2) H.stat = 1 for(var/mob/O in viewers(H, null)) - O.show_message(text("\red [] has been knocked unconscious!", H), 1, "\red You hear someone fall.", 2) + O.show_message(text("[] has been knocked unconscious!", H), 1, "You hear someone fall.", 2) else - H << text("\red [] tried to knock you unconcious!",user) + H << text("[] tried to knock you unconcious!",user) H.eye_blurry += 3 return*/ diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 2306c33057..70c1d33d73 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -286,9 +286,9 @@ if (M == usr) usr << "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("[usr] puts [W] into [src].") + M.show_message("\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("[usr] puts [W] into [src].") + M.show_message("\The [usr] puts [W] into [src].") src.orient2hud(usr) if(usr.s_active) @@ -335,7 +335,7 @@ ..() if(isrobot(user)) - user << "\blue You're a robot. No." + user << "You're a robot. No." return //Robots can't interact with storage items. if(!can_be_inserted(W)) @@ -345,14 +345,14 @@ var/obj/item/weapon/tray/T = W if(T.calc_carry() > 0) if(prob(85)) - user << "\red The tray won't fit in [src]." + user << "The tray won't fit in [src]." return else W.loc = user.loc if ((user.client && user.s_active != src)) user.client.screen -= W W.dropped(user) - user << "\red God damnit!" + user << "God damnit!" W.add_fingerprint(user) return handle_item_insertion(W) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index f8708d7925..cc54970009 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -19,7 +19,7 @@ var/hitcost = 1000 //oh god why do power cells carry so much charge? We probably need to make a distinction between "industrial" sized power cells for APCs and power cells for everything else. /obj/item/weapon/melee/baton/suicide_act(mob/user) - user.visible_message("[user] is putting the live [name] in \his mouth! It looks like \he's trying to commit suicide.") + user.visible_message("\The [user] is putting the live [name] in \his mouth! It looks like \he's trying to commit suicide.") return (FIRELOSS) /obj/item/weapon/melee/baton/New() @@ -130,7 +130,7 @@ target_zone = get_zone_with_miss_chance(user.zone_sel.selecting, L) if(!target_zone) - L.visible_message("\red [user] misses [L] with \the [src]!") + L.visible_message(">span class='danger'>\The [user] misses [L] with \the [src]!") return 0 var/mob/living/carbon/human/H = L diff --git a/code/game/objects/items/weapons/surgery_limbattachment.dm b/code/game/objects/items/weapons/surgery_limbattachment.dm index b52bb1bb3f..4ba10524f2 100644 --- a/code/game/objects/items/weapons/surgery_limbattachment.dm +++ b/code/game/objects/items/weapons/surgery_limbattachment.dm @@ -19,36 +19,36 @@ else if((user.zone_sel.selecting == "l_leg") && (istype(src, /obj/item/robot_parts/l_leg))) limbloc = "l_foot" else - user << "\red That doesn't fit there!" + user << "That doesn't fit there!" return ..() var/mob/living/carbon/human/H = M var/datum/organ/external/S = H.organs[user.zone_sel.selecting] if(S.status & ORGAN_DESTROYED) if(!(S.status & ORGAN_ATTACHABLE)) - user << "\red The wound is not ready for a replacement!" + user << "The wound is not ready for a replacement!" return 0 if(M != user) M.visible_message( \ - "\red [user] is beginning to attach \the [src] where [H]'s [S.display_name] used to be.", \ - "\red [user] begins to attach \the [src] where your [S.display_name] used to be.") + "\The [user] is beginning to attach \the [src] where [H]'s [S.display_name] used to be.", \ + "\The [user] begins to attach \the [src] where your [S.display_name] used to be.") else M.visible_message( \ - "\red [user] begins to attach a robotic limb where \his [S.display_name] used to be with [src].", \ - "\red You begin to attach \the [src] where your [S.display_name] used to be.") + "\The [user] begins to attach a robotic limb where \his [S.display_name] used to be with [src].", \ + "You begin to attach \the [src] where your [S.display_name] used to be.") if(do_mob(user, H, 100)) if(M != user) M.visible_message( \ - "\red [user] finishes attaching [H]'s new [S.display_name].", \ - "\red [user] finishes attaching your new [S.display_name].") + "\The [user] finishes attaching [H]'s new [S.display_name].", \ + "\The [user] finishes attaching your new [S.display_name].") else M.visible_message( \ - "\red [user] finishes attaching \his new [S.display_name].", \ - "\red You finish attaching your new [S.display_name].") + "\The [user] finishes attaching \his new [S.display_name].", \ + "You finish attaching your new [S.display_name].") if(H == user && prob(25)) - user << "\red You mess up!" + user << "You mess up!" S.take_damage(15) S.status &= ~ORGAN_BROKEN diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index c07cd5a7f2..0eecde46a5 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -66,8 +66,8 @@ attack_verb = list("drilled") suicide_act(mob/user) - viewers(user) << pick("\red [user] is pressing the [src.name] to \his temple and activating it! It looks like \he's trying to commit suicide.", \ - "\red [user] is pressing [src.name] to \his chest and activating it! It looks like \he's trying to commit suicide.") + viewers(user) << pick("\The [user] is pressing \the [src] to \his temple and activating it! It looks like \he's trying to commit suicide.", + "\The [user] is pressing \the [src] to \his chest and activating it! It looks like \he's trying to commit suicide.") return (BRUTELOSS) /* @@ -91,9 +91,9 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") suicide_act(mob/user) - viewers(user) << pick("\red [user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") + viewers(user) << pick("\The [user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ + "\The [user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ + "\The [user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") return (BRUTELOSS) /* diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index d466c65afa..44be447393 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -26,7 +26,7 @@ /obj/item/weapon/melee/classic_baton/attack(mob/M as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) - user << "\red You club yourself over the head." + user << "You club yourself over the head." user.Weaken(3 * force) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -49,7 +49,7 @@ M.Stun(8) M.Weaken(8) for(var/mob/O in viewers(M)) - if (O.client) O.show_message("\red [M] has been beaten with \the [src] by [user]!", 1, "\red You hear someone fall", 2) + if (O.client) O.show_message("\The [M] has been beaten with \the [src] by [user]!", 1, "You hear someone fall", 2) else playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1, -1) M.Stun(5) @@ -60,7 +60,7 @@ src.add_fingerprint(user) for(var/mob/O in viewers(M)) - if (O.client) O.show_message("\red [M] has been stunned with \the [src] by [user]!", 1, "\red You hear someone fall", 2) + if (O.client) O.show_message("\The [M] has been stunned with \the [src] by [user]!", 1, "You hear someone fall", 2) //Telescopic baton /obj/item/weapon/melee/telebaton @@ -78,8 +78,8 @@ /obj/item/weapon/melee/telebaton/attack_self(mob/user as mob) on = !on if(on) - user.visible_message("\red With a flick of their wrist, [user] extends their telescopic baton.",\ - "\red You extend the baton.",\ + user.visible_message("With a flick of their wrist, [user] extends their telescopic baton.",\ + "You extend the baton.",\ "You hear an ominous click.") icon_state = "telebaton_1" item_state = "telebaton_1" @@ -87,8 +87,8 @@ force = 15//quite robust attack_verb = list("smacked", "struck", "slapped") else - user.visible_message("\blue [user] collapses their telescopic baton.",\ - "\blue You collapse the baton.",\ + user.visible_message("\The [user] collapses their telescopic baton.",\ + "You collapse the baton.",\ "You hear a click.") icon_state = "telebaton_0" item_state = "telebaton_0" @@ -119,7 +119,7 @@ /obj/item/weapon/melee/telebaton/attack(mob/target as mob, mob/living/user as mob) if(on) if ((CLUMSY in user.mutations) && prob(50)) - user << "\red You club yourself over the head." + user << "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 a0af746ab4..a5d5db02ad 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -71,12 +71,12 @@ pr_open = 1 switch(alert(user, "What would you like to do?", "Lighter", "Press the button.", "Close the lighter.")) if("Press the button.") - user << "\red You press the button." + user << "You press the button." flick("c-4detonator_click", src) if(src.bomb) src.bomb.detonate() - log_admin("[user.real_name]([user.ckey]) has triggered [src.bomb] with [src].") - message_admins("\red [user.real_name]([user.ckey]) has triggered [src.bomb] with [src].") + log_admin("[key_name(user)] has triggered [src.bomb] with [src].") + message_admins("[key_name_admin(user)] has triggered [src.bomb] with [src].") if("Close the lighter.") src.icon_state = "c-4detonator_0" diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 745f828d84..470fd21ee3 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -23,7 +23,7 @@ return if(air_contents.gas["oxygen"] < 10) - user << text("\red The meter on the [src.name] indicates you are almost out of air!") + user << text("The meter on \the [src] indicates you are almost out of air!") playsound(user, 'sound/effects/alert.ogg', 50, 1) /obj/item/weapon/tank/jetpack/verb/toggle_rockets() @@ -113,7 +113,7 @@ return if(air_contents.gas["carbon_dioxide"] < 10) - user << text("\red The meter on the [src.name] indicates you are almost out of carbon dioxide!") + user << text("The meter on \the [src] indicates you are almost out of carbon dioxide!") playsound(user, 'sound/effects/alert.ogg', 50, 1) return diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index a43d49a39c..1c6056c25e 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -25,7 +25,7 @@ examine(mob/user) if(..(user, 0) && air_contents.gas["oxygen"] < 10) - user << text("\red The meter on the [src.name] indicates you are almost out of oxygen!") + user << text("The meter on \the [src] indicates you are almost out of oxygen!") //playsound(usr, 'sound/effects/alert.ogg', 50, 1) @@ -67,7 +67,7 @@ examine(mob/user) if(..(user, 0) && air_contents.gas["oxygen"] < 1 && loc==user) - user << "\red The meter on the [src.name] indicates you are almost out of air!" + user << "The meter on the [src.name] indicates you are almost out of air!" user << sound('sound/effects/alert.ogg') /obj/item/weapon/tank/air/New() @@ -131,7 +131,7 @@ examine(mob/user) if(..(user, 0) && air_contents.gas["oxygen"] < 0.2 && loc==user) - user << text("\red The meter on the [src.name] indicates you are almost out of air!") + user << text("The meter on the [src.name] indicates you are almost out of air!") user << sound('sound/effects/alert.ogg') /obj/item/weapon/tank/emergency_oxygen/engi @@ -164,7 +164,7 @@ examine(mob/user) if(..(user, 0) && air_contents.gas["nitrogen"] < 0.2 && loc==user) - user << text("\red The meter on the [src.name] indicates you are almost out of air!") + user << text("The meter on \the [src] indicates you are almost out of air!") user << sound('sound/effects/alert.ogg') /* @@ -185,5 +185,5 @@ /obj/item/weapon/tank/nitrogen/examine(mob/user) if(..(user, 0) && air_contents.gas["nitrogen"] < 10) - user << text("\red The meter on the [src.name] indicates you are almost out of nitrogen!") + user << text("The meter on \the [src] indicates you are almost out of nitrogen!") //playsound(user, 'sound/effects/alert.ogg', 50, 1) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index f1cd0286ba..86effc923c 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -44,26 +44,33 @@ if (istype(src.loc, /obj/item/assembly)) icon = src.loc if (!in_range(src, user)) - if (icon == src) user << "\blue It's \a \icon[icon][src]! If you want any more information you'll need to get closer." + if (icon == src) user << "It's \a \icon[icon][src]! If you want any more information you'll need to get closer." return var/celsius_temperature = src.air_contents.temperature-T0C var/descriptive + var/status if (celsius_temperature < 20) descriptive = "cold" + status = "warning" else if (celsius_temperature < 40) descriptive = "room temperature" + status = "notice" else if (celsius_temperature < 80) descriptive = "lukewarm" + status = "warning" else if (celsius_temperature < 100) descriptive = "warm" + status = "warning" else if (celsius_temperature < 300) descriptive = "hot" + status = "danger" else descriptive = "furiously hot" + status = "danger" - user << "\blue \The \icon[icon][src] feels [descriptive]" + user << "\The \icon[icon][src] feels [descriptive]" return @@ -87,20 +94,20 @@ if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1) for (var/mob/O in viewers(user, null)) - O << "\red [user] has used [W] on \icon[icon] [src]" + O << "\The [user] has used [W] on \icon[icon] [src]" var/pressure = air_contents.return_pressure() manipulated_by = user.real_name //This person is aware of the contents of the tank. var/total_moles = air_contents.total_moles - user << "\blue Results of analysis of \icon[icon]" + user << "Results of analysis of \icon[icon]" if (total_moles>0) - user << "\blue Pressure: [round(pressure,0.1)] kPa" + user << "Pressure: [round(pressure,0.1)] kPa" for(var/g in air_contents.gas) - user << "\blue [gas_data.name[g]]: [(round(air_contents.gas[g] / total_moles) * 100)]%" - user << "\blue Temperature: [round(air_contents.temperature-T0C)]°C" + user << "[gas_data.name[g]]: [(round(air_contents.gas[g] / total_moles) * 100)]%" + user << "Temperature: [round(air_contents.temperature-T0C)]°C" else - user << "\blue Tank is empty!" + user << "Tank is empty!" src.add_fingerprint(user) else if (istype(W,/obj/item/latexballon)) var/obj/item/latexballon/LB = W @@ -195,7 +202,7 @@ if(location.internal == src) location.internal = null location.internals.icon_state = "internal0" - usr << "\blue You close the tank release valve." + usr << "You close the tank release valve." if (location.internals) location.internals.icon_state = "internal0" else @@ -210,11 +217,11 @@ if(can_open_valve) location.internal = src - usr << "\blue You open \the [src] valve." + usr << "You open \the [src] valve." if (location.internals) location.internals.icon_state = "internal1" else - usr << "\blue You need something to connect to \the [src]." + usr << "You need something to connect to \the [src]." src.add_fingerprint(usr) return 1 @@ -261,7 +268,7 @@ if(!istype(src.loc,/obj/item/device/transfer_valve)) message_admins("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast].") log_game("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast].") - //world << "\blue[x],[y] tank is exploding: [pressure] kPa" + //world << "[x],[y] tank is exploding: [pressure] kPa" //Give the gas a chance to build up more pressure through reacting air_contents.react() air_contents.react() @@ -271,13 +278,13 @@ range = min(range, max_explosion_range) // was 8 - - - Changed to a configurable define -- TLE var/turf/epicenter = get_turf(loc) - //world << "\blue Exploding Pressure: [pressure] kPa, intensity: [range]" + //world << "Exploding Pressure: [pressure] kPa, intensity: [range]" explosion(epicenter, round(range*0.25), round(range*0.5), round(range), round(range*1.5)) qdel(src) else if(pressure > TANK_RUPTURE_PRESSURE) - //world << "\blue[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]" + //world << "[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]" if(integrity <= 0) var/turf/simulated/T = get_turf(src) if(!T) @@ -289,7 +296,7 @@ integrity-- else if(pressure > TANK_LEAK_PRESSURE) - //world << "\blue[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]" + //world << "[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]" if(integrity <= 0) var/turf/simulated/T = get_turf(src) if(!T) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 0ea6a5c428..d51a9a1e3b 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -48,8 +48,8 @@ attack_verb = list("stabbed") suicide_act(mob/user) - viewers(user) << pick("\red [user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.", \ - "\red [user] is stabbing the [src.name] into \his heart! It looks like \he's trying to commit suicide.") + viewers(user) << pick("\The [user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.", \ + "\The [user] is stabbing the [src.name] into \his heart! It looks like \he's trying to commit suicide.") return(BRUTELOSS) /obj/item/weapon/screwdriver/New() @@ -236,7 +236,7 @@ else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.welding) 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.") - user << "\red 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." + 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." var/obj/structure/reagent_dispensers/fueltank/tank = O tank.explode() return @@ -332,29 +332,29 @@ return switch(safety) if(1) - usr << "\red Your eyes sting a little." + usr << "Your eyes sting a little." E.damage += rand(1, 2) if(E.damage > 12) user.eye_blurry += rand(3,6) if(0) - usr << "\red Your eyes burn." + usr << "Your eyes burn." E.damage += rand(2, 4) if(E.damage > 10) E.damage += rand(4,10) if(-1) - usr << "\red Your thermals intensify the welder's glow. Your eyes itch and burn severely." + usr << "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) - user << "\red Your eyes are really starting to hurt. This can't be good for you!" + user << "Your eyes are really starting to hurt. This can't be good for you!" if (E.damage >= E.min_broken_damage) - user << "\red You go blind!" + user << "You go blind!" user.sdisabilities |= BLIND else if (E.damage >= E.min_bruised_damage) - user << "\red You go blind!" + user << "You go blind!" user.eye_blind = 5 user.eye_blurry = 5 user.disabilities |= NEARSIGHTED diff --git a/code/game/objects/items/weapons/trays.dm b/code/game/objects/items/weapons/trays.dm index c52961eda5..c81a01786d 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? - M << "\red You accidentally slam yourself with the [src]!" + M << "You accidentally slam yourself with the [src]!" M.Weaken(1) user.take_organ_damage(2) if(prob(50)) @@ -64,17 +64,17 @@ if(prob(50)) playsound(M, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] slams [] with the tray!", user, M), 1) + O.show_message(text("[] slams [] with the tray!", user, M), 1) return else playsound(M, '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("\red [] slams [] with the tray!", user, M), 1) + O.show_message(text("[] slams [] with the tray!", user, M), 1) return if(istype(M, /mob/living/carbon/human) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES))) - M << "\red You get slammed in the face with the tray, against your mask!" + M << "You get slammed in the face with the tray, against your mask!" if(prob(33)) src.add_blood(H) if (H.wear_mask) @@ -90,11 +90,11 @@ if(prob(50)) playsound(M, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] slams [] with the tray!", user, M), 1) + O.show_message(text("[] slams [] with the tray!", user, M), 1) else playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] slams [] with the tray!", user, M), 1) + O.show_message(text("[] slams [] with the tray!", user, M), 1) if(prob(10)) M.Stun(rand(1,3)) M.take_organ_damage(3) @@ -104,7 +104,7 @@ return else //No eye or head protection, tough luck! - M << "\red You get slammed in the face with the tray!" + M << "You get slammed in the face with the tray!" if(prob(33)) src.add_blood(M) var/turf/location = H.loc @@ -114,11 +114,11 @@ if(prob(50)) playsound(M, 'sound/items/trayhit1.ogg', 50, 1) for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] slams [] in the face with the tray!", user, M), 1) + O.show_message(text("[] slams [] in the face with the tray!", user, M), 1) else playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' again for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] slams [] in the face with the tray!", user, M), 1) + O.show_message(text("[] slams [] in the face with the tray!", user, M), 1) if(prob(30)) M.Stun(rand(2,4)) M.take_organ_damage(4) diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm index 0a4d4f6e70..e9b5fdb379 100644 --- a/code/game/objects/items/weapons/weldbackpack.dm +++ b/code/game/objects/items/weapons/weldbackpack.dm @@ -19,19 +19,19 @@ if(T.welding & prob(50)) message_admins("[key_name_admin(user)] triggered a fueltank explosion.") log_game("[key_name(user)] triggered a fueltank explosion.") - user << "\red That was stupid of you." + user << "That was stupid of you." explosion(get_turf(src),-1,0,2) if(src) qdel(src) return else if(T.welding) - user << "\red That was close!" + user << "That was close!" src.reagents.trans_to_obj(W, T.max_fuel) - user << "\blue Welder refilled!" + user << "Welder refilled!" playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) return - user << "\blue The tank scoffs at your insolence. It only provides services to welders." + user << "The tank scoffs at your insolence. It only provides services to welders." return /obj/item/weapon/weldpack/afterattack(obj/O as obj, mob/user as mob, proximity) @@ -39,11 +39,11 @@ return if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume < max_fuel) O.reagents.trans_to_obj(src, max_fuel) - user << "\blue You crack the cap off the top of the pack and fill it back up again from the tank." + user << "You crack the cap off the top of the pack and fill it back up again from the tank." playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) return else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume == max_fuel) - user << "\blue The pack is already full!" + user << "The pack is already full!" return /obj/item/weapon/weldpack/examine(mob/user) diff --git a/code/game/objects/items/weapons/wires.dm b/code/game/objects/items/weapons/wires.dm index df2033f887..0a70fdbe1c 100644 --- a/code/game/objects/items/weapons/wires.dm +++ b/code/game/objects/items/weapons/wires.dm @@ -12,7 +12,7 @@ /obj/item/weapon/wire/attack_self(mob/user as mob) if (src.laying) src.laying = 0 - user << "\blue You're done laying wire!" + user << "You're done laying wire!" else - user << "\blue You are not using this to lay wire..." + user << "You are not using this to lay wire..." return From 0e3bc3b8609ae1ab131741efa0d8094e3890a151 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Thu, 4 Jun 2015 09:20:02 +0200 Subject: [PATCH 10/20] NPC mobs and blobs now attack all external human limbs. When attacked by simple mobs and blobs now all external limbs are available for random selection. The overall damage will be the same but the number of fractures caused will, in general, be fewer. --- code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/mob/living/carbon/human/human_attackhand.dm | 2 +- code/modules/research/xenoarchaeology/finds/finds_special.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 4f31bd5a84..10e165fa5f 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -172,7 +172,7 @@ /mob/living/carbon/human/blob_act() if(stat == 2) return show_message("\red The blob attacks you!") - var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg") + var/dam_zone = pick(organs_by_name) var/obj/item/organ/external/affecting = get_organ(ran_zone(dam_zone)) apply_damage(rand(30,40), BRUTE, affecting, run_armor_check(affecting, "melee")) return diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 21a386b5cf..7451e6ae6a 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -295,7 +295,7 @@ src.visible_message("[user] has [attack_message] [src]!") user.do_attack_animation(src) - var/dam_zone = pick("head", "chest", "l_arm", "r_arm", "l_leg", "r_leg", "groin") + var/dam_zone = pick(organs_by_name) var/obj/item/organ/external/affecting = get_organ(ran_zone(dam_zone)) var/armor_block = run_armor_check(affecting, "melee") apply_damage(damage, BRUTE, affecting, armor_block) diff --git a/code/modules/research/xenoarchaeology/finds/finds_special.dm b/code/modules/research/xenoarchaeology/finds/finds_special.dm index b2c0fb3898..af73f541d6 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_special.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_special.dm @@ -127,7 +127,7 @@ playsound(src.loc, pick('sound/hallucinations/wail.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/far_noise.ogg'), 50, 1, -3) nearby_mobs.Add(M) - var/target = pick("chest","groin","head","l_arm","r_arm","r_leg","l_leg","l_hand","r_hand","l_foot","r_foot") + var/target = pick(M.organs_by_name) M.apply_damage(rand(5, 10), BRUTE, target) M << "\red 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) From 288e6189806204040ef65da350358616a20be1f4 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Thu, 4 Jun 2015 09:23:20 +0200 Subject: [PATCH 11/20] Changelog entry. --- html/changelogs/PsiOmegaDelta-ExternalDamage.yml | 5 +++++ html/changelogs/{Yoshax-emptypls.xml => Yoshax-emptypls.yml} | 0 2 files changed, 5 insertions(+) create mode 100644 html/changelogs/PsiOmegaDelta-ExternalDamage.yml rename html/changelogs/{Yoshax-emptypls.xml => Yoshax-emptypls.yml} (100%) diff --git a/html/changelogs/PsiOmegaDelta-ExternalDamage.yml b/html/changelogs/PsiOmegaDelta-ExternalDamage.yml new file mode 100644 index 0000000000..2fc23a20fd --- /dev/null +++ b/html/changelogs/PsiOmegaDelta-ExternalDamage.yml @@ -0,0 +1,5 @@ +author: PsiOmegaDelta +delete-after: True + +changes: + - tweak: "Blobs and simple mobs now attack all external organs instead of a subset. The overall damage remains the same but the number of fractures caused will, in general, be fewer." diff --git a/html/changelogs/Yoshax-emptypls.xml b/html/changelogs/Yoshax-emptypls.yml similarity index 100% rename from html/changelogs/Yoshax-emptypls.xml rename to html/changelogs/Yoshax-emptypls.yml From 7168c9b0644a732d65c44b5e3b5d3d8bbd4f9274 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Thu, 4 Jun 2015 09:50:43 +0200 Subject: [PATCH 12/20] Spiderlings now inherit color and light from egg clusters, spiders inherit from spiderlings. --- code/game/objects/effects/spiders.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 03b5c922d8..141eabc61f 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -79,13 +79,19 @@ pixel_x = rand(3,-3) pixel_y = rand(3,-3) processing_objects.Add(src) + +/obj/effect/spider/eggcluster/Destroy() + processing_objects.Remove(src) + ..() /obj/effect/spider/eggcluster/process() amount_grown += rand(0,2) if(amount_grown >= 100) var/num = rand(6,24) for(var/i=0, i= 100) var/spawn_type = pick(typesof(/mob/living/simple_animal/hostile/giant_spider)) - new spawn_type(src.loc) + var/mob/spiderspawn = new spawn_type(src.loc) + spiderspawn.color = color + spiderspawn.set_light(light_range, light_power, light_color) qdel(src) /obj/effect/decal/cleanable/spiderling_remains From dc22e8fed387ba93ca042cccc68b3601e440b70f Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Thu, 4 Jun 2015 12:13:29 +0200 Subject: [PATCH 13/20] Giant spider nurses now have a chance of injecting their victims with spider eggs. Spider nurses now have poison_per_bite chance (currently 10%) to inject a random non-robotic external limb with spider eggs. These eggs will eventually hatch a number of spiderlings that will slowly grow inside their host, causing minor tox damage over time. If the organ is removed from the host, the host dies, or the spiderling has matured sufficiently it will crawl out into freedom. Medical scanners will register eggs and spiderlings as foreign bodies. --- code/game/objects/effects/spiders.dm | 72 +++++++++++++------ .../simple_animal/hostile/giant_spider.dm | 15 +++- 2 files changed, 61 insertions(+), 26 deletions(-) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 141eabc61f..ea420e56b9 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -78,18 +78,28 @@ New() pixel_x = rand(3,-3) pixel_y = rand(3,-3) - processing_objects.Add(src) - + processing_objects |= src + /obj/effect/spider/eggcluster/Destroy() - processing_objects.Remove(src) + processing_objects -= src + if(istype(loc, /obj/item/organ/external)) + var/obj/item/organ/external/O = loc + O.implants -= src + ..() /obj/effect/spider/eggcluster/process() amount_grown += rand(0,2) if(amount_grown >= 100) var/num = rand(6,24) + var/obj/item/organ/external/O = null + if(istype(loc, /obj/item/organ/external)) + O = loc + for(var/i=0, i\The [src] skitters[pick(" away"," around","")].") + else if(prob(5)) + //vent crawl! + for(var/obj/machinery/atmospherics/unary/vent_pump/v in view(7,src)) + if(!v.welded) + entry_vent = v + walk_to(src, entry_vent, 5) + break - else if(prob(25)) - var/list/nearby = oview(5, src) - if(nearby.len) - var/target_atom = pick(nearby) - walk_to(src, target_atom, 5) - if(prob(25)) - src.visible_message("\blue \the [src] skitters[pick(" away"," around","")].") - else if(prob(5)) - //vent crawl! - for(var/obj/machinery/atmospherics/unary/vent_pump/v in view(7,src)) - if(!v.welded) - entry_vent = v - walk_to(src, entry_vent, 5) - break - - if(prob(1)) - src.visible_message("\blue \the [src] chitters.") - if(isturf(loc) && amount_grown > 0) - amount_grown += rand(0,2) if(amount_grown >= 100) var/spawn_type = pick(typesof(/mob/living/simple_animal/hostile/giant_spider)) var/mob/spiderspawn = new spawn_type(src.loc) spiderspawn.color = color spiderspawn.set_light(light_range, light_power, light_color) qdel(src) + else if(isorgan(loc)) + if(!amount_grown) amount_grown = 1 + var/obj/item/organ/external/O = loc + 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]"]!") + if(O.owner) + O.owner.apply_damage(1, BRUTE, O.limb_name) + else if(prob(1)) + O.owner.apply_damage(1, TOX, O.limb_name) + if(world.time > last_itch + 30 SECONDS) + last_itch = world.time + O.owner << "Your [O.name] itches..." + else if(prob(1)) + src.visible_message("\The [src] skitters.") + + if(amount_grown) + amount_grown += rand(0,2) /obj/effect/decal/cleanable/spiderling_remains name = "spiderling remains" @@ -214,7 +240,7 @@ icon_state = pick("cocoon1","cocoon2","cocoon3") /obj/effect/spider/cocoon/Destroy() - src.visible_message("\red \the [src] splits open.") + src.visible_message("\The [src] splits open.") for(var/atom/movable/A in contents) A.loc = src.loc return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 4d7a8f7e3a..40247c7584 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -64,15 +64,24 @@ move_to_delay = 4 /mob/living/simple_animal/hostile/giant_spider/AttackingTarget() - ..() - if(isliving(target_mob)) - var/mob/living/L = target_mob + var/target = ..() + if(isliving(target)) + var/mob/living/L = target if(L.reagents) L.reagents.add_reagent("toxin", poison_per_bite) if(prob(poison_per_bite)) L << "\red You feel a tiny prick." L.reagents.add_reagent(poison_type, 5) +/mob/living/simple_animal/hostile/giant_spider/nurse/AttackingTarget() + var/target = ..() + if(ishuman(target)) + var/mob/living/carbon/human/H = target + if(prob(poison_per_bite)) + var/obj/item/organ/external/O = pick(H.organs) + if(!(O.status & ORGAN_ROBOT)) + O.implants += new/obj/effect/spider/eggcluster(O) + /mob/living/simple_animal/hostile/giant_spider/Life() ..() if(!stat) From 5006e8160d85bbe62b185dc3d03ecf1f72edf732 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Thu, 4 Jun 2015 12:19:54 +0200 Subject: [PATCH 14/20] Spider eggs now also inherit color and light from their mother. --- .../mob/living/simple_animal/hostile/giant_spider.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 40247c7584..091bd200cd 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -80,7 +80,10 @@ if(prob(poison_per_bite)) var/obj/item/organ/external/O = pick(H.organs) if(!(O.status & ORGAN_ROBOT)) - O.implants += new/obj/effect/spider/eggcluster(O) + var/obj/effect/spider/eggcluster/eggs = new(O) + eggs.color = color + eggs.set_light(light_range, light_power, light_color) + O.implants += eggs /mob/living/simple_animal/hostile/giant_spider/Life() ..() @@ -144,7 +147,9 @@ if(busy == LAYING_EGGS) E = locate() in get_turf(src) if(!E) - new /obj/effect/spider/eggcluster(src.loc) + var/obj/effect/spider/eggcluster/eggs = new(src.loc) + eggs.color = color + eggs.set_light(light_range, light_power, light_color) fed-- busy = 0 stop_automated_movement = 0 From 2f9abd759ee09a7407121422492d1ca2bff241e5 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Thu, 4 Jun 2015 12:25:17 +0200 Subject: [PATCH 15/20] Changelog entry. --- html/changelogs/PsiOmegaDelta-SpiderGlow.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/PsiOmegaDelta-SpiderGlow.yml diff --git a/html/changelogs/PsiOmegaDelta-SpiderGlow.yml b/html/changelogs/PsiOmegaDelta-SpiderGlow.yml new file mode 100644 index 0000000000..bccc54c320 --- /dev/null +++ b/html/changelogs/PsiOmegaDelta-SpiderGlow.yml @@ -0,0 +1,5 @@ +author: PsiOmegaDelta +delete-after: True + +changes: + - rscadd: "Spider nurses now have a chance of injecting their victims with spider eggs which eventually hatch. If the limb is removed from the host, the host dies, or the spiderling has matured sufficiently it will crawl out into freedom. Medical scanners will pick upp eggs and spiderlings as foreign bodies." From 55bc495ee73c9bd666b94e3bf271bba5ba94d345 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Thu, 4 Jun 2015 14:12:27 +0200 Subject: [PATCH 16/20] Some cleanup of code. --- code/__HELPERS/unsorted.dm | 5 +++ code/game/objects/effects/spiders.dm | 36 +++++++++++-------- .../simple_animal/hostile/giant_spider.dm | 20 +++++------ 3 files changed, 37 insertions(+), 24 deletions(-) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 75166b3f48..da54173471 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1373,3 +1373,8 @@ var/list/WALLITEMS = list( temp_col = "0[temp_col]" colour += temp_col return colour + +/atom/proc/get_light_and_color(var/atom/origin) + if(origin) + color = origin.color + set_light(origin.light_range, origin.light_power, origin.light_color) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index ea420e56b9..c54b1c15c4 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -80,6 +80,10 @@ pixel_y = rand(3,-3) processing_objects |= src +/obj/effect/spider/eggcluster/New(var/location, var/atom/parent) + get_light_and_color(parent) + ..() + /obj/effect/spider/eggcluster/Destroy() processing_objects -= src if(istype(loc, /obj/item/organ/external)) @@ -97,11 +101,9 @@ O = loc for(var/i=0, i= 100) var/spawn_type = pick(typesof(/mob/living/simple_animal/hostile/giant_spider)) - var/mob/spiderspawn = new spawn_type(src.loc) - spiderspawn.color = color - spiderspawn.set_light(light_range, light_power, light_color) + new spawn_type(src.loc, src) qdel(src) else if(isorgan(loc)) if(!amount_grown) amount_grown = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 091bd200cd..793e421b99 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -63,6 +63,10 @@ poison_per_bite = 5 move_to_delay = 4 +/mob/living/simple_animal/hostile/giant_spider/New(var/location, var/atom/parent) + get_light_and_color(parent) + ..() + /mob/living/simple_animal/hostile/giant_spider/AttackingTarget() var/target = ..() if(isliving(target)) @@ -80,9 +84,7 @@ if(prob(poison_per_bite)) var/obj/item/organ/external/O = pick(H.organs) if(!(O.status & ORGAN_ROBOT)) - var/obj/effect/spider/eggcluster/eggs = new(O) - eggs.color = color - eggs.set_light(light_range, light_power, light_color) + var/eggs = PoolOrNew(/obj/effect/spider/eggcluster/, list(O, src)) O.implants += eggs /mob/living/simple_animal/hostile/giant_spider/Life() @@ -129,7 +131,7 @@ var/obj/effect/spider/stickyweb/W = locate() in get_turf(src) if(!W) busy = SPINNING_WEB - src.visible_message("\blue \the [src] begins to secrete a sticky substance.") + src.visible_message("\The [src] begins to secrete a sticky substance.") stop_automated_movement = 1 spawn(40) if(busy == SPINNING_WEB) @@ -141,15 +143,13 @@ var/obj/effect/spider/eggcluster/E = locate() in get_turf(src) if(!E && fed > 0) busy = LAYING_EGGS - src.visible_message("\blue \the [src] begins to lay a cluster of eggs.") + src.visible_message("\The [src] begins to lay a cluster of eggs.") stop_automated_movement = 1 spawn(50) if(busy == LAYING_EGGS) E = locate() in get_turf(src) if(!E) - var/obj/effect/spider/eggcluster/eggs = new(src.loc) - eggs.color = color - eggs.set_light(light_range, light_power, light_color) + PoolOrNew(/obj/effect/spider/eggcluster, list(loc, src)) fed-- busy = 0 stop_automated_movement = 0 @@ -171,7 +171,7 @@ else if(busy == MOVING_TO_TARGET && cocoon_target) if(get_dist(src, cocoon_target) <= 1) busy = SPINNING_COCOON - src.visible_message("\blue \the [src] begins to secrete a sticky substance around \the [cocoon_target].") + src.visible_message("\The [src] begins to secrete a sticky substance around \the [cocoon_target].") stop_automated_movement = 1 walk(src,0) spawn(50) @@ -186,7 +186,7 @@ continue large_cocoon = 1 fed++ - src.visible_message("\red \the [src] sticks a proboscis into \the [cocoon_target] and sucks a viscous substance out.") + src.visible_message("\The [src] sticks a proboscis into \the [cocoon_target] and sucks a viscous substance out.") M.loc = C C.pixel_x = M.pixel_x C.pixel_y = M.pixel_y From 1711d01e7aa8459f57208dd0712f6af2fc9ecea2 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Thu, 4 Jun 2015 19:42:06 +0100 Subject: [PATCH 17/20] Makes special wizard projectile staffs only usable by wizards. --- code/modules/projectiles/guns/energy/special.dm | 7 +++++++ html/changelogs/Yoshax-stafffixes.yml | 5 +++++ 2 files changed, 12 insertions(+) create mode 100644 html/changelogs/Yoshax-stafffixes.yml diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index e5eadb0ae3..7f1457d638 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -117,6 +117,13 @@ self_recharge = 1 charge_meter = 0 +/obj/item/weapon/gun/energy/staff/special_check(var/mob/user) + if((user.mind && !wizards.is_antagonist(user.mind))) + usr << "You focus your mind on \the [src], but nothing happens!" + return 0 + + return ..() + /obj/item/weapon/gun/energy/staff/handle_click_empty(mob/user = null) if (user) user.visible_message("*fizzle*", "*fizzle*") diff --git a/html/changelogs/Yoshax-stafffixes.yml b/html/changelogs/Yoshax-stafffixes.yml new file mode 100644 index 0000000000..b9038094f2 --- /dev/null +++ b/html/changelogs/Yoshax-stafffixes.yml @@ -0,0 +1,5 @@ +author: Yoshax +delete-after: True + +changes: + - tweak: "Makes the special wizard projectile staffs, Animate, Change, Focus and any future ones only usable by wizards.." \ No newline at end of file From c960fad48ee68c7e16bbc181a8598e9398acb816 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Thu, 4 Jun 2015 20:21:31 +0100 Subject: [PATCH 18/20] Changes teleportation scroll and spellbook to be only usable by wizards --- code/game/objects/items/weapons/scrolls.dm | 4 ++++ code/modules/spells/spellbook.dm | 4 ++++ html/changelogs/Yoshax-stafffixes.yml | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 618598c182..05709898d6 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -11,6 +11,10 @@ origin_tech = list(TECH_BLUESPACE = 4) /obj/item/weapon/teleportation_scroll/attack_self(mob/user as mob) + if((user.mind && !wizards.is_antagonist(user.mind))) + usr << "You stare at the scroll but cannot make sense of the markings!" + return + user.set_machine(src) var/dat = "Teleportation Scroll:
" dat += "Number of uses: [src.uses]
" diff --git a/code/modules/spells/spellbook.dm b/code/modules/spells/spellbook.dm index 169d750944..0c13e4ac93 100644 --- a/code/modules/spells/spellbook.dm +++ b/code/modules/spells/spellbook.dm @@ -14,6 +14,10 @@ /obj/item/weapon/spellbook/attack_self(mob/user = usr) if(!user) return + if((user.mind && !wizards.is_antagonist(user.mind))) + usr << "You stare at the book but cannot make sense of the markings!" + return + user.set_machine(src) var/dat if(temp) diff --git a/html/changelogs/Yoshax-stafffixes.yml b/html/changelogs/Yoshax-stafffixes.yml index b9038094f2..5e2c45a699 100644 --- a/html/changelogs/Yoshax-stafffixes.yml +++ b/html/changelogs/Yoshax-stafffixes.yml @@ -2,4 +2,4 @@ author: Yoshax delete-after: True changes: - - tweak: "Makes the special wizard projectile staffs, Animate, Change, Focus and any future ones only usable by wizards.." \ No newline at end of file + - tweak: "Makes the special wizard projectile staffs, Animate, Change, Focus and any future ones only usable by wizards. Also makes it so only wizards can use spellbooks and teleportation scrolls." From 28a1bad9c4dfb7cc0d72f7df127919850eb4bb91 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Fri, 5 Jun 2015 00:58:13 +0100 Subject: [PATCH 19/20] Travis, reverts non-spanclass change --- .travis.yml | 1 + code/game/objects/items/weapons/storage/briefcase.dm | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 948be8cfe5..908e4a473c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ script: - shopt -s globstar - (! grep 'step_[xy]' maps/**/*.dmm) - (! find nano/templates/ -type f -exec md5sum {} + | sort | uniq -D -w 32 | grep nano) + - (num=`grep -E '\\\\(red|blue|green|black|b|i[^mc])' **/*.dm | wc -l`; [ $num -le 1355 ]) - ( md5sum -c - <<< "0af969f671fba6cf9696c78cd175a14a *baystation12.int") - DreamMaker baystation12.dme - python tools/GenerateChangelog/ss13_genchangelog.py html/changelog.html html/changelogs diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 8af478806e..09a157ea47 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -31,10 +31,9 @@ if (M.stat < 2 && M.health < 50 && prob(90)) var/mob/H = M // ******* Check -// Commented this bit out simply because it doesn't make sense, I can't work out what it's supposed to do, and it doesn't do anything at all as it is ~GN -// if ((istype(H, /mob/living/carbon/human) && istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80))) -// M << "The helmet protects you from being hit hard in the head!" -// return + if ((istype(H, /mob/living/carbon/human) && istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80))) + M << "The helmet protects you from being hit hard in the head!" + return var/time = rand(2, 6) if (prob(75)) M.Paralyse(time) From 8794a90d059f290b6611e93cbd725537a54745af Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Thu, 4 Jun 2015 08:42:44 +0200 Subject: [PATCH 20/20] The shuffle proc can now handle both normal and associative lists. --- code/__HELPERS/lists.dm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm index ed0f0c9780..fb4cd3874e 100644 --- a/code/__HELPERS/lists.dm +++ b/code/__HELPERS/lists.dm @@ -169,16 +169,15 @@ proc/listclearnulls(list/list) return output //Randomize: Return the list in a random order -/proc/shuffle(var/list/shufflelist) - if(!shufflelist) +/proc/shuffle(var/list/L) + if(!L) return - var/list/new_list = list() - var/list/old_list = shufflelist.Copy() - while(old_list.len) - var/item = pick(old_list) - new_list += item - old_list -= item - return new_list + + L = L.Copy() + + for(var/i=1; i