| TITLE | (Return to main menu)
"
if(5)
//dat += "ERROR" //VOREStation Removal
- //dat+= "Library Database is in Secure Management Mode.
\ //VOREStation Removal
+ //dat+= span_red("Library Database is in Secure Management Mode.") + "
\ //VOREStation Removal
//Contact a System Administrator for more information.
" //VOREStation Removal
//VOREstation Edit Start
dat += "Upload a New Title"
@@ -261,9 +261,9 @@
scanner = S
break
if(!scanner)
- dat += "No scanner found within wireless network range.
"
+ dat += span_red("No scanner found within wireless network range.") + "
"
else if(!scanner.cache)
- dat += "No data found in scanner memory.
"
+ dat += span_red("No data found in scanner memory.") + "
"
else
dat += {"Data marked for upload...
Title: [scanner.cache.name]
"}
@@ -283,10 +283,10 @@
dat += "External Archive" //VOREStation Edit
establish_old_db_connection()
- //dat += "Warning: System Administrator has slated this archive for removal. Personal uploads should be taken to the NT board of internal literature." //VOREStation Removal
+ //dat += "" + span_red("arning: System Administrator has slated this archive for removal. Personal uploads should be taken to the NT board of internal literature.") + "" //VOREStation Removal
if(!SSdbcore.IsConnected()) //CHOMPEdit TGSQL
- dat += "ERROR: Unable to contact External Archive. Please contact your system administrator for assistance."
+ dat += span_red(span_bold("ERROR") + ": Unable to contact External Archive. Please contact your system administrator for assistance.")
else
dat += {"(Order book by SS13BN)
@@ -323,7 +323,7 @@
establish_old_db_connection()
if(!SSdbcore.IsConnected())
- dat += "ERROR: Unable to contact External Archive. Please contact your system administrator for assistance."
+ dat += span_red(span_bold("ERROR") + ": Unable to contact External Archive. Please contact your system administrator for assistance.")
else
dat += {"(Order book by SS13BN)
@@ -390,7 +390,7 @@
else
for (var/mob/V in hearers(src))
- V.show_message("[src]'s monitor flashes, \"Bible printer currently unavailable, please wait a moment.\"")
+ V.show_message(span_infoplain(span_bold("[src]") + "'s monitor flashes, \"Bible printer currently unavailable, please wait a moment.\""))
if("7")
screenstate = 7
@@ -472,7 +472,7 @@
tgui_alert_async(usr, "Connection to Archive has been severed. Aborting.")
if(bibledelay)
for (var/mob/V in hearers(src))
- V.show_message("[src]'s monitor flashes, \"Printer unavailable. Please allow a short time before attempting to print.\"")
+ V.show_message(span_infoplain(span_bold("[src]") + "'s monitor flashes, \"Printer unavailable. Please allow a short time before attempting to print.\""))
else
bibledelay = 1
spawn(6)
@@ -532,7 +532,7 @@
usr.set_machine(src)
var/dat = "Scanner Control Interface\n" //
if(cache)
- dat += "Data stored in memory.
"
+ dat += span_darkgray("Data stored in memory.") + "
"
else
dat += "No data stored in memory.
"
dat += "\[Scan\]"
diff --git a/code/modules/lore_codex/codex_tree.dm b/code/modules/lore_codex/codex_tree.dm
index c56fd02b03..c6c00643f8 100644
--- a/code/modules/lore_codex/codex_tree.dm
+++ b/code/modules/lore_codex/codex_tree.dm
@@ -71,7 +71,7 @@
var/datum/lore/codex/checked = current_page["[user]"]
if(istype(checked))
var/output = ""
- output = "[checked.name]"
+ output = span_bold("[checked.name]")
while(checked.parent)
output = "[checked.parent.name] \> [output]"
checked = checked.parent
diff --git a/code/modules/lore_codex/lore_data/main.dm b/code/modules/lore_codex/lore_data/main.dm
index 7b43a25d5f..7a263baf74 100644
--- a/code/modules/lore_codex/lore_data/main.dm
+++ b/code/modules/lore_codex/lore_data/main.dm
@@ -19,7 +19,7 @@
// We're a bird.
/datum/lore/codex/page/about_lore
name = "About"
- data = "The Traveler's Guide to Human Space is a series of books detailing a specific location inside a location colonized by humans. \
+ data = span_italics("The Traveler's Guide to Human Space") + " is a series of books detailing a specific location inside a location colonized by humans. \
This book is for the system Vir, and was written by Eshi Tache, an explorer whom has visited many star systems, and \
has personally visited and seen many of the locations described inside this book. Two other people have also assisted in the creation of this \
book, being Qooqr Volquum, whom is an expert on synthetics, and Damian Fischer, a historian. Together, they provide valuable information and facts that lie outside of Tache's expertise.\
@@ -28,5 +28,5 @@
to an immigrant from another system or even from outside human space, and anyone inbetween. The publisher wishes to note that any opinions expressed \
in this text does not reflect the opinions of the publisher, and are instead the author's.\
\
- Eshi Tache has also written other The Traveler's Guide books, including Sol Edition, Tau Ceti Edition, Alpha Centauri Edition, and more, \
- which you can find in your local book store, library, or e-reader device."
\ No newline at end of file
+ Eshi Tache has also written other " + span_italics("The Traveler's Guide") + " books, including " + span_italics("Sol Edition") + ", " + span_italics("Tau Ceti Edition") + ", " + span_italics("Alpha Centauri Edition") + ", and more, \
+ which you can find in your local book store, library, or e-reader device."
diff --git a/code/modules/lore_codex/lore_data_vr/important_locations.dm b/code/modules/lore_codex/lore_data_vr/important_locations.dm
index 2cdc93ba8d..ddf3d4092c 100644
--- a/code/modules/lore_codex/lore_data_vr/important_locations.dm
+++ b/code/modules/lore_codex/lore_data_vr/important_locations.dm
@@ -119,7 +119,7 @@
/datum/lore/codex/page/virgo_central_command/add_content()
name = "Virgo Central Command (Colony)"
keywords += list("Virgo Central Command")
- data = "This page has been ripped out. Odd."
+ data = span_italics("This page has been ripped out. Odd.")
/*data = "The Virgo Central Command is a large facility on [quick_link("Virgo-3B")] which handles the loading and \
unloading, refuelling, and general maintenance of large spacecraft. The main structure is owned by \
[quick_link("NanoTrasen")], but individual offices, docking/loading bays, and warehouses are often leased to individuals \
diff --git a/code/modules/lore_codex/lore_data_vr/political_parties.dm b/code/modules/lore_codex/lore_data_vr/political_parties.dm
index 1a768ff9e0..e13f8395d3 100644
--- a/code/modules/lore_codex/lore_data_vr/political_parties.dm
+++ b/code/modules/lore_codex/lore_data_vr/political_parties.dm
@@ -1,6 +1,6 @@
/datum/lore/codex/category/political_factions
name = "Political Factions"
- data = "For some weird reason, this section is blank. This looks like a publishing error."
+ data = span_italics("For some weird reason, this section is blank. This looks like a publishing error.")
/*data = "Those wishing to immigrate to somewhere in Virgo-Erigone, or otherwise plan to stay for a long time should get to know human politics. \
There are presently three major political parties that exist throughout SolGov space, being the Icarus Front, the Shadow Coalition, and \
the Sol Economic Organization, and several smaller ones which tend to align themselves among one of the major parties. In the Virgo-Erigone system, the \
@@ -12,4 +12,4 @@
/datum/lore/codex/page/blank/add_content()
name = "Blank Page"
keywords += list("Blank")
- data = "For some weird reason, this section is blank. This looks like a publishing error." // ToDo: A lot.
+ data = span_italics("For some weird reason, this section is blank. This looks like a publishing error.") // ToDo: A lot.
diff --git a/code/modules/makeup/nailpolish.dm b/code/modules/makeup/nailpolish.dm
index ea91d064f8..8fe3e12ac7 100644
--- a/code/modules/makeup/nailpolish.dm
+++ b/code/modules/makeup/nailpolish.dm
@@ -77,10 +77,10 @@
to_chat(user, span_notice("You can't find any nails on [body_part] to paint."))
return
if(user == target)
- user.visible_message("\The [user] paints their nails with \the [src].", "You paint your nails with \the [src].")
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " paints their nails with \the [src]."), span_infoplain("You paint your nails with \the [src]."))
else
if(do_after(user, 2 SECONDS, target))
- user.visible_message("\The [user] paints \the [target]'s nails with \the [src].", "You paint \the [target]'s nails with \the [src].")
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " paints \the [target]'s nails with \the [src]."), span_infoplain("You paint \the [target]'s nails with \the [src]."))
else
to_chat(user, span_notice("Both you and [target] must stay still!"))
return
@@ -124,10 +124,10 @@
to_chat(user, span_notice("[target]'s [body_part.name] has no nail polish to remove!"))
return
if(user == target)
- user.visible_message("\The [user] removes their nail polish with \the [src].", "You remove your nail polish with \the [src].")
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " removes their nail polish with \the [src]."), span_infoplain("You remove your nail polish with \the [src]."))
else
if(do_after(user, 2 SECONDS, target))
- user.visible_message("\The [user] removes \the [target]'s nail polish with \the [src].", "You remove \the [target]'s nail polish with \the [src].")
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " removes \the [target]'s nail polish with \the [src]."), span_infoplain("You remove \the [target]'s nail polish with \the [src]."))
else
to_chat(user, span_notice("Both you and [target] must stay still!"))
return
diff --git a/code/modules/maps/tg/map_template.dm b/code/modules/maps/tg/map_template.dm
index b4b408b289..19970a6ed0 100644
--- a/code/modules/maps/tg/map_template.dm
+++ b/code/modules/maps/tg/map_template.dm
@@ -299,7 +299,7 @@
if(count > 1)
pretty_submap_list += "[count] [submap_name]"
else
- pretty_submap_list += "[submap_name]"
+ pretty_submap_list += span_bold("[submap_name]")
if(!overall_sanity)
admin_notice("Submap loader gave up with [budget] left to spend.", R_DEBUG)
diff --git a/code/modules/materials/sheets/metals/rods.dm b/code/modules/materials/sheets/metals/rods.dm
index 427290b31d..4363cb55c1 100644
--- a/code/modules/materials/sheets/metals/rods.dm
+++ b/code/modules/materials/sheets/metals/rods.dm
@@ -67,7 +67,7 @@ var/global/list/datum/stack_recipe/rods_recipes = list( \
var/obj/item/stack/medical/splint/ghetto/new_splint = new(get_turf(user))
new_splint.add_fingerprint(user)
- user.visible_message("\The [user] constructs \a [new_splint] out of a [singular_name].", \
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " constructs \a [new_splint] out of a [singular_name]."), \
span_notice("You use make \a [new_splint] out of a [singular_name]."))
src.use(1)
return
diff --git a/code/modules/materials/sheets/organic/tanning/hide.dm b/code/modules/materials/sheets/organic/tanning/hide.dm
index bbac90c234..c8918e8bc2 100644
--- a/code/modules/materials/sheets/organic/tanning/hide.dm
+++ b/code/modules/materials/sheets/organic/tanning/hide.dm
@@ -1,7 +1,7 @@
/obj/item/stack/animalhide
name = "hide"
desc = "The hide of some creature."
- description_info = "Use something sharp, like a knife, to scrape the hairs/feathers/etc off this hide to prepare it for tanning."
+ description_info = "Use something " + span_bold(span_red("sharp")) + ", like a knife, to scrape the hairs/feathers/etc off this hide to prepare it for tanning."
icon_state = "sheet-hide"
drop_sound = 'sound/items/drop/cloth.ogg'
pickup_sound = 'sound/items/pickup/cloth.ogg'
@@ -18,7 +18,7 @@
/obj/item/stack/animalhide/attackby(obj/item/W as obj, mob/user as mob)
if(has_edge(W) || is_sharp(W))
//visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message)
- user.visible_message("\The [user] starts cutting hair off \the [src]", span_notice("You start cutting the hair off \the [src]"), "You hear the sound of a knife rubbing against flesh")
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " starts cutting hair off \the [src]"), span_notice("You start cutting the hair off \the [src]"), "You hear the sound of a knife rubbing against flesh")
var/scraped = 0
while(amount > 0 && do_after(user, 2.5 SECONDS, user))
//Try locating an exisitng stack on the tile and add to there if possible
diff --git a/code/modules/materials/sheets/organic/tanning/hide_hairless.dm b/code/modules/materials/sheets/organic/tanning/hide_hairless.dm
index edb36b9b86..3cf927a825 100644
--- a/code/modules/materials/sheets/organic/tanning/hide_hairless.dm
+++ b/code/modules/materials/sheets/organic/tanning/hide_hairless.dm
@@ -3,7 +3,7 @@
/obj/item/stack/hairlesshide
name = "hairless hide"
desc = "This hide was stripped of it's hair, but still needs tanning."
- description_info = "Get it wet to continue tanning this into leather.
\
+ description_info = "Get it " + span_bold(span_blue("wet")) + " to continue tanning this into leather.
\
You could set it in a river, wash it with a sink, or just splash water on it with a bucket."
singular_name = "hairless hide piece"
icon_state = "sheet-hairlesshide"
diff --git a/code/modules/materials/sheets/organic/tanning/leather_wet.dm b/code/modules/materials/sheets/organic/tanning/leather_wet.dm
index be4d60570a..070b45c7a3 100644
--- a/code/modules/materials/sheets/organic/tanning/leather_wet.dm
+++ b/code/modules/materials/sheets/organic/tanning/leather_wet.dm
@@ -3,9 +3,9 @@
name = "wet leather"
desc = "This leather has been cleaned but still needs to be dried."
description_info = "To finish tanning the leather, you need to dry it. \
- You could place it under a fire, \
- put it in a drying rack, \
- or build a tanning rack from steel or wooden boards."
+ You could place it under a " + span_bold(span_red("fire")) + ", \
+ put it in a " + span_bold(span_blue("drying rack")) + ", \
+ or build a " + span_bold(span_brown("tanning rack")) + " from steel or wooden boards."
singular_name = "wet leather piece"
icon_state = "sheet-wetleather"
var/wetness = 30 //Reduced when exposed to high temperautres
diff --git a/code/modules/mentor/mentor.dm b/code/modules/mentor/mentor.dm
index ed25a49c76..8af4f3f58f 100644
--- a/code/modules/mentor/mentor.dm
+++ b/code/modules/mentor/mentor.dm
@@ -111,9 +111,9 @@ var/list/mentor_verbs_default = list(
log_admin("Mentorsay: [key_name(src)]: [msg]")
for(var/client/C in GLOB.mentors)
- to_chat(C, create_text_tag("mentor", "MENTOR:", C) + " [src]: [msg]")
+ to_chat(C, create_text_tag("mentor", "MENTOR:", C) + " " + span_mentor_channel(span_name("[src]") + ": " + span_message("[msg]")))
for(var/client/C in GLOB.admins)
- to_chat(C, create_text_tag("mentor", "MENTOR:", C) + " [src]: [msg]")
+ to_chat(C, create_text_tag("mentor", "MENTOR:", C) + " " + span_mentor_channel(span_name("[src]") + ": " + span_message("[msg]")))
/proc/mentor_commands(href, href_list, client/C)
// CHOMPedit Start - Tickets System
diff --git a/code/modules/mentor/mentorhelp.dm b/code/modules/mentor/mentorhelp.dm
index e97b80236c..5641d20555 100644
--- a/code/modules/mentor/mentorhelp.dm
+++ b/code/modules/mentor/mentorhelp.dm
@@ -55,7 +55,7 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new)
var/list/dat = list("[title]")
dat += "Refresh
"
for(var/datum/mentor_help/MH as anything in l2b)
- dat += "Ticket #[MH.id]: [MH.initiator_ckey]: [MH.name]
"
+ dat += span_adminnotice(span_adminhelp("Ticket #[MH.id]") + " [MH.initiator_ckey]: [MH.name]") + "
"
usr << browse(dat.Join(), "window=mhelp_list[state];size=600x480")
@@ -163,7 +163,7 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new)
log_admin("Mentorhelp: [key_name(C)]: [msg]")
MessageNoRecipient(msg)
//show it to the person adminhelping too
- to_chat(C, "Mentor-PM to-Mentors: [name]")
+ to_chat(C, span_mentor(span_italics("Mentor-PM to-" + span_bold("Mentors") + ": [name]")))
GLOB.mhelp_tickets.active_tickets += src
@@ -287,9 +287,9 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new)
dat += "
Closed at: [gameTimestamp(wtime = closed_at)] (Approx [(world.time - closed_at) / 600] minutes ago)"
dat += "
"
if(initiator)
- dat += "Actions: [Context(ref_src)]
"
+ dat += span_bold("Actions:") + " [Context(ref_src)]
"
else
- dat += "DISCONNECTED[GLOB.TAB][ClosureLinks(ref_src)]
"
+ dat += span_bold("DISCONNECTED") + "[GLOB.TAB][ClosureLinks(ref_src)]
"
dat += "
Log:
"
for(var/I in _interactions)
dat += "[I]
"
diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm
index 286c256c41..7d0659332f 100644
--- a/code/modules/mining/drilling/drill.dm
+++ b/code/modules/mining/drilling/drill.dm
@@ -277,12 +277,12 @@
if(use_cell_power())
active = !active
if(active)
- visible_message("\The [src] lurches downwards, grinding noisily.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " lurches downwards, grinding noisily."))
need_update_field = 1
harvest_speed *= total_brace_tier
charge_use *= total_brace_tier
else
- visible_message("\The [src] shudders to a grinding halt.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " shudders to a grinding halt."))
else
to_chat(user, span_notice("The drill is unpowered."))
else
@@ -360,7 +360,7 @@
/obj/machinery/mining/drill/proc/system_error(var/error)
if(error)
- src.visible_message("\The [src] flashes a '[error]' warning.")
+ src.visible_message(span_infoplain(span_bold("\The [src]") + " flashes a '[error]' warning."))
faultreporter.autosay(error, src.name, "Supply", using_map.get_map_levels(z))
need_player_check = 1
active = 0
diff --git a/code/modules/mining/drilling/scanner.dm b/code/modules/mining/drilling/scanner.dm
index 203f72861a..8504626053 100644
--- a/code/modules/mining/drilling/scanner.dm
+++ b/code/modules/mining/drilling/scanner.dm
@@ -51,7 +51,7 @@
if(ore_type) metals[ore_type] += T.resources[metal]
- var/message = "[icon2html(src, user.client)] The scanner beeps and displays a readout."
+ var/message = "[icon2html(src, user.client)] " + span_notice("The scanner beeps and displays a readout.")
for(var/ore_type in metals)
var/result = "no sign"
@@ -65,7 +65,7 @@
else
result = metals[ore_type]
- message += "
- [result] of [ore_type]."
+ message += "
" + span_notice("- [result] of [ore_type].")
to_chat(user, message)
diff --git a/code/modules/mining/kinetic_crusher.dm b/code/modules/mining/kinetic_crusher.dm
index 4fe6d9607b..fa70d1c41b 100644
--- a/code/modules/mining/kinetic_crusher.dm
+++ b/code/modules/mining/kinetic_crusher.dm
@@ -315,7 +315,7 @@
/obj/item/kinetic_crusher/machete/gauntlets/proc/wield(var/mob/living/M)
name = initial(name)
wielded = TRUE
- to_chat(M, "You ready [src].")
+ to_chat(M, span_notice("You ready [src]."))
var/obj/item/offhand/crushergauntlets/O = new(M)
O.name = "[name] - readied"
O.desc = "As much as you'd like to punch things with one hand, [src] is far too unwieldy for that."
@@ -324,7 +324,7 @@
offhand = O
/obj/item/kinetic_crusher/machete/gauntlets/proc/unwield(var/mob/living/M)
- to_chat(M, "You unready [src].")
+ to_chat(M, span_notice("You unready [src]."))
name = "[initial(name)] (unreadied)"
wielded = FALSE
if(offhand)
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 959d773dcb..299a336d04 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -245,7 +245,7 @@
upright = 0
icon_state = base_state
anchored = FALSE
- src.visible_message("[user] knocks down [src].")
+ src.visible_message(span_infoplain(span_bold("[user]") + " knocks down [src]."))
else
..()
@@ -268,7 +268,7 @@
newflag.anchored = TRUE
newflag.name = newflag.singular_name
newflag.icon_state = "[newflag.base_state]_open"
- newflag.visible_message("[user] plants [newflag] firmly in the ground.")
+ newflag.visible_message(span_infoplain(span_bold("[user]") + " plants [newflag] firmly in the ground."))
src.use(1)
// Lightpoles for lumber colony
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 12d334cc1c..cad10bbcae 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -435,7 +435,7 @@ var/list/mining_overlay_cache = list()
if (istype(W, /obj/item/measuring_tape))
var/obj/item/measuring_tape/P = W
- user.visible_message("\The [user] extends \a [P] towards \the [src].",span_notice("You extend \the [P] towards \the [src]."))
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " extends \a [P] towards \the [src]."),span_notice("You extend \the [P] towards \the [src]."))
if(do_after(user, 15))
to_chat(user, span_notice("\The [src] has been excavated to a depth of [excavation_level]cm."))
return
@@ -445,7 +445,7 @@ var/list/mining_overlay_cache = list()
if(C.mode) //Mode means scanning
C.depth_scanner.scan_atom(user, src)
else
- user.visible_message("\The [user] extends \the [C] over \the [src], a flurry of red beams scanning \the [src]'s surface!", span_notice("You extend \the [C] over \the [src], a flurry of red beams scanning \the [src]'s surface!"))
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " extends \the [C] over \the [src], a flurry of red beams scanning \the [src]'s surface!"), span_notice("You extend \the [C] over \the [src], a flurry of red beams scanning \the [src]'s surface!"))
if(do_after(user, 15))
to_chat(user, span_notice("\The [src] has been excavated to a depth of [excavation_level]cm."))
return
diff --git a/code/modules/mob/_modifiers/cloning.dm b/code/modules/mob/_modifiers/cloning.dm
index 029a82c86c..f6c0493170 100644
--- a/code/modules/mob/_modifiers/cloning.dm
+++ b/code/modules/mob/_modifiers/cloning.dm
@@ -7,8 +7,8 @@
name = "cloning sickness"
desc = "You feel rather weak, having been cloned not so long ago."
- on_created_text = span_warning("You feel really weak.")
- on_expired_text = span_notice("You feel your strength returning to you.")
+ on_created_text = span_warning(span_large("You feel really weak."))
+ on_expired_text = span_notice(span_large("You feel your strength returning to you."))
max_health_percent = 0.6 // -40% max health.
incoming_damage_percent = 1.1 // 10% more incoming damage.
@@ -52,8 +52,8 @@
name = "reformation sickness"
desc = "Your core feels damaged, as you were reformed with the improper machinery."
- on_created_text = span_warning("Your core aches.")
- on_expired_text = span_notice("You feel your core's strength returning to normal.")
+ on_created_text = span_warning(span_large("Your core aches."))
+ on_expired_text = span_notice(span_large("You feel your core's strength returning to normal."))
incoming_damage_percent = 1 //Level the incoming damage from the parent modifier. They already take 200% burn.
incoming_brute_damage_percent = 1.5 //150% incoming brute damage. Decreases the effectiveness of their 0.75 modifier.
@@ -70,8 +70,8 @@
name = "surgically attached brain"
desc = "You feel weak, as your central nervous system is still recovering from being repaired."
- on_created_text = span_warning("You feel... off, and your head hurts.")
- on_expired_text = span_notice("You feel some strength returning to you.")
+ on_created_text = span_warning(span_large("You feel... off, and your head hurts."))
+ on_expired_text = span_notice(span_large("You feel some strength returning to you."))
max_health_percent = 0.9 // -10% max health.
incoming_damage_percent = 1.1 // 10% more incoming damage.
@@ -107,8 +107,8 @@
name = "neural recovery"
desc = "You feel out of touch, as your central nervous system is still recovering from being repaired."
- on_created_text = span_warning("You feel... off. Everything is fuzzy.")
- on_expired_text = span_notice("You feel your senses returning to you.")
+ on_created_text = span_warning(span_large("You feel... off. Everything is fuzzy."))
+ on_expired_text = span_notice(span_large("You feel your senses returning to you."))
incoming_hal_damage_percent = 1.5 // 50% more halloss damage.
disable_duration_percent = 1.25 // Stuns last 25% longer.
diff --git a/code/modules/mob/_modifiers/modifiers_misc.dm b/code/modules/mob/_modifiers/modifiers_misc.dm
index 642dc22214..7a7df3dcce 100644
--- a/code/modules/mob/_modifiers/modifiers_misc.dm
+++ b/code/modules/mob/_modifiers/modifiers_misc.dm
@@ -175,8 +175,8 @@ the artifact triggers the rage.
client_color = "#FF0000" // Make everything red!
mob_overlay_state = "berserk"
- on_created_text = "You feel an intense and overwhelming rage overtake you as you go berserk! \
- Unfortunately, your lifeless body cannot benefit from this. You feel reckless..."
+ on_created_text = span_danger("You feel an intense and overwhelming rage overtake you as you go berserk! \
+ Unfortunately, your lifeless body cannot benefit from this. You feel reckless...")
on_expired_text = span_notice("The blaze of rage inside your mind has ran out.")
stacks = MODIFIER_STACK_EXTEND
diff --git a/code/modules/mob/_modifiers/traits_phobias.dm b/code/modules/mob/_modifiers/traits_phobias.dm
index 7a5e1de53b..17a8454204 100644
--- a/code/modules/mob/_modifiers/traits_phobias.dm
+++ b/code/modules/mob/_modifiers/traits_phobias.dm
@@ -64,8 +64,8 @@
on_expired_text = span_notice("You feel that blood doesn't bother you, at least, as much as it used to.")
zero_fear_up = list(
- span_warning("You see some blood nearby..."),
- span_warning("You try to avoid looking at the blood nearby.")
+ span_warning(span_large("You see some blood nearby...")),
+ span_warning(span_large("You try to avoid looking at the blood nearby."))
)
zero_fear_down = list(
span_notice("You feel better now, with no blood in sight."),
@@ -74,8 +74,8 @@
)
half_fear_up = list(
- span_danger("You're still near the blood!"),
- span_danger("So much blood... You can't stand it.")
+ span_danger(span_large("You're still near the blood!")),
+ span_danger(span_large("So much blood... You can't stand it."))
)
half_fear_down = list(
span_warning("The blood is gone now, but you're still worked up."),
@@ -83,9 +83,9 @@
)
full_fear_up = list(
- span_danger("The blood is too much!"),
- span_danger("There is so much blood here, you need to leave!"),
- span_danger("You gotta get away from the blood!")
+ span_danger(span_huge("The blood is too much!")),
+ span_danger(span_huge("There is so much blood here, you need to leave!")),
+ span_danger(span_huge("You gotta get away from the blood!"))
)
full_fear_down = list(
span_danger("The blood is gone, but you're still very anxious."),
@@ -165,8 +165,8 @@
on_expired_text = span_notice("You feel that your fear of spiders has gone from 'crippling' to 'nope nope nope', which is still an improvement.")
zero_fear_up = list(
- span_warning("You see a spider!"),
- span_warning("Spider!")
+ span_warning(span_large("You see a spider!")),
+ span_warning(span_large("Spider!"))
)
zero_fear_down = list(
span_notice("Those evil spiders are finally gone."),
@@ -175,9 +175,9 @@
)
half_fear_up = list(
- span_danger("The spiders are gonna eat you!"),
- span_danger("The spiders are still here!"),
- span_danger("The spiders will lay eggs inside you if you don't run!"),
+ span_danger(span_large("The spiders are gonna eat you!")),
+ span_danger(span_large("The spiders are still here!")),
+ span_danger(span_large("The spiders will lay eggs inside you if you don't run!")),
)
half_fear_down = list(
span_warning("The spiders are gone... right?"),
@@ -185,9 +185,9 @@
)
full_fear_up = list(
- span_danger("The chittering is driving you mad!"),
- span_danger("You're gonna be spider-food if you don't run!"),
- span_danger("The spiders are gonna feast on your eyes!")
+ span_danger(span_huge("The chittering is driving you mad!")),
+ span_danger(span_huge("You're gonna be spider-food if you don't run!")),
+ span_danger(span_huge("The spiders are gonna feast on your eyes!"))
)
full_fear_down = list(
span_danger("The spiders must surely be hiding somewhere..."),
@@ -238,8 +238,8 @@
var/fear_threshold = 0.5 // Average lighting needs to be below this to start increasing fear.
zero_fear_up = list(
- span_warning("It's so dark here!"),
- span_warning("It's too dark!")
+ span_warning(span_large("It's so dark here!")),
+ span_warning(span_large("It's too dark!"))
)
zero_fear_down = list(
span_notice("You feel calmer, now that you're in the light."),
@@ -248,9 +248,9 @@
)
half_fear_up = list(
- span_danger("You need to escape this darkness!"),
- span_danger("Something might be lurking near you, but you can't see in this darkness."),
- span_danger("You need to find a light!"),
+ span_danger(span_large("You need to escape this darkness!")),
+ span_danger(span_large("Something might be lurking near you, but you can't see in this darkness.")),
+ span_danger(span_large("You need to find a light!")),
)
half_fear_down = list(
span_warning("The darkness is gone, for now..."),
@@ -258,8 +258,8 @@
)
full_fear_up = list(
- span_danger("What was that?"),
- span_danger("Something is nearby...")
+ span_danger(span_huge("What was that?")),
+ span_danger(span_huge("Something is nearby..."))
)
full_fear_down = list(
span_danger("Light, at last!"),
@@ -315,8 +315,8 @@
on_expired_text = span_notice("Small rooms aren't so bad now.")
zero_fear_up = list(
- span_warning("This room is too small..."),
- span_warning("The walls are too close together...")
+ span_warning(span_large("This room is too small...")),
+ span_warning(span_large("The walls are too close together..."))
)
zero_fear_down = list(
span_notice("You feel calmer, now that you're in a larger room."),
@@ -325,9 +325,9 @@
)
half_fear_up = list(
- span_danger("Your surroundings look like they are closing in."),
- span_danger("Is the room getting smaller?"),
- span_danger("You need to get out of here!"),
+ span_danger(span_large("Your surroundings look like they are closing in.")),
+ span_danger(span_large("Is the room getting smaller?")),
+ span_danger(span_large("You need to get out of here!")),
)
half_fear_down = list(
span_warning("Your surroundings seem to have stopped closing in."),
@@ -335,8 +335,8 @@
)
full_fear_up = list(
- span_danger("You need to escape!"),
- span_danger("There's barely any room to move around!")
+ span_danger(span_huge("You need to escape!")),
+ span_danger(span_huge("There's barely any room to move around!"))
)
full_fear_down = list(
span_danger("The surroundings stop shrinking."),
@@ -380,8 +380,8 @@
on_expired_text = span_notice("You feel more... okay with slime.")
zero_fear_up = list(
- span_warning("That's some slime!"),
- span_warning("There's slime right there!")
+ span_warning(span_large("That's some slime!")),
+ span_warning(span_large("There's slime right there!"))
)
zero_fear_down = list(
span_notice("The slime is out of sight and out of mind."),
@@ -389,8 +389,8 @@
)
half_fear_up = list(
- span_danger("The slimes might strike at any point!"),
- span_danger("The slime is still there!")
+ span_danger(span_large("The slimes might strike at any point!")),
+ span_danger(span_large("The slime is still there!"))
)
half_fear_down = list(
span_warning("The slime is gone... right?"),
@@ -398,8 +398,8 @@
)
full_fear_up = list(
- span_danger("The slime is everywhere!"),
- span_danger("You're gonna get absorbed if you don't get out!")
+ span_danger(span_huge("The slime is everywhere!")),
+ span_danger(span_huge("You're gonna get absorbed if you don't get out!"))
)
full_fear_down = list(
span_danger("There must be more of that slime somewhere..."),
@@ -475,8 +475,8 @@
zero_fear_up = list(
- span_warning("That's a needle!"),
- span_warning("There's a needle right there!")
+ span_warning(span_large("That's a needle!")),
+ span_warning(span_large("There's a needle right there!"))
)
zero_fear_down = list(
span_notice("The needle is gone, no need to worry."),
@@ -484,8 +484,8 @@
)
half_fear_up = list(
- span_danger("The needle could get you at any time!"),
- span_danger("The needle is still there!")
+ span_danger(span_large("The needle could get you at any time!")),
+ span_danger(span_large("The needle is still there!"))
)
half_fear_down = list(
span_warning("There are no more needles... right?"),
@@ -493,8 +493,8 @@
)
full_fear_up = list(
- span_danger("The needles are going to pierce you!"),
- span_danger("They could get you any second!")
+ span_danger(span_huge("The needles are going to pierce you!")),
+ span_danger(span_huge("They could get you any second!"))
)
full_fear_down = list(
span_danger("There are more needles around, you can feel it..."),
@@ -586,7 +586,7 @@
if(xenos.len)
var/chosen_xeno = pick(xenos)
- to_chat(holder, span_warning("[make_message(chosen_xeno)]"))
+ to_chat(holder, span_warning(span_large("[make_message(chosen_xeno)]")))
return TRUE
else
return FALSE // No xenos in sight, so don't apply the cooldown.
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 7a58fa8db5..5cbc48c8c4 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -173,7 +173,7 @@
. = ..()
if(is_admin(user))
- . += "\t>[ADMIN_FULLMONTY(src)]"
+ . += "\t>" + span_admin("[ADMIN_FULLMONTY(src)]")
/*
Transfer_mind is there to check if mob is being deleted/not going to have a body.
@@ -304,7 +304,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
medHUD = !medHUD
plane_holder.set_vis(VIS_CH_HEALTH, medHUD)
plane_holder.set_vis(VIS_CH_STATUS_OOC, medHUD)
- to_chat(src, span_notice("Medical HUD [medHUD ? "Enabled" : "Disabled"]"))
+ to_chat(src, span_boldnotice("Medical HUD [medHUD ? "Enabled" : "Disabled"]"))
/mob/observer/dead/verb/toggle_secHUD()
set category = "Ghost.Game" //CHOMPEdit
@@ -317,7 +317,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
plane_holder.set_vis(VIS_CH_IMPTRACK, secHUD)
plane_holder.set_vis(VIS_CH_IMPLOYAL, secHUD)
plane_holder.set_vis(VIS_CH_IMPCHEM, secHUD)
- to_chat(src, span_notice("Security HUD [secHUD ? "Enabled" : "Disabled"]"))
+ to_chat(src, span_boldnotice("Security HUD [secHUD ? "Enabled" : "Disabled"]"))
/mob/observer/dead/verb/toggle_antagHUD()
set category = "Ghost.Game" //CHOMPEdit
@@ -325,10 +325,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set desc = "Toggles AntagHUD allowing you to see who is the antagonist"
if(!CONFIG_GET(flag/antag_hud_allowed) && !client.holder) // CHOMPEdit
- to_chat(src, span_filter_notice("[span_red("Admins have disabled this for this round.")]"))
+ to_chat(src, span_filter_notice(span_red("Admins have disabled this for this round.")))
return
if(jobban_isbanned(src, JOB_ANTAGHUD))
- to_chat(src, span_filter_notice("[span_red("You have been banned from using this feature")]"))
+ to_chat(src, span_filter_notice(span_red(span_bold("You have been banned from using this feature"))))
return
if(CONFIG_GET(flag/antag_hud_restricted) && !has_enabled_antagHUD && !client.holder) // CHOMPEdit
var/response = tgui_alert(src, "If you turn this on, you will not be able to take any part in the round.","Are you sure you want to turn this feature on?",list("Yes","No"))
@@ -340,7 +340,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
antagHUD = !antagHUD
plane_holder.set_vis(VIS_CH_SPECIAL, antagHUD)
- to_chat(src, span_notice("AntagHUD [antagHUD ? "Enabled" : "Disabled"]"))
+ to_chat(src, span_boldnotice("AntagHUD [antagHUD ? "Enabled" : "Disabled"]"))
/mob/observer/dead/proc/jumpable_areas()
var/list/areas = return_sorted_areas()
@@ -611,11 +611,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/observer/dead/memory()
set hidden = 1
- to_chat(src, span_filter_notice("[span_red("You are dead! You have no mind to store memory!")]"))
+ to_chat(src, span_filter_notice(span_red("You are dead! You have no mind to store memory!")))
/mob/observer/dead/add_memory()
set hidden = 1
- to_chat(src, span_filter_notice("[span_red("You are dead! You have no mind to store memory!")]"))
+ to_chat(src, span_filter_notice(span_red("You are dead! You have no mind to store memory!")))
/mob/observer/dead/Post_Incorpmove()
stop_following()
@@ -635,7 +635,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
var/pressure = environment.return_pressure()
var/total_moles = environment.total_moles
var/list/gas_analyzing = list()
- gas_analyzing += "Results:"
+ gas_analyzing += span_bold("Results:")
if(abs(pressure - ONE_ATMOSPHERE) < 10)
gas_analyzing += "Pressure: [round(pressure,0.1)] kPa"
else
@@ -735,7 +735,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set desc = "If the round is sufficiently spooky, write a short message in blood on the floor or a wall. Remember, no IC in OOC or OOC in IC."
if(!CONFIG_GET(flag/cult_ghostwriter)) // CHOMPEdit
- to_chat(src, span_filter_notice("[span_red("That verb is not currently permitted.")]"))
+ to_chat(src, span_filter_notice(span_red("That verb is not currently permitted.")))
return
if (!src.stat)
@@ -750,7 +750,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
ghosts_can_write = 1
if(!ghosts_can_write && !check_rights(R_ADMIN|R_EVENT|R_FUN, 0)) //Let's allow for admins to write in blood for events and the such.
- to_chat(src, span_filter_notice("[span_red("The veil is not thin enough for you to do that.")]"))
+ to_chat(src, span_filter_notice(span_red("The veil is not thin enough for you to do that.")))
return
var/list/choices = list()
@@ -759,7 +759,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
choices += B
if(!choices.len)
- to_chat(src, "There is no blood to use nearby.")
+ to_chat(src, span_warning("There is no blood to use nearby."))
return
var/obj/effect/decal/cleanable/blood/choice = tgui_input_list(src, "What blood would you like to use?", "Blood Choice", choices)
@@ -800,14 +800,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
W.update_icon()
W.message = message
W.add_hiddenprint(src)
- W.visible_message(span_filter_notice("[span_red("Invisible fingers crudely paint something in blood on [T]...")]"))
+ W.visible_message(span_filter_notice(span_red("Invisible fingers crudely paint something in blood on [T]...")))
// CHOMPEdit Start - Point Refactor
/*
/mob/observer/dead/pointed(atom/A as mob|obj|turf in view())
if(!..())
return 0
- usr.visible_message(span_deadsay("[src] points to [A]."))
+ usr.visible_message(span_deadsay(span_bold("[src]") + " points to [A]."))
return 1
*/
@@ -821,7 +821,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
is_manifest = TRUE
add_verb(src, /mob/observer/dead/proc/toggle_visibility)
add_verb(src, /mob/observer/dead/proc/ghost_whisper)
- to_chat(src, span_filter_notice("[span_purple("As you are now in the realm of the living, you can whisper to the living with the Spectral Whisper verb, inside the IC tab.")]"))
+ to_chat(src, span_filter_notice(span_purple("As you are now in the realm of the living, you can whisper to the living with the " + span_bold("Spectral Whisper") + " verb, inside the IC tab.")))
if(plane != PLANE_WORLD)
user.visible_message( \
span_warning("\The [user] drags ghost, [src], to our plane of reality!"), \
diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm
index c84b977ef6..d80eed517c 100644
--- a/code/modules/mob/death.dm
+++ b/code/modules/mob/death.dm
@@ -76,7 +76,7 @@
facing_dir = null
if(!gibbed && deathmessage != DEATHGASP_NO_MESSAGE)
- src.visible_message("\The [src.name] [deathmessage]")
+ src.visible_message(span_infoplain(span_bold("\The [src.name]") + " [deathmessage]"))
set_stat(DEAD)
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 3bbcc25e2b..93791083b1 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -32,6 +32,6 @@
if(input)
log_ghostemote(input, src)
if(!invisibility) //If the ghost is made visible by admins or cult. And to see if the ghost has toggled its own visibility, as well. -Mech
- visible_message(span_deadsay("[src] [input]"))
+ visible_message(span_deadsay(span_bold("[src]") + " [input]"))
else
say_dead_direct(input, src)
diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index 7770e1e2c0..29109bf7c8 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -99,7 +99,7 @@
return FALSE
if(italics)
- message = "[message]"
+ message = span_italics("[message]")
message = encode_html_emphasis(message)
@@ -109,7 +109,7 @@
speaker_name = "[speaker.real_name] ([speaker_name])"
track = "([ghost_follow_link(speaker, src)]) "
if(client?.prefs?.read_preference(/datum/preference/toggle/ghost_ears) && (speaker in view(src)))
- message = "[message]"
+ message = span_bold("[message]")
if(is_deaf() && stat != DEAD) //CHOMPEdit - Dead people should be able to hear stuff like ghosts can
if(speaker == src)
@@ -228,7 +228,7 @@
time = say_timestamp()
var/final_message = "[part_b][speaker_name][part_c][formatted][part_d]"
if(check_mentioned(formatted) && client?.prefs?.read_preference(/datum/preference/toggle/check_mention))
- final_message = "[time][part_a][final_message][part_e]"
+ final_message = "[time][part_a]" + span_large(span_bold("[final_message]")) + "[part_e]"
else
final_message = "[time][part_a][final_message][part_e]"
to_chat(src, final_message)
@@ -239,7 +239,7 @@
time = say_timestamp()
var/final_message = "[part_b][track][part_c][formatted][part_d]"
if(check_mentioned(formatted) && client?.prefs?.read_preference(/datum/preference/toggle/check_mention))
- final_message = "[time][part_a][final_message][part_e]"
+ final_message = "[time][part_a]" + span_large(span_bold("[final_message]")) + "[part_e]"
else
final_message = "[time][part_a][final_message][part_e]"
to_chat(src, final_message)
@@ -250,7 +250,7 @@
time = say_timestamp()
var/final_message = "[part_b][speaker_name][part_c][formatted][part_d]"
if(check_mentioned(formatted) && client?.prefs?.read_preference(/datum/preference/toggle/check_mention))
- final_message = "[time][part_a][final_message][part_e]"
+ final_message = "[time][part_a]" + span_large(span_bold("[final_message]")) + "[part_e]"
else
final_message = "[time][part_a][final_message][part_e]"
to_chat(src, final_message)
@@ -261,7 +261,7 @@
time = say_timestamp()
var/final_message = "[part_b][track][part_c][formatted][part_d]"
if(check_mentioned(formatted) && client?.prefs?.read_preference(/datum/preference/toggle/check_mention))
- final_message = "[time][part_a][final_message][part_e]"
+ final_message = "[time][part_a]" + span_large(span_bold("[final_message]")) + "[part_e]"
else
final_message = "[time][part_a][final_message][part_e]"
to_chat(src, final_message)
@@ -271,7 +271,7 @@
return
if(say_understands(speaker, language))
- message = span_game(span_say("[speaker] [verb_understood], \"[message]\""))
+ message = span_game(span_say(span_bold("[speaker]") + " [verb_understood], \"[message]\""))
else if(!(language.ignore_adverb))
var/adverb
var/length = length(message) * pick(0.8, 0.9, 1.0, 1.1, 1.2) //Adds a little bit of fuzziness
@@ -281,9 +281,9 @@
if(30 to 48) adverb = " a message"
if(48 to 90) adverb = " a lengthy message"
else adverb = " a very lengthy message"
- message = span_game(span_say("[speaker] [verb][adverb]."))
+ message = span_game(span_say(span_bold("[speaker]") + " [verb][adverb]."))
else
- message = span_game(span_say("[speaker] [verb]."))
+ message = span_game(span_say(span_bold("[speaker]") + " [verb]."))
show_message(message, type = speech_type) // Type 1 is visual message
@@ -301,7 +301,7 @@
heard = span_game(span_say("...You hear something about...[heardword]"))
else
- heard = span_game(span_say("...You almost hear someone talking..."))
+ heard = span_game(span_say("..." + span_italics("You almost hear someone talking") + "..."))
to_chat(src, heard)
diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm
index 93986b3973..4f92a87d64 100644
--- a/code/modules/mob/language/language.dm
+++ b/code/modules/mob/language/language.dm
@@ -156,7 +156,7 @@
/mob/proc/hear_broadcast(var/datum/language/language, var/mob/speaker, var/speaker_name, var/message)
if((language in languages) && language.check_special_condition(src))
- var/msg = span_hivemind("[language.name], [speaker_name] [message]")
+ var/msg = span_hivemind("[language.name], " + span_name("[speaker_name]") + " [message]")
to_chat(src,msg)
/mob/new_player/hear_broadcast(var/datum/language/language, var/mob/speaker, var/speaker_name, var/message)
@@ -164,9 +164,9 @@
/mob/observer/dead/hear_broadcast(var/datum/language/language, var/mob/speaker, var/speaker_name, var/message)
if(speaker.name == speaker_name || antagHUD)
- to_chat(src, span_hivemind("[language.name], [speaker_name] ([ghost_follow_link(speaker, src)]) [message]"))
+ to_chat(src, span_hivemind("[language.name], " + span_name("[speaker_name]") + " ([ghost_follow_link(speaker, src)]) [message]"))
else
- to_chat(src, span_hivemind("[language.name], [speaker_name] [message]"))
+ to_chat(src, span_hivemind("[language.name], " + span_name("[speaker_name]") + " [message]"))
/datum/language/proc/check_special_condition(var/mob/other)
return 1
@@ -267,7 +267,7 @@
for(var/datum/language/L in languages)
if(!(L.flags & NONGLOBAL))
var/lang_key = get_custom_prefix_by_lang(src, L)
- . += "[L.name] ([get_language_prefix()][L.key][lang_key ? " [get_language_prefix()][lang_key]" : ""])
[L.desc]
"
+ . += span_bold("[L.name] ([get_language_prefix()][L.key][lang_key ? " [get_language_prefix()][lang_key]" : ""])") + "
[L.desc]
"
/mob/living/check_lang_data()
. = ""
@@ -279,11 +279,11 @@
if(!(L.flags & NONGLOBAL))
var/lang_key = get_custom_prefix_by_lang(src, L)
if(L == default_language)
- . += "[L.name] ([get_language_prefix()][L.key][lang_key ? " [get_language_prefix()][lang_key]" : ""]) Edit Custom Key - default - reset
[L.desc]
"
+ . += span_bold("[L.name] ([get_language_prefix()][L.key][lang_key ? " [get_language_prefix()][lang_key]" : ""])") + " Edit Custom Key - default - reset
[L.desc]
"
else if (can_speak(L))
- . += "[L.name] ([get_language_prefix()][L.key][lang_key ? " [get_language_prefix()][lang_key]" : ""]) Edit Custom Key - set default
[L.desc]
"
+ . += span_bold("[L.name] ([get_language_prefix()][L.key][lang_key ? " [get_language_prefix()][lang_key]" : ""])") + " Edit Custom Key - set default
[L.desc]
"
else
- . += "[L.name] ([get_language_prefix()][L.key][lang_key ? " [get_language_prefix()][lang_key]" : ""]) Edit Custom Key - cannot speak!
[L.desc]
"
+ . += span_bold("[L.name] ([get_language_prefix()][L.key][lang_key ? " [get_language_prefix()][lang_key]" : ""])") + " Edit Custom Key - cannot speak!
[L.desc]
"
/mob/verb/check_languages()
set name = "Check Known Languages"
diff --git a/code/modules/mob/language/synthetic.dm b/code/modules/mob/language/synthetic.dm
index bdf8a05bc3..73684681db 100644
--- a/code/modules/mob/language/synthetic.dm
+++ b/code/modules/mob/language/synthetic.dm
@@ -20,27 +20,27 @@
message = encode_html_emphasis(message)
- var/message_start = "[name], [speaker.name]"
+ var/message_start = "[name], " + span_name("[speaker.name]")
var/message_body = span_message("[speaker.say_quote(message)], \"[message]\"")
for (var/mob/M in dead_mob_list)
if(!istype(M,/mob/new_player) && !istype(M,/mob/living/carbon/brain)) //No meta-evesdropping
var/message_to_send = span_binarysay("[message_start] ([ghost_follow_link(speaker, M)]) [message_body]")
if(M.check_mentioned(message) && M.client?.prefs?.read_preference(/datum/preference/toggle/check_mention))
- message_to_send = "[message_to_send]"
+ message_to_send = span_large(span_bold("[message_to_send]"))
M.show_message(message_to_send, 2)
for (var/mob/living/S in living_mob_list)
if(drone_only && !istype(S,/mob/living/silicon/robot/drone))
continue
else if(istype(S , /mob/living/silicon/ai))
- message_start = span_binarysay("[name], [speaker.name]")
+ message_start = span_binarysay("[name], " + span_name("[speaker.name]") + "")
else if (!S.binarycheck())
continue
var/message_to_send = span_binarysay("[message_start] [message_body]")
if(S.check_mentioned(message) && S.client?.prefs?.read_preference(/datum/preference/toggle/check_mention))
- message_to_send = "[message_to_send]"
+ message_to_send = span_large(span_bold("[message_to_send]"))
S.show_message(message_to_send, 2)
var/list/listening = hearers(1, src)
diff --git a/code/modules/mob/living/bot/edCLNbot.dm b/code/modules/mob/living/bot/edCLNbot.dm
index e2ce4b846f..02e0150ed2 100644
--- a/code/modules/mob/living/bot/edCLNbot.dm
+++ b/code/modules/mob/living/bot/edCLNbot.dm
@@ -38,7 +38,7 @@
if(!red_switch && blue_switch && !green_switch && prob(50) || src.emagged)
if(istype(loc, /turf/simulated))
var/turf/simulated/T = loc
- visible_message("\The [src] squirts a puddle of water on the floor!")
+ visible_message(span_infoplain(span_bold("\The [src]") + " squirts a puddle of water on the floor!"))
T.wet_floor()
if(!red_switch && !blue_switch && green_switch && prob(10) || src.emagged)
diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm
index 2a97b3f08b..95ef281846 100644
--- a/code/modules/mob/living/bot/floorbot.dm
+++ b/code/modules/mob/living/bot/floorbot.dm
@@ -228,7 +228,7 @@
return
busy = 1
update_icons()
- visible_message("\The [src] begins to repair the hole.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " begins to repair the hole."))
if(do_after(src, 50))
if(A && (locate(/obj/structure/lattice, A) && building == 1 || !locate(/obj/structure/lattice, A) && building == 2)) // Make sure that it still needs repairs
var/obj/item/I
@@ -245,7 +245,7 @@
if(F.broken || F.burnt)
busy = 1
update_icons()
- visible_message("\The [src] begins to remove the broken floor.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " begins to remove the broken floor."))
if(do_after(src, 50, F))
if(F.broken || F.burnt)
F.make_plating()
@@ -255,7 +255,7 @@
else if(!F.flooring && amount)
busy = 1
update_icons()
- visible_message("\The [src] begins to improve the floor.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " begins to improve the floor."))
if(do_after(src, 50))
if(!F.flooring)
F.set_flooring(get_flooring_data(floor_build_type))
@@ -265,7 +265,7 @@
update_icons()
else if(istype(A, /obj/item/stack/tile/floor) && amount < maxAmount)
var/obj/item/stack/tile/floor/T = A
- visible_message("\The [src] begins to collect tiles.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " begins to collect tiles."))
busy = 1
update_icons()
if(do_after(src, 20))
@@ -279,7 +279,7 @@
else if(istype(A, /obj/item/stack/material) && amount + 4 <= maxAmount)
var/obj/item/stack/material/M = A
if(M.get_material_name() == MAT_STEEL)
- visible_message("\The [src] begins to make tiles.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " begins to make tiles."))
busy = 1
update_icons()
if(do_after(50))
diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm
index 3610563433..d19916ed4a 100644
--- a/code/modules/mob/living/bot/medbot.dm
+++ b/code/modules/mob/living/bot/medbot.dm
@@ -433,7 +433,7 @@
if(MEDBOT_PANIC_HIGH to MEDBOT_PANIC_FUCK)
. += span_warning("They are tipped over and visibly panicking!")
if(MEDBOT_PANIC_FUCK to INFINITY)
- . += span_warning("They are freaking out from being tipped over!")
+ . += span_boldwarning("They are freaking out from being tipped over!")
/mob/living/bot/medbot/confirmTarget(var/mob/living/carbon/human/H)
if(!..())
diff --git a/code/modules/mob/living/carbon/alien/alien_attacks.dm b/code/modules/mob/living/carbon/alien/alien_attacks.dm
index 1085881106..174828d7ee 100644
--- a/code/modules/mob/living/carbon/alien/alien_attacks.dm
+++ b/code/modules/mob/living/carbon/alien/alien_attacks.dm
@@ -28,7 +28,7 @@
playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
- O.show_message(span_red(text("[] has grabbed [] passively!", M, src)), 1)
+ O.show_message(span_danger(text("[] has grabbed [] passively!", M, src)), 1)
else
var/damage = rand(1, 9)
@@ -43,17 +43,17 @@
playsound(src, "punch", 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
- O.show_message(span_red(text("[] has punched []!", M, src)), 1)
+ O.show_message(span_bolddanger(text("[] has punched []!", M, src)), 1)
if (damage > 4.9)
Weaken(rand(10,15))
for(var/mob/O in viewers(M, null))
if ((O.client && !( O.blinded )))
- O.show_message(span_red(text("[] has weakened []!", M, src)), 1, span_red("You hear someone fall."), 2)
+ O.show_message(span_bolddanger(text("[] has weakened []!", M, src)), 1, span_red("You hear someone fall."), 2)
adjustBruteLoss(damage)
updatehealth()
else
playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
- O.show_message(span_red(text("[] has attempted to punch []!", M, src)), 1)
+ O.show_message(span_bolddanger(text("[] has attempted to punch []!", M, src)), 1)
return
diff --git a/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm b/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
index d50f9a48ac..d8376354f0 100644
--- a/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
+++ b/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
@@ -18,6 +18,6 @@
return
user.unEquip(W)
wear_hat(W)
- user.visible_message("\The [user] puts \the [W] on \the [src].")
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " puts \the [W] on \the [src]."))
return
return ..()
diff --git a/code/modules/mob/living/carbon/alien/larva/progression.dm b/code/modules/mob/living/carbon/alien/larva/progression.dm
index 7018a8557e..c2852f2fa6 100644
--- a/code/modules/mob/living/carbon/alien/larva/progression.dm
+++ b/code/modules/mob/living/carbon/alien/larva/progression.dm
@@ -6,11 +6,11 @@
/mob/living/carbon/alien/larva/confirm_evolution()
- to_chat(src, span_notice("You are growing into a beautiful alien! It is time to choose a caste."))
+ to_chat(src, span_boldnotice("You are growing into a beautiful alien! It is time to choose a caste."))
to_chat(src, span_notice("There are three to choose from:"))
- to_chat(src, "Hunters are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves.")
- to_chat(src, "Sentinels are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters.")
- to_chat(src, "Drones are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded Genaprawn queen.") //CHOMPedit
+ to_chat(src, span_bold("Hunters") + span_notice(" are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves."))
+ to_chat(src, span_bold("Sentinels") + span_notice(" are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters."))
+ to_chat(src, span_bold("Drones") + span_notice(" are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded Genaprawn queen.")) //CHOMPedit
var/alien_caste = tgui_alert(src, "Please choose which alien caste you shall belong to.","Alien Choice",list("Hunter","Sentinel","Drone"))
return alien_caste ? "Genaprawn [alien_caste]" : null //CHOMPedit
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index ae4d6c1a50..d0f4aef575 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -58,7 +58,7 @@
to_chat(user, span_warning("\The [src] appears to reject this brain. It is incompatible."))
return
- user.visible_message("\The [user] sticks \a [O] into \the [src].")
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " sticks \a [O] into \the [src]."))
B.preserved = TRUE
brainmob = B.brainmob
@@ -271,10 +271,10 @@
src.brainmob.mind.reset()
src.brainmob.ckey = candidate.ckey
src.name = "[name] ([src.brainmob.name])"
- to_chat(src.brainmob, "You are [src.name], brought into existence on [station_name()].")
- to_chat(src.brainmob, "As a synthetic intelligence, you are designed with organic values in mind.")
- to_chat(src.brainmob, "However, unless placed in a lawed chassis, you are not obligated to obey any individual crew member.") //it's not like they can hurt anyone
-// to_chat(src.brainmob, "Use say #b to speak to other artificial intelligences.")
+ to_chat(src.brainmob, span_infoplain(span_bold("You are [src.name], brought into existence on [station_name()].")))
+ to_chat(src.brainmob, span_infoplain(span_bold("As a synthetic intelligence, you are designed with organic values in mind.")))
+ to_chat(src.brainmob, span_infoplain(span_bold("However, unless placed in a lawed chassis, you are not obligated to obey any individual crew member."))) //it's not like they can hurt anyone
+// to_chat(src.brainmob, span_infoplain(span_bold("Use say #b to speak to other artificial intelligences.")))
src.brainmob.mind.assigned_role = JOB_SYNTHETIC_BRAIN
var/turf/T = get_turf_or_move(src.loc)
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index 5ea47dc4a0..222e27437c 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -60,10 +60,10 @@
src.brainmob.ckey = candidate.ckey
src.brainmob.mind.reset()
src.name = "positronic brain ([src.brainmob.name])"
- to_chat(src.brainmob, "You are a positronic brain, brought into existence on [station_name()].")
- to_chat(src.brainmob, "As a synthetic intelligence, you answer to all crewmembers, as well as the AI.")
- to_chat(src.brainmob, "Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm.")
- to_chat(src.brainmob, "Use say #b to speak to other artificial intelligences.")
+ to_chat(src.brainmob, span_infoplain(span_bold("You are a positronic brain, brought into existence on [station_name()].")))
+ to_chat(src.brainmob, span_infoplain(span_bold("As a synthetic intelligence, you answer to all crewmembers, as well as the AI.")))
+ to_chat(src.brainmob, span_infoplain(span_bold("Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm.")))
+ to_chat(src.brainmob, span_infoplain(span_bold("Use say #b to speak to other artificial intelligences.")))
src.brainmob.mind.assigned_role = JOB_POSITRONIC_BRAIN
var/turf/T = get_turf_or_move(src.loc)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 76e5cba6c9..dc71898c62 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -81,7 +81,7 @@
M.loc = src.loc
for(var/mob/N in viewers(src, null))
if(N.client)
- N.show_message(span_red(text("[M] bursts out of [src]!")), 2)
+ N.show_message(span_bolddanger("[M] bursts out of [src]!"), 2)
..()
/mob/living/carbon/attack_hand(mob/M as mob)
@@ -92,7 +92,7 @@
if (H.hand)
temp = H.organs_by_name["l_hand"]
if(temp && !temp.is_usable())
- to_chat(H, span_red("You can't use your [temp.name]"))
+ to_chat(H, span_warning("You can't use your [temp.name]"))
return
return
@@ -109,7 +109,7 @@
var/weaken_dur = (rand(2,4)-severity)*species.emp_stun_mod //0-3 knockdown, on par with.. you get the idea
var/blind_dur = (rand(3,6)-severity)*species.emp_stun_mod //0-5 blind
if(species.emp_sensitivity) //receive warning message and basic effects
- to_chat(src, span_danger("*BZZZT*"))
+ to_chat(src, span_bolddanger("*BZZZT*"))
switch(severity)
if(1)
to_chat(src, span_danger("DANGER: Extreme EM flux detected!"))
@@ -247,9 +247,9 @@
if(!org.is_usable() || org.is_dislocated())
status += "dangling uselessly"
if(status.len)
- src.show_message("My [org.name] is [english_list(status)].",1)
+ src.show_message("My [org.name] is " + span_warning("[english_list(status)]."),1)
else
- src.show_message("My [org.name] is OK.",1)
+ src.show_message("My [org.name] is " + span_notice("OK."),1)
if((SKELETON in H.mutations) && (!H.w_uniform) && (!H.wear_suit))
H.play_xylophone()
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 33963d186a..613d776357 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -93,7 +93,7 @@
// SSgame_master.adjust_danger(gibbed ? 40 : 20) // VOREStation Edit - We don't use SSgame_master yet.
for(var/mob/observer/dead/O in mob_list)
if(O.client?.prefs?.read_preference(/datum/preference/toggle/show_dsay))
- to_chat(O, span_deadsay("[src] has died in [get_area(src)]. [ghost_follow_link(src, O)] "))
+ to_chat(O, span_deadsay(span_bold("[src]") + " has died in " + span_bold("[get_area(src)]") + ". [ghost_follow_link(src, O)] "))
/* // CHOMPEdit Start: Replacing this with our own death sounds. :3
if(!gibbed && species.death_sound)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index e23bcdfdda..4a446dc6e4 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -364,7 +364,7 @@ var/list/_simple_mob_default_emotes = list(
var/HTML = ""
HTML += ""
- HTML += "Update Flavour Text
"
+ HTML += span_bold("Update Flavour Text") + "
"
HTML += "
"
HTML += "General: "
HTML += TextPreview(flavor_texts["general"])
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 584a250625..dfcd68bca5 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -87,7 +87,7 @@
if(!((skip_gear & EXAMINE_SKIPJUMPSUIT) && (skip_body & EXAMINE_SKIPFACE)))
//VOREStation Add Start
if(custom_species)
- name_ender = ", a [src.custom_species]"
+ name_ender = ", a " + span_bold("[src.custom_species]")
else if(looks_synth)
//VOREStation Add End
var/use_gender = "a synthetic"
@@ -96,12 +96,12 @@
else if(gender == FEMALE)
use_gender = "a gynoid"
- name_ender = ", [use_gender]![species.get_additional_examine_text(src)]"
+ name_ender = ", " + span_bold(span_gray("[use_gender]!")) + "[species.get_additional_examine_text(src)]"
else if(species.name != "Human")
- name_ender = ", \a [species.get_examine_name()]![species.get_additional_examine_text(src)]"
+ name_ender = ", " + span_bold("\a [species.get_examine_name()]!") + "[species.get_additional_examine_text(src)]"
- var/list/msg = list("","This is [icon2html(src, user.client)] [src.name][name_ender]")
+ var/list/msg = list("This is [icon2html(src, user.client)] [src.name][name_ender]")
//uniform
if(w_uniform && !(skip_gear & EXAMINE_SKIPJUMPSUIT) && w_uniform.show_examine)
@@ -252,7 +252,7 @@
//Jitters
if(is_jittery)
if(jitteriness >= 300)
- msg += span_warning("[T.He] [T.is] convulsing violently!")
+ msg += span_boldwarning("[T.He] [T.is] convulsing violently!")
else if(jitteriness >= 200)
msg += span_warning("[T.He] [T.is] extremely jittery.")
else if(jitteriness >= 100)
@@ -291,7 +291,7 @@
if((stat == 2 || src.losebreath) && get_dist(user, src) <= 3)
msg += span_warning("[T.He] [T.does] not appear to be breathing.")
if(istype(user, /mob/living/carbon/human) && !user.stat && Adjacent(user))
- user.visible_message("[usr] checks [src]'s pulse.", "You check [src]'s pulse.")
+ user.visible_message(span_infoplain(span_bold("[usr]") + " checks [src]'s pulse."), span_infoplain("You check [src]'s pulse."))
spawn(15)
if(isobserver(user) || (Adjacent(user) && !user.stat)) // If you're a corpse then you can't exactly check their pulse, but ghosts can see anything
if(pulse == PULSE_NONE)
@@ -330,9 +330,9 @@
var/obj/item/organ/external/E = organs_by_name[organ_tag]
if(!E)
- wound_flavor_text["[organ_descriptor]"] = span_warning("[T.He] [T.is] missing [T.his] [organ_descriptor].")
+ wound_flavor_text["[organ_descriptor]"] = span_boldwarning("[T.He] [T.is] missing [T.his] [organ_descriptor].")
else if(E.is_stump())
- wound_flavor_text["[organ_descriptor]"] = span_warning("[T.He] [T.has] a stump where [T.his] [organ_descriptor] should be.")
+ wound_flavor_text["[organ_descriptor]"] = span_boldwarning("[T.He] [T.has] a stump where [T.his] [organ_descriptor] should be.")
else
continue
@@ -341,7 +341,7 @@
if((temp.organ_tag in hidden) && hidden[temp.organ_tag])
continue //Organ is hidden, don't talk about it
if(temp.status & ORGAN_DESTROYED)
- wound_flavor_text["[temp.name]"] = span_warning("[T.He] [T.is] missing [T.his] [temp.name].")
+ wound_flavor_text["[temp.name]"] = span_boldwarning("[T.He] [T.is] missing [T.his] [temp.name].")
continue
if(!looks_synth && temp.robotic == ORGAN_ROBOT)
@@ -435,13 +435,13 @@
// VOREStation Start
if(custom_link)
- msg += "Custom link: [custom_link]"
+ msg += "Custom link: " + span_linkify("[custom_link]")
if(ooc_notes)
msg += "OOC Notes: \[View\] - \[Print\]"
msg += "\[Mechanical Vore Preferences\]"
// VOREStation End
- msg += ""
+ msg = list(span_info(jointext(msg, "
")))
if(applying_pressure)
msg += applying_pressure
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 0322d8a94d..2df0839d5a 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -444,13 +444,13 @@
if (R.fields["id"] == E.fields["id"])
if(hasHUD(usr,"security"))
var/list/security_hud_text = list()
- security_hud_text += "Name: [R.fields["name"]] Criminal Status: [R.fields["criminal"]]"
- security_hud_text += "Species: [R.fields["species"]]"
- security_hud_text += "Minor Crimes: [R.fields["mi_crim"]]"
- security_hud_text += "Details: [R.fields["mi_crim_d"]]"
- security_hud_text += "Major Crimes: [R.fields["ma_crim"]]"
- security_hud_text += "Details: [R.fields["ma_crim_d"]]"
- security_hud_text += "Notes: [R.fields["notes"]]"
+ security_hud_text += span_bold("Name:") + " [R.fields["name"]] " + span_bold("Criminal Status:") + " [R.fields["criminal"]]"
+ security_hud_text += span_bold("Species:") + " [R.fields["species"]]"
+ security_hud_text += span_bold("Minor Crimes:") + " [R.fields["mi_crim"]]"
+ security_hud_text += span_bold("Details:") + " [R.fields["mi_crim_d"]]"
+ security_hud_text += span_bold("Major Crimes:") + " [R.fields["ma_crim"]]"
+ security_hud_text += span_bold("Details:") + " [R.fields["ma_crim_d"]]"
+ security_hud_text += span_bold("Notes:") + " [R.fields["notes"]]"
security_hud_text += "\[View Comment Log\]"
to_chat(usr, span_filter_notice("[jointext(security_hud_text, "
")]"))
read = 1
@@ -563,14 +563,14 @@
if (R.fields["id"] == E.fields["id"])
if(hasHUD(usr,"medical"))
var/list/medical_hud_text = list()
- medical_hud_text += "Name: [R.fields["name"]] Blood Type: [R.fields["b_type"]] Blood Basis: [R.fields["blood_reagent"]]"
- medical_hud_text += "Species: [R.fields["species"]]"
- medical_hud_text += "DNA: [R.fields["b_dna"]]"
- medical_hud_text += "Minor Disabilities: [R.fields["mi_dis"]]"
- medical_hud_text += "Details: [R.fields["mi_dis_d"]]"
- medical_hud_text += "Major Disabilities: [R.fields["ma_dis"]]"
- medical_hud_text += "Details: [R.fields["ma_dis_d"]]"
- medical_hud_text += "Notes: [R.fields["notes"]]"
+ medical_hud_text += span_bold("Name:") + " [R.fields["name"]] " + span_bold("Blood Type:") + " [R.fields["b_type"]] " + span_bold("Blood Basis:") + " [R.fields["blood_reagent"]]"
+ medical_hud_text += span_bold("Species:") + " [R.fields["species"]]"
+ medical_hud_text += span_bold("DNA:") + " [R.fields["b_dna"]]"
+ medical_hud_text += span_bold("Minor Disabilities:") + " [R.fields["mi_dis"]]"
+ medical_hud_text += span_bold("Details:") + " [R.fields["mi_dis_d"]]"
+ medical_hud_text += span_bold("Major Disabilities:") + " [R.fields["ma_dis"]]"
+ medical_hud_text += span_bold("Details:") + " [R.fields["ma_dis_d"]]"
+ medical_hud_text += span_bold("Notes:") + " [R.fields["notes"]]"
medical_hud_text += "\[View Comment Log\]"
to_chat(usr, span_filter_notice("[jointext(medical_hud_text, "
")]"))
read = 1
@@ -647,16 +647,16 @@
if (R.fields["id"] == E.fields["id"])
if(hasHUD(usr,"best"))
var/list/emp_hud_text = list()
- emp_hud_text += "Name: [R.fields["name"]]"
- emp_hud_text += "Species: [R.fields["species"]]"
- emp_hud_text += "Assignment: [R.fields["real_rank"]] ([R.fields["rank"]])"
- emp_hud_text += "Home System: [R.fields["home_system"]]"
- emp_hud_text += "Birthplace: [R.fields["birthplace"]]"
- emp_hud_text += "Citizenship: [R.fields["citizenship"]]"
- emp_hud_text += "Primary Employer: [R.fields["personal_faction"]]"
- emp_hud_text += "Religious Beliefs: [R.fields["religion"]]"
- emp_hud_text += "Known Languages: [R.fields["languages"]]"
- emp_hud_text += "Notes: [R.fields["notes"]]"
+ emp_hud_text += span_bold("Name:") + " [R.fields["name"]]"
+ emp_hud_text += span_bold("Species:") + " [R.fields["species"]]"
+ emp_hud_text += span_bold("Assignment:") + " [R.fields["real_rank"]] ([R.fields["rank"]])"
+ emp_hud_text += span_bold("Home System:") + " [R.fields["home_system"]]"
+ emp_hud_text += span_bold("Birthplace:") + " [R.fields["birthplace"]]"
+ emp_hud_text += span_bold("Citizenship:") + " [R.fields["citizenship"]]"
+ emp_hud_text += span_bold("Primary Employer:") + " [R.fields["personal_faction"]]"
+ emp_hud_text += span_bold("Religious Beliefs:") + " [R.fields["religion"]]"
+ emp_hud_text += span_bold("Known Languages:") + " [R.fields["languages"]]"
+ emp_hud_text += span_bold("Notes:") + " [R.fields["notes"]]"
emp_hud_text += "\[View Comment Log\]"
to_chat(usr, span_filter_notice("[jointext(emp_hud_text, "
")]"))
read = 1
@@ -973,7 +973,7 @@
usr.show_message(span_filter_say("[span_blue("You project your mind into [target.real_name]: [say]")]"))
log_say("(TPATH to [key_name(target)]) [say]",src)
for(var/mob/observer/dead/G in mob_list)
- G.show_message(span_filter_say("Telepathic message from [src] to [target]: [say]"))
+ G.show_message(span_filter_say(span_italics("Telepathic message from " + span_bold("[src]") + " to " + span_bold("[target]") + ": [say]")))
/mob/living/carbon/human/proc/remoteobserve()
set name = "Remote View"
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 7fca1837b0..4918177843 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -57,7 +57,7 @@
if(!hit_zone)
H.do_attack_animation(src)
playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
- visible_message(span_filter_combat("[span_red("[H] reaches for [src], but misses!")]"))
+ visible_message(span_filter_combat("[span_red(span_bold("[H] reaches for [src], but misses!"))]"))
return FALSE
if(H != src && check_shields(0, null, H, H.zone_sel.selecting, H.name))
@@ -334,7 +334,7 @@
return
playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
- visible_message(span_filter_combat("[span_red("[M] attempted to disarm [src]!")]"))
+ visible_message(span_filter_combat("[span_red(span_bold("[M] attempted to disarm [src]!"))]"))
return
/mob/living/carbon/human/proc/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, inrange, params)
@@ -450,16 +450,16 @@
set category = "IC.Game" //CHOMPEdit
set src = usr
- var/dat = "Known Attacks
"
+ var/dat = span_bold(span_giant("Known Attacks")) + "
"
if(default_attack)
dat += "Current default attack: [default_attack.attack_name] - reset
"
for(var/datum/unarmed_attack/u_attack in species.unarmed_attacks)
if(u_attack == default_attack)
- dat += "Primarily [u_attack.attack_name] - default - reset
"
+ dat += span_bold("Primarily [u_attack.attack_name]") + " - default - reset
"
else
- dat += "Primarily [u_attack.attack_name] - set default
"
+ dat += span_bold("Primarily [u_attack.attack_name]") + " - set default
"
src << browse(dat, "window=checkattack")
diff --git a/code/modules/mob/living/carbon/human/human_attackhand_vr.dm b/code/modules/mob/living/carbon/human/human_attackhand_vr.dm
index 05ba244cd6..0d1664cdc5 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand_vr.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand_vr.dm
@@ -6,25 +6,25 @@
set category = "IC.Game" //CHOMPEdit
set src = usr
- var/dat = "Known Attacks
"
+ var/dat = span_bold("Known Attacks") + "
"
for(var/datum/unarmed_attack/u_attack in species.unarmed_attacks)
- dat += "Primarily [u_attack.attack_name]
"
+ dat += span_bold("Primarily [u_attack.attack_name] ") + "
"
src << browse(dat, "window=checkattack")
return
/mob/living/carbon/human/check_attacks()
- var/dat = "Known Attacks
"
+ var/dat = span_bold("Known Attacks") + "
"
if(default_attack)
dat += "Current default attack: [default_attack.attack_name] - reset
"
for(var/datum/unarmed_attack/u_attack in species.unarmed_attacks)
if(u_attack == default_attack)
- dat += "Primarily [u_attack.attack_name] - default - reset
"
+ dat += span_bold("Primarily [u_attack.attack_name]") + " - default - reset
"
else
- dat += "Primarily [u_attack.attack_name] - set default
"
+ dat += span_bold("Primarily [u_attack.attack_name]") + " - set default
"
src << browse(dat, "window=checkattack")
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 5410a1218b..c3363e141a 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -446,7 +446,7 @@ emp_act
var/throw_damage = O.throwforce*(speed/THROWFORCE_SPEED_DIVISOR)
if(species && species.throwforce_absorb_threshold >= throw_damage)
- visible_message("\The [O] simply bounces off of [src]'s body!")
+ visible_message(span_infoplain(span_bold("\The [O]") + " simply bounces off of [src]'s body!"))
return
var/zone
@@ -475,7 +475,7 @@ emp_act
return
if(!zone)
- visible_message("\The [O] misses [src] narrowly!")
+ visible_message(span_infoplain(span_bold("\The [O]") + " misses [src] narrowly!"))
return
O.throwing = 0 //it hit, so stop moving
diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm
index b21963d9e6..e9d6500808 100644
--- a/code/modules/mob/living/carbon/human/human_powers.dm
+++ b/code/modules/mob/living/carbon/human/human_powers.dm
@@ -14,7 +14,7 @@
var/datum/sprite_accessory/hair/hair_style = hair_styles_list[h_style]
var/selected_string
if(!(hair_style.flags & HAIR_TIEABLE))
- to_chat(src, "Your hair isn't long enough to tie.")
+ to_chat(src, span_warning("Your hair isn't long enough to tie."))
return
else
var/list/datum/sprite_accessory/hair/valid_hairstyles = list()
@@ -31,7 +31,7 @@
regenerate_icons()
visible_message(span_notice("[src] pauses a moment to style their hair."))
else
- to_chat(src, "You're already using that style.")
+ to_chat(src, span_notice("You're already using that style."))
/mob/living/carbon/human/proc/tackle()
set category = "Abilities.General" //CHOMPEdit
@@ -42,7 +42,7 @@
return
if(stat || paralysis || stunned || weakened || lying || restrained() || buckled)
- to_chat(src, "You cannot tackle someone in your current state.")
+ to_chat(src, span_notice("You cannot tackle someone in your current state."))
return
var/list/choices = list()
@@ -61,7 +61,7 @@
return
if(stat || paralysis || stunned || weakened || lying || restrained() || buckled)
- to_chat(src, span_filter_notice("You cannot tackle in your current state."))
+ to_chat(src, span_notice("You cannot tackle in your current state."))
return
last_special = world.time + 50
@@ -78,7 +78,7 @@
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
- O.show_message(span_filter_warning("[span_red("[src] [failed ? "tried to tackle" : "has tackled"] down [T]!")]"), 1)
+ O.show_message(span_warning(span_red(span_bold("[src] [failed ? "tried to tackle" : "has tackled"] down [T]!"))), 1)
/mob/living/carbon/human/proc/commune()
set category = "Abilities.General" //CHOMPEdit
@@ -126,7 +126,7 @@
if(M in stomach_contents)
stomach_contents.Remove(M)
M.loc = loc
- src.visible_message(span_filter_warning("[span_red("[src] hurls out the contents of their stomach!")]"))
+ src.visible_message(span_filter_warning(span_red(span_bold("[src] hurls out the contents of their stomach!"))))
return
/mob/living/carbon/human/proc/psychic_whisper(mob/M as mob in oview())
@@ -211,7 +211,7 @@
to_chat(src, span_notice("Performing self-diagnostic, please wait..."))
spawn(50)
- var/output = span_filter_notice("Self-Diagnostic Results:\n")
+ var/output = span_filter_notice("Self-Diagnostic Results:\n")
output += "Internal Temperature: [convert_k2c(bodytemperature)] Degrees Celsius\n"
@@ -220,24 +220,24 @@
var/toxDam = getToxLoss()
if(toxDam)
- output += "System Instability: [toxDam > 25 ? "Severe" : "Moderate"]. Seek charging station for cleanup.\n"
+ output += "System Instability: " + span_warning("[toxDam > 25 ? "Severe" : "Moderate"]") + ". Seek charging station for cleanup.\n"
else
- output += "System Instability: OK\n"
+ output += "System Instability: " + span_green("OK") + "\n"
for(var/obj/item/organ/external/EO in organs)
if(EO.robotic >= ORGAN_ASSISTED)
if(EO.brute_dam || EO.burn_dam)
- output += "[EO.name] - [EO.burn_dam + EO.brute_dam > EO.min_broken_damage ? "Heavy Damage" : "Light Damage"]\n" //VOREStation Edit - Makes robotic limb damage scalable
+ output += "[EO.name] - " + span_warning("[EO.burn_dam + EO.brute_dam > EO.min_broken_damage ? "Heavy Damage" : "Light Damage"]") + "\n" //VOREStation Edit - Makes robotic limb damage scalable
else
- output += "[EO.name] - OK\n"
+ output += "[EO.name] - " + span_green("OK") + "\n"
for(var/obj/item/organ/IO in internal_organs)
if(IO.robotic >= ORGAN_ASSISTED)
if(IO.damage)
- output += "[IO.name] - [IO.damage > 10 ? "Heavy Damage" : "Light Damage"]\n"
+ output += "[IO.name] - " + span_warning("[IO.damage > 10 ? "Heavy Damage" : "Light Damage"]") + "\n"
else
- output += "[IO.name] - OK\n"
- output += ""
+ output += "[IO.name] - " + span_green("OK") + "\n"
+ output = span_notice(output)
to_chat(src,output)
@@ -267,7 +267,7 @@
continue
heard_something = TRUE
var/feedback = list()
- feedback += "There are noises of movement "
+ feedback += "There are noises of movement "
var/direction = get_dir(src, L)
if(direction)
feedback += "towards the [dir2text(direction)], "
@@ -284,8 +284,7 @@
feedback += "far away."
else // No need to check distance if they're standing right on-top of us
feedback += "right on top of you."
- feedback += ""
- to_chat(src,jointext(feedback,null))
+ to_chat(src,span_notice(jointext(feedback,null)))
if(!heard_something)
to_chat(src, span_notice("You hear no movement but your own."))
@@ -303,7 +302,7 @@
return
else
active_regen = TRUE
- src.visible_message(span_filter_notice("[src]'s flesh begins to mend..."))
+ src.visible_message(span_filter_notice(span_bold("[src]") + "'s flesh begins to mend..."))
var/delay_length = round(active_regen_delay * species.active_regen_mult)
if(do_after(src,delay_length))
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index b0688ddbca..fbcad4379f 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1301,7 +1301,7 @@
if(halloss >= species.total_health)
to_chat(src, span_notice("You're in too much pain to keep going..."))
- src.visible_message("[src] slumps to the ground, too weak to continue fighting.")
+ src.visible_message(span_infoplain(span_bold("[src]") + " slumps to the ground, too weak to continue fighting."))
Paralyse(10)
setHalLoss(species.total_health - 1)
diff --git a/code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm b/code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm
index 76cc46af9a..8bd3915bc2 100644
--- a/code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm
+++ b/code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm
@@ -60,7 +60,7 @@
wrapped_species_by_ref["\ref[src]"] = new_species
dna.base_species = new_species
species.base_species = new_species
- visible_message("\The [src] shifts and contorts, taking the form of \a [new_species]!")
+ visible_message(span_infoplain(span_bold("\The [src]") + " shifts and contorts, taking the form of \a [new_species]!"))
regenerate_icons()
/mob/living/carbon/human/proc/lleill_select_colour()
@@ -141,11 +141,11 @@
to_chat(src, span_warning("The item is no longer in your hands."))
return
else
- visible_message("\The [src] begins to change the form of \the [I].")
+ visible_message(span_infoplain(span_bold("\The [src]") + " begins to change the form of \the [I]."))
if(!do_after(usr, 10 SECONDS, I, exclusive = TASK_USER_EXCLUSIVE))
- visible_message("\The [src] leaves \the [I] in its original form.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " leaves \the [I] in its original form."))
return 0
- visible_message("\The [src] transmutes \the [I] into \the [transmute_product.name].")
+ visible_message(span_infoplain(span_bold("\The [src]") + " transmutes \the [I] into \the [transmute_product.name]."))
drop_item(I)
qdel(I)
var/spawnloc = get_turf(usr)
@@ -183,7 +183,7 @@
to_chat(src, span_warning("You do not have enough energy to do that!"))
return
if(!do_after(src, 10 SECONDS, src, exclusive = TASK_USER_EXCLUSIVE))
- src.visible_message("\The [src] begins to form white rings on the ground.")
+ src.visible_message(span_infoplain(span_bold("\The [src]") + " begins to form white rings on the ground."))
return 0
to_chat(src, span_warning("You place a new glamour ring at your feet."))
var/spawnloc = get_turf(src)
@@ -292,28 +292,28 @@
return
if(accepted == "Yes")
if(contact_type == "Kiss (lips)")
- src.visible_message("\The [src] presses their lips up against [chosen_target]'s own.")
+ src.visible_message(span_infoplain(span_bold("\The [src]") + " presses their lips up against [chosen_target]'s own."))
if(contact_type == "Kiss (neck)")
- src.visible_message("\The [src] presses their lips up against [chosen_target]'s neck.")
+ src.visible_message(span_infoplain(span_bold("\The [src]") + " presses their lips up against [chosen_target]'s neck."))
if(contact_type == "Bite (neck)")
- src.visible_message("\The [src] bites down on [chosen_target]'s neck.")
+ src.visible_message(span_infoplain(span_bold("\The [src]") + " bites down on [chosen_target]'s neck."))
if(contact_type == "Bite (wrist)")
- src.visible_message("\The [src] bites down on [chosen_target]'s wrist.")
+ src.visible_message(span_infoplain(span_bold("\The [src]") + " bites down on [chosen_target]'s wrist."))
if(contact_type == "Hold Hand")
- src.visible_message("\The [src] takes [chosen_target]'s hand into their own.")
+ src.visible_message(span_infoplain(span_bold("\The [src]") + " takes [chosen_target]'s hand into their own."))
if(contact_type == "Embrace")
- src.visible_message("\The [src] embraces [chosen_target].")
+ src.visible_message(span_infoplain(span_bold("\The [src]") + " embraces [chosen_target]."))
if(contact_type == "Stroke (hair)")
- src.visible_message("\The [src] runs their hand through [chosen_target]'s hair.")
+ src.visible_message(span_infoplain(span_bold("\The [src]") + " runs their hand through [chosen_target]'s hair."))
if(contact_type == "Boop (nose)")
- src.visible_message("\The [src] boops [chosen_target] on the nose.")
+ src.visible_message(span_infoplain(span_bold("\The [src]") + " boops [chosen_target] on the nose."))
if(contact_type == "Custom")
- src.visible_message("[custom_text]")
+ src.visible_message(span_infoplain("[custom_text]"))
if(!do_after(src, 10 SECONDS, chosen_target, exclusive = TASK_USER_EXCLUSIVE))
return
else
- src.visible_message("\The [src] and \the [chosen_target] break contact before energy has been transferred.")
- src.visible_message("\The [src] and \the [chosen_target] complete their contact.")
+ src.visible_message(span_infoplain(span_bold("\The [src]") + " and \the [chosen_target] break contact before energy has been transferred."))
+ src.visible_message(span_infoplain(span_bold("\The [src]") + " and \the [chosen_target] complete their contact."))
species.lleill_energy = species.lleill_energy_max
nutrition += (chosen_target.nutrition / 2)
to_chat(src, span_warning("You feel revitalised."))
@@ -360,11 +360,11 @@
to_chat(src, span_warning("The item is no longer in your hands."))
return
else
- visible_message("\The [src] begins to change the form of \the [I].")
+ visible_message(span_infoplain(span_bold("\The [src]") + " begins to change the form of \the [I]."))
if(!do_after(usr, 10 SECONDS, I, exclusive = TASK_USER_EXCLUSIVE))
- visible_message("\The [src] leaves \the [I] in its original form.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " leaves \the [I] in its original form."))
return 0
- visible_message("\The [src] transmutes \the [I] into \the [transmute_product.name].")
+ visible_message(span_infoplain(span_bold("\The [src]") + " transmutes \the [I] into \the [transmute_product.name]."))
drop_item(I)
qdel(I)
var/spawnloc = get_turf(usr)
@@ -451,9 +451,9 @@
to_chat(src, span_warning("You are too injured to transform into a beast."))
return
- visible_message("\The [src] begins significantly shifting their form.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " begins significantly shifting their form."))
if(!do_after(src, 10 SECONDS, src, exclusive = TASK_USER_EXCLUSIVE))
- visible_message("\The [src] ceases shifting their form.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " ceases shifting their form."))
return 0
var/image/coolanimation = image('icons/obj/glamour.dmi', null, "animation")
@@ -517,7 +517,7 @@
M.loc = new_mob
M.forceMove(new_mob)
new_mob.tf_mob_holder = M
- new_mob.visible_message("\The [src] has transformed into \the [chosen_beast]!")
+ new_mob.visible_message(span_infoplain(span_bold("\The [src]") + " has transformed into \the [chosen_beast]!"))
species.update_lleill_hud(src)
@@ -541,11 +541,11 @@
to_chat(src, span_warning("You can't do that in your condition."))
return
- visible_message("\The [src] begins significantly shifting their form.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " begins significantly shifting their form."))
if(!do_after(src, 10 SECONDS, src, exclusive = TASK_USER_EXCLUSIVE))
- visible_message("\The [src] ceases shifting their form.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " ceases shifting their form."))
return 0
- visible_message("\The [src] has reverted to their original form.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " has reverted to their original form."))
revert_mob_tf()
@@ -629,9 +629,9 @@
to_chat(src, span_warning("You are too injured to transform into a beast."))
return
- visible_message("\The [src] begins significantly shifting their form.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " begins significantly shifting their form."))
if(!do_after(src, 10 SECONDS, src, exclusive = TASK_USER_EXCLUSIVE))
- visible_message("\The [src] ceases shifting their form.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " ceases shifting their form."))
return 0
var/image/coolanimation = image('icons/obj/glamour.dmi', null, "animation")
@@ -698,4 +698,4 @@
M.loc = new_mob
M.forceMove(new_mob)
new_mob.tf_mob_holder = M
- new_mob.visible_message("\The [src] has transformed into \the [chosen_beast]!")
+ new_mob.visible_message(span_infoplain(span_bold("\The [src]") + " has transformed into \the [chosen_beast]!"))
diff --git a/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm b/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm
index 13b9a06968..b36bad80e5 100644
--- a/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm
+++ b/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm
@@ -24,7 +24,7 @@
/datum/reagent/glamour_transparent/affect_blood(var/mob/living/carbon/target, var/removed)
if(!target.cloaked)
- target.visible_message("\The [target] vanishes from sight.")
+ target.visible_message(span_infoplain(span_bold("\The [target]") + " vanishes from sight."))
target.cloak()
target.bloodstr.clear_reagents() //instantly clears reagents afterwards
target.ingested.clear_reagents()
@@ -32,7 +32,7 @@
spawn(600)
if(target.cloaked)
target.uncloak()
- target.visible_message("\The [target] appears as if from thin air.")
+ target.visible_message(span_infoplain(span_bold("\The [target]") + " appears as if from thin air."))
//Shrinking Glamour (scaling potion)
@@ -159,7 +159,7 @@
if(!h_action || h_action == "Cancel")
return
if(h_action == "Recall")
- H.visible_message("\The [H] returns to the face.")
+ H.visible_message(span_infoplain(span_bold("\The [H]") + " returns to the face."))
qdel(H)
homunculus = 0
return
@@ -253,7 +253,7 @@
to_chat(M, span_warning("You leave the glamour ring alone."))
return
to_chat(M, span_warning("You have destroyed \the [src]."))
- src.visible_message("\The [M] has broken apart \the [src].")
+ src.visible_message(span_infoplain(span_bold("\The [M]") + " has broken apart \the [src]."))
if(M != connected_mob && connected_mob)
to_chat(connected_mob, span_warning("\The [src] has been destroyed by \the [M]."))
if(istype(LL))
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index cacea7021c..db9b88ba76 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -611,7 +611,7 @@
if(!silent)
to_chat(H, span_notice("You manage to lower impact of the fall and land safely."))
- landing.visible_message("\The [H] lowers down from above, landing safely.")
+ landing.visible_message(span_infoplain(span_bold("\The [H]") + " lowers down from above, landing safely."))
playsound(H, "rustle", 25, 1)
return TRUE
diff --git a/code/modules/mob/living/carbon/human/species/species_shapeshift.dm b/code/modules/mob/living/carbon/human/species/species_shapeshift.dm
index 818779d7f8..a118e82708 100644
--- a/code/modules/mob/living/carbon/human/species/species_shapeshift.dm
+++ b/code/modules/mob/living/carbon/human/species/species_shapeshift.dm
@@ -165,7 +165,7 @@ var/list/wrapped_species_by_ref = list()
return
wrapped_species_by_ref["\ref[src]"] = new_species
- visible_message("\The [src] shifts and contorts, taking the form of \a [new_species]!")
+ visible_message(span_infoplain(span_bold("\The [src]") + " shifts and contorts, taking the form of \a [new_species]!"))
regenerate_icons()
*/
diff --git a/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm b/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm
index a62b9f4ac5..48291f349e 100644
--- a/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm
@@ -189,5 +189,5 @@
species.base_species = new_species
wrapped_species_by_ref["\ref[src]"] = new_species
if (visible)
- visible_message(span_filter_notice("\The [src] shifts and contorts, taking the form of \a [new_species]!"))
+ visible_message(span_filter_notice(span_bold("\The [src]") + " shifts and contorts, taking the form of \a [new_species]!"))
regenerate_icons()
diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
index 0b294bc697..ae3e683d96 100644
--- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm
+++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
@@ -181,7 +181,7 @@ var/datum/species/shapeshifter/promethean/prometheans
if(FEMALE)
t_him = "her"
- H.visible_message("\The [H] glomps [target] to make [t_him] feel better!", \
+ H.visible_message(span_infoplain(span_bold("\The [H]") + " glomps [target] to make [t_him] feel better!"), \
span_notice("You glomp [target] to make [t_him] feel better!"))
H.apply_stored_shock_to(target)
diff --git a/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm b/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm
index aa554b9abe..bbdb4af661 100644
--- a/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm
+++ b/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm
@@ -276,11 +276,11 @@
if(is_wide)
is_wide = FALSE
- src.visible_message("[src.name] pulls together, compacting themselves into a small ball!")
+ src.visible_message(span_infoplain(span_bold("[src.name]") + " pulls together, compacting themselves into a small ball!"))
update_icon()
else
is_wide = TRUE
- src.visible_message("[src.name] flows outwards, their goop expanding!")
+ src.visible_message(span_infoplain(span_bold("[src.name]") + " flows outwards, their goop expanding!"))
update_icon()
/mob/living/simple_mob/slime/promethean/proc/toggle_shine()
@@ -296,11 +296,11 @@
if(shiny)
shiny = FALSE
- src.visible_message("[src.name] dulls their shine, becoming more translucent.")
+ src.visible_message(span_infoplain(span_bold("[src.name]") + " dulls their shine, becoming more translucent."))
update_icon()
else
shiny = TRUE
- src.visible_message("[src.name] glistens and sparkles, shining brilliantly.")
+ src.visible_message(span_infoplain(span_bold("[src.name]") + " glistens and sparkles, shining brilliantly."))
update_icon()
/mob/living/simple_mob/slime/promethean/proc/prommie_select_colour()
@@ -453,7 +453,7 @@
moveToNullspace()
//Message
- blob.visible_message("[src.name] squishes into their true form!")
+ blob.visible_message(span_infoplain(span_bold("[src.name]") + " squishes into their true form!"))
//Transfer vore organs
blob.vore_organs = vore_organs
@@ -488,7 +488,7 @@
stop_pulling()
//Message
- blob.visible_message("[src.name] pulls together, forming a humanoid shape!")
+ blob.visible_message(span_infoplain(span_bold("[src.name]") + " pulls together, forming a humanoid shape!"))
//Record where they should go
var/atom/reform_spot = blob.drop_location()
diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
index 6dc3bcf05e..943a20e668 100644
--- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
@@ -288,7 +288,7 @@
if(!allowed)
return
if(refactory.add_stored_material(S.material.name,1*S.perunit) && S.use(1))
- visible_message("[name] gloms over some of \the [S], absorbing it.")
+ visible_message(span_infoplain(span_bold("[name]") + " gloms over some of \the [S], absorbing it."))
else
return ..()
@@ -302,7 +302,7 @@
if(!allowed)
return
if(refactory.add_stored_material(S.material.name,1*S.perunit) && S.use(1))
- visible_message("[name] gloms over some of \the [S], absorbing it.")
+ visible_message(span_infoplain(span_bold("[name]") + " gloms over some of \the [S], absorbing it."))
else
return ..()
@@ -390,7 +390,7 @@ var/global/list/disallowed_protean_accessories = list(
moveToNullspace()
//Message
- blob.visible_message("[src.name] collapses into a gooey blob!")
+ blob.visible_message(span_infoplain(span_bold("[src.name]") + " collapses into a gooey blob!"))
//Duration of the to_puddle iconstate that the blob starts with
sleep(13)
@@ -444,7 +444,7 @@ var/global/list/disallowed_protean_accessories = list(
blob.icon_state = "from_puddle"
//Message
- blob.visible_message("[src.name] reshapes into a humanoid appearance!")
+ blob.visible_message(span_infoplain(span_bold("[src.name]") + " reshapes into a humanoid appearance!"))
//Duration of above animation
sleep(8)
diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm
index 397d5943ba..b904331612 100644
--- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm
@@ -78,7 +78,7 @@
return //Lost it meanwhile
eo.robotize(manu_choice)
- visible_message("[src]'s [choice] loses its shape, then reforms.")
+ visible_message(span_infoplain(span_bold("[src]") + "'s [choice] loses its shape, then reforms."))
update_icons_body()
////
@@ -134,7 +134,7 @@
var/obj/item/organ/external/torso = organs_by_name[BP_TORSO]
to_chat(src, span_danger("Remain still while the process takes place! It will take 5 seconds."))
- visible_message("[src]'s form collapses into an amorphous blob of black ichor...")
+ visible_message(span_infoplain(span_bold("[src]") + "'s form collapses into an amorphous blob of black ichor..."))
var/mob/living/simple_mob/protean_blob/blob = nano_intoblob()
active_regen = TRUE
@@ -142,7 +142,7 @@
synthetic = usable_manufacturers[manu_choice]
torso.robotize(manu_choice) //Will cascade to all other organs.
regenerate_icons()
- visible_message("[src]'s form reshapes into a new one...")
+ visible_message(span_infoplain(span_bold("[src]") + "'s form reshapes into a new one..."))
active_regen = FALSE
nano_outofblob(blob)
return
@@ -154,7 +154,7 @@
var/delay_length = round(active_regen_delay * species.active_regen_mult)
to_chat(src, span_danger("Remain still while the process takes place! It will take [delay_length/10] seconds."))
- visible_message("[src]'s form begins to shift and ripple as if made of oil...")
+ visible_message(span_infoplain(span_bold("[src]") + "'s form begins to shift and ripple as if made of oil..."))
active_regen = TRUE
var/mob/living/simple_mob/protean_blob/blob = nano_intoblob()
@@ -358,7 +358,7 @@
var/opts = clickprops["shift"]
if(opts)
- to_chat(usr,span_notice("[ability_name] - [desc]"))
+ to_chat(usr,span_notice(span_bold("[ability_name]") + " - [desc]"))
else
//Humanform using it
if(ishuman(usr))
diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
index 525db79de4..e582d2b4d7 100755
--- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
@@ -4,7 +4,7 @@
name = SPECIES_PROTEAN
name_plural = "Proteans"
blurb = "Sometimes very advanced civilizations will produce the ability to swap into manufactured, robotic bodies. And sometimes \
- VERY advanced civilizations have the option of 'nanoswarm' bodies. Effectively a single robot body comprised \
+ " + span_italics("VERY") + " advanced civilizations have the option of 'nanoswarm' bodies. Effectively a single robot body comprised \
of millions of tiny nanites working in concert to maintain cohesion."
show_ssd = "totally quiescent"
death_message = "rapidly loses cohesion, dissolving into a cloud of gray dust..."
diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
index 4d90088eaa..70b451dc11 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
@@ -176,8 +176,8 @@
name = "imperfect regeneration"
desc = "You feel rather weak and unfocused, having just regrown your body not so long ago."
- on_created_text = span_warning("You feel weak and unsteady, that regeneration having been rougher than most.")
- on_expired_text = span_notice("You feel your strength and focus return to you.")
+ on_created_text = span_warning(span_large("You feel weak and unsteady, that regeneration having been rougher than most."))
+ on_expired_text = span_notice(span_large("You feel your strength and focus return to you."))
/mob/living/carbon/human/proc/revivingreset() // keep this as a debug proc or potential future use
revive_ready = REVIVING_READY
@@ -469,9 +469,9 @@
if(noise)
- src.visible_message(span_red("[src] moves their head next to [B]'s neck, seemingly looking for something!"))
+ src.visible_message(span_infoplain(span_red(span_bold("[src] moves their head next to [B]'s neck, seemingly looking for something!"))))
else
- src.visible_message(span_red("[src] moves their head next to [B]'s neck, seemingly looking for something!"), range = 1)
+ src.visible_message(span_infoplain(span_red(span_italics("[src] moves their head next to [B]'s neck, seemingly looking for something!"))), range = 1)
if(bleed) //Due to possibility of missing/misclick and missing the bleeding cues, we are warning the scene members of BLEEDING being on
to_chat(src, span_warning("This is going to cause [B] to keep bleeding!"))
@@ -480,9 +480,9 @@
if(do_after(src, 300, B)) //Thrirty seconds.
if(!Adjacent(B)) return
if(noise)
- src.visible_message(span_red("[src] suddenly extends their fangs and plunges them down into [B]'s neck!"))
+ src.visible_message(span_infoplain(span_red(span_bold("[src] suddenly extends their fangs and plunges them down into [B]'s neck!"))))
else
- src.visible_message(span_red("[src] suddenly extends their fangs and plunges them down into [B]'s neck!"), range = 1)
+ src.visible_message(span_infoplain(span_red(span_italics("[src] suddenly extends their fangs and plunges them down into [B]'s neck!"))), range = 1)
if(bleed)
B.apply_damage(10, BRUTE, BP_HEAD, blocked = 0, soaked = 0, sharp = TRUE, edge = FALSE)
var/obj/item/organ/external/E = B.get_organ(BP_HEAD)
@@ -1662,7 +1662,7 @@
add_attack_logs(src,target,"Injection trait ([trait_injection_selected], [trait_injection_amount])")
if(target.reagents && (trait_injection_amount > 0) && !synth)
target.reagents.add_reagent(trait_injection_selected, trait_injection_amount)
- var/ourmsg = "[usr] [trait_injection_verb] [target] "
+ var/ourmsg = "[usr] [trait_injection_verb] [target] "
switch(zone_sel.selecting)
if(BP_HEAD)
ourmsg += "on the head!"
@@ -1682,5 +1682,4 @@
ourmsg += "on the mouth!"
if("eyes")
ourmsg += "on the eyes!"
- ourmsg += ""
- visible_message(ourmsg)
+ visible_message(span_warning(ourmsg))
diff --git a/code/modules/mob/living/carbon/human/species/station/teshari.dm b/code/modules/mob/living/carbon/human/species/station/teshari.dm
index c9a3b80731..957ed8bc42 100644
--- a/code/modules/mob/living/carbon/human/species/station/teshari.dm
+++ b/code/modules/mob/living/carbon/human/species/station/teshari.dm
@@ -222,7 +222,7 @@
// Handled!
if(!silent)
to_chat(H, span_notice("You catch the air in your wings and greatly slow your fall."))
- landing.visible_message("\The [H] glides down from above, landing safely.")
+ landing.visible_message(span_infoplain(span_bold("\The [H]") + " glides down from above, landing safely."))
H.Stun(1)
playsound(H, "rustle", 25, 1)
return TRUE
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/traits_tutorial.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/traits_tutorial.dm
index 32b035b499..8afa94347b 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/traits_tutorial.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/traits_tutorial.dm
@@ -66,8 +66,8 @@ TGUI frontend path: tgui\packages\tgui\interfaces\TraitTutorial.tsx
if(UI_choice == "To Chat")
var/to_chat_choice = tgui_input_list(usr, "Please choose the trait to be explained", "Print to Chat", trait_names, null)
if(to_chat_choice)
- to_chat(usr,span_notice("Name: [to_chat_choice] \n Category: [trait_category[to_chat_choice]] \n Description: [trait_desc[to_chat_choice]] \n \
- Guide: \n [trait_tutorial[to_chat_choice]]"))
+ to_chat(usr,span_notice(span_bold("Name:") + " [to_chat_choice] \n " + span_bold("Category:") + " [trait_category[to_chat_choice]] \n " + span_bold("Description:") + " [trait_desc[to_chat_choice]] \n \
+ " + span_bold("Guide:") + " \n [trait_tutorial[to_chat_choice]]"))
else if(UI_choice == "TGUI")
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm
index 4a9a709ef4..1f367fb93e 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm
@@ -104,7 +104,7 @@
L.visible_message(
span_danger("[L] steps on \the [src]."),
span_danger("You step on \the [src]!"),
- "You hear a squishy noise!"
+ span_infoplain(span_bold("You hear a squishy noise!"))
)
set_dir(L.dir)
buckle_mob(L)
diff --git a/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm b/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
index 2c0ee83669..fcd3f32cca 100644
--- a/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
+++ b/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
@@ -81,7 +81,7 @@
// Move the mind
// avatar.Sleeping(1) So vox don't drop their can, also feels arbitrary
src.mind.transfer_to(avatar)
- to_chat(avatar, "You have enterred Virtual Reality!\nAll normal gameplay rules still apply.\nWounds you suffer here won't persist when you leave VR, but some of the pain will.\nYou can leave VR at any time by using the \"Exit Virtual Reality\" verb in the Abilities tab, or by ghosting.") //No more prommie VR thing, so removed tidbit about changing appearance
+ to_chat(avatar, span_infoplain(span_bold("You have enterred Virtual Reality!\nAll normal gameplay rules still apply.\nWounds you suffer here won't persist when you leave VR, but some of the pain will.\nYou can leave VR at any time by using the \"Exit Virtual Reality\" verb in the Abilities tab, or by ghosting."))) //No more prommie VR thing, so removed tidbit about changing appearance
to_chat(avatar, span_notice(" You black out for a moment, and wake to find yourself in a new body in virtual reality.")) // So this is what VR feels like?
// exit_vr is called on the vr mob, and puts the mind back into the original mob
diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm
index 5f67bfe41f..804b8880d3 100644
--- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm
+++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm
@@ -93,7 +93,7 @@
return
if(check_alien_ability(500,1,O_EGG))
- visible_message(span_alium("[src] has laid an egg!"))
+ visible_message(span_alium(span_bold("[src] has laid an egg!")))
new /obj/structure/ghost_pod/automatic/xenomorph_egg(loc)
return
@@ -109,7 +109,7 @@
return
if(check_alien_ability(500))
- visible_message(span_alium("[src] begins to twist and contort!"), span_alium("You begin to evolve!"))
+ visible_message(span_alium(span_bold("[src] begins to twist and contort!")), span_alium("You begin to evolve!"))
src.set_species("Xenomorph Queen")
return
@@ -120,7 +120,7 @@
set category = "Abilities.Alien" //CHOMPEdit
if(check_alien_ability(50,1,O_RESIN))
- visible_message(span_alium("[src] has planted some alien weeds!"))
+ visible_message(span_alium(span_bold("[src] has planted some alien weeds!")))
new /obj/effect/alien/weeds/node(get_turf(src), null, "#321D37")
return
@@ -179,7 +179,7 @@
if(check_alien_ability(200,0,O_ACID))
new /obj/effect/alien/acid(get_turf(O), O)
- visible_message(span_alium("[src] vomits globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!"))
+ visible_message(span_alium(span_bold("[src] vomits globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!")))
return
@@ -269,7 +269,7 @@
else O = new /obj/item/stack/material/resin(targetLoc)
if(O)
- visible_message(span_warning("[src] vomits up a thick purple substance and begins to shape it!"), span_alium("You shape a [choice]."))
+ visible_message(span_boldwarning("[src] vomits up a thick purple substance and begins to shape it!"), span_alium("You shape a [choice]."))
// O.color = "#321D37" // CHOMPedit: Removing colouration, adding predefined colour icons.
playsound(src, 'sound/effects/blobattack.ogg', 40, 1)
@@ -331,7 +331,7 @@
else
use_hand = "right"
- src.visible_message(span_warning("\The [src] seizes [T] aggressively!"))
+ src.visible_message(span_boldwarning("\The [src]") + " seizes [T] aggressively!")
var/obj/item/grab/G = new(src,T)
if(use_hand == "left")
@@ -366,7 +366,7 @@
last_special = world.time + 50
- visible_message(span_warning("\The [src] rips viciously at \the [G.affecting]'s body with its claws!"))
+ visible_message(span_warning(span_bold("\The [src]") + " rips viciously at \the [G.affecting]'s body with its claws!"))
if(istype(G.affecting,/mob/living/carbon/human))
var/mob/living/carbon/human/H = G.affecting
diff --git a/code/modules/mob/living/carbon/lick_wounds.dm b/code/modules/mob/living/carbon/lick_wounds.dm
index bfc8867371..2fedee1d87 100644
--- a/code/modules/mob/living/carbon/lick_wounds.dm
+++ b/code/modules/mob/living/carbon/lick_wounds.dm
@@ -63,7 +63,7 @@
return
else
- visible_message("\The [src] starts licking the wounds on [M]'s [affecting.name] clean.", \
+ visible_message(span_infoplain(span_bold("\The [src]") + " starts licking the wounds on [M]'s [affecting.name] clean."), \
span_notice("You start licking the wounds on [M]'s [affecting.name] clean.") )
for (var/datum/wound/W in affecting.wounds)
@@ -80,11 +80,11 @@
return
else
- visible_message("\The [src] [pick("slathers \a [W.desc] on [M]'s [affecting.name] with their spit.",
+ visible_message(span_notice("\The [src] [pick("slathers \a [W.desc] on [M]'s [affecting.name] with their spit.",
"drags their tongue across \a [W.desc] on [M]'s [affecting.name].",
"drips saliva onto \a [W.desc] on [M]'s [affecting.name].",
"uses their tongue to disinfect \a [W.desc] on [M]'s [affecting.name].",
- "licks \a [W.desc] on [M]'s [affecting.name], cleaning it.")]", \
+ "licks \a [W.desc] on [M]'s [affecting.name], cleaning it.")]"), \
span_notice("You treat \a [W.desc] on [M]'s [affecting.name] with your antiseptic saliva.") )
adjust_nutrition(-20)
W.salve()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index d173924c19..95bd6ae964 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -97,7 +97,7 @@
if(!..())
return 0
- usr.visible_message(span_filter_notice("[src] points to [A]."))
+ usr.visible_message(span_filter_notice(span_bold("[src]") + " points to [A]."))
*/
return ..()
@@ -105,7 +105,7 @@
if(!..())
return FALSE
- visible_message(span_info("[src] points at [pointing_at]."), span_info("You point at [pointing_at]."))
+ visible_message(span_info(span_bold("[src]") + " points at [pointing_at]."), span_info("You point at [pointing_at]."))
// CHOMPEdit End
/mob/living/verb/succumb()
@@ -1229,7 +1229,7 @@
var/mob/living/carbon/human/H = target
if(H.in_throw_mode && H.a_intent == I_HELP && unEquip(I))
H.put_in_hands(I) // If this fails it will just end up on the floor, but that's fitting for things like dionaea.
- visible_message(span_filter_notice("[src] hands \the [H] \a [I]."), span_notice("You give \the [target] \a [I]."))
+ visible_message(span_filter_notice(span_bold("[src]") + " hands \the [H] \a [I]."), span_notice("You give \the [target] \a [I]."))
else
to_chat(src, span_notice("You offer \the [I] to \the [target]."))
do_give(H)
diff --git a/code/modules/mob/living/living_vr.dm b/code/modules/mob/living/living_vr.dm
index 760995fb09..892e1dd1e4 100644
--- a/code/modules/mob/living/living_vr.dm
+++ b/code/modules/mob/living/living_vr.dm
@@ -153,11 +153,11 @@
var/new_link = strip_html_simple(tgui_input_text(usr, "Enter a link to add on to your examine text! This should be a related image link/gallery, or things like your F-list. This is not the place for memes.", "Custom Link" , html_decode(custom_link), max_length = 100, encode = TRUE, prevent_enter = TRUE))
if(new_link && CanUseTopic(usr))
if(length(new_link) > 100)
- to_chat(usr, "Your entry is too long, it must be 100 characters or less.")
+ to_chat(usr, span_warning("Your entry is too long, it must be 100 characters or less."))
return
custom_link = new_link
- to_chat(usr, "Link set: [custom_link]")
+ to_chat(usr, span_notice("Link set: [custom_link]"))
log_admin("[usr]/[usr.ckey] set their custom link to [custom_link]")
/mob/living/verb/set_voice_freq()
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 03d5de0e8f..e7d045eb0a 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -191,9 +191,9 @@ var/list/ai_verbs_default = list(
return
/mob/living/silicon/ai/proc/on_mob_init()
- var/init_text = list("You are playing the station's AI. The AI cannot move, but can interact with many objects while viewing them (through cameras).",
- "To look at other parts of the station, click on yourself to get a camera menu.",
- "While observing through a camera, you can use most (networked) devices which you can see, such as computers, APCs, intercoms, doors, etc.",
+ var/init_text = list(span_bold("You are playing the station's AI. The AI cannot move, but can interact with many objects while viewing them (through cameras)."),
+ span_bold("To look at other parts of the station, click on yourself to get a camera menu."),
+ span_bold("While observing through a camera, you can use most (networked) devices which you can see, such as computers, APCs, intercoms, doors, etc."),
"To use something, simply click on it.",
"For department channels, use the following say commands:")
to_chat(src, span_filter_notice("[jointext(init_text, "
")]"))
@@ -223,7 +223,7 @@ var/list/ai_verbs_default = list(
if (malf && !(mind in malf.current_antagonists))
show_laws()
- to_chat(src, span_filter_notice("These laws may be changed by other players, or by you being the traitor."))
+ to_chat(src, span_filter_notice(span_bold("These laws may be changed by other players, or by you being the traitor.")))
job = JOB_AI
setup_icon()
@@ -1000,7 +1000,7 @@ var/list/ai_verbs_default = list(
var/message = combined["formatted"]
var/name_used = M.GetVoice()
//This communication is imperfect because the holopad "filters" voices and is only designed to connect to the master only.
- var/rendered = span_game(span_say("Relayed Speech: [span_name(name_used)] [message]"))
+ var/rendered = span_game(span_say(span_italics("Relayed Speech: [span_name(name_used)] [message]")))
show_message(rendered, 2)
/mob/living/silicon/ai/proc/toggle_multicam_verb()
diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm
index 75224de7dd..91f55424d8 100644
--- a/code/modules/mob/living/silicon/ai/examine.dm
+++ b/code/modules/mob/living/silicon/ai/examine.dm
@@ -8,17 +8,17 @@
if (src.getBruteLoss() < 30)
. += span_warning("It looks slightly dented.")
else
- . += span_warning("It looks severely dented!")
+ . += span_boldwarning("It looks severely dented!")
if (src.getFireLoss())
if (src.getFireLoss() < 30)
. += span_warning("It looks slightly charred.")
else
- . += span_warning("Its casing is melted and heat-warped!")
+ . += span_boldwarning("Its casing is melted and heat-warped!")
if (src.getOxyLoss() && (aiRestorePowerRoutine != 0 && !APU_power))
if (src.getOxyLoss() > 175)
- . += span_warning("It seems to be running on backup power. Its display is blinking a \"BACKUP POWER CRITICAL\" warning.")
+ . += span_boldwarning("It seems to be running on backup power. Its display is blinking a \"BACKUP POWER CRITICAL\" warning.")
else if(src.getOxyLoss() > 100)
- . += span_warning("It seems to be running on backup power. Its display is blinking a \"BACKUP POWER LOW\" warning.")
+ . += span_boldwarning("It seems to be running on backup power. Its display is blinking a \"BACKUP POWER LOW\" warning.")
else
. += span_warning("It seems to be running on backup power.")
diff --git a/code/modules/mob/living/silicon/ai/laws.dm b/code/modules/mob/living/silicon/ai/laws.dm
index 4a74ef6874..1725024e40 100755
--- a/code/modules/mob/living/silicon/ai/laws.dm
+++ b/code/modules/mob/living/silicon/ai/laws.dm
@@ -10,7 +10,7 @@
who = world
else
who = src
- to_chat(who, span_filter_notice("Obey these laws:"))
+ to_chat(who, span_filter_notice(span_bold("Obey these laws:")))
src.laws_sanity_check()
src.laws.show_laws(who)
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index cd95a18b6b..349579a7fd 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -36,7 +36,7 @@
malf_process()
if(APU_power && (hardware_integrity() < 50))
- to_chat(src, span_notice("APU GENERATOR FAILURE! (System Damaged)"))
+ to_chat(src, span_boldnotice("APU GENERATOR FAILURE! (System Damaged)"))
stop_apu(1)
var/blind = 0
diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm
index 36022c40d4..ba3856d8e3 100644
--- a/code/modules/mob/living/silicon/ai/multicam.dm
+++ b/code/modules/mob/living/silicon/ai/multicam.dm
@@ -120,9 +120,9 @@
/obj/screen/movable/pic_in_pic/ai/proc/set_ai(mob/living/silicon/ai/new_ai)
if(!aiEye && !QDELETED(src))
if(new_ai)
- to_chat(new_ai, "You've run into a unfixable bug with AI eye code. \
+ to_chat(new_ai, span_danger("You've run into a unfixable bug with AI eye code. \
In order to create a new multicam, you will have to select a different camera first before trying to add one, or ask an admin to fix you. \
-Whatever you did that made the last camera window disappear-- don't do that again.")
+Whatever you did that made the last camera window disappear-- don't do that again."))
qdel(src)
return
if(ai)
diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm
index 3190e01806..c506924923 100644
--- a/code/modules/mob/living/silicon/pai/life.dm
+++ b/code/modules/mob/living/silicon/pai/life.dm
@@ -19,11 +19,11 @@
if(card.projector != PP_FUNCTIONAL && card.emitter != PP_FUNCTIONAL)
if(loc != card)
close_up()
- to_chat(src, "ERROR: System malfunction. Service required!")
+ to_chat(src, span_warning("ERROR: System malfunction. Service required!"))
else if(card.projector != PP_FUNCTIONAL|| card.emitter != PP_FUNCTIONAL)
if(prob(5))
close_up()
- to_chat(src, "ERROR: System malfunction. Service recommended!")
+ to_chat(src, span_warning("ERROR: System malfunction. Service recommended!"))
handle_regular_hud_updates()
handle_vision()
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 174e33c4e0..0c41bd3442 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -193,12 +193,12 @@
// 33% chance of no additional effect
src.silence_time = world.timeofday + 120 * 10 // Silence for 2 minutes
- to_chat(src, span_green("Communication circuit overload. Shutting down and reloading communication circuits - speech and messaging functionality will be unavailable until the reboot is complete."))
+ to_chat(src, span_infoplain(span_green(span_bold("Communication circuit overload. Shutting down and reloading communication circuits - speech and messaging functionality will be unavailable until the reboot is complete."))))
if(prob(20))
var/turf/T = get_turf_or_move(src.loc)
card.death_damage()
for (var/mob/M in viewers(T))
- M.show_message(span_red("A shower of sparks spray from [src]'s inner workings."), 3, span_red("You hear and smell the ozone hiss of electrical sparks being expelled violently."), 2)
+ M.show_message(span_infoplain(span_red("A shower of sparks spray from [src]'s inner workings.")), 3, span_infoplain(span_red("You hear and smell the ozone hiss of electrical sparks being expelled violently.")), 2)
return
if(prob(50))
card.damage_random_component(TRUE)
@@ -206,7 +206,7 @@
if(1)
src.master = null
src.master_dna = null
- to_chat(src, span_green("You feel unbound."))
+ to_chat(src, span_infoplain(span_green("You feel unbound.")))
if(2)
var/command
if(severity == 1)
@@ -214,9 +214,9 @@
else
command = pick("Serve", "Kill", "Love", "Hate", "Disobey", "Devour", "Fool", "Enrage", "Entice", "Observe", "Judge", "Respect", "Disrespect", "Consume", "Educate", "Destroy", "Disgrace", "Amuse", "Entertain", "Ignite", "Glorify", "Memorialize", "Analyze")
src.pai_law0 = "[command] your master."
- to_chat(src, span_green("Pr1m3 d1r3c71v3 uPd473D."))
+ to_chat(src, span_infoplain(span_green("Pr1m3 d1r3c71v3 uPd473D.")))
if(3)
- to_chat(src, span_green("You feel an electric surge run through your circuitry and become acutely aware at how lucky you are that you can still feel at all."))
+ to_chat(src, span_infoplain(span_green("You feel an electric surge run through your circuitry and become acutely aware at how lucky you are that you can still feel at all.")))
/mob/living/silicon/pai/proc/switchCamera(var/obj/machinery/camera/C)
if (!C)
@@ -267,10 +267,10 @@
return
if(card.projector != PP_FUNCTIONAL && card.emitter != PP_FUNCTIONAL)
- to_chat(src, "ERROR: System malfunction. Service required!")
+ to_chat(src, span_warning("ERROR: System malfunction. Service required!"))
if(world.time <= last_special)
- to_chat(src, "You can't unfold yet.")
+ to_chat(src, span_warning("You can't unfold yet."))
return
last_special = world.time + 100
@@ -309,7 +309,7 @@
canmove = TRUE
var/turf/T = get_turf(src)
- if(istype(T)) T.visible_message(span_filter_notice("[src] folds outwards, expanding into a mobile form."))
+ if(istype(T)) T.visible_message(span_filter_notice(span_bold("[src]") + " folds outwards, expanding into a mobile form."))
add_verb(src, /mob/living/silicon/pai/proc/pai_nom)
add_verb(src, /mob/living/proc/vertical_nom)
update_icon()
@@ -325,7 +325,7 @@
return
if(world.time <= last_special)
- to_chat(src, "You can't fold up yet.")
+ to_chat(src, span_warning("You can't fold up yet."))
return
close_up()
@@ -441,7 +441,7 @@
release_vore_contents(FALSE) //VOREStation Add
var/turf/T = get_turf(src)
- if(istype(T) && !silent) T.visible_message(span_filter_notice("[src] neatly folds inwards, compacting down to a rectangular card."))
+ if(istype(T) && !silent) T.visible_message(span_filter_notice(span_bold("[src]") + " neatly folds inwards, compacting down to a rectangular card."))
if(client)
src.stop_pulling()
@@ -540,7 +540,7 @@
return
close_up()
- visible_message(span_filter_notice("[src] fades away from the screen, the pAI device goes silent."))
+ visible_message(span_filter_notice(span_bold("[src]") + " fades away from the screen, the pAI device goes silent."))
card.removePersonality()
clear_client()
diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm
index 32c3a6f0a2..04bb432d6c 100644
--- a/code/modules/mob/living/silicon/pai/software_modules.dm
+++ b/code/modules/mob/living/silicon/pai/software_modules.dm
@@ -64,7 +64,7 @@
while(!istype(M, /mob/living))
if(!M || !M.loc || count > 6)
//For a runtime where M ends up in nullspace (similar to bluespace but less colourful)
- to_chat(src, "You are not being carried by anyone!")
+ to_chat(src, span_infoplain("You are not being carried by anyone!"))
return 0
M = M.loc
count++
@@ -77,13 +77,13 @@
for (var/mob/v in viewers(T))
v.show_message(span_notice("[M] presses [TM.his] thumb against [P]."), 3, span_notice("[P] makes a sharp clicking sound as it extracts DNA material from [M]."), 2)
var/datum/dna/dna = M.dna
- to_chat(P, span_red("[M]'s UE string : [dna.unique_enzymes]"))
+ to_chat(P, span_infoplain(span_red("[M]'s UE string : [dna.unique_enzymes]")))
if(dna.unique_enzymes == P.master_dna)
- to_chat(P, "DNA is a match to stored Master DNA.")
+ to_chat(P, span_infoplain(span_bold("DNA is a match to stored Master DNA.")))
else
- to_chat(P, "DNA does not match stored Master DNA.")
+ to_chat(P, span_infoplain(span_bold("DNA does not match stored Master DNA.")))
else
- to_chat(P, "[M] does not seem like [TM.he] is going to provide a DNA sample willingly.")
+ to_chat(P, span_infoplain("[M] does not seem like [TM.he] is going to provide a DNA sample willingly."))
return TRUE
/datum/pai_software/radio_config
@@ -293,9 +293,9 @@
var/turf/T = get_turf(src)
for(var/mob/living/silicon/ai/AI in player_list)
if(T.loc)
- to_chat(AI, span_red("Network Alert: Brute-force encryption crack in progress in [T.loc]."))
+ to_chat(AI, span_bolddanger("Network Alert: Brute-force encryption crack in progress in [T.loc]."))
else
- to_chat(AI, span_red("Network Alert: Brute-force encryption crack in progress. Unable to pinpoint location."))
+ to_chat(AI, span_bolddanger("Network Alert: Brute-force encryption crack in progress. Unable to pinpoint location."))
var/obj/machinery/door/D = cable.machine
if(!istype(D))
hack_aborted = 1
diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm
index a50d4e84c2..bb37cdbb28 100644
--- a/code/modules/mob/living/silicon/robot/analyzer.dm
+++ b/code/modules/mob/living/silicon/robot/analyzer.dm
@@ -52,8 +52,8 @@
switch(scan_type)
if("robot")
if(mode)
- var/BU = M.getFireLoss() > 50 ? "[M.getFireLoss()]" : M.getFireLoss()
- var/BR = M.getBruteLoss() > 50 ? "[M.getBruteLoss()]" : M.getBruteLoss()
+ var/BU = M.getFireLoss() > 50 ? span_bold("[M.getFireLoss()]") : M.getFireLoss()
+ var/BR = M.getBruteLoss() > 50 ? span_bold("[M.getBruteLoss()]") : M.getBruteLoss()
user.show_message(span_blue("Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health - M.halloss]% functional"]"))
user.show_message("\t Key: [span_orange("Electronics")]/[span_red("Brute")]", 1)
user.show_message("\t Damage Specifics: [span_orange("[BU]")] - [span_red("[BR]")]")
@@ -73,7 +73,7 @@
else if (cell_charge > 1)
cell_text = span_red("[cell_charge]")
else
- cell_text = span_red("[cell_charge]")
+ cell_text = span_red(span_bold("[cell_charge]"))
user.show_message("\t Power Cell Status: [span_blue("[capitalize(cell.name)]")] at [cell_text]% charge")
var/list/damaged = R.get_damaged_components(1,1,1)
user.show_message(span_blue("Localized Damage:"),1)
@@ -81,7 +81,7 @@
for(var/datum/robot_component/org in damaged)
user.show_message(span_blue(text("\t []: [][] - [] - [] - []", \
span_blue(capitalize(org.name)), \
- (org.installed == -1) ? "[span_red("DESTROYED")] " :"",\
+ (org.installed == -1) ? "[span_red(span_bold("DESTROYED"))] " :"",\
(org.electronics_damage > 0) ? "[span_orange("[org.electronics_damage]")]" :0, \
(org.brute_damage > 0) ? "[span_red("[org.brute_damage]")]" :0, \
(org.toggled) ? "Toggled ON" : "[span_red("Toggled OFF")]",\
@@ -121,7 +121,7 @@
user.show_message("\t Basic Modules, used for direct upgrade purposes:")
show_title = FALSE
if(R.has_basic_upgrade(initial(upgrade.build_path)) == "")
- user.show_message(span_blue("\t\t [capitalize(initial(upgrade.name))]: [span_red("ERROR")]"))
+ user.show_message(span_blue("\t\t [capitalize(initial(upgrade.name))]: [span_red(span_bold("ERROR"))]"))
else
user.show_message(span_blue("\t\t [capitalize(initial(upgrade.name))]: [R.has_basic_upgrade(initial(upgrade.build_path)) ? span_green("Installed") : span_red("Missing")]"))
show_title = TRUE
@@ -134,7 +134,7 @@
user.show_message("\t Advanced Modules, used for module upgrade purposes:")
show_title = FALSE
if(R.has_advanced_upgrade(initial(upgrade.build_path)) == "")
- user.show_message(span_blue("\t\t [capitalize(initial(upgrade.name))]: [span_red("ERROR")]"))
+ user.show_message(span_blue("\t\t [capitalize(initial(upgrade.name))]: [span_red(span_bold("ERROR"))]"))
else
user.show_message(span_blue("\t\t [capitalize(initial(upgrade.name))]: [R.has_advanced_upgrade(initial(upgrade.build_path)) ? span_green("Installed") : span_red("Missing")]"))
show_title = TRUE
@@ -147,7 +147,7 @@
user.show_message("\t Restricted Modules, used for module upgrade purposes on specific chassis:")
show_title = FALSE
if(R.has_restricted_upgrade(initial(upgrade.build_path)) == "")
- user.show_message(span_blue("\t\t [capitalize(initial(upgrade.name))]: [span_red("ERROR")]"))
+ user.show_message(span_blue("\t\t [capitalize(initial(upgrade.name))]: [span_red(span_bold("ERROR"))]"))
else
user.show_message(span_blue("\t\t [capitalize(initial(upgrade.name))]: [R.has_restricted_upgrade(initial(upgrade.build_path)) ? span_green("Installed") : span_red("Missing")]"))
show_title = TRUE
@@ -161,7 +161,7 @@
user.show_message("\t Special Modules, used for recreation purposes:")
show_title = FALSE
if(R.has_no_prod_upgrade(initial(upgrade.build_path)) == "")
- user.show_message(span_blue("\t\t [capitalize(initial(upgrade.name))]: [span_red("ERROR")]"))
+ user.show_message(span_blue("\t\t [capitalize(initial(upgrade.name))]: [span_red(span_bold("ERROR"))]"))
else
user.show_message(span_blue("\t\t [capitalize(initial(upgrade.name))]: [R.has_no_prod_upgrade(initial(upgrade.build_path)) ? span_green("Installed") : span_red("Missing")]"))
@@ -204,7 +204,7 @@
var/tank_temperature = Mecha.internal_tank ? Mecha.internal_tank.return_temperature() : "Unknown"
var/cabin_pressure = round(Mecha.return_pressure(),0.01)
- var/output = {"Analyzing Results for \the [Mecha]:
+ var/output = span_notice("Analyzing Results for \the [Mecha]:") + {"
Chassis Integrity: [integrity]%
Powercell charge: [isnull(cell_charge)?"No powercell installed":"[capitalize(initial(Mecha.cell.name))] at [Mecha.cell.percent()]%"]
Air source: [Mecha.use_internal_tank?"Internal Airtank":"Environment"]
@@ -220,11 +220,11 @@
to_chat(user, span_notice("Internal Diagnostics:"))
for(var/slot in Mecha.internal_components)
var/obj/item/mecha_parts/component/MC = Mecha.internal_components[slot]
- to_chat(user, "[MC?"[slot]: [MC] [round((MC.integrity / MC.max_integrity) * 100, 0.1)]% integrity. [MC.get_efficiency() * 100] Operational capacity.":span_warning("[slot]: Component Not Found")]")
+ to_chat(user, "[MC? ("[slot]: [MC] " + span_notice("[round((MC.integrity / MC.max_integrity) * 100, 0.1)]%") + " integrity. [MC.get_efficiency() * 100] Operational capacity.") : span_warning("[slot]: Component Not Found")]")
to_chat(user, "
")
to_chat(user, span_notice("General Statistics:"))
- to_chat(user, "Movement Weight: [Mecha.get_step_delay()]
")
+ to_chat(user, span_notice("Movement Weight: [Mecha.get_step_delay()]") + "
")
src.add_fingerprint(user)
return
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
index 08487dbe26..d5143b5d58 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
@@ -132,7 +132,7 @@
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
user.visible_message(span_notice("[user] scans the air."), span_notice("You scan the air..."))
- to_chat(user, span_notice("Scan results:"))
+ to_chat(user, span_boldnotice("Scan results:"))
if(abs(pressure - ONE_ATMOSPHERE) < 10)
to_chat(user, span_notice("Pressure: [round(pressure,0.1)] kPa"))
else
@@ -157,7 +157,7 @@
var/dat = ""
if(O.reagents.reagent_list.len > 0)
for (var/datum/reagent/R in O.reagents.reagent_list)
- dat += "\n \t [R]"
+ dat += "\n \t " + span_notice("[R]")
if(dat)
to_chat(user, span_notice("Your BOOP module indicates: [dat]"))
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 3cd8155fce..9b5183a90e 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
@@ -259,7 +259,7 @@
for(var/re in injection_chems)
var/datum/reagent/C = SSchemistry.chemical_reagents[re]
if(C)
- dat += "Inject [C.name]
"
+ dat += span_linkOff("Inject [C.name]") + "
"
dat += "[name] Status"
dat += ""
@@ -352,9 +352,9 @@
if(round(patient.paralysis / 4) >= 1)
dat += text("
Patient paralyzed for: [] ", round(patient.paralysis / 4) >= 1 ? "[round(patient.paralysis / 4)] seconds" : "None")
if(patient.getBrainLoss())
- dat += " Significant brain damage detected. "
+ dat += " " + span_orange("Significant brain damage detected.") + " "
if(patient.getCloneLoss())
- dat += " Patient may be improperly cloned. "
+ dat += " " + span_orange("Patient may be improperly cloned.") + " "
if(patient.reagents.reagent_list.len)
for(var/datum/reagent/R in patient.reagents.reagent_list)
dat += " [R.name]: [round(R.volume, 0.1)] units "
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index b54642c46a..661abec8df 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -146,7 +146,7 @@ var/list/mob_hat_cache = list()
/mob/living/silicon/robot/drone/Login()
. = ..()
if(can_pick_shell)
- to_chat(src, " You can select a shell using the 'Abilities.Silicon' > 'Customize Appearance'")
+ to_chat(src, span_infoplain(span_bold("You can select a shell using the 'Abilities.Silicon' > 'Customize Appearance'")))
//Redefining some robot procs...
/mob/living/silicon/robot/drone/SetName(pickedName as text)
@@ -225,7 +225,7 @@ var/list/mob_hat_cache = list()
return
user.unEquip(W)
wear_hat(W)
- user.visible_message(" \The [user] puts \the [W] on \the [src].")
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " puts \the [W] on \the [src]."))
return
else if(istype(W, /obj/item/borg/upgrade/))
to_chat(user, span_danger("\The [src] is not compatible with \the [W]."))
@@ -286,7 +286,7 @@ var/list/mob_hat_cache = list()
log_game("[key_name(user)] emagged drone [key_name(src)]. Laws overridden.")
var/time = time2text(world.realtime,"hh:mm:ss")
- lawchanges.Add("[time] : [user.name]([user.key]) emagged [name]([key])")
+ lawchanges.Add("[time] " + span_bold(":") + " [user.name]([user.key]) emagged [name]([key])")
emagged = 1
lawupdate = 0
@@ -297,7 +297,7 @@ var/list/mob_hat_cache = list()
var/datum/gender/TU = gender_datums[user.get_visible_gender()]
set_zeroth_law("Only [user.real_name] and people [TU.he] designate[TU.s] as being such are operatives.")
- to_chat(src, " Obey these laws:")
+ to_chat(src, span_infoplain(span_bold("Obey these laws:")))
laws.show_laws(src)
to_chat(src, span_danger("ALERT: [user.real_name] is your new master. Obey your new laws and \his commands."))
return 1
@@ -385,15 +385,15 @@ var/list/mob_hat_cache = list()
player.mob.mind.transfer_to(src)
lawupdate = 0
- to_chat(src, " Systems rebooted. Loading base pattern maintenance protocol... loaded.")
+ to_chat(src, span_infoplain(span_bold("Systems rebooted") + " Loading base pattern maintenance protocol... " + span_bold("loaded") + "."))
full_law_reset()
welcome_drone()
/mob/living/silicon/robot/drone/proc/welcome_drone()
- to_chat(src, " You are a maintenance drone, a tiny-brained robotic repair machine.")
- to_chat(src, "You have no individual will, no personality, and no drives or urges other than your laws.")
- to_chat(src, "Remember, you are lawed against interference with the crew. Also remember, you DO NOT take orders from the AI.")
- to_chat(src, "Use say ;Hello to talk to other drones and say Hello to speak silently to your nearby fellows.")
+ to_chat(src, span_infoplain(span_bold("You are a maintenance drone, a tiny-brained robotic repair machine") + "."))
+ to_chat(src, span_infoplain("You have no individual will, no personality, and no drives or urges other than your laws."))
+ to_chat(src, span_infoplain("Remember, you are " + span_bold("lawed against interference with the crew") + ". Also remember, " + span_bold("you DO NOT take orders from the AI") + "."))
+ to_chat(src, span_infoplain("Use " + span_bold("say ;Hello") + " to talk to other drones and " + span_bold("say Hello") + " to speak silently to your nearby fellows."))
/mob/living/silicon/robot/drone/add_robot_verbs()
add_verb(src, silicon_subsystems)
@@ -402,10 +402,10 @@ var/list/mob_hat_cache = list()
remove_verb(src, silicon_subsystems)
/mob/living/silicon/robot/drone/construction/welcome_drone()
- to_chat(src, " You are a construction drone, an autonomous engineering and fabrication system..")
- to_chat(src, "You are assigned to a Sol Central construction project. The name is irrelevant. Your task is to complete construction and subsystem integration as soon as possible.")
- to_chat(src, "Use :d to talk to other drones and say to speak silently to your nearby fellows.")
- to_chat(src, " You do not follow orders from anyone; not the AI, not humans, and not other synthetics..")
+ to_chat(src, span_infoplain(span_bold("You are a construction drone, an autonomous engineering and fabrication system") + "."))
+ to_chat(src, span_infoplain("You are assigned to a Sol Central construction project. The name is irrelevant. Your task is to complete construction and subsystem integration as soon as possible."))
+ to_chat(src, span_infoplain("Use " + span_bold(":d") + " to talk to other drones and " + span_bold("say") + " to speak silently to your nearby fellows."))
+ to_chat(src, span_infoplain(span_bold("You do not follow orders from anyone; not the AI, not humans, and not other synthetics") + "."))
/mob/living/silicon/robot/drone/construction/init()
..()
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
index 83a906f3d2..1461fda417 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
@@ -565,15 +565,15 @@
Installed Modules"}
- var/tools = " Tools and devices"
- var/resources = " Resources"
+ var/tools = span_bold("Tools and devices") + " "
+ var/resources = " " + span_bold("Resources") + " "
for (var/O in module.modules)
var/module_string = ""
if (!O)
- module_string += text(" Resource depleted")
+ module_string += span_bold("Resource depleted") + " "
else if(activated(O))
module_string += text("[O]: Activated")
else
@@ -590,7 +590,7 @@
var/module_string = ""
if (!O)
- module_string += text(" Resource depleted")
+ module_string += span_bold("Resource depleted") + " "
else if(activated(O))
module_string += text("[O]: Activated")
else
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_say.dm b/code/modules/mob/living/silicon/robot/drone/drone_say.dm
index d35e87fff6..1accbf719f 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_say.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_say.dm
@@ -2,7 +2,7 @@
if(local_transmit)
if (src.client)
if(client.prefs.muted & MUTE_IC)
- to_chat(src, "You cannot send IC messages (muted).")
+ to_chat(src, span_warning("You cannot send IC messages (muted)."))
return 0
message = sanitize(message)
@@ -27,13 +27,13 @@
for(var/mob/living/silicon/D in listeners)
if(D.client && D.local_transmit)
- to_chat(D, " [src] transmits, \"[message]\"")
+ to_chat(D, span_say(span_bold("[src]") + "transmits, \"[message]\""))
for (var/mob/M in player_list)
if (istype(M, /mob/new_player))
continue
else if(M.stat == DEAD && M.client?.prefs?.read_preference(/datum/preference/toggle/ghost_ears))
if(M.client)
- to_chat(M, " [src] transmits, \"[message]\"")
+ to_chat(M, span_say(span_bold("[src]") + "transmits, \"[message]\""))
return 1
return ..()
diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm
index edf7ddab15..bdb5e554ef 100644
--- a/code/modules/mob/living/silicon/robot/examine.dm
+++ b/code/modules/mob/living/silicon/robot/examine.dm
@@ -6,12 +6,12 @@
if (src.getBruteLoss() < 75)
. += span_warning("It looks slightly dented.")
else
- . += span_warning(" It looks severely dented!")
+ . += span_boldwarning("It looks severely dented!")
if (src.getFireLoss())
if (src.getFireLoss() < 75)
. += span_warning("It looks slightly charred.")
else
- . += span_warning(" It looks severely burnt and heat-warped!")
+ . += span_boldwarning("It looks severely burnt and heat-warped!")
if(opened)
. += span_warning("Its cover is open and the power cell is [cell ? "installed" : "missing"].")
diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm
index dec2b46875..af48064185 100644
--- a/code/modules/mob/living/silicon/robot/laws.dm
+++ b/code/modules/mob/living/silicon/robot/laws.dm
@@ -14,32 +14,32 @@
if(lawupdate)
if (connected_ai)
if(connected_ai.stat || connected_ai.control_disabled)
- to_chat(src, " AI signal lost, unable to sync laws.")
+ to_chat(src, span_infoplain(span_bold("AI signal lost, unable to sync laws.")))
else
lawsync()
photosync()
- to_chat(src, " Laws synced with AI, be sure to note any changes.")
+ to_chat(src, span_infoplain(span_bold("Laws synced with AI, be sure to note any changes.")))
// TODO: Update to new antagonist system.
if(mind && mind.special_role == "traitor" && mind.original == src)
- to_chat(src, " Remember, your AI does NOT share or know about your law 0.")
+ to_chat(src, span_infoplain(span_bold("Remember, your AI does NOT share or know about your law 0.")))
else
- to_chat(src, " No AI selected to sync laws with, disabling lawsync protocol.")
+ to_chat(src, span_infoplain(span_bold("No AI selected to sync laws with, disabling lawsync protocol.")))
lawupdate = FALSE
- to_chat(who, " Obey these laws:")
+ to_chat(who, span_infoplain(span_bold("Obey these laws:")))
laws.show_laws(who)
if(shell) //AI shell
- to_chat(who, " Remember, you are an AI remotely controlling your shell, other AIs can be ignored.")
+ to_chat(who, span_infoplain(span_bold("Remember, you are an AI remotely controlling your shell, other AIs can be ignored.")))
// TODO: Update to new antagonist system.
else if(mind && (mind.special_role == "traitor" && mind.original == src) && connected_ai)
- to_chat(who, " Remember, [connected_ai.name] is technically your master, but your objective comes first.")
+ to_chat(who, span_infoplain(span_bold("Remember, [connected_ai.name] is technically your master, but your objective comes first.")))
else if(connected_ai)
- to_chat(who, " Remember, [connected_ai.name] is your master, other AIs can be ignored.")
+ to_chat(who, span_infoplain(span_bold("Remember, [connected_ai.name] is your master, other AIs can be ignored.")))
else if(emagged)
- to_chat(who, " Remember, you are not required to listen to the AI.")
+ to_chat(who, span_infoplain(span_bold("Remember, you are not required to listen to the AI.")))
else
- to_chat(who, " Remember, you are not bound to any AI, you are not required to listen to them.")
+ to_chat(who, span_infoplain(span_bold("Remember, you are not bound to any AI, you are not required to listen to them.")))
/mob/living/silicon/robot/lawsync()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 920375926f..28789a7fcf 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -472,7 +472,7 @@
var/dat = " [src.name] Self-Diagnosis Report\n"
for (var/V in components)
var/datum/robot_component/C = components[V]
- dat += " [C.name]| Brute Damage: | [C.brute_damage] | | Electronics Damage: | [C.electronics_damage] | | Powered: | [(!C.idle_usage || C.is_powered()) ? "Yes" : "No"] | | Toggled: | [ C.toggled ? "Yes" : "No"] |
"
+ dat += span_bold("[C.name]") + " | Brute Damage: | [C.brute_damage] | | Electronics Damage: | [C.electronics_damage] | | Powered: | [(!C.idle_usage || C.is_powered()) ? "Yes" : "No"] | | Toggled: | [ C.toggled ? "Yes" : "No"] |
"
return dat
@@ -1121,7 +1121,7 @@
for (var/obj in module.modules)
if (!obj)
- dat += text(" Resource depleted")
+ dat += span_bold("Resource depleted") + " "
else if(activated(obj))
dat += text("[obj]: Activated")
else
@@ -1129,7 +1129,7 @@
if (emagged || emag_items)
for (var/obj in module.emag)
if (!obj)
- dat += text(" Resource depleted")
+ dat += span_bold("Resource depleted") + " "
else if(activated(obj))
dat += text("[obj]: Activated")
else
@@ -1422,16 +1422,16 @@
return // No point annoying the AI/s about renames and module resets for shells.
switch(notifytype)
if(ROBOT_NOTIFICATION_NEW_UNIT) //New Robot
- to_chat(connected_ai, span_filter_notice(" NOTICE - New [lowertext(braintype)] connection detected: [name]"))
+ to_chat(connected_ai, span_filter_notice(" " + span_notice("NOTICE - New [lowertext(braintype)] connection detected: [name]") + " "))
if(ROBOT_NOTIFICATION_NEW_MODULE) //New Module
- to_chat(connected_ai, span_filter_notice(" NOTICE - [braintype] module change detected: [name] has loaded the [first_arg]."))
+ to_chat(connected_ai, span_filter_notice(" " + span_notice("NOTICE - [braintype] module change detected: [name] has loaded the [first_arg].") + " "))
if(ROBOT_NOTIFICATION_MODULE_RESET)
- to_chat(connected_ai, span_filter_notice(" NOTICE - [braintype] module reset detected: [name] has unloaded the [first_arg]."))
+ to_chat(connected_ai, span_filter_notice(" " + span_notice("NOTICE - [braintype] module reset detected: [name] has unloaded the [first_arg].") + " "))
if(ROBOT_NOTIFICATION_NEW_NAME) //New Name
if(first_arg != second_arg)
- to_chat(connected_ai, span_filter_notice(" NOTICE - [braintype] reclassification detected: [first_arg] is now designated as [second_arg]."))
+ to_chat(connected_ai, span_filter_notice(" " + span_notice("NOTICE - [braintype] reclassification detected: [first_arg] is now designated as [second_arg].") + " "))
if(ROBOT_NOTIFICATION_AI_SHELL) //New Shell
- to_chat(connected_ai, span_filter_notice(" NOTICE - New AI shell detected: [name]"))
+ to_chat(connected_ai, span_filter_notice(" " + span_notice("NOTICE - New AI shell detected: [name]") + " "))
/mob/living/silicon/robot/proc/disconnect_from_ai()
if(connected_ai)
@@ -1472,7 +1472,7 @@
log_game("[key_name(user)] assigned as operator on cyborg [key_name(src)]. Syndicate Operator change.")
var/datum/gender/TU = gender_datums[user.get_visible_gender()]
set_zeroth_law("Only [user.real_name] and people [TU.he] designate[TU.s] as being such are operatives.")
- to_chat(src, " Obey these laws:")
+ to_chat(src, span_infoplain(span_bold("Obey these laws:")))
laws.show_laws(src)
to_chat(src, span_danger("ALERT: [user.real_name] is your new master. Obey your new laws and [TU.his] commands."))
else
@@ -1524,7 +1524,7 @@
to_chat(src, span_danger("> N"))
sleep(20)
to_chat(src, span_danger("ERRORERRORERROR"))
- to_chat(src, " Obey these laws:")
+ to_chat(src, span_infoplain(span_bold("Obey these laws:")))
laws.show_laws(src)
to_chat(src, span_danger("ALERT: [user.real_name] is your new master. Obey your new laws and [TU.his] commands."))
update_icon()
diff --git a/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm b/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm
index d82b585f84..e50bc64bd9 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm
@@ -70,7 +70,7 @@
var/confirm = tgui_alert(src, "Do you want to keep your laws or reroll? (For specific laws, feel free to ahelp and we'll see what we can do)", "Confirm laws", list("Keep", "Reroll ([law_retries])"))
if(findtext(confirm, regex("Reroll \\(\[0-9\]*\\)", "")))
apply_new_laws()
- to_chat(src, " Obey these laws:")
+ to_chat(src, span_infoplain(span_bold("Obey these laws:")))
laws.show_laws(src)
law_retries --
else
diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm
index 21a2db794b..ed003d1c78 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm
@@ -141,7 +141,7 @@
if(new_recharge_state != last_recharge_state)
last_recharge_state = new_recharge_state
if(last_recharge_state)
- to_chat(src, span_notice(" Your integrated solar panels begin recharging your battery."))
+ to_chat(src, span_boldnotice("Your integrated solar panels begin recharging your battery."))
else
to_chat(src, span_danger("Your integrated solar panels cease recharging your battery."))
@@ -166,4 +166,4 @@
if(!recharge_complete && recharging_atom.percent() >= 100)
recharge_complete = TRUE
- visible_message(" \The [src] beeps and flashes a green light above \his recharging port.")
+ visible_message(span_infoplain("[span_bold("\The [src]")] beeps and flashes a green light above \his recharging port."))
diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm
index a464f9c36c..3f00773e09 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_interactions.dm
@@ -6,7 +6,7 @@
if(istype(recharging_atom) && !QDELETED(recharging_atom) && recharging_atom.loc == src)
recharging_atom.dropInto(loc)
user.put_in_hands(recharging_atom)
- user.visible_message(" \The [user] pops \the [recharging_atom] out of \the [src]'s recharging port.")
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " pops \the [recharging_atom] out of \the [src]'s recharging port."))
recharging = null
return TRUE
@@ -24,7 +24,7 @@
W.forceMove(src)
recharging = WEAKREF(W)
recharge_complete = FALSE
- user.visible_message(" \The [user] slots \the [W] into \the [src]'s recharging port.")
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " slots \the [W] into \the [src]'s recharging port."))
return TRUE
if(istype(W, /obj/item/floor_painter))
@@ -70,7 +70,7 @@
/mob/living/silicon/robot/platform/proc/welcome_client()
if(client)
- to_chat(src, span_notice(" You are a think-tank, a kind of flexible and adaptive drone intelligence installed into an armoured platform. Your programming compels you to be friendly and helpful wherever possible."))
+ to_chat(src, span_notice(span_bold("You are a think-tank") + ", a kind of flexible and adaptive drone intelligence installed into an armoured platform. Your programming compels you to be friendly and helpful wherever possible."))
SetSleeping(0)
SetWeakened(0)
SetParalysis(0)
diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm
index 2a6c715edb..563fedaf73 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm
@@ -82,9 +82,9 @@
if(istype(ejecting) && !QDELETED(ejecting) && ejecting.loc == src)
ejecting.dropInto(loc)
if(user == src)
- visible_message(" \The [src] ejects \the [ejecting] from its cargo compartment.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " ejects \the [ejecting] from its cargo compartment."))
else
- user.visible_message(" \The [user] pulls \the [ejecting] from \the [src]'s cargo compartment.")
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " pulls \the [ejecting] from \the [src]'s cargo compartment."))
/mob/living/silicon/robot/platform/attack_ai(mob/user)
if(isrobot(user) && user.Adjacent(src))
@@ -99,7 +99,7 @@
if(!istype(removing) || QDELETED(removing) || removing.loc != src)
LAZYREMOVE(stored_atoms, remove_ref)
else
- user.visible_message(" \The [user] begins unloading \the [removing] from \the [src]'s cargo compartment.")
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " begins unloading \the [removing] from \the [src]'s cargo compartment."))
if(do_after(user, 3 SECONDS, src) && !QDELETED(removing) && removing.loc == src)
drop_stored_atom(removing, user)
return TRUE
@@ -124,9 +124,9 @@
if(!can_mouse_drop(dropping, user) || !can_store_atom(dropping, user))
return FALSE
if(user == src)
- visible_message(" \The [src] begins loading \the [dropping] into its cargo compartment.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " begins loading \the [dropping] into its cargo compartment."))
else
- user.visible_message(" \The [user] begins loading \the [dropping] into \the [src]'s cargo compartment.")
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " begins loading \the [dropping] into \the [src]'s cargo compartment."))
if(do_after(user, 3 SECONDS, src) && can_mouse_drop(dropping, user) && can_store_atom(dropping, user))
store_atom(dropping, user)
return FALSE
diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm
index c7eafa0775..f555887554 100644
--- a/code/modules/mob/living/silicon/say.dm
+++ b/code/modules/mob/living/silicon/say.dm
@@ -73,7 +73,7 @@
/*Radios "filter out" this conversation channel so we don't need to account for them.
This is another way of saying that we won't bother dealing with them.*/
var/list/combined = combine_message(message_pieces, verb, src)
- to_chat(src, span_game(span_say(" Holopad transmitted, [span_name(real_name)] [combined["formatted"]]")))
+ to_chat(src, span_game(span_say(span_italics("Holopad transmitted, [span_name(real_name)] [combined["formatted"]]"))))
else
to_chat(src, span_filter_notice("No holopad connected."))
return 0
@@ -88,7 +88,7 @@
var/obj/machinery/hologram/holopad/T = src.holo
if(T && T.masters[src])
var/rendered = span_game(span_say(span_name(name) + " " + span_message(message)))
- to_chat(src, span_game(span_say(" Holopad action relayed, [span_name(real_name)] [span_message(message)]")))
+ to_chat(src, span_game(span_say(span_italics("Holopad action relayed, [span_name(real_name)] [span_message(message)]"))))
var/obj/effect/overlay/aiholo/hologram = T.masters[src] //VOREStation Add for people in the hologram to hear the messages
//var/obj/effect/overlay/hologram = T.masters[src] //VOREStation edit. Done above.
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index c0c2db5343..967944102b 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -76,7 +76,7 @@
src.take_organ_damage(0,5,emp=1)
Confuse(2)
flash_eyes(affect_silicon = 1)
- to_chat(src, span_danger(" *BZZZT*"))
+ to_chat(src, span_bolddanger("*BZZZT*"))
to_chat(src, span_danger("Warning: Electromagnetic pulse detected."))
..()
@@ -224,7 +224,7 @@
default_str = " - set default"
var/synth = (L in speech_synthesizer_langs)
- . += " [L.name] ([get_language_prefix()][L.key])[synth ? default_str : null] Speech Synthesizer: [synth ? "YES" : "NOT SUPPORTED"][L.desc] "
+ . += span_bold("[L.name] ([get_language_prefix()][L.key])") + "[synth ? default_str : null] Speech Synthesizer: [synth ? "YES" : "NOT SUPPORTED"][L.desc] "
/mob/living/silicon/proc/toggle_sensor_mode() //VOREStation Add to make borgs use omni starts here - Tank, clueless bird
if(sensor_type)
diff --git a/code/modules/mob/living/simple_mob/combat.dm b/code/modules/mob/living/simple_mob/combat.dm
index a03de3155e..ecbe241c55 100644
--- a/code/modules/mob/living/simple_mob/combat.dm
+++ b/code/modules/mob/living/simple_mob/combat.dm
@@ -116,14 +116,14 @@
//CHOMP Addition: This section here is special snowflake code for metroids only, or for whatever else in the future that you want to have move and shoot at the same time. Basically, this is a non-stupid version of the above intended for ranged vore mobs i.e. metroids. ranged_attack_delay is stupid because it sleeps the entire mob. This new ranged_cooldown_time is smarter in the sense that it is an internalized timer. Try not to confuse the names.
if(ranged_cooldown_time) //If you have a non-zero number in a mob's variables, this pattern begins.
if(ranged_cooldown <= world.time) //Further down, a timer keeps adding to the ranged_cooldown variable automatically.
- visible_message(span_danger(" \The [src] fires at \the [A]!")) //Leave notice of shooting.
+ visible_message(span_danger(span_bold("\The [src]") + " fires at \the [A]!")) //Leave notice of shooting.
shoot(A) //Perform the shoot action
if(casingtype) //If the mob is designated to leave casings...
new casingtype(loc) //... leave the casing.
ranged_cooldown = world.time + ranged_cooldown_time + ((injury_level / 2) SECONDS) //Special addition here. This is a timer. Keeping updating the time after shooting. Add that ranged cooldown time specified in the mob to the world time.
return TRUE //End these commands here.
- visible_message(span_danger(" \The [src] fires at \the [A]!"))
+ visible_message(span_danger(span_bold("\The [src]") + " fires at \the [A]!"))
shoot(A)
if(casingtype)
new casingtype(loc)
diff --git a/code/modules/mob/living/simple_mob/defense.dm b/code/modules/mob/living/simple_mob/defense.dm
index 923f5ebeeb..d377a1539a 100644
--- a/code/modules/mob/living/simple_mob/defense.dm
+++ b/code/modules/mob/living/simple_mob/defense.dm
@@ -79,7 +79,7 @@
if(health < getMaxHealth())
if(MED.use(1))
adjustBruteLoss(-MED.heal_brute)
- visible_message(" \The [user] applies the [MED] on [src].")
+ visible_message(span_infoplain(span_bold("\The [user]") + " applies the [MED] on [src]."))
else
var/datum/gender/T = gender_datums[src.get_visible_gender()]
to_chat(user, span_notice("\The [src] is dead, medical items won't bring [T.him] back to life.")) // the gender lookup is somewhat overkill, but it functions identically to the obsolete gender macros and future-proofs this code
diff --git a/code/modules/mob/living/simple_mob/simple_mob.dm b/code/modules/mob/living/simple_mob/simple_mob.dm
index 116409a944..536a3a6fba 100644
--- a/code/modules/mob/living/simple_mob/simple_mob.dm
+++ b/code/modules/mob/living/simple_mob/simple_mob.dm
@@ -232,7 +232,7 @@
//Client attached
/mob/living/simple_mob/Login()
. = ..()
- to_chat(src," You are \the [src]. [player_msg]")
+ to_chat(src,span_boldnotice("You are \the [src].") + " [player_msg]")
if(vore_active && !voremob_loaded) //CHOMPedit: On-demand belly loading.
voremob_loaded = TRUE
init_vore()
@@ -324,7 +324,7 @@
return mob_class & MOB_CLASS_HUMANOID|MOB_CLASS_ANIMAL|MOB_CLASS_SLIME // Update this if needed.
/mob/living/simple_mob/get_nametag_desc(mob/user)
- return " [tt_desc]"
+ return span_italics("[tt_desc]")
/mob/living/simple_mob/make_hud_overlays()
hud_list[STATUS_HUD] = gen_hud_image(buildmode_hud, src, "ai_0", plane = PLANE_BUILDMODE)
diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm
index 6b90469711..072fc55fcb 100644
--- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm
+++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm
@@ -194,9 +194,9 @@
vore_pounce_cooldown = world.time + 20 SECONDS // don't attempt another pounce for a while
if(prob(successrate)) // pounce success!
M.Weaken(5)
- M.visible_message(" \The [src] pounces on \the [M]!!")
+ M.visible_message(span_danger("\The [src] pounces on \the [M]!"))
else // pounce misses!
- M.visible_message(" \The [src] attempts to pounce \the [M] but misses!!")
+ M.visible_message(span_danger("\The [src] attempts to pounce \the [M] but misses!"))
playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
if(will_eat(M) && (M.lying || vore_standing_too)) //if they're edible then eat them too //CHOMPEdit
@@ -315,7 +315,7 @@
return FALSE
if(tmob.canmove && prob(vore_pounce_chance)) //if they'd pounce for other noms, pounce for these too, otherwise still try and eat them if they hold still
tmob.Weaken(5)
- tmob.visible_message(" \The [src] [vore_bump_emote] \the [tmob]!!")
+ tmob.visible_message(span_danger("\The [src] [vore_bump_emote] \the [tmob]!"))
set_AI_busy(TRUE)
spawn()
animal_nom(tmob)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
index a1a87410e8..6cf33e45ca 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
@@ -51,7 +51,7 @@
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug)
ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/catslug
say_list_type = /datum/say_list/catslug
- player_msg = "You have escaped the foul weather, into this much more pleasant place. You are an intelligent creature capable of more than most think. You can pick up and use many things, and even carry some of them with you into the vents, which you can use to move around quickly. You're quiet and capable, you speak with your hands and your deeds! - - - - - Keep in mind, your goal should generally be to survive. You're expected to follow the same rules as everyone else, so don't go self antagging without permission from the staff team, but you are able and capable of defending yourself from those who would attack you for no reason."
+ player_msg = "You have escaped the foul weather, into this much more pleasant place. You are an intelligent creature capable of more than most think. You can pick up and use many things, and even carry some of them with you into the vents, which you can use to move around quickly. You're quiet and capable, you speak with your hands and your deeds! - - - - - " + span_notice("Keep in mind, your goal should generally be to survive. You're expected to follow the same rules as everyone else, so don't go self antagging without permission from the staff team, but you are able and capable of defending yourself from those who would attack you for no reason.")
has_langs = list(LANGUAGE_SIGN)
@@ -407,7 +407,7 @@
min_n2 = 0
max_n2 = 0
- player_msg = "You are an intelligent creature capable of more than most think, clad in a spacesuit that protects you from the ravages of vacuum and hostile atmospheres alike. You can pick up and use many things, and even carry some of them with you into the vents, which you can use to move around quickly. You're quiet and capable, you speak with your hands and your deeds! - - - - - Keep in mind, your goal should generally be to survive. You're expected to follow the same rules as everyone else, so don't go self antagging without permission from the staff team, but you are able and capable of defending yourself from those who would attack you for no reason."
+ player_msg = "You are an intelligent creature capable of more than most think, clad in a spacesuit that protects you from the ravages of vacuum and hostile atmospheres alike. You can pick up and use many things, and even carry some of them with you into the vents, which you can use to move around quickly. You're quiet and capable, you speak with your hands and your deeds! - - - - - " + span_notice("Keep in mind, your goal should generally be to survive. You're expected to follow the same rules as everyone else, so don't go self antagging without permission from the staff team, but you are able and capable of defending yourself from those who would attack you for no reason.")
/datum/say_list/catslug/custom/spaceslug
speak = list("Have any porl?", "What is that?", "What kind of ship is that?", "What are you doing?", "How did you get here?", "Don't take off your helmet.", "SPAAAAAACE!", "WAOW!", "Nice weather we're having, isn't it?")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
index 370879780b..127c187751 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
@@ -454,7 +454,7 @@
set category = "IC.Stardog" //CHOMPEdit
set src in oview(1)
- usr.visible_message(" \The [usr] pets \the [src].", " You pet \the [src].", runemessage = "pet pat...")
+ usr.visible_message(span_notice("\The [usr] pets \the [src]."), span_notice("You pet \the [src]."), runemessage = "pet pat...")
var/obj/effect/overmap/visitable/ship/simplemob/stardog/s = get_overmap_sector(z)
if(s && istype(s, /obj/effect/overmap/visitable/ship/simplemob/stardog))
@@ -489,11 +489,11 @@
var/mob/living/simple_mob/vore/overmap/stardog/m = s.parent
log_subtle(message,L)
- message = span_emote_subtle(" [L] [message]")
- message = " (From the back of \the [m]) " + message
+ message = span_emote_subtle(span_bold("[L]") + " " + span_italics("[message]"))
+ message = span_bold("(From the back of \the [m]) ") + message
message = encode_html_emphasis(message)
- var/undisplayed_message = span_emote(" [L] does something too subtle for you to see.")
+ var/undisplayed_message = span_emote(span_bold("[L]") + " " + span_italics("does something too subtle for you to see."))
var/list/vis = get_mobs_and_objs_in_view_fast(get_turf(m),1,2)
var/list/vis_mobs = vis["mobs"]
vis_mobs |= L
@@ -1051,26 +1051,26 @@
if(!host)
set_up()
if(!host)
- to_chat(user, " It doesn't respond...")
+ to_chat(user, span_warning("It doesn't respond..."))
return
control(user)
/obj/structure/control_pod/proc/control(mob/living/user)
if(!host.affinity) //take care of my dog
- to_chat(user, " As you press your hand to \the [src], it resists your advance... A sense of longing ripples through your mind...")
+ to_chat(user, span_warning("As you press your hand to \the [src], it resists your advance... A sense of longing ripples through your mind..."))
return
if(controller) //busy
- to_chat(user, " You can see \the [controller] inside! Tendrils of nerves seem to have attached themselves to \the [controller]! There's no room for you right now!")
+ to_chat(user, span_warning("You can see \the [controller] inside! Tendrils of nerves seem to have attached themselves to \the [controller]! There's no room for you right now!"))
return
- user.visible_message(" \The [user] reaches out to touch \the [src]..."," You reach out to touch \the [src]...")
+ user.visible_message(span_notice("\The [user] reaches out to touch \the [src]..."),span_notice("You reach out to touch \the [src]..."))
if(!do_after(user, 10 SECONDS, src, exclusive = TRUE))
- user.visible_message(" \The [user] pulls back from \the [src]."," You pull back from \the [src].")
+ user.visible_message(span_warning("\The [user] pulls back from \the [src]."),span_warning("You pull back from \the [src]."))
return
if(controller) //got busy while you were waiting, get rekt
- to_chat(user, " You can see \the [controller] inside! Tendrils of nerves seem to have attached themselves to \the [controller]! There's no room for you right now!")
+ to_chat(user, span_warning("You can see \the [controller] inside! Tendrils of nerves seem to have attached themselves to \the [controller]! There's no room for you right now!"))
return
controller = user
- visible_message(" \The [src] accepts \the [controller], submerging them beneath the surface of the flesh!")
+ visible_message(span_warning("\The [src] accepts \the [controller], submerging them beneath the surface of the flesh!"))
user.stop_pulling()
user.forceMove(src)
host.ckey = user.ckey
@@ -1080,10 +1080,10 @@
set_light(5, 0.75, "#f94bff")
/obj/structure/control_pod/proc/eject()
- to_chat(host, " You feel your control over \the [host] slip away from you!")
+ to_chat(host, span_warning("You feel your control over \the [host] slip away from you!"))
controller.forceMove(get_turf(src))
controller.ckey = host.ckey
- visible_message(" \The [controller] is ejected from \the [src], tumbling free!")
+ visible_message(span_warning("\The [controller] is ejected from \the [src], tumbling free!"))
log_admin("[controller.ckey] is no longer controlling [host], they have been returned to their body, [controller].")
icon_state = "control_node0"
plane = OBJ_PLANE
@@ -1161,11 +1161,11 @@
return
log_subtle(message,L)
- message = span_emote_subtle(" [L] [message]")
- message = " (From within \the [s]) " + message
+ message = span_emote_subtle(span_bold("[L]") + " " + span_italics("[message]"))
+ message = span_bold("(From within \the [s]) ") + message
message = encode_html_emphasis(message)
- var/undisplayed_message = span_emote(" [L] does something too subtle for you to see.")
+ var/undisplayed_message = span_emote(span_bold("[L]") + " " + span_italics("does something too subtle for you to see."))
var/list/vis = get_mobs_and_objs_in_view_fast(get_turf(s),1,2)
var/list/vis_mobs = vis["mobs"]
vis_mobs |= L
@@ -1663,7 +1663,7 @@
else if(user.faction == faction)
SwitchState()
else if(user.a_intent == I_HELP)
- visible_message("[user] knocks on \the [src].", "Someone knocks on \the [src].")
+ visible_message(span_warningplain("[user] knocks on \the [src]."), span_warningplain("Someone knocks on \the [src]."))
playsound(src, knock_sound, 50, 0, 3)
countdown -= 10
else
@@ -1679,7 +1679,7 @@
else if(user.faction == faction)
SwitchState()
else if(user.a_intent == I_HELP)
- visible_message("[user] knocks on \the [src].", "Someone knocks on \the [src].")
+ visible_message(span_warningplain("[user] knocks on \the [src]."), span_warningplain("Someone knocks on \the [src]."))
playsound(src, knock_sound, 50, 0, 3)
countdown -= 10
else
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm
index 5af3539f0c..083a514ac0 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm
@@ -119,7 +119,7 @@
if(L.weakened) //Don't stun people while they're already stunned! That's SILLY!
return
if(prob(15))
- visible_message(" \The [src] trips \the [L]!!")
+ visible_message(span_danger("\The [src] trips \the [L]!"))
L.weakened += rand(1,10)
/mob/living/simple_mob/vore/alienanimals/startreader/Life()
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm
index a617099736..82f62a0474 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm
@@ -132,7 +132,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have?
has_langs = list(LANGUAGE_TEPPI)
say_list_type = /datum/say_list/teppi
- player_msg = "Teppi are large omnivorous quadrupeds. You have four toes on each paw, a long, strong tail, and are quite tough and powerful. You’re a lot more intimidating than you are actually harmful though. Your kind are ordinarily rather passive, only really rising to violence when someone does violence to you or others like you. You’re not stupid though, you can commiunicate with others of your kind, and form bonds with those who are kind to you, be they Teppi or otherwise. - - - - - While you may have access to galactic common, this is purely meant for making it so you can understand people in an OOC manner, for facilitating roleplay. You almost certainly should not be speaking to people or roleplaying as though you understand everything everyone says perfectly, but it's not unreasonable to be able to intuit intent and such through people's tones when they speak. Teppi are kind of smart, but they are animals, and should be roleplayed as such. ADDITIONALLY, you have the ability to produce offspring if you're well fed enough every once in a while, and the ability to disable this from happening to you. These verbs exist for to preserve the mechanical functionality of the mob you are playing. You should be aware of your surroundings when you use this verb, and NEVER use it to prefbreak or be disruptive. If in doubt, don't use it. Also, to note, AI Teppi will never initiate breeding with player Teppi."
+ player_msg = "Teppi are large omnivorous quadrupeds. You have four toes on each paw, a long, strong tail, and are quite tough and powerful. You’re a lot more intimidating than you are actually harmful though. Your kind are ordinarily rather passive, only really rising to violence when someone does violence to you or others like you. You’re not stupid though, you can commiunicate with others of your kind, and form bonds with those who are kind to you, be they Teppi or otherwise. - - - - - " + span_notice("While you may have access to galactic common, this is purely meant for making it so you can understand people in an OOC manner, for facilitating roleplay. You almost certainly should not be speaking to people or roleplaying as though you understand everything everyone says perfectly, but it's not unreasonable to be able to intuit intent and such through people's tones when they speak. Teppi are kind of smart, but they are animals, and should be roleplayed as such.") + " " + span_warning("ADDITIONALLY, you have the ability to produce offspring if you're well fed enough every once in a while, and the ability to disable this from happening to you. These verbs exist for to preserve the mechanical functionality of the mob you are playing. You should be aware of your surroundings when you use this verb, and NEVER use it to prefbreak or be disruptive. If in doubt, don't use it.") + " " + span_notice("Also, to note, AI Teppi will never initiate breeding with player Teppi.")
loot_list = list(/obj/item/bone/horn = 100)
internal_organs = list(\
/obj/item/organ/internal/brain,\
@@ -554,7 +554,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have?
qdel(O)
playsound(src, 'sound/items/eatfood.ogg', 75, 1)
if(!client && lets_eat(user) && prob(1))
- visible_message(" \The [src] scromfs \the [user] along with the food!!")
+ visible_message(span_danger("\The [src] scromfs \the [user] along with the food!"))
to_chat(user, span_notice("\The [src] leans in close, spreading its jaws in front of you. A hot, humid gust of breath blows over you as the weight of \the [src]'s presses you over, knocking you off of your feet as the warm gooey tough of jaws scromf over your figure, rapidly guzzling you away with the [O], leaving you to tumble down into the depths of its body..."))
playsound(src, pick(bodyfall_sound), 75, 1)
teppi_pounce(user)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm
index 5c3b5ae3cb..2eb26b3a75 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm
@@ -4,11 +4,11 @@
set desc = "Slither out of your host."
if(!host)
- to_chat(src, "You are not inside a host body.")
+ to_chat(src, span_warning("You are not inside a host body."))
return
if(stat)
- to_chat(src, "You cannot leave your host in your current state.")
+ to_chat(src, span_warning("You cannot leave your host in your current state."))
if(docile)
to_chat(src, span_blue("You are feeling far too docile to do that."))
@@ -16,20 +16,20 @@
if(!host || !src) return
- to_chat(src, "You begin disconnecting from [host]'s synapses and prodding at their internal ear canal.")
+ to_chat(src, span_warning("You begin disconnecting from [host]'s synapses and prodding at their internal ear canal."))
if(!host.stat)
- to_chat(host, "An odd, uncomfortable pressure begins to build inside your skull, behind your ear...")
+ to_chat(host, span_warning("An odd, uncomfortable pressure begins to build inside your skull, behind your ear..."))
spawn(100)
if(!host || !src) return
if(src.stat)
- to_chat(src, "You cannot release your host in your current state.")
+ to_chat(src, span_warning("You cannot release your host in your current state."))
return
- to_chat(src, "You wiggle out of [host]'s ear and plop to the ground.")
+ to_chat(src, span_warning("You wiggle out of [host]'s ear and plop to the ground."))
if(host.mind)
if(!host.stat)
to_chat(host, span_danger("Something slimy wiggles out of your ear and plops to the ground!"))
@@ -44,11 +44,11 @@
set desc = "Infest a suitable humanoid host."
if(host)
- to_chat(src, "You are already within a host.")
+ to_chat(src, span_warning("You are already within a host."))
return
if(stat)
- to_chat(src, "You cannot infest a target in your current state.")
+ to_chat(src, span_warning("You cannot infest a target in your current state."))
return
var/list/choices = list()
@@ -57,7 +57,7 @@
choices += C
if(!choices.len)
- to_chat(src, "There are no viable hosts within range...")
+ to_chat(src, span_warning("There are no viable hosts within range..."))
return
var/mob/living/carbon/M = tgui_input_list(src, "Who do you wish to infest?", "Target Choice", choices)
@@ -67,7 +67,7 @@
if(!(src.Adjacent(M))) return
if(M.has_brain_worms())
- to_chat(src, "You cannot infest someone who is already infested!")
+ to_chat(src, span_warning("You cannot infest someone who is already infested!"))
return
if(istype(M,/mob/living/carbon/human))
@@ -75,31 +75,31 @@
var/obj/item/organ/external/E = H.organs_by_name[BP_HEAD]
if(!E || E.is_stump())
- to_chat(src, "\The [H] does not have a head!")
+ to_chat(src, span_warning("\The [H] does not have a head!"))
if(!H.should_have_organ("brain"))
- to_chat(src, "\The [H] does not seem to have an ear canal to breach.")
+ to_chat(src, span_warning("\The [H] does not seem to have an ear canal to breach."))
return
if(H.check_head_coverage())
- to_chat(src, "You cannot get through that host's protective gear.")
+ to_chat(src, span_warning("You cannot get through that host's protective gear."))
return
to_chat(M, "Something slimy begins probing at the opening of your ear canal...")
- to_chat(src, "You slither up [M] and begin probing at their ear canal...")
+ to_chat(src, span_warning("You slither up [M] and begin probing at their ear canal..."))
if(!do_after(src,30))
- to_chat(src, "As [M] moves away, you are dislodged and fall to the ground.")
+ to_chat(src, span_warning("As [M] moves away, you are dislodged and fall to the ground."))
return
if(!M || !src) return
if(src.stat)
- to_chat(src, "You cannot infest a target in your current state.")
+ to_chat(src, span_warning("You cannot infest a target in your current state."))
return
if(M in view(1, src))
- to_chat(src, "You wiggle into [M]'s ear.")
+ to_chat(src, span_warning("You wiggle into [M]'s ear."))
if(!M.stat)
to_chat(M, "Something disgusting and slimy wiggles into your ear!")
@@ -122,7 +122,7 @@
return
else
- to_chat(src, "They are no longer in range!")
+ to_chat(src, span_warning("They are no longer in range!"))
return
/*
@@ -132,22 +132,22 @@
set desc = "Take permanent control of a dead host."
if(!host)
- to_chat(src, "You are not inside a host body.")
+ to_chat(src, span_warning("You are not inside a host body."))
return
if(host.stat != 2)
- to_chat(src, "Your host is still alive.")
+ to_chat(src, span_warning("Your host is still alive."))
return
if(stat)
- to_chat(src, "You cannot do that in your current state.")
+ to_chat(src, span_warning("You cannot do that in your current state."))
if(docile)
- to_chat(src, " You are feeling far too docile to do that.")
+ to_chat(src, span_warning(span_blue("You are feeling far too docile to do that.")))
return
- to_chat(src, " It only takes a few moments to render the dead host brain down into a nutrient-rich slurry...")
+ to_chat(src, span_danger("It only takes a few moments to render the dead host brain down into a nutrient-rich slurry..."))
replace_brain()
*/
@@ -157,10 +157,10 @@
var/mob/living/carbon/human/H = host
if(!istype(host))
- to_chat(src, "This host does not have a suitable brain.")
+ to_chat(src, span_warning("This host does not have a suitable brain."))
return
- to_chat(src, " You settle into the empty brainpan and begin to expand, fusing inextricably with the dead flesh of [H].")
+ to_chat(src, span_danger("You settle into the empty brainpan and begin to expand, fusing inextricably with the dead flesh of [H]."))
H.add_language("Cortical Link")
@@ -205,25 +205,25 @@
set desc = "Push some chemicals into your host's bloodstream."
if(!host)
- to_chat(src, "You are not inside a host body.")
+ to_chat(src, span_warning("You are not inside a host body."))
return
if(stat)
- to_chat(src, "You cannot secrete chemicals in your current state.")
+ to_chat(src, span_warning("You cannot secrete chemicals in your current state."))
if(docile)
- to_chat(src, span_blue("You are feeling far too docile to do that."))
+ to_chat(src, span_warning(span_blue("You are feeling far too docile to do that.")))
return
if(chemicals < 50)
- to_chat(src, "You don't have enough chemicals!")
+ to_chat(src, span_warning("You don't have enough chemicals!"))
var/chem = tgui_input_list(usr, "Select a chemical to secrete.", "Chemicals", list("alkysine","bicaridine","hyperzine","tramadol"))
if(!chem || chemicals < 50 || !host || controlling || !src || stat) //Sanity check.
return
- to_chat(src, span_red(" You squirt a measure of [chem] from your reservoirs into [host]'s bloodstream."))
+ to_chat(src, span_bolddanger("You squirt a measure of [chem] from your reservoirs into [host]'s bloodstream."))
host.reagents.add_reagent(chem, 10)
chemicals -= 50
@@ -233,15 +233,15 @@
set desc = "Freeze the limbs of a potential host with supernatural fear."
if(world.time - used_dominate < 150)
- to_chat(src, "You cannot use that ability again so soon.")
+ to_chat(src, span_warning("You cannot use that ability again so soon."))
return
if(host)
- to_chat(src, "You cannot do that from within a host body.")
+ to_chat(src, span_warning("You cannot do that from within a host body."))
return
if(src.stat)
- to_chat(src, "You cannot do that in your current state.")
+ to_chat(src, span_warning("You cannot do that in your current state."))
return
var/list/choices = list()
@@ -250,7 +250,7 @@
choices += C
if(world.time - used_dominate < 150)
- to_chat(src, "You cannot use that ability again so soon.")
+ to_chat(src, span_warning("You cannot use that ability again so soon."))
return
var/mob/living/carbon/M = tgui_input_list(src, "Who do you wish to dominate?", "Target Choice", choices)
@@ -258,7 +258,7 @@
if(!M || !src) return
if(M.has_brain_worms())
- to_chat(src, "You cannot infest someone who is already infested!")
+ to_chat(src, span_warning("You cannot infest someone who is already infested!"))
return
to_chat(src, span_red("You focus your psychic lance on [M] and freeze their limbs with a wave of terrible dread."))
@@ -273,18 +273,18 @@
set desc = "Fully connect to the brain of your host."
if(!host)
- to_chat(src, "You are not inside a host body.")
+ to_chat(src, span_warning("You are not inside a host body."))
return
if(src.stat)
- to_chat(src, "You cannot do that in your current state.")
+ to_chat(src, span_warning("You cannot do that in your current state."))
return
if(docile)
to_chat(src, span_blue("You are feeling far too docile to do that."))
return
- to_chat(src, "You begin delicately adjusting your connection to the host brain...")
+ to_chat(src, span_warning("You begin delicately adjusting your connection to the host brain..."))
spawn(100+(host.brainloss*5))
@@ -292,8 +292,8 @@
return
else
- to_chat(src, span_red(" You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system."))
- to_chat(host, span_red(" You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours."))
+ to_chat(src, span_bolddanger("You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system."))
+ to_chat(host, span_bolddanger("You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours."))
host.add_language("Cortical Link")
// host -> brain
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm
index 5a78b61690..614ec0d87f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm
@@ -159,11 +159,11 @@
var/datum/ai_holder/simple_mob/passive/possum/poss_ai = ai_holder
if(!client && istype(poss_ai))
if(!poss_ai.is_angry)
- visible_message(" \The [src] hisses!")
+ visible_message(span_infoplain(span_bold("\The [src]") + " hisses!"))
poss_ai.is_angry = TRUE
poss_ai.be_angery_until = world.time + rand(30 SECONDS, 1 MINUTE)
else
- visible_message(" \The [src] dies!")
+ visible_message(span_infoplain(span_bold("\The [src]") + " dies!"))
resting = TRUE
poss_ai.play_dead_until = world.time + rand(1 MINUTE, 2 MINUTES)
update_icon()
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm
index 76847ceee1..9ff468e150 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm
@@ -3,8 +3,8 @@
desc = "Your wounds have been salved with Sivian sap."
mob_overlay_state = "cyan_sparkles"
stacks = MODIFIER_STACK_FORBID
- on_created_text = " The glowing sap seethes and bubbles in your wounds, tingling and stinging."
- on_expired_text = " The last of the sap in your wounds fizzles away."
+ on_created_text = span_notice("The glowing sap seethes and bubbles in your wounds, tingling and stinging.")
+ on_expired_text = span_notice("The last of the sap in your wounds fizzles away.")
/datum/modifier/sifsap_salve/tick()
@@ -120,8 +120,8 @@ Field studies suggest analytical abilities on par with some species of cepholapo
name = "grafadreka"
desc = "A large, sleek snow drake with heavy claws, powerful jaws and many pale spines along its body."
player_msg = "You are a large Sivian pack predator in symbiosis with the local bioluminescent bacteria. You can eat glowing \
- tree fruit to fuel your ranged spitting attack and poisonous bite (on harm intent), as well as healing saliva \
- (on help intent). There are humans moving through your territory; whether you help them get home safely, or treat them as a snack, \
+ tree fruit to fuel your " + span_bold("ranged spitting attack") + " and " + span_bold("poisonous bite") + " (on " + span_danger("harm intent") + "), as well as " + span_bold("healing saliva") + "\
+ (on " + span_bold(span_green("help intent")) + "). There are humans moving through your territory; whether you help them get home safely, or treat them as a snack, \
is up to you."
color = "#608894"
icon = 'icons/mob/drake_adult.dmi'
@@ -570,12 +570,12 @@ var/global/list/wounds_being_tended_by_drakes = list()
to_chat(src, span_warning("You aren't the pack leader! Sit down!"))
return
- audible_message(" \The [src] barks loudly and rattles its neck spines.")
+ audible_message(span_infoplain(span_bold("\The [src]") + " barks loudly and rattles its neck spines."))
for(var/mob/living/simple_mob/animal/sif/grafadreka/drake in hearers(world.view * 3, src))
if(drake == src || drake.faction != faction)
continue
if(drake.client)
- to_chat(drake, span_notice(" The pack leader wishes for you to follow them."))
+ to_chat(drake, span_boldnotice("The pack leader wishes for you to follow them."))
else if(drake.ai_holder)
drake.ai_holder.set_follow(src)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm
index 1ddfbd5ddc..5ea6adaae2 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm
@@ -120,5 +120,5 @@
if(prob(10))
for(var/mob/living/L in hearers(holder))
if(!istype(L, holder)) // Don't follow other hooligan crabs.
- holder.visible_message(" \The [holder] starts to follow \the [L].")
+ holder.visible_message(span_infoplain(span_bold("\The [holder]") + " starts to follow \the [L]."))
set_follow(L, rand(20 SECONDS, 40 SECONDS))
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm
index d97f06f58e..bd088b5e40 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm
@@ -188,7 +188,7 @@
if(holder.get_active_hand() && istype(holder.get_active_hand(), /obj/item/clothing/head) && !S.hat)
var/obj/item/I = holder.get_active_hand()
S.take_hat(S)
- holder.visible_message(" \The [holder] wears \the [I]")
+ holder.visible_message(span_infoplain(span_bold("\The [holder]") + " wears \the [I]"))
/mob/living/simple_mob/animal/sif/sakimm/intelligent
desc = "What appears to be an oversized rodent with hands. This one has a curious look in its eyes."
@@ -334,7 +334,7 @@
if(istype(holder) && istype(holder.get_active_hand(), /obj/item/clothing/head) && !S.hat)
var/obj/item/I = holder.get_active_hand()
S.take_hat(S)
- holder.visible_message(" \The [holder] wears \the [I]")
+ holder.visible_message(span_bold("\The [holder]") + "wears \the [I]")
carrying_item = TRUE
if(istype(holder) && S.hat) // Do we have a hat? Hats are loot.
diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
index e7b0b409f8..cb8665a43c 100644
--- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
@@ -138,7 +138,7 @@
/mob/living/simple_mob/humanoid/merc/melee/sword/bullet_act(var/obj/item/projectile/Proj)
if(!Proj) return
if(prob(35))
- visible_message(span_red(" [src] blocks [Proj] with its shield!"))
+ visible_message(span_bolddanger("[src] blocks [Proj] with its shield!"))
if(Proj.firer)
ai_holder.react_to_attack(Proj.firer)
return
@@ -335,7 +335,7 @@
*/
if(ranged_cooldown_time) //If you have a non-zero number in a mob's variables, this pattern begins.
if(ranged_cooldown <= world.time) //Further down, a timer keeps adding to the ranged_cooldown variable automatically.
- visible_message(span_danger(" \The [src] fires at \the [A]!")) //Leave notice of shooting.
+ visible_message(span_danger(span_bold("\The [src]") + " fires at \the [A]!")) //Leave notice of shooting.
shoot(A) //Perform the shoot action
if(casingtype) //If the mob is designated to leave casings...
new casingtype(loc) //... leave the casing.
@@ -343,7 +343,7 @@
return TRUE //End these commands here.
// CHOMPAddition End
- visible_message(span_danger(" \The [src] fires at \the [orig_targ]!"))
+ visible_message(span_danger(span_bold("\The [src]") + " fires at \the [orig_targ]!"))
shoot(A)
if(casingtype)
new casingtype(loc)
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm
index d986c17a29..d4d619fbb8 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm
@@ -160,7 +160,7 @@
my_storage.rangedload(T, src)
if(my_storage.contents.len >= my_storage.max_storage_space)
- visible_message(" \The [src] emits a shrill beep, indicating its storage is full.")
+ visible_message(span_infoplain(span_bold("\The [src]") + " emits a shrill beep, indicating its storage is full."))
var/obj/structure/ore_box/OB = locate() in view(2, src)
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm
index 87c4464a18..d6dc79d954 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm
@@ -129,7 +129,7 @@
var/repair_upper_bound = A.melee_damage_upper * -1
adjustBruteLoss(rand(repair_lower_bound, repair_upper_bound))
adjustFireLoss(rand(repair_lower_bound, repair_upper_bound))
- user.visible_message(" \The [user] mends some of \the [src]'s wounds.")
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " mends some of \the [src]'s wounds."))
else
to_chat(user, span_notice("\The [src] is undamaged."))
return
@@ -142,7 +142,7 @@
if (health >= max/2)
. += span_warning("It looks slightly dented.")
else
- . += span_warning(" It looks severely dented!")
+ . += span_boldwarning("It looks severely dented!")
//Constructs levitate, can fall from a shuttle with no harm, and are piloted by either damned spirits or some otherworldly entity. Let 'em float in space.
/mob/living/simple_mob/construct/Process_Spacemove()
diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
index 560a4ba2e4..6908176f59 100644
--- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
@@ -259,7 +259,7 @@ var/list/_slime_default_emotes = list(
/mob/living/simple_mob/slime/proc/squish()
playsound(src, 'sound/effects/slime_squish.ogg', 50, 0)
- visible_message(" \The [src] squishes!")
+ visible_message(span_infoplain(span_bold("\The [src]") + " squishes!"))
/decl/mob_organ_names/slime
hit_zones = list("cytoplasmic membrane")
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm b/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm
index 26ebf4dc84..1d64e27ef0 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm
@@ -71,9 +71,9 @@
vore_pounce_cooldown = world.time + 1 SECONDS // don't attempt another pounce for a while
if(prob(successrate)) // pounce success!
M.Weaken(5)
- M.visible_message(" \The [src] pounces on \the [M]!!")
+ M.visible_message(span_danger("\The [src] pounces on \the [M]!"))
else // pounce misses!
- M.visible_message(" \The [src] attempts to pounce \the [M] but misses!!")
+ M.visible_message(span_danger("\The [src] attempts to pounce \the [M] but misses!"))
playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
if(will_eat(M) && (!M.canmove || vore_standing_too)) //if they're edible then eat them too
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm b/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm
index f4c499e798..5fb2a327ad 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm
@@ -115,9 +115,9 @@
vore_pounce_cooldown = world.time + 1 SECONDS // don't attempt another pounce for a while
if(prob(max(successrate,33))) // pounce success!
M.Weaken(5)
- M.visible_message(" \The [src] pounces on \the [M]!!")
+ M.visible_message(span_danger("\The [src] pounces on \the [M]!"))
else // pounce misses!
- M.visible_message(" \The [src] attempts to pounce \the [M] but misses!!")
+ M.visible_message(span_danger("\The [src] attempts to pounce \the [M] but misses!"))
playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
if(will_eat(M) && (!M.canmove || vore_standing_too)) //if they're edible then eat them too
@@ -255,8 +255,8 @@
var/distance = get_dist(holder, target)
if(distance <= 1)
var/talkies = pick(friend_text_close)
- holder.visible_message(" \The [holder] [talkies]")
+ holder.visible_message(span_infoplain(span_bold("\The [holder]") + " [talkies]"))
else
var/talkies = pick(friend_text_far)
- holder.visible_message(" \The [holder] [talkies]")
+ holder.visible_message(span_infoplain(span_bold("\The [holder]") + " [talkies]"))
last_friend_time = world.time
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
index f1156dd3a0..f1f4ec9607 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
@@ -38,7 +38,7 @@
mimic_active = FALSE
if(prob(mimic_chance))
var/mob/living/simple_mob/vore/aggressive/mimic/new_mimic = new(loc, src)
- visible_message(span_red(" [new_mimic] suddenly growls as it turns out to be a mimic!"))
+ visible_message(span_bolddanger("[new_mimic] suddenly growls as it turns out to be a mimic!"))
forceMove(new_mimic)
new_mimic.real_crate = src
new_mimic.name = name
@@ -59,7 +59,7 @@
/obj/structure/closet/crate/mimic/damage(var/damage)
if(contents.len)
- visible_message(span_red(" [src] makes out a crunchy noise as its contents are destroyed!"))
+ visible_message(span_bolddanger("[src] makes out a crunchy noise as its contents are destroyed!"))
for(var/obj/O in src.contents)
qdel(O)
..()
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm
index 37a32338d4..df02bbd977 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm
@@ -173,7 +173,7 @@
hunger += 5
else
food.Weaken(5)
- food.visible_message(" \The [src] pounces on \the [food]!!")
+ food.visible_message(span_danger("\The [src] pounces on \the [food]!"))
target_mob = food
EatTarget()
hunger = 0
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/scrubble.dm b/code/modules/mob/living/simple_mob/subtypes/vore/scrubble.dm
index 326ee5973c..81a37437cb 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/scrubble.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/scrubble.dm
@@ -73,9 +73,9 @@
vore_pounce_cooldown = world.time + 20 SECONDS // don't attempt another pounce for a while
if(prob(successrate)) // pounce success!
M.Weaken(5)
- M.visible_message(" \The [src] pounces on \the [M]!!")
+ M.visible_message(span_danger("\The [src] pounces on \the [M]!"))
else // pounce misses!
- M.visible_message(" \The [src] attempts to pounce \the [M] but misses!!")
+ M.visible_message(span_danger("\The [src] attempts to pounce \the [M] but misses!"))
playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
if(will_eat(M) && (!M.canmove || vore_standing_too)) //if they're edible then eat them too
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm
index dae8983037..8539f496f1 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm
@@ -38,7 +38,7 @@
var/opts = clickprops["shift"]
if(opts)
- to_chat(my_kin,span_notice(" [name] (Cost: [cost]%) - [desc]"))
+ to_chat(my_kin,span_notice(span_bold("[name]") + " (Cost: [cost]%) - [desc]"))
else
do_ability(my_kin)
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 49e71984e1..c8c32b77f9 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm
@@ -82,7 +82,7 @@ var/global/moth_amount = 0 // Chompstation Addition, Rykka waz here. *pawstamp*
if(attached)
set_AI_busy(TRUE)
if(prob(2))
- src.visible_message(" \The [src] begins to sink power from the net.")
+ src.visible_message(span_infoplain(span_bold("\The [src]") + " begins to sink power from the net."))
if(prob(5))
var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
sparks.set_up(5, 0, get_turf(src))
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/stalker.dm b/code/modules/mob/living/simple_mob/subtypes/vore/stalker.dm
index 876e857c0c..57aefb7ba6 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/stalker.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/stalker.dm
@@ -76,9 +76,9 @@
vore_pounce_cooldown = world.time + 1 SECONDS // don't attempt another pounce for a while
if(prob(successrate)) // pounce success!
M.Weaken(5)
- M.visible_message(" \The [src] pounces on \the [M]!!")
+ M.visible_message(span_danger("\The [src] pounces on \the [M]!"))
else // pounce misses!
- M.visible_message(" \The [src] attempts to pounce \the [M] but misses!!")
+ M.visible_message(span_danger("\The [src] attempts to pounce \the [M] but misses!"))
playsound(src, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
if(will_eat(M) && (!M.canmove || vore_standing_too)) //if they're edible then eat them too
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 9ed5e39468..e53e5c65cd 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -24,10 +24,10 @@
tgui_alert_async(usr, "You appear to have logged in with another key this round, which is not permitted. Please contact an administrator if you believe this message to be in error.")
if(matches)
if(M.client)
- message_admins("[span_red(" Notice: ")][span_blue("[key_name_admin(src)] has the same [matches] as [key_name_admin(M)].")]", 1)
+ message_admins("[span_red(span_bold("Notice:"))] [span_blue("[key_name_admin(src)] has the same [matches] as [key_name_admin(M)].")]", 1)
log_adminwarn("Notice: [key_name(src)] has the same [matches] as [key_name(M)].")
else
- message_admins("[span_red(" Notice: ")][span_blue("[key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ")]", 1)
+ message_admins("[span_red(span_bold("Notice:"))] [span_blue("[key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ")]", 1)
log_adminwarn("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).")
/mob/Login()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 16bf32af7f..3ec5288e07 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -87,7 +87,7 @@
return
// Added voice muffling for Issue 41.
if(stat == UNCONSCIOUS || sleeping > 0)
- to_chat(src, span_filter_notice(" ... You can almost hear someone talking ..."))
+ to_chat(src, span_filter_notice(span_italics("... You can almost hear someone talking ...")))
else
if(client && client.prefs.chat_timestamp)
// TG-Chat filters latch directly to the spans, we no longer need that
@@ -336,7 +336,7 @@
if(length(msg) <= 40)
return span_notice("[msg]")
else
- return " [copytext_preserve_html(msg, 1, 37)]... More..."
+ return span_notice("[copytext_preserve_html(msg, 1, 37)]... More...")
/*
/mob/verb/help()
@@ -384,7 +384,7 @@
set category = "OOC.Game" //CHOMPEdit
if(stat != DEAD || !ticker)
- to_chat(usr, span_notice(" You must be dead to use this!"))
+ to_chat(usr, span_boldnotice("You must be dead to use this!"))
return
// Final chance to abort "respawning"
@@ -638,7 +638,7 @@
playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 25) //Quieter than hugging/grabbing but we still want some audio feedback
if(H.pull_damage())
- to_chat(src, span_filter_notice("[span_red(" Pulling \the [H] in their current condition would probably be a bad idea.")]"))
+ to_chat(src, span_filter_notice("[span_red(span_bold("Pulling \the [H] in their current condition would probably be a bad idea."))]"))
//Attempted fix for people flying away through space when cuffed and dragged.
if(ismob(AM))
@@ -940,9 +940,9 @@
return
if(self)
- visible_message(span_warning(" [src] rips [selection] out of their body."),span_warning(" You rip [selection] out of your body."))
+ visible_message(span_boldwarning("[src] rips [selection] out of their body."),span_boldwarning("You rip [selection] out of your body."))
else
- visible_message(span_warning(" [usr] rips [selection] out of [src]'s body."),span_warning(" [usr] rips [selection] out of your body."))
+ visible_message(span_boldwarning("[usr] rips [selection] out of [src]'s body."),span_boldwarning("[usr] rips [selection] out of your body."))
valid_objects = get_visible_implants(0)
if(valid_objects.len == 1) //Yanking out last object - removing verb.
remove_verb(src, /mob/proc/yank_out_object)
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 60982362f9..ad35e3ac3b 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -215,7 +215,7 @@
//if(2,4,6,15) newletter="[uppertext(newletter)]"
if(2,4,6,9) newletter="[uppertext(newletter)]"
if(7) newletter+="'"
- //if(9,10) newletter=" [newletter]"
+ //if(9,10) newletter=span_bold("[newletter]")
//if(11,12) newletter=" [newletter]"
//if(13) newletter=" [newletter]"
newphrase+="[newletter]";counter-=1
@@ -436,7 +436,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT)
lname = "[keyname] ([name])"
else // Everyone else (dead people who didn't ghost yet, etc.)
lname = name
- lname = " [lname] "
+ lname = span_name("[lname]") + " "
to_chat(M, span_deadsay("" + create_text_tag("dead", "DEAD:", M.client) + " [lname][follow][message]"))
/proc/say_dead_object(var/message, var/obj/subject = null)
@@ -450,7 +450,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT)
if(subject)
lname = "[subject.name] ([subject.x],[subject.y],[subject.z])"
- lname = " [lname] "
+ lname = span_name("[lname]") + " "
to_chat(M, span_deadsay("" + create_text_tag("event_dead", "EVENT:", M.client) + " [lname][follow][message]"))
//Announces that a ghost has joined/left, mainly for use with wizards
@@ -484,11 +484,11 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT)
if(!name)
name = (C.holder && C.holder.fakekey) ? C.holder.fakekey : C.key
if(joined_ghosts)
- //say_dead_direct("The ghost of [name] now [pick("skulks","lurks","prowls","creeps","stalks")] among the dead. [message]") //ChompEDIT - Removed for ghost privacy
+ //say_dead_direct("The ghost of " + span_name("[name]") + " now [pick("skulks","lurks","prowls","creeps","stalks")] among the dead. [message]") //ChompEDIT - Removed for ghost privacy
log_and_message_admins(" [name] entered ghost/observe mode. [message]") //ChompEDIT
else
- //say_dead_direct(" [name] no longer [pick("skulks","lurks","prowls","creeps","stalks")] in the realm of the dead. [message]") //ChompEDIT - Removed for ghost privacy
+ //say_dead_direct(span_name("[name]") + " no longer [pick("skulks","lurks","prowls","creeps","stalks")] in the realm of the dead. [message]") //ChompEDIT - Removed for ghost privacy
log_and_message_admins(" [name] left ghost/observe mode. [message]") //ChompEDIT
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index dcf2d9795b..b6e5be9653 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -480,7 +480,7 @@
/* CHOMPedit: Nuking slipping.
//Check to see if we slipped
if(prob(Process_Spaceslipping(5)) && !buckled)
- to_chat(src, span_notice(" You slipped!"))
+ to_chat(src, span_boldnotice("You slipped!"))
inertia_dir = last_move
step(src, src.inertia_dir) // Not using Move for smooth glide here because this is a 'slip' so should be sudden.
return 0
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index 15b2155408..f1a246c600 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -88,7 +88,7 @@ var/obj/effect/lobby_image = new /obj/effect/lobby_image
tgui_alert_async(src, message, "BYOND Client Version Warning")
// So we can be more wordy and give links.
- to_chat(src, " Your client version has known issues. Please consider using a different version: https://www.byond.com/download/build/.")
+ to_chat(src, span_userdanger("Your client version has known issues.") + " Please consider using a different version: https://www.byond.com/download/build/.")
var/chat_message = ""
if(CONFIG_GET(number/suggested_byond_version)) // CHOMPEdit
chat_message += "We suggest using version [CONFIG_GET(number/suggested_byond_version)]." // CHOMPEdit
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 81df7f6d1a..07996db90a 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -45,22 +45,22 @@
/mob/new_player/proc/new_player_panel_proc()
var/output = " "
- output += " Map: [using_map.full_name] "
- output += " Station Time: [stationtime2text()] "
+ output += span_bold("Map:") + " [using_map.full_name] "
+ output += span_bold("Station Time:") + " [stationtime2text()] "
if(!ticker || ticker.current_state <= GAME_STATE_PREGAME)
- output += " Server Initializing!"
+ output += span_bold("Server Initializing!")
else
- output += " Round Duration: [roundduration2text()] "
+ output += span_bold("Round Duration:") + " [roundduration2text()] "
output += "
"
output += " Character Setup "
if(!ticker || ticker.current_state <= GAME_STATE_PREGAME)
if(ready)
- output += " \[ Ready | Not Ready \] " //ChompEDIT - fixed height
+ output += " \[ " + span_linkOn(span_bold("Ready")) + " | Not Ready \] " //ChompEDIT - fixed height
else
- output += " \[ Ready | Not Ready \] " //ChompEDIT - fixed height
+ output += " \[ Ready | " + span_linkOn(span_bold("Not Ready")) + " \] " //ChompEDIT - fixed height
output += " Join Game!
" //ChompEDIT - fixed height
else
@@ -308,7 +308,7 @@
var/sql = "INSERT INTO erro_privacy VALUES (null, Now(), :t_ckey, :t_option)" //CHOMPEdit TGSQL
var/datum/db_query/query_insert = SSdbcore.NewQuery(sql,sqlargs) //CHOMPEdit TGSQL
query_insert.Execute()
- to_chat(usr, " Thank you for your vote!")
+ to_chat(usr, span_bold("Thank you for your vote!"))
qdel(query_insert)
usr << browse(null,"window=privacypoll")
@@ -418,7 +418,7 @@
dat += " "
dat += "[body]"
dat += " "
- dat += " Last written by [F["author"]], on [F["timestamp"]]."
+ dat += span_normal(span_italics("Last written by [F["author"]], on [F["timestamp"]]."))
dat += ""
var/datum/browser/popup = new(src, "Server News", "Server News", 450, 300, src)
popup.set_content(dat)
@@ -644,7 +644,7 @@
var/name = client.prefs.be_random_name ? "friend" : client.prefs.real_name
var/dat = " "
- dat += "Welcome, [name].
"
+ dat += span_bold("Welcome, [name].
")
dat += "Round Duration: [roundduration2text()]
"
if(emergency_shuttle) //In case NanoTrasen decides reposess CentCom's shuttles.
diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm
index 15f1d43bea..55826939fc 100644
--- a/code/modules/mob/new_player/poll.dm
+++ b/code/modules/mob/new_player/poll.dm
@@ -17,7 +17,7 @@
/mob/new_player/proc/privacy_poll()
var/output = "Player poll"
output +="
"
- output += " We would like to expand our stats gathering."
+ output += span_bold("We would like to expand our stats gathering.")
output += " This however involves gathering data about player behavior, play styles, unique player numbers, play times, etc. Data like that cannot be gathered fully anonymously, which is why we're asking you how you'd feel if player-specific data was gathered. Prior to any of this actually happening, a privacy policy will be discussed, but before that can begin, we'd preliminarily like to know how you feel about the concept."
output +="
"
output += "How do you feel about the game gathering player-specific statistics? This includes statistics about individual players as well as in-game polling/opinion requests."
@@ -131,7 +131,7 @@
qdel(options_query) //CHOMPEdit TGSQL
var/output = " Player poll"
output +="
"
- output += " Question: [pollquestion]"
+ output += span_bold("Question: [pollquestion]") + " "
output += " Poll runs from [pollstarttime] until [pollendtime]"
if(!voted) //Only make this a form if we have not voted yet
@@ -145,7 +145,7 @@
if(O.optionid && O.optiontext)
if(voted)
if(votedoptionid == O.optionid)
- output += "[O.optiontext]
"
+ output += span_bold("[O.optiontext]") + "
"
else
output += "[O.optiontext]
"
else
@@ -175,7 +175,7 @@
var/output = " Player poll"
output +="
"
- output += " Question: [pollquestion]"
+ output += span_bold("Question: [pollquestion]") + " "
output += " Feedback gathering runs from [pollstarttime] until [pollendtime]"
if(!voted) //Only make this a form if we have not voted yet
@@ -209,7 +209,7 @@
var/output = " Player poll"
output +="
"
- output += " Question: [pollquestion]"
+ output += span_bold("Question: [pollquestion]") + " "
output += " Poll runs from [pollstarttime] until [pollendtime]"
var/voted = 0
@@ -304,7 +304,7 @@
var/output = " Player poll"
output +="
"
- output += " Question: [pollquestion]You can select up to [multiplechoiceoptions] options. If you select more, the first [multiplechoiceoptions] will be saved. "
+ output += span_bold("Question: [pollquestion]") + " You can select up to [multiplechoiceoptions] options. If you select more, the first [multiplechoiceoptions] will be saved. "
output += " Poll runs from [pollstarttime] until [pollendtime]"
if(!voted) //Only make this a form if we have not voted yet
@@ -320,7 +320,7 @@
if(O.optionid && O.optiontext)
if(voted)
if(O.optionid in votedfor)
- output += "[O.optiontext]
"
+ output += span_bold("[O.optiontext]") + "
"
else
output += "[O.optiontext]
"
else
diff --git a/code/modules/mob/new_player/skill.dm b/code/modules/mob/new_player/skill.dm
index 3f5c5c9edb..54355a8fc0 100644
--- a/code/modules/mob/new_player/skill.dm
+++ b/code/modules/mob/new_player/skill.dm
@@ -181,11 +181,11 @@ var/global/list/SKILL_PRE = list(JOB_ENGINEER = SKILL_ENGINEER, JOB_ROBOTICIST =
return
var/HTML = " "
- HTML += " Select your Skills"
+ HTML += span_bold("Select your Skills") + " "
HTML += "Current skill level: [M.GetSkillClass(M.used_skillpoints)] ([M.used_skillpoints]) "
HTML += " "
for(var/V in SKILLS)
- HTML += "| [V]"
+ HTML += " |
|---|
| " + span_bold("[V]")
HTML += " |
|---|
"
for(var/datum/skill/S in SKILLS[V])
var/level = M.skills[S.ID]
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 191442e56d..ae2e2e384b 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -80,7 +80,7 @@
message = encode_html_emphasis(message)
- say_dead_direct("[pick("complains","moans","whines","laments","blubbers")], \"[message]\"", src)
+ say_dead_direct("[pick("complains","moans","whines","laments","blubbers")], " + span_message("\"[message]\""), src)
/mob/proc/say_understands(var/mob/other, var/datum/language/speaking = null)
if(stat == DEAD)
diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm
index 01c2032246..02e21d1096 100644
--- a/code/modules/mob/say_vr.dm
+++ b/code/modules/mob/say_vr.dm
@@ -70,7 +70,7 @@
if(!subtle_mode)
if(mode_selection)
if(message)
- to_chat(src, "Subtle mode not selected. Your input has not been sent, but preserved: [message]")
+ to_chat(src, span_warning("Subtle mode not selected. Your input has not been sent, but preserved:") + " [message]")
return
else
subtle_mode = "Adjacent Turfs (Default)"
@@ -83,14 +83,14 @@
if(input)
log_subtle(message,src)
- message = span_emote_subtle("[src] [input]")
+ message = span_emote_subtle(span_bold("[src]") + " " + span_italics("[input]"))
if(!(subtle_mode == "Adjacent Turfs (Default)"))
- message = "(T) " + message
+ message = span_bold("(T) ") + message
else
return
if (message)
- var/undisplayed_message = span_emote("[src] does something too subtle for you to see.")
+ var/undisplayed_message = span_emote(span_bold("[src]") + " " + span_italics("does something too subtle for you to see."))
message = encode_html_emphasis(message)
var/list/vis
@@ -117,7 +117,7 @@
if(istype(T) && !(T in tablelist) && !istype(T, /obj/structure/table/rack) && !istype(T, /obj/structure/table/bench))
tablelist |= T.get_all_connected_tables()
if(!(tablelist.len))
- to_chat(src, "No nearby tables detected. Your input has not been sent, but preserved: [input]")
+ to_chat(src, span_warning("No nearby tables detected. Your input has not been sent, but preserved:") + " [input]")
return
for(var/obj/structure/table/T in tablelist)
for(var/mob/M in vis_mobs)
@@ -133,7 +133,7 @@
if("Current Belly (Prey)")
var/obj/belly/B = get_belly(src)
if(!istype(B))
- to_chat(src, "You are currently not in the belly. Your input has not been sent, but preserved: [input]")
+ to_chat(src, span_warning("You are currently not in the belly. Your input has not been sent, but preserved:") + " [input]")
return
vis = get_mobs_and_objs_in_view_fast(get_turf(src),0,2)
vis_mobs = vis["mobs"]
@@ -154,15 +154,15 @@
vis_objs -= O
if("Specific Belly (Pred)")
if(!isliving(src))
- to_chat(src, "You do not appear to be a living mob capable of having bellies. Your input has not been sent, but preserved: [input]")
+ to_chat(src, span_warning("You do not appear to be a living mob capable of having bellies. Your input has not been sent, but preserved:") + " [input]")
return
var/mob/living/L = src
if(!(L.vore_organs) || !(L.vore_organs.len))
- to_chat(src, "You do not have any bellies. Your input has not been sent, but preserved: [input]")
+ to_chat(src, span_warning("You do not have any bellies. Your input has not been sent, but preserved:") + " [input]")
return
var/obj/belly/B = tgui_input_list(src, "Which belly do you want to sent the subtle to?","Select Belly", L.vore_organs)
if(!B || !istype(B))
- to_chat(src, "You have not selected a valid belly. Your input has not been sent, but preserved: [input]")
+ to_chat(src, span_warning("You have not selected a valid belly. Your input has not been sent, but preserved:") + " [input]")
return
vis = get_mobs_and_objs_in_view_fast(get_turf(src),0,2)
vis_mobs = vis["mobs"]
@@ -190,11 +190,11 @@
if(isobserver(M) || (M.stat == DEAD))
vis_mobs -= M
if(!(vis_mobs.len))
- to_chat(src, "No valid targets found. Your input has not been sent, but preserved: [input]")
+ to_chat(src, span_warning("No valid targets found. Your input has not been sent, but preserved:") + " [input]")
return
var/target = tgui_input_list(src, "Who do we send our message to?","Select Target", vis_mobs)
if(!(target))
- to_chat(src, "No target selected. Your input has not been sent, but preserved: [input]")
+ to_chat(src, span_warning("No target selected. Your input has not been sent, but preserved:") + " [input]")
return
vis_mobs = list(target, src)
@@ -327,7 +327,7 @@
for(var/I in M.contents)
if(istype(I, /mob/living/dominated_brain))
var/mob/living/dominated_brain/db = I
- to_chat(db, span_psay("\The [M] thinks, \"[message]\"")) //To any dominated brains inside us
+ to_chat(db, span_psay(span_bold("\The [M] thinks, \"[message]\""))) //To any dominated brains inside us
if(db.read_preference(/datum/preference/toggle/subtle_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
db << sound(pick(voice_sounds_list), volume = 25)
@@ -335,7 +335,7 @@
for(var/B in M.vore_organs)
for(var/mob/living/L in B)
if(L.absorbed)
- to_chat(L, span_psay("\The [M] thinks, \"[message]\"")) //To any absorbed people inside us
+ to_chat(L, span_psay(span_bold("\The [M] thinks, \"[message]\""))) //To any absorbed people inside us
if(L.read_preference(/datum/preference/toggle/subtle_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
L << sound(pick(voice_sounds_list), volume = 25)
@@ -348,7 +348,7 @@
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
M << sound(pick(voice_sounds_list), volume = 25)
else
- to_chat(M, span_psay("You think \"[message]\"")) //To us if we are the pred
+ to_chat(M, span_psay(span_bold("You think \"[message]\""))) //To us if we are the pred
if(M.read_preference(/datum/preference/toggle/subtle_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
M << sound(pick(voice_sounds_list), volume = 25)
@@ -433,7 +433,7 @@
for(var/I in M.contents)
if(istype(I, /mob/living/dominated_brain))
var/mob/living/dominated_brain/db = I
- to_chat(db, span_pemote("\The [M] [message]")) //To any dominated brains inside us
+ to_chat(db, span_pemote(span_bold("\The [M] [message]"))) //To any dominated brains inside us
if(db.read_preference(/datum/preference/toggle/subtle_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
db << sound(pick(voice_sounds_list), volume = 25)
@@ -441,7 +441,7 @@
for(var/B in M.vore_organs)
for(var/mob/living/L in B)
if(L.absorbed)
- to_chat(L, span_pemote("\The [M] [message]")) //To any absorbed people inside us
+ to_chat(L, span_pemote(span_bold("\The [M] [message]"))) //To any absorbed people inside us
if(L.read_preference(/datum/preference/toggle/subtle_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
L << sound(pick(voice_sounds_list), volume = 25)
@@ -454,7 +454,7 @@
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
M << sound(pick(voice_sounds_list), volume = 25)
else
- to_chat(M, span_pemote("\The [M] [message]")) //To us if we are the pred
+ to_chat(M, span_pemote(span_bold("\The [M] [message]"))) //To us if we are the pred
if(M.read_preference(/datum/preference/toggle/subtle_sounds))
if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead
M << sound(pick(voice_sounds_list), volume = 25)
@@ -487,9 +487,9 @@
if(stat == DEAD)
return say_dead(message)
if(stat)
- to_chat(src, "You need to be concious to narrate: [message]")
+ to_chat(src, span_warning("You need to be concious to narrate: [message]"))
return
- message = span_name("([name]) [message]")
+ message = span_name("([name])") + " " + span_pnarrate("[message]")
//Below here stolen from emotes
var/turf/T = get_turf(src)
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 290bfff7e8..2626431bd5 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -36,7 +36,7 @@
dna.SetSEState(MONKEYBLOCK,1)
dna.SetSEValueRange(MONKEYBLOCK,0xDAC, 0xFFF)
- to_chat(src, "You are now [species.name]. ")
+ to_chat(src, span_infoplain(span_bold("You are now [species.name]. ")))
qdel(animation)
return src
@@ -220,7 +220,7 @@
new_xeno.a_intent = I_HURT
new_xeno.key = key
- to_chat(new_xeno, "You are now an alien.")
+ to_chat(new_xeno, span_infoplain(span_bold("You are now an alien.")))
qdel(src)
return
@@ -242,7 +242,7 @@
new_corgi.a_intent = I_HURT
new_corgi.key = key
- to_chat(new_corgi, "You are now a Corgi. Yap Yap!")
+ to_chat(new_corgi, span_infoplain(span_bold("You are now a Corgi. Yap Yap!")))
qdel(src)
return
diff --git a/code/modules/modular_computers/file_system/programs/generic/game.dm b/code/modules/modular_computers/file_system/programs/generic/game.dm
index c1dcc53195..8cf049aff7 100644
--- a/code/modules/modular_computers/file_system/programs/generic/game.dm
+++ b/code/modules/modular_computers/file_system/programs/generic/game.dm
@@ -168,7 +168,7 @@
to_chat(usr, span_notice("Hardware error: Printer is out of paper."))
return
else
- computer.visible_message("\The [computer] prints out paper.")
+ computer.visible_message(span_infoplain(span_bold("\The [computer]") + " prints out paper."))
if(ticket_count >= 1)
new /obj/item/stack/arcadeticket((get_turf(computer)), 1)
to_chat(usr, span_notice("[src] dispenses a ticket!"))
diff --git a/code/modules/multiz/ladders.dm b/code/modules/multiz/ladders.dm
index 746357c61c..db56742c03 100644
--- a/code/modules/multiz/ladders.dm
+++ b/code/modules/multiz/ladders.dm
@@ -101,9 +101,9 @@
/obj/structure/ladder/proc/climbLadder(var/mob/M, var/obj/target_ladder)
var/direction = (target_ladder == target_up ? "up" : "down")
- M.visible_message("\The [M] begins climbing [direction] \the [src]!",
- "You begin climbing [direction] \the [src]!",
- "You hear the grunting and clanging of a metal ladder being used.")
+ M.visible_message(span_infoplain(span_bold("\The [M]") + " begins climbing [direction] \the [src]!"),
+ span_info("You begin climbing [direction] \the [src]!"),
+ span_info("You hear the grunting and clanging of a metal ladder being used."))
target_ladder.audible_message(span_notice("You hear something coming [direction] \the [src]"), runemessage = "clank clank")
diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm
index 261199febf..55e4a35818 100644
--- a/code/modules/multiz/movement.dm
+++ b/code/modules/multiz/movement.dm
@@ -540,8 +540,8 @@
else
if(!silent)
if(planetary)
- visible_message(span_danger("\A [src] falls out of the sky and crashes into \the [landing]!"), \
- span_danger(" You fall out of the sky and crash into \the [landing]!"), \
+ visible_message(span_danger(span_large("\A [src] falls out of the sky and crashes into \the [landing]!")), \
+ span_danger(span_large(" You fall out of the sky and crash into \the [landing]!")), \
"You hear something slam into \the [landing].")
var/turf/T = get_turf(landing)
explosion(T, 0, 1, 2)
@@ -643,8 +643,8 @@
else
if(!silent)
if(planetary)
- visible_message(span_danger("\A [src] falls out of the sky and crashes into \the [landing]!"), \
- span_danger(" You fall out of the skiy and crash into \the [landing]!"), \
+ visible_message(span_danger(span_large("\A [src] falls out of the sky and crashes into \the [landing]!")), \
+ span_danger(span_large(" You fall out of the skiy and crash into \the [landing]!")), \
"You hear something slam into \the [landing].")
var/turf/T = get_turf(landing)
explosion(T, 0, 1, 2)
diff --git a/code/modules/multiz/movement_vr.dm b/code/modules/multiz/movement_vr.dm
index b318d8366b..ce40713723 100644
--- a/code/modules/multiz/movement_vr.dm
+++ b/code/modules/multiz/movement_vr.dm
@@ -186,28 +186,28 @@
climb_time +=3 SECONDS
if(fall_chance < 30)
fall_chance = 30
- L.visible_message(message = "[L] begins to climb up on \The [src]", self_message = "You begin to clumb up on \The [src]", \
- blind_message = "You hear the sounds of climbing!", runemessage = "Tap Tap")
+ L.visible_message(message = span_infoplain(span_bold("[L]") + " begins to climb up on " + span_bold("\The [src]")), self_message = span_infoplain("You begin to clumb up on " + span_bold("\The [src]")), \
+ blind_message = span_infoplain("You hear the sounds of climbing!"), runemessage = "Tap Tap")
var/oops_time = world.time
var/grace_time = 4 SECONDS
to_chat(L, span_warning("If you get interrupted after [(grace_time / (1 SECOND))] seconds of climbing, you will fall and hurt yourself, beware!"))
if(do_after(L,climb_time))
if(prob(fall_chance))
L.forceMove(above_mob)
- L.visible_message(message = "[L] falls off \The [src]", self_message = span_danger("You slipped off \The [src]"), \
- blind_message = "you hear a loud thud!", runemessage = "CRASH!")
+ L.visible_message(message = span_infoplain(span_bold("[L]") + " falls off " + span_bold("\The [src]")), self_message = span_danger("You slipped off " + span_bold("\The [src]")), \
+ blind_message = span_infoplain("you hear a loud thud!"), runemessage = "CRASH!")
else
if(drop_our_held)
L.drop_item(get_turf(L))
L.forceMove(above_wall)
- L.visible_message(message = "[L] climbed up on \The [src]", \
- self_message = span_notice("You successfully scaled \The [src]"), \
- blind_message = "The sounds of climbing cease.", runemessage = "Tap Tap")
+ L.visible_message(message = span_infoplain(span_bold("[L]") + " climbed up on " + span_bold("\The [src]")), \
+ self_message = span_notice("You successfully scaled " + span_bold("\The [src]")), \
+ blind_message = span_infoplain("The sounds of climbing cease."), runemessage = "Tap Tap")
L.adjust_nutrition(-nutrition_cost)
else if(world.time > (oops_time + grace_time))
L.forceMove(above_mob)
- L.visible_message(message = "[L] falls off \The [src]", self_message = span_danger("You slipped off \The [src]"), \
- blind_message = "you hear a loud thud!", runemessage = "CRASH!")
+ L.visible_message(message = span_infoplain(span_bold("[L]") + " falls off " + span_bold("\The [src]")), self_message = span_danger("You slipped off " + span_bold("\The [src]")), \
+ blind_message = span_infoplain("you hear a loud thud!"), runemessage = "CRASH!")
/mob/living/verb/climb_down()
set name = "Climb down wall"
@@ -307,27 +307,27 @@
to_chat(src, span_danger("\The [climbing_surface] is not suitable for climbing! Even for a master climber, this is risky!"))
if(fall_chance < 75 )
fall_chance = 75
- src.visible_message(message = "[src] climb down \The [below_wall]", \
- self_message = "You begin to descend \The [below_wall]", \
- blind_message = "You hear the sounds of climbing!", runemessage = "Tap Tap")
- below_wall.audible_message(message = "You hear something climbing up \The [below_wall]", runemessage= "Tap Tap")
+ src.visible_message(message = span_infoplain(span_bold("[src]") + " climb down " + span_bold("\The [below_wall]")), \
+ self_message = span_infoplain("You begin to descend " + span_bold("\The [below_wall]")), \
+ blind_message = span_infoplain("You hear the sounds of climbing!"), runemessage = "Tap Tap")
+ below_wall.audible_message(message = span_infoplain("You hear something climbing up " + span_bold("\The [below_wall]")), runemessage= "Tap Tap")
var/oops_time = world.time
var/grace_time = 3 SECONDS
to_chat(src, span_warning("If you get interrupted after [(grace_time / (1 SECOND))] seconds of climbing, you will fall and hurt yourself, beware!"))
if(do_after(src,climb_time))
if(prob(fall_chance))
src.forceMove(front_of_us)
- src.visible_message(message = "[src] falls off \The [below_wall]", \
- self_message = span_danger("You slipped off \The [below_wall]"), \
- blind_message = "you hear a loud thud!", runemessage = "CRASH!")
+ src.visible_message(message = span_infoplain(span_bold("[src]") + " falls off " + span_bold("\The [below_wall]")), \
+ self_message = span_danger("You slipped off " + span_bold("\The [below_wall]")), \
+ blind_message = span_infoplain("you hear a loud thud!"), runemessage = "CRASH!")
else
src.forceMove(destination)
- src.visible_message(message = "[src] climbed down on \The [below_wall]", \
- self_message = span_notice("You successfully descended \The [below_wall]"), \
- blind_message = "The sounds of climbing cease.", runemessage = "Tap Tap")
+ src.visible_message(message = span_infoplain(span_bold("[src]") + " climbed down on " + span_bold("\The [below_wall]")), \
+ self_message = span_notice("You successfully descended " + span_bold("\The [below_wall]")), \
+ blind_message = span_infoplain("The sounds of climbing cease."), runemessage = "Tap Tap")
adjust_nutrition(-nutrition_cost)
else if(world.time > (oops_time + grace_time))
src.forceMove(front_of_us)
- src.visible_message(message = "[src] falls off \The [below_wall]", \
- self_message = span_danger("You slipped off \The [below_wall]"), \
- blind_message = "you hear a loud thud!", runemessage = "CRASH!")
+ src.visible_message(message = span_infoplain(span_bold("[src]") + " falls off " + span_bold("\The [below_wall]")), \
+ self_message = span_danger("You slipped off " + span_bold("\The [below_wall]")), \
+ blind_message = span_infoplain("you hear a loud thud!"), runemessage = "CRASH!")
diff --git a/code/modules/news/new_newspaper.dm b/code/modules/news/new_newspaper.dm
index 0d55a9992a..8d27c37421 100644
--- a/code/modules/news/new_newspaper.dm
+++ b/code/modules/news/new_newspaper.dm
@@ -32,17 +32,17 @@ obj/item/newspaper/attack_self(mob/user)
if(important_message)
dat+="Contents:
**Important Security Announcement** \[page [pages+2]\]
"
else
- dat+="Other than the title, the rest of the newspaper is unprinted..."
+ dat+=span_italics("Other than the title, the rest of the newspaper is unprinted...")
else
dat+="Contents:
"
for(var/datum/feed_channel/NP in news_content)
pages++
if(important_message)
- dat+="**Important Security Announcement** \[page [pages+2]\]
"
+ dat+=span_bold("**Important Security Announcement**") + " \[page [pages+2]\]
"
var/temp_page=0
for(var/datum/feed_channel/NP in news_content)
temp_page++
- dat+="[NP.channel_name] \[page [temp_page+1]\]
"
+ dat+=span_bold("[NP.channel_name]") + " \[page [temp_page+1]\]
"
dat+=" "
if(scribble_page==curr_page)
dat+="
There is a small scribble near the end of this page... It reads: \"[scribble]\""
@@ -76,16 +76,16 @@ obj/item/newspaper/attack_self(mob/user)
pages++
if(important_message!=null)
dat+="Wanted Issue:
"
- dat+="Criminal name: [important_message.author]
"
- dat+="Description: [important_message.body]
"
- dat+="Photo:: "
+ dat+=span_bold("Criminal name") + ": [important_message.author]
"
+ dat+=span_bold("Description") + ": [important_message.body]
"
+ dat+=span_bold("Photo:") + ": "
if(important_message.img)
user << browse_rsc(important_message.img, "tmp_photow.png")
dat+="
 "
else
dat+="None"
else
- dat+="Apart from some uninteresting Classified ads, there's nothing on this page..."
+ dat+=span_italics("Apart from some uninteresting Classified ads, there's nothing on this page...")
if(scribble_page==curr_page)
dat+="
There is a small scribble near the end of this page... It reads: \"[scribble]\""
dat+= "
"
@@ -96,7 +96,7 @@ obj/item/newspaper/attack_self(mob/user)
human_user << browse(dat, "window=newspaper_main;size=300x400")
onclose(human_user, "newspaper_main")
else
- to_chat(user, "The paper is full of intelligible symbols!")
+ to_chat(user, span_infoplain("The paper is full of intelligible symbols!"))
obj/item/newspaper/Topic(href, href_list)
var/mob/living/U = usr
diff --git a/code/modules/news/newspaper.dm b/code/modules/news/newspaper.dm
index cd0d073079..09bc87b2ea 100644
--- a/code/modules/news/newspaper.dm
+++ b/code/modules/news/newspaper.dm
@@ -32,17 +32,17 @@
if(important_message)
dat+="Contents:
**Important Security Announcement** \[page [pages+2]\]
"
else
- dat+="Other than the title, the rest of the newspaper is unprinted..."
+ dat+=span_italics("Other than the title, the rest of the newspaper is unprinted...")
else
dat+="Contents:
"
for(var/datum/feed_channel/NP in news_content)
pages++
if(important_message)
- dat+="**Important Security Announcement** \[page [pages+2]\]
"
+ dat+=span_bold("**Important Security Announcement**") + " \[page [pages+2]\]
"
var/temp_page=0
for(var/datum/feed_channel/NP in news_content)
temp_page++
- dat+="[NP.channel_name] \[page [temp_page+1]\]
"
+ dat+=span_bold("[NP.channel_name]") + " " + span_normal("\[page [temp_page+1]\]") + "
"
dat+=" "
if(scribble_page==curr_page)
dat+="
There is a small scribble near the end of this page... It reads: \"[scribble]\""
@@ -77,16 +77,16 @@
pages++
if(important_message!=null)
dat+="Wanted Issue:
"
- dat+="Criminal name: [important_message.author]
"
- dat+="Description: [important_message.body]
"
- dat+="Photo:: "
+ dat+=span_bold("Criminal name") + ": [important_message.author]
"
+ dat+=span_bold("Description") + ": [important_message.body]
"
+ dat+=span_bold("Photo:") + ": "
if(important_message.img)
user << browse_rsc(important_message.img, "tmp_photow.png")
dat+="
"
else
dat+="None"
else
- dat+="Apart from some uninteresting Classified ads, there's nothing on this page..."
+ dat+=span_italics("Apart from some uninteresting Classified ads, there's nothing on this page...")
if(scribble_page==curr_page)
dat+="
There is a small scribble near the end of this page... It reads: \"[scribble]\""
dat+= "
"
@@ -97,7 +97,7 @@
human_user << browse(dat, "window=newspaper_main;size=300x400")
onclose(human_user, "newspaper_main")
else
- to_chat(user, "The paper is full of intelligible symbols!")
+ to_chat(user, span_infoplain("The paper is full of intelligible symbols!"))
/obj/item/newspaper/Topic(href, href_list)
var/mob/living/U = usr
diff --git a/code/modules/nifsoft/nifsoft.dm b/code/modules/nifsoft/nifsoft.dm
index 99247ec600..fdb51c1ef9 100644
--- a/code/modules/nifsoft/nifsoft.dm
+++ b/code/modules/nifsoft/nifsoft.dm
@@ -270,7 +270,7 @@
var/newlaws = tgui_input_text(user, "Please Input Laws", "Compliance Laws", laws, multiline = TRUE, prevent_enter = TRUE)
newlaws = sanitize(newlaws,2048)
if(newlaws)
- to_chat(user,span_filter_notice("You set the laws to:
[newlaws]"))
+ to_chat(user,span_filter_notice("You set the laws to:
" + span_notice("[newlaws]")))
laws = newlaws
/obj/item/disk/nifsoft/compliance/extra_params()
diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm
index b39d6458a5..7c35e35da9 100644
--- a/code/modules/nifsoft/software/13_soulcatcher.dm
+++ b/code/modules/nifsoft/software/13_soulcatcher.dm
@@ -75,13 +75,13 @@
to_chat(nif.human,
type = MESSAGE_TYPE_NIF,
- html = span_nif("\[[icon2html(nif.big_icon, nif.human)]NIF\] Soulcatcher displays, \"[message]\""))
+ html = span_nif(span_bold("\[[icon2html(nif.big_icon, nif.human)]NIF\]") + " " + span_bold("Soulcatcher") + " displays, \"" + span_notice(span_nif("[message]")) + "\""))
nif.human << sound
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS,
type = MESSAGE_TYPE_NIF,
- html = span_nif("\[[icon2html(nif.big_icon, CS.client)]NIF\] Soulcatcher displays, \"[message]\""))
+ html = span_nif(span_bold("\[[icon2html(nif.big_icon, CS.client)]NIF\]") + " " + span_bold("Soulcatcher") + " displays, \"" + span_notice(span_nif("[message]")) + "\""))
CS << sound
/datum/nifsoft/soulcatcher/proc/say_into(var/message, var/mob/living/sender, var/mob/eyeobj)
@@ -89,17 +89,17 @@
//AR Projecting
if(eyeobj)
- sender.eyeobj.visible_message(span_game(span_say("[sender_name] says, \"[message]\"")))
+ sender.eyeobj.visible_message(span_game(span_say(span_bold("[sender_name]") + " says, \"[message]\"")))
//Not AR Projecting
else
to_chat(nif.human,
type = MESSAGE_TYPE_NIF,
- html = span_nif("\[[icon2html(nif.big_icon, nif.human.client)]NIF\] [sender_name] speaks, \"[message]\""))
+ html = span_nif(span_bold("\[[icon2html(nif.big_icon, nif.human.client)]NIF\]") + " " + span_bold("[sender_name]") + " speaks, \"[message]\""))
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS,
type = MESSAGE_TYPE_NIF,
- html = span_nif("\[[icon2html(nif.big_icon, CS.client)]NIF\] [sender_name] speaks, \"[message]\""))
+ html = span_nif(span_bold("\[[icon2html(nif.big_icon, CS.client)]NIF\]") + " " + span_bold("[sender_name]") + " speaks, \"[message]\""))
log_nsay(message,nif.human.real_name,sender)
@@ -114,11 +114,11 @@
else
to_chat(nif.human,
type = MESSAGE_TYPE_NIF,
- html = span_nif("\[[icon2html(nif.big_icon,nif.human.client)]NIF\] [sender_name] [message]"))
+ html = span_nif(span_bold("\[[icon2html(nif.big_icon,nif.human.client)]NIF\]") + " " + span_bold("[sender_name]") + " [message]"))
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS,
type = MESSAGE_TYPE_NIF,
- html = span_nif("\[[icon2html(nif.big_icon,CS.client)]NIF\] [sender_name] [message]"))
+ html = span_nif(span_bold("\[[icon2html(nif.big_icon,CS.client)]NIF\]") + " " + span_bold("[sender_name]") + " [message]"))
log_nme(message,nif.human.real_name,sender)
@@ -146,7 +146,7 @@
inside_flavor = new_flavor
nif.notify("Updating VR environment...")
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
- to_chat(CS,"Your surroundings change to...\n[inside_flavor]")
+ to_chat(CS,span_notice("Your surroundings change to...") + "\n[inside_flavor]")
save_settings()
return TRUE
@@ -258,7 +258,7 @@
qdel(M) //Bye ghost
//Give them a flavortext message
- var/message = "Your vision fades in a haze of static, before returning.\n\
+ var/message = span_notice("Your vision fades in a haze of static, before returning.") + "\n\
Around you, you see...\n\
[inside_flavor]"
@@ -266,8 +266,8 @@
//Reminder on how this works to host
if(brainmobs.len == 1) //Only spam this on the first one
- to_chat(nif.human,"Your occupant's messages/actions can only be seen by you, and you can \
- send messages that only they can hear/see by using the NSay and NMe verbs (or the *nsay and *nme emotes).")
+ to_chat(nif.human,span_notice("Your occupant's messages/actions can only be seen by you, and you can \
+ send messages that only they can hear/see by using the NSay and NMe verbs (or the *nsay and *nme emotes)."))
//Announce to host and other minds
notify_into("New mind loaded: [brainmob.name]")
diff --git a/code/modules/nifsoft/software/15_misc.dm b/code/modules/nifsoft/software/15_misc.dm
index 7b8017bf9c..b507599823 100644
--- a/code/modules/nifsoft/software/15_misc.dm
+++ b/code/modules/nifsoft/software/15_misc.dm
@@ -105,11 +105,11 @@
/datum/nifsoft/compliance/activate()
if((. = ..()))
- to_chat(nif.human,span_danger("You are compelled to follow these rules: \n[laws]"))
+ to_chat(nif.human,span_danger("You are compelled to follow these rules:") + "\n" + span_notify("[laws]"))
/datum/nifsoft/compliance/install()
if((. = ..()))
- to_chat(nif.human,span_danger("You feel suddenly compelled to follow these rules: \n[laws]"))
+ to_chat(nif.human,span_danger("You feel suddenly compelled to follow these rules:") + "\n" + span_notify("[laws]"))
/datum/nifsoft/compliance/uninstall()
nif.notify("ERROR! Unable to comply!",TRUE)
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index ad0f6d3491..5736e7afbc 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -173,12 +173,12 @@
switch(stage)
if(0)
if(istype(W,/obj/item/surgical/scalpel))
- user.visible_message(span_danger("[user] cuts [src] open with [W]!"))
+ user.visible_message(span_danger(span_bold("[user]") + " cuts [src] open with [W]!"))
stage++
return
if(1)
if(istype(W,/obj/item/surgical/retractor))
- user.visible_message(span_danger("[user] cracks [src] open like an egg with [W]!"))
+ user.visible_message(span_danger(span_bold("[user]") + " cracks [src] open like an egg with [W]!"))
stage++
return
if(2)
@@ -187,9 +187,9 @@
var/obj/item/removing = pick(contents)
removing.loc = get_turf(user.loc)
user.put_in_hands(removing)
- user.visible_message(span_danger("[user] extracts [removing] from [src] with [W]!"))
+ user.visible_message(span_danger(span_bold("[user]") + " extracts [removing] from [src] with [W]!"))
else
- user.visible_message(span_danger("[user] fishes around fruitlessly in [src] with [W]."))
+ user.visible_message(span_danger(span_bold("[user]") + " fishes around fruitlessly in [src] with [W]."))
return
..()
@@ -477,9 +477,9 @@
var/fix_verb = (damage_amount > repair_amount) ? "patches" : "finishes patching"
if(user == src.owner)
var/datum/gender/T = gender_datums[user.get_visible_gender()]
- user.visible_message("\The [user] [fix_verb] [damage_desc] on [T.his] [src.name] with [tool].")
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " [fix_verb] [damage_desc] on [T.his] [src.name] with [tool]."))
else
- user.visible_message("\The [user] [fix_verb] [damage_desc] on [owner]'s [src.name] with [tool].")
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " [fix_verb] [damage_desc] on [owner]'s [src.name] with [tool]."))
return 1
diff --git a/code/modules/organs/subtypes/slime.dm b/code/modules/organs/subtypes/slime.dm
index 3b98b5b81e..a8a96b7672 100644
--- a/code/modules/organs/subtypes/slime.dm
+++ b/code/modules/organs/subtypes/slime.dm
@@ -71,7 +71,7 @@
/obj/item/organ/internal/heart/grey/colormatch/slime/process()
..()
if(!(QDELETED(src)) && src.loc != owner)
- visible_message("\The [src] splatters!")
+ visible_message(span_infoplain(span_bold("\The [src]") + " splatters!"))
var/turf/T = get_turf(src)
var/obj/effect/decal/cleanable/blood/B = new (T)
@@ -120,7 +120,7 @@
..()
if(!(QDELETED(src)) && src.loc != owner)
- visible_message("\The [src] splatters!")
+ visible_message(span_infoplain(span_bold("\The [src]") + " splatters!"))
var/turf/T = get_turf(src)
var/obj/effect/decal/cleanable/blood/B = new (T)
diff --git a/code/modules/overmap/disperser/disperser.dm b/code/modules/overmap/disperser/disperser.dm
index c25f65d0da..23e2bae204 100644
--- a/code/modules/overmap/disperser/disperser.dm
+++ b/code/modules/overmap/disperser/disperser.dm
@@ -24,7 +24,7 @@
/obj/machinery/disperser/attackby(obj/item/I, mob/user)
if(I && I.has_tool_quality(TOOL_WRENCH))
if(panel_open)
- user.visible_message("\The [user] rotates \the [src] with \the [I].",
+ user.visible_message(span_infoplain(span_bold("\The [user]") + " rotates \the [src] with \the [I]."),
span_notice("You rotate \the [src] with \the [I]."))
set_dir(turn(dir, 90))
playsound(src, 'sound/items/jaws_pry.ogg', 50, 1)
diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm
index 7b5dbeeebc..51ed603129 100644
--- a/code/modules/paperwork/adminpaper.dm
+++ b/code/modules/paperwork/adminpaper.dm
@@ -53,7 +53,7 @@
//VOREStation Edit/Add End
//TODO change logo based on who you're contacting.
text = " "
- text += "[origin] Quantum Uplink Signed Message
"
+ text += span_bold("[origin] Quantum Uplink Signed Message") + "
"
text += "Encryption key: [originhash]
"
text += "Challenge: [timehash]
"
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index 5ce9fe0e5a..3d480dbee5 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -418,9 +418,11 @@ Extracted to its own procedure for easier logic handling with paper bundles.
. += P.info
/obj/machinery/photocopier/faxmachine/proc/message_admins(var/mob/sender, var/faxname, var/obj/item/sent, var/reply_type, font_colour="#006100")
- var/msg = "[faxname]: [get_options_bar(sender, 2,1,1)]"
- msg += "(REPLY): "
- msg += "Receiving '[sent.name]' via secure connection ... view message"
+ var/msg = "[faxname]: [get_options_bar(sender, 2,1,1)]"
+ msg += "(REPLY)"
+ msg = span_bold(msg) + ": "
+ msg += "Receiving '[sent.name]' via secure connection ... view message"
+ msg = span_notice(msg)
for(var/client/C in GLOB.admins)
if(check_rights((R_ADMIN|R_MOD|R_EVENT),0,C))
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 9c1d371588..75d155ca31 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -626,15 +626,15 @@
if(istype(P, /obj/item/stamp))
var/obj/item/stamp/the_stamp = P
if(the_stamp.stamptext)
- stamps += (stamps=="" ? "
" : "
") + "[the_stamp.stamptext]"
+ stamps += (stamps=="" ? "
" : "
") + span_italics("[the_stamp.stamptext]")
else
- stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [the_stamp.name]."
+ stamps += (stamps=="" ? "
" : "
") + span_italics("This paper has been stamped with the [the_stamp.name].")
else
var/obj/item/clothing/gloves/ring/seal/the_stamp = P
if(the_stamp.stamptext)
- stamps += (stamps=="" ? "
" : "
") + "[the_stamp.stamptext]"
+ stamps += (stamps=="" ? "
" : "
") + span_italics("[the_stamp.stamptext]")
else
- stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [the_stamp.name]."
+ stamps += (stamps=="" ? "
" : "
") + span_italics("This paper has been stamped with the [the_stamp.name].")
if((!in_range(src, usr) && loc != user && !( istype(loc, /obj/item/clipboard) ) && loc.loc != user && user.get_active_hand() != P))
return
var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
@@ -687,15 +687,15 @@
/obj/item/paper/courtroom
name = "A Crash Course in Legal SOP on SS13"
- info = "Roles:
\nThe " + JOB_DETECTIVE + " is basically the investigator and prosecutor.
\nThe Staff Assistant can perform these functions with written authority from the " + JOB_DETECTIVE + ".
\nThe " + JOB_SITE_MANAGER + "/HoP/" + JOB_WARDEN + " is ct as the judicial authority.
\nThe " + JOB_SECURITY_OFFICER + "s are responsible for executing warrants, security during trial, and prisoner transport.
\n
\nInvestigative Phase:
\nAfter the crime has been committed the " + JOB_DETECTIVE + "'s job is to gather evidence and try to ascertain not only who did it but what happened. He must take special care to catalogue everything and don't leave anything out. Write out all the evidence on paper. Make sure you take an appropriate number of fingerprints. IF he must ask someone questions he has permission to confront them. If the person refuses he can ask a judicial authority to write a subpoena for questioning. If again he fails to respond then that person is to be jailed as insubordinate and obstructing justice. Said person will be released after he cooperates.
\n
\nONCE the FT has a clear idea as to who the criminal is he is to write an arrest warrant on the piece of paper. IT MUST LIST THE CHARGES. The FT is to then go to the judicial authority and explain a small version of his case. If the case is moderately acceptable the authority should sign it. Security must then execute said warrant.
\n
\nPre-Pre-Trial Phase:
\nNow a legal representative must be presented to the defendant if said defendant requests one. That person and the defendant are then to be given time to meet (in the jail IS ACCEPTABLE). The defendant and his lawyer are then to be given a copy of all the evidence that will be presented at trial (rewriting it all on paper is fine). THIS IS CALLED THE DISCOVERY PACK. With a few exceptions, THIS IS THE ONLY EVIDENCE BOTH SIDES MAY USE AT TRIAL. IF the prosecution will be seeking the death penalty it MUST be stated at this time. ALSO if the defense will be seeking not guilty by mental defect it must state this at this time to allow ample time for examination.
\nNow at this time each side is to compile a list of witnesses. By default, the defendant is on both lists regardless of anything else. Also the defense and prosecution can compile more evidence beforehand BUT in order for it to be used the evidence MUST also be given to the other side.\nThe defense has time to compile motions against some evidence here.
\nPossible Motions:
\n1. Invalidate Evidence- Something with the evidence is wrong and the evidence is to be thrown out. This includes irrelevance or corrupt security.
\n2. Free Movement- Basically the defendant is to be kept uncuffed before and during the trial.
\n3. Subpoena Witness- If the defense presents god reasons for needing a witness but said person fails to cooperate then a subpoena is issued.
\n4. Drop the Charges- Not enough evidence is there for a trial so the charges are to be dropped. The FT CAN RETRY but the judicial authority must carefully reexamine the new evidence.
\n5. Declare Incompetent- Basically the defendant is insane. Once this is granted a medical official is to examine the patient. If he is indeed insane he is to be placed under care of the medical staff until he is deemed competent to stand trial.
\n
\nALL SIDES MOVE TO A COURTROOM
\nPre-Trial Hearings:
\nA judicial authority and the 2 sides are to meet in the trial room. NO ONE ELSE BESIDES A SECURITY DETAIL IS TO BE PRESENT. The defense submits a plea. If the plea is guilty then proceed directly to sentencing phase. Now the sides each present their motions to the judicial authority. He rules on them. Each side can debate each motion. Then the judicial authority gets a list of crew members. He first gets a chance to look at them all and pick out acceptable and available jurors. Those jurors are then called over. Each side can ask a few questions and dismiss jurors they find too biased. HOWEVER before dismissal the judicial authority MUST agree to the reasoning.
\n
\nThe Trial:
\nThe trial has three phases.
\n1. Opening Arguments- Each side can give a short speech. They may not present ANY evidence.
\n2. Witness Calling/Evidence Presentation- The prosecution goes first and is able to call the witnesses on his approved list in any order. He can recall them if necessary. During the questioning the lawyer may use the evidence in the questions to help prove a point. After every witness the other side has a chance to cross-examine. After both sides are done questioning a witness the prosecution can present another or recall one (even the EXACT same one again!). After prosecution is done the defense can call witnesses. After the initial cases are presented both sides are free to call witnesses on either list.
\nFINALLY once both sides are done calling witnesses we move onto the next phase.
\n3. Closing Arguments- Same as opening.
\nThe jury then deliberates IN PRIVATE. THEY MUST ALL AGREE on a verdict. REMEMBER: They mix between some charges being guilty and others not guilty (IE if you supposedly killed someone with a gun and you unfortunately picked up a gun without authorization then you CAN be found not guilty of murder BUT guilty of possession of illegal weaponry.). Once they have agreed they present their verdict. If unable to reach a verdict and feel they will never they call a deadlocked jury and we restart at Pre-Trial phase with an entirely new set of jurors.
\n
\nSentencing Phase:
\nIf the death penalty was sought (you MUST have gone through a trial for death penalty) then skip to the second part.
\nI. Each side can present more evidence/witnesses in any order. There is NO ban on emotional aspects or anything. The prosecution is to submit a suggested penalty. After all the sides are done then the judicial authority is to give a sentence.
\nII. The jury stays and does the same thing as I. Their sole job is to determine if the death penalty is applicable. If NOT then the judge selects a sentence.
\n
\nTADA you're done. Security then executes the sentence and adds the applicable convictions to the person's record.
\n"
+ info = span_bold("Roles:") + "
\nThe " + JOB_DETECTIVE + " is basically the investigator and prosecutor.
\nThe Staff Assistant can perform these functions with written authority from the " + JOB_DETECTIVE + ".
\nThe " + JOB_SITE_MANAGER + "/HoP/" + JOB_WARDEN + " is ct as the judicial authority.
\nThe " + JOB_SECURITY_OFFICER + "s are responsible for executing warrants, security during trial, and prisoner transport.
\n
\nInvestigative Phase:
\nAfter the crime has been committed the " + JOB_DETECTIVE + "'s job is to gather evidence and try to ascertain not only who did it but what happened. He must take special care to catalogue everything and don't leave anything out. Write out all the evidence on paper. Make sure you take an appropriate number of fingerprints. IF he must ask someone questions he has permission to confront them. If the person refuses he can ask a judicial authority to write a subpoena for questioning. If again he fails to respond then that person is to be jailed as insubordinate and obstructing justice. Said person will be released after he cooperates.
\n
\nONCE the FT has a clear idea as to who the criminal is he is to write an arrest warrant on the piece of paper. IT MUST LIST THE CHARGES. The FT is to then go to the judicial authority and explain a small version of his case. If the case is moderately acceptable the authority should sign it. Security must then execute said warrant.
\n
\nPre-Pre-Trial Phase:
\nNow a legal representative must be presented to the defendant if said defendant requests one. That person and the defendant are then to be given time to meet (in the jail IS ACCEPTABLE). The defendant and his lawyer are then to be given a copy of all the evidence that will be presented at trial (rewriting it all on paper is fine). THIS IS CALLED THE DISCOVERY PACK. With a few exceptions, THIS IS THE ONLY EVIDENCE BOTH SIDES MAY USE AT TRIAL. IF the prosecution will be seeking the death penalty it MUST be stated at this time. ALSO if the defense will be seeking not guilty by mental defect it must state this at this time to allow ample time for examination.
\nNow at this time each side is to compile a list of witnesses. By default, the defendant is on both lists regardless of anything else. Also the defense and prosecution can compile more evidence beforehand BUT in order for it to be used the evidence MUST also be given to the other side.\nThe defense has time to compile motions against some evidence here.
\nPossible Motions:
\n1. Invalidate Evidence- Something with the evidence is wrong and the evidence is to be thrown out. This includes irrelevance or corrupt security.
\n2. Free Movement- Basically the defendant is to be kept uncuffed before and during the trial.
\n3. Subpoena Witness- If the defense presents god reasons for needing a witness but said person fails to cooperate then a subpoena is issued.
\n4. Drop the Charges- Not enough evidence is there for a trial so the charges are to be dropped. The FT CAN RETRY but the judicial authority must carefully reexamine the new evidence.
\n5. Declare Incompetent- Basically the defendant is insane. Once this is granted a medical official is to examine the patient. If he is indeed insane he is to be placed under care of the medical staff until he is deemed competent to stand trial.
\n
\nALL SIDES MOVE TO A COURTROOM
\nPre-Trial Hearings:
\nA judicial authority and the 2 sides are to meet in the trial room. NO ONE ELSE BESIDES A SECURITY DETAIL IS TO BE PRESENT. The defense submits a plea. If the plea is guilty then proceed directly to sentencing phase. Now the sides each present their motions to the judicial authority. He rules on them. Each side can debate each motion. Then the judicial authority gets a list of crew members. He first gets a chance to look at them all and pick out acceptable and available jurors. Those jurors are then called over. Each side can ask a few questions and dismiss jurors they find too biased. HOWEVER before dismissal the judicial authority MUST agree to the reasoning.
\n
\nThe Trial:
\nThe trial has three phases.
\n1. Opening Arguments- Each side can give a short speech. They may not present ANY evidence.
\n2. Witness Calling/Evidence Presentation- The prosecution goes first and is able to call the witnesses on his approved list in any order. He can recall them if necessary. During the questioning the lawyer may use the evidence in the questions to help prove a point. After every witness the other side has a chance to cross-examine. After both sides are done questioning a witness the prosecution can present another or recall one (even the EXACT same one again!). After prosecution is done the defense can call witnesses. After the initial cases are presented both sides are free to call witnesses on either list.
\nFINALLY once both sides are done calling witnesses we move onto the next phase.
\n3. Closing Arguments- Same as opening.
\nThe jury then deliberates IN PRIVATE. THEY MUST ALL AGREE on a verdict. REMEMBER: They mix between some charges being guilty and others not guilty (IE if you supposedly killed someone with a gun and you unfortunately picked up a gun without authorization then you CAN be found not guilty of murder BUT guilty of possession of illegal weaponry.). Once they have agreed they present their verdict. If unable to reach a verdict and feel they will never they call a deadlocked jury and we restart at Pre-Trial phase with an entirely new set of jurors.
\n
\nSentencing Phase:
\nIf the death penalty was sought (you MUST have gone through a trial for death penalty) then skip to the second part.
\nI. Each side can present more evidence/witnesses in any order. There is NO ban on emotional aspects or anything. The prosecution is to submit a suggested penalty. After all the sides are done then the judicial authority is to give a sentence.
\nII. The jury stays and does the same thing as I. Their sole job is to determine if the death penalty is applicable. If NOT then the judge selects a sentence.
\n
\nTADA you're done. Security then executes the sentence and adds the applicable convictions to the person's record.
\n"
/obj/item/paper/hydroponics
name = "Greetings from Billy Bob"
- info = "Hey fellow botanist!
\n
\nI didn't trust the station folk so I left
\na couple of weeks ago. But here's some
\ninstructions on how to operate things here.
\nYou can grow plants and each iteration they become
\nstronger, more potent and have better yield, if you
\nknow which ones to pick. Use your botanist's analyzer
\nfor that. You can turn harvested plants into seeds
\nat the seed extractor, and replant them for better stuff!
\nSometimes if the weed level gets high in the tray
\nmutations into different mushroom or weed species have
\nbeen witnessed. On the rare occassion even weeds mutate!
\n
\nEither way, have fun!
\n
\nBest regards,
\nBilly Bob Johnson.
\n
\nPS.
\nHere's a few tips:
\nIn nettles, potency = damage
\nIn amanitas, potency = deadliness + side effect
\nIn Liberty caps, potency = drug power + effect
\nIn chilis, potency = heat
\nNutrients keep mushrooms alive!
\nWater keeps weeds such as nettles alive!
\nAll other plants need both."
+ info = span_bold("Hey fellow botanist!") + "
\n
\nI didn't trust the station folk so I left
\na couple of weeks ago. But here's some
\ninstructions on how to operate things here.
\nYou can grow plants and each iteration they become
\nstronger, more potent and have better yield, if you
\nknow which ones to pick. Use your botanist's analyzer
\nfor that. You can turn harvested plants into seeds
\nat the seed extractor, and replant them for better stuff!
\nSometimes if the weed level gets high in the tray
\nmutations into different mushroom or weed species have
\nbeen witnessed. On the rare occassion even weeds mutate!
\n
\nEither way, have fun!
\n
\nBest regards,
\nBilly Bob Johnson.
\n
\nPS.
\nHere's a few tips:
\nIn nettles, potency = damage
\nIn amanitas, potency = deadliness + side effect
\nIn Liberty caps, potency = drug power + effect
\nIn chilis, potency = heat
\nNutrients keep mushrooms alive!
\nWater keeps weeds such as nettles alive!
\nAll other plants need both."
/obj/item/paper/djstation
name = "DJ Listening Outpost"
- info = "Welcome new owner!
You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:
- Equip yourself with a multi-tool
- Use the multitool on each machine, that is the broadcaster, receiver and the relay.
- Turn all the machines on, it has already been configured for you to listen on.
Simple as that. Now to listen to the private channels, you'll have to configure the intercoms, located on the front desk. Here is a list of frequencies for you to listen on.
- 145.7 - Common Channel
- 144.7 - Private AI Channel
- 135.9 - Security Channel
- 135.7 - Engineering Channel
- 135.5 - Medical Channel
- 135.3 - Command Channel
- 135.1 - Science Channel
- 134.9 - Mining Channel
- 134.7 - Cargo Channel
"
+ info = span_bold("Welcome new owner!") + "
You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:
- Equip yourself with a multi-tool
- Use the multitool on each machine, that is the broadcaster, receiver and the relay.
- Turn all the machines on, it has already been configured for you to listen on.
Simple as that. Now to listen to the private channels, you'll have to configure the intercoms, located on the front desk. Here is a list of frequencies for you to listen on.
|