| 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"
@@ -253,9 +253,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]
"}
@@ -275,10 +275,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(!dbcon_old.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)
@@ -319,7 +319,7 @@
establish_old_db_connection()
if(!dbcon_old.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)
@@ -385,7 +385,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
@@ -465,7 +465,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)
@@ -536,7 +536,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/lighting/lighting_corner.dm b/code/modules/lighting/lighting_corner.dm
index e02e04b0f7c..3f66bdde70a 100644
--- a/code/modules/lighting/lighting_corner.dm
+++ b/code/modules/lighting/lighting_corner.dm
@@ -29,35 +29,47 @@
///whether we are to be added to SSlighting's corners_queue list for an update
var/needs_update = FALSE
-/datum/lighting_corner/New(turf/new_turf, diagonal)
+/datum/lighting_corner/New(x, y, z)
. = ..()
- save_master(new_turf, turn(diagonal, 180))
- var/vertical = diagonal & ~(diagonal - 1) // The horizontal directions (4 and 8) are bigger than the vertical ones (1 and 2), so we can reliably say the lsb is the horizontal direction.
- var/horizontal = diagonal & ~vertical // Now that we know the horizontal one we can get the vertical one.
+ src.x = x + 0.5
+ src.y = y + 0.5
- x = new_turf.x + (horizontal == EAST ? 0.5 : -0.5)
- y = new_turf.y + (vertical == NORTH ? 0.5 : -0.5)
+ // Alright. We're gonna take a set of coords, and from them do a loop clockwise
+ // To build out the turfs adjacent to us. This is pretty fast
+ var/turf/process_next = locate(x, y, z)
+ if(process_next)
+ master_SW = process_next
+ process_next.lighting_corner_NE = src
+ // Now, we go north!
+ process_next = get_step(process_next, NORTH)
+ else
+ // Yes this is slightly slower then having a guarenteeed turf, but there aren't many null turfs
+ // So this is pretty damn fast
+ process_next = locate(x, y + 1, z)
- // My initial plan was to make this loop through a list of all the dirs (horizontal, vertical, diagonal).
- // Issue being that the only way I could think of doing it was very messy, slow and honestly overengineered.
- // So we'll have this hardcode instead.
- var/turf/new_master_turf
+ // Ok, if we have a north turf, go there. otherwise, onto the next
+ if(process_next)
+ master_NW = process_next
+ process_next.lighting_corner_SE = src
+ // Now, TO THE EAST
+ process_next = get_step(process_next, EAST)
+ else
+ process_next = locate(x + 1, y + 1, z)
- // Diagonal one is easy.
- new_master_turf = get_step(new_turf, diagonal)
- if (new_master_turf) // In case we're on the map's border.
- save_master(new_master_turf, diagonal)
+ // Etc etc
+ if(process_next)
+ master_NE = process_next
+ process_next.lighting_corner_SW = src
+ // Now, TO THE SOUTH AGAIN (SE)
+ process_next = get_step(process_next, SOUTH)
+ else
+ process_next = locate(x + 1, y, z)
- // Now the horizontal one.
- new_master_turf = get_step(new_turf, horizontal)
- if (new_master_turf) // Ditto.
- save_master(new_master_turf, ((new_master_turf.x > x) ? EAST : WEST) | ((new_master_turf.y > y) ? NORTH : SOUTH)) // Get the dir based on coordinates.
-
- // And finally the vertical one.
- new_master_turf = get_step(new_turf, vertical)
- if (new_master_turf)
- save_master(new_master_turf, ((new_master_turf.x > x) ? EAST : WEST) | ((new_master_turf.y > y) ? NORTH : SOUTH)) // Get the dir based on coordinates.
+ // anddd the last tile
+ if(process_next)
+ master_SE = process_next
+ process_next.lighting_corner_NW = src
/datum/lighting_corner/proc/save_master(turf/master, dir)
switch (dir)
diff --git a/code/modules/lighting/lighting_overlay.dm b/code/modules/lighting/lighting_overlay.dm
index 155de84b1da..8e118279970 100644
--- a/code/modules/lighting/lighting_overlay.dm
+++ b/code/modules/lighting/lighting_overlay.dm
@@ -28,8 +28,9 @@
affected_turf.lighting_object = src
affected_turf.set_luminosity(0)
- for(var/turf/space/space_tile in RANGE_TURFS(1, affected_turf))
- space_tile.update_starlight()
+ if(config.starlight)
+ for(var/turf/space/space_tile in RANGE_TURFS(1, affected_turf))
+ space_tile.update_starlight()
needs_update = TRUE
SSlighting.objects_queue += src
@@ -57,6 +58,7 @@
var/static/datum/lighting_corner/dummy/dummy_lighting_corner = new
+ var/turf/affected_turf = src.affected_turf
var/datum/lighting_corner/red_corner = affected_turf.lighting_corner_SW || dummy_lighting_corner
var/datum/lighting_corner/green_corner = affected_turf.lighting_corner_SE || dummy_lighting_corner
var/datum/lighting_corner/blue_corner = affected_turf.lighting_corner_NW || dummy_lighting_corner
@@ -64,22 +66,6 @@
var/max = max(red_corner.largest_color_luminosity, green_corner.largest_color_luminosity, blue_corner.largest_color_luminosity, alpha_corner.largest_color_luminosity)
- var/rr = red_corner.cache_r
- var/rg = red_corner.cache_g
- var/rb = red_corner.cache_b
-
- var/gr = green_corner.cache_r
- var/gg = green_corner.cache_g
- var/gb = green_corner.cache_b
-
- var/br = blue_corner.cache_r
- var/bg = blue_corner.cache_g
- var/bb = blue_corner.cache_b
-
- var/ar = alpha_corner.cache_r
- var/ag = alpha_corner.cache_g
- var/ab = alpha_corner.cache_b
-
#if LIGHTING_SOFT_THRESHOLD != 0
var/set_luminosity = max > LIGHTING_SOFT_THRESHOLD
#else
@@ -88,30 +74,30 @@
var/set_luminosity = max > 1e-6
#endif
- if((rr & gr & br & ar) && (rg + gg + bg + ag + rb + gb + bb + ab == 8))
+ var/mutable_appearance/current_underlay = src.current_underlay
+ affected_turf.underlays -= current_underlay
+ if(red_corner.cache_r & green_corner.cache_r & blue_corner.cache_r & alpha_corner.cache_r && \
+ (red_corner.cache_g + green_corner.cache_g + blue_corner.cache_g + alpha_corner.cache_g + \
+ red_corner.cache_b + green_corner.cache_b + blue_corner.cache_b + alpha_corner.cache_b == 8))
//anything that passes the first case is very likely to pass the second, and addition is a little faster in this case
- affected_turf.underlays -= current_underlay
current_underlay.icon_state = "transparent"
current_underlay.color = null
- affected_turf.underlays += current_underlay
else if(!set_luminosity)
- affected_turf.underlays -= current_underlay
current_underlay.icon_state = "dark"
current_underlay.color = null
- affected_turf.underlays += current_underlay
else
- affected_turf.underlays -= current_underlay
current_underlay.icon_state = "gradient"
current_underlay.color = list(
- rr, rg, rb, 00,
- gr, gg, gb, 00,
- br, bg, bb, 00,
- ar, ag, ab, 00,
+ red_corner.cache_r, red_corner.cache_g, red_corner.cache_b, 00,
+ green_corner.cache_r, green_corner.cache_g, green_corner.cache_b, 00,
+ blue_corner.cache_r, blue_corner.cache_g, blue_corner.cache_b, 00,
+ alpha_corner.cache_r, alpha_corner.cache_g, alpha_corner.cache_b, 00,
00, 00, 00, 01
)
- affected_turf.underlays += current_underlay
-
+ // Of note. Most of the cost in this proc is here, I think because color matrix'd underlays DO NOT cache well, which is what adding to underlays does
+ // We use underlays because objects on each tile would fuck with maptick. if that ever changes, use an object for this instead
+ affected_turf.underlays += current_underlay
affected_turf.set_luminosity(set_luminosity)
/datum/lighting_object/proc/removefromturf()
diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm
index a04cd6c6eb0..611a875104f 100644
--- a/code/modules/lighting/lighting_source.dm
+++ b/code/modules/lighting/lighting_source.dm
@@ -111,34 +111,51 @@
// As such this all gets counted as a single line.
// The braces and semicolons are there to be able to do this on a single line.
-// /tg/ falloff alg
-#define LUM_FALLOFF(C, T) (1 - CLAMP01(sqrt((C.x - T.x) ** 2 + (C.y - T.y) ** 2 + LIGHTING_HEIGHT) / max(1, light_range)))
+// This exists so we can cache the vars used in this macro, and save MASSIVE time :)
+// Most of this is saving off datum var accesses, tho some of it does actually cache computation
+// You will NEED to call this before you call APPLY_CORNER
+#define SETUP_CORNERS_CACHE(lighting_source) \
+ var/_turf_x = lighting_source.pixel_turf.x; \
+ var/_turf_y = lighting_source.pixel_turf.y; \
+ var/_range_divisor = max(1, lighting_source.light_range); \
+ var/_light_power = lighting_source.light_power; \
+ var/_applied_lum_r = lighting_source.applied_lum_r; \
+ var/_applied_lum_g = lighting_source.applied_lum_g; \
+ var/_applied_lum_b = lighting_source.applied_lum_b; \
+ var/_lum_r = lighting_source.lum_r; \
+ var/_lum_g = lighting_source.lum_g; \
+ var/_lum_b = lighting_source.lum_b; \
-// Bay/Polaris falloff alg
-//#define LUM_FALLOFF(C, T)(1 - CLAMP01(((C.x - T.x) ** 2 +(C.y - T.y) ** 2 + LIGHTING_HEIGHT) ** 0.6 / max(1, light_range)))
+#define SETUP_CORNERS_REMOVAL_CACHE(lighting_source) \
+ var/_applied_lum_r = lighting_source.applied_lum_r; \
+ var/_applied_lum_g = lighting_source.applied_lum_g; \
+ var/_applied_lum_b = lighting_source.applied_lum_b;
+
+#define LUM_FALLOFF(C) (1 - CLAMP01(sqrt((C.x - _turf_x) ** 2 + (C.y - _turf_y) ** 2 + LIGHTING_HEIGHT) / _range_divisor))
#define APPLY_CORNER(C) \
- . = LUM_FALLOFF(C, pixel_turf); \
- . *= light_power; \
+ . = LUM_FALLOFF(C); \
+ . *= _light_power; \
var/OLD = effect_str[C]; \
\
C.update_lumcount \
( \
- (. * lum_r) - (OLD * applied_lum_r), \
- (. * lum_g) - (OLD * applied_lum_g), \
- (. * lum_b) - (OLD * applied_lum_b) \
+ (. * _lum_r) - (OLD * _applied_lum_r), \
+ (. * _lum_g) - (OLD * _applied_lum_g), \
+ (. * _lum_b) - (OLD * _applied_lum_b) \
); \
#define REMOVE_CORNER(C) \
. = -effect_str[C]; \
C.update_lumcount \
( \
- . * applied_lum_r, \
- . * applied_lum_g, \
- . * applied_lum_b \
+ . * _applied_lum_r, \
+ . * _applied_lum_g, \
+ . * _applied_lum_b \
);
/datum/light_source/proc/remove_lum()
+ SETUP_CORNERS_REMOVAL_CACHE(src)
applied = FALSE
for (var/datum/lighting_corner/corner as anything in effect_str)
REMOVE_CORNER(corner)
@@ -147,6 +164,7 @@
effect_str = null
/datum/light_source/proc/recalc_corner(datum/lighting_corner/corner)
+ SETUP_CORNERS_CACHE(src)
LAZYINITLIST(effect_str)
if (effect_str[corner]) // Already have one.
REMOVE_CORNER(corner)
@@ -158,6 +176,22 @@
/datum/light_source/proc/get_turfs_in_range()
return view(CEILING(light_range, 1), source_turf)
+// Keep in mind. Lighting corners accept the bottom left (northwest) set of cords to them as input
+#define GENERATE_MISSING_CORNERS(gen_for) \
+ if (!gen_for.lighting_corner_NE) { \
+ gen_for.lighting_corner_NE = new /datum/lighting_corner(gen_for.x, gen_for.y, gen_for.z); \
+ } \
+ if (!gen_for.lighting_corner_SE) { \
+ gen_for.lighting_corner_SE = new /datum/lighting_corner(gen_for.x, gen_for.y - 1, gen_for.z); \
+ } \
+ if (!gen_for.lighting_corner_SW) { \
+ gen_for.lighting_corner_SW = new /datum/lighting_corner(gen_for.x - 1, gen_for.y - 1, gen_for.z); \
+ } \
+ if (!gen_for.lighting_corner_NW) { \
+ gen_for.lighting_corner_NW = new /datum/lighting_corner(gen_for.x - 1, gen_for.y, gen_for.z); \
+ } \
+ gen_for.lighting_corners_initialised = TRUE;
+
/datum/light_source/proc/update_corners()
var/update = FALSE
var/atom/source_atom = src.source_atom
@@ -220,24 +254,27 @@
return //nothing's changed
var/list/datum/lighting_corner/corners = list()
- var/list/turf/turfs = list()
if (source_turf)
var/oldlum = source_turf.luminosity
source_turf.luminosity = CEILING(light_range, 1)
for(var/turf/T in get_turfs_in_range())
- if(!IS_OPAQUE_TURF(T))
- if (!T.lighting_corners_initialised)
- T.generate_missing_corners()
- corners[T.lighting_corner_NE] = 0
- corners[T.lighting_corner_SE] = 0
- corners[T.lighting_corner_SW] = 0
- corners[T.lighting_corner_NW] = 0
- turfs += T
+ if(IS_OPAQUE_TURF(T))
+ continue
+ if (!T.lighting_corners_initialised)
+ GENERATE_MISSING_CORNERS(T)
+
+ corners[T.lighting_corner_NE] = 0
+ corners[T.lighting_corner_SE] = 0
+ corners[T.lighting_corner_SW] = 0
+ corners[T.lighting_corner_NW] = 0
source_turf.luminosity = oldlum
- var/list/datum/lighting_corner/new_corners = (corners - effect_str)
- LAZYINITLIST(effect_str)
+ SETUP_CORNERS_CACHE(src)
+
+ var/list/datum/lighting_corner/new_corners = (corners - src.effect_str)
+ LAZYINITLIST(src.effect_str)
+ var/list/effect_str = src.effect_str
if (needs_update == LIGHTING_VIS_UPDATE)
for (var/datum/lighting_corner/corner as anything in new_corners)
APPLY_CORNER(corner)
@@ -251,13 +288,15 @@
LAZYADD(corner.affecting, src)
effect_str[corner] = .
- for (var/datum/lighting_corner/corner as anything in corners - new_corners) // Existing corners
- APPLY_CORNER(corner)
- if (. != 0)
- effect_str[corner] = .
- else
- LAZYREMOVE(corner.affecting, src)
- effect_str -= corner
+ // New corners are a subset of corners. so if they're both the same length, there are NO old corners!
+ if(length(corners) != length(new_corners))
+ for (var/datum/lighting_corner/corner as anything in corners - new_corners) // Existing corners
+ APPLY_CORNER(corner)
+ if (. != 0)
+ effect_str[corner] = .
+ else
+ LAZYREMOVE(corner.affecting, src)
+ effect_str -= corner
var/list/datum/lighting_corner/gone_corners = effect_str - corners
for (var/datum/lighting_corner/corner as anything in gone_corners)
@@ -269,9 +308,12 @@
applied_lum_g = lum_g
applied_lum_b = lum_b
- UNSETEMPTY(effect_str)
+ UNSETEMPTY(src.effect_str)
#undef EFFECT_UPDATE
#undef LUM_FALLOFF
#undef REMOVE_CORNER
#undef APPLY_CORNER
+#undef SETUP_CORNERS_REMOVAL_CACHE
+#undef SETUP_CORNERS_CACHE
+#undef GENERATE_MISSING_CORNERS
diff --git a/code/modules/lighting/lighting_turf.dm b/code/modules/lighting/lighting_turf.dm
index 4ba09f11f23..dc5437c4cac 100644
--- a/code/modules/lighting/lighting_turf.dm
+++ b/code/modules/lighting/lighting_turf.dm
@@ -138,19 +138,3 @@
/turf/proc/has_dynamic_lighting()
var/area/A = loc
return (IS_DYNAMIC_LIGHTING(src) && IS_DYNAMIC_LIGHTING(A))
-
-/turf/proc/generate_missing_corners()
-
- if (!lighting_corner_NE)
- lighting_corner_NE = new/datum/lighting_corner(src, NORTH|EAST)
-
- if (!lighting_corner_SE)
- lighting_corner_SE = new/datum/lighting_corner(src, SOUTH|EAST)
-
- if (!lighting_corner_SW)
- lighting_corner_SW = new/datum/lighting_corner(src, SOUTH|WEST)
-
- if (!lighting_corner_NW)
- lighting_corner_NW = new/datum/lighting_corner(src, NORTH|WEST)
-
- lighting_corners_initialised = TRUE
diff --git a/code/modules/lore_codex/codex_tree.dm b/code/modules/lore_codex/codex_tree.dm
index c56fd02b038..c6c00643f8d 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 7b43a25d5fd..7a263baf740 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 ae87092212d..ddf3d4092cd 100644
--- a/code/modules/lore_codex/lore_data_vr/important_locations.dm
+++ b/code/modules/lore_codex/lore_data_vr/important_locations.dm
@@ -41,14 +41,14 @@
/datum/lore/codex/page/virgo_one/add_content()
name = "Virgo 1 (Hot-Ice Giant)"
keywords += list("Virgo 1")
- data = "Virgo 1 is a tidally locked hot ice giant located closest to the star. Temperatures soar and drop between 490°K and 120°K. Winds on the planet often surpass \
+ data = "Virgo 1 is a tidally locked hot ice giant located closest to the star. Temperatures soar and drop between 490°K and 120°K. Winds on the planet often surpass \
supersonic speeds."
/datum/lore/codex/page/virgo_two/add_content()
name = "Virgo 2 (Metal-Rich Planet)"
keywords += list("Virgo 2")
data = "The second closest planet to [quick_link("Virgo-Erigone")], this planet has a high concentration of minerals inside its crust, as well as active volcanism and plate tectonics. \
- The temperature on the surface can reach up to 405 degrees kelvin (132°C) due to the relatively high albedo of the surface, which has deterred most people from the planet, except for two [quick_link("TSC", "TSCs")], \
+ The temperature on the surface can reach up to 405 degrees kelvin (132°C) due to the relatively high albedo of the surface, which has deterred most people from the planet, except for two [quick_link("TSC", "TSCs")], \
Greyson Manufactories and [quick_link("Xion Manufacturing Group")]. In orbit, the two companies each have a space station, used to coordinate and \
control their stations on the surface without having to suffer the intense heat. Xion's station also doubles as a control and oversight facility for their \
[quick_link("drones","autonomous mining drones")].\
@@ -88,7 +88,7 @@
/datum/lore/codex/page/virgo_prime/add_content() // Virgo 4 technically.
name = "Virgo 4 / Virgo-Prime (Terrestrial Planet)"
keywords += list("Virgo 4","Virgo-Prime")
- data = "Virgo 4, also known as Virgo-Prime, is the fourth planet of Virgo-Eirgone. Although primarily desert, temperatures linger around only 287 kelvin (~14°C). \
+ data = "Virgo 4, also known as Virgo-Prime, is the fourth planet of Virgo-Eirgone. Although primarily desert, temperatures linger around only 287 kelvin (~14°C). \
It is the only planet in the system with an environment that supports oxygen-breathing lifeforms. \
\
While being about the size of Earth, it is home to only about 750,000 known residents, most of whom live \
@@ -103,7 +103,7 @@
/datum/lore/codex/page/virgo_five/add_content()
name = "Virgo 5 (Rocky Ice Planet)"
keywords += list("Virgo 5")
- data = "Virgo 5 is a cold, inhospitable wasteland contaminated with toxic phoron-based compounds. At temperatures around 213 kelvin (-60°C), \
+ data = "Virgo 5 is a cold, inhospitable wasteland contaminated with toxic phoron-based compounds. At temperatures around 213 kelvin (-60°C), \
it can support only the most hardy of phoron-based life, such as space carp, which are unaffected by the frigid temperatures or deadly \
atmosphere. Scientists believe this planet was once closer to its host star, but over time was pushed out beyond the habitable zone by \
other large planets."
@@ -112,14 +112,14 @@
name = "The Outer Worlds"
keywords += list("The Outer Worlds")
data = "The last three planets in the system are two small rocky worlds, Virgo 6 and 7, and finally Virgo 8 which is a frozen gas giant \
- whose temperatures reach only 49°K. The planet has several moons, but none of these worlds are of any significance. Virgo 6 and 7, as well \
+ whose temperatures reach only 49°K. The planet has several moons, but none of these worlds are of any significance. Virgo 6 and 7, as well \
as 8's moons have no substantial deposits of any useful minerals, nor do they have an abundance of phoron. They are left largely ignored by \
the local [quick_link("TSC", "TSCs")], though this also makes them a safe haven for various pirate and smuggler stations."
/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 \
@@ -140,4 +140,4 @@
largely unknown history.\
\
Today it houses a population of civilians, whom work to maintain the facility and support the local mining industry. Employees often commute to the \
- installation via an underground transit network that links the facility to a neighboring colony." // ToDo: Add link to CentCom colony.
\ No newline at end of file
+ installation via an underground transit network that links the facility to a neighboring colony." // ToDo: Add link to CentCom colony.
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 1a768ff9e0b..e13f8395d30 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 ea91d064f8c..8fe3e12ac74 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 3ae7d058557..f8aaca0276a 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 427290b31d7..4363cb55c14 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 bbac90c234b..c8918e8bc2a 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 edb36b9b867..3cf927a8255 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 be4d60570aa..070b45c7a3b 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 66b95973959..370d80a3443 100644
--- a/code/modules/mentor/mentor.dm
+++ b/code/modules/mentor/mentor.dm
@@ -36,11 +36,11 @@ var/list/mentor_verbs_default = list(
/client/proc/add_mentor_verbs()
if(mentorholder)
- verbs += mentor_verbs_default
+ add_verb(src, mentor_verbs_default)
/client/proc/remove_mentor_verbs()
if(mentorholder)
- verbs -= mentor_verbs_default
+ remove_verb(src, mentor_verbs_default)
/client/proc/make_mentor()
set category = "Special Verbs"
@@ -99,9 +99,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)
if(href_list["mhelp"])
diff --git a/code/modules/mentor/mentorhelp.dm b/code/modules/mentor/mentorhelp.dm
index 7bf6ef57db6..cbf457083ad 100644
--- a/code/modules/mentor/mentorhelp.dm
+++ b/code/modules/mentor/mentorhelp.dm
@@ -55,23 +55,28 @@ 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")
//Tickets statpanel
/datum/mentor_help_tickets/proc/stat_entry()
+ SHOULD_CALL_PARENT(TRUE)
+ SHOULD_NOT_SLEEP(TRUE)
+ var/list/L = list()
var/num_disconnected = 0
- stat("== Mentor Tickets ==")
- stat("Active Tickets:", astatclick.update("[active_tickets.len]"))
+ L[++L.len] = list("== Mentor Tickets ==", "", null, null)
+ L[++L.len] = list("Active Tickets:", "[astatclick.update("[active_tickets.len]")]", null, REF(astatclick))
+ astatclick.update("[active_tickets.len]")
for(var/datum/mentor_help/MH as anything in active_tickets)
if(MH.initiator)
- stat("#[MH.id]. [MH.initiator_ckey]:", MH.statclick.update())
+ L[++L.len] = list("#[MH.id]. [MH.initiator_ckey]:", "[MH.statclick.update()]", REF(MH))
else
++num_disconnected
if(num_disconnected)
- stat("Disconnected:", astatclick.update("[num_disconnected]"))
- stat("Resolved Tickets:", rstatclick.update("[resolved_tickets.len]"))
+ L[++L.len] = list("Disconnected:", "[astatclick.update("[num_disconnected]")]", null, REF(astatclick))
+ L[++L.len] = list("Resolved Tickets:", "[rstatclick.update("[resolved_tickets.len]")]", null, REF(rstatclick))
+ return L
//Reassociate still open ticket if one exists
/datum/mentor_help_tickets/proc/ClientLogin(client/C)
@@ -158,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
@@ -282,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]
"
@@ -439,9 +444,9 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new)
"Send to discord?", list("Admin-help!", "Still mentorhelp!", "Cancel"))
if(choice == "Admin-help!")
usr.client.adminhelp(msg)
- src.verbs -= /client/verb/mentorhelp
+ remove_verb(src, /client/verb/mentorhelp)
spawn(1200)
- src.verbs += /client/verb/mentorhelp // 2 minute cd to prevent abusing this to spam admins.
+ add_verb(src, /client/verb/mentorhelp) // 2 minute cd to prevent abusing this to spam admins.
return
else if(!choice || choice == "Cancel")
return
@@ -449,9 +454,9 @@ GLOBAL_DATUM_INIT(mhelp_tickets, /datum/mentor_help_tickets, new)
//remove out adminhelp verb temporarily to prevent spamming of admins.
- src.verbs -= /client/verb/mentorhelp
+ remove_verb(src, /client/verb/mentorhelp)
spawn(600)
- src.verbs += /client/verb/mentorhelp // 1 minute cool-down for mentorhelps
+ add_verb(src, /client/verb/mentorhelp) // 1 minute cool-down for mentorhelps
feedback_add_details("admin_verb","Mentorhelp") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
if(current_mentorhelp)
diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm
index 3b28e393239..99245eb39df 100644
--- a/code/modules/mining/drilling/drill.dm
+++ b/code/modules/mining/drilling/drill.dm
@@ -273,12 +273,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
@@ -356,7 +356,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 203f72861a6..85046260531 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 4fe6d9607b0..06ab146ec6b 100644
--- a/code/modules/mining/kinetic_crusher.dm
+++ b/code/modules/mining/kinetic_crusher.dm
@@ -27,8 +27,7 @@
sharp = TRUE
edge = TRUE
// sharpness = SHARP_EDGED
- action_button_name = "Toggle Light"
- // actions_types = list(/datum/action/item_action/toggle_light)
+ actions_types = list(/datum/action/item_action/toggle_light)
// var/list/trophies = list()
var/charged = TRUE
var/charge_time = 15
@@ -315,7 +314,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 +323,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)
@@ -350,7 +349,7 @@
var/obj/item/rig_module/gauntlets/storing_module
/obj/item/kinetic_crusher/machete/gauntlets/rig/dropped(mob/user)
- . = ..()
+ . = ..(user)
if(storing_module)
src.forceMove(storing_module)
storing_module.stored_gauntlets = src
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 37f70949675..25c3e3d30a7 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,5 +268,5 @@
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)
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index a427121551a..3bab28eae20 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -426,7 +426,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
@@ -436,7 +436,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 029a82c86c5..f6c0493170e 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 642dc22214c..7a7df3dcce9 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 7a5e1de53b4..17a8454204d 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 9a817a3b221..c87e4d2e852 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.
@@ -208,7 +208,7 @@ Works together with spawning an observer, noted above.
if(ghost.client)
ghost.client.time_died_as_mouse = ghost.timeofdeath
if(ghost.client && !ghost.client.holder && !config.antag_hud_allowed) // For new ghosts we remove the verb from even showing up if it's not allowed.
- ghost.verbs -= /mob/observer/dead/verb/toggle_antagHUD // Poor guys, don't know what they are missing!
+ remove_verb(ghost, /mob/observer/dead/verb/toggle_antagHUD) // Poor guys, don't know what they are missing!
return ghost
/*
@@ -249,13 +249,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/observer/dead/can_use_hands() return 0
/mob/observer/dead/is_active() return 0
-/mob/observer/dead/Stat()
- ..()
- if(statpanel("Status"))
- if(emergency_shuttle)
- var/eta_status = emergency_shuttle.get_status_panel_eta()
- if(eta_status)
- stat(null, eta_status)
+/mob/observer/dead/get_status_tab_items()
+ . = ..()
+ if(emergency_shuttle)
+ var/eta_status = emergency_shuttle.get_status_panel_eta()
+ if(eta_status)
+ . += ""
+ . += "[eta_status]"
/mob/observer/dead/verb/reenter_corpse()
set category = "Ghost"
@@ -302,7 +302,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
medHUD = !medHUD
plane_holder.set_vis(VIS_CH_HEALTH, medHUD)
plane_holder.set_vis(VIS_CH_STATUS_OOC, medHUD)
- to_chat(src, 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"
@@ -315,7 +315,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
plane_holder.set_vis(VIS_CH_IMPTRACK, secHUD)
plane_holder.set_vis(VIS_CH_IMPLOYAL, secHUD)
plane_holder.set_vis(VIS_CH_IMPCHEM, secHUD)
- to_chat(src, 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"
@@ -323,10 +323,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set desc = "Toggles AntagHUD allowing you to see who is the antagonist"
if(!config.antag_hud_allowed && !client.holder)
- to_chat(src, span_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.antag_hud_restricted && !has_enabled_antagHUD && !client.holder)
var/response = tgui_alert(src, "If you turn this on, you will not be able to take any part in the round.","Are you sure you want to turn this feature on?",list("Yes","No"))
@@ -338,7 +338,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
antagHUD = !antagHUD
plane_holder.set_vis(VIS_CH_SPECIAL, antagHUD)
- to_chat(src, 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()
@@ -599,11 +599,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()
@@ -623,7 +623,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
@@ -723,7 +723,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set desc = "If the round is sufficiently spooky, write a short message in blood on the floor or a wall. Remember, no IC in OOC or OOC in IC."
if(!(config.cult_ghostwriter))
- to_chat(src, span_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)
@@ -738,7 +738,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()
@@ -747,7 +747,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)
@@ -788,19 +788,19 @@ 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]...")))
/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
/mob/observer/dead/proc/manifest(mob/user)
is_manifest = TRUE
- verbs |= /mob/observer/dead/proc/toggle_visibility
- verbs |= /mob/observer/dead/proc/ghost_whisper
- to_chat(src, span_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.")]"))
+ 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 " + 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 af0b51e28a6..41e1c7824fb 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 4826fe06982..6f50d8bbdf3 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 5fc440faf0b..1ad8ceb73cd 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())
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/holder.dm b/code/modules/mob/holder.dm
index 7e59c103de8..7910d1594bb 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -32,6 +32,41 @@ var/list/holder_mob_icon_cache = list()
held.reset_view(src)
START_PROCESSING(SSobj, src)
+/mob/living/get_status_tab_items()
+ . = ..()
+ if(. && istype(loc, /obj/item/holder))
+ var/location = ""
+ var/obj/item/holder/H = loc
+ if(ishuman(H.loc))
+ var/mob/living/carbon/human/HH = H.loc
+ if(HH.l_hand == H)
+ location = "[HH]'s left hand"
+ else if(HH.r_hand == H)
+ location = "[HH]'s right hand"
+ else if(HH.r_store == H || HH.l_store == H)
+ location = "[HH]'s pocket"
+ else if(HH.head == H)
+ location = "[HH]'s head"
+ else if(HH.shoes == H)
+ location = "[HH]'s feet"
+ else
+ location = "[HH]"
+ else if(ismob(H.loc))
+ var/mob/living/M = H.loc
+ if(M.l_hand == H)
+ location = "[M]'s left hand"
+ else if(M.r_hand == H)
+ location = "[M]'s right hand"
+ else
+ location = "[M]"
+ else if(ismob(H.loc.loc))
+ location = "[H.loc.loc]'s [H.loc]"
+ else
+ location = "[H.loc]"
+ if (location != "")
+ . += ""
+ . += "Location: [location]"
+
/obj/item/holder/Entered(mob/held, atom/OldLoc)
if(held_mob)
held.forceMove(get_turf(src))
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 716ef2afaee..41defb12b33 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -208,12 +208,6 @@ var/list/slot_equipment_priority = list( \
/mob/proc/temporarilyRemoveItemFromInventory(obj/item/I, force = FALSE, idrop = TRUE)
return u_equip(I, force, null, TRUE, idrop)
-///sometimes we only want to grant the item's action if it's equipped in a specific slot.
-/obj/item/proc/item_action_slot_check(slot, mob/user)
- if(slot == SLOT_BACK || slot == LEGS) //these aren't true slots, so avoid granting actions there
- return FALSE
- return TRUE
-
///Get the item on the mob in the storage slot identified by the id passed in
/mob/proc/get_item_by_slot(slot_id)
return null
diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm
index ca21339f8e7..a295bea93a0 100644
--- a/code/modules/mob/language/language.dm
+++ b/code/modules/mob/language/language.dm
@@ -130,7 +130,7 @@
/datum/language/proc/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
log_say("(HIVE) [message]", speaker)
- speaker.verbs |= /mob/proc/adjust_hive_range
+ add_verb(speaker, /mob/proc/adjust_hive_range)
if(!speaker_mask) speaker_mask = speaker.real_name
message = "[get_spoken_verb(message)], \"[format_message(message, get_spoken_verb(message))]\""
@@ -154,7 +154,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)
@@ -162,9 +162,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
@@ -205,7 +205,7 @@
languages.Add(new_language)
//VOREStation Addition Start
if(new_language.flags & HIVEMIND)
- verbs |= /mob/proc/adjust_hive_range
+ add_verb(src, /mob/proc/adjust_hive_range)
//VOREStation Addition End
return 1
@@ -265,7 +265,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()
. = ""
@@ -277,11 +277,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 bdf8a05bc3a..73684681db6 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/bot.dm b/code/modules/mob/living/bot/bot.dm
index c8acdb6759c..41844ed5f8b 100644
--- a/code/modules/mob/living/bot/bot.dm
+++ b/code/modules/mob/living/bot/bot.dm
@@ -562,13 +562,13 @@
/mob/living/bot/Login()
no_vore = FALSE // ROBOT VORE
init_vore() // ROBOT VORE
- verbs |= /mob/proc/insidePanel
+ add_verb(src, /mob/proc/insidePanel)
return ..()
/mob/living/bot/Logout()
release_vore_contents()
- verbs -= /mob/proc/insidePanel
+ remove_verb(src, /mob/proc/insidePanel)
no_vore = TRUE
devourable = FALSE
feeding = FALSE
diff --git a/code/modules/mob/living/bot/edCLNbot.dm b/code/modules/mob/living/bot/edCLNbot.dm
index e2ce4b846f6..02e0150ed2c 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 2a97b3f08ba..95ef2818466 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 de25a334fbd..8220da54090 100644
--- a/code/modules/mob/living/bot/medbot.dm
+++ b/code/modules/mob/living/bot/medbot.dm
@@ -432,7 +432,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.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 1629913c76b..882ed514534 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -27,8 +27,8 @@
time_of_birth = world.time
- verbs += /mob/living/proc/ventcrawl
- verbs += /mob/living/proc/hide
+ add_verb(src, /mob/living/proc/ventcrawl)
+ add_verb(src, /mob/living/proc/hide)
instance_num = rand(1, 1000)
name = "[initial(name)] ([instance_num])"
@@ -66,4 +66,3 @@
else if(ending == "?")
verb = "hisses curiously"
return verb
-
diff --git a/code/modules/mob/living/carbon/alien/alien_attacks.dm b/code/modules/mob/living/carbon/alien/alien_attacks.dm
index 10858811064..174828d7ee8 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.dm b/code/modules/mob/living/carbon/alien/diona/diona.dm
index 9fa713936f2..434d02617b7 100644
--- a/code/modules/mob/living/carbon/alien/diona/diona.dm
+++ b/code/modules/mob/living/carbon/alien/diona/diona.dm
@@ -54,7 +54,7 @@ var/list/_nymph_default_emotes = list(
species = GLOB.all_species[SPECIES_DIONA]
add_language(LANGUAGE_ROOTGLOBAL)
add_language(LANGUAGE_GALCOM)
- verbs += /mob/living/carbon/alien/diona/proc/merge
+ add_verb(src, /mob/living/carbon/alien/diona/proc/merge)
/mob/living/carbon/alien/diona/put_in_hands(var/obj/item/W) // No hands.
W.loc = get_turf(src)
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 d50f9a48acf..d8376354f0d 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/diona/diona_powers.dm b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm
index 0f4b69501d4..492a590793b 100644
--- a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm
+++ b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm
@@ -9,7 +9,7 @@
return
if(istype(src.loc,/mob/living/carbon))
- src.verbs -= /mob/living/carbon/alien/diona/proc/merge
+ remove_verb(src, /mob/living/carbon/alien/diona/proc/merge)
return
var/list/choices = list()
@@ -35,8 +35,8 @@
to_chat(H, "You feel your being twine with that of \the [src] as it merges with your biomass.")
to_chat(src, "You feel your being twine with that of \the [H] as you merge with its biomass.")
loc = H
- verbs += /mob/living/carbon/alien/diona/proc/split
- verbs -= /mob/living/carbon/alien/diona/proc/merge
+ add_verb(src, /mob/living/carbon/alien/diona/proc/split)
+ remove_verb(src, /mob/living/carbon/alien/diona/proc/merge)
return 1
/mob/living/carbon/alien/diona/proc/split()
@@ -49,7 +49,7 @@
return
if(!(istype(src.loc,/mob/living/carbon)))
- src.verbs -= /mob/living/carbon/alien/diona/proc/split
+ remove_verb(src, /mob/living/carbon/alien/diona/proc/split)
return
to_chat(src.loc, "You feel a pang of loss as [src] splits away from your biomass.")
@@ -58,8 +58,8 @@
var/mob/living/M = src.loc
src.loc = get_turf(src)
- src.verbs -= /mob/living/carbon/alien/diona/proc/split
- src.verbs += /mob/living/carbon/alien/diona/proc/merge
+ remove_verb(src, /mob/living/carbon/alien/diona/proc/split)
+ add_verb(src, /mob/living/carbon/alien/diona/proc/merge)
if(istype(M))
for(var/atom/A in M.contents)
diff --git a/code/modules/mob/living/carbon/alien/diona/progression.dm b/code/modules/mob/living/carbon/alien/diona/progression.dm
index c8f9baaba6a..45a33d4ebb8 100644
--- a/code/modules/mob/living/carbon/alien/diona/progression.dm
+++ b/code/modules/mob/living/carbon/alien/diona/progression.dm
@@ -1,7 +1,8 @@
-/mob/living/carbon/alien/diona/Stat() //Specified where progression is at, doesn't work right for some things in carbon/alien
+/mob/living/carbon/alien/diona/get_status_tab_items() //Specified where progression is at, doesn't work right for some things in carbon/alien
. = ..()
- if(. && statpanel("Status"))
- stat("Growth", "[round(amount_grown)]/[max_grown]")
+ if(.)
+ . += ""
+ . += "Diona Growth: [round(amount_grown)]/[max_grown]"
/mob/living/carbon/alien/diona/confirm_evolution()
diff --git a/code/modules/mob/living/carbon/alien/larva/progression.dm b/code/modules/mob/living/carbon/alien/larva/progression.dm
index e671ac3aace..1f1f44a3e3b 100644
--- a/code/modules/mob/living/carbon/alien/larva/progression.dm
+++ b/code/modules/mob/living/carbon/alien/larva/progression.dm
@@ -1,15 +1,16 @@
-/mob/living/carbon/alien/larva/Stat() //Specified where progression stats come from, because for some reason it doesn't work right in carbon/alien
+/mob/living/carbon/alien/larva/get_status_tab_items() //Specified where progression stats come from, because for some reason it doesn't work right in carbon/alien
. = ..()
- if(. && statpanel("Status"))
- stat("Growth", "[round(amount_grown)]/[max_grown]")
+ if(.)
+ . += ""
+ . += "Larva Growth: [round(amount_grown)]/[max_grown]"
/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 alien queen.")
+ 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 alien queen."))
var/alien_caste = tgui_alert(src, "Please choose which alien caste you shall belong to.","Alien Choice",list("Hunter","Sentinel","Drone"))
return alien_caste ? "Xenomorph [alien_caste]" : null
diff --git a/code/modules/mob/living/carbon/alien/progression.dm b/code/modules/mob/living/carbon/alien/progression.dm
index 001c1111392..e59688646e8 100644
--- a/code/modules/mob/living/carbon/alien/progression.dm
+++ b/code/modules/mob/living/carbon/alien/progression.dm
@@ -8,7 +8,7 @@
return
if(!adult_form)
- verbs -= /mob/living/carbon/alien/verb/evolve
+ remove_verb(src, /mob/living/carbon/alien/verb/evolve)
return
if(handcuffed || legcuffed)
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index ae4d6c1a501..d0f4aef5754 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 5ea47dc4a0e..222e27437c1 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 c0aa2fb26e4..2949c387a2d 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -78,7 +78,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)
@@ -89,7 +89,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
@@ -106,7 +106,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!"))
@@ -243,9 +243,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()
@@ -455,7 +455,7 @@
throw_alert("handcuffed", /obj/screen/alert/restrained/handcuffed, new_master = handcuffed)
else
clear_alert("handcuffed")
- update_action_buttons() //some of our action buttons might be unusable when we're handcuffed.
+ update_action_buttons_icon() //some of our action buttons might be unusable when we're handcuffed.
update_inv_handcuffed()
// Clears blood overlays
diff --git a/code/modules/mob/living/carbon/carbon_powers.dm b/code/modules/mob/living/carbon/carbon_powers.dm
index 04b85db770b..f805968d40d 100644
--- a/code/modules/mob/living/carbon/carbon_powers.dm
+++ b/code/modules/mob/living/carbon/carbon_powers.dm
@@ -12,9 +12,9 @@
B.detatch()
- verbs -= /mob/living/carbon/proc/release_control
- verbs -= /mob/living/carbon/proc/punish_host
- verbs -= /mob/living/carbon/proc/spawn_larvae
+ remove_verb(src, /mob/living/carbon/proc/release_control)
+ remove_verb(src, /mob/living/carbon/proc/punish_host)
+ remove_verb(src, /mob/living/carbon/proc/spawn_larvae)
else
to_chat(src, span_danger("ERROR NO BORER OR BRAINMOB DETECTED IN THIS MOB, THIS IS A BUG !"))
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 038b5f6cf83..dd76b5dfec7 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -77,7 +77,7 @@
B.host_brain.name = "host brain"
B.host_brain.real_name = "host brain"
- verbs -= /mob/living/carbon/proc/release_control
+ remove_verb(src, /mob/living/carbon/proc/release_control)
callHook("death", list(src, gibbed))
@@ -85,7 +85,7 @@
// SSgame_master.adjust_danger(gibbed ? 40 : 20) // VOREStation Edit - We don't use SSgame_master yet.
for(var/mob/observer/dead/O in mob_list)
if(O.client?.prefs?.read_preference(/datum/preference/toggle/show_dsay))
- to_chat(O, 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)] "))
if(!gibbed && species.death_sound)
playsound(src, species.death_sound, 80, 1, 1)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 9bd963c8175..0d9d9d975ed 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -344,7 +344,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 7ca315f2409..73913ba2951 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)
@@ -290,7 +290,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)
@@ -329,9 +329,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
@@ -340,7 +340,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)
@@ -434,13 +434,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 b632dce0120..aa06a0cd179 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -66,7 +66,6 @@
dna.real_name = real_name
sync_organ_dna()
- //verbs |= /mob/living/proc/toggle_selfsurgery //VOREStation Removal
AddComponent(/datum/component/personal_crafting)
/mob/living/carbon/human/Destroy()
@@ -84,42 +83,76 @@
QDEL_NULL(vessel)
return ..()
-/mob/living/carbon/human/Stat()
- ..()
- if(statpanel("Status"))
- stat("Intent:", "[a_intent]")
- stat("Move Mode:", "[m_intent]")
- if(emergency_shuttle)
- var/eta_status = emergency_shuttle.get_status_panel_eta()
- if(eta_status)
- stat(null, eta_status)
+/mob/living/carbon/human/get_status_tab_items()
+ . = ..()
+ . += ""
+ . += "Intent: [a_intent]"
+ . += "Move Mode: [m_intent]"
+ if(emergency_shuttle)
+ var/eta_status = emergency_shuttle.get_status_panel_eta()
+ if(eta_status)
+ . += "[eta_status]"
- if (internal)
- if (!internal.air_contents)
- qdel(internal)
- else
- stat("Internal Atmosphere Info", internal.name)
- stat("Tank Pressure", internal.air_contents.return_pressure())
- stat("Distribution Pressure", internal.distribute_pressure)
+ if (internal)
+ if (!internal.air_contents)
+ qdel(internal)
+ else
+ . += "Internal Atmosphere Info: [internal.name]"
+ . += "Tank Pressure: [internal.air_contents.return_pressure()]"
+ . += "Distribution Pressure: [internal.distribute_pressure]"
- var/obj/item/organ/internal/xenos/plasmavessel/P = internal_organs_by_name[O_PLASMA] //Xenomorphs. Mech.
- if(P)
- stat(null, "Phoron Stored: [P.stored_plasma]/[P.max_plasma]")
+ var/obj/item/organ/internal/xenos/plasmavessel/P = internal_organs_by_name[O_PLASMA] //Xenomorphs. Mech.
+ if(P)
+ . += "Phoron Stored: [P.stored_plasma]/[P.max_plasma]"
- if(back && istype(back,/obj/item/rig))
- var/obj/item/rig/suit = back
- var/cell_status = "ERROR"
- if(suit.cell) cell_status = "[suit.cell.charge]/[suit.cell.maxcharge]"
- stat(null, "Suit charge: [cell_status]")
+ if(back && istype(back,/obj/item/rig))
+ var/obj/item/rig/suit = back
+ var/cell_status = "ERROR"
+ if(suit.cell) cell_status = "[suit.cell.charge]/[suit.cell.maxcharge]"
+ . += "Suit charge: [cell_status]"
+
+ if(mind)
+ if(mind.changeling)
+ . += "Chemical Storage: [mind.changeling.chem_charges]"
+ . += "Genetic Damage Time: [mind.changeling.geneticdamage]"
+ . += "Re-Adaptations: [mind.changeling.readapts]/[mind.changeling.max_readapts]"
- if(mind)
- if(mind.changeling)
- stat("Chemical Storage", mind.changeling.chem_charges)
- stat("Genetic Damage Time", mind.changeling.geneticdamage)
- stat("Re-Adaptations", "[mind.changeling.readapts]/[mind.changeling.max_readapts]")
if(species)
- species.Stat(src)
+ species.get_status_tab_items(src)
+
+/mob/proc/RigPanel(var/obj/item/rig/R)
+ if(R && !R.canremove && R.installed_modules.len)
+ var/list/L = list()
+ var/cell_status = R.cell ? "[R.cell.charge]/[R.cell.maxcharge]" : "ERROR"
+ L[++L.len] = list("Suit charge: [cell_status]", null, null, null, null)
+ for(var/obj/item/rig_module/module in R.installed_modules)
+ {
+ for(var/stat_rig_module/SRM in module.stat_modules)
+ if(SRM.CanUse())
+ L[++L.len] = list(SRM.module.interface_name,null,null,SRM.name,REF(SRM))
+ }
+ misc_tabs["Hardsuit Modules"] = L
+
+/mob/living/update_misc_tabs()
+ ..()
+ if(get_rig_stats)
+ var/obj/item/rig/rig = get_rig()
+ if(rig)
+ RigPanel(rig)
+
+/mob/living/carbon/human/update_misc_tabs()
+ ..()
+ if(species)
+ species.update_misc_tabs(src)
+
+ if(istype(back,/obj/item/rig))
+ var/obj/item/rig/R = back
+ RigPanel(R)
+
+ else if(istype(belt,/obj/item/rig))
+ var/obj/item/rig/R = belt
+ RigPanel(R)
/mob/living/carbon/human/ex_act(severity)
if(!blinded)
@@ -410,13 +443,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
@@ -529,14 +562,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
@@ -613,16 +646,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
@@ -847,7 +880,7 @@
return
if(!(mMorph in mutations))
- src.verbs -= /mob/living/carbon/human/proc/morph
+ remove_verb(src, /mob/living/carbon/human/proc/morph)
return
var/new_facial = input(usr, "Please select facial hair color.", "Character Generation",rgb(r_facial,g_facial,b_facial)) as color
@@ -922,7 +955,7 @@
return
if(!(mRemotetalk in src.mutations))
- src.verbs -= /mob/living/carbon/human/proc/remotesay
+ remove_verb(src, /mob/living/carbon/human/proc/remotesay)
return
var/list/creatures = list()
for(var/mob/living/carbon/h in mob_list)
@@ -939,7 +972,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"
@@ -953,7 +986,7 @@
if(!(mRemote in src.mutations))
remoteview_target = null
reset_view(0)
- src.verbs -= /mob/living/carbon/human/proc/remoteobserve
+ remove_verb(src, /mob/living/carbon/human/proc/remoteobserve)
return
if(client.eye != client.mob)
@@ -1088,7 +1121,7 @@
blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
hand_blood_color = blood_color
update_bloodied()
- verbs += /mob/living/carbon/human/proc/bloody_doodle
+ add_verb(src, /mob/living/carbon/human/proc/bloody_doodle)
return 1 //we applied blood to the item
/mob/living/carbon/human/proc/get_full_print()
@@ -1317,7 +1350,7 @@
return 0 //something is terribly wrong
if (!bloody_hands)
- verbs -= /mob/living/carbon/human/proc/bloody_doodle
+ remove_verb(src, /mob/living/carbon/human/proc/bloody_doodle)
if (src.gloves)
to_chat(src, span_warning("Your [src.gloves] are getting in the way."))
@@ -1682,7 +1715,7 @@
/mob/living/carbon/human/examine_icon()
var/icon/I = get_cached_examine_icon(src)
if(!I)
- I = getFlatIcon(src, defdir = SOUTH, no_anim = TRUE)
+ I = getFlatIcon(src, defdir = SOUTH, no_anim = TRUE, force_south = TRUE)
set_cached_examine_icon(src, I, 50 SECONDS)
return I
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 987c2d504e8..638febe0d53 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))
@@ -333,7 +333,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)
@@ -449,16 +449,16 @@
set category = "IC"
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 fa8c84c22cc..bbee7002ac7 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"
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")
@@ -60,4 +60,4 @@
claws/attack_name = "claws"
claws/strong/attack_name = "strong claws"
slime_glomp/attack_name = "glomp"
- bite/sharp/numbing/attack_name = "numbing bite"
\ No newline at end of file
+ bite/sharp/numbing/attack_name = "numbing bite"
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 2943d9b886f..3106dfd248d 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -443,7 +443,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
@@ -468,7 +468,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_modular_limbs.dm b/code/modules/mob/living/carbon/human/human_modular_limbs.dm
index c2ec8564233..7e1d4e1e40e 100644
--- a/code/modules/mob/living/carbon/human/human_modular_limbs.dm
+++ b/code/modules/mob/living/carbon/human/human_modular_limbs.dm
@@ -73,13 +73,13 @@
// Called in robotize(), replaced() and removed() to update our modular limb verbs.
/mob/living/carbon/human/proc/refresh_modular_limb_verbs()
if(length(get_modular_limbs(return_first_found = TRUE, validate_proc = /obj/item/organ/external/proc/can_attach_modular_limb_here)))
- verbs |= /mob/living/carbon/human/proc/attach_limb_verb
+ add_verb(src, /mob/living/carbon/human/proc/attach_limb_verb)
else
- verbs -= /mob/living/carbon/human/proc/attach_limb_verb
+ remove_verb(src, /mob/living/carbon/human/proc/attach_limb_verb)
if(length(get_modular_limbs(return_first_found = TRUE, validate_proc = /obj/item/organ/external/proc/can_remove_modular_limb)))
- verbs |= /mob/living/carbon/human/proc/detach_limb_verb
+ add_verb(src, /mob/living/carbon/human/proc/detach_limb_verb)
else
- verbs -= /mob/living/carbon/human/proc/detach_limb_verb
+ remove_verb(src, /mob/living/carbon/human/proc/detach_limb_verb)
// Proc helper for attachment verb.
/mob/living/carbon/human/proc/check_can_attach_modular_limb(var/obj/item/organ/external/E)
diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm
index 1391f47ca99..1d6746cfc07 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"
@@ -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"
@@ -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())
@@ -191,8 +191,8 @@
qdel(Org)
// Purge the diona verbs.
- verbs -= /mob/living/carbon/human/proc/diona_split_nymph
- verbs -= /mob/living/carbon/human/proc/regenerate
+ remove_verb(src, /mob/living/carbon/human/proc/diona_split_nymph)
+ remove_verb(src, /mob/living/carbon/human/proc/regenerate)
for(var/obj/item/organ/external/E in organs) // Just fall apart.
E.droplimb(TRUE)
@@ -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/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 92239e537b1..25ae7e3f50e 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -222,7 +222,6 @@ This saves us from having to call add_fingerprint() any time something is put in
else
return 0
- update_action_buttons()
return 1
@@ -369,9 +368,6 @@ This saves us from having to call add_fingerprint() any time something is put in
W.hud_layerise()
- if(W.action_button_name)
- update_action_buttons()
-
if(W.zoom)
W.zoom()
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 49fa407eb7b..056dbf7f034 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1237,7 +1237,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/hanner.dm b/code/modules/mob/living/carbon/human/species/lleill/hanner.dm
index f63369d232b..8b7e2b98f80 100644
--- a/code/modules/mob/living/carbon/human/species/lleill/hanner.dm
+++ b/code/modules/mob/living/carbon/human/species/lleill/hanner.dm
@@ -114,7 +114,7 @@
H.ability_master = new /obj/screen/movable/ability_master/lleill(H)
for(var/datum/power/lleill/P in lleill_ability_datums)
if(!(P.verbpath in H.verbs))
- H.verbs += P.verbpath
+ add_verb(H, P.verbpath)
H.ability_master.add_lleill_ability(
object_given = H,
verb_given = P.verbpath,
diff --git a/code/modules/mob/living/carbon/human/species/lleill/lleill.dm b/code/modules/mob/living/carbon/human/species/lleill/lleill.dm
index 4072e5af050..8c6e2065557 100644
--- a/code/modules/mob/living/carbon/human/species/lleill/lleill.dm
+++ b/code/modules/mob/living/carbon/human/species/lleill/lleill.dm
@@ -206,7 +206,7 @@
H.ability_master = new /obj/screen/movable/ability_master/lleill(H)
for(var/datum/power/lleill/P in lleill_ability_datums)
if(!(P.verbpath in H.verbs))
- H.verbs += P.verbpath
+ add_verb(H, P.verbpath)
H.ability_master.add_lleill_ability(
object_given = H,
verb_given = P.verbpath,
@@ -239,4 +239,3 @@
/datum/species/lleill/add_inherent_verbs(var/mob/living/carbon/human/H)
..()
add_lleill_abilities(H)
-
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 5e68449f251..d61512624ea 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")
@@ -476,8 +476,8 @@
new_mob.vore_organs = list()
new_mob.name = M.name
new_mob.real_name = M.real_name
- new_mob.verbs |= /mob/living/proc/revert_beast_form
- new_mob.verbs |= /mob/living/proc/set_size
+ add_verb(new_mob, /mob/living/proc/revert_beast_form)
+ add_verb(new_mob, /mob/living/proc/set_size)
for(var/lang in M.languages)
new_mob.languages |= lang
M.copy_vore_prefs_to_mob(new_mob)
@@ -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")
@@ -654,8 +654,8 @@
new_mob.vore_organs = list()
new_mob.name = M.name
new_mob.real_name = M.real_name
- new_mob.verbs |= /mob/living/proc/revert_beast_form
- new_mob.verbs |= /mob/living/proc/set_size
+ add_verb(new_mob, /mob/living/proc/revert_beast_form)
+ add_verb(new_mob, /mob/living/proc/set_size)
new_mob.hasthermals = 0
new_mob.health = M.health
new_mob.maxHealth = M.health
@@ -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 5121d8c842d..b36bad80e59 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)
@@ -61,7 +61,7 @@
/datum/reagent/glamour_scaling/affect_blood(var/mob/living/carbon/target, var/removed)
if(!(/mob/living/proc/set_size in target.verbs))
to_chat(target, span_warning("You feel as though you could change size at any moment."))
- target.verbs |= /mob/living/proc/set_size
+ add_verb(target, /mob/living/proc/set_size)
target.bloodstr.clear_reagents() //instantly clears reagents afterwards
target.ingested.clear_reagents()
target.touching.clear_reagents()
@@ -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/shadekin/shadekin.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm
index 032a76628d8..c1de18c498f 100644
--- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm
+++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm
@@ -144,7 +144,7 @@
H.ability_master = new /obj/screen/movable/ability_master/shadekin(H)
for(var/datum/power/shadekin/P in shadekin_ability_datums)
if(!(P.verbpath in H.verbs))
- H.verbs += P.verbpath
+ add_verb(H, P.verbpath)
H.ability_master.add_shadekin_ability(
object_given = H,
verb_given = P.verbpath,
@@ -341,4 +341,4 @@
new_copy.energy_dark = energy_dark
- return new_copy
\ No newline at end of file
+ return new_copy
diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm
index 696af416c4c..3d62d0d033f 100644
--- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm
+++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm
@@ -29,7 +29,7 @@
/mob/living/carbon/human/proc/phase_shift()
set name = "Phase Shift (100)"
set desc = "Shift yourself out of alignment with realspace to travel quickly to different areas."
- set category = "Shadekin"
+ set category = "Abilities.Shadekin"
var/ability_cost = 100
@@ -181,7 +181,7 @@
/mob/living/carbon/human/proc/regenerate_other()
set name = "Regenerate Other (50)"
set desc = "Spend energy to heal physical wounds in another creature."
- set category = "Shadekin"
+ set category = "Abilities.Shadekin"
var/ability_cost = 50
@@ -250,7 +250,7 @@
/mob/living/carbon/human/proc/create_shade()
set name = "Create Shade (25)"
set desc = "Create a field of darkness that follows you."
- set category = "Shadekin"
+ set category = "Abilities.Shadekin"
var/ability_cost = 25
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 296b9e386cc..72b4396d61a 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -458,13 +458,13 @@
/datum/species/proc/remove_inherent_verbs(var/mob/living/carbon/human/H)
if(inherent_verbs)
for(var/verb_path in inherent_verbs)
- H.verbs -= verb_path
+ remove_verb(H, verb_path)
return
/datum/species/proc/add_inherent_verbs(var/mob/living/carbon/human/H)
if(inherent_verbs)
for(var/verb_path in inherent_verbs)
- H.verbs |= verb_path
+ add_verb(H, verb_path)
return
/datum/species/proc/handle_post_spawn(var/mob/living/carbon/human/H) //Handles anything not already covered by basic species assignment.
@@ -556,8 +556,8 @@
return FALSE
// Allow species to display interesting information in the human stat panels
-/datum/species/proc/Stat(var/mob/living/carbon/human/H)
- return
+/datum/species/proc/get_status_tab_items(var/mob/living/carbon/human/H)
+ return ""
/datum/species/proc/handle_water_damage(var/mob/living/carbon/human/H, var/amount = 0)
amount *= 1 - H.get_water_protection()
@@ -576,7 +576,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
@@ -584,3 +584,6 @@
/datum/species/proc/post_spawn_special(mob/living/carbon/human/H)
return
+
+/datum/species/proc/update_misc_tabs(var/mob/living/carbon/human/H)
+ return
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 20b0c26a147..cac17137eb1 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 8f497f40c47..88074be3d4a 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/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm
index 2c2089e57b2..38fbfa66f0b 100644
--- a/code/modules/mob/living/carbon/human/species/station/alraune.dm
+++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm
@@ -393,8 +393,8 @@
var/selection = tgui_input_list(src, "Choose your character's fruit type. Choosing nothing will result in a default of apples.", "Fruit Type", acceptable_fruit_types)
if(selection)
fruit_gland.fruit_type = selection
- verbs |= /mob/living/carbon/human/proc/alraune_fruit_pick
- verbs -= /mob/living/carbon/human/proc/alraune_fruit_select
+ add_verb(src, /mob/living/carbon/human/proc/alraune_fruit_pick)
+ remove_verb(src, /mob/living/carbon/human/proc/alraune_fruit_select)
fruit_gland.organ_owner = src
fruit_gland.emote_descriptor = list("fruit right off of [fruit_gland.organ_owner]!", "a fruit from [fruit_gland.organ_owner]!")
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 1163aa41f67..371824d2099 100644
--- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm
+++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
@@ -175,7 +175,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 9bdf64f4f29..9f19887a667 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
@@ -42,15 +42,14 @@
/decl/emote/visible/floorspin
)
/mob/living/simple_mob/slime/promethean/Initialize(mapload, null)
- //verbs -= /mob/living/proc/ventcrawl
- verbs += /mob/living/simple_mob/slime/promethean/proc/prommie_blobform
- verbs += /mob/living/proc/set_size
- verbs += /mob/living/proc/hide
- verbs += /mob/living/simple_mob/proc/animal_nom
- verbs += /mob/living/proc/shred_limb
- verbs += /mob/living/simple_mob/slime/promethean/proc/toggle_expand
- verbs += /mob/living/simple_mob/slime/promethean/proc/prommie_select_colour
- verbs += /mob/living/simple_mob/slime/promethean/proc/toggle_shine
+ add_verb(src, /mob/living/simple_mob/slime/promethean/proc/prommie_blobform)
+ add_verb(src, /mob/living/proc/set_size)
+ add_verb(src, /mob/living/proc/hide)
+ add_verb(src, /mob/living/simple_mob/proc/animal_nom)
+ add_verb(src, /mob/living/proc/shred_limb)
+ add_verb(src, /mob/living/simple_mob/slime/promethean/proc/toggle_expand)
+ add_verb(src, /mob/living/simple_mob/slime/promethean/proc/prommie_select_colour)
+ add_verb(src, /mob/living/simple_mob/slime/promethean/proc/toggle_shine)
update_mood()
if(rad_glow)
rad_glow = CLAMP(rad_glow,0,250)
@@ -81,10 +80,10 @@
QDEL_NULL(stored_blob)
return ..()
-/mob/living/simple_mob/slime/promethean/Stat()
- ..()
+/mob/living/simple_mob/slime/promethean/update_misc_tabs()
+ . = ..()
if(humanform)
- humanform.species.Stat(humanform)
+ humanform.species.update_misc_tabs(src)
/mob/living/simple_mob/slime/promethean/handle_special() // Should disable default slime healing, we'll use nutrition based heals instead.
if(rad_glow)
@@ -264,11 +263,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()
@@ -284,11 +283,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()
@@ -409,14 +408,14 @@
new_hat.forceMove(src)
blob.update_icon()
- blob.verbs -= /mob/living/proc/ventcrawl // Absolutely not.
- blob.verbs -= /mob/living/simple_mob/proc/set_name // We already have a name.
+ remove_verb(blob, /mob/living/proc/ventcrawl) // Absolutely not.
+ remove_verb(blob, /mob/living/simple_mob/proc/set_name) // We already have a name.
temporary_form = blob
//Mail them to nullspace
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
@@ -449,7 +448,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 fb1b1366e41..40d366f7d55 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
@@ -63,8 +63,8 @@
humanform = H
updatehealth()
refactory = locate() in humanform.internal_organs
- verbs |= /mob/living/proc/ventcrawl
- verbs |= /mob/living/proc/hide
+ add_verb(src, /mob/living/proc/ventcrawl)
+ add_verb(src, /mob/living/proc/hide)
else
update_icon()
@@ -99,10 +99,10 @@
/mob/living/simple_mob/protean_blob/isSynthetic()
return TRUE // yup
-/mob/living/simple_mob/protean_blob/Stat()
- ..()
+/mob/living/simple_mob/protean_blob/update_misc_tabs()
+ . = ..()
if(humanform)
- humanform.species.Stat(humanform)
+ humanform.species.update_misc_tabs(src)
/mob/living/simple_mob/protean_blob/update_icon()
if(humanform)
@@ -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 ..()
@@ -323,10 +323,6 @@ var/global/list/disallowed_protean_accessories = list(
to_chat(src,span_warning("You can't change forms while inside something."))
return
- var/panel_was_up = FALSE
- if(client?.statpanel == "Protean")
- panel_was_up = TRUE
-
handle_grasp() //It's possible to blob out before some key parts of the life loop. This results in things getting dropped at null. TODO: Fix the code so this can be done better.
remove_micros(src, src) //Living things don't fare well in roblobs.
if(buckled)
@@ -389,7 +385,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)
@@ -405,9 +401,6 @@ var/global/list/disallowed_protean_accessories = list(
//We can still speak our languages!
blob.languages = languages.Copy()
- //Flip them to the protean panel
- if(panel_was_up)
- client?.statpanel = "Protean"
//Return our blob in case someone wants it
return blob
@@ -427,10 +420,6 @@ var/global/list/disallowed_protean_accessories = list(
to_chat(blob,span_warning("You can't change forms while inside something."))
return
- var/panel_was_up = FALSE
- if(client?.statpanel == "Protean")
- panel_was_up = TRUE
-
if(buckled)
buckled.unbuckle_mob()
if(LAZYLEN(buckled_mobs))
@@ -448,7 +437,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)
@@ -483,10 +472,6 @@ var/global/list/disallowed_protean_accessories = list(
//Get rid of friend blob
qdel(blob)
- //Flip them to the protean panel
- if(panel_was_up)
- client?.statpanel = "Protean"
-
//Return ourselves in case someone wants it
return src
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 397d5943ba4..b9043316123 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 d106ec4eb49..e582d2b4d7d 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..."
@@ -212,22 +212,32 @@
/datum/species/protean/get_additional_examine_text(var/mob/living/carbon/human/H)
return ..() //Hmm, what could be done here?
-/datum/species/protean/Stat(var/mob/living/carbon/human/H)
+/datum/species/protean/update_misc_tabs(var/mob/living/carbon/human/H)
..()
- if(statpanel("Protean"))
- var/obj/item/organ/internal/nano/refactory/refactory = H.nano_get_refactory()
- if(refactory && !(refactory.status & ORGAN_DEAD))
- stat(null, "- -- --- Refactory Metal Storage --- -- -")
- var/max = refactory.max_storage
- for(var/material in refactory.materials)
- var/amount = refactory.get_stored_material(material)
- stat("[capitalize(material)]", "[amount]/[max]")
- else
- stat(null, "- -- --- REFACTORY ERROR! --- -- -")
+ var/list/L = list()
+ var/obj/item/organ/internal/nano/refactory/refactory = H.nano_get_refactory()
+ if(refactory && !(refactory.status & ORGAN_DEAD))
+ L[++L.len] = list("- -- --- Refactory Metal Storage --- -- -", null, null, null, null)
+ var/max = refactory.max_storage
+ for(var/material in refactory.materials)
+ var/amount = refactory.get_stored_material(material)
+ L[++L.len] = list("[capitalize(material)]: [amount]/[max]", null, null, null, null)
+ else
+ L[++L.len] = list("- -- --- REFACTORY ERROR! --- -- -", null, null, null, null)
- stat(null, "- -- --- Abilities (Shift+LMB Examines) --- -- -")
- for(var/obj/effect/protean_ability/A as anything in abilities)
- stat("[A.ability_name]",A.atom_button_text())
+ L[++L.len] = list("- -- --- Abilities (Shift+LMB Examines) --- -- -", null, null, null, null)
+ for(var/obj/effect/protean_ability/A as anything in abilities)
+ var/client/C = H.client
+ var/img
+ if(C && istype(C)) //sanity checks
+ if(A.ability_name in C.misc_cache)
+ img = C.misc_cache[A.ability_name]
+ else
+ img = icon2html(A,C,sourceonly=TRUE)
+ C.misc_cache[A.ability_name] = img
+
+ L[++L.len] = list("[A.ability_name]", A.ability_name, img, A.atom_button_text(), REF(A))
+ H.misc_tabs["Protean"] = L
// Various modifiers
/datum/modifier/protean
diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm
index fda555edd8e..c2d52b273b9 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -633,8 +633,8 @@
qdel(Org)
// Purge the diona verbs.
- H.verbs -= /mob/living/carbon/human/proc/diona_split_nymph
- H.verbs -= /mob/living/carbon/human/proc/regenerate
+ remove_verb(H, /mob/living/carbon/human/proc/diona_split_nymph)
+ remove_verb(H, /mob/living/carbon/human/proc/regenerate)
return
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 4c7b12a130e..9bca0bcfc7a 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
@@ -57,7 +57,7 @@
// Was dead, still dead.
else
to_chat(src, span_notice("Consciousness begins to stir as your new body awakens, ready to hatch."))
- verbs |= /mob/living/carbon/human/proc/hatch
+ add_verb(src, /mob/living/carbon/human/proc/hatch)
revive_ready = REVIVING_DONE
src << sound('sound/effects/mob_effects/xenochimera/hatch_notification.ogg',0,0,0,30)
clear_alert("regen")
@@ -79,7 +79,7 @@
to_chat(src, span_notice("Consciousness begins to stir as your new body awakens, ready to hatch.."))
else
to_chat(src, span_warning("Consciousness begins to stir as your battered body struggles to recover from its ordeal.."))
- verbs |= /mob/living/carbon/human/proc/hatch
+ add_verb(src, /mob/living/carbon/human/proc/hatch)
revive_ready = REVIVING_DONE
src << sound('sound/effects/mob_effects/xenochimera/hatch_notification.ogg',0,0,0,30)
clear_alert("regen")
@@ -110,7 +110,7 @@
if(revive_ready != REVIVING_DONE)
//Hwhat?
- verbs -= /mob/living/carbon/human/proc/hatch
+ remove_verb(src, /mob/living/carbon/human/proc/hatch)
return
var/confirm = tgui_alert(usr, "Are you sure you want to hatch right now? This will be very obvious to anyone in view.", "Confirm Regeneration", list("Yes", "No"))
@@ -138,7 +138,7 @@
clear_alert("hatch")
/mob/living/carbon/human/proc/chimera_hatch()
- verbs -= /mob/living/carbon/human/proc/hatch
+ remove_verb(src, /mob/living/carbon/human/proc/hatch)
to_chat(src, span_notice("Your new body awakens, bursting free from your old skin."))
//Modify and record values (half nutrition and braindamage)
var/old_nutrition = nutrition
@@ -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)
@@ -1657,7 +1657,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!"
@@ -1677,5 +1677,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 15bed54a38c..9a7f71c86e0 100644
--- a/code/modules/mob/living/carbon/human/species/station/teshari.dm
+++ b/code/modules/mob/living/carbon/human/species/station/teshari.dm
@@ -210,7 +210,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/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
index d2257ee6699..441fddafa08 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
@@ -108,7 +108,7 @@
/datum/trait/neutral/bloodsucker/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/bloodsuck
+ add_verb(H, /mob/living/carbon/human/proc/bloodsuck)
/datum/trait/neutral/bloodsucker_freeform
name = "Bloodsucker"
@@ -129,7 +129,7 @@
/datum/trait/neutral/bloodsucker_freeform/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/bloodsuck
+ add_verb(H, /mob/living/carbon/human/proc/bloodsuck)
/datum/trait/neutral/succubus_drain
name = "Succubus Drain"
@@ -139,9 +139,9 @@
/datum/trait/neutral/succubus_drain/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/succubus_drain
- H.verbs |= /mob/living/carbon/human/proc/succubus_drain_finalize
- H.verbs |= /mob/living/carbon/human/proc/succubus_drain_lethal
+ add_verb(H, /mob/living/carbon/human/proc/succubus_drain)
+ add_verb(H, /mob/living/carbon/human/proc/succubus_drain_finalize)
+ add_verb(H, /mob/living/carbon/human/proc/succubus_drain_lethal)
/datum/trait/neutral/venom_bite
name = "Venomous Injection"
@@ -169,7 +169,7 @@
/datum/trait/neutral/venom_bite/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/proc/injection
+ add_verb(H, /mob/living/proc/injection)
H.trait_injection_reagents += "microcillin" // get small
H.trait_injection_reagents += "macrocillin" // get BIG
H.trait_injection_reagents += "normalcillin" // normal
@@ -201,7 +201,7 @@
/datum/trait/neutral/long_vore/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/proc/long_vore
+ add_verb(H, /mob/living/proc/long_vore)
/datum/trait/neutral/feeder
name = "Feeder"
@@ -211,7 +211,7 @@
/datum/trait/neutral/feeder/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/slime_feed
+ add_verb(H, /mob/living/carbon/human/proc/slime_feed)
/datum/trait/neutral/stuffing_feeder
name = "Food Stuffer"
@@ -222,7 +222,7 @@
/datum/trait/neutral/stuffing_feeder/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/proc/toggle_stuffing_mode
+ add_verb(H, /mob/living/proc/toggle_stuffing_mode)
/datum/trait/neutral/hard_vore
name = "Brutal Predation"
@@ -232,7 +232,7 @@
/datum/trait/neutral/hard_vore/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/proc/shred_limb
+ add_verb(H, /mob/living/proc/shred_limb)
/datum/trait/neutral/trashcan
name = "Trash Can"
@@ -243,8 +243,8 @@
/datum/trait/neutral/trashcan/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/proc/eat_trash
- H.verbs |= /mob/living/proc/toggle_trash_catching //Ported from chompstation
+ add_verb(H, /mob/living/proc/eat_trash)
+ add_verb(H, /mob/living/proc/toggle_trash_catching) //Ported from chompstation
/datum/trait/neutral/gem_eater
name = "Expensive Taste"
@@ -255,7 +255,7 @@
/datum/trait/neutral/gem_eater/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/proc/eat_minerals
+ add_verb(H, /mob/living/proc/eat_minerals)
/datum/trait/neutral/synth_chemfurnace
name = "Biofuel Processor"
@@ -292,7 +292,7 @@
/datum/trait/neutral/glowing_eyes/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/toggle_eye_glow
+ add_verb(H, /mob/living/carbon/human/proc/toggle_eye_glow)
/datum/trait/neutral/glowing_body
name = "Glowing Body"
@@ -304,8 +304,8 @@
/datum/trait/neutral/glowing_body/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/proc/glow_toggle
- H.verbs |= /mob/living/proc/glow_color
+ add_verb(H, /mob/living/proc/glow_toggle)
+ add_verb(H, /mob/living/proc/glow_color)
//Allergen traits! Not available to any species with a base allergens var.
/datum/trait/neutral/allergy
@@ -733,7 +733,7 @@
/datum/trait/neutral/dominate_predator/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/proc/dominate_predator
+ add_verb(H, /mob/proc/dominate_predator)
/datum/trait/neutral/dominate_prey
name = "Dominate Prey"
@@ -743,7 +743,7 @@
/datum/trait/neutral/dominate_prey/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/proc/dominate_prey
+ add_verb(H, /mob/living/proc/dominate_prey)
/datum/trait/neutral/submit_to_prey
name = "Submit To Prey"
@@ -753,7 +753,7 @@
/datum/trait/neutral/submit_to_prey/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/proc/lend_prey_control
+ add_verb(H, /mob/living/proc/lend_prey_control)
/datum/trait/neutral/vertical_nom
name = "Vertical Nom"
@@ -763,7 +763,7 @@
/datum/trait/neutral/vertical_nom/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/proc/vertical_nom
+ add_verb(H, /mob/living/proc/vertical_nom)
/datum/trait/neutral/micro_size_down
name = "Light Frame"
@@ -859,7 +859,7 @@
/datum/trait/neutral/synth_cosmetic_pain/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/trait_prefs = null)
..()
- H.verbs |= /mob/living/carbon/human/proc/toggle_pain_module
+ add_verb(H, /mob/living/carbon/human/proc/toggle_pain_module)
//Food preferences ported from RogueStar
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
index 72b3f49626c..7551915c9dc 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
@@ -125,9 +125,9 @@
/datum/trait/positive/winged_flight/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/proc/flying_toggle
- H.verbs |= /mob/living/proc/flying_vore_toggle
- H.verbs |= /mob/living/proc/start_wings_hovering
+ add_verb(H, /mob/living/proc/flying_toggle)
+ add_verb(H, /mob/living/proc/flying_vore_toggle)
+ add_verb(H, /mob/living/proc/start_wings_hovering)
/datum/trait/positive/soft_landing
name = "Soft Landing"
@@ -151,7 +151,7 @@
/datum/trait/positive/antiseptic_saliva/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/lick_wounds
+ add_verb(H, /mob/living/carbon/human/proc/lick_wounds)
/datum/trait/positive/traceur
name = "Traceur"
@@ -179,11 +179,11 @@
/datum/trait/positive/weaver/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/check_silk_amount
- H.verbs |= /mob/living/carbon/human/proc/toggle_silk_production
- H.verbs |= /mob/living/carbon/human/proc/weave_structure
- H.verbs |= /mob/living/carbon/human/proc/weave_item
- H.verbs |= /mob/living/carbon/human/proc/set_silk_color
+ add_verb(H, /mob/living/carbon/human/proc/check_silk_amount)
+ add_verb(H, /mob/living/carbon/human/proc/toggle_silk_production)
+ add_verb(H, /mob/living/carbon/human/proc/weave_structure)
+ add_verb(H, /mob/living/carbon/human/proc/weave_item)
+ add_verb(H, /mob/living/carbon/human/proc/set_silk_color)
/datum/trait/positive/aquatic
name = "Aquatic"
@@ -195,8 +195,8 @@
/datum/trait/positive/aquatic/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/water_stealth
- H.verbs |= /mob/living/carbon/human/proc/underwater_devour
+ add_verb(H, /mob/living/carbon/human/proc/water_stealth)
+ add_verb(H, /mob/living/carbon/human/proc/underwater_devour)
/datum/trait/positive/cocoon_tf
name = "Cocoon Spinner"
@@ -207,7 +207,7 @@
/datum/trait/positive/cocoon_tf/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..()
- H.verbs |= /mob/living/carbon/human/proc/enter_cocoon
+ add_verb(H, /mob/living/carbon/human/proc/enter_cocoon)
/datum/trait/positive/linguist
name = "Linguist"
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm
index 6239f894282..d47eda0a34e 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm
@@ -33,7 +33,7 @@
S.vars[trait] = trait_prefs[trait]
if(TRAIT_VAREDIT_TARGET_MOB)
H.vars[trait] = trait_prefs[trait]
- H.verbs |= /mob/living/carbon/human/proc/trait_tutorial
+ add_verb(H, /mob/living/carbon/human/proc/trait_tutorial)
return
//Applying trait to preferences rather than just us.
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 b8dd9b12391..6da754903d1 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 e209bca826d..14d85dffd2d 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 ee8b5f7edf3..3d549233c49 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)
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 9f87c39208e..10f21ec169c 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
@@ -85,7 +85,7 @@
if(!config.aliens_allowed)
to_chat(src, "You begin to lay an egg, but hesitate. You suspect it isn't allowed.")
- verbs -= /mob/living/carbon/human/proc/lay_egg
+ remove_verb(src, /mob/living/carbon/human/proc/lay_egg)
return
if(locate(/obj/structure/ghost_pod/automatic/xenomorph_egg) in get_turf(src))
@@ -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"
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"
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/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 912cef600ba..a592afd1c2e 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -1387,8 +1387,8 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
working.pixel_y = tail_style.offset_y
if(taurtype.can_ride && !riding_datum)
riding_datum = new /datum/riding/taur(src)
- verbs |= /mob/living/carbon/human/proc/taur_mount
- verbs |= /mob/living/proc/toggle_rider_reins
+ add_verb(src, /mob/living/carbon/human/proc/taur_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
else if(islongtail(tail_style))
working.pixel_x = tail_style.offset_x
working.pixel_y = tail_style.offset_y
diff --git a/code/modules/mob/living/carbon/lick_wounds.dm b/code/modules/mob/living/carbon/lick_wounds.dm
index 7b757778aee..880e7358b94 100644
--- a/code/modules/mob/living/carbon/lick_wounds.dm
+++ b/code/modules/mob/living/carbon/lick_wounds.dm
@@ -59,7 +59,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)
@@ -76,11 +76,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/death.dm b/code/modules/mob/living/death.dm
index a5e5fece268..224cdfa1d6a 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -1,5 +1,6 @@
/mob/living/death(gibbed)
clear_fullscreens()
+ update_action_buttons_icon()
if(ai_holder)
ai_holder.go_sleep()
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 421c3351ac5..a15b0e115ea 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -75,8 +75,6 @@
handle_disabilities() // eye, ear, brain damages
handle_statuses() //all special effects, stunned, weakened, jitteryness, hallucination, sleeping, etc
- handle_actions()
-
update_canmove()
handle_regular_hud_updates()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 89b1e22f762..7564d37ae38 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -99,7 +99,7 @@
if(!..())
return 0
- usr.visible_message(span_filter_notice("[src] points to [A]."))
+ usr.visible_message(span_filter_notice(span_bold("[src]") + " points to [A]."))
return 1
/mob/living/verb/succumb()
@@ -1160,7 +1160,7 @@
var/mob/living/carbon/human/H = target
if(H.in_throw_mode && H.a_intent == I_HELP && unEquip(I))
H.put_in_hands(I) // If this fails it will just end up on the floor, but that's fitting for things like dionaea.
- visible_message(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_defense.dm b/code/modules/mob/living/living_defense.dm
index aa34f5669d1..c46b4c88262 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -365,7 +365,7 @@
/mob/living/proc/embed(var/obj/O, var/def_zone=null)
O.loc = src
src.embedded += O
- src.verbs += /mob/proc/yank_out_object
+ add_verb(src, /mob/proc/yank_out_object)
throw_alert("embeddedobject", /obj/screen/alert/embeddedobject)
//This is called when the mob is thrown into a dense turf
@@ -524,75 +524,6 @@
/mob/living/proc/reagent_permeability()
return 1
-/mob/living/proc/handle_actions()
- //Pretty bad, i'd use picked/dropped instead but the parent calls in these are nonexistent
- for(var/datum/action/A in actions)
- if(A.CheckRemoval(src))
- A.Remove(src)
- for(var/obj/item/I in src)
- if(I.action_button_name)
- if(!I.action)
- if(I.action_button_is_hands_free)
- I.action = new/datum/action/item_action/hands_free
- else
- I.action = new/datum/action/item_action
- I.action.name = I.action_button_name
- I.action.target = I
- I.action.Grant(src)
- return
-
-/mob/living/update_action_buttons()
- if(!hud_used) return
- if(!client) return
-
- if(hud_used.hud_shown != 1) //Hud toggled to minimal
- return
-
- client.screen -= hud_used.hide_actions_toggle
- for(var/datum/action/A in actions)
- if(A.button)
- client.screen -= A.button
-
- if(hud_used.action_buttons_hidden)
- if(!hud_used.hide_actions_toggle)
- hud_used.hide_actions_toggle = new(hud_used)
- hud_used.hide_actions_toggle.UpdateIcon()
-
- if(!hud_used.hide_actions_toggle.moved)
- hud_used.hide_actions_toggle.screen_loc = hud_used.ButtonNumberToScreenCoords(1)
- //hud_used.SetButtonCoords(hud_used.hide_actions_toggle,1)
-
- client.screen += hud_used.hide_actions_toggle
- return
-
- var/button_number = 0
- for(var/datum/action/A in actions)
- button_number++
- if(A.button == null)
- var/obj/screen/movable/action_button/N = new(hud_used)
- N.owner = A
- A.button = N
-
- var/obj/screen/movable/action_button/B = A.button
-
- B.UpdateIcon()
-
- B.name = A.UpdateName()
-
- client.screen += B
-
- if(!B.moved)
- B.screen_loc = hud_used.ButtonNumberToScreenCoords(button_number)
- //hud_used.SetButtonCoords(B,button_number)
-
- if(button_number > 0)
- if(!hud_used.hide_actions_toggle)
- hud_used.hide_actions_toggle = new(hud_used)
- hud_used.hide_actions_toggle.InitialiseIcon(src)
- if(!hud_used.hide_actions_toggle.moved)
- hud_used.hide_actions_toggle.screen_loc = hud_used.ButtonNumberToScreenCoords(button_number+1)
- //hud_used.SetButtonCoords(hud_used.hide_actions_toggle,button_number+1)
- client.screen += hud_used.hide_actions_toggle
// Returns a number to determine if something is harder or easier to hit than normal.
/mob/living/proc/get_evasion()
diff --git a/code/modules/mob/living/living_vr.dm b/code/modules/mob/living/living_vr.dm
index 4afe66b0d02..82850fea56e 100644
--- a/code/modules/mob/living/living_vr.dm
+++ b/code/modules/mob/living/living_vr.dm
@@ -107,11 +107,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/login.dm b/code/modules/mob/living/login.dm
index cd2672f97d0..94819c56c9b 100644
--- a/code/modules/mob/living/login.dm
+++ b/code/modules/mob/living/login.dm
@@ -15,14 +15,14 @@
AddComponent(/datum/component/character_setup)
// Vore stuff
- verbs |= /mob/living/proc/escapeOOC
- verbs |= /mob/living/proc/lick
- verbs |= /mob/living/proc/smell
- verbs |= /mob/living/proc/switch_scaling
- verbs |= /mob/living/proc/center_offset
+ add_verb(src, /mob/living/proc/escapeOOC)
+ add_verb(src, /mob/living/proc/lick)
+ add_verb(src, /mob/living/proc/smell)
+ add_verb(src, /mob/living/proc/switch_scaling)
+ add_verb(src, /mob/living/proc/center_offset)
if(!no_vore)
- verbs |= /mob/living/proc/vorebelly_printout
+ add_verb(src, /mob/living/proc/vorebelly_printout)
if(!vorePanel)
AddComponent(/datum/component/vore_panel)
//VOREStation Add Start
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 47bae9304a4..19c7f4bab62 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -99,12 +99,12 @@ var/list/ai_verbs_default = list(
can_be_antagged = TRUE
/mob/living/silicon/ai/proc/add_ai_verbs()
- src.verbs |= ai_verbs_default
- src.verbs |= silicon_subsystems
+ add_verb(src, ai_verbs_default)
+ add_verb(src, silicon_subsystems)
/mob/living/silicon/ai/proc/remove_ai_verbs()
- src.verbs -= ai_verbs_default
- src.verbs -= silicon_subsystems
+ remove_verb(src, ai_verbs_default)
+ remove_verb(src, silicon_subsystems)
/mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/mmi/B, var/safety = 0)
announcement = new()
@@ -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, "
")]"))
@@ -218,7 +218,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()
@@ -238,26 +238,27 @@ var/list/ai_verbs_default = list(
return ..()
-/mob/living/silicon/ai/Stat()
- ..()
- if(statpanel("Status"))
- if(!stat) // Make sure we're not unconscious/dead.
- stat(null, text("System integrity: [(health+100)/2]%"))
- stat(null, text("Connected synthetics: [connected_robots.len]"))
- for(var/mob/living/silicon/robot/R in connected_robots)
- var/robot_status = "Nominal"
- if(R.shell)
- robot_status = "AI SHELL"
- else if(R.stat || !R.client)
- robot_status = "OFFLINE"
- else if(!R.cell || R.cell.charge <= 0)
- robot_status = "DEPOWERED"
- //Name, Health, Battery, Module, Area, and Status! Everything an AI wants to know about its borgies!
- stat(null, text("[R.name] | S.Integrity: [R.health]% | Cell: [R.cell ? "[R.cell.charge]/[R.cell.maxcharge]" : "Empty"] | \
- Module: [R.modtype] | Loc: [get_area_name(R, TRUE)] | Status: [robot_status]"))
- stat(null, text("AI shell beacons detected: [LAZYLEN(GLOB.available_ai_shells)]")) //Count of total AI shells
- else
- stat(null, text("Systems nonfunctional"))
+
+/mob/living/silicon/ai/get_status_tab_items()
+ . = ..()
+ . += ""
+ if(!stat) // Make sure we're not unconscious/dead.
+ . += "System integrity: [(health+100)/2]%"
+ . += "Connected synthetics: [connected_robots.len]"
+ for(var/mob/living/silicon/robot/R in connected_robots)
+ var/robot_status = "Nominal"
+ if(R.shell)
+ robot_status = "AI SHELL"
+ else if(R.stat || !R.client)
+ robot_status = "OFFLINE"
+ else if(!R.cell || R.cell.charge <= 0)
+ robot_status = "DEPOWERED"
+ //Name, Health, Battery, Module, Area, and Status! Everything an AI wants to know about its borgies!
+ . += "[R.name] | S.Integrity: [R.health]% | Cell: [R.cell ? "[R.cell.charge]/[R.cell.maxcharge]" : "Empty"] | \
+ Module: [R.modtype] | Loc: [get_area_name(R, TRUE)] | Status: [robot_status]"
+ . += "AI shell beacons detected: [LAZYLEN(GLOB.available_ai_shells)]" //Count of total AI shells
+ else
+ . += "Systems nonfunctional"
/mob/living/silicon/ai/proc/setup_icon()
@@ -987,7 +988,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/ai_remote_control.dm b/code/modules/mob/living/silicon/ai/ai_remote_control.dm
index 53d1a3de354..adb410ab45f 100644
--- a/code/modules/mob/living/silicon/ai/ai_remote_control.dm
+++ b/code/modules/mob/living/silicon/ai/ai_remote_control.dm
@@ -3,7 +3,7 @@
/mob/living/silicon/ai/Initialize()
if(config.allow_ai_shells)
- verbs += /mob/living/silicon/ai/proc/deploy_to_shell_act
+ add_verb(src, /mob/living/silicon/ai/proc/deploy_to_shell_act)
return ..()
/mob/living/silicon/ai/proc/deploy_to_shell(var/mob/living/silicon/robot/target)
diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm
index 75224de7dd6..91f55424d8d 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 f0f45fff58d..ad051cddff6 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 cd95a18b6bf..349579a7fda 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/malf.dm b/code/modules/mob/living/silicon/ai/malf.dm
index a6034d649cb..6727a983fae 100644
--- a/code/modules/mob/living/silicon/ai/malf.dm
+++ b/code/modules/mob/living/silicon/ai/malf.dm
@@ -10,9 +10,9 @@
hacked_apcs = list()
recalc_cpu()
- verbs += new/datum/game_mode/malfunction/verb/ai_select_hardware()
- verbs += new/datum/game_mode/malfunction/verb/ai_select_research()
- verbs += new/datum/game_mode/malfunction/verb/ai_help()
+ add_verb(src, new/datum/game_mode/malfunction/verb/ai_select_hardware())
+ add_verb(src, new/datum/game_mode/malfunction/verb/ai_select_research())
+ add_verb(src, new/datum/game_mode/malfunction/verb/ai_help())
// And greet user with some OOC info.
to_chat(user, "You are malfunctioning, you do not have to follow any laws.")
@@ -109,29 +109,31 @@
// Shows capacitor charge and hardware integrity information to the AI in Status tab.
/mob/living/silicon/ai/show_system_integrity()
+ . = ""
if(!src.stat)
- stat(null, text("Hardware integrity: [hardware_integrity()]%"))
- stat(null, text("Internal capacitor: [backup_capacitor()]%"))
+ . += "Hardware integrity: [hardware_integrity()]%"
+ . += "Internal capacitor: [backup_capacitor()]%"
else
- stat(null, text("Systems nonfunctional"))
+ . += "Systems nonfunctional"
// Shows AI Malfunction related information to the AI.
/mob/living/silicon/ai/show_malf_ai()
+ . = ""
if(src.is_malf())
if(src.hacked_apcs)
- stat(null, "Hacked APCs: [src.hacked_apcs.len]")
- stat(null, "System Status: [src.hacking ? "Busy" : "Stand-By"]")
+ . += "Hacked APCs: [src.hacked_apcs.len]"
+ . += "System Status: [src.hacking ? "Busy" : "Stand-By"]"
if(src.research)
- stat(null, "Available CPU: [src.research.stored_cpu] TFlops")
- stat(null, "Maximal CPU: [src.research.max_cpu] TFlops")
- stat(null, "CPU generation rate: [src.research.cpu_increase_per_tick * 10] TFlops/s")
- stat(null, "Current research focus: [src.research.focus ? src.research.focus.name : "None"]")
+ . += "Available CPU: [src.research.stored_cpu] TFlops"
+ . += "Maximal CPU: [src.research.max_cpu] TFlops"
+ . += "CPU generation rate: [src.research.cpu_increase_per_tick * 10] TFlops/s"
+ . += "Current research focus: [src.research.focus ? src.research.focus.name : "None"]"
if(src.research.focus)
- stat(null, "Research completed: [round(src.research.focus.invested, 0.1)]/[round(src.research.focus.price)]")
+ . += "Research completed: [round(src.research.focus.invested, 0.1)]/[round(src.research.focus.price)]"
if(system_override == 1)
- stat(null, "SYSTEM OVERRIDE INITIATED")
+ . += "SYSTEM OVERRIDE INITIATED"
else if(system_override == 2)
- stat(null, "SYSTEM OVERRIDE COMPLETED")
+ . += "SYSTEM OVERRIDE COMPLETED"
// Cleaner proc for creating powersupply for an AI.
/mob/living/silicon/ai/proc/create_powersupply()
diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm
index 36022c40d41..ba3856d8e3b 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 3190e018062..c506924923c 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 693bf7e0a37..98d1a2ee6a8 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -130,8 +130,8 @@
add_language(LANGUAGE_TERMINUS, 1)
add_language(LANGUAGE_SIGN, 1)
- verbs += /mob/living/silicon/pai/proc/choose_chassis
- verbs += /mob/living/silicon/pai/proc/choose_verbs
+ add_verb(src, /mob/living/silicon/pai/proc/choose_chassis)
+ add_verb(src, /mob/living/silicon/pai/proc/choose_verbs)
//PDA
pda = new(src)
@@ -157,16 +157,16 @@
// this function shows the information about being silenced as a pAI in the Status panel
/mob/living/silicon/pai/proc/show_silenced()
+ . = ""
if(src.silence_time)
var/timeleft = round((silence_time - world.timeofday)/10 ,1)
- stat(null, "Communications system reboot in -[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
+ . += "Communications system reboot in -[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]"
-/mob/living/silicon/pai/Stat()
- ..()
- statpanel("Status")
- if (src.client.statpanel == "Status")
- show_silenced()
+/mob/living/silicon/pai/get_status_tab_items()
+ . = ..()
+ . += ""
+ . += show_silenced()
/mob/living/silicon/pai/check_eye(var/mob/user as mob)
if (!src.current)
@@ -187,12 +187,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)
@@ -200,7 +200,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)
@@ -208,9 +208,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)
@@ -261,10 +261,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
@@ -303,9 +303,9 @@
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."))
- verbs |= /mob/living/silicon/pai/proc/pai_nom
- verbs |= /mob/living/proc/vertical_nom
+ 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()
/mob/living/silicon/pai/verb/fold_up()
@@ -319,7 +319,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()
@@ -340,7 +340,7 @@
finalized = tgui_alert(usr, "Look at your sprite. Is this what you wish to use?","Choose Chassis",list("No","Yes"))
chassis = possible_chassis[choice]
- verbs |= /mob/living/proc/hide
+ add_verb(src, /mob/living/proc/hide)
//VOREStation Removal End
*/
@@ -444,7 +444,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()
@@ -477,8 +477,8 @@
icon_state = "[chassis]"
if(isopenspace(card.loc))
fall()
- verbs -= /mob/living/silicon/pai/proc/pai_nom
- verbs -= /mob/living/proc/vertical_nom
+ remove_verb(src, /mob/living/silicon/pai/proc/pai_nom)
+ remove_verb(src, /mob/living/proc/vertical_nom)
// No binary for pAIs.
/mob/living/silicon/pai/binarycheck()
@@ -543,6 +543,6 @@
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/pai_vr.dm b/code/modules/mob/living/silicon/pai/pai_vr.dm
index 22da5119222..2e3c1ed1fee 100644
--- a/code/modules/mob/living/silicon/pai/pai_vr.dm
+++ b/code/modules/mob/living/silicon/pai/pai_vr.dm
@@ -71,10 +71,10 @@
/mob/living/silicon/pai/Initialize()
. = ..()
- verbs |= /mob/proc/dominate_predator
- verbs |= /mob/living/proc/dominate_prey
- verbs |= /mob/living/proc/set_size
- verbs |= /mob/living/proc/shred_limb
+ add_verb(src, /mob/proc/dominate_predator)
+ add_verb(src, /mob/living/proc/dominate_prey)
+ add_verb(src, /mob/living/proc/set_size)
+ add_verb(src, /mob/living/proc/shred_limb)
/mob/living/silicon/pai/Login()
. = ..()
diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm
index 4e37613b493..8c2f5117916 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 a50d4e84c2a..bb37cdbb28f 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 7ed60814b90..034aa0ac13c 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 3c20a1952af..6c573330d47 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
@@ -255,7 +255,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 += ""
@@ -345,9 +345,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 2379310a6ee..f2932bedda4 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -104,8 +104,8 @@ var/list/mob_hat_cache = list()
/mob/living/silicon/robot/drone/New()
..()
- verbs += /mob/living/proc/ventcrawl
- verbs += /mob/living/proc/hide
+ add_verb(src, /mob/living/proc/ventcrawl)
+ add_verb(src, /mob/living/proc/hide)
remove_language("Robot Talk")
add_language("Robot Talk", 0)
add_language("Drone Talk", 1)
@@ -123,7 +123,7 @@ var/list/mob_hat_cache = list()
var/datum/robot_component/C = components[V]
C.max_damage = 10
- verbs -= /mob/living/silicon/robot/verb/namepick
+ remove_verb(src, /mob/living/silicon/robot/verb/namepick)
if(can_pick_shell)
var/random = pick(shell_types)
@@ -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 'Robot Commands' > '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)
@@ -172,7 +172,7 @@ var/list/mob_hat_cache = list()
/mob/living/silicon/robot/drone/verb/pick_shell()
set name = "Customize Appearance"
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
if(!can_pick_shell)
to_chat(src, span_warning("You already selected a shell or this drone type isn't customizable."))
@@ -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
@@ -384,27 +384,27 @@ 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()
- src.verbs |= silicon_subsystems
+ add_verb(src, silicon_subsystems)
/mob/living/silicon/robot/drone/remove_robot_verbs()
- src.verbs -= silicon_subsystems
+ 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_abilities.dm b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
index deaf9fb8b7a..3a4bf3e0e28 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
@@ -2,7 +2,7 @@
/mob/living/silicon/robot/drone/verb/set_mail_tag()
set name = "Set Mail Tag"
set desc = "Tag yourself for delivery through the disposals system."
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
var/new_tag = tgui_input_list(usr, "Select the desired destination.", "Set Mail Tag", GLOB.tagger_locations)
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 130716af91d..667fd23abb1 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
@@ -267,7 +267,7 @@
set name = "Drop Item"
set desc = "Release an item from your magnetic gripper."
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
drop_item()
@@ -564,15 +564,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
@@ -589,7 +589,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 d35e87fff68..1accbf719f9 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 33c917f166a..2622411e1ec 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/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index fb99ab98cf1..fc8bda74c93 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -21,6 +21,9 @@
/mob/living/silicon/robot/proc/uneq_active()
if(isnull(module_active))
return
+ var/obj/item/I = module_active
+ for(var/datum/action/A as anything in I.actions)
+ A.Remove(src)
if(module_state_1 == module_active)
if(istype(module_state_1,/obj/item/borg/sight))
sight_mode &= ~module_state_1:sight_mode
@@ -64,6 +67,9 @@
if (client)
client.screen -= module_state_1
contents -= module_state_1
+ var/obj/item/I = module_state_1
+ for(var/datum/action/A as anything in I.actions)
+ A.Remove(src)
module_state_1:loc = module
module_state_1 = null
inv1.icon_state = "inv1"
@@ -72,6 +78,9 @@
sight_mode &= ~module_state_2:sight_mode
if (client)
client.screen -= module_state_2
+ var/obj/item/I = module_state_2
+ for(var/datum/action/A as anything in I.actions)
+ A.Remove(src)
contents -= module_state_2
module_state_2:loc = module
module_state_2 = null
@@ -81,6 +90,9 @@
sight_mode &= ~module_state_3:sight_mode
if (client)
client.screen -= module_state_3
+ var/obj/item/I = module_state_3
+ for(var/datum/action/A as anything in I.actions)
+ A.Remove(src)
contents -= module_state_3
module_state_3:loc = module
module_state_3 = null
@@ -212,16 +224,16 @@
var/slot_num
if(slot_start == 0)
slot_num = 1
- slot_start = 2
else
slot_num = slot_start + 1
-
- while(slot_start != slot_num) //If we wrap around without finding any free slots, just give up.
+ if(slot_num > 3)
+ return
+ // Attempt to rotate through the slots until we're past slot 3, or find the next usable slot. Allows skipping empty slots, while still having an empty slot at end of rotation.
+ while(slot_num <= 3)
if(module_active(slot_num))
select_module(slot_num)
return
slot_num++
- if(slot_num > 3) slot_num = 1 //Wrap around.
return
@@ -276,6 +288,9 @@
pounce.icon_state = initial(pounce.icon_state)
pounce.desc = initial(pounce.desc)
pounce.bluespace = initial(pounce.bluespace)
+ if(O)
+ for(var/datum/action/A as anything in O.actions)
+ A.Grant(src)
/mob/living/silicon/robot/put_in_hands(var/obj/item/W) // No hands.
W.forceMove(get_turf(src))
diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm
index 59a7160d4c2..af480641857 100644
--- a/code/modules/mob/living/silicon/robot/laws.dm
+++ b/code/modules/mob/living/silicon/robot/laws.dm
@@ -1,5 +1,5 @@
/mob/living/silicon/robot/verb/cmd_show_laws()
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
set name = "Show Laws"
show_laws()
@@ -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()
@@ -51,6 +51,6 @@
return
/mob/living/silicon/robot/proc/robot_checklaws()
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
set name = "State Laws"
subsystem_law_manager()
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index 27b5a5123f6..3019869da87 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -10,7 +10,6 @@
//Status updates, death etc.
clamp_values()
handle_regular_status_updates()
- handle_actions()
handle_instability()
// For some reason borg Life() doesn't call ..()
handle_modifiers()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 20868b6d3ef..3ea48098658 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -280,11 +280,13 @@
if (!rbPDA)
rbPDA = new/obj/item/pda/ai(src)
rbPDA.set_name_and_job(name,"[modtype] [braintype]")
+ add_verb(src, /obj/item/pda/ai/verb/cmd_pda_open_ui)
/mob/living/silicon/robot/proc/setup_communicator()
if (!communicator)
communicator = new/obj/item/communicator/integrated(src)
communicator.register_device(name, "[modtype] [braintype]")
+ add_verb(src, /obj/item/communicator/integrated/verb/activate)
//If there's an MMI in the robot, have it ejected when the mob goes away. --NEO
//Improved /N
@@ -424,7 +426,7 @@
/mob/living/silicon/robot/verb/namepick()
set name = "Pick Name"
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
if(custom_name)
to_chat(usr, "You can't pick another custom name. [isshell(src) ? "" : "Go ask for a name change."]")
@@ -442,7 +444,7 @@
/mob/living/silicon/robot/verb/extra_customization()
set name = "Customize Appearance"
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
set desc = "Customize your appearance (assuming your chosen sprite allows)."
if(!sprite_datum || !sprite_datum.has_extra_customization)
@@ -458,12 +460,12 @@
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
/mob/living/silicon/robot/verb/toggle_lights()
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
set name = "Toggle Lights"
lights_on = !lights_on
@@ -472,7 +474,7 @@
update_icon()
/mob/living/silicon/robot/verb/self_diagnosis_verb()
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
set name = "Self Diagnosis"
if(!is_component_functioning("diagnosis unit"))
@@ -486,7 +488,7 @@
/mob/living/silicon/robot/verb/toggle_component()
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
set name = "Toggle Component"
set desc = "Toggle a component, conserving power."
@@ -510,18 +512,19 @@
to_chat(src, span_red("You enable [C.name]."))
/mob/living/silicon/robot/verb/spark_plug() //So you can still sparkle on demand without violence.
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
set name = "Emit Sparks"
to_chat(src, span_filter_notice("You harmlessly spark."))
spark_system.start()
// this function displays jetpack pressure in the stat panel
/mob/living/silicon/robot/proc/show_jetpack_pressure()
+ . = list()
// if you have a jetpack, show the internal tank pressure
var/obj/item/tank/jetpack/current_jetpack = installed_jetpack()
if (current_jetpack)
- stat("Internal Atmosphere Info", current_jetpack.name)
- stat("Tank Pressure", current_jetpack.air_contents.return_pressure())
+ . += "Internal Atmosphere Info: [current_jetpack.name]"
+ . += "Tank Pressure: [current_jetpack.air_contents.return_pressure()]"
// this function returns the robots jetpack, if one is installed
@@ -533,12 +536,13 @@
// this function displays the cyborgs current cell charge in the stat panel
/mob/living/silicon/robot/proc/show_cell_power()
+ . = list()
if(cell)
- stat(null, text("Charge Left: [round(cell.percent())]%"))
- stat(null, text("Cell Rating: [round(cell.maxcharge)]")) // Round just in case we somehow get crazy values
- stat(null, text("Power Cell Load: [round(used_power_this_tick)]W"))
+ . += "Charge Left: [round(cell.percent())]%"
+ . += "Cell Rating: [round(cell.maxcharge)]" // Round just in case we somehow get crazy values
+ . += "Power Cell Load: [round(used_power_this_tick)]W"
else
- stat(null, text("No Cell Inserted!"))
+ . += "No Cell Inserted!"
// function to toggle VTEC once installed
/mob/living/silicon/robot/proc/toggle_vtec()
@@ -549,15 +553,15 @@
to_chat(src, span_filter_notice("VTEC module [vtec_active ? "enabled" : "disabled"]."))
// update the status screen display
-/mob/living/silicon/robot/Stat()
- ..()
- if (statpanel("Status"))
- show_cell_power()
- show_jetpack_pressure()
- stat(null, text("Lights: [lights_on ? "ON" : "OFF"]"))
- if(module)
- for(var/datum/matter_synth/ms in module.synths)
- stat("[ms.name]: [ms.energy]/[ms.max_energy]")
+/mob/living/silicon/robot/get_status_tab_items()
+ . = ..()
+ . += ""
+ . += show_cell_power()
+ . += show_jetpack_pressure()
+ . += "Lights: [lights_on ? "ON" : "OFF"]"
+ if(module)
+ for(var/datum/matter_synth/ms in module.synths)
+ . += "[ms.name]: [ms.energy]/[ms.max_energy]"
/mob/living/silicon/robot/restrained()
return 0
@@ -843,7 +847,7 @@
/mob/living/silicon/robot/proc/ColorMate()
set name = "Recolour Module"
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
set desc = "Allows to recolour once."
if(!has_recoloured)
@@ -1079,7 +1083,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
@@ -1087,7 +1091,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
@@ -1191,7 +1195,7 @@
/mob/living/silicon/robot/proc/ResetSecurityCodes()
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
set name = "Reset Identity Codes"
set desc = "Scrambles your security and identification codes and resets your current buffers. Unlocks you and permenantly severs you from your AI and the robotics console and will deactivate your camera system."
@@ -1200,7 +1204,7 @@
if(R)
R.UnlinkSelf()
to_chat(R, span_filter_notice("Buffers flushed and reset. Camera system shutdown. All systems operational."))
- src.verbs -= /mob/living/silicon/robot/proc/ResetSecurityCodes
+ remove_verb(src, /mob/living/silicon/robot/proc/ResetSecurityCodes)
/mob/living/silicon/robot/proc/SetLockdown(var/state = 1)
// They stay locked down if their wire is cut.
@@ -1289,7 +1293,7 @@
/mob/living/silicon/robot/proc/sensor_mode() //Medical/Security HUD controller for borgs
set name = "Toggle Sensor Augmentation" //VOREStation Add
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
set desc = "Augment visual feed with internal sensor overlays."
sensor_type = !sensor_type //VOREStation Add
to_chat(usr, "You [sensor_type ? "enable" : "disable"] your sensors.") //VOREStation Add
@@ -1299,16 +1303,16 @@
return
/mob/living/silicon/robot/proc/add_robot_verbs()
- src.verbs |= robot_verbs_default
- src.verbs |= silicon_subsystems
+ add_verb(src, robot_verbs_default)
+ add_verb(src, silicon_subsystems)
if(config.allow_robot_recolor)
- src.verbs |= /mob/living/silicon/robot/proc/ColorMate
+ add_verb(src, /mob/living/silicon/robot/proc/ColorMate)
/mob/living/silicon/robot/proc/remove_robot_verbs()
- src.verbs -= robot_verbs_default
- src.verbs -= silicon_subsystems
+ remove_verb(src, robot_verbs_default)
+ remove_verb(src, silicon_subsystems)
if(config.allow_robot_recolor)
- src.verbs |= /mob/living/silicon/robot/proc/ColorMate
+ remove_verb(src, /mob/living/silicon/robot/proc/ColorMate)
// Uses power from cyborg's cell. Returns 1 on success or 0 on failure.
// Properly converts using CELLRATE now! Amount is in Joules.
@@ -1358,16 +1362,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)
@@ -1408,7 +1412,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
@@ -1460,7 +1464,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/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
index def75b1dad2..8f8c0757e0c 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
@@ -167,10 +167,10 @@ var/global/list/robot_modules = list(
added_networks.Cut()
/obj/item/robot_module/proc/add_subsystems(var/mob/living/silicon/robot/R)
- R.verbs |= subsystems
+ add_verb(R, subsystems)
/obj/item/robot_module/proc/remove_subsystems(var/mob/living/silicon/robot/R)
- R.verbs -= subsystems
+ remove_verb(R, subsystems)
/obj/item/robot_module/proc/apply_status_flags(var/mob/living/silicon/robot/R)
if(!can_be_pushed)
diff --git a/code/modules/mob/living/silicon/robot/robot_remote_control.dm b/code/modules/mob/living/silicon/robot/robot_remote_control.dm
index a768b1f7b76..4f38630848d 100644
--- a/code/modules/mob/living/silicon/robot/robot_remote_control.dm
+++ b/code/modules/mob/living/silicon/robot/robot_remote_control.dm
@@ -65,7 +65,7 @@ GLOBAL_LIST_EMPTY(available_ai_shells)
lawsync()
// Give button to leave.
- verbs += /mob/living/silicon/robot/proc/undeploy_act
+ add_verb(src, /mob/living/silicon/robot/proc/undeploy_act)
to_chat(AI, span_notice("You have connected to an AI Shell remotely, and are now in control of it. \
To return to your core, use the Release Control verb."))
@@ -110,7 +110,7 @@ GLOBAL_LIST_EMPTY(available_ai_shells)
/mob/living/silicon/robot/proc/undeploy_act()
set name = "Release Control"
set desc = "Release control of a remote drone."
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
undeploy("Remote session terminated.")
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 2524d784de2..24e449c411c 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 21a2db794b1..ed003d1c784 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 a464f9c36cd..3f00773e09d 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_module.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm
index 2175bb1db47..ebe112a4e8d 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm
@@ -25,7 +25,7 @@
/obj/item/robot_module/robot/platform/verb/set_eye_colour()
set name = "Set Eye Colour"
set desc = "Select an eye colour to use."
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
set src in usr
var/new_pupil_color = input(usr, "Select a pupil colour.", "Pupil Colour Selection") as color|null
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 c1cc9e770e0..563fedaf73f 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,14 +99,14 @@
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
/mob/living/silicon/robot/platform/verb/drop_stored_atom_verb()
set name = "Eject Cargo"
- set category = "Robot Commands"
+ set category = "Abilities.Silicon"
set desc = "Drop something from your internal storage."
if(incapacitated())
@@ -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 c7eafa07756..f5558875540 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 e7f297b7fde..3f3d1016687 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -74,7 +74,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."))
..()
@@ -130,30 +130,30 @@
// this function shows the health of the AI in the Status panel
/mob/living/silicon/proc/show_system_integrity()
if(!src.stat)
- stat(null, text("System integrity: [round((health/getMaxHealth())*100)]%"))
+ . = "System integrity: [round((health/getMaxHealth())*100)]%"
else
- stat(null, text("Systems nonfunctional"))
+ . = "Systems nonfunctional"
// This is a pure virtual function, it should be overwritten by all subclasses
/mob/living/silicon/proc/show_malf_ai()
- return 0
+ return ""
// this function displays the shuttles ETA in the status panel if the shuttle has been called
/mob/living/silicon/proc/show_emergency_shuttle_eta()
if(emergency_shuttle)
var/eta_status = emergency_shuttle.get_status_panel_eta()
if(eta_status)
- stat(null, eta_status)
+ . = "[eta_status]"
// This adds the basic clock, shuttle recall timer, and malf_ai info to all silicon lifeforms
-/mob/living/silicon/Stat()
- if(statpanel("Status"))
- show_emergency_shuttle_eta()
- show_system_integrity()
- show_malf_ai()
- ..()
+/mob/living/silicon/get_status_tab_items()
+ . = ..()
+ . += ""
+ . += show_emergency_shuttle_eta()
+ . += show_system_integrity()
+ . += show_malf_ai()
/* VOREStation Removal
// this function displays the stations manifest in a separate window
@@ -221,7 +221,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/silicon/subystems.dm b/code/modules/mob/living/silicon/subystems.dm
index 6c46ecb2e88..e2d82f6fdfe 100644
--- a/code/modules/mob/living/silicon/subystems.dm
+++ b/code/modules/mob/living/silicon/subystems.dm
@@ -51,7 +51,7 @@
********************/
/mob/living/silicon/proc/subsystem_alarm_monitor()
set name = "Alarm Monitor"
- set category = "Subystems"
+ set category = "Abilities.Silicon"
alarm_monitor.tgui_interact(usr)
@@ -59,7 +59,7 @@
* Atmos Control *
********************/
/mob/living/silicon/proc/subsystem_atmos_control()
- set category = "Subystems"
+ set category = "Abilities.Silicon"
set name = "Atmospherics Control"
atmos_control.tgui_interact(usr)
@@ -68,7 +68,7 @@
* Crew Manifest *
********************/
/mob/living/silicon/proc/subsystem_crew_manifest()
- set category = "Subystems"
+ set category = "Abilities.Silicon"
set name = "Crew Manifest"
crew_manifest.tgui_interact(usr)
@@ -77,7 +77,7 @@
* Crew Monitor *
********************/
/mob/living/silicon/proc/subsystem_crew_monitor()
- set category = "Subystems"
+ set category = "Abilities.Silicon"
set name = "Crew Monitor"
crew_monitor.tgui_interact(usr)
@@ -87,7 +87,7 @@
****************/
/mob/living/silicon/proc/subsystem_law_manager()
set name = "Law Manager"
- set category = "Subystems"
+ set category = "Abilities.Silicon"
law_manager.tgui_interact(usr)
@@ -95,7 +95,7 @@
* Power Monitor *
********************/
/mob/living/silicon/proc/subsystem_power_monitor()
- set category = "Subystems"
+ set category = "Abilities.Silicon"
set name = "Power Monitor"
power_monitor.tgui_interact(usr)
@@ -104,7 +104,7 @@
* RCON *
************/
/mob/living/silicon/proc/subsystem_rcon()
- set category = "Subystems"
+ set category = "Abilities.Silicon"
set name = "RCON"
rcon.tgui_interact(usr)
diff --git a/code/modules/mob/living/simple_mob/combat.dm b/code/modules/mob/living/simple_mob/combat.dm
index 065878284d3..727efefcd23 100644
--- a/code/modules/mob/living/simple_mob/combat.dm
+++ b/code/modules/mob/living/simple_mob/combat.dm
@@ -113,7 +113,7 @@
try_reload()
return FALSE
- visible_message(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 1d59a5d9c2e..c8ebebd1622 100644
--- a/code/modules/mob/living/simple_mob/defense.dm
+++ b/code/modules/mob/living/simple_mob/defense.dm
@@ -76,7 +76,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 8808f30f4bf..ec4ff326ff4 100644
--- a/code/modules/mob/living/simple_mob/simple_mob.dm
+++ b/code/modules/mob/living/simple_mob/simple_mob.dm
@@ -180,7 +180,7 @@
var/isthermal = 0
/mob/living/simple_mob/Initialize()
- verbs -= /mob/verb/observe
+ remove_verb(src, /mob/verb/observe)
health = maxHealth
if(ID_provided) //VOREStation Edit
@@ -199,7 +199,7 @@
organ_names = GET_DECL(organ_names)
if(config.allow_simple_mob_recolor)
- verbs |= /mob/living/simple_mob/proc/ColorMate
+ add_verb(src, /mob/living/simple_mob/proc/ColorMate)
return ..()
@@ -224,9 +224,9 @@
//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(hasthermals)
- verbs |= /mob/living/simple_mob/proc/hunting_vision //So that maint preds can see prey through walls, to make it easier to find them.
+ add_verb(src, /mob/living/simple_mob/proc/hunting_vision) //So that maint preds can see prey through walls, to make it easier to find them.
/mob/living/simple_mob/SelfMove(turf/n, direct, movetime)
var/turf/old_turf = get_turf(src)
@@ -286,11 +286,10 @@
. += ..()
-
-/mob/living/simple_mob/Stat()
- ..()
- if(statpanel("Status") && show_stat_health)
- stat(null, "Health: [round((health / getMaxHealth()) * 100)]%")
+/mob/living/simple_mob/get_status_tab_items()
+ . = ..()
+ . += ""
+ . += "Health: [round((health / getMaxHealth()) * 100)]%"
/mob/living/simple_mob/lay_down()
..()
@@ -314,7 +313,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 c2d9f723d33..b4f999bc830 100644
--- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm
+++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm
@@ -170,9 +170,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
@@ -212,16 +212,16 @@
return
if(!IsAdvancedToolUser())
- verbs |= /mob/living/simple_mob/proc/animal_nom
- verbs |= /mob/living/proc/shred_limb
+ add_verb(src, /mob/living/simple_mob/proc/animal_nom)
+ add_verb(src, /mob/living/proc/shred_limb)
if(LAZYLEN(vore_organs))
return
// Since they have bellies, add verbs to toggle settings on them.
- verbs |= /mob/living/simple_mob/proc/toggle_digestion
- verbs |= /mob/living/simple_mob/proc/toggle_fancygurgle
- verbs |= /mob/living/proc/vertical_nom
+ add_verb(src, /mob/living/simple_mob/proc/toggle_digestion)
+ add_verb(src, /mob/living/simple_mob/proc/toggle_fancygurgle)
+ add_verb(src, /mob/living/proc/vertical_nom)
//A much more detailed version of the default /living implementation
var/obj/belly/B = new /obj/belly(src)
@@ -278,7 +278,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 164257a4c7f..67fe95dba1b 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)
@@ -137,9 +137,9 @@
/mob/living/simple_mob/vore/alienanimals/catslug/Initialize()
. = ..()
- verbs += /mob/living/proc/ventcrawl
- verbs += /mob/living/proc/hide
- verbs += /mob/living/simple_mob/vore/alienanimals/catslug/proc/catslug_color
+ add_verb(src, /mob/living/proc/ventcrawl)
+ add_verb(src, /mob/living/proc/hide)
+ add_verb(src, /mob/living/simple_mob/vore/alienanimals/catslug/proc/catslug_color)
/mob/living/simple_mob/vore/alienanimals/catslug/Destroy()
if(hat)
@@ -358,9 +358,9 @@
/mob/living/simple_mob/vore/alienanimals/catslug/custom/Initialize()
. = ..()
- verbs += /mob/living/proc/ventcrawl
- verbs += /mob/living/proc/hide
- verbs -= /mob/living/simple_mob/vore/alienanimals/catslug/proc/catslug_color //Most of these have custom sprites with colour already, so we'll not let them have this.
+ add_verb(src, /mob/living/proc/ventcrawl)
+ add_verb(src, /mob/living/proc/hide)
+ remove_verb(src, /mob/living/simple_mob/vore/alienanimals/catslug/proc/catslug_color) //Most of these have custom sprites with colour already, so we'll not let them have this.
/datum/category_item/catalogue/fauna/catslug/custom/spaceslug
@@ -404,7 +404,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?")
@@ -1080,7 +1080,7 @@
/mob/living/simple_mob/vore/alienanimals/catslug/suslug/Initialize()
. = ..()
- verbs += /mob/living/simple_mob/vore/alienanimals/catslug/suslug/proc/assussinate
+ add_verb(src, /mob/living/simple_mob/vore/alienanimals/catslug/suslug/proc/assussinate)
update_icon()
/mob/living/simple_mob/vore/alienanimals/catslug/suslug/update_icon()
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 05e52f6676e..1fa6963c687 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
@@ -69,8 +69,8 @@
/mob/living/simple_mob/vore/overmap/stardog/Login()
. = ..()
- verbs -= /mob/living/simple_mob/proc/set_name
- verbs -= /mob/living/simple_mob/proc/set_desc
+ remove_verb(src, /mob/living/simple_mob/proc/set_name)
+ remove_verb(src, /mob/living/simple_mob/proc/set_desc)
/mob/living/simple_mob/vore/overmap/stardog/attack_hand(mob/living/user)
if(!(user.pickup_pref && user.pickup_active))
@@ -164,10 +164,10 @@
weather_areas -= anything
return ..()
-/mob/living/simple_mob/vore/overmap/stardog/Stat()
- ..()
- if(statpanel("Status"))
- stat(null, "Affinity: [round(affinity)]")
+/mob/living/simple_mob/vore/overmap/stardog/get_status_tab_items()
+ . = ..()
+ . += ""
+ . += "Affinity: [round(affinity)]"
/mob/living/simple_mob/vore/overmap/stardog/start_pulling(var/atom/movable/AM)
if(!istype(loc, /turf/unsimulated/map)) //Don't pull stuff on the overmap
@@ -454,7 +454,7 @@
set category = "IC"
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 b10077a46aa..7f63a58a1df 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
@@ -115,7 +115,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 28c824dc51a..50704e1fa9c 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
@@ -130,7 +130,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,\
@@ -333,11 +333,11 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have?
real_name = name
if(!teppi_adult)
nutrition = 0
- verbs += /mob/living/proc/ventcrawl
- verbs += /mob/living/proc/hide
+ add_verb(src, /mob/living/proc/ventcrawl)
+ add_verb(src, /mob/living/proc/hide)
else
- verbs += /mob/living/simple_mob/vore/alienanimals/teppi/proc/produce_offspring
- verbs += /mob/living/simple_mob/vore/alienanimals/teppi/proc/toggle_producing_offspring
+ add_verb(src, /mob/living/simple_mob/vore/alienanimals/teppi/proc/produce_offspring)
+ add_verb(src, /mob/living/simple_mob/vore/alienanimals/teppi/proc/toggle_producing_offspring)
// teppi_id = rand(1,100000)
@@ -548,7 +548,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.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm
index 19c817dc67d..779e871695a 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm
@@ -57,8 +57,8 @@
/mob/living/simple_mob/animal/borer/Initialize()
add_language("Cortical Link")
- verbs += /mob/living/proc/ventcrawl
- verbs += /mob/living/proc/hide
+ add_verb(src, /mob/living/proc/ventcrawl)
+ add_verb(src, /mob/living/proc/hide)
true_name = "[pick("Primary","Secondary","Tertiary","Quaternary")] [rand(1000,9999)]"
@@ -99,15 +99,9 @@
if(prob(host.brainloss/20))
host.say("*[pick(list("blink","blink_r","choke","aflap","drool","twitch","twitch_v","gasp"))]")
-/mob/living/simple_mob/animal/borer/Stat()
- ..()
- if(client.statpanel == "Status")
- statpanel("Status")
- if(emergency_shuttle)
- var/eta_status = emergency_shuttle.get_status_panel_eta()
- if(eta_status)
- stat(null, eta_status)
- stat("Chemicals", chemicals)
+/mob/living/simple_mob/animal/borer/get_status_tab_items()
+ . = ..()
+ . += "Chemicals: [chemicals]"
/mob/living/simple_mob/animal/borer/proc/detatch()
if(!host || !controlling)
@@ -122,9 +116,9 @@
controlling = FALSE
host.remove_language("Cortical Link")
- host.verbs -= /mob/living/carbon/proc/release_control
- host.verbs -= /mob/living/carbon/proc/punish_host
- host.verbs -= /mob/living/carbon/proc/spawn_larvae
+ remove_verb(host, /mob/living/carbon/proc/release_control)
+ remove_verb(host, /mob/living/carbon/proc/punish_host)
+ remove_verb(host, /mob/living/carbon/proc/spawn_larvae)
if(host_brain)
// these are here so bans and multikey warnings are not triggered on the wrong people when ckey is changed.
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_captive.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_captive.dm
index 0053f4207dc..208a52ac378 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_captive.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_captive.dm
@@ -55,9 +55,9 @@
to_chat(H, span_danger("With an immense exertion of will, you regain control of your body!"))
to_chat(B.host, span_danger("You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you."))
B.detatch()
- verbs -= /mob/living/carbon/proc/release_control
- verbs -= /mob/living/carbon/proc/punish_host
- verbs -= /mob/living/carbon/proc/spawn_larvae
+ remove_verb(src, /mob/living/carbon/proc/release_control)
+ remove_verb(src, /mob/living/carbon/proc/punish_host)
+ remove_verb(src, /mob/living/carbon/proc/spawn_larvae)
return
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 b31f8d0dcbe..160ddbdeff5 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,20 +157,20 @@
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")
if(host.stat == 2)
- H.verbs |= /mob/living/carbon/human/proc/jumpstart
+ add_verb(H, /mob/living/carbon/human/proc/jumpstart)
- H.verbs |= /mob/living/carbon/human/proc/psychic_whisper
- H.verbs |= /mob/living/carbon/human/proc/tackle
+ add_verb(H, /mob/living/carbon/human/proc/psychic_whisper)
+ add_verb(H, /mob/living/carbon/human/proc/tackle)
if(antag)
- H.verbs |= /mob/living/carbon/proc/spawn_larvae
+ add_verb(H, /mob/living/carbon/proc/spawn_larvae)
if(H.client)
H.ghostize(0)
@@ -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
@@ -331,10 +331,10 @@
controlling = 1
- host.verbs += /mob/living/carbon/proc/release_control
- host.verbs += /mob/living/carbon/proc/punish_host
+ add_verb(host, /mob/living/carbon/proc/release_control)
+ add_verb(host, /mob/living/carbon/proc/punish_host)
if(antag)
- host.verbs += /mob/living/carbon/proc/spawn_larvae
+ add_verb(host, /mob/living/carbon/proc/spawn_larvae)
return
@@ -347,7 +347,7 @@
to_chat(usr, "Your host is already alive.")
return
- verbs -= /mob/living/carbon/human/proc/jumpstart
+ remove_verb(src, /mob/living/carbon/human/proc/jumpstart)
visible_message(span_warning("With a hideous, rattling moan, [src] shudders back to life!"))
rejuvenate()
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm
index 844cd29559f..b3bb907c9c7 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm
@@ -47,8 +47,8 @@
/mob/living/simple_mob/animal/passive/mouse/New()
..()
- verbs += /mob/living/proc/ventcrawl
- verbs += /mob/living/proc/hide
+ add_verb(src, /mob/living/proc/ventcrawl)
+ add_verb(src, /mob/living/proc/hide)
if(name == initial(name))
name = "[name] ([rand(1, 1000)])"
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 f3696edd333..614ec0d87fe 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()
@@ -185,8 +185,8 @@
/mob/living/simple_mob/animal/passive/opossum/Initialize()
. = ..()
- verbs += /mob/living/proc/ventcrawl
- verbs += /mob/living/proc/hide
+ add_verb(src, /mob/living/proc/ventcrawl)
+ add_verb(src, /mob/living/proc/hide)
/mob/living/simple_mob/animal/passive/opossum/poppy
name = "Poppy the Safety Possum"
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm
index 0a5b21b0da9..9e9f4782d6e 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm
@@ -85,8 +85,8 @@
/mob/living/simple_mob/animal/sif/frostfly/Initialize()
. = ..()
smoke_special = new
- verbs += /mob/living/proc/ventcrawl
- verbs += /mob/living/proc/hide
+ add_verb(src, /mob/living/proc/ventcrawl)
+ add_verb(src, /mob/living/proc/hide)
/datum/say_list/frostfly
speak = list("Zzzz.", "Kss.", "Zzt?")
@@ -110,15 +110,9 @@
if(energy < max_energy)
energy++
-/mob/living/simple_mob/animal/sif/frostfly/Stat()
- ..()
- if(client.statpanel == "Status")
- statpanel("Status")
- if(emergency_shuttle)
- var/eta_status = emergency_shuttle.get_status_panel_eta()
- if(eta_status)
- stat(null, eta_status)
- stat("Energy", energy)
+/mob/living/simple_mob/animal/sif/frostfly/get_status_tab_items()
+ . = ..()
+ . += "Energy: [energy]"
/mob/living/simple_mob/animal/sif/frostfly/should_special_attack(atom/A)
if(energy >= 20)
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 cf1ec313cdc..e0d523d3fac 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'
@@ -526,11 +526,10 @@ var/global/list/wounds_being_tended_by_drakes = list()
else
remove_modifiers_of_type(/datum/modifier/ace)
-/mob/living/simple_mob/animal/sif/grafadreka/Stat()
+/mob/living/simple_mob/animal/sif/grafadreka/get_status_tab_items()
. = ..()
- if(statpanel("Status"))
- stat("Nutrition:", "[nutrition]/[max_nutrition]")
- stat("Stored sap:", "[stored_sap]/[max_stored_sap]")
+ . += "Nutrition: [nutrition]/[max_nutrition]"
+ . += "Stored sap: [stored_sap]/[max_stored_sap]"
/mob/living/simple_mob/animal/sif/grafadreka/proc/can_bite(var/mob/living/M)
return istype(M) && (M.lying || M.confused || M.incapacitated())
@@ -571,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 c603d6b65bc..b2a5ab838d9 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
@@ -119,5 +119,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/leech.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
index 73403e6c763..5e455483938 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
@@ -119,18 +119,12 @@
/mob/living/simple_mob/animal/sif/leech/Initialize()
. = ..()
- verbs += /mob/living/proc/ventcrawl
- verbs += /mob/living/proc/hide
+ add_verb(src, /mob/living/proc/ventcrawl)
+ add_verb(src, /mob/living/proc/hide)
-/mob/living/simple_mob/animal/sif/leech/Stat()
- ..()
- if(client.statpanel == "Status")
- statpanel("Status")
- if(emergency_shuttle)
- var/eta_status = emergency_shuttle.get_status_panel_eta()
- if(eta_status)
- stat(null, eta_status)
- stat("Chemicals", chemicals)
+/mob/living/simple_mob/animal/sif/leech/get_status_tab_items()
+ . = ..()
+ . += "Chemicals: [chemicals]"
/mob/living/simple_mob/animal/sif/leech/do_special_attack(atom/A)
. = TRUE
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/moth.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/moth.dm
index 12d8d9e0fe0..5c59c2b7b14 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/moth.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/moth.dm
@@ -119,8 +119,8 @@
/mob/living/simple_mob/animal/sif/tymisian/Initialize()
. = ..()
smoke_spore = new
- verbs += /mob/living/proc/ventcrawl
- verbs += /mob/living/proc/hide
+ add_verb(src, /mob/living/proc/ventcrawl)
+ add_verb(src, /mob/living/proc/hide)
/mob/living/simple_mob/animal/sif/tymisian/handle_special()
..()
@@ -128,15 +128,9 @@
if(energy < max_energy)
energy++
-/mob/living/simple_mob/animal/sif/tymisian/Stat()
- ..()
- if(client.statpanel == "Status")
- statpanel("Status")
- if(emergency_shuttle)
- var/eta_status = emergency_shuttle.get_status_panel_eta()
- if(eta_status)
- stat(null, eta_status)
- stat("Energy", energy)
+/mob/living/simple_mob/animal/sif/tymisian/get_status_tab_items()
+ . = ..()
+ . += "Energy: [energy]"
/mob/living/simple_mob/animal/sif/tymisian/should_special_attack(atom/A)
if(energy >= 20)
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 02baeeda894..0798f487d7d 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
@@ -153,8 +153,8 @@
/mob/living/simple_mob/animal/sif/sakimm/Initialize()
. = ..()
- verbs += /mob/living/proc/ventcrawl
- verbs += /mob/living/proc/hide
+ add_verb(src, /mob/living/proc/ventcrawl)
+ add_verb(src, /mob/living/proc/hide)
if(randomize_size)
adjust_scale(rand(8, 11) / 10)
@@ -182,7 +182,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."
@@ -328,7 +328,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 94cde54931c..115e0cb4101 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
@@ -135,7 +135,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
@@ -321,7 +321,7 @@
try_reload()
return FALSE
- 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 d986c17a29d..d4d619fbb83 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 af513e23c03..d62100fd764 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
@@ -126,7 +126,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
@@ -139,7 +139,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 383c25a3951..bc61a5f2765 100644
--- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
@@ -91,7 +91,7 @@ var/list/_slime_default_emotes = list(
emote_hear = list("squishes")
/mob/living/simple_mob/slime/Initialize()
- verbs += /mob/living/proc/ventcrawl
+ add_verb(src, /mob/living/proc/ventcrawl)
update_mood()
glow_color = color
handle_light()
@@ -249,7 +249,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/bigdragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm
index b22b06e29f5..d3fc35c3c37 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm
@@ -240,15 +240,15 @@ I think I covered everything.
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
- verbs |= /mob/living/simple_mob/proc/animal_mount
- verbs |= /mob/living/proc/toggle_rider_reins
- verbs |= /mob/living/simple_mob/vore/bigdragon/proc/set_style
- verbs |= /mob/living/simple_mob/vore/bigdragon/proc/toggle_glow
- verbs |= /mob/living/simple_mob/vore/bigdragon/proc/sprite_toggle
- verbs |= /mob/living/simple_mob/vore/bigdragon/proc/flame_toggle
- verbs |= /mob/living/simple_mob/vore/bigdragon/proc/special_toggle
- //verbs |= /mob/living/simple_mob/vore/bigdragon/proc/set_name //Implemented upstream
- //verbs |= /mob/living/simple_mob/vore/bigdragon/proc/set_desc //Implemented upstream
+ add_verb(src, /mob/living/simple_mob/proc/animal_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
+ add_verb(src, /mob/living/simple_mob/vore/bigdragon/proc/set_style)
+ add_verb(src, /mob/living/simple_mob/vore/bigdragon/proc/toggle_glow)
+ add_verb(src, /mob/living/simple_mob/vore/bigdragon/proc/sprite_toggle)
+ add_verb(src, /mob/living/simple_mob/vore/bigdragon/proc/flame_toggle)
+ add_verb(src, /mob/living/simple_mob/vore/bigdragon/proc/special_toggle)
+ //add_verb(src, /mob/living/simple_mob/vore/bigdragon/proc/set_name) //Implemented upstream
+ //add_verb(src, /mob/living/simple_mob/vore/bigdragon/proc/set_desc) //Implemented upstream
faction = FACTION_NEUTRAL
/mob/living/simple_mob/vore/bigdragon/Initialize()
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm b/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm
index 4326d048dde..abd7cdf105d 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm
@@ -113,8 +113,8 @@
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
- verbs |= /mob/living/simple_mob/proc/animal_mount
- verbs |= /mob/living/proc/toggle_rider_reins
+ add_verb(src, /mob/living/simple_mob/proc/animal_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
movement_cooldown = 0
/mob/living/simple_mob/vore/aggressive/corrupthound/MouseDrop_T(mob/living/M, mob/living/user)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/cryptdrake.dm b/code/modules/mob/living/simple_mob/subtypes/vore/cryptdrake.dm
index bad9f2dde35..0e931f98325 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/cryptdrake.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/cryptdrake.dm
@@ -64,8 +64,8 @@
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
- verbs |= /mob/living/simple_mob/proc/animal_mount
- verbs |= /mob/living/proc/toggle_rider_reins
+ add_verb(src, /mob/living/simple_mob/proc/animal_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
movement_cooldown = -1
/mob/living/simple_mob/vore/cryptdrake/init_vore()
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm
index 133e29d632d..dbb629cbdde 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm
@@ -74,8 +74,8 @@
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
- verbs |= /mob/living/simple_mob/proc/animal_mount
- verbs |= /mob/living/proc/toggle_rider_reins
+ add_verb(src, /mob/living/simple_mob/proc/animal_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
movement_cooldown = 0
/mob/living/simple_mob/vore/aggressive/deathclaw/MouseDrop_T(mob/living/M, mob/living/user)
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 26ebf4dc848..1d64e27ef0a 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/dominated_brain.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm
index fed12356a1e..79f2432c44a 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm
@@ -32,7 +32,7 @@
return
. = ..()
lets_register_our_signals()
- verbs |= /mob/living/dominated_brain/proc/resist_control
+ add_verb(src, /mob/living/dominated_brain/proc/resist_control)
/mob/living/dominated_brain/Life()
. = ..()
@@ -114,7 +114,7 @@
prey_goes_here.ooc_notes = prey_ooc_notes
prey_goes_here.ooc_notes_likes = prey_ooc_likes
prey_goes_here.ooc_notes_dislikes = prey_ooc_dislikes
- prey_goes_here.verbs |= /mob/living/dominated_brain/proc/cease_this_foolishness
+ add_verb(prey_goes_here, /mob/living/dominated_brain/proc/cease_this_foolishness)
else //The prey body does not exist, let's put them in the back seat instead!
@@ -134,7 +134,7 @@
///////////////////
// Handle Pred
- pred_body.verbs -= /mob/proc/release_predator
+ remove_verb(pred_body, /mob/proc/release_predator)
//Now actually put the people in the mobs
prey_goes_here.ckey = src.prey_ckey
@@ -166,7 +166,7 @@
langlist -= languages
for(var/datum/language/L in langlist)
if(L.flags & HIVEMIND)
- verbs |= /mob/proc/adjust_hive_range
+ add_verb(src, /mob/proc/adjust_hive_range)
temp_languages |= langlist
languages |= langlist
@@ -259,7 +259,7 @@
pred.ooc_notes_likes = pred_brain.prey_ooc_likes
pred.ooc_notes_dislikes = pred_brain.prey_ooc_dislikes
- pred.verbs |= /mob/proc/release_predator
+ add_verb(pred, /mob/proc/release_predator)
//Now actually put the people in the mobs
pred_brain.ckey = pred_brain.pred_ckey
@@ -286,7 +286,7 @@
else
continue
to_chat(src, span_danger("You haven't been taken over, and shouldn't have this verb. I'll clean that up for you. Report this on the github, it is a bug."))
- verbs -= /mob/proc/release_predator
+ remove_verb(src, /mob/proc/release_predator)
/mob/living/dominated_brain/proc/resist_control()
set category = "Abilities"
@@ -368,7 +368,7 @@
db.ooc_notes_dislikes = M.ooc_notes_dislikes
db.prey_ooc_likes = M.ooc_notes_likes
db.prey_ooc_dislikes = M.ooc_notes_dislikes
- db.verbs |= /mob/living/dominated_brain/proc/cease_this_foolishness
+ add_verb(db, /mob/living/dominated_brain/proc/cease_this_foolishness)
absorb_langs()
@@ -402,7 +402,7 @@
to_chat(src, span_warning("You can sense your body... but it is not contained within [pred_body]... You cannot return to it at this time."))
else
to_chat(src, span_warning("Your body seems to no longer exist, so, you cannot return to it."))
- verbs -= /mob/living/dominated_brain/proc/cease_this_foolishness
+ remove_verb(src, /mob/living/dominated_brain/proc/cease_this_foolishness)
/mob/living/proc/lend_prey_control()
set category = "Abilities"
@@ -489,7 +489,7 @@
pred.ooc_notes_likes = pred_brain.prey_ooc_likes
pred.ooc_notes_dislikes = pred_brain.prey_ooc_dislikes
- pred.verbs |= /mob/proc/release_predator
+ add_verb(pred, /mob/proc/release_predator)
//Now actually put the people in the mobs
pred_brain.ckey = pred_brain.pred_ckey
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm
index aac50f5c003..9915d171b0f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm
@@ -105,8 +105,8 @@
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
- verbs |= /mob/living/simple_mob/proc/animal_mount
- verbs |= /mob/living/proc/toggle_rider_reins
+ add_verb(src, /mob/living/simple_mob/proc/animal_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
movement_cooldown = 0
/mob/living/simple_mob/vore/aggressive/dragon/MouseDrop_T(mob/living/M, mob/living/user)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm b/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm
index 3251532c59f..1d0e18733cf 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm
@@ -93,8 +93,8 @@
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
- verbs |= /mob/living/simple_mob/proc/animal_mount
- verbs |= /mob/living/proc/toggle_rider_reins
+ add_verb(src, /mob/living/simple_mob/proc/animal_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
movement_cooldown = -1.5
/mob/living/simple_mob/vore/greatwolf/MouseDrop_T(mob/living/M, mob/living/user)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm b/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm
index 412a7ec8e50..725d48590f1 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm
@@ -70,8 +70,8 @@
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
- verbs |= /mob/living/simple_mob/proc/animal_mount
- verbs |= /mob/living/proc/toggle_rider_reins
+ add_verb(src, /mob/living/simple_mob/proc/animal_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
movement_cooldown = 0
/mob/living/simple_mob/vore/hippo/MouseDrop_T(mob/living/M, mob/living/user)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm b/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm
index 51511ebcc84..4432da92be7 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm
@@ -72,8 +72,8 @@
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
- verbs |= /mob/living/simple_mob/proc/animal_mount
- verbs |= /mob/living/proc/toggle_rider_reins
+ add_verb(src, /mob/living/simple_mob/proc/animal_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
movement_cooldown = -2
/mob/living/simple_mob/vore/horse/MouseDrop_T(mob/living/M, mob/living/user)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm
index 5a808e65ec3..5b35207b545 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm
@@ -66,8 +66,8 @@
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
- verbs |= /mob/living/simple_mob/proc/animal_mount
- verbs |= /mob/living/proc/toggle_rider_reins
+ add_verb(src, /mob/living/simple_mob/proc/animal_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
movement_cooldown = -1
/mob/living/simple_mob/vore/leopardmander/Initialize()
@@ -141,7 +141,7 @@
/mob/living/simple_mob/vore/leopardmander/exotic/New()
..()
- verbs |= /mob/living/simple_mob/vore/leopardmander/exotic/proc/toggle_glow
+ add_verb(src, /mob/living/simple_mob/vore/leopardmander/exotic/proc/toggle_glow)
/mob/living/simple_mob/vore/leopardmander/exotic/init_vore()
. = ..()
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 f4c499e798f..5fb2a327ad8 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 e583765ac09..19eab2768bf 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
@@ -31,7 +31,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
@@ -52,7 +52,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/mobs_monsters/clowns/bus.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bus.dm
index 75782e987a2..ad73462e296 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bus.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bus.dm
@@ -4,4 +4,4 @@
/mob/living/simple_mob/clowns/big/c_shift/New()
..()
- verbs += /mob/living/simple_mob/clowns/big/c_shift/proc/phase_shift
+ add_verb(src, /mob/living/simple_mob/clowns/big/c_shift/proc/phase_shift)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
index 92071f6f87f..6eb6187f49c 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
@@ -62,10 +62,10 @@
/obj/effect))
/mob/living/simple_mob/vore/morph/Initialize()
- verbs += /mob/living/proc/ventcrawl
- verbs += /mob/living/simple_mob/vore/morph/proc/take_over_prey
+ add_verb(src, /mob/living/proc/ventcrawl)
+ add_verb(src, /mob/living/simple_mob/vore/morph/proc/take_over_prey)
if(!istype(src, /mob/living/simple_mob/vore/morph/dominated_prey))
- verbs += /mob/living/simple_mob/vore/morph/proc/morph_color
+ add_verb(src, /mob/living/simple_mob/vore/morph/proc/morph_color)
return ..()
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm
index ad3abb09efe..e02408e979f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm
@@ -313,8 +313,8 @@
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
- verbs |= /mob/living/simple_mob/proc/animal_mount
- verbs |= /mob/living/proc/toggle_rider_reins
+ add_verb(src, /mob/living/simple_mob/proc/animal_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
movement_cooldown = 0
/mob/living/simple_mob/vore/otie/MouseDrop_T(mob/living/M, mob/living/user)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm b/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm
index a67f6c33b95..fb8e27e3c0e 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm
@@ -55,8 +55,8 @@
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
- verbs |= /mob/living/simple_mob/proc/animal_mount
- verbs |= /mob/living/proc/toggle_rider_reins
+ add_verb(src, /mob/living/simple_mob/proc/animal_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
movement_cooldown = 0
/mob/living/simple_mob/vore/aggressive/panther/MouseDrop_T(mob/living/M, mob/living/user)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm b/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm
index 76e9d0a2979..4495c320348 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm
@@ -78,8 +78,8 @@
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
- verbs |= /mob/living/simple_mob/proc/animal_mount
- verbs |= /mob/living/proc/toggle_rider_reins
+ add_verb(src, /mob/living/simple_mob/proc/animal_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
movement_cooldown = -1
/mob/living/simple_mob/vore/raptor/init_vore()
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 a52519d0a48..186dfbc9833 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm
@@ -165,7 +165,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
@@ -214,8 +214,8 @@
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
- verbs |= /mob/living/simple_mob/proc/animal_mount
- verbs |= /mob/living/proc/toggle_rider_reins
+ add_verb(src, /mob/living/simple_mob/proc/animal_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
movement_cooldown = 0
/mob/living/simple_mob/vore/aggressive/rat/MouseDrop_T(mob/living/M, mob/living/user)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/scel.dm b/code/modules/mob/living/simple_mob/subtypes/vore/scel.dm
index 42159314675..ce4ff0fe938 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/scel.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/scel.dm
@@ -86,12 +86,12 @@
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
- verbs |= /mob/living/simple_mob/proc/animal_mount
- verbs |= /mob/living/proc/toggle_rider_reins
- verbs |= /mob/living/proc/glow_toggle
- verbs |= /mob/living/proc/glow_color
- verbs |= /mob/living/proc/long_vore
- verbs |= /mob/living/proc/target_lunge
+ add_verb(src, /mob/living/simple_mob/proc/animal_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
+ add_verb(src, /mob/living/proc/glow_toggle)
+ add_verb(src, /mob/living/proc/glow_color)
+ add_verb(src, /mob/living/proc/long_vore)
+ add_verb(src, /mob/living/proc/target_lunge)
movement_cooldown = -1
/mob/living/simple_mob/vore/scel/init_vore()
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 326ee5973cc..81a37437cb1 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/sect_drone.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm
index 532bbdc5ff5..0c0adcc0a2f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm
@@ -88,7 +88,7 @@
/mob/living/simple_mob/vore/sect_drone/Login()
. = ..()
- verbs |= /mob/living/simple_mob/vore/sect_drone/proc/set_abdomen_color
+ add_verb(src, /mob/living/simple_mob/vore/sect_drone/proc/set_abdomen_color)
/mob/living/simple_mob/vore/sect_drone/proc/set_abdomen_color()
set name = "Set Glow Color"
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm
index 1ce45927653..15dfcf13687 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm
@@ -89,7 +89,7 @@
/mob/living/simple_mob/vore/sect_queen/Login()
. = ..()
- verbs |= /mob/living/simple_mob/vore/sect_queen/proc/set_abdomen_color
+ add_verb(src, /mob/living/simple_mob/vore/sect_queen/proc/set_abdomen_color)
/mob/living/simple_mob/vore/sect_queen/proc/set_abdomen_color()
set name = "Set Glow Color"
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 2927eb651c1..12598b1e940 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/shadekin/shadekin.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm
index b7108a9ae31..69977845274 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm
@@ -131,7 +131,7 @@
update_icon()
- verbs |= /mob/proc/adjust_hive_range
+ add_verb(src, /mob/proc/adjust_hive_range)
return ..()
@@ -225,14 +225,21 @@
add_overlay(tailimage)
add_overlay(eye_icon_state)
-/mob/living/simple_mob/shadekin/Stat()
- . = ..()
- if(statpanel("Shadekin"))
- abilities_stat()
+/mob/living/simple_mob/shadekin/update_misc_tabs()
+ ..()
+ var/list/L = list()
+ for(var/obj/effect/shadekin_ability/A as anything in shadekin_abilities)
+ var/client/C = client
+ var/img
+ if(C && istype(C)) //sanity checks
+ if(A.ability_name in C.misc_cache)
+ img = C.misc_cache[A.ability_name]
+ else
+ img = icon2html(A,C,sourceonly=TRUE)
+ C.misc_cache[A.ability_name] = img
-/mob/living/simple_mob/shadekin/proc/abilities_stat()
- for(var/obj/effect/shadekin_ability/ability as anything in shadekin_abilities)
- stat("[ability.ability_name]",ability.atom_button_text())
+ L[++L.len] = list("[A.ability_name]", A.ability_name, img, A.atom_button_text(), REF(A))
+ misc_tabs["Shadekin"] = L
//They phase back to the dark when killed
/mob/living/simple_mob/shadekin/death(gibbed, deathmessage = "phases to somewhere far away!")
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm
index 30ac2976288..ad58c3a43f3 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm
@@ -48,8 +48,8 @@
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
- verbs |= /mob/living/simple_mob/proc/animal_mount
- verbs |= /mob/living/proc/toggle_rider_reins
+ add_verb(src, /mob/living/simple_mob/proc/animal_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
movement_cooldown = -1
/mob/living/simple_mob/vore/sheep/MouseDrop_T(mob/living/M, mob/living/user)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm b/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm
index aaf4ccfd7c0..23d4260cec8 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm
@@ -57,8 +57,8 @@
/mob/living/simple_mob/vore/woof/New()
..()
- verbs += /mob/living/proc/ventcrawl
- verbs += /mob/living/proc/hide
+ add_verb(src, /mob/living/proc/ventcrawl)
+ add_verb(src, /mob/living/proc/hide)
/datum/say_list/softdog
speak = list("Woof~", "Woof!", "Yip!", "Yap!", "Yip~", "Yap~", "Awoooooo~", "Awoo!", "AwooooooooooOOOOOOoOooOoooOoOOoooo!")
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 95eb4bca090..db9606c346e 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm
@@ -72,7 +72,7 @@ List of things solar grubs should be able to do:
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/solargrub_larva.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm
index 1f91fdb5923..763e7386ab5 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm
@@ -60,7 +60,7 @@ var/global/list/grub_machine_overlays = list()
sparks = new(src)
sparks.set_up()
sparks.attach(src)
- verbs += /mob/living/proc/ventcrawl
+ add_verb(src, /mob/living/proc/ventcrawl)
/mob/living/simple_mob/animal/solargrub_larva/death()
powermachine.draining = 0
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 876e857c0cf..57aefb7ba6a 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/living/simple_mob/subtypes/vore/vore.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm
index 195480b6800..62a4ac73b55 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm
@@ -9,8 +9,8 @@
/mob/living/simple_mob/Login()
. = ..()
- verbs |= /mob/living/simple_mob/proc/set_name
- verbs |= /mob/living/simple_mob/proc/set_desc
+ add_verb(src, /mob/living/simple_mob/proc/set_name)
+ add_verb(src, /mob/living/simple_mob/proc/set_desc)
if(copy_prefs_to_mob)
login_prefs()
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm
index d59a89b1632..bf2535cd49f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm
@@ -102,8 +102,8 @@
. = ..()
if(!riding_datum)
riding_datum = new /datum/riding/simple_mob(src)
- verbs |= /mob/living/simple_mob/proc/animal_mount
- verbs |= /mob/living/proc/toggle_rider_reins
+ add_verb(src, /mob/living/simple_mob/proc/animal_mount)
+ add_verb(src, /mob/living/proc/toggle_rider_reins)
movement_cooldown = -1
/mob/living/simple_mob/vore/wolf/direwolf/MouseDrop_T(mob/living/M, mob/living/user)
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 4ff396fd0ac..dcb9c3d9a81 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -18,10 +18,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()
@@ -83,4 +83,5 @@
if(cloaked && cloaked_selfimage)
client.images += cloaked_selfimage
+ client.init_verbs()
SEND_SIGNAL(src, COMSIG_MOB_CLIENT_LOGIN, client)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 044f2ecd1fb..ec16537753d 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -90,7 +90,7 @@
return
// Added voice muffling for Issue 41.
if(stat == UNCONSCIOUS || sleeping > 0)
- to_chat(src, 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
@@ -339,7 +339,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()
@@ -387,7 +387,7 @@
set category = "OOC"
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"
@@ -634,7 +634,7 @@
playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 25) //Quieter than hugging/grabbing but we still want some audio feedback
if(H.pull_damage())
- to_chat(src, span_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))
@@ -694,86 +694,19 @@
for(var/mob/M in viewers())
M.see(message)
-/mob/Stat()
- ..()
- . = (is_client_active(10 MINUTES))
+/// Adds this list to the output to the stat browser
+/mob/proc/get_status_tab_items()
+ . = list()
- if(.)
- if(statpanel("Status"))
- stat(null, "Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)")
- if(ticker && ticker.current_state != GAME_STATE_PREGAME)
- stat("Station Time", stationtime2text())
- var/date = "[stationdate2text()], [capitalize(world_time_season)]"
- stat("Station Date", date)
- stat("Round Duration", roundduration2text())
-
- if(client.holder)
- if(statpanel("Status"))
- stat("Location:", "([x], [y], [z]) [loc]")
- stat("CPU:","[world.cpu]")
- stat("Instances:","[world.contents.len]")
- stat(null, "Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)")
- stat("Keys Held", keys2text(client.move_keys_held | client.mod_keys_held))
- stat("Next Move ADD", dirs2text(client.next_move_dir_add))
- stat("Next Move SUB", dirs2text(client.next_move_dir_sub))
- stat("Current size:", size_multiplier * 100)
-
- if(statpanel("MC"))
- stat("Location:", "([x], [y], [z]) [loc]")
- stat("CPU:","[world.cpu]")
- stat("Instances:","[world.contents.len]")
- stat("World Time:", world.time)
- stat("Real time of day:", REALTIMEOFDAY)
- stat(null)
- if(GLOB)
- GLOB.stat_entry()
- else
- stat("Globals:", "ERROR")
- if(Master)
- Master.stat_entry()
- else
- stat("Master Controller:", "ERROR")
- if(Failsafe)
- Failsafe.stat_entry()
- else
- stat("Failsafe Controller:", "ERROR")
- if(Master)
- stat(null)
- for(var/datum/controller/subsystem/SS in Master.subsystems)
- SS.stat_entry()
-
- if(statpanel("Tickets"))
- if(check_rights(R_ADMIN|R_SERVER,FALSE)) //Prevents non-staff from opening the list of ahelp tickets
- GLOB.ahelp_tickets.stat_entry()
-
-
- if(length(GLOB.sdql2_queries))
- if(statpanel("SDQL2"))
- stat("Access Global SDQL2 List", GLOB.sdql2_vv_statobj)
- for(var/datum/SDQL2_query/Q as anything in GLOB.sdql2_queries)
- Q.generate_stat()
-
- if(has_mentor_powers(client))
- if(statpanel("Tickets"))
- GLOB.mhelp_tickets.stat_entry()
-
- if(listed_turf && client)
- if(!TurfAdjacent(listed_turf))
- listed_turf = null
- else
- if(statpanel("Turf"))
- stat(listed_turf)
- for(var/atom/A in listed_turf)
- if(!A.mouse_opacity)
- continue
- if(A.invisibility > see_invisible)
- continue
- if(is_type_in_list(A, shouldnt_see))
- continue
- if(A.plane > plane)
- continue
- stat(A)
+/// Gets all relevant proc holders for the browser statpenl
+/mob/proc/get_proc_holders()
+ . = list()
+ //if(mind)
+ //. += get_spells_for_statpanel(mind.spell_list)
+ //. += get_spells_for_statpanel(mob_spell_list)
+/mob/proc/update_misc_tabs()
+ misc_tabs = list() //Reset misc_tabs every Stat() to prevent old shit sticking around
// facing verbs
/mob/proc/canface()
@@ -1003,12 +936,12 @@
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.
- src.verbs -= /mob/proc/yank_out_object
+ remove_verb(src, /mob/proc/yank_out_object)
clear_alert("embeddedobject")
if(ishuman(src))
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 83cea738c43..050738cb953 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -236,3 +236,5 @@
var/list/progressbars = null //VOREStation Edit
var/datum/focus //What receives our keyboard inputs. src by default
+ /// dict of custom stat tabs with data
+ var/list/list/misc_tabs = list()
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 2a583c7804d..a384f755b55 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -213,7 +213,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
@@ -434,7 +434,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)
@@ -448,7 +448,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
@@ -482,9 +482,9 @@ 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]")
+ say_dead_direct("The ghost of " + span_name("[name]") + " now [pick("skulks","lurks","prowls","creeps","stalks")] among the dead. [message]")
else
- say_dead_direct(" [name] no longer [pick("skulks","lurks","prowls","creeps","stalks")] in the realm of the dead. [message]")
+ say_dead_direct(span_name("[name]") + " no longer [pick("skulks","lurks","prowls","creeps","stalks")] in the realm of the dead. [message]")
/mob/proc/switch_to_camera(var/obj/machinery/camera/C)
if (!C.can_use() || stat || (get_dist(C, src) > 1 || machine != src || blinded || !canmove))
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index fd1042f0cca..2df28b1bb6f 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -428,7 +428,7 @@
//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 cfbcebbf420..938002d796c 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -50,6 +50,7 @@ var/obj/effect/lobby_image = new /obj/effect/lobby_image
created_for = ckey
new_player_panel()
+ client.init_verbs()
spawn(40)
if(client)
handle_privacy_poll()
@@ -87,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.suggested_byond_version)
chat_message += "We suggest using version [config.suggested_byond_version]."
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 8e4030ca394..06f034bf15c 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -8,6 +8,8 @@
var/show_hidden_jobs = 0 //Show jobs that are set to "Never" in preferences
var/has_respawned = FALSE //Determines if we're using RESPAWN_MESSAGE
var/datum/browser/panel
+ var/datum/tgui_module/crew_manifest/manifest = null
+ var/datum/tgui_module/late_choices/late_choices_dialog = null
universal_speak = 1
invisibility = 101
@@ -22,13 +24,17 @@
/mob/new_player/New()
mob_list += src
- verbs |= /mob/proc/insidePanel
+ add_verb(src, /mob/proc/insidePanel)
initialized = TRUE // Explicitly don't use Initialize(). New players join super early and use New()
/mob/new_player/Destroy()
if(panel)
QDEL_NULL(panel)
+ if(manifest)
+ QDEL_NULL(manifest)
+ if(late_choices_dialog)
+ QDEL_NULL(late_choices_dialog)
. = ..()
/mob/new_player/verb/new_player_panel()
@@ -39,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 \] "
+ output += " \[ " + span_linkOn(span_bold("Ready")) + " | Not Ready \] "
else
- output += " \[ Ready | Not Ready \] "
+ output += " \[ Ready | " + span_linkOn(span_bold("Not Ready")) + " \] "
else
output += " View the Crew Manifest"
@@ -111,36 +117,37 @@
panel.open()
return
-/mob/new_player/Stat()
- ..()
+/mob/new_player/get_status_tab_items()
+ . = ..()
+ . += ""
- if(statpanel("Lobby") && SSticker)
- stat("Game Mode:", SSticker.hide_mode ? "Secret" : "[config.mode_names[master_mode]]")
+ . += "Game Mode: [SSticker.hide_mode ? "Secret" : "[config.mode_names[master_mode]]"]"
- // if(SSvote.mode)
- // stat("Vote: [capitalize(SSvote.mode)]", "Time Left: [SSvote.time_remaining] s")
+ // if(SSvote.mode)
+ // . += "Vote: [capitalize(SSvote.mode)] Time Left: [SSvote.time_remaining] s"
- if(SSticker.current_state == GAME_STATE_INIT)
- stat("Time To Start:", "Server Initializing")
+ if(SSticker.current_state == GAME_STATE_INIT)
+ . += "Time To Start: Server Initializing"
- else if(SSticker.current_state == GAME_STATE_PREGAME)
- stat("Time To Start:", "[round(SSticker.pregame_timeleft,1)][round_progressing ? "" : " (DELAYED)"]")
- stat("Players: [totalPlayers]", "Players Ready: [totalPlayersReady]")
- totalPlayers = 0
- totalPlayersReady = 0
- var/datum/job/refJob = null
- for(var/mob/new_player/player in player_list)
- refJob = player.client.prefs.get_highest_job()
- if(player.client.prefs.obfuscate_key && player.client.prefs.obfuscate_job)
- stat("Anonymous User", (player.ready)?("Ready!"):(null))
- else if(player.client.prefs.obfuscate_key)
- stat("Anonymous User", (player.ready)?("(Playing as: [(refJob)?(refJob.title):("Unknown")])"):(null))
- else if(player.client.prefs.obfuscate_job)
- stat("[player.key]", (player.ready)?("Ready!"):(null))
- else
- stat("[player.key]", (player.ready)?("(Playing as: [(refJob)?(refJob.title):("Unknown")])"):(null))
- totalPlayers++
- if(player.ready)totalPlayersReady++
+ else if(SSticker.current_state == GAME_STATE_PREGAME)
+ . += "Time To Start: [round(SSticker.pregame_timeleft,1)][round_progressing ? "" : " (DELAYED)"]"
+ . += "Players: [totalPlayers]"
+ . += "Players Ready: [totalPlayersReady]"
+ totalPlayers = 0
+ totalPlayersReady = 0
+ var/datum/job/refJob = null
+ for(var/mob/new_player/player in player_list)
+ refJob = player.client.prefs.get_highest_job()
+ if(player.client.prefs.obfuscate_key && player.client.prefs.obfuscate_job)
+ . += "Anonymous User [player.ready ? "Ready!" : null]"
+ else if(player.client.prefs.obfuscate_key)
+ . += "Anonymous User [player.ready ? "(Playing as: [refJob ? refJob.title : "Unknown"])" : null]"
+ else if(player.client.prefs.obfuscate_job)
+ . += "[player.key] [player.ready ? "Ready!" : null]"
+ else
+ . += "[player.key] [player.ready ? "(Playing as: [refJob ? refJob.title : "Unknown"])" : null]"
+ totalPlayers++
+ if(player.ready)totalPlayersReady++
/mob/new_player/Topic(href, href_list[])
if(!client) return 0
@@ -191,9 +198,10 @@
observer.real_name = client.prefs.real_name
observer.name = observer.real_name
if(!client.holder && !config.antag_hud_allowed) // For new ghosts we remove the verb from even showing up if it's not allowed.
- observer.verbs -= /mob/observer/dead/verb/toggle_antagHUD // Poor guys, don't know what they are missing!
+ remove_verb(observer, /mob/observer/dead/verb/toggle_antagHUD) // Poor guys, don't know what they are missing!
observer.key = key
observer.set_respawn_timer(time_till_respawn()) // Will keep their existing time if any, or return 0 and pass 0 into set_respawn_timer which will use the defaults
+ observer.client.init_verbs()
qdel(src)
return 1
@@ -222,37 +230,6 @@
if(href_list["manifest"])
ViewManifest()
- if(href_list["SelectedJob"])
-
- /* Vorestation Removal Start
- //Prevents people rejoining as same character.
- for (var/mob/living/carbon/human/C in mob_list)
- var/char_name = client.prefs.real_name
- if(char_name == C.real_name)
- to_chat(usr, span_notice("There is a character that already exists with the same name - [C.real_name], please join with a different one, or use Quit the Round with the previous character.")) //VOREStation Edit
- return
- */ //Vorestation Removal End
-
- if(!config.enter_allowed)
- to_chat(usr, span_notice("There is an administrative lock on entering the game!"))
- return
- else if(ticker && ticker.mode && ticker.mode.explosion_in_progress)
- to_chat(usr, span_danger("The station is currently exploding. Joining would go poorly."))
- return
-
- if(!is_alien_whitelisted(src, GLOB.all_species[client.prefs.species]))
- tgui_alert(src, "You are currently not whitelisted to play [client.prefs.species].")
- return 0
-
- var/datum/species/S = GLOB.all_species[client.prefs.species]
-
- if(!(S.spawn_flags & SPECIES_CAN_JOIN))
- tgui_alert_async(src,"Your current species, [client.prefs.species], is not available for play on the station.")
- return 0
-
- AttemptLateSpawn(href_list["SelectedJob"],client.prefs.spawnpoint)
- return
-
if(href_list["privacy_poll"])
establish_db_connection()
if(!dbcon.IsConnected())
@@ -288,7 +265,7 @@
var/sql = "INSERT INTO erro_privacy VALUES (null, Now(), '[src.ckey]', '[option]')"
var/DBQuery/query_insert = dbcon.NewQuery(sql)
query_insert.Execute()
- to_chat(usr, " Thank you for your vote!")
+ to_chat(usr, span_bold("Thank you for your vote!"))
usr << browse(null,"window=privacypoll")
if(!ready && href_list["preference"])
@@ -385,7 +362,7 @@
dat += " "
dat += "[F["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)
@@ -517,6 +494,7 @@
if(imp.handle_implant(character,character.zone_sel.selecting))
imp.post_implant(character)
+ character.client.init_verbs()
qdel(src) // Delete new_player mob
/mob/new_player/proc/AnnounceCyborg(var/mob/living/character, var/rank, var/join_message, var/channel, var/zlevel)
@@ -528,53 +506,9 @@
global_announcer.autosay("A new[rank ? " [rank]" : " visitor" ] [join_message ? join_message : "has arrived on the station"].", "Arrivals Announcement Computer", channel, zlevels)
/mob/new_player/proc/LateChoices()
- var/name = client.prefs.be_random_name ? "friend" : client.prefs.real_name
-
- var/dat = " "
- dat += "Welcome, [name].
"
- dat += "Round Duration: [roundduration2text()]
"
-
- if(emergency_shuttle) //In case NanoTrasen decides reposess CentCom's shuttles.
- if(emergency_shuttle.going_to_centcom()) //Shuttle is going to CentCom, not recalled
- dat += "The station has been evacuated.
"
- if(emergency_shuttle.online())
- if (emergency_shuttle.evac) // Emergency shuttle is past the point of no recall
- dat += "The station is currently undergoing evacuation procedures.
"
- else // Crew transfer initiated
- dat += "The station is currently undergoing crew transfer procedures.
"
-
- dat += "Choose from the following open/valid positions:
"
- dat += "[show_hidden_jobs ? "Hide":"Show"] Hidden Jobs.
"
-
- var/deferred = ""
- for(var/datum/job/job in job_master.occupations)
- if(job && IsJobAvailable(job.title))
- // Checks for jobs with minimum age requirements
- if((job.minimum_character_age || job.min_age_by_species) && (client.prefs.age < job.get_min_age(client.prefs.species, client.prefs.organ_data["brain"])))
- continue
- // Checks for jobs set to "Never" in preferences //TODO: Figure out a better way to check for this
- if(!(client.prefs.GetJobDepartment(job, 1) & job.flag))
- if(!(client.prefs.GetJobDepartment(job, 2) & job.flag))
- if(!(client.prefs.GetJobDepartment(job, 3) & job.flag))
- if(!show_hidden_jobs && job.title != JOB_ALT_ASSISTANT) // Assistant is always an option
- continue
- var/active = 0
- // Only players with the job assigned and AFK for less than 10 minutes count as active
- for(var/mob/M in player_list) if(M.mind && M.client && M.mind.assigned_role == job.title && M.client.inactivity <= 10 MINUTES)
- active++
-
- var/string = "[job.title] ([job.current_positions]) (Active: [active])
"
-
- if(job.offmap_spawn) //At the bottom
- deferred += string
- else
- dat += string
-
- dat += deferred
-
- dat += ""
- src << browse(dat, "window=latechoices;size=300x640;can_close=1")
-
+ if(!late_choices_dialog)
+ late_choices_dialog = new(src)
+ late_choices_dialog.tgui_interact(src)
/mob/new_player/proc/create_character(var/turf/T)
spawning = 1
@@ -621,6 +555,7 @@
mind.transfer_to(new_character) //won't transfer key since the mind is not active
new_character.name = real_name
+ client.init_verbs()
new_character.dna.ready_dna(new_character)
new_character.dna.b_type = client.prefs.b_type
new_character.sync_organ_dna()
@@ -658,13 +593,16 @@
return new_character
/mob/new_player/proc/ViewManifest()
- var/datum/tgui_module/crew_manifest/self_deleting/S = new(src)
- S.tgui_interact(src)
+ if(!manifest)
+ manifest = new(src)
+ manifest.tgui_interact(src)
/mob/new_player/Move()
return 0
/mob/new_player/proc/close_spawn_windows()
+ manifest?.close_ui()
+ late_choices_dialog?.close_ui()
src << browse(null, "window=latechoices") //closes late choices window
src << browse(null, "window=preferences_window") //VOREStation Edit?
diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm
index 650344cd9d2..df882facddf 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 @@
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 e779ed04b28..9bf4c4a4978 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/new_player/sprite_accessories_tail_vr.dm b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm
index 3b6dd83b6cb..e516eb2ac6e 100644
--- a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm
+++ b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm
@@ -458,6 +458,34 @@
extra_overlay_w = "tigeralt-tips_w"
extra_overlay2_w = "tigeralt-tips2_w"
+/datum/sprite_accessory/tail/twotiger
+ name = "tiger tail, double (vwag)"
+ desc = ""
+ icon_state = "twotiger"
+ extra_overlay = "twotiger-tips"
+ extra_overlay2 = "twotiger-tips2"
+ do_colouration = 1
+ color_blend_mode = ICON_MULTIPLY
+ ani_state = "twotiger_w"
+ extra_overlay_w = "twotiger-tips_w"
+ extra_overlay2_w = "twotiger-tips2_w"
+
+/datum/sprite_accessory/tail/twocat
+ name = "cat tail, double (vwag)"
+ desc = ""
+ icon_state = "twocat"
+ ani_state = "twocat_w"
+ do_colouration = 1
+ color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/tail/threecat
+ name = "cat tail, triple (vwag)"
+ desc = ""
+ icon_state = "threecat"
+ ani_state = "threecat_w"
+ do_colouration = 1
+ color_blend_mode = ICON_MULTIPLY
+
/datum/sprite_accessory/tail/vulp_new
name = "new vulp tail (vwag)"
@@ -1549,4 +1577,9 @@
extra_overlay = "chonksqrl-m1"
extra_overlay2 = "chonksqrl-m2"
-//RS ADD END
\ No newline at end of file
+//RS ADD END
+
+/datum/sprite_accessory/tail/kururak
+ name = "kururak tail"
+ desc = ""
+ icon_state = "kururak"
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 4746cfbb297..43e853b1b5d 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -74,7 +74,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 85f07959f93..0ce22e0ec01 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)
@@ -322,14 +322,14 @@
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))
db << sound('sound/talksounds/subtle_sound.ogg', volume = 50)
f = TRUE
for(var/B in M.vore_organs)
for(var/mob/living/L in B)
if(L.absorbed)
- to_chat(L, 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))
L << sound('sound/talksounds/subtle_sound.ogg', volume = 50)
f = TRUE
@@ -340,7 +340,7 @@
if(M.read_preference(/datum/preference/toggle/subtle_sounds))
M << sound('sound/talksounds/subtle_sound.ogg', volume = 50)
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))
M << sound('sound/talksounds/subtle_sound.ogg', volume = 50)
for (var/mob/G in player_list)
@@ -420,14 +420,14 @@
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))
db << sound('sound/talksounds/subtle_sound.ogg', volume = 50)
f = TRUE
for(var/B in M.vore_organs)
for(var/mob/living/L in B)
if(L.absorbed)
- to_chat(L, 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))
L << sound('sound/talksounds/subtle_sound.ogg', volume = 50)
f = TRUE
@@ -438,7 +438,7 @@
if(M.read_preference(/datum/preference/toggle/subtle_sounds))
M << sound('sound/talksounds/subtle_sound.ogg', volume = 50)
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))
M << sound('sound/talksounds/subtle_sound.ogg', volume = 50)
for (var/mob/G in player_list)
@@ -470,9 +470,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 05c2c4cd3ba..a686e35de7b 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
@@ -216,7 +216,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
@@ -238,7 +238,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 c1dcc53195e..8cf049aff72 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 746357c61ce..db56742c036 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 a1dc794bb85..66fe8d90efe 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)
@@ -639,8 +639,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 13af6e8315e..656d56600e4 100644
--- a/code/modules/multiz/movement_vr.dm
+++ b/code/modules/multiz/movement_vr.dm
@@ -185,28 +185,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"
@@ -306,27 +306,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 0d55a9992a2..8d27c374211 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 cd0d0730797..09bc87b2eab 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/nif.dm b/code/modules/nifsoft/nif.dm
index 76967fbf982..04dc280ffb5 100644
--- a/code/modules/nifsoft/nif.dm
+++ b/code/modules/nifsoft/nif.dm
@@ -126,7 +126,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
human = H
human.nif = src
stat = NIF_INSTALLING
- H.verbs |= /mob/living/carbon/human/proc/set_nif_examine
+ add_verb(H, /mob/living/carbon/human/proc/set_nif_examine)
menu = H.AddComponent(/datum/component/nif_menu)
if(starting_software)
for(var/path in starting_software)
@@ -171,7 +171,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
stat = NIF_PREINSTALL
vis_update()
if(H)
- H.verbs -= /mob/living/carbon/human/proc/set_nif_examine
+ remove_verb(H, /mob/living/carbon/human/proc/set_nif_examine)
H.nif = null
qdel_null(menu)
human = null
@@ -691,7 +691,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
set category = "OOC"
if(!nif)
- verbs -= /mob/living/carbon/human/proc/set_nif_examine
+ remove_verb(src, /mob/living/carbon/human/proc/set_nif_examine)
to_chat(src,span_warning("You don't have a NIF, not sure why this was here."))
return
diff --git a/code/modules/nifsoft/nif_tgui.dm b/code/modules/nifsoft/nif_tgui.dm
index 4b57d577398..2c9227e5ad4 100644
--- a/code/modules/nifsoft/nif_tgui.dm
+++ b/code/modules/nifsoft/nif_tgui.dm
@@ -46,7 +46,7 @@
UnregisterSignal(screen_icon, COMSIG_CLICK)
qdel_null(screen_icon)
if(ishuman(parent))
- owner.verbs -= /mob/living/carbon/human/proc/nif_menu
+ remove_verb(owner, /mob/living/carbon/human/proc/nif_menu)
/datum/component/nif_menu/proc/create_mob_button(mob/user)
@@ -60,7 +60,7 @@
LAZYADD(HUD.other_important, screen_icon)
user.client?.screen += screen_icon
- user.verbs |= /mob/living/carbon/human/proc/nif_menu
+ add_verb(user, /mob/living/carbon/human/proc/nif_menu)
/datum/component/nif_menu/proc/nif_menu_click(source, location, control, params, user)
var/mob/living/carbon/human/H = user
diff --git a/code/modules/nifsoft/nifsoft.dm b/code/modules/nifsoft/nifsoft.dm
index 99247ec6001..fdb51c1ef9f 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 bf9eca000a2..7e5783cb25d 100644
--- a/code/modules/nifsoft/software/13_soulcatcher.dm
+++ b/code/modules/nifsoft/software/13_soulcatcher.dm
@@ -46,14 +46,14 @@
if((. = ..()))
//nif.set_flag(NIF_O_SCOTHERS,NIF_FLAGS_OTHER) //Only required on install if the flag is in the default setting_flags list defined few lines above.
if(nif?.human)
- nif.human.verbs |= /mob/proc/nsay
- nif.human.verbs |= /mob/proc/nme
+ add_verb(nif.human, /mob/proc/nsay)
+ add_verb(nif.human, /mob/proc/nme)
/datum/nifsoft/soulcatcher/uninstall()
QDEL_LIST_NULL(brainmobs)
if((. = ..()) && nif?.human) //Sometimes NIFs are deleted outside of a human
- nif.human.verbs -= /mob/proc/nsay
- nif.human.verbs -= /mob/proc/nme
+ remove_verb(nif.human, /mob/proc/nsay)
+ remove_verb(nif.human, /mob/proc/nme)
/datum/nifsoft/soulcatcher/proc/save_settings()
if(!nif)
@@ -74,13 +74,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)
@@ -88,17 +88,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)
@@ -113,11 +113,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)
@@ -145,7 +145,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
@@ -251,7 +251,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]"
@@ -259,8 +259,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 785f48b12de..3eb15d72ca6 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/internal/augment.dm b/code/modules/organs/internal/augment.dm
index 8f6cc818fdf..495bb3a281a 100644
--- a/code/modules/organs/internal/augment.dm
+++ b/code/modules/organs/internal/augment.dm
@@ -88,7 +88,7 @@
var/obj/item/organ/my_augment = null // Used to reference the object's host organ.
/obj/item/dropped(mob/user)
- . = ..()
+ . = ..(user)
if(src)
if(destroy_on_drop && !QDELETED(src))
qdel(src)
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index dd4d9e97b02..1ef703cc9f9 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -548,11 +548,11 @@ var/list/organ_cache = list()
if(!removed && organ_verbs && check_verb_compatability())
for(var/verb_path in organ_verbs)
- owner.verbs |= verb_path
+ add_verb(owner, verb_path)
else if(organ_verbs)
for(var/verb_path in organ_verbs)
if(!(verb_path in save_verbs))
- owner.verbs -= verb_path
+ remove_verb(owner, verb_path)
return
/obj/item/organ/proc/handle_organ_proc_special() // Called when processed.
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 9ec1dc24b59..d2d4b714dc9 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
..()
@@ -221,7 +221,7 @@
dislocated = 1
if(istype(owner))
- owner.verbs |= /mob/living/carbon/human/proc/relocate
+ add_verb(owner, /mob/living/carbon/human/proc/relocate)
/obj/item/organ/external/proc/relocate()
if(dislocated == -1)
@@ -235,7 +235,7 @@
for(var/obj/item/organ/external/limb in owner.organs)
if(limb.dislocated == 1)
return
- owner.verbs -= /mob/living/carbon/human/proc/relocate
+ remove_verb(owner, /mob/living/carbon/human/proc/relocate)
/obj/item/organ/external/update_health()
damage = min(max_damage, (brute_dam + burn_dam))
@@ -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
@@ -1223,7 +1223,7 @@ Note that amputating the affected organ does in fact remove the infection from t
owner.visible_message(span_danger("\The [W] sticks in the wound!"))
implants += W
owner.embedded_flag = 1
- owner.verbs += /mob/proc/yank_out_object
+ add_verb(owner, /mob/proc/yank_out_object)
owner.throw_alert("embeddedobject", /obj/screen/alert/embeddedobject)
W.add_blood(owner)
if(ismob(W.loc))
diff --git a/code/modules/organs/subtypes/slime.dm b/code/modules/organs/subtypes/slime.dm
index fa60367e93b..7cd0e3167bf 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 c25f65d0dad..23e2bae204b 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/overmap/overmap_object.dm b/code/modules/overmap/overmap_object.dm
index ad87d50e8b4..c6f43c4702f 100644
--- a/code/modules/overmap/overmap_object.dm
+++ b/code/modules/overmap/overmap_object.dm
@@ -3,7 +3,6 @@
icon = 'icons/obj/overmap.dmi'
icon_state = "object"
-
/// If set to TRUE will show up on ship sensors for detailed scans
var/scannable
/// Description for scans
@@ -26,14 +25,52 @@
//light_system = MOVABLE_LIGHT
light_on = FALSE
+ ///~~If we need to render a map for cameras and helms for this object~~ basically can you look at and use this as a ship or station.
+ var/render_map = FALSE
+
+ // Stuff needed to render the map
+ var/map_name
+ var/obj/screen/map_view/cam_screen
+ /// All the plane masters that need to be applied.
+ var/list/cam_plane_masters
+ var/obj/screen/background/cam_background
+
/obj/effect/overmap/Initialize()
. = ..()
if(!global.using_map.use_overmap)
return INITIALIZE_HINT_QDEL
+ if(render_map) // Initialize map objects
+ map_name = "overmap_[REF(src)]_map"
+ cam_screen = new
+ cam_screen.name = "screen"
+ cam_screen.assigned_map = map_name
+ cam_screen.del_on_map_removal = FALSE
+ cam_screen.screen_loc = "[map_name]:1,1"
+
+ cam_plane_masters = get_tgui_plane_masters()
+
+ for(var/obj/screen/instance as anything in cam_plane_masters)
+ instance.assigned_map = map_name
+ instance.del_on_map_removal = FALSE
+ instance.screen_loc = "[map_name]:CENTER"
+
+ cam_background = new
+ cam_background.assigned_map = map_name
+ cam_background.del_on_map_removal = FALSE
+ update_screen()
+
/obj/effect/overmap/Destroy()
real_appearance?.loc = null
real_appearance = null
+
+ if(cam_screen)
+ QDEL_NULL(cam_screen)
+ if(cam_plane_masters)
+ QDEL_LIST(cam_plane_masters)
+ if(cam_background)
+ QDEL_NULL(cam_background)
+
return ..()
//Overlay of how this object should look on other skyboxes
@@ -78,3 +115,21 @@
SSskybox.rebuild_skyboxes(other.map_z)
for(var/obj/effect/overmap/visitable/O in loc)
SSskybox.rebuild_skyboxes(O.map_z)
+
+/**
+ * Updates the screen object, which is displayed on all connected helms
+ */
+/obj/effect/overmap/proc/update_screen()
+ if(render_map)
+ var/list/visible_turfs = list()
+ for(var/turf/T in view(4, get_turf(src)))
+ visible_turfs += T
+
+ var/list/bbox = get_bbox_of_atoms(visible_turfs)
+ var/size_x = bbox[3] - bbox[1] + 1
+ var/size_y = bbox[4] - bbox[2] + 1
+
+ cam_screen?.vis_contents = visible_turfs
+ cam_background.icon_state = "clear"
+ cam_background.fill_rect(1, 1, size_x, size_y)
+ return TRUE
diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm
index c012eb323cd..5895b3bb849 100644
--- a/code/modules/overmap/ships/computers/helm.dm
+++ b/code/modules/overmap/ships/computers/helm.dm
@@ -94,8 +94,23 @@ GLOBAL_LIST_EMPTY(all_waypoints)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
+ user.client.register_map_obj(linked.cam_screen)
+ for(var/plane in linked.cam_plane_masters)
+ user.client.register_map_obj(plane)
+ user.client.register_map_obj(linked.cam_background)
+
ui = new(user, src, "OvermapHelm", "[linked.name] Helm Control") // 565, 545
ui.open()
+ addtimer(CALLBACK(src, PROC_REF(update_map)), 0.1 SECONDS)
+
+/obj/machinery/computer/ship/helm/proc/update_map()
+ linked.update_screen()
+
+/obj/machinery/computer/ship/helm/tgui_close(mob/user)
+ . = ..()
+
+ // Unregister map objects
+ user.client?.clear_map(linked?.map_name)
/obj/machinery/computer/ship/helm/tgui_data(mob/user)
var/list/data = ..()
@@ -103,6 +118,7 @@ GLOBAL_LIST_EMPTY(all_waypoints)
var/turf/T = get_turf(linked)
var/obj/effect/overmap/visitable/sector/current_sector = locate() in T
+ data["mapRef"] = linked?.map_name
data["sector"] = current_sector ? current_sector.name : "Deep Space"
data["sector_info"] = current_sector ? current_sector.desc : "Not Available"
data["landed"] = linked.get_landed_info()
@@ -155,6 +171,13 @@ GLOBAL_LIST_EMPTY(all_waypoints)
return FALSE
switch(action)
+ if("update_camera_view")
+ if(TIMER_COOLDOWN_RUNNING(src, COOLDOWN_SHIP_REFRESH))
+ to_chat(usr, span_warning("You cannot refresh the map so often."))
+ return
+ update_map()
+ TIMER_COOLDOWN_START(src, COOLDOWN_SHIP_REFRESH, 5 SECONDS)
+ . = TRUE
if("add")
var/datum/computer_file/data/waypoint/R = new()
var/sec_name = tgui_input_text(usr, "Input navigation entry name", "New navigation entry", "Sector #[known_sectors.len]", MAX_NAME_LEN)
diff --git a/code/modules/overmap/ships/ship.dm b/code/modules/overmap/ships/ship.dm
index 9beeada88c8..8394744fc35 100644
--- a/code/modules/overmap/ships/ship.dm
+++ b/code/modules/overmap/ships/ship.dm
@@ -17,6 +17,7 @@
icon_state = "ship_nosprite"
appearance_flags = TILE_BOUND|KEEP_TOGETHER|LONG_GLIDE //VOREStation Edit
light_power = 4
+ layer = OBJ_LAYER + 0.1 // make movables a little higher than regular sectors
unknown_name = "unknown ship"
unknown_state = "ship"
@@ -46,6 +47,7 @@
/// Vis contents overlay holding the ship's vector when in motion
var/obj/effect/overlay/vis/vector
+ render_map = TRUE
/obj/effect/overmap/visitable/ship/Initialize()
. = ..()
@@ -217,6 +219,7 @@
pixel_y = new_pixel_y
return
animate(src, pixel_x = new_pixel_x, pixel_y = new_pixel_y, time = wait, flags = ANIMATION_END_NOW)
+ update_screen()
// If we get moved, update our internal tracking to account for it
/obj/effect/overmap/visitable/ship/Moved(atom/old_loc, direction, forced = FALSE)
@@ -229,6 +232,7 @@
pixel_y = 0
position_x = ((loc.x - 1) * WORLD_ICON_SIZE) + MODULUS(position_x, WORLD_ICON_SIZE)
position_y = ((loc.y - 1) * WORLD_ICON_SIZE) + MODULUS(position_y, WORLD_ICON_SIZE)
+ update_screen()
/obj/effect/overmap/visitable/ship/update_icon()
if(!is_still())
diff --git a/code/modules/overmap/turfs.dm b/code/modules/overmap/turfs.dm
index 33c6b7cb042..6b264f3d0e8 100644
--- a/code/modules/overmap/turfs.dm
+++ b/code/modules/overmap/turfs.dm
@@ -11,6 +11,7 @@ var/global/list/map_sectors = list()
icon = 'icons/turf/space.dmi'
icon_state = "map"
alpha = 200
+ vis_flags = VIS_INHERIT_ID // disable VIS_INHERIT_PLANE
/turf/unsimulated/map/edge
opacity = 1
diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm
index 4b5154d84bf..aa944abb874 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 d7c7ecadbfd..577b1e76811 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -414,9 +414,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 bff59857fc9..0b11efd1303 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -601,15 +601,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')
@@ -662,15 +662,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.
|
"
//Costlier version of icon2html() that uses getFlatIcon() to account for overlays, underlays, etc. Use with extreme moderation, ESPECIALLY on mobs.
-/proc/costly_icon2html(thing, target, sourceonly = FALSE)
+/proc/costly_icon2html(thing, target, sourceonly = FALSE, force_south = FALSE)
if (!thing)
return
//if(SSlag_switch.measures[DISABLE_USR_ICON2HTML] && usr && !HAS_TRAIT(usr, TRAIT_BYPASS_MEASURES))
@@ -754,5 +756,5 @@ GLOBAL_LIST_EMPTY(cached_examine_icons)
if (isicon(thing))
return icon2html(thing, target)
- var/icon/I = getFlatIcon(thing)
+ var/icon/I = getFlatIcon(thing, force_south = force_south)
return icon2html(I, target, sourceonly = sourceonly)
diff --git a/code/_helpers/logging.dm b/code/_helpers/logging.dm
index 2b61a877ba2..57795108c76 100644
--- a/code/_helpers/logging.dm
+++ b/code/_helpers/logging.dm
@@ -74,42 +74,42 @@
//Log the message to in-game dialogue logs, as well.
if(speaker.client)
- speaker.dialogue_log += "([time_stamp()]) ([speaker]/[speaker.client]) SAY: - [text]"
- GLOB.round_text_log += "([time_stamp()]) ([speaker]/[speaker.client]) SAY: - [text]"
+ speaker.dialogue_log += span_bold("([time_stamp()])") + " (" + span_bold("[speaker]/[speaker.client]") + ") " + span_underline("SAY:") + " - " + span_green("[text]")
+ GLOB.round_text_log += span_bold("([time_stamp()])") + " (" + span_bold("[speaker]/[speaker.client]") + ") " + span_underline("SAY:") + " - " + span_green("[text]")
/proc/log_ooc(text, client/user)
if (config.log_ooc)
WRITE_LOG(diary, "OOC: [user.simple_info_line()]: [html_decode(text)]")
- GLOB.round_text_log += "([time_stamp()]) ([user]) OOC: - [text]"
+ GLOB.round_text_log += span_bold("([time_stamp()])") + " (" + span_bold("[user]") + ") " + span_underline("OOC:") + " - " + span_blue(span_bold("[text]"))
/proc/log_aooc(text, client/user)
if (config.log_ooc)
WRITE_LOG(diary, "AOOC: [user.simple_info_line()]: [html_decode(text)]")
- GLOB.round_text_log += "([time_stamp()]) ([user]) AOOC: - [text]"
+ GLOB.round_text_log += span_bold("([time_stamp()])") + " (" + span_bold("[user]") + ") " + span_underline("AOOC:") + " - " + span_red(span_bold("[text]"))
/proc/log_looc(text, client/user)
if (config.log_ooc)
WRITE_LOG(diary, "LOOC: [user.simple_info_line()]: [html_decode(text)]")
- GLOB.round_text_log += "([time_stamp()]) ([user]) LOOC: - [text]"
+ GLOB.round_text_log += span_bold("([time_stamp()])") + " (" + span_bold("[user]") + ") " + span_underline("LOOC:") + " - " + span_orange(span_bold("[text]"))
/proc/log_whisper(text, mob/speaker)
if (config.log_whisper)
WRITE_LOG(diary, "WHISPER: [speaker.simple_info_line()]: [html_decode(text)]")
if(speaker.client)
- speaker.dialogue_log += "([time_stamp()]) ([speaker]/[speaker.client]) SAY: - [text]"
- GLOB.round_text_log += "([time_stamp()]) ([speaker]/[speaker.client]) SAY: - [text]"
+ speaker.dialogue_log += span_bold("([time_stamp()])") + " (" + span_bold("[speaker]/[speaker.client]") + ") " + span_underline("SAY:") + " - " + span_gray(span_italics("[text]"))
+ GLOB.round_text_log += span_bold("([time_stamp()])") + " (" + span_bold("[speaker]/[speaker.client]") + ") " + span_underline("SAY:") + " - " + span_gray(span_italics("[text]"))
/proc/log_emote(text, mob/speaker)
if (config.log_emote)
WRITE_LOG(diary, "EMOTE: [speaker.simple_info_line()]: [html_decode(text)]")
if(speaker.client)
- speaker.dialogue_log += "([time_stamp()]) ([speaker]/[speaker.client]) EMOTE: - [text]"
- GLOB.round_text_log += "([time_stamp()]) ([speaker]/[speaker.client]) EMOTE: - [text]"
+ speaker.dialogue_log += span_bold("([time_stamp()])") + " (" + span_bold("[speaker]/[speaker.client]") + ") " + span_underline("EMOTE:") + " - " + span_pink("[text]")
+ GLOB.round_text_log += span_bold("([time_stamp()])") + " (" + span_bold("[speaker]/[speaker.client]") + ") " + span_underline("EMOTE:") + " - " + span_pink("[text]")
/proc/log_attack(attacker, defender, message)
if (config.log_attack)
@@ -131,8 +131,8 @@
if (config.log_say)
WRITE_LOG(diary, "DEADCHAT: [speaker.simple_info_line()]: [html_decode(text)]")
- speaker.dialogue_log += "([time_stamp()]) ([speaker]/[speaker.client]) DEADSAY: - [text]"
- GLOB.round_text_log += "([time_stamp()]) ([speaker]/[speaker.client]) DEADSAY: - [text]"
+ speaker.dialogue_log += span_bold("([time_stamp()])") + " (" + span_bold("[speaker]/[speaker.client]") + ") " + span_underline("DEADSAY:") + " - " + span_green("[text]")
+ GLOB.round_text_log += span_small(span_purple(span_bold("([time_stamp()])") + " (" + span_bold("[speaker]/[speaker.client]") + ") " + span_underline("DEADSAY:") + " - [text]"))
/proc/log_ghostemote(text, mob/speaker)
if (config.log_emote)
@@ -146,8 +146,8 @@
if (config.log_pda)
WRITE_LOG(diary, "PDA: [speaker.simple_info_line()]: [html_decode(text)]")
- speaker.dialogue_log += "([time_stamp()]) ([speaker]/[speaker.client]) MSG: - [text]"
- GLOB.round_text_log += "([time_stamp()]) ([speaker]/[speaker.client]) MSG: - [text]"
+ speaker.dialogue_log += span_bold("([time_stamp()])") + " (" + span_bold("[speaker]/[speaker.client]") + ") " + span_underline("MSG:") + " - " + span_darkgreen("[text]")
+ GLOB.round_text_log += span_bold("([time_stamp()])") + " (" + span_bold("[speaker]/[speaker.client]") + ") " + span_underline("MSG:") + " - " + span_darkgreen("[text]")
/proc/log_to_dd(text)
to_world_log(text) //this comes before the config check because it can't possibly runtime
diff --git a/code/_helpers/screen_objs.dm b/code/_helpers/screen_objs.dm
new file mode 100644
index 00000000000..00f6bd41570
--- /dev/null
+++ b/code/_helpers/screen_objs.dm
@@ -0,0 +1,115 @@
+/// Takes a screen loc string in the format
+/// "+-left-offset:+-pixel,+-bottom-offset:+-pixel"
+/// Where the :pixel is optional, and returns
+/// A list in the format (x_offset, y_offset)
+/// We require context to get info out of screen locs that contain relative info, so NORTH, SOUTH, etc
+/proc/screen_loc_to_offset(screen_loc, view)
+ if(!screen_loc)
+ return list(64, 64)
+ var/list/view_size = view_to_pixels(view)
+ var/x = 0
+ var/y = 0
+ // Time to parse for directional relative offsets
+ if(findtext(screen_loc, "EAST")) // If you're starting from the east, we start from the east too
+ x += view_size[1]
+ if(findtext(screen_loc, "WEST")) // HHHHHHHHHHHHHHHHHHHHHH WEST is technically a 1 tile offset from the start. Shoot me please
+ x += ICON_SIZE_X
+ if(findtext(screen_loc, "NORTH"))
+ y += view_size[2]
+ if(findtext(screen_loc, "SOUTH"))
+ y += ICON_SIZE_Y
+
+ var/list/x_and_y = splittext(screen_loc, ",")
+
+ var/list/x_pack = splittext(x_and_y[1], ":")
+ var/list/y_pack = splittext(x_and_y[2], ":")
+
+ var/x_coord = x_pack[1]
+ var/y_coord = y_pack[1]
+
+ if (findtext(x_coord, "CENTER"))
+ x += view_size[1] / 2
+
+ if (findtext(y_coord, "CENTER"))
+ y += view_size[2] / 2
+
+ x_coord = text2num(cut_relative_direction(x_coord))
+ y_coord = text2num(cut_relative_direction(y_coord))
+
+ x += x_coord * ICON_SIZE_X
+ y += y_coord * ICON_SIZE_Y
+
+ if(length(x_pack) > 1)
+ x += text2num(x_pack[2])
+ if(length(y_pack) > 1)
+ y += text2num(y_pack[2])
+ return list(x, y)
+
+/// Takes a list in the form (x_offset, y_offset)
+/// And converts it to a screen loc string
+/// Accepts an optional view string/size to force the screen_loc around, so it can't go out of scope
+/proc/offset_to_screen_loc(x_offset, y_offset, view = null)
+ if(view)
+ var/list/view_bounds = view_to_pixels(view)
+ x_offset = clamp(x_offset, ICON_SIZE_X, view_bounds[1])
+ y_offset = clamp(y_offset, ICON_SIZE_Y, view_bounds[2])
+
+ // Round with no argument is floor, so we get the non pixel offset here
+ var/x = round(x_offset / ICON_SIZE_X)
+ var/pixel_x = x_offset % ICON_SIZE_X
+ var/y = round(y_offset / ICON_SIZE_Y)
+ var/pixel_y = y_offset % ICON_SIZE_Y
+
+ var/list/generated_loc = list()
+ generated_loc += "[x]"
+ if(pixel_x)
+ generated_loc += ":[pixel_x]"
+ generated_loc += ",[y]"
+ if(pixel_y)
+ generated_loc += ":[pixel_y]"
+ return jointext(generated_loc, "")
+
+/**
+ * Returns a valid location to place a screen object without overflowing the viewport
+ *
+ * * target: The target location as a purely number based screen_loc string "+-left-offset:+-pixel,+-bottom-offset:+-pixel"
+ * * target_offset: The amount we want to offset the target location by. We explictly don't care about direction here, we will try all 4
+ * * view: The view variable of the client we're doing this for. We use this to get the size of the screen
+ *
+ * Returns a screen loc representing the valid location
+**/
+/proc/get_valid_screen_location(target_loc, target_offset, view)
+ var/list/offsets = screen_loc_to_offset(target_loc)
+ var/base_x = offsets[1]
+ var/base_y = offsets[2]
+
+ var/list/view_size = view_to_pixels(view)
+
+ // Bias to the right, down, left, and then finally up
+ if(base_x + target_offset < view_size[1])
+ return offset_to_screen_loc(base_x + target_offset, base_y, view)
+ if(base_y - target_offset > ICON_SIZE_Y)
+ return offset_to_screen_loc(base_x, base_y - target_offset, view)
+ if(base_x - target_offset > ICON_SIZE_X)
+ return offset_to_screen_loc(base_x - target_offset, base_y, view)
+ if(base_y + target_offset < view_size[2])
+ return offset_to_screen_loc(base_x, base_y + target_offset, view)
+ stack_trace("You passed in a scren location {[target_loc]} and offset {[target_offset]} that can't be fit in the viewport Width {[view_size[1]]}, Height {[view_size[2]]}. what did you do lad")
+ return null // The fuck did you do lad
+
+/// Takes a screen_loc string and cut out any directions like NORTH or SOUTH
+/proc/cut_relative_direction(fragment)
+ var/static/regex/regex = regex(@"([A-Z])\w+", "g")
+ return regex.Replace(fragment, "")
+
+/// Returns a screen_loc format for a tiling screen objects from start and end positions. Start should be bottom left corner, and end top right corner.
+/proc/spanning_screen_loc(start_px, start_py, end_px, end_py)
+ var/starting_tile_x = round(start_px / ICON_SIZE_X)
+ start_px -= starting_tile_x * ICON_SIZE_X
+ var/starting_tile_y = round(start_py/ ICON_SIZE_Y)
+ start_py -= starting_tile_y * ICON_SIZE_Y
+ var/ending_tile_x = round(end_px / ICON_SIZE_X)
+ end_px -= ending_tile_x * ICON_SIZE_X
+ var/ending_tile_y = round(end_py / ICON_SIZE_Y)
+ end_py -= ending_tile_y * ICON_SIZE_Y
+ return "[starting_tile_x]:[start_px],[starting_tile_y]:[start_py] to [ending_tile_x]:[end_px],[ending_tile_y]:[end_py]"
diff --git a/code/_helpers/time.dm b/code/_helpers/time.dm
index 802359a1b76..b1d372f435b 100644
--- a/code/_helpers/time.dm
+++ b/code/_helpers/time.dm
@@ -1,3 +1,7 @@
+//Returns the world time in english
+/proc/worldtime2text()
+ return gameTimestamp("hh:mm:ss", world.time)
+
#define TimeOfGame (get_game_time())
#define TimeOfTick (TICK_USAGE*0.01*world.tick_lag)
diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm
index 1a0d8434afe..c18a512db22 100644
--- a/code/_helpers/unsorted.dm
+++ b/code/_helpers/unsorted.dm
@@ -367,7 +367,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
if(isAI(src))
var/mob/living/silicon/ai/A = src
oldname = null//don't bother with the records update crap
- //to_world("[newname] is the AI!")
+ //to_world(span_world("[newname] is the AI!"))
//world << sound('sound/AI/newAI.ogg')
// Set eyeobj name
A.SetName(newname)
diff --git a/code/_helpers/verbs.dm b/code/_helpers/verbs.dm
new file mode 100644
index 00000000000..8a35bb9c6cf
--- /dev/null
+++ b/code/_helpers/verbs.dm
@@ -0,0 +1,94 @@
+/**
+ * handles adding verbs and updating the stat panel browser
+ *
+ * pass the verb type path to this instead of adding it directly to verbs so the statpanel can update
+ * Arguments:
+ * * target - Who the verb is being added to, client or mob typepath
+ * * verb - typepath to a verb, or a list of verbs, supports lists of lists
+ */
+/proc/add_verb(client/target, verb_or_list_to_add)
+ if(!target)
+ CRASH("add_verb called without a target")
+ if(IsAdminAdvancedProcCall())
+ return
+ var/mob/mob_target = null
+
+ if(ismob(target))
+ mob_target = target
+ target = mob_target.client
+ else if(!istype(target, /client))
+ CRASH("add_verb called on a non-mob and non-client")
+ var/list/verbs_list = list()
+ if(!islist(verb_or_list_to_add))
+ verbs_list += verb_or_list_to_add
+ else
+ var/list/verb_listref = verb_or_list_to_add
+ var/list/elements_to_process = verb_listref.Copy()
+ while(length(elements_to_process))
+ var/element_or_list = elements_to_process[length(elements_to_process)] //Last element
+ elements_to_process.len--
+ if(islist(element_or_list))
+ elements_to_process += element_or_list //list/a += list/b adds the contents of b into a, not the reference to the list itself
+ else
+ verbs_list += element_or_list
+
+ if(mob_target)
+ mob_target.verbs += verbs_list
+ if(!target)
+ return //Our work is done.
+ else
+ target.verbs += verbs_list
+
+ var/list/output_list = list()
+ for(var/thing in verbs_list)
+ var/procpath/verb_to_add = thing
+ output_list[++output_list.len] = list(verb_to_add.category, verb_to_add.name, verb_to_add.desc)
+
+ target.stat_panel.send_message("add_verb_list", output_list)
+
+/**
+ * handles removing verb and sending it to browser to update, use this for removing verbs
+ *
+ * pass the verb type path to this instead of removing it from verbs so the statpanel can update
+ * Arguments:
+ * * target - Who the verb is being removed from, client or mob typepath
+ * * verb - typepath to a verb, or a list of verbs, supports lists of lists
+ */
+/proc/remove_verb(client/target, verb_or_list_to_remove)
+ if(IsAdminAdvancedProcCall())
+ return
+
+ var/mob/mob_target = null
+ if(ismob(target))
+ mob_target = target
+ target = mob_target.client
+ else if(!istype(target, /client))
+ CRASH("remove_verb called on a non-mob and non-client")
+
+ var/list/verbs_list = list()
+ if(!islist(verb_or_list_to_remove))
+ verbs_list += verb_or_list_to_remove
+ else
+ var/list/verb_listref = verb_or_list_to_remove
+ var/list/elements_to_process = verb_listref.Copy()
+ while(length(elements_to_process))
+ var/element_or_list = elements_to_process[length(elements_to_process)] //Last element
+ elements_to_process.len--
+ if(islist(element_or_list))
+ elements_to_process += element_or_list //list/a += list/b adds the contents of b into a, not the reference to the list itself
+ else
+ verbs_list += element_or_list
+
+ if(mob_target)
+ mob_target.verbs -= verbs_list
+ if(!target)
+ return //Our work is done.
+ else
+ target.verbs -= verbs_list
+
+ var/list/output_list = list()
+ for(var/thing in verbs_list)
+ var/procpath/verb_to_remove = thing
+ output_list[++output_list.len] = list(verb_to_remove.category, verb_to_remove.name)
+
+ target.stat_panel.send_message("remove_verb_list", output_list)
diff --git a/code/_helpers/view.dm b/code/_helpers/view.dm
index be60a56697f..4615e0c97da 100644
--- a/code/_helpers/view.dm
+++ b/code/_helpers/view.dm
@@ -11,6 +11,15 @@
viewY = text2num(viewrangelist[2])
return list(viewX, viewY)
+/// Takes a string or num view, and converts it to pixel width/height in a list(pixel_width, pixel_height)
+/proc/view_to_pixels(view)
+ if(!view)
+ return list(0, 0)
+ var/list/view_info = getviewsize(view)
+ view_info[1] *= ICON_SIZE_X
+ view_info[2] *= ICON_SIZE_Y
+ return view_info
+
// Used to get `atom/O as obj|mob|turf in view()` to match against strings containing apostrophes immediately after substrings that match to other objects. Somehow. - Ater
/proc/_validate_atom(atom/A)
- return view()
\ No newline at end of file
+ return view()
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index d303529c1e0..3562ed09a7f 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -286,16 +286,9 @@
/atom/proc/AltClick(var/mob/user)
var/turf/T = get_turf(src)
if(T && user.TurfAdjacent(T))
- user.ToggleTurfTab(T)
+ user.set_listed_turf(T)
return 1
-/mob/proc/ToggleTurfTab(var/turf/T)
- if(listed_turf == T)
- listed_turf = null
- else
- listed_turf = T
- client.statpanel = "Turf"
-
/mob/proc/TurfAdjacent(var/turf/T)
return T.AdjacentQuick(src)
diff --git a/code/_onclick/hud/ability_screen_objects.dm b/code/_onclick/hud/ability_screen_objects.dm
index 905676ff17a..250e93823aa 100644
--- a/code/_onclick/hud/ability_screen_objects.dm
+++ b/code/_onclick/hud/ability_screen_objects.dm
@@ -312,7 +312,7 @@
if(object_used && verb_to_call)
call(object_used,verb_to_call)(arguments_to_use)
// call(object_used,verb_to_call)(arguments_to_use)
-// to_world("Attempted to call([object_used],[verb_to_call])([arguments_to_use])")
+// to_world(span_world("Attempted to call([object_used],[verb_to_call])([arguments_to_use])"))
// if(hascall(object_used, verb_to_call))
// call(object_used,verb_to_call)(arguments_to_use)
// else
diff --git a/code/_onclick/hud/action.dm b/code/_onclick/hud/action.dm
deleted file mode 100644
index 288c4799226..00000000000
--- a/code/_onclick/hud/action.dm
+++ /dev/null
@@ -1,228 +0,0 @@
-#define AB_ITEM 1
-#define AB_SPELL 2
-#define AB_INNATE 3
-#define AB_GENERIC 4
-
-
-/datum/action
- var/name = "Generic Action"
- var/action_type = AB_ITEM
- var/procname = null
- var/atom/movable/target = null
- var/check_flags = 0
- var/processing = 0
- var/active = 0
- var/obj/screen/movable/action_button/button = null
- var/button_icon = 'icons/mob/actions.dmi'
- var/button_icon_state = "default"
- var/background_icon_state = "bg_default"
- var/mob/living/owner
-
-/datum/action/New(var/Target)
- target = Target
-
-/datum/action/Destroy()
- if(owner)
- Remove(owner)
- target = null
- QDEL_NULL(button)
- return ..()
-
-/datum/action/proc/Grant(mob/living/T)
- if(owner)
- if(owner == T)
- return
- Remove(owner)
- owner = T
- owner.actions.Add(src)
- owner.update_action_buttons()
- return
-
-/datum/action/proc/Remove(mob/living/T)
- if(button)
- if(T.client)
- T.client.screen -= button
- QDEL_NULL(button)
- T.actions.Remove(src)
- T.update_action_buttons()
- owner = null
- return
-
-/datum/action/proc/Trigger()
- if(!Checks())
- return
- switch(action_type)
- if(AB_ITEM)
- if(target)
- var/obj/item/item = target
- item.ui_action_click()
- //if(AB_SPELL)
- // if(target)
- // var/obj/effect/proc_holder/spell = target
- // spell.Click()
- if(AB_INNATE)
- if(!active)
- Activate()
- else
- Deactivate()
- if(AB_GENERIC)
- if(target && procname)
- call(target,procname)(usr)
- return
-
-/datum/action/proc/Activate()
- return
-
-/datum/action/proc/Deactivate()
- return
-
-/datum/action/process()
- return
-
-/datum/action/proc/CheckRemoval(mob/living/user) // 1 if action is no longer valid for this mob and should be removed
- return 0
-
-/datum/action/proc/IsAvailable()
- return Checks()
-
-/datum/action/proc/Checks()// returns 1 if all checks pass
- if(!owner)
- return 0
- if(check_flags & AB_CHECK_RESTRAINED)
- if(owner.restrained())
- return 0
- if(check_flags & AB_CHECK_STUNNED)
- if(owner.stunned)
- return 0
- if(check_flags & AB_CHECK_LYING)
- if(owner.lying)
- return 0
- if(check_flags & AB_CHECK_ALIVE)
- if(owner.stat)
- return 0
- if(check_flags & AB_CHECK_INSIDE)
- if(!(target in owner))
- return 0
- return 1
-
-/datum/action/proc/UpdateName()
- return name
-
-/obj/screen/movable/action_button
- var/datum/action/owner
- screen_loc = "WEST,NORTH"
-
-/obj/screen/movable/action_button/Click(location,control,params)
- var/list/modifiers = params2list(params)
- if(modifiers["shift"])
- moved = 0
- return 1
- if(!usr.checkClickCooldown())
- return
- owner.Trigger()
- return 1
-
-/obj/screen/movable/action_button/proc/UpdateIcon()
- if(!owner)
- return
- icon = owner.button_icon
- icon_state = owner.background_icon_state
-
- cut_overlays()
- var/image/img
- if(owner.action_type == AB_ITEM && owner.target)
- var/obj/item/I = owner.target
- img = image(I.icon, src , I.icon_state)
- else if(owner.button_icon && owner.button_icon_state)
- img = image(owner.button_icon,src,owner.button_icon_state)
- img.pixel_x = 0
- img.pixel_y = 0
- add_overlay(img)
-
- if(!owner.IsAvailable())
- color = rgb(128,0,0,128)
- else
- color = rgb(255,255,255,255)
-
-//Hide/Show Action Buttons ... Button
-/obj/screen/movable/action_button/hide_toggle
- name = "Hide Buttons"
- icon = 'icons/mob/actions.dmi'
- icon_state = "bg_default"
- var/hidden = 0
-
-/obj/screen/movable/action_button/hide_toggle/Click()
- usr.hud_used.action_buttons_hidden = !usr.hud_used.action_buttons_hidden
-
- hidden = usr.hud_used.action_buttons_hidden
- if(hidden)
- name = "Show Buttons"
- else
- name = "Hide Buttons"
- UpdateIcon()
- usr.update_action_buttons()
-
-
-/obj/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(var/mob/living/user)
- if(isalien(user))
- icon_state = "bg_alien"
- else
- icon_state = "bg_default"
- UpdateIcon()
- return
-
-/obj/screen/movable/action_button/hide_toggle/UpdateIcon()
- cut_overlays()
- var/image/img = image(icon,src,hidden?"show":"hide")
- add_overlay(img)
- return
-
-//This is the proc used to update all the action buttons. Properly defined in /mob/living/
-/mob/proc/update_action_buttons()
- return
-
-#define AB_WEST_OFFSET 4
-#define AB_NORTH_OFFSET 26
-#define AB_MAX_COLUMNS 10
-
-/datum/hud/proc/ButtonNumberToScreenCoords(var/number) // TODO : Make this zero-indexed for readabilty
- var/row = round((number-1)/AB_MAX_COLUMNS)
- var/col = ((number - 1)%(AB_MAX_COLUMNS)) + 1
- var/coord_col = "+[col-1]"
- var/coord_col_offset = AB_WEST_OFFSET+2*col
- var/coord_row = "[-1 - row]"
- var/coord_row_offset = AB_NORTH_OFFSET
- return "WEST[coord_col]:[coord_col_offset],NORTH[coord_row]:[coord_row_offset]"
-
-/datum/hud/proc/SetButtonCoords(var/obj/screen/button,var/number)
- var/row = round((number-1)/AB_MAX_COLUMNS)
- var/col = ((number - 1)%(AB_MAX_COLUMNS)) + 1
- var/x_offset = 32*(col-1) + AB_WEST_OFFSET + 2*col
- var/y_offset = -32*(row+1) + AB_NORTH_OFFSET
-
- var/matrix/M = matrix()
- M.Translate(x_offset,y_offset)
- button.transform = M
-
-//Presets for item actions
-/datum/action/item_action
- check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_LYING|AB_CHECK_ALIVE|AB_CHECK_INSIDE
-
-/datum/action/item_action/CheckRemoval(mob/living/user)
- return !(target in user)
-
-/datum/action/item_action/hands_free
- check_flags = AB_CHECK_ALIVE|AB_CHECK_INSIDE
-
-#undef AB_WEST_OFFSET
-#undef AB_NORTH_OFFSET
-#undef AB_MAX_COLUMNS
-
-
-/datum/action/innate/
- action_type = AB_INNATE
-
-#undef AB_ITEM
-#undef AB_SPELL
-#undef AB_INNATE
-#undef AB_GENERIC
diff --git a/code/_onclick/hud/action/action.dm b/code/_onclick/hud/action/action.dm
new file mode 100644
index 00000000000..7e0c3ece55e
--- /dev/null
+++ b/code/_onclick/hud/action/action.dm
@@ -0,0 +1,156 @@
+/datum/action
+ var/name = "Generic Action"
+ var/atom/movable/target = null
+ var/check_flags = 0
+ var/processing = 0
+ var/obj/screen/movable/action_button/button = null
+ var/button_icon = 'icons/mob/actions.dmi'
+ var/button_icon_state = "default"
+ var/background_icon_state = "bg_default"
+ var/mob/living/owner
+
+/datum/action/New(Target)
+ target = Target
+ button = new
+ button.linked_action = src
+ button.name = name
+
+/datum/action/Destroy()
+ if(owner)
+ Remove(owner)
+ target = null
+ QDEL_NULL(button)
+ return ..()
+
+/datum/action/proc/Grant(mob/living/L)
+ if(owner)
+ if(owner == L)
+ return
+ Remove(owner)
+ owner = L
+ L.actions += src
+ if(L.client)
+ L.client.screen += button
+ L.update_action_buttons(TRUE)
+
+/datum/action/proc/Remove(mob/living/L)
+ if(L.client)
+ L.client.screen -= button
+ button.moved = FALSE
+ L.actions -= src
+ L.update_action_buttons(TRUE)
+ owner = null
+
+/datum/action/proc/Trigger()
+ if(!IsAvailable())
+ return 0
+ return 1
+
+/datum/action/process()
+ return
+
+/datum/action/proc/IsAvailable()
+ if(!owner)
+ return 0
+ if(check_flags & AB_CHECK_RESTRAINED)
+ if(owner.restrained())
+ return 0
+ if(check_flags & AB_CHECK_STUNNED)
+ if(owner.stunned)
+ return 0
+ if(check_flags & AB_CHECK_LYING)
+ if(owner.lying)
+ return 0
+ if(check_flags & AB_CHECK_CONSCIOUS)
+ if(owner.stat)
+ return 0
+ return 1
+
+/datum/action/proc/UpdateButtonIcon()
+ if(button)
+ button.icon = button_icon
+ button.icon_state = background_icon_state
+
+ ApplyIcon(button)
+
+ if(!IsAvailable())
+ button.color = rgb(128, 0, 0, 128)
+ else
+ button.color = rgb(255, 255, 255, 255)
+ return 1
+
+/datum/action/proc/ApplyIcon(obj/screen/movable/action_button/current_button)
+ current_button.cut_overlays()
+ if(button_icon && button_icon_state)
+ var/image/img
+ img = image(button_icon, current_button, button_icon_state)
+ img.pixel_x = 0
+ img.pixel_y = 0
+ current_button.add_overlay(img)
+
+//Presets for item actions
+/datum/action/item_action
+ check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_LYING|AB_CHECK_CONSCIOUS
+
+/datum/action/item_action/New(Target)
+ . = ..()
+ var/obj/item/I = target
+ I.actions += src
+
+/datum/action/item_action/Destroy()
+ var/obj/item/I = target
+ I.actions -= src
+ return ..()
+
+/datum/action/item_action/Trigger()
+ if(!..())
+ return 0
+ if(target)
+ var/obj/item/I = target
+ I.ui_action_click(owner, src.type)
+ return 1
+
+/datum/action/item_action/ApplyIcon(obj/screen/movable/action_button/current_button)
+ current_button.cut_overlays()
+ if(target)
+ var/mutable_appearance/ma = new(target.appearance)
+ ma.plane = FLOAT_PLANE
+ ma.layer = FLOAT_LAYER
+ ma.pixel_x = 0
+ ma.pixel_y = 0
+ current_button.add_overlay(ma)
+
+/datum/action/item_action/hands_free
+ check_flags = AB_CHECK_CONSCIOUS
+
+
+/datum/action/innate
+ check_flags = 0
+ var/active = 0
+
+/datum/action/innate/Trigger()
+ if(!..())
+ return 0
+ if(!active)
+ Activate()
+ else
+ Deactivate()
+ return 1
+
+/datum/action/innate/proc/Activate()
+ return
+
+/datum/action/innate/proc/Deactivate()
+ return
+
+//Preset for action that call specific procs (consider innate).
+/datum/action/generic
+ check_flags = 0
+ var/procname
+
+/datum/action/generic/Trigger()
+ if(!..())
+ return 0
+ if(target && procname)
+ call(target, procname)(usr)
+ return 1
diff --git a/code/_onclick/hud/action/action_screen_objects.dm b/code/_onclick/hud/action/action_screen_objects.dm
new file mode 100644
index 00000000000..f4b10fc001d
--- /dev/null
+++ b/code/_onclick/hud/action/action_screen_objects.dm
@@ -0,0 +1,132 @@
+
+/obj/screen/movable/action_button
+ var/datum/action/linked_action
+ screen_loc = null
+
+/obj/screen/movable/action_button/Click(location,control,params)
+ var/list/modifiers = params2list(params)
+ if(modifiers["shift"])
+ moved = FALSE
+ usr.update_action_buttons()
+ return 1
+ if(!usr.checkClickCooldown())
+ return
+ linked_action.Trigger()
+ return 1
+//Hide/Show Action Buttons ... Button
+/obj/screen/movable/action_button/hide_toggle
+ name = "Hide Buttons"
+ icon = 'icons/mob/actions.dmi'
+ icon_state = "bg_default"
+ var/hidden = 0
+
+/obj/screen/movable/action_button/hide_toggle/Click()
+ usr.hud_used.action_buttons_hidden = !usr.hud_used.action_buttons_hidden
+
+ hidden = usr.hud_used.action_buttons_hidden
+ if(hidden)
+ name = "Show Buttons"
+ else
+ name = "Hide Buttons"
+ UpdateIcon()
+ usr.update_action_buttons()
+
+/obj/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(var/mob/living/user)
+ if(isalien(user))
+ icon_state = "bg_alien"
+ else
+ icon_state = "bg_default"
+ UpdateIcon()
+
+/obj/screen/movable/action_button/hide_toggle/proc/UpdateIcon()
+ cut_overlays()
+ var/image/img = image(icon, src, hidden ? "show" : "hide")
+ add_overlay(img)
+
+/obj/screen/movable/action_button/MouseEntered(location, control, params)
+ openToolTip(usr, src, params, title = name, content = desc)
+
+/obj/screen/movable/action_button/MouseExited(location, control, params)
+ closeToolTip(usr)
+
+//used to update the buttons icon.
+/mob/proc/update_action_buttons_icon()
+ return
+
+/mob/living/update_action_buttons_icon()
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
+
+//This is the proc used to update all the action buttons. Properly defined in /mob/living/
+/mob/proc/update_action_buttons(reload_screen)
+ return
+
+/mob/living/update_action_buttons(reload_screen)
+ if(!hud_used || !client)
+ return
+
+ if(!hud_used.hud_shown) //Hud toggled to minimal
+ return
+
+ var/button_number = 0
+
+ if(hud_used.action_buttons_hidden)
+ for(var/datum/action/A in actions)
+ A.button.screen_loc = null
+ if(reload_screen)
+ client.screen += A.button
+ else
+ for(var/datum/action/A in actions)
+ button_number++
+ A.UpdateButtonIcon()
+ var/obj/screen/movable/action_button/B = A.button
+ if(!B.moved)
+ B.screen_loc = hud_used.ButtonNumberToScreenCoords(button_number)
+ else
+ B.screen_loc = B.moved
+ if(reload_screen)
+ client.screen += B
+
+ if(!button_number)
+ hud_used.hide_actions_toggle?.screen_loc = null
+ return
+
+ // not exactly sure how this happens but it does
+ if(hud_used.hide_actions_toggle)
+ if(!hud_used.hide_actions_toggle.moved)
+ hud_used.hide_actions_toggle.screen_loc = hud_used.ButtonNumberToScreenCoords(button_number+1)
+ else
+ hud_used.hide_actions_toggle.screen_loc = hud_used.hide_actions_toggle.moved
+ if(reload_screen)
+ client.screen += hud_used.hide_actions_toggle
+
+#define AB_WEST_OFFSET 4
+#define AB_NORTH_OFFSET 26
+#define AB_MAX_COLUMNS 10
+
+/datum/hud/proc/ButtonNumberToScreenCoords(var/number) // TODO : Make this zero-indexed for readabilty
+ var/row = round((number-1)/AB_MAX_COLUMNS)
+ var/col = ((number - 1)%(AB_MAX_COLUMNS)) + 1
+
+ var/coord_col = "+[col-1]"
+ var/coord_col_offset = AB_WEST_OFFSET+2*col
+
+ var/coord_row = "[-1 - row]"
+ var/coord_row_offset = AB_NORTH_OFFSET
+
+ return "WEST[coord_col]:[coord_col_offset],NORTH[coord_row]:[coord_row_offset]"
+
+/datum/hud/proc/SetButtonCoords(var/obj/screen/button,var/number)
+ var/row = round((number-1)/AB_MAX_COLUMNS)
+ var/col = ((number - 1)%(AB_MAX_COLUMNS)) + 1
+ var/x_offset = 32*(col-1) + AB_WEST_OFFSET + 2*col
+ var/y_offset = -32*(row+1) + AB_NORTH_OFFSET
+
+ var/matrix/M = matrix()
+ M.Translate(x_offset,y_offset)
+ button.transform = M
+
+#undef AB_WEST_OFFSET
+#undef AB_NORTH_OFFSET
+#undef AB_MAX_COLUMNS
diff --git a/code/_onclick/hud/action/types/item.dm b/code/_onclick/hud/action/types/item.dm
new file mode 100644
index 00000000000..df2d770aec5
--- /dev/null
+++ b/code/_onclick/hud/action/types/item.dm
@@ -0,0 +1,161 @@
+// Generic Classes
+/datum/action/item_action/activate
+
+/datum/action/item_action/activate/New(Target, name)
+ . = ..()
+ src.name = name
+ button.name = name
+
+// Specific names
+/datum/action/item_action/toggle_grippers
+ name = "Toggle Grippers"
+
+/datum/action/item_action/toggle_talons
+ name = "Toggle Talons"
+
+/datum/action/item_action/toggle_goggles
+ name = "Toggle Goggles"
+
+/datum/action/item_action/toggle_shield_projector
+ name = "Toggle Shield Projector"
+
+/datum/action/item_action/toggle_tesla_armor
+ name = "Toggle Tesla Armor"
+
+/datum/action/item_action/remove_replace_paddles
+ name = "Remove/Replace Paddles"
+
+/datum/action/item_action/toggle_flashlight
+ name = "Toggle Flashlight"
+
+/datum/action/item_action/toggle_shield
+ name = "Toggle Shield"
+
+/datum/action/item_action/toggle_heatsink
+ name = "Toggle Heatsink"
+
+/datum/action/item_action/remove_replace_handset
+ name = "Remove/Replace Handset"
+
+/datum/action/item_action/command
+ name = "Command"
+
+/datum/action/item_action/toggle_jetpack
+ name = "Toggle Jetpack"
+
+/datum/action/item_action/toggle_cataloguer
+ name = "Toggle Cataloguer"
+
+/datum/action/item_action/toggle_eyepatch
+ name = "Toggle Eyepatch"
+
+/datum/action/item_action/hands_free/change_scanning_pattern
+ name = "Change Scanning Pattern"
+
+/datum/action/item_action/toggle_hud
+ name = "Toggle HUD"
+
+/datum/action/item_action/toggle_mode
+ name = "Toggle Mode"
+
+/datum/action/item_action/flip_welding_goggles
+ name = "Flip Welding Goggles"
+
+/datum/action/item_action/toggle_monocle
+ name = "Toggle Monocle"
+
+/datum/action/item_action/adjust_orange_goggles
+ name = "Adjust Orange Goggles"
+
+/datum/action/item_action/ar_console_crew
+ name = "AR Console (Crew Monitor)"
+
+/datum/action/item_action/ar_console_security_alerts
+ name = "AR Console (Security Alerts)"
+
+/datum/action/item_action/ar_console_station_alerts
+ name = "AR Console (Station Alerts)"
+
+/datum/action/item_action/ar_console_all_alerts
+ name = "AR Console (All Alerts)"
+
+/datum/action/item_action/toggle_head_light
+ name = "Toggle Head-light"
+
+/datum/action/item_action/toggle_visor
+ name = "Toggle Visor"
+
+/datum/action/item_action/flip_welding_mask
+ name = "Flip Welding Mask"
+
+/datum/action/item_action/adjust_breath_mask
+ name = "Adjust Breath Mask"
+
+/datum/action/item_action/toggle_feeding_port
+ name = "Toggle Feeding Port"
+
+/datum/action/item_action/halt
+ name = "HALT!"
+
+/datum/action/item_action/hands_free/redraw_design
+ name = "Redraw Design"
+
+/datum/action/item_action/toggle_magboots
+ name = "Toggle Magboots"
+
+/datum/action/item_action/toggle_magclaws
+ name = "Toggle Magclaws"
+
+/datum/action/item_action/activate_jump_boots
+ name = "Activate Jump Boots"
+
+/datum/action/item_action/toggle_helmet_light
+ name = "Toggle Helmet Light"
+
+/datum/action/item_action/hardsuit_interface
+ name = "Hardsuit Interface"
+
+/datum/action/item_action/toggle_helmet
+ name = "Toggle Helmet"
+
+/datum/action/item_action/toggle_knight_headgear
+ name = "Toggle Knight Headgear"
+
+/datum/action/item_action/toggle_hood
+ name = "Toggle Hood"
+
+/datum/action/item_action/adjust_cloak
+ name = "Adjust Cloak"
+
+/datum/action/item_action/adjust_poncho
+ name = "Adjust Poncho"
+
+/datum/action/item_action/pull_on_gaiter
+ name = "Pull On Gaiter"
+
+/datum/action/item_action/toggle_uv_light
+ name = "Toggle UV Light"
+
+/datum/action/item_action/toggle_light
+ name = "Toggle Light"
+
+/datum/action/item_action/use_scope
+ name = "Use Scope"
+
+/datum/action/item_action/aim_down_sights
+ name = "Aim Down Sights"
+
+/datum/action/item_action/toggle_gunlight
+ name = "Toggle Gun-light"
+
+/datum/action/item_action/toggle_internal_generator
+ name = "Toggle Internal Generator"
+
+/datum/action/item_action/toggle_stock
+ name = "Toggle Stock"
+
+/datum/action/item_action/toggle_pom_pom
+ name = "Toggle Pom-Pom"
+
+/datum/action/item_action/toggle_mlembulance
+ name = "Toggle Mlembulance Mode"
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index 123d94a7d84..7ba7bba1e1e 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -207,6 +207,7 @@ var/list/global_huds = list(
/datum/hud/Destroy()
. = ..()
QDEL_NULL_LIST(minihuds)
+ QDEL_NULL(hide_actions_toggle)
grab_intent = null
hurt_intent = null
disarm_intent = null
@@ -322,10 +323,12 @@ var/list/global_huds = list(
return 0
mymob.create_mob_hud(src)
+ hide_actions_toggle = new()
+ hide_actions_toggle.InitialiseIcon(mymob)
persistant_inventory_update()
mymob.reload_fullscreen() // Reload any fullscreen overlays this mob has.
- mymob.update_action_buttons()
+ mymob.update_action_buttons(TRUE)
reorganize_alerts()
/mob/proc/create_mob_hud(datum/hud/HUD, apply_to_client = TRUE)
@@ -404,10 +407,11 @@ var/list/global_huds = list(
hud_used?.action_intent.screen_loc = ui_acti //Restore intent selection to the original position
client.screen += zone_sel //This one is a special snowflake
+ client.screen += hud_used.hide_actions_toggle
hud_used.hidden_inventory_update()
hud_used.persistant_inventory_update()
- update_action_buttons()
+ update_action_buttons(TRUE)
hud_used.reorganize_alerts()
return TRUE
@@ -467,7 +471,7 @@ var/list/global_huds = list(
hud_used.hidden_inventory_update()
hud_used.persistant_inventory_update()
- update_action_buttons()
+ update_action_buttons(TRUE)
/mob/proc/add_click_catcher()
client.screen += client.void
diff --git a/code/_onclick/hud/movable_screen_objects.dm b/code/_onclick/hud/movable_screen_objects.dm
index 39d36738aa0..53e64c8b246 100644
--- a/code/_onclick/hud/movable_screen_objects.dm
+++ b/code/_onclick/hud/movable_screen_objects.dm
@@ -9,9 +9,10 @@
//Not tied to the grid, places it's center where the cursor is
/obj/screen/movable
+ mouse_drag_pointer = 'icons/effects/mouse_pointers/screen_drag.dmi'
var/snap2grid = FALSE
var/moved = FALSE
- var/x_off = -16
+ var/x_off = -16
var/y_off = -16
//Snap Screen Object
@@ -22,30 +23,33 @@
/obj/screen/movable/MouseDrop(over_object, src_location, over_location, src_control, over_control, params)
- var/list/PM = params2list(params)
-
- //No screen-loc information? abort.
- if(!PM || !PM["screen-loc"])
+ var/position = mouse_params_to_position(params)
+ if(!position)
return
- //Split screen-loc up into X+Pixel_X and Y+Pixel_Y
- var/list/screen_loc_params = splittext(PM["screen-loc"], ",")
+ screen_loc = position
+ moved = screen_loc
- //Split X+Pixel_X up into list(X, Pixel_X)
- var/list/screen_loc_X = splittext(screen_loc_params[1],":")
- screen_loc_X[1] = encode_screen_X(text2num(screen_loc_X[1]))
- //Split Y+Pixel_Y up into list(Y, Pixel_Y)
- var/list/screen_loc_Y = splittext(screen_loc_params[2],":")
- screen_loc_Y[1] = encode_screen_Y(text2num(screen_loc_Y[1]))
+/// Takes mouse parmas as input, returns a string representing the appropriate mouse position
+/obj/screen/movable/proc/mouse_params_to_position(params)
+ var/list/modifiers = params2list(params)
+
+ //No screen-loc information? abort.
+ if(!LAZYACCESS(modifiers, SCREEN_LOC))
+ return
+
+ var/client/our_client = usr.client
+ var/list/offset = screen_loc_to_offset(LAZYACCESS(modifiers, SCREEN_LOC), our_client?.view)
if(snap2grid) //Discard Pixel Values
- screen_loc = "[screen_loc_X[1]],[screen_loc_Y[1]]"
-
+ offset[1] = FLOOR(offset[1], ICON_SIZE_X) // drops any pixel offset
+ offset[2] = FLOOR(offset[2], ICON_SIZE_Y) // drops any pixel offset
else //Normalise Pixel Values (So the object drops at the center of the mouse, not 16 pixels off)
- var/pix_X = text2num(screen_loc_X[2]) + x_off
- var/pix_Y = text2num(screen_loc_Y[2]) + y_off
- screen_loc = "[screen_loc_X[1]]:[pix_X],[screen_loc_Y[1]]:[pix_Y]"
+ offset[1] += x_off
+ offset[2] += y_off
+ return offset_to_screen_loc(offset[1], offset[2], our_client?.view)
+// Must stay for now, for subtypes
/obj/screen/movable/proc/encode_screen_X(X)
var/view_dist = world.view
if(view_dist)
diff --git a/code/_onclick/hud/screen_objects_vr.dm b/code/_onclick/hud/screen_objects_vr.dm
index ea4fbaa9a47..d3e43bb628a 100644
--- a/code/_onclick/hud/screen_objects_vr.dm
+++ b/code/_onclick/hud/screen_objects_vr.dm
@@ -6,23 +6,23 @@
if("darkness")
var/turf/T = get_turf(usr)
var/darkness = round(1 - T.get_lumcount(),0.1)
- to_chat(usr,span_notice("Darkness: [darkness]"))
+ to_chat(usr,span_notice(span_bold("Darkness:") + " [darkness]"))
if("energy")
var/mob/living/simple_mob/shadekin/SK = usr
if(istype(SK))
- to_chat(usr,span_notice("Energy: [SK.energy] ([SK.dark_gains])"))
+ to_chat(usr,span_notice(span_bold("Energy:") + " [SK.energy] ([SK.dark_gains])"))
if("shadekin status")
var/turf/T = get_turf(usr)
if(T)
var/darkness = round(1 - T.get_lumcount(),0.1)
- to_chat(usr,span_notice("Darkness: [darkness]"))
+ to_chat(usr,span_notice(span_bold("Darkness:") + " [darkness]"))
var/mob/living/carbon/human/H = usr
if(istype(H) && istype(H.species, /datum/species/shadekin))
- to_chat(usr,span_notice("Energy: [H.shadekin_get_energy(H)]"))
+ to_chat(usr,span_notice(span_bold("Energy:") + " [H.shadekin_get_energy(H)]"))
if("glamour")
var/mob/living/carbon/human/H = usr
if(istype(H))
- to_chat(usr,span_notice("Energy: [H.species.lleill_energy]/[H.species.lleill_energy_max]"))
+ to_chat(usr,span_notice(span_bold("Energy:") + " [H.species.lleill_energy]/[H.species.lleill_energy_max]"))
if("danger level")
var/mob/living/carbon/human/H = usr
if(istype(H) && istype(H.species, /datum/species/xenochimera))
diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm
index 75d1208a402..f8dc673b5f9 100644
--- a/code/_onclick/observer.dm
+++ b/code/_onclick/observer.dm
@@ -41,7 +41,7 @@
if(modifiers["alt"]) // alt and alt-gr (rightalt)
var/turf/T = get_turf(A)
if(T && TurfAdjacent(T))
- ToggleTurfTab(T)
+ set_listed_turf(T)
return
// You are responsible for checking config.ghost_interaction when you override this function
// Not all of them require checking, see below
diff --git a/code/_onclick/rig.dm b/code/_onclick/rig.dm
index 2284226b373..dc57ad2150c 100644
--- a/code/_onclick/rig.dm
+++ b/code/_onclick/rig.dm
@@ -1,11 +1,11 @@
-#define MIDDLE_CLICK 0
-#define ALT_CLICK 1
-#define CTRL_CLICK 2
+#define HARDSUIT_MIDDLE_CLICK 0
+#define HARDSUIT_ALT_CLICK 1
+#define HARDSUIT_CTRL_CLICK 2
#define MAX_HARDSUIT_CLICK_MODE 2
/client
- var/hardsuit_click_mode = MIDDLE_CLICK
+ var/hardsuit_click_mode = HARDSUIT_MIDDLE_CLICK
/client/verb/toggle_hardsuit_mode()
set name = "Toggle Hardsuit Activation Mode"
@@ -17,32 +17,32 @@
hardsuit_click_mode = 0
switch(hardsuit_click_mode)
- if(MIDDLE_CLICK)
+ if(HARDSUIT_MIDDLE_CLICK)
to_chat(src, "Hardsuit activation mode set to middle-click.")
- if(ALT_CLICK)
+ if(HARDSUIT_ALT_CLICK)
to_chat(src, "Hardsuit activation mode set to alt-click.")
- if(CTRL_CLICK)
+ if(HARDSUIT_CTRL_CLICK)
to_chat(src, "Hardsuit activation mode set to control-click.")
else
// should never get here, but just in case:
soft_assert(0, "Bad hardsuit click mode: [hardsuit_click_mode] - expected 0 to [MAX_HARDSUIT_CLICK_MODE]")
to_chat(src, "Somehow you bugged the system. Setting your hardsuit mode to middle-click.")
- hardsuit_click_mode = MIDDLE_CLICK
+ hardsuit_click_mode = HARDSUIT_MIDDLE_CLICK
/mob/living/MiddleClickOn(atom/A)
- if(client && client.hardsuit_click_mode == MIDDLE_CLICK)
+ if(client && client.hardsuit_click_mode == HARDSUIT_MIDDLE_CLICK)
if(HardsuitClickOn(A))
return
..()
/mob/living/AltClickOn(atom/A)
- if(client && client.hardsuit_click_mode == ALT_CLICK)
+ if(client && client.hardsuit_click_mode == HARDSUIT_ALT_CLICK)
if(HardsuitClickOn(A))
return
..()
/mob/living/CtrlClickOn(atom/A)
- if(client && client.hardsuit_click_mode == CTRL_CLICK)
+ if(client && client.hardsuit_click_mode == HARDSUIT_CTRL_CLICK)
if(HardsuitClickOn(A))
return
..()
@@ -78,7 +78,7 @@
return 1
return 0
-#undef MIDDLE_CLICK
-#undef ALT_CLICK
-#undef CTRL_CLICK
+#undef HARDSUIT_MIDDLE_CLICK
+#undef HARDSUIT_ALT_CLICK
+#undef HARDSUIT_CTRL_CLICK
#undef MAX_HARDSUIT_CLICK_MODE
diff --git a/code/controllers/autotransfer.dm b/code/controllers/autotransfer.dm
index e94163ea464..d303142886a 100644
--- a/code/controllers/autotransfer.dm
+++ b/code/controllers/autotransfer.dm
@@ -19,7 +19,7 @@ var/datum/controller/transfer_controller/transfer_controller
//VOREStation Edit START
if (round_duration_in_ds >= shift_last_vote - 2 MINUTES)
shift_last_vote = 99999999 //Setting to a stupidly high number since it'll be not used again.
- to_world("Warning: You have one hour left in the shift. Wrap up your scenes in the next 60 minutes before the transfer is called.") //VOREStation Edit
+ to_world(span_world(span_notice("Warning: You have one hour left in the shift. Wrap up your scenes in the next 60 minutes before the transfer is called."))) //VOREStation Edit
if (round_duration_in_ds >= shift_hard_end - 1 MINUTE)
init_shift_change(null, 1)
shift_hard_end = timerbuffer + config.vote_autotransfer_interval //If shuttle somehow gets recalled, let's force it to call again next time a vote would occur.
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index bd846d11bcd..ff3deb6adbd 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -71,7 +71,7 @@ var/list/gamemode_cache = list()
var/static/respawn = 1
var/static/respawn_time = 3000 // time before a dead player is allowed to respawn (in ds, though the config file asks for minutes, and it's converted below)
- var/static/respawn_message = span_notice("Make sure to play a different character, and please roleplay correctly!")
+ var/static/respawn_message = span_boldnotice("Make sure to play a different character, and please roleplay correctly!")
var/static/guest_jobban = 1
var/static/usewhitelist = 0
@@ -529,7 +529,7 @@ var/list/gamemode_cache = list()
config.respawn_time = raw_minutes MINUTES
if ("respawn_message")
- config.respawn_message = span_notice("[value]")
+ config.respawn_message = span_boldnotice("[value]")
if ("servername")
config.server_name = value
diff --git a/code/controllers/controller.dm b/code/controllers/controller.dm
index c9d5f1e5650..1f0a01a072c 100644
--- a/code/controllers/controller.dm
+++ b/code/controllers/controller.dm
@@ -16,4 +16,4 @@
/datum/controller/proc/Recover()
-/datum/controller/proc/stat_entry()
+/datum/controller/proc/stat_entry(msg)
diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm
index 3022944ec32..dfe8bc7234d 100644
--- a/code/controllers/failsafe.dm
+++ b/code/controllers/failsafe.dm
@@ -96,8 +96,9 @@ var/datum/controller/failsafe/Failsafe
/datum/controller/failsafe/proc/defcon_pretty()
return defcon
-/datum/controller/failsafe/stat_entry()
+/datum/controller/failsafe/stat_entry(msg)
if(!statclick)
statclick = new/obj/effect/statclick/debug(null, "Initializing...", src)
- stat("Failsafe Controller:", statclick.update("Defcon: [defcon_pretty()] (Interval: [Failsafe.processing_interval] | Iteration: [Failsafe.master_iteration])"))
+ msg = "Failsafe Controller: [statclick.update("Defcon: [defcon_pretty()] (Interval: [Failsafe.processing_interval] | Iteration: [Failsafe.master_iteration])")]"
+ return msg
diff --git a/code/controllers/globals.dm b/code/controllers/globals.dm
index cd6e7544dd4..bf9c7e1e9ce 100644
--- a/code/controllers/globals.dm
+++ b/code/controllers/globals.dm
@@ -32,11 +32,12 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars)
return ..()
-/datum/controller/global_vars/stat_entry()
+/datum/controller/global_vars/stat_entry(msg)
if(!statclick)
statclick = new/obj/effect/statclick/debug(null, "Initializing...", src)
- stat("GLOB:", statclick.update("Edit"))
+ msg = "GLOB: [statclick.update("Edit")]"
+ return msg
/datum/controller/global_vars/vv_edit_var(var_name, var_value)
if(gvars_datum_protected_varlist[var_name])
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 49f34a5c978..049e687a95f 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -582,12 +582,14 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
-/datum/controller/master/stat_entry()
+/datum/controller/master/stat_entry(msg)
if(!statclick)
statclick = new/obj/effect/statclick/debug(null, "Initializing...", src)
- stat("Byond:", "(FPS:[world.fps]) (TickCount:[world.time/world.tick_lag]) (TickDrift:[round(Master.tickdrift,1)]([round((Master.tickdrift/(world.time/world.tick_lag))*100,0.1)]%))")
- stat("Master Controller:", statclick.update("(TickRate:[Master.processing]) (Iteration:[Master.iteration])"))
+ msg = "Byond: (FPS:[world.fps]) (TickCount:[world.time/world.tick_lag]) (TickDrift:[round(Master.tickdrift,1)]([round((Master.tickdrift/(world.time/world.tick_lag))*100,0.1)]%))"
+ msg += "Master Controller: [statclick.update("(TickRate:[Master.processing]) (Iteration:[Master.iteration])")]"
+
+ return msg
/datum/controller/master/StartLoadingMap(var/quiet = TRUE)
if(map_loading)
diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm
index 5297314ab14..9c5fcbe5cb6 100644
--- a/code/controllers/subsystem.dm
+++ b/code/controllers/subsystem.dm
@@ -164,22 +164,11 @@
//hook for printing stats to the "MC" statuspanel for admins to see performance and related stats etc.
/datum/controller/subsystem/stat_entry(msg)
- if(!statclick)
- statclick = new/obj/effect/statclick/debug(null, "Initializing...", src)
-
-
- if(SS_NO_FIRE & flags)
- msg = "NO FIRE\t[msg]"
- else if(can_fire <= 0)
- msg = "OFFLINE\t[msg]"
- else
+ if(can_fire && !(SS_NO_FIRE & flags))
msg = "[round(cost,1)]ms|[round(tick_usage,1)]%([round(tick_overrun,1)]%)|[round(ticks,0.1)]\t[msg]"
-
- var/title = name
- if (can_fire)
- title = "\[[state_letter()]][title]"
-
- stat(title, statclick.update(msg))
+ else
+ msg = "OFFLINE\t[msg]"
+ return msg
/datum/controller/subsystem/proc/state_letter()
switch (state)
diff --git a/code/controllers/subsystems/ai.dm b/code/controllers/subsystems/ai.dm
index eb29e2fec2f..4e5256d9492 100644
--- a/code/controllers/subsystems/ai.dm
+++ b/code/controllers/subsystems/ai.dm
@@ -12,8 +12,9 @@ SUBSYSTEM_DEF(ai)
var/slept_mobs = 0
var/list/process_z = list()
-/datum/controller/subsystem/ai/stat_entry(msg_prefix)
- ..("P: [processing.len] | S: [slept_mobs]")
+/datum/controller/subsystem/ai/stat_entry(msg)
+ msg = "P: [processing.len] | S: [slept_mobs]"
+ return ..()
/datum/controller/subsystem/ai/fire(resumed = 0)
if (!resumed)
diff --git a/code/controllers/subsystems/aifast.dm b/code/controllers/subsystems/aifast.dm
index f045a7fd35c..2580c156ace 100644
--- a/code/controllers/subsystems/aifast.dm
+++ b/code/controllers/subsystems/aifast.dm
@@ -9,10 +9,9 @@ SUBSYSTEM_DEF(aifast)
var/list/processing = list()
var/list/currentrun = list()
-/datum/controller/subsystem/aifast/stat_entry(msg_prefix)
- var/list/msg = list(msg_prefix)
- msg += "P:[processing.len]"
- ..(msg.Join())
+/datum/controller/subsystem/aifast/stat_entry(msg)
+ msg = "P:[processing.len]"
+ return ..()
/datum/controller/subsystem/aifast/fire(resumed = 0)
if (!resumed)
diff --git a/code/controllers/subsystems/air.dm b/code/controllers/subsystems/air.dm
index 4886a11c273..1e5f1506ec6 100644
--- a/code/controllers/subsystems/air.dm
+++ b/code/controllers/subsystems/air.dm
@@ -244,9 +244,8 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
if(MC_TICK_CHECK)
return
-/datum/controller/subsystem/air/stat_entry(msg_prefix)
- var/list/msg = list(msg_prefix)
- msg += "S:[current_step ? part_names[current_step] : ""] "
+/datum/controller/subsystem/air/stat_entry(msg)
+ msg = "S:[current_step ? part_names[current_step] : ""] "
msg += "C:{"
msg += "T [round(cost_turfs, 1)] | "
msg += "E [round(cost_edges, 1)] | "
@@ -263,7 +262,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
msg += "H [active_hotspots.len] | "
msg += "Z [zones_to_update.len] "
msg += "}"
- ..(msg.Join())
+ return ..()
// ZAS might displace objects as the map loads if an air tick is processed mid-load.
/datum/controller/subsystem/air/StartLoadingMap(var/quiet = TRUE)
diff --git a/code/controllers/subsystems/alarm.dm b/code/controllers/subsystems/alarm.dm
index 868025eca3f..e3507a34e45 100644
--- a/code/controllers/subsystems/alarm.dm
+++ b/code/controllers/subsystems/alarm.dm
@@ -41,5 +41,6 @@ SUBSYSTEM_DEF(alarm)
/datum/controller/subsystem/alarm/proc/number_of_active_alarms()
return active_alarm_cache.len
-/datum/controller/subsystem/alarm/stat_entry()
- ..("[number_of_active_alarms()] alarm\s")
+/datum/controller/subsystem/alarm/stat_entry(msg)
+ msg = "[number_of_active_alarms()] alarm\s"
+ return ..()
diff --git a/code/controllers/subsystems/chemistry.dm b/code/controllers/subsystems/chemistry.dm
index 148e9755421..6f0c5959ebe 100644
--- a/code/controllers/subsystems/chemistry.dm
+++ b/code/controllers/subsystems/chemistry.dm
@@ -20,8 +20,9 @@ SUBSYSTEM_DEF(chemistry)
initialize_chemical_reactions()
..()
-/datum/controller/subsystem/chemistry/stat_entry()
- ..("C: [chemical_reagents.len] | R: [chemical_reactions.len]")
+/datum/controller/subsystem/chemistry/stat_entry(msg)
+ msg = "C: [chemical_reagents.len] | R: [chemical_reactions.len]"
+ return ..()
//Chemical Reactions - Initialises all /decl/chemical_reaction into a list
// It is filtered into multiple lists within a list.
@@ -43,7 +44,7 @@ SUBSYSTEM_DEF(chemistry)
// add_to = fusion_reactions_by_reagent
if(istype(D, /decl/chemical_reaction/distilling))
add_to = distilled_reactions_by_reagent
-
+
LAZYINITLIST(add_to[reagent_id])
add_to[reagent_id] += D
diff --git a/code/controllers/subsystems/events.dm b/code/controllers/subsystems/events.dm
index 83ab2fa00ca..5bdf83fdecc 100644
--- a/code/controllers/subsystems/events.dm
+++ b/code/controllers/subsystems/events.dm
@@ -41,8 +41,9 @@ SUBSYSTEM_DEF(events)
var/datum/event_container/EC = event_containers[i]
EC.process()
-/datum/controller/subsystem/events/stat_entry()
- ..("E:[active_events.len]")
+/datum/controller/subsystem/events/stat_entry(msg)
+ msg = "E:[active_events.len]"
+ return ..()
/datum/controller/subsystem/events/Recover()
if(SSevents.active_events)
diff --git a/code/controllers/subsystems/inactivity.dm b/code/controllers/subsystems/inactivity.dm
index 3795468f840..c921cff0220 100644
--- a/code/controllers/subsystems/inactivity.dm
+++ b/code/controllers/subsystems/inactivity.dm
@@ -56,8 +56,9 @@ SUBSYSTEM_DEF(inactivity)
if (MC_TICK_CHECK)
return
-/datum/controller/subsystem/inactivity/stat_entry()
- ..("Kicked: [number_kicked]")
+/datum/controller/subsystem/inactivity/stat_entry(msg)
+ msg = "Kicked: [number_kicked]"
+ return ..()
/datum/controller/subsystem/inactivity/proc/can_kick(var/client/C)
if(C.holder) return FALSE //VOREStation Add - Don't kick admins.
diff --git a/code/controllers/subsystems/machines.dm b/code/controllers/subsystems/machines.dm
index 67210025556..dea5b7ccc37 100644
--- a/code/controllers/subsystems/machines.dm
+++ b/code/controllers/subsystems/machines.dm
@@ -82,9 +82,8 @@ SUBSYSTEM_DEF(machines)
T.broadcast_status()
CHECK_TICK
-/datum/controller/subsystem/machines/stat_entry()
- var/msg = list()
- msg += "C:{"
+/datum/controller/subsystem/machines/stat_entry(msg)
+ msg = "C:{"
msg += "PI:[round(cost_pipenets,1)]|"
msg += "MC:[round(cost_machinery,1)]|"
msg += "PN:[round(cost_powernets,1)]|"
@@ -95,7 +94,7 @@ SUBSYSTEM_DEF(machines)
msg += "PN:[SSmachines.powernets.len]|"
msg += "PO:[SSmachines.powerobjs.len]|"
msg += "MC/MS:[round((cost ? SSmachines.processing_machines.len/cost_machinery : 0),0.1)]"
- ..(jointext(msg, null))
+ return ..()
/datum/controller/subsystem/machines/proc/process_pipenets(resumed = 0)
if (!resumed)
diff --git a/code/controllers/subsystems/mobs.dm b/code/controllers/subsystems/mobs.dm
index c124b5573ef..8fec502f21c 100644
--- a/code/controllers/subsystems/mobs.dm
+++ b/code/controllers/subsystems/mobs.dm
@@ -19,8 +19,9 @@ SUBSYSTEM_DEF(mobs)
var/slept_mobs = 0
var/list/process_z = list()
-/datum/controller/subsystem/mobs/stat_entry()
- ..("P: [global.mob_list.len] | S: [slept_mobs]")
+/datum/controller/subsystem/mobs/stat_entry(msg)
+ msg = "P: [global.mob_list.len] | S: [slept_mobs]"
+ return ..()
/datum/controller/subsystem/mobs/fire(resumed = 0)
if (!resumed)
@@ -90,4 +91,4 @@ SUBSYSTEM_DEF(mobs)
/datum/controller/subsystem/mobs/critfail()
..()
- log_recent()
\ No newline at end of file
+ log_recent()
diff --git a/code/controllers/subsystems/orbits.dm b/code/controllers/subsystems/orbits.dm
index 5cda1ce9dc4..af7a5ab7eab 100644
--- a/code/controllers/subsystems/orbits.dm
+++ b/code/controllers/subsystems/orbits.dm
@@ -7,8 +7,9 @@ SUBSYSTEM_DEF(orbit)
var/list/currentrun = list()
var/list/processing = list()
-/datum/controller/subsystem/orbit/stat_entry()
- ..("P:[processing.len]")
+/datum/controller/subsystem/orbit/stat_entry(msg)
+ msg = "P:[processing.len]"
+ return ..()
/datum/controller/subsystem/orbit/fire(resumed = 0)
@@ -40,5 +41,3 @@ SUBSYSTEM_DEF(orbit)
O.Check(targetloc)
if (MC_TICK_CHECK)
return
-
-
diff --git a/code/controllers/subsystems/overlays.dm b/code/controllers/subsystems/overlays.dm
index 9d840933cb7..0a953e97828 100644
--- a/code/controllers/subsystems/overlays.dm
+++ b/code/controllers/subsystems/overlays.dm
@@ -32,8 +32,9 @@ SUBSYSTEM_DEF(overlays)
fire(FALSE, TRUE)
..()
-/datum/controller/subsystem/overlays/stat_entry()
- ..("Queued Atoms: [queue.len], Cache Size: [cache_size]")
+/datum/controller/subsystem/overlays/stat_entry(msg)
+ msg = "Queued Atoms: [queue.len], Cache Size: [cache_size]"
+ return ..()
/datum/controller/subsystem/overlays/fire(resumed, no_mc_tick)
diff --git a/code/controllers/subsystems/ping.dm b/code/controllers/subsystems/ping.dm
index 20cf8dd4465..8f4836290a4 100644
--- a/code/controllers/subsystems/ping.dm
+++ b/code/controllers/subsystems/ping.dm
@@ -12,8 +12,9 @@ SUBSYSTEM_DEF(ping)
runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
var/list/currentrun = list()
-/datum/controller/subsystem/ping/stat_entry()
- ..("P:[GLOB.clients.len]")
+/datum/controller/subsystem/ping/stat_entry(msg)
+ msg = "P:[GLOB.clients.len]"
+ return ..()
/datum/controller/subsystem/ping/fire(resumed = FALSE)
// Prepare the new batch of clients
diff --git a/code/controllers/subsystems/plants.dm b/code/controllers/subsystems/plants.dm
index 42622b217d4..af4815395e1 100644
--- a/code/controllers/subsystems/plants.dm
+++ b/code/controllers/subsystems/plants.dm
@@ -22,8 +22,9 @@ SUBSYSTEM_DEF(plants)
var/list/processing = list()
var/list/currentrun = list()
-/datum/controller/subsystem/plants/stat_entry()
- ..("P:[processing.len]|S:[seeds.len]")
+/datum/controller/subsystem/plants/stat_entry(msg)
+ msg = "P:[processing.len]|S:[seeds.len]"
+ return ..()
/datum/controller/subsystem/plants/Initialize(timeofday)
setup()
diff --git a/code/controllers/subsystems/processing/obj_tab_items.dm b/code/controllers/subsystems/processing/obj_tab_items.dm
new file mode 100644
index 00000000000..53786daf011
--- /dev/null
+++ b/code/controllers/subsystems/processing/obj_tab_items.dm
@@ -0,0 +1,24 @@
+PROCESSING_SUBSYSTEM_DEF(obj_tab_items)
+ name = "Obj Tab Items"
+ flags = SS_NO_INIT
+ runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
+ wait = 0.1 SECONDS
+
+// I know this is mostly copypasta, but I want to change the processing logic
+// Sorry bestie :(
+/datum/controller/subsystem/processing/obj_tab_items/fire(resumed = FALSE)
+ if (!resumed)
+ currentrun = processing.Copy()
+ //cache for sanic speed (lists are references anyways)
+ var/list/current_run = currentrun
+
+ while(current_run.len)
+ var/datum/thing = current_run[current_run.len]
+ if(QDELETED(thing))
+ processing -= thing
+ else if(thing.process(wait * 0.1) == PROCESS_KILL)
+ // fully stop so that a future START_PROCESSING will work
+ STOP_PROCESSING(src, thing)
+ if (MC_TICK_CHECK)
+ return
+ current_run.len--
diff --git a/code/controllers/subsystems/processing/processing.dm b/code/controllers/subsystems/processing/processing.dm
index 16b4da021b1..51c1afe015f 100644
--- a/code/controllers/subsystems/processing/processing.dm
+++ b/code/controllers/subsystems/processing/processing.dm
@@ -24,8 +24,9 @@ SUBSYSTEM_DEF(processing)
if(CHECK_BITFIELD(D.datum_flags, DF_ISPROCESSING))
processing |= D
-/datum/controller/subsystem/processing/stat_entry()
- ..("[stat_tag]:[processing.len]")
+/datum/controller/subsystem/processing/stat_entry(msg)
+ msg = "[stat_tag]:[processing.len]"
+ return ..()
/datum/controller/subsystem/processing/fire(resumed = 0)
if (!resumed)
@@ -69,14 +70,14 @@ SUBSYSTEM_DEF(processing)
log_world(msg)
return
msg += "Lists: current_run: [currentrun.len], processing: [processing.len]\n"
-
+
if(!currentrun.len)
msg += "!!The subsystem just finished the processing list, and currentrun is empty (or has never run).\n"
msg += "!!The info below is the tail of processing instead of currentrun.\n"
-
+
var/datum/D = currentrun.len ? currentrun[currentrun.len] : processing[processing.len]
msg += "Tail entry: [describeThis(D)] (this is likely the item AFTER the problem item)\n"
-
+
var/position = processing.Find(D)
if(!position)
msg += "Unable to find context of tail entry in processing list.\n"
diff --git a/code/controllers/subsystems/radiation.dm b/code/controllers/subsystems/radiation.dm
index 8f140a5fc83..967c21992f4 100644
--- a/code/controllers/subsystems/radiation.dm
+++ b/code/controllers/subsystems/radiation.dm
@@ -54,8 +54,9 @@ SUBSYSTEM_DEF(radiation)
if (MC_TICK_CHECK)
return
-/datum/controller/subsystem/radiation/stat_entry()
- ..("S:[sources.len], RC:[resistance_cache.len]")
+/datum/controller/subsystem/radiation/stat_entry(msg)
+ msg = "S:[sources.len], RC:[resistance_cache.len]"
+ return ..()
// Ray trace from all active radiation sources to T and return the strongest effect.
/datum/controller/subsystem/radiation/proc/get_rads_at_turf(var/turf/T)
@@ -144,4 +145,4 @@ SUBSYSTEM_DEF(radiation)
if(!(power && source))
return
var/turf/epicentre = locate(round(world.maxx / 2), round(world.maxy / 2), source.z)
- flat_radiate(epicentre, power, world.maxx, respect_maint)
\ No newline at end of file
+ flat_radiate(epicentre, power, world.maxx, respect_maint)
diff --git a/code/controllers/subsystems/shuttles.dm b/code/controllers/subsystems/shuttles.dm
index 38ec9e5c83f..02f9cb91ebd 100644
--- a/code/controllers/subsystems/shuttles.dm
+++ b/code/controllers/subsystems/shuttles.dm
@@ -172,5 +172,6 @@ SUBSYSTEM_DEF(shuttles)
for(var/obj/effect/overmap/visitable/ship/ship_effect as anything in ships)
overmap_halted ? ship_effect.halt() : ship_effect.unhalt()
-/datum/controller/subsystem/shuttles/stat_entry()
- ..("Shuttles:[process_shuttles.len]/[shuttles.len], Ships:[ships.len], L:[registered_shuttle_landmarks.len][overmap_halted ? ", HALT" : ""]")
+/datum/controller/subsystem/shuttles/stat_entry(msg)
+ msg = "Shuttles:[process_shuttles.len]/[shuttles.len], Ships:[ships.len], L:[registered_shuttle_landmarks.len][overmap_halted ? ", HALT" : ""]"
+ return ..()
diff --git a/code/controllers/subsystems/statpanel.dm b/code/controllers/subsystems/statpanel.dm
new file mode 100644
index 00000000000..c80e7cd1fbe
--- /dev/null
+++ b/code/controllers/subsystems/statpanel.dm
@@ -0,0 +1,481 @@
+SUBSYSTEM_DEF(statpanels)
+ name = "Stat Panels"
+ wait = 4
+ init_order = INIT_ORDER_STATPANELS
+ //init_stage = INITSTAGE_EARLY
+ priority = FIRE_PRIORITY_STATPANEL
+ runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
+ flags = SS_NO_INIT
+ var/list/currentrun = list()
+ var/list/global_data
+ var/list/mc_data
+ var/list/cached_images = list()
+
+ ///how many subsystem fires between most tab updates
+ var/default_wait = 10
+ ///how many subsystem fires between updates of misc tabs
+ var/misc_wait = 3
+ ///how many subsystem fires between updates of the status tab
+ var/status_wait = 2
+ ///how many subsystem fires between updates of the MC tab
+ var/mc_wait = 5
+ ///how many full runs this subsystem has completed. used for variable rate refreshes.
+ var/num_fires = 0
+
+/datum/controller/subsystem/statpanels/fire(resumed = FALSE)
+ if (!resumed)
+ num_fires++
+ //var/datum/map_config/cached = SSmapping.next_map_config
+ global_data = list(
+ //"Map: [SSmapping.config?.map_name || "Loading..."]",
+ "Map: [using_map.name]",
+ //cached ? "Next Map: [cached.map_name]" : null,
+ //"Next Map: -- Not Available --",
+ // "Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]",
+ "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]",
+ "Round Time: [ROUND_TIME()]",
+ "Station Date: [stationdate2text()]", // [capitalize(GLOB.world_time_season)]",
+ "Station Time: [stationtime2text()]",
+ "Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)"
+ )
+
+ if(emergency_shuttle.evac)
+ var/ETA = emergency_shuttle.get_status_panel_eta()
+ if(ETA)
+ global_data += "[ETA]"
+ src.currentrun = GLOB.clients.Copy()
+ mc_data = null
+
+ var/list/currentrun = src.currentrun
+ while(length(currentrun))
+ var/client/target = currentrun[length(currentrun)]
+ currentrun.len--
+
+ if(!target?.stat_panel?.is_ready()) // Null target client, client has null stat panel, or stat panel isn't ready
+ continue
+
+ if(target.stat_tab == "Status" && num_fires % status_wait == 0)
+ set_status_tab(target)
+
+ if(!target.holder)
+ target.stat_panel.send_message("remove_admin_tabs")
+ else
+ //target.stat_panel.send_message("update_split_admin_tabs", !!(target.prefs.toggles & SPLIT_ADMIN_TABS))
+ target.stat_panel.send_message("update_split_admin_tabs", FALSE)
+
+ if(!("MC" in target.panel_tabs) || !("Tickets" in target.panel_tabs))
+ target.stat_panel.send_message("add_admin_tabs", target.holder.href_token)
+
+ //if(target.stat_tab == "MC" && ((num_fires % mc_wait == 0) || target?.prefs.read_preference(/datum/preference/toggle/fast_mc_refresh)))
+ //set_MC_tab(target)
+ if(target.stat_tab == "MC" && ((num_fires % mc_wait == 0)))
+ set_MC_tab(target)
+
+ if(target.stat_tab == "Tickets" && num_fires % default_wait == 0)
+ set_tickets_tab(target)
+
+ if(!length(GLOB.sdql2_queries) && ("SDQL2" in target.panel_tabs))
+ target.stat_panel.send_message("remove_sdql2")
+
+ else if(length(GLOB.sdql2_queries) && (target.stat_tab == "SDQL2" || !("SDQL2" in target.panel_tabs)) && num_fires % default_wait == 0)
+ set_SDQL2_tab(target)
+
+ if(target.mob)
+ var/mob/target_mob = target.mob
+
+ // Handle the action panels of the stat panel
+
+ var/update_actions = FALSE
+ // We're on a spell tab, update the tab so we can see cooldowns progressing and such
+ if(target.stat_tab in target.spell_tabs)
+ update_actions = TRUE
+ // We're not on a spell tab per se, but we have cooldown actions, and we've yet to
+ // set up our spell tabs at all
+ //if(!length(target.spell_tabs) && locate(/datum/action/cooldown) in target_mob.actions)
+ //update_actions = TRUE
+
+ if(update_actions && num_fires % default_wait == 0)
+ set_action_tabs(target, target_mob)
+ //Update every fire if tab is open, otherwise update every 7 fires
+ if((num_fires % misc_wait == 0))
+ update_misc_tabs(target,target_mob)
+
+ var/datum/object_window_info/obj_window = target.obj_window
+ if(obj_window)
+ if(obj_window.flags & TURFLIST_UPDATE_QUEUED)
+ immediate_send_stat_data(target)
+ obj_window.flags = 0
+
+ if(MC_TICK_CHECK)
+ return
+
+/datum/controller/subsystem/statpanels/proc/update_misc_tabs(var/client/target,var/mob/target_mob)
+ target_mob.update_misc_tabs()
+ for(var/tab in target_mob.misc_tabs)
+ if(target_mob.misc_tabs[tab].len == 0 && (tab in target.misc_tabs))
+ target.misc_tabs -= tab
+ target.stat_panel.send_message("remove_misc",tab)
+
+ if(target_mob.misc_tabs[tab].len > 0)
+ if(!(tab in target.misc_tabs))
+ target.misc_tabs += tab
+ target.stat_panel.send_message("create_misc",tab)
+ target.stat_panel.send_message("update_misc",list(
+ TN = tab, \
+ TC = target_mob.misc_tabs[tab], \
+ ))
+
+ for(var/tab in target.misc_tabs)
+ if(!(tab in target_mob.misc_tabs))
+ target.misc_tabs -= tab
+ target.stat_panel.send_message("remove_misc",tab)
+
+/datum/controller/subsystem/statpanels/proc/set_status_tab(client/target)
+ if(!global_data)//statbrowser hasnt fired yet and we were called from immediate_send_stat_data()
+ return
+
+ target.stat_panel.send_message("update_stat", list(
+ global_data = global_data,
+ ping_str = "Ping: -- Not Available --", // [round(target.lastping, 1)]ms (Average: [round(target.avgping, 1)]ms)",
+ other_str = target.mob?.get_status_tab_items(),
+ ))
+
+/datum/controller/subsystem/statpanels/proc/set_MC_tab(client/target)
+ var/turf/eye_turf = get_turf(target.eye)
+ var/coord_entry = COORD(eye_turf)
+ if(!mc_data)
+ generate_mc_data()
+ target.stat_panel.send_message("update_mc", list(mc_data = mc_data, coord_entry = coord_entry))
+
+/datum/controller/subsystem/statpanels/proc/set_examine_tab(client/target)
+ var/description_holders = target.description_holders
+ var/list/examine_update = list()
+
+ if(!target.obj_window)
+ target.obj_window = new(target)
+ if(!target.examine_icon && !target.obj_window.examine_target && target.stat_tab == "Examine")
+ target.obj_window.examine_target = description_holders["icon"]
+ target.obj_window.atoms_to_show += target.obj_window.examine_target
+ START_PROCESSING(SSobj_tab_items, target.obj_window)
+ refresh_client_obj_view(target)
+ examine_update += "[target.examine_icon] [description_holders["name"]]" //The name, written in big letters.
+ examine_update += "[description_holders["desc"]]" //the default examine text.
+ if(description_holders["info"])
+ examine_update += "" + span_bold("[replacetext(description_holders["info"], "\n", "