diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index 9ee6235f62..7fef0ceac3 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -259,10 +259,10 @@ return num_val MINUTES /datum/config_entry/string/respawn_message - default = "Make sure to play a different character, and please roleplay correctly!" + default = span_boldnotice("Make sure to play a different character, and please roleplay correctly!") /datum/config_entry/string/respawn_message/ValidateAndSet(str_val) - return "[str_val]" + return span_boldnotice("[str_val]") /datum/config_entry/flag/guest_jobban default = TRUE diff --git a/code/controllers/subsystems/mapping_yw.dm b/code/controllers/subsystems/mapping_yw.dm index a6ea2b33f6..85f8645143 100644 --- a/code/controllers/subsystems/mapping_yw.dm +++ b/code/controllers/subsystems/mapping_yw.dm @@ -29,7 +29,7 @@ chosen_type = pick(engine_types) global_announcer.autosay("Engineering has selected [chosen_type.name] as todays engine.", "Engine Constructor") to_world_log("Chose Engine Map: [chosen_type.name]") - admin_notice("Chose Engine Map: [chosen_type.name]", R_DEBUG) + admin_notice(span_danger("Chose Engine Map: [chosen_type.name]"), R_DEBUG) // Annihilate movable atoms engine_loader_pickable.annihilate_bounds() diff --git a/code/game/machinery/airconditioner_yw.dm b/code/game/machinery/airconditioner_yw.dm index e3c9f995c0..a721a49c92 100644 --- a/code/game/machinery/airconditioner_yw.dm +++ b/code/game/machinery/airconditioner_yw.dm @@ -25,7 +25,7 @@ return if(I.is_wrench()) anchored = !anchored - visible_message("\The [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].") //Does this not need to be disabled? + visible_message(span_notice("\The [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].")) //Does this not need to be disabled? playsound(src, I.usesound, 75, 1) if(anchored) connect_to_network() @@ -35,4 +35,4 @@ return if(istype(I, /obj/item/multitool)) return - ..() \ No newline at end of file + ..() diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index cd7b5b3ab3..3a49b074bf 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -166,7 +166,7 @@ return if(!allowed(user) && (wires & 1)) - to_chat(user, "Access Denied") + to_chat(user, span_warning("Access Denied")) flick("doorctrl-denied",src) return diff --git a/code/game/machinery/feeder.dm b/code/game/machinery/feeder.dm index 33aacf19f5..a6e9ee458a 100644 --- a/code/game/machinery/feeder.dm +++ b/code/game/machinery/feeder.dm @@ -107,13 +107,13 @@ if(beaker) if(beaker.reagents && beaker.reagents.reagent_list.len) - . += "Inserted is \a [beaker] with [beaker.reagents.total_volume] units of liquid." + . += span_notice("Inserted is \a [beaker] with [beaker.reagents.total_volume] units of liquid.") else - . += "Inserted is an empty [beaker]." + . += span_notice("Inserted is an empty [beaker].") else - . += "No container is inserted." + . += span_notice("No container is inserted.") - . += "[attached ? attached : "No one"] is being fed by it." + . += span_notice("[attached ? attached : "No one"] is being fed by it.") /obj/machinery/feeder/CanPass(atom/movable/mover, turf/target, height = 0, air_group = 0) if(height && istype(mover) && mover.checkpass(PASSTABLE)) //allow bullets, beams, thrown objects, mice, drones, and the like through. diff --git a/code/game/machinery/suit_dispenser.dm b/code/game/machinery/suit_dispenser.dm index 3c5be0d444..99585bf975 100644 --- a/code/game/machinery/suit_dispenser.dm +++ b/code/game/machinery/suit_dispenser.dm @@ -20,8 +20,8 @@ var/list/dispenser_presets = list() if(LAZYLEN(req_one_access)) var/accesses = user.GetAccess() return has_access(null, req_one_access, accesses) - - return 1 + + return 1 /datum/gear_disp/proc/spawn_gear(var/turf/T, var/mob/living/carbon/human/user) var/list/spawned = list() @@ -39,7 +39,7 @@ var/list/dispenser_presets = list() /datum/gear_disp/custom/allowed(var/mob/living/carbon/human/user) if(ckey_allowed && user.ckey != ckey_allowed) return 0 - + if(character_allowed && user.real_name != character_allowed) return 0 @@ -98,7 +98,7 @@ var/list/dispenser_presets = list() magboots = new magboots_type(voidsuit) voidsuit.boots = magboots spawned += magboots - + if(refit) voidsuit.refit_for_species(user.species?.get_bodytype()) // does helmet and boots if they're attached @@ -113,7 +113,7 @@ var/list/dispenser_presets = list() else if(user.species?.breath_type) if(voidsuit.tank) error("[src] created a voidsuit [voidsuit] and wants to add a tank but it already has one") - else + else //Create a tank (if such a thing exists for this species) var/tanktext = "/obj/item/tank/" + "[user.species?.breath_type]" var/obj/item/tank/tankpath = text2path(tanktext) @@ -137,7 +137,7 @@ var/list/dispenser_presets = list() /datum/gear_disp/voidsuit/custom/allowed(var/mob/living/carbon/human/user) if(ckey_allowed && user.ckey != ckey_allowed) return 0 - + if(character_allowed && user.real_name != character_allowed) return 0 @@ -158,7 +158,7 @@ var/list/dispenser_presets = list() //req_one_access = list(whatever) // Note that each gear datum can have access, too. /obj/machinery/gear_dispenser/custom/emag_act(remaining_charges, mob/user, emag_source) - to_chat(user, "Your moral standards prevent you from emagging this machine!") + to_chat(user, span_warning("Your moral standards prevent you from emagging this machine!")) return -1 // Letting people emag this one would be bad times /obj/machinery/gear_dispenser/Initialize() @@ -172,7 +172,7 @@ var/list/dispenser_presets = list() if(one_setting) one_setting = new one_setting dispenses = real_gear_list - + /obj/machinery/gear_dispenser/attack_hand(var/mob/living/carbon/human/user) if(!can_use(user)) @@ -180,18 +180,18 @@ var/list/dispenser_presets = list() dispenser_flags |= GD_BUSY if(!(dispenser_flags & GD_ONEITEM)) var/list/gear_list = get_gear_list(user) - + if(!LAZYLEN(gear_list)) - to_chat(user, "\The [src] doesn't have anything to dispense for you!") + to_chat(user, span_warning("\The [src] doesn't have anything to dispense for you!")) dispenser_flags &= ~GD_BUSY return - + var/choice = input("Select equipment to dispense.", "Equipment Dispenser") as null|anything in gear_list - + if(!choice) dispenser_flags &= ~GD_BUSY return - + dispense(gear_list[choice],user) else dispense(one_setting,user) @@ -200,28 +200,28 @@ var/list/dispenser_presets = list() /obj/machinery/gear_dispenser/proc/can_use(var/mob/living/carbon/human/user) var/list/used_by = gear_distributed_to["[type]"] if(!istype(user)) - to_chat(user,"You can't use this!") + to_chat(user,span_warning("You can't use this!")) return 0 if((dispenser_flags & GD_BUSY)) - to_chat(user,"Someone else is using this!") + to_chat(user,span_warning("Someone else is using this!")) return 0 if((dispenser_flags & GD_ONEITEM) && !(dispenser_flags & GD_UNLIMITED) && !one_setting.amount) - to_chat(user,"There's nothing in here!") + to_chat(user,span_warning("There's nothing in here!")) return 0 if ((dispenser_flags & GD_NOGREED) && (user in used_by) && !emagged) - to_chat(user,"You've already picked up your gear!") + to_chat(user,span_warning("You've already picked up your gear!")) playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) return 0 if(emagged) audible_message("!'^&YouVE alreaDY pIC&$!Ked UP yOU%r Ge^!ar.") playsound(src, 'sound/machines/buzz-sigh.ogg', 100, 0) return 1 - + // And finally if(allowed(user)) return 1 else - to_chat(user,"Your access is rejected!") + to_chat(user,span_warning("Your access is rejected!")) playsound(src, 'sound/machines/buzz-sigh.ogg', 100, 0) return 0 @@ -239,7 +239,7 @@ var/list/dispenser_presets = list() /obj/machinery/gear_dispenser/proc/dispense(var/datum/gear_disp/S,var/mob/living/carbon/human/user,var/greet=TRUE) if(!S.amount && !(dispenser_flags & GD_UNLIMITED)) - to_chat(user,"There are no more [S.name]s left!") + to_chat(user,span_warning("There are no more [S.name]s left!")) dispenser_flags &= ~GD_BUSY return 1 else if(!(dispenser_flags & GD_UNLIMITED)) @@ -257,13 +257,13 @@ var/list/dispenser_presets = list() var/turf/T = get_turf(src) if(!(S && T)) // in case we got destroyed while we slept return 1 - + S.spawn_gear(T, user) if(emagged) emagged = FALSE if(greet && user && !user.stat) // in case we got destroyed while we slept - to_chat(user,"[S.name] dispensing processed. Have a good day.") + to_chat(user,span_notice("[S.name] dispensing processed. Have a good day.")) /obj/machinery/gear_dispenser/proc/fit_for(var/obj/item/clothing/C, var/mob/living/carbon/human/H) if(!istype(C)) @@ -278,7 +278,7 @@ var/list/dispenser_presets = list() . = ..() if(!emagged) emagged = TRUE - visible_message("\The [user] slides a weird looking ID into \the [src]!","You temporarily short the safety mechanisms.") + visible_message(span_warning("\The [user] slides a weird looking ID into \the [src]!"),span_warning("You temporarily short the safety mechanisms.")) return 1 diff --git a/code/game/objects/effects/alien/alien egg.dm b/code/game/objects/effects/alien/alien egg.dm index 2b980faac7..4a61dfe4d8 100644 --- a/code/game/objects/effects/alien/alien egg.dm +++ b/code/game/objects/effects/alien/alien egg.dm @@ -31,7 +31,7 @@ if(progress >= MAX_PROGRESS) for(var/mob/observer/dead/O) //CHOMPedit fixed the snowflake ghost_pod notification. if(O.client) - to_chat(O, "An alien is ready to hatch! (spawn)") + to_chat(O, span_notice("An alien is ready to hatch! (spawn)")) STOP_PROCESSING(SSobj, src) update_icon() @@ -56,7 +56,7 @@ // Check for bans properly. if(jobban_isbanned(user, MODE_XENOMORPH)) - to_chat(user, "You are banned from playing a Genaprawn.") //CHOMPedit + to_chat(user, span_danger("You are banned from playing a Genaprawn.")) //CHOMPedit return var/confirm = alert(user, "Are you sure you want to join as a Genaprawn larva?", "Become Larva", "No", "Yes") //CHOMPedit @@ -76,7 +76,7 @@ sleep(5) if(!src || !user) - visible_message("\The [src] writhes with internal motion, but nothing comes out.") + visible_message(span_alium("\The [src] writhes with internal motion, but nothing comes out.")) progress = MAX_PROGRESS // Someone else can have a go. return // What a pain. @@ -86,7 +86,7 @@ spawn(-1) if(user) qdel(user) // Remove the keyless ghost if it exists. - visible_message("\The [src] splits open with a wet slithering noise, and \the [larva] writhes free!") + visible_message(span_alium("\The [src] splits open with a wet slithering noise, and \the [larva] writhes free!")) // Turn us into a hatched egg. name = "hatched alien egg" diff --git a/code/game/objects/effects/alien/alien.dm b/code/game/objects/effects/alien/alien.dm index e461cf1e02..c6d001265d 100644 --- a/code/game/objects/effects/alien/alien.dm +++ b/code/game/objects/effects/alien/alien.dm @@ -33,7 +33,7 @@ /obj/structure/alien/hitby(AM as mob|obj) ..() - visible_message("\The [src] was hit by \the [AM].") + visible_message(span_danger("\The [src] was hit by \the [AM].")) var/tforce = 0 if(ismob(AM)) tforce = 10 diff --git a/code/game/objects/effects/alien/aliens.dm b/code/game/objects/effects/alien/aliens.dm index 31ad49c667..58479417f7 100644 --- a/code/game/objects/effects/alien/aliens.dm +++ b/code/game/objects/effects/alien/aliens.dm @@ -228,7 +228,7 @@ /obj/effect/alien/weeds/attack_hand(mob/user as mob) usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if (HULK in usr.mutations) - visible_message("[usr] destroys the [name]!") + visible_message(span_warning("[usr] destroys the [name]!")) health = 0 else @@ -237,7 +237,7 @@ if(user.a_intent == I_HURT) var/mob/living/carbon/M = usr if(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs) - visible_message ("[usr] strokes the [name] and it melts away!", 1) + visible_message (span_warning("[usr] strokes the [name] and it melts away!"), 1) health = 0 healthcheck() return diff --git a/code/game/objects/items/devices/communicator/cartridge.dm b/code/game/objects/items/devices/communicator/cartridge.dm index fd7e1e28e4..f2f426dcd5 100644 --- a/code/game/objects/items/devices/communicator/cartridge.dm +++ b/code/game/objects/items/devices/communicator/cartridge.dm @@ -129,13 +129,13 @@ return if(world.time < internal_data["supply_reqtime"]) - visible_message("[src] flashes, \"[internal_data["supply_reqtime"] - world.time] seconds remaining until another requisition form may be printed.\"") + visible_message(span_warning("[src] flashes, \"[internal_data["supply_reqtime"] - world.time] seconds remaining until another requisition form may be printed.\"")) return var/timeout = world.time + 600 var/reason = sanitize(input(user, "Reason:","Why do you require this item?","") as null|text) if(world.time > timeout) - to_chat(user, "Error. Request timed out.") + to_chat(user, span_warning("Error. Request timed out.")) return if(!reason) return @@ -267,14 +267,14 @@ switch(href_list["send_shuttle"]) if("send_away") if(SSsupply.shuttle.forbidden_atoms_check()) - to_chat(usr, "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.") + to_chat(usr, span_warning("For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.")) else SSsupply.shuttle.launch(src) - to_chat(usr, "Initiating launch sequence.") + to_chat(usr, span_notice("Initiating launch sequence.")) if("send_to_station") SSsupply.shuttle.launch(src) - to_chat(usr, "The supply shuttle has been called and will arrive in approximately [round(SSsupply.movetime/600,1)] minutes.") + to_chat(usr, span_notice("The supply shuttle has been called and will arrive in approximately [round(SSsupply.movetime/600,1)] minutes.")) if("cancel_shuttle") SSsupply.shuttle.cancel_launch(src) diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm index 91da955297..2441bda8b8 100644 --- a/code/game/objects/items/devices/communicator/communicator.dm +++ b/code/game/objects/items/devices/communicator/communicator.dm @@ -128,7 +128,7 @@ var/global/list/obj/item/communicator/all_communicators = list() if(id) remove_id() else - to_chat(usr, "This Communicator does not have an ID in it.") + to_chat(usr, span_notice("This Communicator does not have an ID in it.")) // Proc: GetAccess() // Parameters: None // Description: Returns the access level of the communicator's ID, if it has one. If the communicator does not have an ID, the procedure returns the @@ -155,7 +155,7 @@ var/global/list/obj/item/communicator/all_communicators = list() if (ismob(loc)) var/mob/M = loc M.put_in_hands(id) - to_chat(M, "You remove the ID from the [name].") //ChompEDIT usr --> M + to_chat(M, span_notice("You remove the ID from the [name].")) //ChompEDIT usr --> M playsound(src, 'sound/machines/id_swipe.ogg', 100, 1) else id.loc = get_turf(src) diff --git a/code/game/objects/items/devices/communicator/helper.dm b/code/game/objects/items/devices/communicator/helper.dm index 71857f0268..73719417f6 100644 --- a/code/game/objects/items/devices/communicator/helper.dm +++ b/code/game/objects/items/devices/communicator/helper.dm @@ -178,21 +178,21 @@ // If it's turned off, then it shouldn't be broadcasting any further info if(!S.on) - status[++status.len] = list("tab" = "Power", "val" = "Off") // Encoding the span classes here so I don't have to do complicated switches in the ui template + status[++status.len] = list("tab" = "Power", "val" = span_red("Off")) // Encoding the span classes here so I don't have to do complicated switches in the ui template continue - status[++status.len] = list("tab" = "Power", "val" = "On") + status[++status.len] = list("tab" = "Power", "val" = span_green("On")) // -- What it's doing // If it's engaged, then say who it thinks it's engaging if(S.target) - status[++status.len] = list("tab" = "Status", "val" = "Apprehending Target") + status[++status.len] = list("tab" = "Status", "val" = span_red("Apprehending Target")) status[++status.len] = list("tab" = "Target", "val" = S.target_name(S.target)) // Else if it's patrolling else if(S.will_patrol) - status[++status.len] = list("tab" = "Status", "val" = "Patrolling") + status[++status.len] = list("tab" = "Status", "val" = span_green("Patrolling")) // Otherwise we don't know what it's doing else - status[++status.len] = list("tab" = "Status", "val" = "Idle") + status[++status.len] = list("tab" = "Status", "val" = span_yellow("Idle")) // Where it is status[++status.len] = list("tab" = "Location", "val" = sanitize("[get_area(S.loc)]")) @@ -260,13 +260,13 @@ var/list/focus = S.return_reading_data() // Packages the span class here so it doesn't need to be interpreted w/in the for loop in the ui template - var/load_stat = "Optimal" + var/load_stat = span_green("Optimal") if(focus["load_percentage"] >= 95) - load_stat = "DANGER: Overload" + load_stat = span_red("DANGER: Overload") else if(focus["load_percentage"] >= 85) - load_stat = "WARNING: High Load" + load_stat = span_yellow("WARNING: High Load") - var/alarm_stat = focus["alarm"] ? "WARNING: Abnormal activity detected!" : "Secure" + var/alarm_stat = focus["alarm"] ? span_red("WARNING: Abnormal activity detected!") : span_green("Secure") if(target_sensor == S.name_tag) powernet_target = list( @@ -297,9 +297,9 @@ // User's location var/turf/userloc = get_turf(src) if(isturf(userloc)) - janidata[++janidata.len] = list("field" = "Current Location", "val" = "[userloc.x], [userloc.y], [using_map.get_zlevel_name(userloc.z)]") + janidata[++janidata.len] = list("field" = "Current Location", "val" = span_green("[userloc.x], [userloc.y], [using_map.get_zlevel_name(userloc.z)]")) else - janidata[++janidata.len] = list("field" = "Current Location", "val" = "Unknown") + janidata[++janidata.len] = list("field" = "Current Location", "val" = span_red("Unknown")) return janidata // If the user isn't on a valid turf, then it shouldn't be able to find anything anyways // Mops, mop buckets, janitorial carts. @@ -307,9 +307,9 @@ var/turf/T = get_turf(C) if(isturf(T) )//&& T.z in using_map.get_map_levels(userloc, FALSE)) if(T.z == userloc.z) - janidata[++janidata.len] = list("field" = apply_text_macros("\proper [C.name]"), "val" = "[T.x], [T.y], [using_map.get_zlevel_name(T.z)]") + janidata[++janidata.len] = list("field" = apply_text_macros("\proper [C.name]"), "val" = span_green("[T.x], [T.y], [using_map.get_zlevel_name(T.z)]")) else - janidata[++janidata.len] = list("field" = apply_text_macros("\proper [C.name]"), "val" = "[T.x], [T.y], [using_map.get_zlevel_name(T.z)]") + janidata[++janidata.len] = list("field" = apply_text_macros("\proper [C.name]"), "val" = span_yellow("[T.x], [T.y], [using_map.get_zlevel_name(T.z)]")) // Cleanbots for(var/mob/living/bot/cleanbot/B in living_mob_list) @@ -319,9 +319,9 @@ if(B.on) textout += "Status: Online
" if(T.z == userloc.z) - textout += "[T.x], [T.y], [using_map.get_zlevel_name(T.z)]" + textout += span_green("[T.x], [T.y], [using_map.get_zlevel_name(T.z)]") else - textout += "[T.x], [T.y], [using_map.get_zlevel_name(T.z)]" + textout += span_yellow("[T.x], [T.y], [using_map.get_zlevel_name(T.z)]") else textout += "Status: Offline" diff --git a/code/game/objects/items/devices/geiger_yw.dm b/code/game/objects/items/devices/geiger_yw.dm index ed89b4313a..4cb9d51c1e 100644 --- a/code/game/objects/items/devices/geiger_yw.dm +++ b/code/game/objects/items/devices/geiger_yw.dm @@ -39,7 +39,7 @@ /obj/item/geiger/wall/examine(mob/user) ..(user) get_radiation() - to_chat(user, "[scanning ? "Ambient" : "Stored"] radiation level: [radiation_count ? radiation_count : "0"]Bq.") + to_chat(user, span_warning("[scanning ? "Ambient" : "Stored"] radiation level: [radiation_count ? radiation_count : "0"]Bq.")) /obj/item/geiger/wall/rad_act(amount) if(!amount || !scanning) @@ -56,7 +56,7 @@ scanning = !scanning update_icon() update_sound() - to_chat(user, "[icon2html(src,user.client)] You switch [scanning ? "on" : "off"] \the [src].") + to_chat(user, span_notice("[icon2html(src,user.client)] You switch [scanning ? "on" : "off"] \the [src].")) /obj/item/geiger/wall/update_icon() if(!scanning) diff --git a/code/game/objects/items/devices/personal_shield_generator_vr.dm b/code/game/objects/items/devices/personal_shield_generator_vr.dm index c9bd593405..25ebc0c3e1 100644 --- a/code/game/objects/items/devices/personal_shield_generator_vr.dm +++ b/code/game/objects/items/devices/personal_shield_generator_vr.dm @@ -182,7 +182,7 @@ else if(W.has_tool_quality(TOOL_SCREWDRIVER)) if(bcell) if(istype(bcell, /obj/item/cell/device/shield_generator/parry)) //CHOMPedit: Cannot remove the cell from Parry shields. - to_chat(user,"You cannot remove the cell from this device.") //CHOMPedit: No cell removal. + to_chat(user,span_notice("You cannot remove the cell from this device.")) //CHOMPedit: No cell removal. return //CHOMPedit: No cell removal. if(istype(bcell, /obj/item/cell/device/shield_generator)) //No stealing self charging batteries! var/choice = tgui_alert(user, "A popup appears on the device 'REMOVING THE INTERNAL CELL WILL DESTROY THE BATTERY. DO YOU WISH TO CONTINUE?'...Well, do you?", "Selection List", list("Cancel", "Remove")) diff --git a/code/game/objects/items/devices/tvcamera.dm b/code/game/objects/items/devices/tvcamera.dm index a68cdaf958..04cb35e412 100644 --- a/code/game/objects/items/devices/tvcamera.dm +++ b/code/game/objects/items/devices/tvcamera.dm @@ -238,19 +238,19 @@ if(nc) channel = nc bcamera.c_tag = channel - to_chat(usr, "New channel name - '[channel]' is set") + to_chat(usr, span_notice("New channel name - '[channel]' is set")) if(href_list["video"]) bcamera.set_status(!bcamera.status) var/turf/here = get_turf(usr) if(bcamera.status) - to_chat(usr,"Video streaming activated. Broadcasting on channel '[channel]'") + to_chat(usr,span_notice("Video streaming activated. Broadcasting on channel '[channel]'")) if(here) - here.visible_message("[usr] turns on their body camera.") + here.visible_message(span_notice("[usr] turns on their body camera.")) show_bodycamera_tvs(loc) else - to_chat(usr,"Video streaming deactivated.") + to_chat(usr,span_notice("Video streaming deactivated.")) if(here) - here.visible_message("[usr] turns off their body camera!") + here.visible_message(span_warning("[usr] turns off their body camera!")) hide_bodycamera_tvs() for(var/obj/machinery/computer/security/telescreen/bodycamera/ES as anything in GLOB.bodycamera_screens) ES.stop_showing() @@ -258,9 +258,9 @@ if(href_list["sound"]) bradio.ToggleBroadcast() if(bradio.broadcasting) - to_chat(usr,"Audio streaming activated. Broadcasting on frequency [format_frequency(bradio.frequency)].") + to_chat(usr,span_notice("Audio streaming activated. Broadcasting on frequency [format_frequency(bradio.frequency)].")) else - to_chat(usr,"Audio streaming deactivated.") + to_chat(usr,span_notice("Audio streaming deactivated.")) if(!href_list["close"]) attack_self(usr) diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm index 47687123db..12816c6736 100644 --- a/code/game/objects/items/glassjar.dm +++ b/code/game/objects/items/glassjar.dm @@ -76,8 +76,8 @@ if(istype(M,/mob/living/voice)) //Don't knock voices out! continue M.forceMove(get_turf(user)) - to_chat(M, "[user] shakes you out of \the [src]!") - to_chat(user, "You shake [M] out of \the [src]!") + to_chat(M, span_warning("[user] shakes you out of \the [src]!")) + to_chat(user, span_notice("You shake [M] out of \the [src]!")) //CHOMPADD END /obj/item/glass_jar/attackby(var/obj/item/W, var/mob/user) if(istype(W, /obj/item/spacecash)) @@ -98,15 +98,15 @@ continue full++ if(full >= 2) - to_chat(user, "You can't fit anyone else into \the [src]!") + to_chat(user, span_warning("You can't fit anyone else into \the [src]!")) else var/obj/item/holder/micro/holder = W if(holder.held_mob && (holder.held_mob in holder)) var/mob/living/M = holder.held_mob holder.dump_mob() - to_chat(M, "[user] stuffs you into \the [src]!") + to_chat(M, span_warning("[user] stuffs you into \the [src]!")) M.forceMove(src) - to_chat(user, "You stuff \the [M] into \the [src]!") + to_chat(user, span_notice("You stuff \the [M] into \the [src]!")) //CHOMPADD END /obj/item/glass_jar/update_icon() // Also updates name and desc underlays.Cut() diff --git a/code/game/objects/items/weapons/lego.dm b/code/game/objects/items/weapons/lego.dm index 2215d1e783..e7b009d655 100644 --- a/code/game/objects/items/weapons/lego.dm +++ b/code/game/objects/items/weapons/lego.dm @@ -19,9 +19,9 @@ var/mob/living/L = AM if(L.m_intent == "run") L.visible_message( - "[L] steps on \the [src].", - "You step on \the [src], you poor bastard!", - "You hear the sound of immeasurable suffering!" + span_danger("[L] steps on \the [src]."), + span_danger("You step on \the [src], you poor bastard!"), + span_hear(span_bold("You hear the sound of immeasurable suffering!")) ) L.adjustHalLoss(100) playsound(src, 'sound/misc/legodeath.ogg', 50, 1) @@ -49,9 +49,9 @@ var/mob/living/L = AM if(L.m_intent == "run") L.visible_message( - "[L] steps on \the [src].", - "You step on \the [src], you poor bastard!", - "You hear the sound of immeasurable suffering!" + span_danger("[L] steps on \the [src]."), + span_danger("You step on \the [src], you poor bastard!"), + span_hear(span_bold("You hear the sound of immeasurable suffering!")) ) L.gib() playsound(src, 'sound/misc/legodeath.ogg', 50, 1) diff --git a/code/game/objects/items/weapons/shields_yw.dm b/code/game/objects/items/weapons/shields_yw.dm index dabe2272e9..6592bc4f28 100644 --- a/code/game/objects/items/weapons/shields_yw.dm +++ b/code/game/objects/items/weapons/shields_yw.dm @@ -28,14 +28,14 @@ obj/item/shield/riot/stun throw_speed = 2 w_class = ITEMSIZE_LARGE slot_flags = SLOT_BACK - user << "You extend \the [src]." + user << span_notice("You extend \the [src].") else force = 3 throwforce = 3 throw_speed = 3 w_class = ITEMSIZE_NORMAL slot_flags = null - user << "[src] can now be concealed." + user << span_notice("[src] can now be concealed.") if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user @@ -44,4 +44,3 @@ obj/item/shield/riot/stun add_fingerprint(user) return - diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 1046f9115f..18d3e790a1 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -484,7 +484,7 @@ //CHOMPEdit - Getting around to proper object flags if(HAS_TRAIT(W, TRAIT_NODROP)) //SHOULD be handled in unEquip, but better safe than sorry. if(!stop_messages) - to_chat(usr, "\the [W] is stuck to your hand, you can't put it in \the [src]!") + to_chat(usr, span_warning("\the [W] is stuck to your hand, you can't put it in \the [src]!")) return FALSE return 1 diff --git a/code/game/objects/items_vr.dm b/code/game/objects/items_vr.dm index 800ee34492..588fa6d508 100644 --- a/code/game/objects/items_vr.dm +++ b/code/game/objects/items_vr.dm @@ -32,9 +32,9 @@ new_voice.item_tf = is_item_tf // allows items to use /me new_voice.emote_type = 1 if(istype(src, /obj/item/mindbinder)) - to_chat(new_voice,"Your mind has been stored in [src]!") + to_chat(new_voice,span_notice("Your mind has been stored in [src]!")) else - to_chat(new_voice,"You have become [src]!") + to_chat(new_voice,span_notice("You have become [src]!")) //CHOMPEdit End // Chomp edit diff --git a/code/game/objects/kasscbuttons_ch.dm b/code/game/objects/kasscbuttons_ch.dm index 14565f6d13..9a84578cca 100644 --- a/code/game/objects/kasscbuttons_ch.dm +++ b/code/game/objects/kasscbuttons_ch.dm @@ -228,4 +228,4 @@ return FALSE //Corresponding closet for example button /obj/structure/closet/button_example - trigger_uid = 97482 \ No newline at end of file + trigger_uid = 97482 diff --git a/code/game/objects/structures/fitness.dm b/code/game/objects/structures/fitness.dm index 21c063d6d4..7018498747 100644 --- a/code/game/objects/structures/fitness.dm +++ b/code/game/objects/structures/fitness.dm @@ -52,7 +52,7 @@ to_chat(user, span_warning("You need more energy to lift weights. Go eat something.")) return if(user.weight < 70) //CHOMPAdd Begin Add weight loss to old fitness equipment - to_chat(user, "You're too skinny to risk losing any more weight!") + to_chat(user, span_notice("You're too skinny to risk losing any more weight!")) return //CHOMPAdd End if(being_used) to_chat(user, span_warning("The weight machine is already in use by somebody else.")) diff --git a/code/game/objects/structures/simple_doors.dm b/code/game/objects/structures/simple_doors.dm index 9f3274c7b7..c84bd6e96b 100644 --- a/code/game/objects/structures/simple_doors.dm +++ b/code/game/objects/structures/simple_doors.dm @@ -291,7 +291,7 @@ /obj/structure/simple_door/resin/attack_hand(mob/user as mob) usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if (HULK in usr.mutations) - visible_message("[usr] destroys the [name]!") + visible_message(span_warning("[usr] destroys the [name]!")) hardness = 0 else @@ -300,16 +300,16 @@ if(user.a_intent == I_HURT) var/mob/living/carbon/M = usr if(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs) - visible_message ("[usr] strokes the [name] and it melts away!", 1) + visible_message (span_warning("[usr] strokes the [name] and it melts away!"), 1) hardness = 0 CheckHardness() return else - visible_message("[usr] tears at the [name]!") + visible_message(span_warning("[usr] tears at the [name]!")) hardness -= 2 CheckHardness() return CheckHardness() TryToSwitchState(user) return -// CHOMPedit end. \ No newline at end of file +// CHOMPedit end. diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index 61b85ceab9..2af7d1eb65 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -92,7 +92,7 @@ /obj/structure/bed/nest/attack_hand(mob/user as mob) usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if (HULK in usr.mutations) - visible_message("[usr] destroys the [name]!") + visible_message(span_warning("[usr] destroys the [name]!")) health = 0 else @@ -101,10 +101,10 @@ if(user.a_intent == I_HURT) var/mob/living/carbon/M = usr if(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs) - visible_message ("[usr] strokes the [name] and it melts away!", 1) + visible_message (span_warning("[usr] strokes the [name] and it melts away!"), 1) health = 0 healthcheck() return healthcheck() return -// CHOMPedit end. \ No newline at end of file +// CHOMPedit end. diff --git a/code/game/turfs/simulated/water_yw.dm b/code/game/turfs/simulated/water_yw.dm index 47d86127b3..69c4161363 100644 --- a/code/game/turfs/simulated/water_yw.dm +++ b/code/game/turfs/simulated/water_yw.dm @@ -14,6 +14,6 @@ if(L.check_submerged() <= 0) return if(!istype(oldloc, /turf/simulated/floor/water/hotspring)) - to_chat(L, "You feel an overwhelming wave of warmth from entering \the [src]!") + to_chat(L, span_warning("You feel an overwhelming wave of warmth from entering \the [src]!")) AM.water_act(5) ..() diff --git a/code/modules/Phorochemistry/electrical_field.dm b/code/modules/Phorochemistry/electrical_field.dm index 2599ff74d2..b77a43e1aa 100644 --- a/code/modules/Phorochemistry/electrical_field.dm +++ b/code/modules/Phorochemistry/electrical_field.dm @@ -19,7 +19,7 @@ for(var/datum/reagent/phororeagent/R in L.reagents.reagent_list) if(R.id == "fulguracin") if(prob(20)) - L << "Your hairs stand up, but you resist the shock for the most part." + L << span_notice("Your hairs stand up, but you resist the shock for the most part.") return //no shock for you if(L.stat != DEAD) @@ -64,4 +64,4 @@ for(var/j = src.y - 1 to src.y + 1) T = locate(i, j, z) for(var/mob/living/L in T.contents) //only the middle X 9 - shock(L) \ No newline at end of file + shock(L) diff --git a/code/modules/Phorochemistry/phorochemheat.dm b/code/modules/Phorochemistry/phorochemheat.dm index a18a4b6373..55b461efe6 100644 --- a/code/modules/Phorochemistry/phorochemheat.dm +++ b/code/modules/Phorochemistry/phorochemheat.dm @@ -94,19 +94,19 @@ /obj/machinery/bunsen_burner/attackby(obj/item/W as obj, mob/user as mob) if(istype(W, /obj/item/reagent_containers)) if(held_container) - user << "You must remove the [held_container] first." + user << span_warning("You must remove the [held_container] first.") else user.drop_item(src) held_container = W held_container.loc = src - user << "You put the [held_container] onto the [src]." + user << span_notice("You put the [held_container] onto the [src].") var/image/I = image("icon"=W, "layer"=FLOAT_LAYER) underlays += I if(heating) spawn(heat_time) try_heating() else - user << "You can't put the [W] onto the [src]." + user << span_warning("You can't put the [W] onto the [src].") /obj/machinery/bunsen_burner/attack_ai() return @@ -114,15 +114,15 @@ /obj/machinery/bunsen_burner/attack_hand(mob/user as mob) if(held_container) underlays = null - user << "You remove the [held_container] from the [src]." + user << span_notice("You remove the [held_container] from the [src].") held_container.loc = src.loc held_container.attack_hand(user) held_container = null else - user << "There is nothing on the [src]." + user << span_warning("There is nothing on the [src].") /obj/machinery/bunsen_burner/proc/try_heating() - src.visible_message(" icon[src] [src] hisses.") + src.visible_message(span_notice(" icon[src] [src] hisses.")) if(held_container && heating) heated = 1 held_container.reagents.handle_reactions() diff --git a/code/modules/Phorochemistry/phororeagent.dm b/code/modules/Phorochemistry/phororeagent.dm index a628612b97..e0e6f1abab 100644 --- a/code/modules/Phorochemistry/phororeagent.dm +++ b/code/modules/Phorochemistry/phororeagent.dm @@ -140,9 +140,9 @@ var/induromol_code = rand(1, 50) protection.explanation_text = span_darkpink("Protect [love_name] at all costs") M.mind.objectives.Add(protection) var/obj_count = 1 - to_chat(M, "Your current objectives:") + to_chat(M, span_notice("Your current objectives:")) for(var/datum/objective/objective in M.mind.objectives) - to_chat(M, "Objective #[obj_count]: [objective.explanation_text]") + to_chat(M, span_bold("Objective #[obj_count]") + ": [objective.explanation_text]") obj_count++ to_chat(M, "
)") @@ -192,9 +192,9 @@ var/induromol_code = rand(1, 50) if(findtext(O.explanation_text, "Protect [love_name] at all costs")) M.mind.objectives.Remove(O) var/obj_count = 1 - to_chat(M, "Your current objectives:") + to_chat(M, span_notice("Your current objectives:")) for(var/datum/objective/objective in M.mind.objectives) - to_chat(M, "Objective #[obj_count]: [objective.explanation_text]") + to_chat(M, span_bold("Objective #[obj_count]") + ": [objective.explanation_text]") obj_count++ to_chat(M, "
") @@ -206,9 +206,9 @@ var/induromol_code = rand(1, 50) if(findtext(O.explanation_text, "Protect [love_name] at all costs")) M.mind.objectives.Remove(O) var/obj_count = 1 - to_chat(M, "Your current objectives:") + to_chat(M, span_notice("Your current objectives:")) for(var/datum/objective/objective in M.mind.objectives) - to_chat(M, "Objective #[obj_count]: [objective.explanation_text]") + to_chat(M, span_bold("Objective #[obj_count]") + ": [objective.explanation_text]") obj_count++ to_chat(M, "
") @@ -227,19 +227,19 @@ var/induromol_code = rand(1, 50) /datum/reagent/phororeagent/nasty/touch_mob(var/mob/M, var/volume) if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M - H << "You are so repulsed by the liquid splashed on you that you feel like puking" + H << span_warning("You are so repulsed by the liquid splashed on you that you feel like puking") // H.vomit() not fast enough src = null spawn(0) if(!H.lastpuke) H.lastpuke = 1 - H << "You feel nauseous..." + H << span_warning("You feel nauseous...") spawn(10) //1 second until second warning - H << "You feel like you are about to throw up!" + H << span_warning("You feel like you are about to throw up!") spawn(20) //and you have 2 more to escape H.Stun(8) - H.visible_message("[H] throws up!","You throw up!") + H.visible_message(span_warning("[H] throws up!"),span_warning("You throw up!")) playsound(H.loc, 'sound/effects/splat.ogg', 50, 1) var/turf/location = H.loc @@ -270,20 +270,20 @@ var/induromol_code = rand(1, 50) src = null for(var/mob/living/carbon/human/H in viewers(T, 7)) if(H == immune) - H << "You are absolutely disgusted, but you hold your stomach contents in." + H << span_notice("You are absolutely disgusted, but you hold your stomach contents in.") continue - H << "You are so disgusted by what looks like spilled vomit you might throw up!" + H << span_warning("You are so disgusted by what looks like spilled vomit you might throw up!") // H.vomit() not fast enough spawn(0) if(!H.lastpuke) H.lastpuke = 1 - H << "You feel nauseous..." + H << span_warning("You feel nauseous...") spawn(50) //5 seconds until second warning - H << "You feel like you are about to throw up!" + H << span_warning("You feel like you are about to throw up!") spawn(50) //and you have 5 more for mad dash to the bucket H.Stun(5) - H.visible_message("[H] throws up!","You throw up!") + H.visible_message(span_warning("[H] throws up!"),span_warning("You throw up!")) playsound(H.loc, 'sound/effects/splat.ogg', 50, 1) var/turf/location = H.loc @@ -298,7 +298,7 @@ var/induromol_code = rand(1, 50) /datum/reagent/phororeagent/nasty/initial_reaction(var/obj/item/reagent_containers/container, var/turf/T, var/volume, var/message) for(var/mob/living/carbon/human/H in viewers(T, 7)) - H << "There is something about the reagent from the telepad you find absolutely repulsive." + H << span_warning("There is something about the reagent from the telepad you find absolutely repulsive.") H.vomit() return ..() @@ -317,7 +317,7 @@ var/induromol_code = rand(1, 50) if(istype(A, /mob/living)) var/mob/living/M = A M.universal_understand = 0 - to_chat(M, "You no longer feel attuned to the spoken word.") + to_chat(M, span_warning("You no longer feel attuned to the spoken word.")) /datum/reagent/phororeagent/babelizine/on_mob_death(var/mob/M) holder.remove_reagent(src.id, src.volume) @@ -342,7 +342,7 @@ var/induromol_code = rand(1, 50) bone.status &= ~ORGAN_BROKEN // bone.perma_injury = 0 Not sure what Polaris equivalent is or why this was necessary H.visible_message( - "You hear a loud crack as [H.name]'s [bone.name] appears to heal miraculously.") + span_notice("You hear a loud crack as [H.name]'s [bone.name] appears to heal miraculously.")) holder.remove_reagent(src.id, 12) ..() @@ -410,13 +410,13 @@ var/induromol_code = rand(1, 50) if(istype(M, /mob/living/silicon)) var/mob/living/silicon/S = M S.take_organ_damage(0, volume/2, emp = 1) - S << "Some of your systems report damage as a result of the liquid." + S << span_notice("Some of your systems report damage as a result of the liquid.") else if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(H.isSynthetic()) H.take_overall_damage(0, volume/2) - H << "Some of your systems report damage as a result of the liquid." + H << span_notice("Some of your systems report damage as a result of the liquid.") //implementation also in power.dm and electrical_field.dm /datum/reagent/phororeagent/mortemol @@ -440,7 +440,7 @@ var/induromol_code = rand(1, 50) C.reagents.add_reagent(id, volume, data) C.rejuvenate() C.rejuvenate() //I like C.rejuvenate() - C.visible_message("[C] seems to wake from the dead!") + C.visible_message(span_notice("[C] seems to wake from the dead!")) else C.reagents.add_reagent(id, volume) @@ -455,7 +455,7 @@ var/induromol_code = rand(1, 50) if(data[1]) if(istype(A, /mob)) var/mob/M = A - to_chat(M, "You feel the last traces of chemicals leave your body as you return to death once more...") + to_chat(M, span_notice("You feel the last traces of chemicals leave your body as you return to death once more...")) M.death(0) //Reagent giveth, and reagent taketh away @@ -468,7 +468,7 @@ var/induromol_code = rand(1, 50) data[1] = 1 C.rejuvenate() C.rejuvenate() //Necessary to call twice in testing - C.visible_message("[C] seems to wake from the dead!") + C.visible_message(span_notice("[C] seems to wake from the dead!")) /datum/reagent/phororeagent/tegoxane id = "tegoxane" @@ -500,14 +500,14 @@ var/induromol_code = rand(1, 50) H.f_style = "Shaved" if(!M.digitalcamo) - to_chat(M, "Your skin starts to feel strange") + to_chat(M, span_notice("Your skin starts to feel strange")) M.digitalcamo = 1 return ..() /datum/reagent/phororeagent/tegoxane/on_remove(var/atom/A) if(istype(A, /mob)) var/mob/M = A - to_chat(M, "Your skin feels normal again") + to_chat(M, span_notice("Your skin feels normal again")) M.digitalcamo = 0 M.icon = saved_icon if(istype(M, /mob/living/carbon/human)) @@ -546,7 +546,7 @@ var/induromol_code = rand(1, 50) if(ishuman(M)) var/mob/living/carbon/human/H = M - H.visible_message("[H] throws up!","You throw up!") + H.visible_message(span_warning("[H] throws up!"),span_warning("You throw up!")) playsound(H.loc, 'sound/effects/splat.ogg', 50, 1) var/turf/location = H.loc @@ -580,7 +580,7 @@ var/induromol_code = rand(1, 50) if(eyes.status & ORGAN_ROBOT) return ..() - to_chat(M, "You blink and your eyes quickly adapt to enhanced function.") + to_chat(M, span_notice("You blink and your eyes quickly adapt to enhanced function.")) M.client.view = 10 return ..() @@ -593,7 +593,7 @@ var/induromol_code = rand(1, 50) if(H.get_species() == SPECIES_PROMETHEAN) if(M.client) M.client.view = 7 - to_chat(M, "After a few blinks, you realize the Oculusosone has worn off.") + to_chat(M, span_notice("After a few blinks, you realize the Oculusosone has worn off.")) return ..() var/obj/item/organ/eyes = H.internal_organs_by_name["eyes"] if(eyes.status & ORGAN_ROBOT) @@ -601,7 +601,7 @@ var/induromol_code = rand(1, 50) if(M.client) M.client.view = 7 - to_chat(M, "After a few blinks, you realize the Oculusosone has worn off.") + to_chat(M, span_notice("After a few blinks, you realize the Oculusosone has worn off.")) return ..() ////////////////////////////////////////////////////////////////////////////////// @@ -614,7 +614,7 @@ var/induromol_code = rand(1, 50) //doesn't do anything, I just like people trying to procure a corpse to test it -DrBrock /datum/reagent/phororeagent/destitutionecam/touch_mob(var/mob/M, var/volume) if(M.stat == 2) - usr << "Absolutely nothing happens. You feel disappointed." + usr << span_notice("Absolutely nothing happens. You feel disappointed.") return ..() /datum/reagent/phororeagent/sapoformator @@ -643,7 +643,7 @@ var/induromol_code = rand(1, 50) src = null if(volume >= 25) - usr << "The solution begins to fizzle." + usr << span_notice("The solution begins to fizzle.") playsound(T, 'sound/effects/bamf.ogg', 50, 1) var/datum/reagents/cleaner = new() cleaner.my_atom = T @@ -677,7 +677,7 @@ var/induromol_code = rand(1, 50) volume -= 20 else - usr << "The solution does not appear to have enough mass to react." + usr << span_notice("The solution does not appear to have enough mass to react.") /datum/reagent/phororeagent/rad_x id = "rad_x" @@ -704,7 +704,7 @@ var/induromol_code = rand(1, 50) /datum/reagent/phororeagent/caloran/on_mob_life(var/mob/living/M as mob, var/alien) if(volume >= 2) if(burn == -1) - to_chat(M, "You feel your skin painfully harden.") + to_chat(M, span_notice("You feel your skin painfully harden.")) M.take_overall_damage(20, 0) burn = M.getFireLoss() else @@ -717,7 +717,7 @@ var/induromol_code = rand(1, 50) /datum/reagent/phororeagent/caloran/on_remove(var/atom/A) if(istype(A, /mob)) var/mob/M = A - to_chat(M, "Your skin returns to normal, no longer desensitized to extreme heat.") + to_chat(M, span_notice("Your skin returns to normal, no longer desensitized to extreme heat.")) return ..() /datum/reagent/phororeagent/the_stuff @@ -730,7 +730,7 @@ var/induromol_code = rand(1, 50) /datum/reagent/phororeagent/the_stuff/on_mob_life(var/mob/living/M as mob, var/alien) if(!init) - to_chat(M, "You start tripping balls.") + to_chat(M, span_warning("You start tripping balls.")) init = 1 var/drugs = list("space_drugs", "serotrotium", "psilocybin", "nuka_cola", "atomicbomb", "hippiesdelight") for(var/drug in drugs) @@ -746,7 +746,7 @@ var/induromol_code = rand(1, 50) /datum/reagent/phororeagent/frioline/on_mob_life(var/mob/living/M as mob, var/alien) if(M.bodytemperature > 310) - to_chat(M, "You suddenly feel very cold.") + to_chat(M, span_notice("You suddenly feel very cold.")) M.bodytemperature = max(165, M.bodytemperature - 30) return ..() @@ -778,15 +778,15 @@ var/induromol_code = rand(1, 50) var/mob/living/L = M var/burned = L.getFireLoss() > 0 if(burned) - L << "In a strange sensation, you feel some burns stop hurting." + L << span_notice("In a strange sensation, you feel some burns stop hurting.") L.heal_organ_damage(0, min(15, volume / 4)) if (mFingerprints in L.mutations) if(!burned) - L << "Another application of the substance does nothing weird to your hands." + L << span_warning("Another application of the substance does nothing weird to your hands.") else L.mutations.Add(mFingerprints) - L << "Your fingers feel strange after the substance splashes on your hands." + L << span_notice("Your fingers feel strange after the substance splashes on your hands.") return ..() /datum/reagent/phororeagent/energized_phoron @@ -900,10 +900,10 @@ var/induromol_code = rand(1, 50) if(world.time - initial_time >= 30) //three second startup lag if(!metabolism) metabolism = 1 - to_chat(M, "You begin to feel transcendental.") + to_chat(M, span_notice("You begin to feel transcendental.")) if(M.z > 5 || M.z == 2 || M.z < 1) //no centcomm teleport, also not dealing with other unknown sectors - to_chat(M, "You feel the bluespace leave your body on this sector, nothing happens.") + to_chat(M, span_warning("You feel the bluespace leave your body on this sector, nothing happens.")) src = null return @@ -982,7 +982,7 @@ var/induromol_code = rand(1, 50) if(istype(L, /mob/living/carbon/human)) var/mob/living/carbon/human/H = L if(!gaseous_reagent_check(H) && H.stat != 2) //protective clothing and living check - H <<"You realize you probably should have worn some safety equipment around dangerous chemicals." + H << span_boldwarning("You realize you probably should have worn some safety equipment around dangerous chemicals.") H.death(0) else if(!istype(L, /mob/living/silicon)) L.death(0) @@ -994,7 +994,7 @@ var/induromol_code = rand(1, 50) if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(!gaseous_reagent_check(H) && H.stat != 2) //protective clothing and living check - H <<"You realize you probably should have worn some safety equipment around dangerous chemicals." + H << span_boldwarning("You realize you probably should have worn some safety equipment around dangerous chemicals.") H.death(0) else if(!istype(M, /mob/living/silicon)) M.death(0) @@ -1017,7 +1017,7 @@ var/induromol_code = rand(1, 50) var/obj/item/organ/eyes = H.internal_organs_by_name["eyes"] if(!(eyes.status & ORGAN_ROBOT)) eyes.take_damage(50) - H << "The gas stings your eyes like you have never felt before!" + H << span_boldwarning("The gas stings your eyes like you have never felt before!") else if(!istype(L, /mob/living/silicon)) L.eye_blind = 500 @@ -1032,7 +1032,7 @@ var/induromol_code = rand(1, 50) var/obj/item/organ/eyes = H.internal_organs_by_name["eyes"] if(!(eyes.status & ORGAN_ROBOT)) eyes.take_damage(50) - H << "The gas stings your eyes like you have never felt before!" + H << span_boldwarning("The gas stings your eyes like you have never felt before!") else if(!istype(M, /mob/living/silicon)) M.eye_blind = 500 src = null*/ diff --git a/code/modules/admin/verbs/smite.dm b/code/modules/admin/verbs/smite.dm index 4aecc20a7b..2c2928b702 100644 --- a/code/modules/admin/verbs/smite.dm +++ b/code/modules/admin/verbs/smite.dm @@ -180,10 +180,10 @@ new/obj/effect/decal/cleanable/pie_smudge(get_turf(target)) playsound(target, 'sound/effects/slime_squish.ogg', 100, 1, get_rand_frequency(), falloff = 5) target.Weaken(1) - target.visible_message("[target] is struck by pie!") + target.visible_message(span_danger("[target] is struck by pie!")) if(SMITE_SPICE) //CHOMP Add - to_chat(target, "Spice spice baby!") + to_chat(target, span_warning("Spice spice baby!")) target.eye_blurry = max(target.eye_blurry, 25) target.Blind(10) target.Stun(5) diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 822c92c970..fcdb30e510 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -722,7 +722,7 @@ /client/proc/check_panel_loaded() if(stat_panel && stat_panel.is_ready()) return - to_chat(src, "Statpanel failed to load, click here to reload the panel. If this does not work, reconnecting will reassign a new panel.") + to_chat(src, span_danger("Statpanel failed to load, click here to reload the panel. If this does not work, reconnecting will reassign a new panel.")) /** * Handles incoming messages from the stat-panel TGUI. diff --git a/code/modules/client/preference_setup/vore/02_size.dm b/code/modules/client/preference_setup/vore/02_size.dm index d454d28aa8..8d2b9c8193 100644 --- a/code/modules/client/preference_setup/vore/02_size.dm +++ b/code/modules/client/preference_setup/vore/02_size.dm @@ -322,7 +322,7 @@ oursound = get_species_sound(select_default_species_sound(pref))["cough"] S = sound(pick(oursound)) if(pref.species_sound == "None" || oursound == null) - to_chat(user, "This set does not have cough sounds!") + to_chat(user, span_warning("This set does not have cough sounds!")) return TOPIC_REFRESH S.frequency = pick(pref.voice_freq) S.volume = 20 @@ -337,7 +337,7 @@ oursound = get_species_sound(select_default_species_sound(pref))["sneeze"] S = sound(pick(oursound)) if(pref.species_sound == "None" || oursound == null) - to_chat(user, "This set does not have sneeze sounds!") + to_chat(user, span_warning("This set does not have sneeze sounds!")) return TOPIC_REFRESH S.frequency = pick(pref.voice_freq) S.volume = 20 @@ -352,7 +352,7 @@ oursound = get_species_sound(select_default_species_sound(pref))["scream"] S = sound(pick(oursound)) if(pref.species_sound == "None" || oursound == null) - to_chat(user, "This set does not have scream sounds!") + to_chat(user, span_warning("This set does not have scream sounds!")) return TOPIC_REFRESH S.frequency = pick(pref.voice_freq) S.volume = 20 @@ -367,7 +367,7 @@ oursound = get_species_sound(select_default_species_sound(pref))["pain"] S = sound(pick(oursound)) if(pref.species_sound == "None" || oursound == null) - to_chat(user, "This set does not have pain sounds!") + to_chat(user, span_warning("This set does not have pain sounds!")) return TOPIC_REFRESH S.frequency = pick(pref.voice_freq) S.volume = 20 @@ -382,7 +382,7 @@ oursound = get_species_sound(select_default_species_sound(pref))["gasp"] S = sound(pick(oursound)) if(pref.species_sound == "None" || oursound == null) - to_chat(user, "This set does not have gasp sounds!") + to_chat(user, span_warning("This set does not have gasp sounds!")) return TOPIC_REFRESH S.frequency = pick(pref.voice_freq) S.volume = 20 @@ -397,7 +397,7 @@ oursound = get_species_sound(select_default_species_sound(pref))["death"] S = sound(pick(oursound)) if(pref.species_sound == "None" || oursound == null) - to_chat(user, "This set does not have death sounds!") + to_chat(user, span_warning("This set does not have death sounds!")) return TOPIC_REFRESH S.frequency = pick(pref.voice_freq) S.volume = 20 diff --git a/code/modules/clothing/accessories/holster.dm b/code/modules/clothing/accessories/holster.dm index 7f64fc8635..ae6725ff34 100644 --- a/code/modules/clothing/accessories/holster.dm +++ b/code/modules/clothing/accessories/holster.dm @@ -52,12 +52,12 @@ if(iscarbon(user)) var/mob/living/carbon/C = user if(C.handcuffed) - to_chat(C, "You cannot draw \the [holstered] while handcuffed!") + to_chat(C, span_warning("You cannot draw \the [holstered] while handcuffed!")) return else if(istype(C, /mob/living/carbon/human)) var/mob/living/carbon/human/H = C if(H.ability_flags & 0x1) - to_chat(H, "You cannot draw \the [holstered] while phase shifted!") + to_chat(H, span_warning("You cannot draw \the [holstered] while phase shifted!")) return //CHOMPEdit end var/sound_vol = 25 diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index c9fee35cb8..d92951d076 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -645,7 +645,7 @@ if(istype(usr, /mob/living/carbon/human)) var/mob/living/carbon/human/H = usr if(H.ability_flags & 0x1) - to_chat(usr, "You cannot do that while phase shifted.") + to_chat(usr, span_warning("You cannot do that while phase shifted.")) return //CHOMPEdit end diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm index 2f4e4fd694..11b8e1128f 100644 --- a/code/modules/clothing/clothing_accessories.dm +++ b/code/modules/clothing/clothing_accessories.dm @@ -130,12 +130,12 @@ if(iscarbon(usr)) var/mob/living/carbon/C = usr if(C.handcuffed) - to_chat(C, "You cannot remove accessories while handcuffed!") + to_chat(C, span_warning("You cannot remove accessories while handcuffed!")) return else if(istype(C, /mob/living/carbon/human)) var/mob/living/carbon/human/H = C if(H.ability_flags & 0x1) - to_chat(H, "You cannot remove accessories while phase shifted!") + to_chat(H, span_warning("You cannot remove accessories while phase shifted!")) return //CHOMPEdit end diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index d8e37629e6..4fd2dbdc2b 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -77,7 +77,7 @@ if(R.shell && !R.emagged) // unless emagged shell continue var/law = target.generate_ion_law() - to_chat(target, "You have detected a change in your laws information:") + to_chat(target, span_danger("You have detected a change in your laws information:")) to_chat(target, law) target.add_ion_law(law) target.show_laws() diff --git a/code/modules/instruments/stationary.dm b/code/modules/instruments/stationary.dm index b17fdf7180..06d5f85bdb 100644 --- a/code/modules/instruments/stationary.dm +++ b/code/modules/instruments/stationary.dm @@ -26,13 +26,13 @@ if(W.has_tool_quality(TOOL_WRENCH)) playsound(src, W.usesound, 100, 1) if(anchored) - user.visible_message("[user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.") + user.visible_message(span_filter_notice("[user] begins unsecuring \the [src] from the floor."), span_filter_notice("You start unsecuring \the [src] from the floor.")) else - user.visible_message("[user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.") + user.visible_message(span_filter_notice("[user] begins securing \the [src] to the floor."), span_filter_notice("You start securing \the [src] to the floor.")) if(do_after(user, 20 * W.toolspeed)) if(!src) return - to_chat(user, "You [anchored? "un" : ""]secured \the [src]!") + to_chat(user, span_notice("You [anchored? "un" : ""]secured \the [src]!")) anchored = !anchored return diff --git a/code/modules/media/mediamanager.dm b/code/modules/media/mediamanager.dm index e23866e8e9..e45d42a422 100644 --- a/code/modules/media/mediamanager.dm +++ b/code/modules/media/mediamanager.dm @@ -141,7 +141,7 @@ return if(!owner.prefs.read_preference(/datum/preference/toggle/play_jukebox) && url != "") return // Don't send anything other than a cancel to people with SOUND_STREAMING pref disabled - MP_DEBUG(span_good("Sending update to mediapanel ([url], [(world.time - start_time) / 10], [volume * source_volume])...")) + MP_DEBUG(span_green("Sending update to mediapanel ([url], [(world.time - start_time) / 10], [volume * source_volume])...")) owner << output(list2params(list(url, (world.time - start_time) / 10, volume * source_volume)), "[WINDOW_ID]:SetMusic") /datum/media_manager/proc/push_music(var/targetURL, var/targetStartTime, var/targetVolume) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index a6ffb489cb..d86405f474 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -337,8 +337,8 @@ var/list/holder_mob_icon_cache = list() for(var/mob/living/M in src.contents) if(user.size_multiplier > M.size_multiplier) var/dam = (user.size_multiplier - M.size_multiplier)*(rand(2,5)) - to_chat(user, "You roughly squeeze [M]!") - to_chat(M, "You are roughly squeezed by [user]!") + to_chat(user, span_danger("You roughly squeeze [M]!")) + to_chat(M, span_danger("You are roughly squeezed by [user]!")) log_and_message_admins("[key_name(M)] has been harmsqueezed by [key_name(user)]") M.apply_damage(dam) //CHOMPADDITION: MicroHandCrush END @@ -370,9 +370,9 @@ var/list/holder_mob_icon_cache = list() var/sizediff = grabber.size_multiplier - size_multiplier if(sizediff < -0.5) if(self_grab) - to_chat(src, "You are too big to fit in \the [grabber]\'s hands!") + to_chat(src, span_warning("You are too big to fit in \the [grabber]\'s hands!")) else - to_chat(grabber, "\The [src] is too big to fit in your hands!") + to_chat(grabber, span_warning("\The [src] is too big to fit in your hands!")) return //end YW edit diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm index a17b91ce05..5128a1e56f 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm @@ -179,7 +179,7 @@ //Yay digestion... presumably... var/obj/belly/belly = H.loc add_attack_logs(belly.owner, H, "Digested in [lowertext(belly.name)]") - to_chat(belly.owner, "\The [H.name] suddenly vanishes within your [belly.name]") + to_chat(belly.owner, span_notice("\The [H.name] suddenly vanishes within your [belly.name]")) H.forceMove(pick(floors)) if(H.ability_flags & AB_PHASE_SHIFTED) H.phase_shift() @@ -201,7 +201,7 @@ spawn(5 MINUTES) H.ability_flags &= ~AB_DARK_RESPITE - to_chat(H, "You feel like you can leave the Dark again") + to_chat(H, span_notice("You feel like you can leave the Dark again")) else H.add_modifier(/datum/modifier/dark_respite, 25 MINUTES) @@ -217,7 +217,7 @@ spawn(15 MINUTES) H.ability_flags &= ~AB_DARK_RESPITE - to_chat(H, "You feel like you can leave the Dark again") + to_chat(H, span_notice("You feel like you can leave the Dark again")) return TRUE @@ -263,7 +263,7 @@ else var/datum/species/shadekin/SK = H.species if(SK.manual_respite) - to_chat(H, "As you leave the Dark, you stop focusing the Dark on healing yourself.") + to_chat(H, span_notice("As you leave the Dark, you stop focusing the Dark on healing yourself.")) SK.manual_respite = FALSE src.expire() if(src.pain_immunity) diff --git a/code/modules/mob/living/carbon/lick_wounds.dm b/code/modules/mob/living/carbon/lick_wounds.dm index 855ceeaeb7..70215253b6 100644 --- a/code/modules/mob/living/carbon/lick_wounds.dm +++ b/code/modules/mob/living/carbon/lick_wounds.dm @@ -12,7 +12,7 @@ return //YW edit. Added the distance check to here. this allows the ability to lick ones own wounds. although this also means that all living/carbon/M appear on the list if used. if (get_dist(src,M) >= 2) - to_chat(src, "You need to be closer to do that.") // CHOMPEdit - don't use src << unless you have to. + to_chat(src, span_warning("You need to be closer to do that.")) // CHOMPEdit - don't use src << unless you have to. return if (get_dist(src,M) >= 2) diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm index 0147ebfa29..a2f5f8cae4 100644 --- a/code/modules/mob/living/living_movement.dm +++ b/code/modules/mob/living/living_movement.dm @@ -150,7 +150,7 @@ default behaviour is: return //CHOMPSTATION edit Adding alternative to lightweight if(H.species.lightweight_light == 1 && H.a_intent == I_HELP) - H.visible_message("[src] bumps into [H], knocking them off balance!") + H.visible_message(span_warning("[src] bumps into [H], knocking them off balance!")) H.Weaken(5) now_pushing = 0 return diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_yw.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_yw.dm index bc925373c4..23f2457c5c 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_yw.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_yw.dm @@ -18,7 +18,7 @@ /obj/item/dogborg/pounce_module/afterattack(atom/target, mob/user as mob, proximity) if(proximity && ishuman(target)) - user.visible_message("\the [user] pounces at \the [target]'s face!", "You pounce at \the [target]!") + user.visible_message(span_notice("\the [user] pounces at \the [target]'s face!"), span_notice("You pounce at \the [target]!")) var/mob/living/L = target L.Weaken(10) user.loc = target.loc diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index 23b1f5841c..89936a135d 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -828,7 +828,7 @@ stored_ore[ore] += ore_amount // Add the ore to the machine. S.stored_ore[ore] = 0 // Set the value of the ore in the satchel to 0. S.current_capacity = 0 // Set the amount of ore in the satchel to 0. - to_chat(user, "You empty the satchel into the box.") + to_chat(user, span_notice("You empty the satchel into the box.")) return ..() //CHOMPEdit End @@ -866,15 +866,15 @@ if(patient && patient.reagents) if(chem in injection_chems + "inaprovaline") if(hound.cell.charge < 200) //This is so borgs don't kill themselves with it. - to_chat(hound, "You don't have enough power to synthesize fluids.") + to_chat(hound, span_notice("You don't have enough power to synthesize fluids.")) return else if(patient.reagents.get_reagent_amount(chem) + 10 >= 50) //Preventing people from accidentally killing themselves by trying to inject too many chemicals! - to_chat(hound, "Your stomach is currently too full of fluids to secrete more fluids of this kind.") + to_chat(hound, span_notice("Your stomach is currently too full of fluids to secrete more fluids of this kind.")) else if(patient.reagents.get_reagent_amount(chem) + 10 <= 50) //No overdoses for you patient.reagents.add_reagent(chem, inject_amount) drain(100) //-100 charge per injection var/units = round(patient.reagents.get_reagent_amount(chem)) - to_chat(hound, "Injecting [units] unit\s into occupant.") //If they were immersed, the reagents wouldn't leave with them. + to_chat(hound, span_notice("Injecting [units] unit\s into occupant.")) //If they were immersed, the reagents wouldn't leave with them. /obj/item/dogborg/sleeper/compactor/honkborg name = "Jiggles Von Hungertron" diff --git a/code/modules/mob/living/simple_animal/aliens/synx.dm b/code/modules/mob/living/simple_animal/aliens/synx.dm index d2545ff039..d3b655dce5 100644 --- a/code/modules/mob/living/simple_animal/aliens/synx.dm +++ b/code/modules/mob/living/simple_animal/aliens/synx.dm @@ -331,7 +331,7 @@ L.adjustFireLoss(damage_done) return else - to_chat(src,"Your stomach bounces off of the victim's armor!") + to_chat(src,span_notice("Your stomach bounces off of the victim's armor!")) return return //If stomach is distended, return here to perform no forcefeeding or poison injecton. @@ -350,7 +350,7 @@ var/target_zone = pick(BP_TORSO,BP_TORSO,BP_TORSO,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_HEAD) if(L.can_inject(src, null, target_zone)) if(prob(poison_chance)) - to_chat(L, "You feel a strange substance on you.") + to_chat(L, span_warning("You feel a strange substance on you.")) L.reagents.add_reagent(poison_type, poison_per_bite) @@ -387,7 +387,7 @@ /mob/living/simple_mob/animal/synx/perform_the_nom(mob/living/user, mob/living/prey, mob/living/pred, obj/belly/belly, delay) //Synx can only eat people if their organs are on the inside. if(stomach_distended) - to_chat(src,"You can't eat people without your stomach inside of you!") + to_chat(src,span_notice("You can't eat people without your stomach inside of you!")) return else ..() @@ -407,13 +407,13 @@ if(status_flags & HIDING) status_flags &= ~HIDING reset_plane_and_layer() - to_chat(src,"You have stopped hiding.") + to_chat(src,span_notice("You have stopped hiding.")) movement_cooldown = 3 else status_flags |= HIDING layer = HIDING_LAYER //Just above cables with their 2.44 plane = OBJ_PLANE - to_chat(src,"You are now hiding.") + to_chat(src,span_notice("You are now hiding.")) movement_cooldown = 6 /mob/living/simple_mob/animal/synx/proc/disguise() @@ -426,13 +426,13 @@ // If transform isn't true if(stomach_distended) - to_chat(src,"You can't disguise with your stomach outside of your body!") + to_chat(src,span_warning("You can't disguise with your stomach outside of your body!")) return if(!transformed) - to_chat(src,"You changed back into your disguise.") + to_chat(src,span_warning("You changed back into your disguise.")) icon_living = transformed_state //Switch state to transformed state else // If transformed is true. - to_chat(src,"Now they see your true form.") + to_chat(src,span_warning("Now they see your true form.")) icon_living = initial(icon_living) //Switch state to what it was originally defined. @@ -446,7 +446,7 @@ if(speak && voices) handle_mimic() else - usr << "YOU NEED TO HEAR THINGS FIRST, try using Ventcrawl to eevesdrop on nerds." + usr << span_warning("YOU NEED TO HEAR THINGS FIRST, try using Ventcrawl to eevesdrop on nerds.") /mob/living/simple_mob/animal/synx/proc/handle_mimic() name = pick(voices) @@ -466,17 +466,17 @@ set category = "Abilities.Synx" //CHOMPEdit if(incapacitated()) - to_chat(src, "You need to recover before you can use this ability.") + to_chat(src, span_warning("You need to recover before you can use this ability.")) return if(world.time < next_sonar_ping) - to_chat(src, "You need another moment to focus.") + to_chat(src, span_warning("You need another moment to focus.")) return if(is_deaf() || is_below_sound_pressure(get_turf(src))) - to_chat(src, "You are for all intents and purposes currently deaf!") + to_chat(src, span_warning("You are for all intents and purposes currently deaf!")) return next_sonar_ping += 10 SECONDS var/heard_something = FALSE - to_chat(src, "You take a moment to listen in to your environment...") + to_chat(src, span_notice("You take a moment to listen in to your environment...")) for(var/mob/living/L in range(client.view, src)) var/turf/T = get_turf(L) if(!T || L == src || L.stat == DEAD || is_below_sound_pressure(T)) @@ -503,7 +503,7 @@ feedback += "" to_chat(src,jointext(feedback,null)) if(!heard_something) - to_chat(src, "You hear no movement but your own.") + to_chat(src, span_notice("You hear no movement but your own.")) @@ -516,7 +516,7 @@ if(!stomach_distended) //true if stomach distended is null, 0, or "" stomach_distended = !stomach_distended //switch statement - to_chat (src, "You disgorge your stomach, spilling its contents!") + to_chat (src, span_notice("You disgorge your stomach, spilling its contents!")) melee_damage_lower = 1 //Hopefully this will make all brute damage not apply while stomach is distended. I don't see a better way to do this. melee_damage_upper = 1 icon_living = stomach_distended_state @@ -534,7 +534,7 @@ if(stomach_distended) //If our stomach has been vomitted stomach_distended = !stomach_distended - to_chat (src, "You swallow your insides!") + to_chat (src, span_notice("You swallow your insides!")) melee_damage_lower = SYNX_LOWER_DAMAGE //This is why I'm using a define melee_damage_upper = SYNX_UPPER_DAMAGE icon_living = initial(icon_living) @@ -592,13 +592,13 @@ //HOLOSEEDSPAWNCODE /mob/living/simple_mob/animal/synx/ai/pet/holo/death() ..() - visible_message("\The [src] fades away!") + visible_message(span_notice("\The [src] fades away!")) var/location = get_turf(src) new /obj/item/seeds/hardlightseed/typesx(location) qdel(src) /mob/living/simple_mob/animal/synx/ai/pet/holo/gib() - visible_message("\The [src] fades away!") + visible_message(span_notice("\The [src] fades away!")) var/location = get_turf(src) new /obj/item/seeds/hardlightseed/typesx(location) qdel(src) diff --git a/code/modules/mob/living/simple_animal/animals/clockwork.dm b/code/modules/mob/living/simple_animal/animals/clockwork.dm index 4084a9673a..cba3824300 100644 --- a/code/modules/mob/living/simple_animal/animals/clockwork.dm +++ b/code/modules/mob/living/simple_animal/animals/clockwork.dm @@ -136,7 +136,7 @@ "rubs against [friend].", "purrs.")) else - usr << "[src] ignores you." + usr << span_notice("[src] ignores you.") return */ /mob/living/simple_animal/clockwork/fluff/Ignis diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/hyena/hyena.dm b/code/modules/mob/living/simple_mob/subtypes/animal/hyena/hyena.dm index 755cf61f70..2331dd864e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/hyena/hyena.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/hyena/hyena.dm @@ -101,14 +101,14 @@ They're also cool, and Rykka/Nyria wrote this uwu hat = null update_icon() if(user == src) - to_chat(user, "You removed your hat.") + to_chat(user, span_notice("You removed your hat.")) return - to_chat(user, "You removed \the [src]'s hat. You monster. ;~;") + to_chat(user, span_warning("You removed \the [src]'s hat. You monster. ;~;")) else if(user == src) - to_chat(user, "You are not wearing a hat!") + to_chat(user, span_notice("You are not wearing a hat!")) return - to_chat(user, "\The [src] is not wearing a hat!") + to_chat(user, span_notice("\The [src] is not wearing a hat!")) /mob/living/simple_mob/animal/hyena/verb/give_hat() set name = "Give Hat" @@ -121,16 +121,16 @@ They're also cool, and Rykka/Nyria wrote this uwu /mob/living/simple_mob/animal/hyena/proc/take_hat(var/mob/user) if(hat) if(user == src) - to_chat(user, "You already have a hat!") + to_chat(user, span_notice("You already have a hat!")) return - to_chat(user, "\The [src] already has a hat!") + to_chat(user, span_notice("\The [src] already has a hat!")) else if(user == src) if(istype(get_active_hand(), /obj/item/clothing/head)) hat = get_active_hand() drop_from_inventory(hat, src) hat.forceMove(src) - to_chat(user, "You put on the hat.") + to_chat(user, span_notice("You put on the hat.")) update_icon() return else if(ishuman(user)) @@ -143,10 +143,10 @@ They're also cool, and Rykka/Nyria wrote this uwu a_intent = I_HELP newhat.attack_hand(src) else if(src.get_active_hand()) - to_chat(user, "\The [src] seems busy with \the [get_active_hand()] already!") + to_chat(user, span_notice("\The [src] seems busy with \the [get_active_hand()] already!")) else - to_chat(user, "You aren't holding a hat...") + to_chat(user, span_warning("You aren't holding a hat...")) /datum/say_list/hyena speak = list("Huff.", "|R|rr?", "Yap.", "Grr.", "Yip.", "SCREM!") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard_mutant_event.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard_mutant_event.dm index 2f4305eed5..bcb2754038 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard_mutant_event.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard_mutant_event.dm @@ -16,12 +16,12 @@ if(istype(loc,/obj/belly)){ var/obj/belly/B = loc - B.owner.visible_message("Something grows inside [B.owner]'s [lowertext(B.name)]!") - to_chat(B.owner, "\The [src] suddenly evolves inside your [lowertext(B.name)]!") + B.owner.visible_message(span_warning("Something grows inside [B.owner]'s [lowertext(B.name)]!")) + to_chat(B.owner, span_warning("\The [src] suddenly evolves inside your [lowertext(B.name)]!")) B.release_specific_contents(src, TRUE) B.nom_mob(bigger, null) qdel(src) }else{ - visible_message("\The [src] suddenly evolves!") + visible_message(span_warning("\The [src] suddenly evolves!")) qdel(src) } diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_mutant_event.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_mutant_event.dm index fb165e12d8..02dac74008 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_mutant_event.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_mutant_event.dm @@ -19,12 +19,12 @@ if(istype(loc,/obj/belly)){ var/obj/belly/B = loc - B.owner.visible_message("Something grows inside [B.owner]'s [lowertext(B.name)]!") - to_chat(B.owner, "\The [src] suddenly evolves inside your [lowertext(B.name)]!") + B.owner.visible_message(span_warning("Something grows inside [B.owner]'s [lowertext(B.name)]!")) + to_chat(B.owner, span_warning("\The [src] suddenly evolves inside your [lowertext(B.name)]!")) B.release_specific_contents(src, TRUE) B.nom_mob(bigger, null) qdel(src) }else{ - visible_message("\The [src] suddenly evolves!") + visible_message(span_warning("\The [src] suddenly evolves!")) qdel(src) } diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm index f0925f2206..1c84becd6a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm @@ -147,7 +147,7 @@ "rubs against [friend].", "purrs.")) else - usr << "[src] ignores you." + usr << span_notice("[src] ignores you.") return */ /mob/living/simple_mob/clockwork/fluff/Ignis diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/vox.dm b/code/modules/mob/living/simple_mob/subtypes/animal/vox.dm index 027799c90e..502701e6c1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/vox.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/vox.dm @@ -41,7 +41,7 @@ /mob/living/simple_mob/vox/armalis/death(var/gibbed = FALSE) ..(TRUE) var/turf/gloc = get_turf(loc) - visible_message("[src] shudders violently and explodes!","You feel your body rupture!") + visible_message(span_bolddanger("[src] shudders violently and explodes!"),span_warning("You feel your body rupture!")) gib() explosion(gloc, -1, -1, 3, 5) qdel(src) @@ -56,16 +56,16 @@ health -= damage for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) - M.show_message("[src] has been attacked with the [O] by [user]. ") + M.show_message(span_danger("[src] has been attacked with the [O] by [user]. ")) else for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) - M.show_message("The [O] bounces harmlessly off of [src]. ") + M.show_message(span_danger("The [O] bounces harmlessly off of [src]. ")) else - to_chat(usr, "This weapon is ineffective, it does no damage.") + to_chat(usr, span_warning("This weapon is ineffective, it does no damage.")) for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) - M.show_message("[user] gently taps [src] with the [O]. ") + M.show_message(span_warning("[user] gently taps [src] with the [O]. ")) /mob/living/simple_mob/vox/armalis/verb/fire_quill(mob/target as mob in oview()) @@ -77,10 +77,10 @@ if(quills<=0) return - to_chat(src, "You launch a razor-sharp quill at [target]!") + to_chat(src, span_warning("You launch a razor-sharp quill at [target]!")) for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) - to_chat(O, "[src] launches a razor-sharp quill at [target]!") + to_chat(O, span_warning("[src] launches a razor-sharp quill at [target]!")) var/obj/item/arrow/quill/Q = new(loc) Q.fingerprintslast = src.ckey @@ -88,7 +88,7 @@ quills-- spawn(100) - to_chat(src, "You feel a fresh quill slide into place.") + to_chat(src, span_warning("You feel a fresh quill slide into place.")) quills++ /mob/living/simple_mob/vox/armalis/verb/message_mob() @@ -113,12 +113,12 @@ to_chat(src, "Not even the armalis can speak to the dead.") return - to_chat(M, "Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]") + to_chat(M, span_notice("Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]")) if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(H.species.name == "Vox") return - to_chat(H, "Your nose begins to bleed...") + to_chat(H, span_warning("Your nose begins to bleed...")) H.drip(1) /mob/living/simple_mob/vox/armalis/verb/shriek() @@ -133,13 +133,13 @@ movement_cooldown = 4 maxHealth += 200 health += 200 - visible_message("[src] is quickly outfitted in [O] by [user].","You quickly outfit [src] in [O].") + visible_message(span_notice("[src] is quickly outfitted in [O] by [user]."),span_notice("You quickly outfit [src] in [O].")) regenerate_icons() return if(istype(O,/obj/item/vox/armalis_amp)) user.drop_item(O) amp = O - visible_message("[src] is quickly outfitted in [O] by [user].","You quickly outfit [src] in [O].") + visible_message(span_notice("[src] is quickly outfitted in [O] by [user]."),span_notice("You quickly outfit [src] in [O].")) regenerate_icons() return return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/metroid/metJuvenile.dm b/code/modules/mob/living/simple_mob/subtypes/metroid/metJuvenile.dm index 0a8f5950fb..0ae05fcac6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/metroid/metJuvenile.dm +++ b/code/modules/mob/living/simple_mob/subtypes/metroid/metJuvenile.dm @@ -47,7 +47,7 @@ if(is_queen) paralysis = 7998 playsound(src, 'sound/metroid/metroidgrow.ogg', 50, 1) - src.visible_message("\The [src] begins to lay an egg.") + src.visible_message(span_notice("\The [src] begins to lay an egg.")) spawn(50) new /obj/effect/metroid/egg(loc, src) adjust_nutrition(-500) @@ -76,7 +76,7 @@ L = new next(get_turf(src)) //Next is a variable defined by metTypes.dm that just points to the next metroid in the evolutionary stage. if(mind) src.mind.transfer_to(L) - visible_message("\The [src] suddenly evolves!") + visible_message(span_warning("\The [src] suddenly evolves!")) qdel(src) // Code for metroids attacking other things. diff --git a/code/modules/mob/living/simple_mob/subtypes/metroid/metTypes.dm b/code/modules/mob/living/simple_mob/subtypes/metroid/metTypes.dm index 5c17407dee..aa9a1663cc 100644 --- a/code/modules/mob/living/simple_mob/subtypes/metroid/metTypes.dm +++ b/code/modules/mob/living/simple_mob/subtypes/metroid/metTypes.dm @@ -74,7 +74,7 @@ GLOBAL_VAR_INIT(queen_amount, 0) //We only gonna want 1 queen in the world. // playsound(src, 'sound/metroid/metroiddeath.ogg', 50, 1) ..() if(prob(20)) - visible_message("\The [src] dropped some toy!") + visible_message(span_notice("\The [src] dropped some toy!")) new /obj/item/toy/figure/bounty_hunter(loc, src) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm index 6673bbacb5..0665d483c3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm @@ -9,7 +9,7 @@ return FALSE if((get_area(src).flags & PHASE_SHIELDED)) //CHOMPAdd - Mapping tools to control phasing - to_chat(src,"This area is preventing you from phasing!") + to_chat(src,span_warning("This area is preventing you from phasing!")) return FALSE if(shift_state && shift_state == AB_SHIFT_ACTIVE) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/plants_ch/pitcher.dm b/code/modules/mob/living/simple_mob/subtypes/vore/plants_ch/pitcher.dm index beb7d451a4..00b810a48f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/plants_ch/pitcher.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/plants_ch/pitcher.dm @@ -309,14 +309,14 @@ GLOBAL_LIST_INIT(pitcher_plant_lure_messages, list( qdel(src) if(!(proximity && O.is_open_container())) return - to_chat(user, "You squeeze \the [src], juicing it into \the [O].") + to_chat(user, span_notice("You squeeze \the [src], juicing it into \the [O].")) reagents.trans_to(O, reagents.total_volume) user.drop_from_inventory(src) pit.loc = user.loc qdel(src) /obj/item/reagent_containers/food/snacks/pitcher_fruit/attack_self(mob/user) - to_chat(user, "You plant the fruit.") + to_chat(user, span_notice("You plant the fruit.")) new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(get_turf(user),src.seed) GLOB.seed_planted_shift_roundstat++ qdel(src) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm index ce0f2d6574..c03d247055 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm @@ -188,13 +188,13 @@ switch(status) //Not allowed due to /area technical reasons if(SHELTER_DEPLOY_BAD_AREA) - to_chat(src, "A tunnel to the Dark will not function in this area.") + to_chat(src, span_warning("A tunnel to the Dark will not function in this area.")) //Anchored objects or no space if(SHELTER_DEPLOY_BAD_TURFS, SHELTER_DEPLOY_ANCHORED_OBJECTS) var/width = template.width var/height = template.height - to_chat(src, "There is not enough open area for a tunnel to the Dark to form! You need to clear a [width]x[height] area!") + to_chat(src, span_warning("There is not enough open area for a tunnel to the Dark to form! You need to clear a [width]x[height] area!")) if(status != SHELTER_DEPLOY_ALLOWED) return FALSE @@ -205,10 +205,10 @@ smoke.set_up(10, 0, T) smoke.start() - src.visible_message("[src] begins pulling dark energies around themselves.") + src.visible_message(span_notice("[src] begins pulling dark energies around themselves.")) if(do_after(src, 600)) //60 seconds playsound(src, 'sound/effects/phasein.ogg', 100, 1) - src.visible_message("[src] finishes pulling dark energies around themselves, creating a portal.") + src.visible_message(span_notice("[src] finishes pulling dark energies around themselves, creating a portal.")) log_and_message_admins("[key_name_admin(src)] created a tunnel to the dark at [get_area(T)]!") template.annihilate_plants(deploy_location) @@ -224,10 +224,10 @@ /mob/living/simple_mob/shadekin/proc/dark_maw() var/turf/T = get_turf(src) if(!istype(T)) - to_chat(src, "You don't seem to be able to set a trap here!") + to_chat(src, span_warning("You don't seem to be able to set a trap here!")) return FALSE else if(T.get_lumcount() >= 0.5) - to_chat(src, "There is too much light here for your trap to last!") + to_chat(src, span_warning("There is too much light here for your trap to last!")) return FALSE if(do_after(src, 10)) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm index acd73885d2..5cf2045f0d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm @@ -51,22 +51,22 @@ var/opts = clickprops["shift"] if(opts) - to_chat(my_kin,"[name] (Cost: [cost]%) - [desc]") + to_chat(my_kin,span_notice("[name] (Cost: [cost]%) - [desc]")) else do_ability(my_kin) /obj/effect/rakshasa_ability/proc/do_ability() if(my_kin.stat) - to_chat(my_kin,"Can't use that ability in your state!") + to_chat(my_kin,span_warning("Can't use that ability in your state!")) return FALSE if(shift_mode == NOT_WHILE_SHIFTED && (my_kin.ability_flags & AB_PHASE_SHIFTED)) - to_chat(my_kin,"Can't use that ability while phase shifted!") + to_chat(my_kin,span_warning("Can't use that ability while phase shifted!")) return FALSE else if(shift_mode == ONLY_WHILE_SHIFTED && !(my_kin.ability_flags & AB_PHASE_SHIFTED)) - to_chat(my_kin,"Can only use that ability while phase shifted!") + to_chat(my_kin,span_warning("Can only use that ability while phase shifted!")) return FALSE else if(my_kin.energy < cost) - to_chat(my_kin,"Not enough energy for that ability!") + to_chat(my_kin,span_warning("Not enough energy for that ability!")) return FALSE my_kin.energy -= cost @@ -290,7 +290,7 @@ /mob/living/simple_mob/shadekin/proc/rakshasa_shift() var/turf/T = get_turf(src) if(!T.CanPass(src,T) || loc != T) - to_chat(src,"You can't use that here!") + to_chat(src,span_warning("You can't use that here!")) return FALSE forceMove(T) @@ -332,11 +332,11 @@ var/mob/living/target = pick(potentials) if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected) target.forceMove(vore_selected) - to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") + to_chat(target,span_warning("\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!")) // Do this after the potential vore, so we get the belly update_icon() - + //Affect nearby lights for(var/obj/machinery/light/L in machines) if(L.z != z || get_dist(src,L) > 10) @@ -365,13 +365,13 @@ incorporeal_move = TRUE density = FALSE force_max_speed = TRUE - - + + //////////////////////////////////////////////////////////////// /mob/living/simple_mob/shadekin/proc/stealth_shift() var/turf/T = get_turf(src) if(!T.CanPass(src,T) || loc != T) - to_chat(src,"You can't use that here!") + to_chat(src,span_warning("You can't use that here!")) return FALSE forceMove(T) @@ -413,7 +413,7 @@ var/mob/living/target = pick(potentials) if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected) target.forceMove(vore_selected) - to_chat(target,"\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") + to_chat(target,span_warning("\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!")) // Do this after the potential vore, so we get the belly update_icon() @@ -449,4 +449,4 @@ for(var/obj/machinery/light/L in machines) if(L.z != z || get_dist(src,L) > 10) continue - L.flicker(10) \ No newline at end of file + L.flicker(10) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_trap.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_trap.dm index b02e0073b3..467c229dc0 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_trap.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_trap.dm @@ -30,11 +30,11 @@ if(has_buckled_mobs() && can_use(user)) var/victim = english_list(buckled_mobs) user.visible_message( - "[user] begins freeing [victim] from \the [src].", - "You carefully begin to free [victim] from \the [src].", + span_notice("[user] begins freeing [victim] from \the [src]."), + span_notice("You carefully begin to free [victim] from \the [src]."), ) if(do_after(user, 5)) - user.visible_message("[victim] has been freed from \the [src] by [user].") + user.visible_message(span_notice("[victim] has been freed from \the [src] by [user].")) for(var/A in buckled_mobs) unbuckle_mob(A) anchored = 0 @@ -53,7 +53,7 @@ ) var/sound = pick(goo_sounds) playsound(src, sound, 100, 1) - L << "You hear a gooey schlorp as \the [src] ensnares your leg, trapping you in place!" + L << span_danger("You hear a gooey schlorp as \the [src] ensnares your leg, trapping you in place!") deployed = 0 can_buckle = initial(can_buckle) @@ -63,9 +63,9 @@ var/mob/living/L = AM if(L.m_intent == "run") L.visible_message( - "[L] steps on \the [src].", - "You step on \the [src]!", - "You hear a gooey schlorp as the goo ensnares your leg!" + span_danger("[L] steps on \the [src]."), + span_danger("You step on \the [src]!"), + span_hear(span_bold("You hear a gooey schlorp as the goo ensnares your leg!")) ) attack_mob(L) if(!has_buckled_mobs()) @@ -73,4 +73,3 @@ deployed = 0 message_admins("[key_name(usr)] has stepped in the goo trap.") ..() - diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm index e70822c922..9f0af9c977 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm @@ -298,7 +298,7 @@ //Yay digestion... presumably... var/obj/belly/belly = src.loc add_attack_logs(belly.owner, src, "Digested in [lowertext(belly.name)]") - to_chat(belly.owner, "\The [src.name] suddenly vanishes within your [belly.name]") + to_chat(belly.owner, span_notice("\The [src.name] suddenly vanishes within your [belly.name]")) forceMove(pick(floors)) flick("tp_in",src) respite_activating = FALSE @@ -313,7 +313,7 @@ spawn(10 MINUTES) ability_flags &= ~AB_DARK_RESPITE movement_cooldown = initial(movement_cooldown) - to_chat(src, "You feel like you can leave the Dark again") + to_chat(src, span_notice("You feel like you can leave the Dark again")) else spawn(1 SECOND) respite_activating = FALSE @@ -326,7 +326,7 @@ spawn(15 MINUTES) ability_flags &= ~AB_DARK_RESPITE movement_cooldown = initial(movement_cooldown) - to_chat(src, "You feel like you can leave the Dark again") + to_chat(src, span_notice("You feel like you can leave the Dark again")) //CHOMPEdit End /* //VOREStation AI Temporary Removal diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm index c8c32b77f9..a7d9ccf08c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm @@ -114,7 +114,7 @@ var/global/moth_amount = 0 // Chompstation Addition, Rykka waz here. *pawstamp* death_star() /mob/living/simple_mob/vore/solargrub/proc/death_star() - visible_message("\The [src]'s shell rips open and evolves!") + visible_message(span_warning("\The [src]'s shell rips open and evolves!")) /* //Commenting this bit out. It's unncecessary, especially since we only use one form. diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm index e9e33ebf65..ec30d8c9a4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm @@ -307,6 +307,6 @@ var/global/list/grub_machine_overlays = list() var/mob/living/simple_mob/animal/solargrub_larva/grub = locate() in O if(grub) grub.eject_from_machine(O) - to_chat(user, "You disturb a grub nesting in \the [O]!") + to_chat(user, span_warning("You disturb a grub nesting in \the [O]!")) return return ..() diff --git a/code/modules/paperwork/faxmachine_vr.dm b/code/modules/paperwork/faxmachine_vr.dm index 69e00313fd..16086a6c96 100644 --- a/code/modules/paperwork/faxmachine_vr.dm +++ b/code/modules/paperwork/faxmachine_vr.dm @@ -134,7 +134,7 @@ var/global/last_fax_role_request if(L.stat || L.restrained()) return if(last_fax_role_request && (world.time - last_fax_role_request < 5 MINUTES)) - to_chat(L, "The global automated relays are still recalibrating. Try again later or relay your request in written form for processing.") + to_chat(L, span_warning("The global automated relays are still recalibrating. Try again later or relay your request in written form for processing.")) return var/confirmation = tgui_alert(L, "Are you sure you want to send automated crew request?", "Confirmation", list("Yes", "No", "Cancel")) @@ -166,7 +166,7 @@ var/global/last_fax_role_request var/datum/department/ping_dept = SSjob.get_ping_role(role) if(!ping_dept) - to_chat(L, "Selected job cannot be requested for \[ERRORDEPTNOTFOUND] reason. Please report this to system administrator.") + to_chat(L, span_warning("Selected job cannot be requested for \[ERRORDEPTNOTFOUND] reason. Please report this to system administrator.")) return var/message_color = "#FFFFFF" var/ping_name = null @@ -192,10 +192,10 @@ var/global/last_fax_role_request //if(DEPARTMENT_TALON) // ping_name = "Offmap" if(!ping_name) - to_chat(L, "Selected job cannot be requested for \[ERRORUNKNOWNDEPT] reason. Please report this to system administrator.") + to_chat(L, span_warning("Selected job cannot be requested for \[ERRORUNKNOWNDEPT] reason. Please report this to system administrator.")) return message_color = ping_dept.color message_chat_rolerequest(message_color, ping_name, reason, role) last_fax_role_request = world.time - to_chat(L, "Your request was transmitted.") + to_chat(L, span_notice("Your request was transmitted.")) diff --git a/code/modules/planet/borealismajoris.dm b/code/modules/planet/borealismajoris.dm index 35a770ecd3..4599dc4c52 100644 --- a/code/modules/planet/borealismajoris.dm +++ b/code/modules/planet/borealismajoris.dm @@ -267,7 +267,7 @@ var/datum/planet/borealis2/planet_borealis2 = null wind_high = 2 wind_low = 1 light_modifier = 0.5 - effect_message = "Rain falls on you." + effect_message = span_warning("Rain falls on you.") transition_chances = list( WEATHER_OVERCAST = 25, @@ -294,13 +294,13 @@ var/datum/planet/borealis2/planet_borealis2 = null var/obj/item/melee/umbrella/U = L.get_active_hand() if(U.open) if(show_message) - to_chat(L, "Rain patters softly onto your umbrella") + to_chat(L, span_notice("Rain patters softly onto your umbrella")) continue else if(istype(L.get_inactive_hand(), /obj/item/melee/umbrella)) var/obj/item/melee/umbrella/U = L.get_inactive_hand() if(U.open) if(show_message) - to_chat(L, "Rain patters softly onto your umbrella") + to_chat(L, span_notice("Rain patters softly onto your umbrella")) continue L.water_act(1) @@ -314,7 +314,7 @@ var/datum/planet/borealis2/planet_borealis2 = null wind_low = 2 light_modifier = 0.3 flight_failure_modifier = 10 - effect_message = "Rain falls on you, drenching you in water." + effect_message = span_warning("Rain falls on you, drenching you in water.") var/next_lightning_strike = 0 // world.time when lightning will strike. var/min_lightning_cooldown = 5 SECONDS @@ -348,13 +348,13 @@ var/datum/planet/borealis2/planet_borealis2 = null if(istype(L.get_active_hand(), /obj/item/melee/umbrella)) var/obj/item/melee/umbrella/U = L.get_active_hand() if(U.open) - to_chat(L, "You struggle to keep hold of your umbrella!") + to_chat(L, span_danger("You struggle to keep hold of your umbrella!")) L.Stun(20) // This is not nearly as long as it seems playsound(L, 'sound/effects/rustle1.ogg', 100, 1) // Closest sound I've got to "Umbrella in the wind" else if(istype(L.get_inactive_hand(), /obj/item/melee/umbrella)) var/obj/item/melee/umbrella/U = L.get_inactive_hand() if(U.open) - to_chat(L, "A gust of wind yanks the umbrella from your hand!") + to_chat(L, span_danger("A gust of wind yanks the umbrella from your hand!")) playsound(L, 'sound/effects/rustle1.ogg', 100, 1) L.drop_from_inventory(U) U.toggle_umbrella() @@ -365,13 +365,13 @@ var/datum/planet/borealis2/planet_borealis2 = null var/obj/item/melee/umbrella/U = L.get_active_hand() if(U.open) if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") + to_chat(L, span_notice("Rain showers loudly onto your umbrella!")) continue else if(istype(L.get_inactive_hand(), /obj/item/melee/umbrella)) var/obj/item/melee/umbrella/U = L.get_inactive_hand() if(U.open) if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") + to_chat(L, span_notice("Rain showers loudly onto your umbrella!")) continue @@ -398,7 +398,7 @@ var/datum/planet/borealis2/planet_borealis2 = null flight_failure_modifier = 15 timer_low_bound = 2 timer_high_bound = 5 - effect_message = "The hail smacks into you!" + effect_message = span_warning("The hail smacks into you!") transition_chances = list( WEATHER_RAIN = 45, @@ -427,13 +427,13 @@ var/datum/planet/borealis2/planet_borealis2 = null var/obj/item/melee/umbrella/U = H.get_active_hand() if(U.open) if(show_message) - to_chat(H, "Hail patters gently onto your umbrella.") + to_chat(H, span_notice("Hail patters gently onto your umbrella.")) continue else if(istype(H.get_inactive_hand(), /obj/item/melee/umbrella)) var/obj/item/melee/umbrella/U = H.get_inactive_hand() if(U.open) if(show_message) - to_chat(H, "Hail patters gently onto your umbrella.") + to_chat(H, span_notice("Hail patters gently onto your umbrella.")) continue var/target_zone = pick(BP_ALL) @@ -566,4 +566,4 @@ var/datum/planet/borealis2/planet_borealis2 = null if(!istype(T)) return if(T.outdoors) - SSradiation.radiate(T, rand(fallout_rad_low, fallout_rad_high)) \ No newline at end of file + SSradiation.radiate(T, rand(fallout_rad_low, fallout_rad_high)) diff --git a/code/modules/planet/virgo4_vr b/code/modules/planet/virgo4_vr index a72d8e9061..c014301c2a 100644 --- a/code/modules/planet/virgo4_vr +++ b/code/modules/planet/virgo4_vr @@ -239,7 +239,7 @@ var/datum/planet/virgo4/planet_virgo4 = null wind_high = 2 wind_low = 1 light_modifier = 0.5 - effect_message = "Rain falls on you." + effect_message = span_warning("Rain falls on you.") transition_chances = list( WEATHER_OVERCAST = 25, @@ -265,7 +265,7 @@ var/datum/planet/virgo4/planet_virgo4 = null if(istype(U) && U.open) if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") + to_chat(L, span_notice("Rain patters softly onto your umbrella.")) continue L.water_act(1) @@ -279,7 +279,7 @@ var/datum/planet/virgo4/planet_virgo4 = null wind_low = 2 light_modifier = 0.3 flight_failure_modifier = 10 - effect_message = "Rain falls on you, drenching you in water." + effect_message = span_warning("Rain falls on you, drenching you in water.") var/next_lightning_strike = 0 // world.time when lightning will strike. var/min_lightning_cooldown = 5 SECONDS @@ -311,7 +311,7 @@ var/datum/planet/virgo4/planet_virgo4 = null if(istype(U) && U.open) if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") + to_chat(L, span_notice("Rain showers loudly onto your umbrella!")) continue @@ -337,7 +337,7 @@ var/datum/planet/virgo4/planet_virgo4 = null flight_failure_modifier = 15 timer_low_bound = 2 timer_high_bound = 5 - effect_message = "The hail smacks into you!" + effect_message = span_warning("The hail smacks into you!") transition_chances = list( WEATHER_HAIL = 100 @@ -364,7 +364,7 @@ var/datum/planet/virgo4/planet_virgo4 = null if(istype(U) && U.open) if(show_message) - to_chat(H, "Hail patters onto your umbrella.") + to_chat(H, span_notice("Hail patters onto your umbrella.")) continue var/target_zone = pick(BP_ALL) diff --git a/code/modules/power/fusion/fuel_assembly/fuel_injector.dm b/code/modules/power/fusion/fuel_assembly/fuel_injector.dm index 71f2a50882..8add9d3b06 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_injector.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_injector.dm @@ -74,7 +74,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors) cur_assembly = W //CHOMPEdit Begin if(istype(W,/obj/item/fuel_assembly/blitz)) - visible_message("The fuel injector begins to shake and whirr violently as it tries to accept the blitz rod!") + visible_message(span_warning("The fuel injector begins to shake and whirr violently as it tries to accept the blitz rod!")) spawn(30) explosion(loc,2,3,4,8) qdel(src) diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 19c6fc8ab0..d507305100 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -313,7 +313,7 @@ //Phorochemistry DM: Allows chemicalresistant shocking -Radiantflash for(var/datum/reagent/phororeagent/R in M.reagents.reagent_list) if(R.id == "fulguracin") - to_chat(M, "Your hairs stand up, but you resist the shock for the most part") + to_chat(M, span_notice("Your hairs stand up, but you resist the shock for the most part")) return 0 //no shock for you */ //Checks again. If we are still here subject will be shocked, trigger standard 20 tick warning diff --git a/code/modules/projectiles/guns/projectile/automatic_yw.dm b/code/modules/projectiles/guns/projectile/automatic_yw.dm index 477b4f8b43..d6e7a15411 100644 --- a/code/modules/projectiles/guns/projectile/automatic_yw.dm +++ b/code/modules/projectiles/guns/projectile/automatic_yw.dm @@ -34,13 +34,13 @@ /obj/item/gun/projectile/automatic/mg42/special_check(mob/user) if(cover_open) - user << "[src]'s cover is open! Close it before firing!" + user << span_warning("[src]'s cover is open! Close it before firing!") return 0 return ..() /obj/item/gun/projectile/automatic/mg42/proc/toggle_cover(mob/user) cover_open = !cover_open - user << "You [cover_open ? "open" : "close"] [src]'s cover." + user << span_notice("You [cover_open ? "open" : "close"] [src]'s cover.") update_icon() update_held_icon() @@ -63,12 +63,12 @@ /obj/item/gun/projectile/automatic/mg42/load_ammo(var/obj/item/A, mob/user) if(!cover_open) - user << "You need to open the cover to load [src]." + user << span_warning("You need to open the cover to load [src].") return ..() /obj/item/gun/projectile/automatic/mg42/unload_ammo(mob/user, var/allow_dump=1) if(!cover_open) - user << "You need to open the cover to unload [src]." + user << span_warning("You need to open the cover to unload [src].") return - ..() \ No newline at end of file + ..() diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 1f47244e74..adc8a0207b 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -473,7 +473,7 @@ if(reagents.total_volume >= 5) //CHOMPEdit Start if(digest_mode == DM_DIGEST && M.digestable) reagents.trans_to(M, reagents.total_volume * 0.1, 1 / max(LAZYLEN(contents), 1), FALSE) - to_chat(M, "You splash into a pool of [reagent_name]!") + to_chat(M, span_vwarning("You splash into a pool of [reagent_name]!")) if(!isliving(thing) && count_items_for_sprite) //CHOMPEdit - If this is enabled also update fullness for non-living things owner.update_fullness() //CHOMPEdit - This is run whenever a belly's contents are changed. //if(istype(thing, /obj/item/capture_crystal)) //CHOMPEdit start: Capture crystal occupant gets to see belly text too. Moved to modular_chomp capture_crystal.dm. @@ -484,7 +484,7 @@ //formatted_desc = replacetext(desc, "%belly", lowertext(name)) //replace with this belly's name //formatted_desc = replacetext(formatted_desc, "%pred", owner) //replace with this belly's owner //formatted_desc = replacetext(formatted_desc, "%prey", thing) //replace with whatever mob entered into this belly - //to_chat(CC.bound_mob, "[formatted_desc]") //CHOMPedit end + //to_chat(CC.bound_mob, span_notice("[formatted_desc]")) //CHOMPedit end /*/ Intended for simple mobs //CHMOPEdit: Counting belly cycles now. if((!owner.client || autotransfer_enabled) && autotransferlocation && autotransferchance > 0) @@ -1184,7 +1184,7 @@ M.mind.transfer_to(hasMMI.brainmob) R.mmi = null else if(!R.shell) // Shells don't have brainmobs in their MMIs. - to_chat(R, "Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug.") + to_chat(R, span_danger("Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug.")) if(R.shell) // Let the standard procedure for shells handle this. qdel(R) return diff --git a/code/modules/vore/eating/bellymodes_datum_vr.dm b/code/modules/vore/eating/bellymodes_datum_vr.dm index 02a53e70b4..4d1a25466c 100644 --- a/code/modules/vore/eating/bellymodes_datum_vr.dm +++ b/code/modules/vore/eating/bellymodes_datum_vr.dm @@ -75,7 +75,7 @@ GLOBAL_LIST_INIT(digest_modes, list()) L.adjustCloneLoss(B.digest_clone) //CHOMPEdit start - Send a message when a prey-thing enters hard crit. if(iscarbon(L) && old_health > 0 && L.health <= 0) - to_chat(B.owner, "You feel [L] go still within your [lowertext(B.name)].") + to_chat(B.owner, span_notice("You feel [L] go still within your [lowertext(B.name)].")) //CHOMPEdit end var/actual_brute = L.getBruteLoss() - old_brute var/actual_burn = L.getFireLoss() - old_burn @@ -157,7 +157,7 @@ GLOBAL_LIST_INIT(digest_modes, list()) if(L.size_multiplier > B.shrink_grow_size) L.resize(L.size_multiplier - 0.01) // Shrink by 1% per tick if(L.size_multiplier <= B.shrink_grow_size) //CHOMPEdit - Adds some feedback so the pred knows their prey has stopped shrinking. - to_chat(B.owner, "You feel [L] get as small as you would like within your [lowertext(B.name)].") + to_chat(B.owner, span_notice("You feel [L] get as small as you would like within your [lowertext(B.name)].")) B.owner.update_fullness() //CHOMPEdit - This is run whenever a belly's contents are changed. . = ..() @@ -169,7 +169,7 @@ GLOBAL_LIST_INIT(digest_modes, list()) if(L.size_multiplier < B.shrink_grow_size) L.resize(L.size_multiplier + 0.01) // Shrink by 1% per tick if(L.size_multiplier >= B.shrink_grow_size) //CHOMPEdit - Adds some feedback so the pred knows their prey has stopped growing. - to_chat(B.owner, "You feel [L] get as big as you would like within your [lowertext(B.name)].") + to_chat(B.owner, span_notice("You feel [L] get as big as you would like within your [lowertext(B.name)].")) B.owner.update_fullness() //CHOMPEdit - This is run whenever a belly's contents are changed. /datum/digest_mode/drain/sizesteal @@ -179,10 +179,10 @@ GLOBAL_LIST_INIT(digest_modes, list()) if(L.size_multiplier > B.shrink_grow_size && B.owner.size_multiplier < 2) //Grow until either pred is large or prey is small. B.owner.resize(B.owner.size_multiplier + 0.01) //Grow by 1% per tick. if(B.owner.size_multiplier >= 2) //CHOMPEdit - Adds some feedback so the pred knows they can't grow anymore. - to_chat(B.owner, "You feel you have grown as much as you can.") + to_chat(B.owner, span_notice("You feel you have grown as much as you can.")) L.resize(L.size_multiplier - 0.01) //Shrink by 1% per tick if(L.size_multiplier <= B.shrink_grow_size) //CHOMPEdit - Adds some feedback so the pred knows their prey has stopped shrinking. - to_chat(B.owner, "You feel [L] get as small as you would like within your [lowertext(B.name)].") + to_chat(B.owner, span_notice("You feel [L] get as small as you would like within your [lowertext(B.name)].")) B.owner.update_fullness() //CHOMPEdit - This is run whenever a belly's contents are changed. . = ..() diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm index 0bc879f502..d438be9482 100644 --- a/code/modules/vore/eating/digest_act_vr.dm +++ b/code/modules/vore/eating/digest_act_vr.dm @@ -124,7 +124,7 @@ //CHOMPEdit End g_damage = w_class / 2 if(B.item_digest_logs) - to_chat(B.owner,"[src] was digested inside your [lowertext(B.name)].") + to_chat(B.owner,span_notice("[src] was digested inside your [lowertext(B.name)].")) qdel(src) else if(istype(src,/obj/item/stack)) var/obj/item/stack/S = src @@ -148,7 +148,7 @@ if(goodmeal.trash) new goodmeal.trash(src) if(B.item_digest_logs) - to_chat(B.owner,"[src] was digested inside your [lowertext(B.name)].") + to_chat(B.owner,span_notice("[src] was digested inside your [lowertext(B.name)].")) qdel(src)//CHOMPEdit End if(g_damage > w_class) return w_class diff --git a/code/modules/vore/eating/simple_animal_vr.dm b/code/modules/vore/eating/simple_animal_vr.dm index ffb7ae6546..f628ed6318 100644 --- a/code/modules/vore/eating/simple_animal_vr.dm +++ b/code/modules/vore/eating/simple_animal_vr.dm @@ -127,7 +127,7 @@ set desc = "Slowly regenerate health using nutrition." if(nutrition < 10) - to_chat(src, "You are too hungry to regenerate health.") + to_chat(src, span_warning("You are too hungry to regenerate health.")) return var/heal_amount = input(src, "Input the amount of health to regenerate at the rate of 10 nutrition per second per hitpoint. Current health: [health] / [maxHealth]", "Regenerate health.") as num|null if(!heal_amount) diff --git a/code/modules/vore/fluffstuff/MadokaSpear.dm b/code/modules/vore/fluffstuff/MadokaSpear.dm index fe7694349c..eb10663ca0 100644 --- a/code/modules/vore/fluffstuff/MadokaSpear.dm +++ b/code/modules/vore/fluffstuff/MadokaSpear.dm @@ -42,7 +42,7 @@ /obj/item/oldtwohanded/mob_can_equip(M as mob, slot, disable_warning = FALSE) //Cannot equip wielded items. if(wielded) - to_chat(M, "Unwield the [initial(name)] first!") + to_chat(M, span_warning("Unwield the [initial(name)] first!")) return 0 return ..() @@ -67,7 +67,7 @@ if(wielded) //Trying to unwield it unwield() - user << "You are now carrying the [name] with one hand." + user << span_notice("You are now carrying the [name] with one hand.") if (src.unwieldsound) playsound(src.loc, unwieldsound, 50, 1) @@ -77,10 +77,10 @@ else //Trying to wield it if(user.get_inactive_hand()) - user << "You need your other hand to be empty" + user << span_warning("You need your other hand to be empty") return wield() - user << "You grab the [initial(name)] with both hands." + user << span_notice("You grab the [initial(name)] with both hands.") if (src.wieldsound) playsound(src.loc, wieldsound, 50, 1) @@ -126,4 +126,4 @@ edge = 0 sharp = 1 hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "poked", "jabbed", "torn", "gored") \ No newline at end of file + attack_verb = list("attacked", "poked", "jabbed", "torn", "gored") diff --git a/code/modules/vore/fluffstuff/custom_clothes_yw.dm b/code/modules/vore/fluffstuff/custom_clothes_yw.dm index 3c2d2282af..9a832bf84c 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm @@ -949,10 +949,10 @@ if(ishuman(loc)) var/mob/living/carbon/human/H = src.loc if(H.wear_suit != src) - to_chat(H, "You must be wearing [src] to put up the hood!") + to_chat(H, span_warning("You must be wearing [src] to put up the hood!")) return if(H.head) - to_chat(H, "You're already wearing something on your head!") + to_chat(H, span_warning("You're already wearing something on your head!")) return else H.equip_to_slot_if_possible(hood,slot_head,0,0,1) @@ -1268,11 +1268,11 @@ if(ring_on) icon_state = "[base_icon]" ring_on = 0 - usr << "You remove the right earring." + usr << span_notice("You remove the right earring.") else icon_state = "[base_icon]_on" ring_on = 1 - usr << "You put on the right earring." + usr << span_notice("You put on the right earring.") update_clothing_icon() @@ -1315,7 +1315,7 @@ if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse/big)) return ..() else - to_chat(H,"You need to have a kentauri half to wear this.") + to_chat(H,span_warning("You need to have a kentauri half to wear this.")) return 0 /obj/item/clothing/suit/armor/vest/harpsong/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0, var/icon/clip_mask = null) diff --git a/code/modules/vore/fluffstuff/custom_items_yw.dm b/code/modules/vore/fluffstuff/custom_items_yw.dm index 64179f122f..baa0adcf8e 100644 --- a/code/modules/vore/fluffstuff/custom_items_yw.dm +++ b/code/modules/vore/fluffstuff/custom_items_yw.dm @@ -18,7 +18,7 @@ if(time2 < 10) time2 = "0[time2]" - user.visible_message("[src] displays [time1]:[time2]") + user.visible_message(span_rose("[src] displays [time1]:[time2]")) else return ..() return @@ -87,7 +87,7 @@ /obj/item/toy/bosunwhistle/fluff/strix/attack_self(mob/user as mob) if(cooldown < world.time - 15) - user << "You blow on [src], creating an ear-splitting noise!" + user << span_notice("You blow on [src], creating an ear-splitting noise!") playsound(user, 'sound/misc/boatswain.ogg', 25, 1) cooldown = world.time @@ -157,18 +157,18 @@ /obj/item/melee/goz_whitecane/attack_self(mob/user as mob) on = !on if(on) - user.visible_message("\The [user] extends the white cane.",\ - "You extend the white cane.",\ - "You hear an ominous click.") + user.visible_message(span_notice("\The [user] extends the white cane."),\ + span_warning("You extend the white cane."),\ + span_hear("You hear an ominous click.")) icon_state = "goz_whitecane_1" item_state_slots = list(slot_r_hand_str = "goz_whitecane", slot_l_hand_str = "goz_whitecane") w_class = ITEMSIZE_NORMAL force = 5 attack_verb = list("smacked", "struck", "craked", "beaten") else - user.visible_message("\The [user] collapses the white cane.",\ - "You collapse the white cane.",\ - "You hear a click.") + user.visible_message(span_notice("\The [user] collapses the white cane."),\ + span_notice("You collapse the white cane."),\ + span_hear("You hear a click.")) icon_state = "goz_whitecane_0" item_state_slots = list(slot_r_hand_str = null, slot_l_hand_str = null) w_class = ITEMSIZE_SMALL @@ -187,7 +187,7 @@ /obj/item/melee/goz_whitecane/attack(mob/M as mob, mob/user as mob) if(user.a_intent == I_HELP) - user.visible_message("\The [user] has lightly tapped [M] on the ankle with their white cane!") + user.visible_message(span_notice("\The [user] has lightly tapped [M] on the ankle with their white cane!")) return else ..() @@ -440,7 +440,7 @@ if(user.r_hand == src || user.l_hand == src) if(icon_state != "[basestate]-s") icon_state = "[basestate]-s" - user.visible_message("[user] spins the [src]!") + user.visible_message(span_rose("[user] spins the [src]!")) spawn(100) icon_state = "[basestate]" else @@ -458,7 +458,7 @@ if(user.r_hand == src || user.l_hand == src) if(icon_state != "squeezetoy-s") icon_state = "squeezetoy-s" - user.visible_message("[user] squeezes the [src] a few times!") + user.visible_message(span_rose("[user] squeezes the [src] a few times!")) spawn(50) icon_state = "squeezetoy" else @@ -477,11 +477,11 @@ if(user.r_hand == src || user.l_hand == src) if(folded == 0) icon_state = "infinitycube0" - user.visible_message("[user] folds the [src]!") + user.visible_message(span_rose("[user] folds the [src]!")) folded = 1 else if(folded == 1) icon_state = "infinitycube1" - user.visible_message("[user] unfolds the [src]!") + user.visible_message(span_rose("[user] unfolds the [src]!")) folded = 0 else return ..() @@ -607,13 +607,13 @@ icon_state = "implanter1_1" /obj/item/implanter/fluff/coda/remove_implant() //No way to remove this implant. - to_chat(usr, "It seems \the [imp] can't be removed from \the [src].") + to_chat(usr, span_notice("It seems \the [imp] can't be removed from \the [src].")) return /obj/item/implanter/fluff/coda/attack() ..() if(!imp) //After injection, the implanter poofs. - to_chat(usr, "\The [src] disentegrates after you use it!") + to_chat(usr, span_notice("\The [src] disentegrates after you use it!")) qdel(src) /obj/item/implant/fluff/coda @@ -631,7 +631,7 @@ /obj/item/implant/fluff/coda/process() if(implanted_in && (src.imp_in != implanted_in)) //If the implant is removed. implanted_in.setBrainLoss(200) - visible_message("\The [src] shorts and sparks during removal, frying itself!") + visible_message(span_notice("\The [src] shorts and sparks during removal, frying itself!")) playsound(src.loc, "sparks", 50, 1) STOP_PROCESSING(SSobj, src) name = "melted implant" diff --git a/maps/tether_better/tether_things.dm b/maps/tether_better/tether_things.dm index 7623df2d45..beb38956a6 100644 --- a/maps/tether_better/tether_things.dm +++ b/maps/tether_better/tether_things.dm @@ -117,7 +117,7 @@ /obj/effect/step_trigger/lost_in_space/Trigger(var/atom/movable/A) //replacement for shuttle dump zones because there's no empty space levels to dump to if(ismob(A)) - to_chat(A, "[deathmessage]") + to_chat(A, span_danger("[deathmessage]")) qdel(A) /obj/effect/step_trigger/lost_in_space/bluespace @@ -214,7 +214,7 @@ attached = above item_records = attached.item_records else - to_chat(world,"[src] at [x],[y],[z] cannot find the unit above it!") + to_chat(world,span_danger("[src] at [x],[y],[z] cannot find the unit above it!")) // Tram departure cryo doors that turn into ordinary airlock doors at round end /obj/machinery/cryopod/robot/door/tram @@ -503,4 +503,4 @@ var/global/list/latejoin_tram = list() /obj/effect/lobby_image - icon = 'icons/misc/loading_2.dmi' //VOREStation Add - Loading Screen \ No newline at end of file + icon = 'icons/misc/loading_2.dmi' //VOREStation Add - Loading Screen diff --git a/maps/yw/cryogaia_things.dm b/maps/yw/cryogaia_things.dm index dfb1dcc7f6..0922389aae 100644 --- a/maps/yw/cryogaia_things.dm +++ b/maps/yw/cryogaia_things.dm @@ -36,7 +36,7 @@ /obj/effect/step_trigger/lost_in_space/Trigger(var/atom/movable/A) //replacement for shuttle dump zones because there's no empty space levels to dump to if(ismob(A)) - to_chat(A, "[deathmessage]") + to_chat(A, span_danger("[deathmessage]")) qdel(A) /obj/effect/step_trigger/lost_in_space/bluespace @@ -130,7 +130,7 @@ attached = above item_records = attached.item_records else - to_chat(world,"[src] at [x],[y],[z] cannot find the unit above it!") + to_chat(world,span_danger("[src] at [x],[y],[z] cannot find the unit above it!")) /obj/machinery/smartfridge/plantvator @@ -153,7 +153,7 @@ attached = above item_records = attached.item_records else - to_chat(world,"[src] at [x],[y],[z] cannot find the unit above it!") + to_chat(world,span_danger("[src] at [x],[y],[z] cannot find the unit above it!")) // Tram departure cryo doors that turn into ordinary airlock doors at round end /obj/machinery/cryopod/robot/door/tram @@ -384,15 +384,15 @@ var/global/list/latejoin_tram = list() if(istype(I, /obj/item/weldingtool)) var/obj/item/weldingtool/welder = I if(welder.remove_fuel(0,user) && welder && welder.isOn()) - to_chat(user, "You start to melt the ice off \the [src]") + to_chat(user, span_notice("You start to melt the ice off \the [src]")) playsound(src, welder.usesound, 50, 1) if(do_after(user, welderTime SECONDS)) - to_chat(user, "You finish melting the ice off \the [src]") + to_chat(user, span_notice("You finish melting the ice off \the [src]")) unFreeze() return if(istype(I, /obj/item/pen/crayon)) - to_chat(user, "You try to use \the [I] to clear the ice, but it crumbles away!") + to_chat(user, span_notice("You try to use \the [I] to clear the ice, but it crumbles away!")) qdel(I) return @@ -404,15 +404,15 @@ var/global/list/latejoin_tram = list() return //if we can't de-ice the door tell them what's wrong. - to_chat(user, "\the [src] is frozen shut!") + to_chat(user, span_notice("\the [src] is frozen shut!")) return ..() /obj/machinery/door/airlock/glass_external/freezable/proc/handleRemoveIce(obj/item/W as obj, mob/user as mob, var/time = 15 as num) - to_chat(user, "You start to chip at the ice covering \the [src]") + to_chat(user, span_notice("You start to chip at the ice covering \the [src]")) if(do_after(user, text2num(time SECONDS))) unFreeze() - to_chat(user, "You finish chipping the ice off \the [src]") + to_chat(user, span_notice("You finish chipping the ice off \the [src]")) /obj/machinery/door/airlock/glass_external/freezable/proc/unFreeze() frozen = 0 diff --git a/maps/yw/submaps/alienship/_alienship.dm b/maps/yw/submaps/alienship/_alienship.dm index c818559297..cc7b834ffc 100644 --- a/maps/yw/submaps/alienship/_alienship.dm +++ b/maps/yw/submaps/alienship/_alienship.dm @@ -169,7 +169,7 @@ L.Paralyse(10) L.forceMove(get_turf(pick(teleport_to))) L << 'sound/effects/bamf.ogg' - to_chat(L,"You're starting to come to. You feel like you've been out for a few minutes, at least...") + to_chat(L,span_warning("You're starting to come to. You feel like you've been out for a few minutes, at least...")) /area/tether_away/alienship name = "\improper Away Mission - Unknown Vessel" diff --git a/maps/yw/submaps/beach/_beach.dm b/maps/yw/submaps/beach/_beach.dm index 4e40696dcb..89df0e2018 100644 --- a/maps/yw/submaps/beach/_beach.dm +++ b/maps/yw/submaps/beach/_beach.dm @@ -39,13 +39,13 @@ deep_count++ // Sanity check. if(surface_count < 100) - admin_notice("Insufficient surface minerals. Rerolling...", R_DEBUG) + admin_notice(span_danger("Insufficient surface minerals. Rerolling..."), R_DEBUG) return 0 else if(rare_count < 50) - admin_notice("Insufficient rare minerals. Rerolling...", R_DEBUG) + admin_notice(span_danger("Insufficient rare minerals. Rerolling..."), R_DEBUG) return 0 else if(deep_count < 50) - admin_notice("Insufficient deep minerals. Rerolling...", R_DEBUG) + admin_notice(span_danger("Insufficient deep minerals. Rerolling..."), R_DEBUG) return 0 else return 1 diff --git a/modular_chomp/maps/relic_base/turfs/outdoors.dm b/modular_chomp/maps/relic_base/turfs/outdoors.dm index 1f7e25a931..1e60c30acd 100644 --- a/modular_chomp/maps/relic_base/turfs/outdoors.dm +++ b/modular_chomp/maps/relic_base/turfs/outdoors.dm @@ -264,13 +264,13 @@ /turf/simulated/floor/outdoors/snow/thor/planetuse/attackby(var/obj/item/W, var/mob/user) if(istype(W, /obj/item/shovel)) - to_chat(user, "You begin to remove \the [src] with your [W].") + to_chat(user, span_notice("You begin to remove \the [src] with your [W].")) if(do_after(user, 4 SECONDS * W.toolspeed)) - to_chat(user, "\The [src] has been dug up, and now lies in a pile nearby.") + to_chat(user, span_notice("\The [src] has been dug up, and now lies in a pile nearby.")) new /obj/item/stack/material/snow(src) demote() else - to_chat(user, "You decide to not finish removing \the [src].") + to_chat(user, span_notice("You decide to not finish removing \the [src].")) else ..() diff --git a/modular_chomp/maps/southern_cross/southern_cross_overrides.dm b/modular_chomp/maps/southern_cross/southern_cross_overrides.dm index f9a21b1170..8af99f5101 100644 --- a/modular_chomp/maps/southern_cross/southern_cross_overrides.dm +++ b/modular_chomp/maps/southern_cross/southern_cross_overrides.dm @@ -20,12 +20,12 @@ /mob/living/carbon/human/shadekin_ability_check() . = ..() if(. && istype(get_area(src), /area/vr)) - to_chat(src, "The VR systems cannot comprehend this power! This is useless to you!") + to_chat(src, span_danger("The VR systems cannot comprehend this power! This is useless to you!")) . = FALSE /obj/item/disposable_teleporter/attack_self(mob/user as mob)//Prevents people from using technomancer gear to escape to station from the VR pods. if(istype(get_area(user), /area/vr)) - to_chat(user, "\The [src] does not appear to work in VR! This is useless to you!") + to_chat(user, span_danger("\The [src] does not appear to work in VR! This is useless to you!")) return . = ..() diff --git a/modular_chomp/maps/southern_cross/turfs/outdoors.dm b/modular_chomp/maps/southern_cross/turfs/outdoors.dm index 57f0f7a863..d0d7e398a3 100644 --- a/modular_chomp/maps/southern_cross/turfs/outdoors.dm +++ b/modular_chomp/maps/southern_cross/turfs/outdoors.dm @@ -203,13 +203,13 @@ /turf/simulated/floor/outdoors/snow/sif/planetuse/attackby(var/obj/item/W, var/mob/user) if(istype(W, /obj/item/shovel)) - to_chat(user, "You begin to remove \the [src] with your [W].") + to_chat(user, span_notice("You begin to remove \the [src] with your [W].")) if(do_after(user, 4 SECONDS * W.toolspeed)) - to_chat(user, "\The [src] has been dug up, and now lies in a pile nearby.") + to_chat(user, span_notice("\The [src] has been dug up, and now lies in a pile nearby.")) new /obj/item/stack/material/snow(src) demote() else - to_chat(user, "You decide to not finish removing \the [src].") + to_chat(user, span_notice("You decide to not finish removing \the [src].")) else ..()