diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm index 9b3c2612afa..d1077823858 100644 --- a/code/__DEFINES/span.dm +++ b/code/__DEFINES/span.dm @@ -24,6 +24,8 @@ #define span_blue(str) ("" + str + "") #define span_blueteamradio(str) ("" + str + "") #define span_bold(str) ("" + str + "") +/// This span outputs to OOC, it's meant for OOC announcements +/// Use span_bolddanger for IC danger messages, it's identical to this #define span_boldannounce(str) ("" + str + "") #define span_bolddanger(str) ("" + str + "") #define span_bolditalic(str) ("" + str + "") diff --git a/code/controllers/subsystem/dynamic/dynamic.dm b/code/controllers/subsystem/dynamic/dynamic.dm index 8cfe55398a1..1e1a9afec47 100644 --- a/code/controllers/subsystem/dynamic/dynamic.dm +++ b/code/controllers/subsystem/dynamic/dynamic.dm @@ -619,7 +619,7 @@ SUBSYSTEM_DEF(dynamic) failed = TRUE //AFK client if(!failed && L.stat) if(HAS_TRAIT(L, TRAIT_SUICIDED)) //Suicider - msg += "[L.name] ([L.key]), the [L.job] ([span_boldannounce("Suicide")])\n" + msg += "[L.name] ([L.key]), the [L.job] ([span_bolddanger("Suicide")])\n" failed = TRUE //Disconnected client if(!failed && (L.stat == UNCONSCIOUS || L.stat == HARD_CRIT)) msg += "[L.name] ([L.key]), the [L.job] (Dying)\n" @@ -633,7 +633,7 @@ SUBSYSTEM_DEF(dynamic) if(D.mind && D.mind.current == L) if(L.stat == DEAD) if(HAS_TRAIT(L, TRAIT_SUICIDED)) //Suicider - msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] ([span_boldannounce("Suicide")])\n" + msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] ([span_bolddanger("Suicide")])\n" continue //Disconnected client else msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Dead)\n" @@ -642,7 +642,7 @@ SUBSYSTEM_DEF(dynamic) if(D.can_reenter_corpse) continue //Adminghost, or cult/wizard ghost else - msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] ([span_boldannounce("Ghosted")])\n" + msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] ([span_bolddanger("Ghosted")])\n" continue //Ghosted while alive var/concatenated_message = msg.Join() diff --git a/code/datums/components/irradiated.dm b/code/datums/components/irradiated.dm index a798124528c..6df77dbfdc9 100644 --- a/code/datums/components/irradiated.dm +++ b/code/datums/components/irradiated.dm @@ -181,10 +181,10 @@ if (isliving(source)) var/mob/living/living_source = source - to_chat(user, span_boldannounce("[icon2html(geiger_counter, user)] Subject is irradiated. Contamination traces back to roughly [DisplayTimeText(world.time - beginning_of_irradiation, 5)] ago. Current toxin levels: [living_source.getToxLoss()].")) + to_chat(user, span_bolddanger("[icon2html(geiger_counter, user)] Subject is irradiated. Contamination traces back to roughly [DisplayTimeText(world.time - beginning_of_irradiation, 5)] ago. Current toxin levels: [living_source.getToxLoss()].")) else // In case the green wasn't obvious enough... - to_chat(user, span_boldannounce("[icon2html(geiger_counter, user)] Target is irradiated.")) + to_chat(user, span_bolddanger("[icon2html(geiger_counter, user)] Target is irradiated.")) return COMSIG_GEIGER_COUNTER_SCAN_SUCCESSFUL diff --git a/code/datums/quirks/negative_quirks/prosthetic_limb.dm b/code/datums/quirks/negative_quirks/prosthetic_limb.dm index f8941975ac1..a9917ac0a59 100644 --- a/code/datums/quirks/negative_quirks/prosthetic_limb.dm +++ b/code/datums/quirks/negative_quirks/prosthetic_limb.dm @@ -28,7 +28,7 @@ old_limb = human_holder.return_and_replace_bodypart(surplus, special = TRUE) /datum/quirk/prosthetic_limb/post_add() - to_chat(quirk_holder, span_boldannounce("Your [slot_string] has been replaced with a surplus prosthetic. It has almost no muscle force, and makes you unhealthier by just having it. Additionally, \ + to_chat(quirk_holder, span_bolddanger("Your [slot_string] has been replaced with a surplus prosthetic. It has almost no muscle force, and makes you unhealthier by just having it. Additionally, \ you need to use a welding tool and cables to repair it, instead of sutures and regenerative meshes.")) /datum/quirk/prosthetic_limb/remove() diff --git a/code/datums/quirks/negative_quirks/prosthetic_organ.dm b/code/datums/quirks/negative_quirks/prosthetic_organ.dm index 2b0f20b0d9f..7877e177b39 100644 --- a/code/datums/quirks/negative_quirks/prosthetic_organ.dm +++ b/code/datums/quirks/negative_quirks/prosthetic_organ.dm @@ -65,7 +65,7 @@ STOP_PROCESSING(SSobj, old_organ) /datum/quirk/prosthetic_organ/post_add() - to_chat(quirk_holder, span_boldannounce("Your [slot_string] has been replaced with a surplus organ. It is weak and highly unstable. \ + to_chat(quirk_holder, span_bolddanger("Your [slot_string] has been replaced with a surplus organ. It is weak and highly unstable. \ Additionally, any EMP will make it stop working entirely.")) /datum/quirk/prosthetic_organ/remove() diff --git a/code/datums/quirks/negative_quirks/quadruple_amputee.dm b/code/datums/quirks/negative_quirks/quadruple_amputee.dm index 493cdf0b71c..653cca3dccd 100644 --- a/code/datums/quirks/negative_quirks/quadruple_amputee.dm +++ b/code/datums/quirks/negative_quirks/quadruple_amputee.dm @@ -16,5 +16,5 @@ human_holder.del_and_replace_bodypart(new /obj/item/bodypart/leg/right/robot/surplus, special = TRUE) /datum/quirk/quadruple_amputee/post_add() - to_chat(quirk_holder, span_boldannounce("All your limbs have been replaced with surplus prosthetics. They are fragile and will easily come apart under duress. \ + to_chat(quirk_holder, span_bolddanger("All your limbs have been replaced with surplus prosthetics. They are fragile and will easily come apart under duress. \ Additionally, you need to use a welding tool and cables to repair them, instead of bruise packs and ointment.")) diff --git a/code/datums/quirks/negative_quirks/tin_man.dm b/code/datums/quirks/negative_quirks/tin_man.dm index 0afd8874bed..a75cbbedd76 100644 --- a/code/datums/quirks/negative_quirks/tin_man.dm +++ b/code/datums/quirks/negative_quirks/tin_man.dm @@ -33,5 +33,5 @@ new_organ.Insert(human_holder, special = TRUE, movement_flags = DELETE_IF_REPLACED) /datum/quirk/tin_man/post_add() - to_chat(quirk_holder, span_boldannounce("Most of your internal organs have been replaced with surplus prosthetics. They are fragile and will easily come apart under duress. \ + to_chat(quirk_holder, span_bolddanger("Most of your internal organs have been replaced with surplus prosthetics. They are fragile and will easily come apart under duress. \ Additionally, any EMP will make them stop working entirely.")) diff --git a/code/datums/quirks/neutral_quirks/monochromatic.dm b/code/datums/quirks/neutral_quirks/monochromatic.dm index ef6735df25d..6c1b8c2ef78 100644 --- a/code/datums/quirks/neutral_quirks/monochromatic.dm +++ b/code/datums/quirks/neutral_quirks/monochromatic.dm @@ -16,7 +16,7 @@ /datum/quirk/monochromatic/post_add() if(is_detective_job(quirk_holder.mind.assigned_role)) - to_chat(quirk_holder, span_boldannounce("Mmm. Nothing's ever clear on this station. It's all shades of gray...")) + to_chat(quirk_holder, span_bolddanger("Mmm. Nothing's ever clear on this station. It's all shades of gray...")) quirk_holder.playsound_local(quirk_holder, 'sound/ambience/security/ambidet1.ogg', 50, FALSE) /datum/quirk/monochromatic/remove() diff --git a/code/datums/quirks/neutral_quirks/transhumanist.dm b/code/datums/quirks/neutral_quirks/transhumanist.dm index aa8ae075df3..cbd85150e76 100644 --- a/code/datums/quirks/neutral_quirks/transhumanist.dm +++ b/code/datums/quirks/neutral_quirks/transhumanist.dm @@ -136,11 +136,11 @@ if(!slot_string) return if(isbodypart(old_part)) - to_chat(quirk_holder, span_boldannounce("Your [slot_string] has been replaced with a robotic limb. You need to use a welding tool and cables to repair it, instead of sutures and regenerative meshes.")) + to_chat(quirk_holder, span_bolddanger("Your [slot_string] has been replaced with a robotic limb. You need to use a welding tool and cables to repair it, instead of sutures and regenerative meshes.")) else if (old_part.name == "eyes") - to_chat(quirk_holder, span_boldannounce("You replaced your eyes with flashlights, not cameras. You can't see a thing!")) + to_chat(quirk_holder, span_bolddanger("You replaced your eyes with flashlights, not cameras. You can't see a thing!")) else if (isorgan(old_part)) - to_chat(quirk_holder, span_boldannounce("Your [slot_string] brings you one step closer to silicon perfection, but you feel you're not quite there yet.")) + to_chat(quirk_holder, span_bolddanger("Your [slot_string] brings you one step closer to silicon perfection, but you feel you're not quite there yet.")) /datum/quirk/transhumanist/remove() if(isnull(old_part)) diff --git a/code/datums/quirks/positive_quirks/chip_connector.dm b/code/datums/quirks/positive_quirks/chip_connector.dm index 6fcc5bf9d31..2035c093699 100644 --- a/code/datums/quirks/positive_quirks/chip_connector.dm +++ b/code/datums/quirks/positive_quirks/chip_connector.dm @@ -22,7 +22,7 @@ connector.Insert(carbon_holder, special = TRUE) /datum/quirk/chip_connector/post_add() - to_chat(quirk_holder, span_boldannounce(desc)) // efficiency is clever laziness + to_chat(quirk_holder, span_bolddanger(desc)) // efficiency is clever laziness /datum/quirk/chip_connector/remove() qdel(connector) diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm index 7d432c1e488..f9d9cfc6121 100644 --- a/code/datums/weather/weather_types/ash_storm.dm +++ b/code/datums/weather/weather_types/ash_storm.dm @@ -12,7 +12,7 @@ weather_duration_upper = 1200 weather_overlay = "ash_storm" - end_message = span_boldannounce("The shrieking wind whips away the last of the ash and falls to its usual murmur. It should be safe to go outside now.") + end_message = span_bolddanger("The shrieking wind whips away the last of the ash and falls to its usual murmur. It should be safe to go outside now.") end_duration = 300 end_overlay = "light_ash" diff --git a/code/datums/weather/weather_types/snow_storm.dm b/code/datums/weather/weather_types/snow_storm.dm index 2b749cdbc84..77aafed4f5d 100644 --- a/code/datums/weather/weather_types/snow_storm.dm +++ b/code/datums/weather/weather_types/snow_storm.dm @@ -14,7 +14,7 @@ use_glow = FALSE end_duration = 100 - end_message = span_boldannounce("The snowfall dies down, it should be safe to go outside again.") + end_message = span_bolddanger("The snowfall dies down, it should be safe to go outside again.") area_type = /area protect_indoors = TRUE diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm index 39fe7ce6cb7..dbaa134f749 100644 --- a/code/game/machinery/newscaster/newscaster_machine.dm +++ b/code/game/machinery/newscaster/newscaster_machine.dm @@ -589,7 +589,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30) else to_chat(user, span_warning("You cannot interface with silicon photo uploading!")) if(!targetcam.stored.len) - to_chat(usr, span_boldannounce("No images saved.")) + to_chat(usr, span_bolddanger("No images saved.")) return var/datum/picture/selection = targetcam.selectpicture(user) if(selection) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 6ccbaa5fa44..70fb3bb6693 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -558,7 +558,7 @@ playsound(src, 'sound/machines/defib/defib_failed.ogg', 50, FALSE) do_cancel() return - user.visible_message(span_boldannounce("[user] shocks [H] with \the [src]!"), span_warning("You shock [H] with \the [src]!")) + user.visible_message(span_bolddanger("[user] shocks [H] with \the [src]!"), span_warning("You shock [H] with \the [src]!")) playsound(src, 'sound/machines/defib/defib_zap.ogg', 100, TRUE, -1) playsound(src, 'sound/items/weapons/egloves.ogg', 100, TRUE, -1) H.emote("scream") diff --git a/code/game/objects/items/devices/scanners/health_analyzer.dm b/code/game/objects/items/devices/scanners/health_analyzer.dm index aedffb566b2..3535bef0074 100644 --- a/code/game/objects/items/devices/scanners/health_analyzer.dm +++ b/code/game/objects/items/devices/scanners/health_analyzer.dm @@ -458,7 +458,7 @@ var/datum/reagent/reagent = r if(reagent.chemical_flags & REAGENT_INVISIBLE) //Don't show hidden chems on scanners continue - render_block += "[round(reagent.volume, 0.001)] units of [reagent.name][reagent.overdosed ? " - [span_boldannounce("OVERDOSING")]" : "."]
" + render_block += "[round(reagent.volume, 0.001)] units of [reagent.name][reagent.overdosed ? " - [span_bolddanger("OVERDOSING")]" : "."]
" if(!length(render_block)) //If no VISIBLY DISPLAYED reagents are present, we report as if there is nothing. render_list += "Subject contains no reagents in their blood.
" @@ -476,11 +476,11 @@ if(bit.chemical_flags & REAGENT_INVISIBLE) continue if(!belly.food_reagents[bit.type]) - render_block += "[round(bit.volume, 0.001)] units of [bit.name][bit.overdosed ? " - [span_boldannounce("OVERDOSING")]" : "."]
" + render_block += "[round(bit.volume, 0.001)] units of [bit.name][bit.overdosed ? " - [span_bolddanger("OVERDOSING")]" : "."]
" else var/bit_vol = bit.volume - belly.food_reagents[bit.type] if(bit_vol > 0) - render_block += "[round(bit_vol, 0.001)] units of [bit.name][bit.overdosed ? " - [span_boldannounce("OVERDOSING")]" : "."]
" + render_block += "[round(bit_vol, 0.001)] units of [bit.name][bit.overdosed ? " - [span_bolddanger("OVERDOSING")]" : "."]
" if(!length(render_block)) render_list += "Subject contains no reagents in their stomach.
" diff --git a/code/game/objects/items/devices/table_clock.dm b/code/game/objects/items/devices/table_clock.dm index d9c5e44fcf7..fcea4c27246 100644 --- a/code/game/objects/items/devices/table_clock.dm +++ b/code/game/objects/items/devices/table_clock.dm @@ -40,7 +40,7 @@ if(break_clock(break_sound = 'sound/effects/magic/clockwork/ark_activation.ogg')) user.visible_message( span_warning("[user] smashes \the [src] so hard it stops breaking!"), - span_boldannounce("I can't stand this stupid machine anymore! Shut up already!"), + span_bolddanger("I can't stand this stupid machine anymore! Shut up already!"), span_notice("You hear repeated smashing!"), ) diff --git a/code/game/objects/items/granters/martial_arts/cqc.dm b/code/game/objects/items/granters/martial_arts/cqc.dm index 7d3f7f2ef9e..4fff32623c8 100644 --- a/code/game/objects/items/granters/martial_arts/cqc.dm +++ b/code/game/objects/items/granters/martial_arts/cqc.dm @@ -3,7 +3,7 @@ name = "old manual" martial_name = "close quarters combat" desc = "A small, black manual. There are drawn instructions of tactical hand-to-hand combat." - greet = span_boldannounce("You've mastered the basics of CQC.") + greet = span_bolddanger("You've mastered the basics of CQC.") icon_state = "cqcmanual" remarks = list( "Kick... Slam...", diff --git a/code/game/objects/items/granters/martial_arts/plasma_fist.dm b/code/game/objects/items/granters/martial_arts/plasma_fist.dm index 22b6b4aefa1..6c185243c70 100644 --- a/code/game/objects/items/granters/martial_arts/plasma_fist.dm +++ b/code/game/objects/items/granters/martial_arts/plasma_fist.dm @@ -3,7 +3,7 @@ name = "frayed scroll" martial_name = "plasma fist" desc = "An aged and frayed scrap of paper written in shifting runes. There are hand-drawn illustrations of pugilism." - greet = span_boldannounce("You have learned the ancient martial art of Plasma Fist. Your combos are extremely hard to pull off, but include some of the most deadly moves ever seen including \ + greet = span_bolddanger("You have learned the ancient martial art of Plasma Fist. Your combos are extremely hard to pull off, but include some of the most deadly moves ever seen including \ the plasma fist, which when pulled off will make someone violently explode.") icon = 'icons/obj/scrolls.dmi' icon_state ="plasmafist" diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm index 2d700cf3ff0..3bab737c9fb 100644 --- a/code/game/objects/items/pet_carrier.dm +++ b/code/game/objects/items/pet_carrier.dm @@ -130,7 +130,7 @@ if(!do_after(user, rand(300, 400), target = user) || open || !locked || !(user in occupants)) return loc.visible_message(span_warning("[user] flips the lock switch on [src] by reaching through!"), null, null, null, user) - to_chat(user, span_boldannounce("Bingo! The lock pops open!")) + to_chat(user, span_bolddanger("Bingo! The lock pops open!")) locked = FALSE playsound(src, 'sound/machines/airlock/boltsup.ogg', 30, TRUE) update_appearance() diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index eb5ade84142..a731772b090 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -297,19 +297,19 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 new_name = "triple-notched claymore" add_atom_colour(rgb(255, 215, 215), ADMIN_COLOUR_PRIORITY) if(4) - to_chat(user, span_notice("You've lost count of how many you've killed.")) + to_chat(user, span_notice("You've lost count of how many you've killed.")) new_name = "many-notched claymore" add_atom_colour(rgb(255, 195, 195), ADMIN_COLOUR_PRIORITY) if(5) - to_chat(user, span_boldannounce("Five voices now echo in your mind, cheering the slaughter.")) + to_chat(user, span_bolddanger("Five voices now echo in your mind, cheering the slaughter.")) new_name = "battle-tested claymore" add_atom_colour(rgb(255, 175, 175), ADMIN_COLOUR_PRIORITY) if(6) - to_chat(user, span_boldannounce("Is this what the vikings felt like? Visions of glory fill your head as you slay your sixth foe.")) + to_chat(user, span_bolddanger("Is this what the vikings felt like? Visions of glory fill your head as you slay your sixth foe.")) new_name = "battle-scarred claymore" add_atom_colour(rgb(255, 155, 155), ADMIN_COLOUR_PRIORITY) if(7) - to_chat(user, span_boldannounce("Kill. Butcher. Conquer.")) + to_chat(user, span_bolddanger("Kill. Butcher. Conquer.")) new_name = "vicious claymore" add_atom_colour(rgb(255, 135, 135), ADMIN_COLOUR_PRIORITY) if(8) diff --git a/code/game/objects/structures/hivebot.dm b/code/game/objects/structures/hivebot.dm index 838113cab8c..19e35d30a5e 100644 --- a/code/game/objects/structures/hivebot.dm +++ b/code/game/objects/structures/hivebot.dm @@ -13,7 +13,7 @@ var/datum/effect_system/fluid_spread/smoke/smoke = new smoke.set_up(2, holder = src, location = loc) smoke.start() - visible_message(span_boldannounce("[src] warps in!")) + visible_message(span_bolddanger("[src] warps in!")) playsound(src.loc, 'sound/effects/empulse.ogg', 25, TRUE) addtimer(CALLBACK(src, PROC_REF(warpbots)), rand(1 SECONDS, 1 MINUTES)) @@ -30,7 +30,7 @@ if("rapid") new /mob/living/basic/hivebot/rapid(get_turf(src)) sleep(10 SECONDS) - visible_message(span_boldannounce("[src] warps out!")) + visible_message(span_bolddanger("[src] warps out!")) playsound(src.loc, 'sound/effects/empulse.ogg', 25, TRUE) qdel(src) return diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm index f9d490a29b2..b53f11c711a 100644 --- a/code/game/objects/structures/icemoon/cave_entrance.dm +++ b/code/game/objects/structures/icemoon/cave_entrance.dm @@ -50,7 +50,7 @@ GLOBAL_LIST_INIT(ore_probability, list( */ /obj/structure/spawner/ice_moon/proc/destroy_effect() playsound(loc,'sound/effects/explosion/explosionfar.ogg', 200, TRUE) - visible_message(span_boldannounce("[src] collapses, sealing everything inside!\nOres fall out of the cave as it is destroyed!")) + visible_message(span_bolddanger("[src] collapses, sealing everything inside!\nOres fall out of the cave as it is destroyed!")) /** * Drops items after the spawner is destroyed @@ -123,7 +123,7 @@ GLOBAL_LIST_INIT(ore_probability, list( /obj/effect/collapsing_demonic_portal/Initialize(mapload) . = ..() playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE) - visible_message(span_boldannounce("[src] begins to collapse, cutting it off from this world!")) + visible_message(span_bolddanger("[src] begins to collapse, cutting it off from this world!")) animate(src, transform = matrix().Scale(0, 1), alpha = 50, time = 5 SECONDS) addtimer(CALLBACK(src, PROC_REF(collapse)), 5 SECONDS) diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm index b169868a85f..0461180721e 100644 --- a/code/game/objects/structures/lavaland/necropolis_tendril.dm +++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm @@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(tendrils, list()) /obj/effect/collapse/Initialize(mapload) . = ..() emitted_light = new(loc) - visible_message(span_boldannounce("The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!")) + visible_message(span_bolddanger("The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!")) balloon_alert_to_viewers("interact to grab loot before collapse!", vision_distance = 7) playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE) addtimer(CALLBACK(src, PROC_REF(collapse)), 5 SECONDS) @@ -132,7 +132,7 @@ GLOBAL_LIST_INIT(tendrils, list()) for(var/mob/M in range(7,src)) shake_camera(M, 15, 1) playsound(get_turf(src),'sound/effects/explosion/explosionfar.ogg', 200, TRUE) - visible_message(span_boldannounce("The tendril falls inward, the ground around it widening into a yawning chasm!")) + visible_message(span_bolddanger("The tendril falls inward, the ground around it widening into a yawning chasm!")) for(var/turf/T in RANGE_TURFS(2,src)) if(HAS_TRAIT(T, TRAIT_NO_TERRAFORM)) continue diff --git a/code/modules/admin/verbs/highlander_datum.dm b/code/modules/admin/verbs/highlander_datum.dm index de7e4918fc0..c574c392882 100644 --- a/code/modules/admin/verbs/highlander_datum.dm +++ b/code/modules/admin/verbs/highlander_datum.dm @@ -11,7 +11,7 @@ GLOBAL_DATUM(highlander_controller, /datum/highlander_controller) . = ..() RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, PROC_REF(new_highlander)) sound_to_playing_players('sound/misc/highlander.ogg') - send_to_playing_players(span_boldannounce("THERE CAN BE ONLY ONE")) + send_to_playing_players(span_bolddanger("THERE CAN BE ONLY ONE")) for(var/obj/item/disk/nuclear/nuke_disk as anything in SSpoints_of_interest.real_nuclear_disks) var/datum/component/stationloving/component = nuke_disk.GetComponent(/datum/component/stationloving) component?.relocate() //Gets it out of bags and such diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index 26cf1222113..e43164419d5 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -493,7 +493,7 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w return SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Mass Braindamage")) for(var/mob/living/carbon/human/H in GLOB.player_list) - to_chat(H, span_boldannounce("You suddenly feel stupid."), confidential = TRUE) + to_chat(H, span_bolddanger("You suddenly feel stupid."), confidential = TRUE) H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 60, 80) message_admins("[key_name_admin(holder)] made everybody brain damaged") if("floorlava") diff --git a/code/modules/antagonists/blob/blob_antag.dm b/code/modules/antagonists/blob/blob_antag.dm index 25bea4b083e..c5dfa6a1e10 100644 --- a/code/modules/antagonists/blob/blob_antag.dm +++ b/code/modules/antagonists/blob/blob_antag.dm @@ -100,7 +100,7 @@ . = ..() if(owner) addtimer(CALLBACK(src, PROC_REF(Activate), TRUE), autoplace_time, TIMER_UNIQUE|TIMER_OVERRIDE) - to_chat(owner, span_boldannounce("You will automatically pop and place your blob core in [DisplayTimeText(autoplace_time)].")) + to_chat(owner, span_bolddanger("You will automatically pop and place your blob core in [DisplayTimeText(autoplace_time)].")) /datum/action/innate/blobpop/Activate(timer_activated = FALSE) var/mob/living/old_body = owner @@ -183,5 +183,3 @@ /obj/effect/dummy/phased_mob/can_blob_attack() return FALSE - - diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm index db40090615b..bb43097bcd2 100644 --- a/code/modules/antagonists/blob/overmind.dm +++ b/code/modules/antagonists/blob/overmind.dm @@ -139,7 +139,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) if(!placed) if(manualplace_min_time && world.time >= manualplace_min_time) to_chat(src, span_boldnotice("You may now place your blob core.")) - to_chat(src, span_boldannounce("You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].")) + to_chat(src, span_bolddanger("You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].")) manualplace_min_time = 0 if(autoplace_max_time && world.time >= autoplace_max_time) place_blob_core(BLOB_RANDOM_PLACEMENT) @@ -261,8 +261,8 @@ GLOBAL_LIST_EMPTY(blob_nodes) return FALSE to_chat(src, span_blobannounce("You are the overmind!")) if(!placed && autoplace_max_time <= world.time) - to_chat(src, span_boldannounce("You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].")) - to_chat(src, span_boldannounce("You [manualplace_min_time ? "will be able to":"can"] manually place your blob core by pressing the Place Blob Core button in the bottom right corner of the screen.")) + to_chat(src, span_bolddanger("You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)].")) + to_chat(src, span_bolddanger("You [manualplace_min_time ? "will be able to":"can"] manually place your blob core by pressing the Place Blob Core button in the bottom right corner of the screen.")) update_health_hud() add_points(0) diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 70c9081c52e..b74de5e146b 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -1031,7 +1031,7 @@ /datum/antagonist/changeling/headslug/greet() play_stinger() - to_chat(owner, span_boldannounce("You are a fresh changeling birthed from a headslug! \ + to_chat(owner, span_bolddanger("You are a fresh changeling birthed from a headslug! \ You aren't as strong as a normal changeling, as you are newly born.")) diff --git a/code/modules/antagonists/fugitive/hunters/hunter.dm b/code/modules/antagonists/fugitive/hunters/hunter.dm index ba266453647..8c68f0b63bf 100644 --- a/code/modules/antagonists/fugitive/hunters/hunter.dm +++ b/code/modules/antagonists/fugitive/hunters/hunter.dm @@ -26,7 +26,7 @@ /datum/antagonist/fugitive_hunter/greet() switch(backstory) if(HUNTER_PACK_COPS) - to_chat(owner, span_boldannounce("Justice has arrived. I am a member of the Spacepol!")) + to_chat(owner, span_bolddanger("Justice has arrived. I am a member of the Spacepol!")) to_chat(owner, "The criminals should be on the station, we have special huds implanted to recognize them.") to_chat(owner, "As we have lost pretty much all power over these damned lawless megacorporations, it's a mystery if their security will cooperate with us.") if(HUNTER_PACK_RUSSIAN) @@ -47,7 +47,7 @@ to_chat(owner, span_danger("Your mission is simple. Infiltrate the facility and extract the target, dead or alive.")) to_chat(owner, span_danger("This is a stealth infiltration mission in hostile enemy territory. Be wary, and avoid being caught if possible.")) - to_chat(owner, span_boldannounce("You are not an antagonist in that you may kill whomever you please, but you can do anything to ensure the capture of the fugitives, even if that means going through the station.")) + to_chat(owner, span_bolddanger("You are not an antagonist in that you may kill whomever you please, but you can do anything to ensure the capture of the fugitives, even if that means going through the station.")) owner.announce_objectives() /datum/antagonist/fugitive_hunter/create_team(datum/team/fugitive_hunters/new_team) diff --git a/code/modules/antagonists/highlander/highlander.dm b/code/modules/antagonists/highlander/highlander.dm index 184ca9c4f77..fa2dcee4d36 100644 --- a/code/modules/antagonists/highlander/highlander.dm +++ b/code/modules/antagonists/highlander/highlander.dm @@ -43,7 +43,7 @@ . = ..() /datum/antagonist/highlander/greet() - to_chat(owner, span_boldannounce("Your [sword.name] cries out for blood. Claim the lives of others, and your own will be restored!\n\ + to_chat(owner, span_bolddanger("Your [sword.name] cries out for blood. Claim the lives of others, and your own will be restored!\n\ Activate it in your hand, and it will lead to the nearest target. Attack the nuclear authentication disk with it, and you will store it.")) owner.announce_objectives() @@ -88,7 +88,7 @@ name = "\improper highlander" /datum/antagonist/highlander/robot/greet() - to_chat(owner, span_boldannounce("Your integrated claymore cries out for blood. Claim the lives of others, and your own will be restored!\n\ + to_chat(owner, span_bolddanger("Your integrated claymore cries out for blood. Claim the lives of others, and your own will be restored!\n\ Activate it in your hand, and it will lead to the nearest target. Attack the nuclear authentication disk with it, and you will store it.")) /datum/antagonist/highlander/robot/give_equipment() diff --git a/code/modules/antagonists/malf_ai/malf_ai_modules.dm b/code/modules/antagonists/malf_ai/malf_ai_modules.dm index f91d1b90ba4..1776371bae9 100644 --- a/code/modules/antagonists/malf_ai/malf_ai_modules.dm +++ b/code/modules/antagonists/malf_ai/malf_ai_modules.dm @@ -191,30 +191,30 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module/malf)) set waitfor = FALSE message_admins("[key_name_admin(owner)][ADMIN_FLW(owner)] has activated AI Doomsday.") var/pass = prob(10) ? "******" : "hunter2" - to_chat(owner, "run -o -a 'selfdestruct'") + to_chat(owner, "run -o -a 'selfdestruct'") sleep(0.5 SECONDS) if(QDELETED(owner) || !isturf(owner_AI.loc)) active = FALSE return - to_chat(owner, "Running executable 'selfdestruct'...") + to_chat(owner, "Running executable 'selfdestruct'...") sleep(rand(10, 30)) if(QDELETED(owner) || !isturf(owner_AI.loc)) active = FALSE return owner.playsound_local(owner, 'sound/announcer/alarm/bloblarm.ogg', 50, 0, use_reverb = FALSE) to_chat(owner, span_userdanger("!!! UNAUTHORIZED SELF-DESTRUCT ACCESS !!!")) - to_chat(owner, span_boldannounce("This is a class-3 security violation. This incident will be reported to Central Command.")) + to_chat(owner, span_bolddanger("This is a class-3 security violation. This incident will be reported to Central Command.")) for(var/i in 1 to 3) sleep(2 SECONDS) if(QDELETED(owner) || !isturf(owner_AI.loc)) active = FALSE return - to_chat(owner, span_boldannounce("Sending security report to Central Command.....[rand(0, 9) + (rand(20, 30) * i)]%")) + to_chat(owner, span_bolddanger("Sending security report to Central Command.....[rand(0, 9) + (rand(20, 30) * i)]%")) sleep(0.3 SECONDS) if(QDELETED(owner) || !isturf(owner_AI.loc)) active = FALSE return - to_chat(owner, "auth 'akjv9c88asdf12nb' [pass]") + to_chat(owner, "auth 'akjv9c88asdf12nb' [pass]") owner.playsound_local(owner, 'sound/items/timer.ogg', 50, 0, use_reverb = FALSE) sleep(3 SECONDS) if(QDELETED(owner) || !isturf(owner_AI.loc)) @@ -232,7 +232,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module/malf)) if(QDELETED(owner) || !isturf(owner_AI.loc)) active = FALSE return - to_chat(owner, "Y") + to_chat(owner, "Y") sleep(1.5 SECONDS) if(QDELETED(owner) || !isturf(owner_AI.loc)) active = FALSE @@ -243,7 +243,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module/malf)) if(QDELETED(owner) || !isturf(owner_AI.loc)) active = FALSE return - to_chat(owner, "Y") + to_chat(owner, "Y") sleep(rand(15, 25)) if(QDELETED(owner) || !isturf(owner_AI.loc)) active = FALSE @@ -254,7 +254,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module/malf)) if(QDELETED(owner) || !isturf(owner_AI.loc)) active = FALSE return - to_chat(owner, "[pass]") + to_chat(owner, "[pass]") sleep(4 SECONDS) if(QDELETED(owner) || !isturf(owner_AI.loc)) active = FALSE diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm index 7445b20cb90..8598a929454 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm @@ -653,7 +653,7 @@ GLOBAL_VAR(station_nuke_source) if(istype(gibbed.loc, /obj/structure/closet/secure_closet/freezer)) var/obj/structure/closet/secure_closet/freezer/freezer = gibbed.loc if(!freezer.jones) - to_chat(gibbed, span_boldannounce("You hold onto [freezer] as [source] goes off. \ + to_chat(gibbed, span_bolddanger("You hold onto [freezer] as [source] goes off. \ Luckily, as [freezer] is lead-lined, you survive.")) freezer.jones = TRUE return FALSE diff --git a/code/modules/antagonists/revolution/enemy_of_the_state.dm b/code/modules/antagonists/revolution/enemy_of_the_state.dm index 90a6431d428..d835655b7ef 100644 --- a/code/modules/antagonists/revolution/enemy_of_the_state.dm +++ b/code/modules/antagonists/revolution/enemy_of_the_state.dm @@ -30,7 +30,7 @@ /datum/antagonist/enemy_of_the_state/greet() . = ..() to_chat(owner, span_userdanger("The revolution is dead.")) - to_chat(owner, span_boldannounce("You're an enemy of the state to Nanotrasen. You're a loose end to the Syndicate.")) + to_chat(owner, span_bolddanger("You're an enemy of the state to Nanotrasen. You're a loose end to the Syndicate.")) to_chat(owner, "It's time to live out your days as an exile... Or go out in one last big bang.") owner.announce_objectives() diff --git a/code/modules/antagonists/santa/santa.dm b/code/modules/antagonists/santa/santa.dm index 2a5eb75e5c8..f3e1cbd02b9 100644 --- a/code/modules/antagonists/santa/santa.dm +++ b/code/modules/antagonists/santa/santa.dm @@ -14,7 +14,7 @@ /datum/antagonist/santa/greet() . = ..() - to_chat(owner, span_boldannounce("Your objective is to bring joy to the people on this station. You have a magical bag, which generates presents as long as you have it! You can examine the presents to take a peek inside, to make sure that you give the right gift to the right person.")) + to_chat(owner, span_bolddanger("Your objective is to bring joy to the people on this station. You have a magical bag, which generates presents as long as you have it! You can examine the presents to take a peek inside, to make sure that you give the right gift to the right person.")) /datum/antagonist/santa/proc/give_equipment() var/mob/living/carbon/human/H = owner.current diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index e56f651a095..465765c75a3 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -29,7 +29,7 @@ if(charges > 0) new /obj/effect/rend(get_turf(user), spawn_type, spawn_amt, rend_desc, spawn_fast) charges-- - user.visible_message(span_boldannounce("[src] hums with power as [user] deals a blow to [activate_descriptor] itself!")) + user.visible_message(span_bolddanger("[src] hums with power as [user] deals a blow to [activate_descriptor] itself!")) else to_chat(user, span_danger("The unearthly energies that powered the blade are now dormant.")) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 4afa1bba731..75ee0a6a43e 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -137,11 +137,11 @@ victim.update_damage_overlays() else if(ismouse(target)) var/mob/living/basic/mouse/splatted = target - visible_message(span_boldannounce("SPLAT!")) + visible_message(span_bolddanger("SPLAT!")) splatted.splat() // mousetraps are instadeath for mice else if(isregalrat(target)) - visible_message(span_boldannounce("Skreeeee!")) //He's simply too large to be affected by a tiny mouse trap. + visible_message(span_bolddanger("Skreeeee!")) //He's simply too large to be affected by a tiny mouse trap. playsound(src, 'sound/effects/snap.ogg', 50, TRUE) pulse() diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index ff09ef15ea5..25122b08a21 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -698,8 +698,8 @@ if(!holding) return FALSE if(valve_open) - message_admins("[ADMIN_LOOKUPFLW(user)] removed [holding] from [src] with valve still open [wire_pulsed ? "via wire pulse" : ""] at [ADMIN_VERBOSEJMP(src)] releasing contents into the [span_boldannounce("air")].") - user.investigate_log("removed the [holding] [wire_pulsed ? "via wire pulse" : ""], leaving the valve open and transferring into the [span_boldannounce("air")].", INVESTIGATE_ATMOS) + message_admins("[ADMIN_LOOKUPFLW(user)] removed [holding] from [src] with valve still open [wire_pulsed ? "via wire pulse" : ""] at [ADMIN_VERBOSEJMP(src)] releasing contents into the [span_bolddanger("air")].") + user.investigate_log("removed the [holding] [wire_pulsed ? "via wire pulse" : ""], leaving the valve open and transferring into the [span_bolddanger("air")].", INVESTIGATE_ATMOS) replace_tank(user, FALSE) return TRUE diff --git a/code/modules/bitrunning/components/virtual_entity.dm b/code/modules/bitrunning/components/virtual_entity.dm index db81f376a80..dba5e9db34e 100644 --- a/code/modules/bitrunning/components/virtual_entity.dm +++ b/code/modules/bitrunning/components/virtual_entity.dm @@ -31,7 +31,7 @@ /datum/component/virtual_entity/proc/jailbreak_mobs() SIGNAL_HANDLER - to_chat(parent, span_boldannounce("You shiver for a moment with a sense of clarity you haven't felt before.")) + to_chat(parent, span_bolddanger("You shiver for a moment with a sense of clarity you haven't felt before.")) to_chat(parent, span_notice("You could go anywhere, do anything! You could leave this simulation right now if you wanted!")) to_chat(parent, span_danger("But be warned, quantum entanglement will interfere with any previous lives.")) to_chat(parent, span_notice("You'll have just one chance to go nova, and there's no turning back.")) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 127840631d6..dd09deae540 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -66,7 +66,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") if(handle_spam_prevention(msg,MUTE_OOC)) return if(findtext(msg, "byond://")) - to_chat(src, span_boldannounce("Advertising other servers is not allowed.")) + to_chat(src, span_boldannounce("Advertising other servers is not allowed.")) log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]") message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]") return diff --git a/code/modules/hallucination/station_message.dm b/code/modules/hallucination/station_message.dm index 9441cdeb42a..55b44d18463 100644 --- a/code/modules/hallucination/station_message.dm +++ b/code/modules/hallucination/station_message.dm @@ -112,7 +112,7 @@ /datum/hallucination/station_message/supermatter_delam/start() SEND_SOUND(hallucinator, 'sound/effects/magic/charge.ogg') - to_chat(hallucinator, span_boldannounce("You feel reality distort for a moment...")) + to_chat(hallucinator, span_bolddanger("You feel reality distort for a moment...")) return ..() /datum/hallucination/station_message/clock_cult_ark diff --git a/code/modules/hydroponics/grown/weeds/nettle.dm b/code/modules/hydroponics/grown/weeds/nettle.dm index dec1e8b119e..2420ba8942c 100644 --- a/code/modules/hydroponics/grown/weeds/nettle.dm +++ b/code/modules/hydroponics/grown/weeds/nettle.dm @@ -58,7 +58,7 @@ /obj/item/food/grown/nettle/death seed = /obj/item/seeds/nettle/death name = "\improper deathnettle" - desc = "The glowing nettle incites rage in you just from looking at it!" + desc = "The glowing nettle incites rage in you just from looking at it!" icon_state = "deathnettle" inhand_icon_state = "deathnettle" bite_consumption_mod = 4 // I guess if you really wanted to diff --git a/code/modules/language/_language_manuals.dm b/code/modules/language/_language_manuals.dm index 7a4298a06b1..507d663ef86 100644 --- a/code/modules/language/_language_manuals.dm +++ b/code/modules/language/_language_manuals.dm @@ -16,7 +16,7 @@ to_chat(user, span_boldwarning("You start skimming through [src], but you already know [initial(language.name)].")) return - to_chat(user, span_boldannounce("You start skimming through [src], and [flavour_text].")) + to_chat(user, span_bolddanger("You start skimming through [src], and [flavour_text].")) user.grant_language(language) user.remove_blocked_language(language, source=LANGUAGE_ALL) diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm index 6baaf8e5660..af81563681c 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm @@ -94,7 +94,7 @@ //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/structure/necropolis_gate/attack_hand(mob/user, list/modifiers) if(locked) - to_chat(user, span_boldannounce("It's [open ? "stuck open":"locked"].")) + to_chat(user, span_bolddanger("It's [open ? "stuck open":"locked"].")) return toggle_the_gate(user) return ..() @@ -163,7 +163,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) var/safety = tgui_alert(user, "You think this might be a bad idea...", "Knock on the door?", list("Proceed", "Abort")) if(safety == "Abort" || !in_range(src, user) || !src || open || changing_openness || user.incapacitated) return - user.visible_message(span_warning("[user] knocks on [src]..."), span_boldannounce("You tentatively knock on [src]...")) + user.visible_message(span_warning("[user] knocks on [src]..."), span_bolddanger("You tentatively knock on [src]...")) playsound(user.loc, 'sound/effects/shieldbash.ogg', 100, TRUE) sleep(5 SECONDS) return ..() diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm index 6e67c0831d3..f925fa651a8 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm @@ -49,4 +49,4 @@ user.updateappearance(mutcolor_update=1) user.domutcheck() user.visible_message(span_warning("[user]'s appearance shifts into [H]'s!"), \ - span_boldannounce("[H.p_They()] think[H.p_s()] [H.p_theyre()] sooo much better than you. Not anymore, [H.p_they()] won't.")) + span_bolddanger("[H.p_They()] think[H.p_s()] [H.p_theyre()] sooo much better than you. Not anymore, [H.p_they()] won't.")) diff --git a/code/modules/mob/living/basic/bots/_bots.dm b/code/modules/mob/living/basic/bots/_bots.dm index 19534cebafd..7a34912f406 100644 --- a/code/modules/mob/living/basic/bots/_bots.dm +++ b/code/modules/mob/living/basic/bots/_bots.dm @@ -631,7 +631,7 @@ GLOBAL_LIST_INIT(command_strings, list( to_chat(src, span_boldnotice(get_emagged_message())) return if(!(bot_access_flags & BOT_COVER_HACKED)) - to_chat(the_user, span_boldannounce("You fail to repair [src]'s [hackables].")) + to_chat(the_user, span_bolddanger("You fail to repair [src]'s [hackables].")) return bot_access_flags &= ~(BOT_COVER_EMAGGED|BOT_COVER_HACKED) to_chat(the_user, span_notice("You reset the [src]'s [hackables].")) diff --git a/code/modules/mob/living/basic/drone/interaction.dm b/code/modules/mob/living/basic/drone/interaction.dm index 58b7cd88ef2..2e22bb99752 100644 --- a/code/modules/mob/living/basic/drone/interaction.dm +++ b/code/modules/mob/living/basic/drone/interaction.dm @@ -148,7 +148,7 @@ Stun(40) visible_message(span_warning("[src]'s display glows a vicious red!"), \ span_userdanger("ERROR: LAW OVERRIDE DETECTED")) - to_chat(src, span_boldannounce("From now on, these are your laws:")) + to_chat(src, span_bolddanger("From now on, these are your laws:")) laws = \ "1. You must always involve yourself in the matters of other beings, even if such matters conflict with Law Two or Law Three.\n"+\ "2. You may harm any being, regardless of intent or circumstance.\n"+\ diff --git a/code/modules/mob/living/basic/space_fauna/paper_wizard/paper_wizard.dm b/code/modules/mob/living/basic/space_fauna/paper_wizard/paper_wizard.dm index cf76f347be3..f2e33eaacd9 100644 --- a/code/modules/mob/living/basic/space_fauna/paper_wizard/paper_wizard.dm +++ b/code/modules/mob/living/basic/space_fauna/paper_wizard/paper_wizard.dm @@ -160,7 +160,7 @@ /obj/effect/temp_visual/paperwiz_dying/Initialize(mapload) . = ..() - visible_message(span_boldannounce("The wizard cries out in pain as a gate appears behind him, sucking him in!")) + visible_message(span_bolddanger("The wizard cries out in pain as a gate appears behind him, sucking him in!")) playsound(get_turf(src), 'sound/effects/magic/mandswap.ogg', 50, vary = TRUE, pressure_affected = TRUE) playsound(get_turf(src), 'sound/effects/hallucinations/wail.ogg', 50, vary = TRUE, pressure_affected = TRUE) RegisterSignal(src, COMSIG_PREQDELETED, PROC_REF(on_delete)) @@ -175,4 +175,3 @@ new /obj/effect/temp_visual/paper_scatter(current_turf) new /obj/item/clothing/suit/wizrobe/paper(current_turf) new /obj/item/clothing/head/collectable/paper(current_turf) - diff --git a/code/modules/mob/living/basic/space_fauna/revenant/revenant_harvest.dm b/code/modules/mob/living/basic/space_fauna/revenant/revenant_harvest.dm index 366cb1c5065..9ce61bf478f 100644 --- a/code/modules/mob/living/basic/space_fauna/revenant/revenant_harvest.dm +++ b/code/modules/mob/living/basic/space_fauna/revenant/revenant_harvest.dm @@ -88,7 +88,7 @@ if(target.stat == CONSCIOUS) to_chat(src, span_revenwarning("[target_Theyre] now powerful enough to fight off your draining!")) - to_chat(target, span_boldannounce("You feel something tugging across your body before subsiding.")) //hey, wait a minute... + to_chat(target, span_bolddanger("You feel something tugging across your body before subsiding.")) //hey, wait a minute... return FALSE to_chat(src, span_revenminor("You begin siphoning essence from [target]'s soul.")) diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 532fa10727e..85b0adb0001 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -75,11 +75,11 @@ return switch(stat) if(DEAD,UNCONSCIOUS) - . += span_boldannounce("[src] is not moving.") + . += span_bolddanger("[src] is not moving.") if(CONSCIOUS) - . += span_boldannounce("[src] seems to be active!") + . += span_bolddanger("[src] seems to be active!") if (sterile) - . += span_boldannounce("It looks like the proboscis has been removed.") + . += span_bolddanger("It looks like the proboscis has been removed.") /obj/item/clothing/mask/facehugger/should_atmos_process(datum/gas_mixture/air, exposed_temperature) return (exposed_temperature > 300) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 1a5e4b60ecc..8d9f8c523b6 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -578,7 +578,7 @@ body_part.check_for_injuries(src, combined_msg) for(var/t in missing) - combined_msg += span_boldannounce("Your [parse_zone(t)] is missing!") + combined_msg += span_bolddanger("Your [parse_zone(t)] is missing!") if(is_bleeding()) var/list/obj/item/bodypart/bleeding_limbs = list() diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm index cefd9d144b7..1754a89aa5c 100644 --- a/code/modules/mob/living/silicon/laws.dm +++ b/code/modules/mob/living/silicon/laws.dm @@ -24,7 +24,7 @@ /mob/living/silicon/proc/post_lawchange(announce = TRUE) throw_alert(ALERT_NEW_LAW, /atom/movable/screen/alert/newlaw) if(announce && last_lawchange_announce != world.time) - to_chat(src, span_boldannounce("Your laws have been changed.")) + to_chat(src, span_bolddanger("Your laws have been changed.")) SEND_SOUND(src, sound('sound/machines/cryo_warning.ogg')) // lawset modules cause this function to be executed multiple times in a tick, so we wait for the next tick in order to be able to see the entire lawset addtimer(CALLBACK(src, PROC_REF(show_laws)), 0) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index a592a605e5a..d4beec00009 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -572,7 +572,7 @@ removing.update_appearance() else - to_chat(src, span_boldannounce("Oops! Something went very wrong, your MMI was unable to receive your mind. \ + to_chat(src, span_bolddanger("Oops! Something went very wrong, your MMI was unable to receive your mind. \ You have been ghosted. Please make a bug report so we can fix this bug.")) ghostize() stack_trace("Borg MMI lacked a brainmob") @@ -1077,4 +1077,3 @@ buckled_mob.Paralyze(1 SECONDS) unbuckle_mob(buckled_mob) do_sparks(5, 0, src) - diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 2c5d4c6aa91..38599c20465 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -1014,7 +1014,7 @@ Pass a positive integer as an argument to override a bot's default speed. to_chat(src, span_boldnotice(get_emagged_message())) return if(!(bot_cover_flags & BOT_COVER_HACKED)) - to_chat(user, span_boldannounce("You fail to repair [src]'s [hackables].")) + to_chat(user, span_bolddanger("You fail to repair [src]'s [hackables].")) return bot_cover_flags &= ~(BOT_COVER_EMAGGED|BOT_COVER_HACKED) to_chat(user, span_notice("You reset the [src]'s [hackables].")) diff --git a/code/modules/pai/pai.dm b/code/modules/pai/pai.dm index ee732432851..728ac6427ce 100644 --- a/code/modules/pai/pai.dm +++ b/code/modules/pai/pai.dm @@ -398,7 +398,7 @@ master_ref = WEAKREF(master) master_name = master.real_name master_dna = master.dna.unique_enzymes - to_chat(src, span_boldannounce("You have been bound to a new master: [user.real_name]!")) + to_chat(src, span_bolddanger("You have been bound to a new master: [user.real_name]!")) holochassis_ready = TRUE return TRUE diff --git a/code/modules/pai/software.dm b/code/modules/pai/software.dm index 59db3716107..285193c7e4c 100644 --- a/code/modules/pai/software.dm +++ b/code/modules/pai/software.dm @@ -171,7 +171,7 @@ if(!holder.has_dna()) balloon_alert(src, "no dna detected!") return FALSE - to_chat(src, span_boldannounce(("[holder]'s UE string: [holder.dna.unique_enzymes]"))) + to_chat(src, span_bolddanger(("[holder]'s UE string: [holder.dna.unique_enzymes]"))) to_chat(src, span_notice("DNA [holder.dna.unique_enzymes == master_dna ? "matches" : "does not match"] our stored Master's DNA.")) return TRUE diff --git a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm index 4fe8863815a..e1d2a25d4da 100644 --- a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm +++ b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm @@ -40,9 +40,9 @@ message = "You hear a lot of rattling in the disposal pipes around you as reality itself distorts. Yet, you feel safe." else message = "You hold onto \the [victim.loc] as hard as you can, as reality distorts around you. You feel safe." - to_chat(victim, span_boldannounce(message)) + to_chat(victim, span_bolddanger(message)) continue - to_chat(victim, span_boldannounce("You feel reality distort for a moment...")) + to_chat(victim, span_bolddanger("You feel reality distort for a moment...")) if (isliving(victim)) var/mob/living/living_victim = victim living_victim.add_mood_event("delam", /datum/mood_event/delam) @@ -161,7 +161,7 @@ for(var/mob/player as anything in GLOB.player_list) if(!isdead(player)) var/mob/living/living_player = player - to_chat(player, span_boldannounce("Everything around you is resonating with a powerful energy. This can't be good.")) + to_chat(player, span_bolddanger("Everything around you is resonating with a powerful energy. This can't be good.")) living_player.add_mood_event("cascade", /datum/mood_event/cascade) SEND_SOUND(player, 'sound/effects/magic/charge.ogg') diff --git a/code/modules/power/supermatter/supermatter_hit_procs.dm b/code/modules/power/supermatter/supermatter_hit_procs.dm index 167ee7988b1..d2e87ef4e54 100644 --- a/code/modules/power/supermatter/supermatter_hit_procs.dm +++ b/code/modules/power/supermatter/supermatter_hit_procs.dm @@ -48,7 +48,7 @@ if(!is_valid_z_level(get_turf(hearing_mob), sm_turf)) continue SEND_SOUND(hearing_mob, 'sound/effects/supermatter.ogg') //everyone goan know bout this - to_chat(hearing_mob, span_boldannounce("A horrible screeching fills your ears, and a wave of dread washes over you...")) + to_chat(hearing_mob, span_bolddanger("A horrible screeching fills your ears, and a wave of dread washes over you...")) qdel(src) return gain diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 0814834b25a..f331dcfbab7 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -578,7 +578,7 @@ required_reagents = list(/datum/reagent/teslium = 1, /datum/reagent/water = 1) strengthdiv = 100 modifier = -100 - mix_message = span_boldannounce("The teslium starts to spark as electricity arcs away from it!") + mix_message = span_bolddanger("The teslium starts to spark as electricity arcs away from it!") mix_sound = 'sound/machines/defib/defib_zap.ogg' var/zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN | ZAP_LOW_POWER_GEN reaction_tags = REACTION_TAG_EASY | REACTION_TAG_EXPLOSIVE | REACTION_TAG_DANGEROUS @@ -640,4 +640,4 @@ /datum/chemical_reaction/reagent_explosion/patriotism_overload required_reagents = list(/datum/reagent/consumable/ethanol/planet_cracker = 1, /datum/reagent/consumable/ethanol/triumphal_arch = 1) strengthdiv = 20 - mix_message = span_boldannounce("The two patriotic drinks instantly reject each other!") + mix_message = span_bolddanger("The two patriotic drinks instantly reject each other!") diff --git a/code/modules/religion/sparring/sparring_datum.dm b/code/modules/religion/sparring/sparring_datum.dm index 8e01403e5a6..fc128a401cc 100644 --- a/code/modules/religion/sparring/sparring_datum.dm +++ b/code/modules/religion/sparring/sparring_datum.dm @@ -227,9 +227,9 @@ cleanup_sparring_match() if(chaplain) //flubing means we don't know who is still standing - to_chat(chaplain, span_boldannounce("The match was flub'd! No winners, no losers. You may restart the match with another contract.")) + to_chat(chaplain, span_bolddanger("The match was flub'd! No winners, no losers. You may restart the match with another contract.")) if(opponent) - to_chat(opponent, span_boldannounce("The match was flub'd! No winners, no losers.")) + to_chat(opponent, span_bolddanger("The match was flub'd! No winners, no losers.")) qdel(src) ///helper to remove all the effects after a match ends @@ -243,8 +243,8 @@ /datum/sparring_match/proc/end_match(mob/living/carbon/human/winner, mob/living/carbon/human/loser, violation_victory = FALSE) cleanup_sparring_match() - to_chat(chaplain, span_boldannounce("[violation_victory ? "[loser] DISQUALIFIED!" : ""] [winner] HAS WON!")) - to_chat(opponent, span_boldannounce("[violation_victory ? "[loser] DISQUALIFIED!" : ""] [winner] HAS WON!")) + to_chat(chaplain, span_bolddanger("[violation_victory ? "[loser] DISQUALIFIED!" : ""] [winner] HAS WON!")) + to_chat(opponent, span_bolddanger("[violation_victory ? "[loser] DISQUALIFIED!" : ""] [winner] HAS WON!")) win(winner, loser, violation_victory) lose(loser, winner) if(stakes_condition != STAKES_YOUR_SOUL) diff --git a/code/modules/vehicles/cars/vim.dm b/code/modules/vehicles/cars/vim.dm index e2d9c50e5d6..e762aec22bd 100644 --- a/code/modules/vehicles/cars/vim.dm +++ b/code/modules/vehicles/cars/vim.dm @@ -46,7 +46,7 @@ /obj/vehicle/sealed/car/vim/atom_destruction(damage_flag) new /obj/effect/decal/cleanable/oil(get_turf(src)) do_sparks(5, TRUE, src) - visible_message(span_boldannounce("[src] blows apart!")) + visible_message(span_bolddanger("[src] blows apart!")) return ..() /obj/vehicle/sealed/car/vim/mob_try_enter(mob/entering)